rpms/azureus/devel azureus-CryptoHandlerECC-bcprov.patch, NONE, 1.1 azureus-CryptoSTSEngineImpl-bcprov.patch, NONE, 1.1 azureus-SecureMessageServiceClientHelper-bcprov.patch, NONE, 1.1 azureus-UDPConnectionSet-bcprov.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 azureus-no-restart.patch, 1.1, 1.2 azureus-no-updates-PluginInitializer.patch, 1.1, 1.2 azureus-remove-win32-PlatformManagerUpdateChecker.patch, 1.2, 1.3 azureus.spec, 1.21, 1.22 sources, 1.6, 1.7 azureus-ConfigSectionPlugins-swt-3.1.patch, 1.2, NONE azureus-ConfigurationManager-improvement.patch, 1.1, NONE azureus-GKR.patch, 1.1, NONE azureus-MessageSlideShell-swt-3.1.patch, 1.2, NONE azureus-Messages-swt-3.1.patch, 1.1, NONE azureus-TableView-swt-3.1.patch, 1.2, NONE azureus-base64.patch, 1.2, NONE azureus-java.beans.XMLEncoder.patch, 1.1, NONE azureus-jessie.patch, 1.1, NONE azureus-no-bouncycastle.patch, 1.2, NONE azureus-no-install-remove-plugins.patch, 1.3, NONE azureus-no-shared-plugins2.patch, 1.1, NONE azureus-no-update-manager-TableView.patch, 1.1, NONE azureus-sun.misc.Cleaner.patch, 1.1, NONE azureus-sun.misc.Signal.patch, 1.1, NONE
Anthony Green (green)
fedora-extras-commits at redhat.com
Sun Jul 30 18:56:22 UTC 2006
Author: green
Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30420
Modified Files:
.cvsignore azureus-no-restart.patch
azureus-no-updates-PluginInitializer.patch
azureus-remove-win32-PlatformManagerUpdateChecker.patch
azureus.spec sources
Added Files:
azureus-CryptoHandlerECC-bcprov.patch
azureus-CryptoSTSEngineImpl-bcprov.patch
azureus-SecureMessageServiceClientHelper-bcprov.patch
azureus-UDPConnectionSet-bcprov.patch
Removed Files:
azureus-ConfigSectionPlugins-swt-3.1.patch
azureus-ConfigurationManager-improvement.patch
azureus-GKR.patch azureus-MessageSlideShell-swt-3.1.patch
azureus-Messages-swt-3.1.patch azureus-TableView-swt-3.1.patch
azureus-base64.patch azureus-java.beans.XMLEncoder.patch
azureus-jessie.patch azureus-no-bouncycastle.patch
azureus-no-install-remove-plugins.patch
azureus-no-shared-plugins2.patch
azureus-no-update-manager-TableView.patch
azureus-sun.misc.Cleaner.patch azureus-sun.misc.Signal.patch
Log Message:
Many updates for new rawhide version.
azureus-CryptoHandlerECC-bcprov.patch:
--- NEW FILE azureus-CryptoHandlerECC-bcprov.patch ---
--- com/aelitis/azureus/core/security/impl/CryptoHandlerECC.java.~1.3.~ 2006-07-08 11:50:24.000000000 -0700
+++ com/aelitis/azureus/core/security/impl/CryptoHandlerECC.java 2006-07-08 11:49:50.000000000 -0700
@@ -31,8 +31,14 @@
import java.security.PublicKey;
import java.security.Signature;
import java.security.spec.KeySpec;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.SecureRandom;
+import java.security.InvalidKeyException;
+import java.security.InvalidAlgorithmParameterException;
import javax.crypto.Cipher;
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
import org.bouncycastle.jce.ECNamedCurveTable;
import org.bouncycastle.jce.interfaces.ECPrivateKey;
@@ -200,6 +206,26 @@
{
return( encrypt( other_public_key, data, null, reason ));
}
+
+ class InternalECIES extends JCEIESCipher.ECIES
+ {
+ public void internalEngineInit(int opmode,
+ Key key,
+ AlgorithmParameterSpec params,
+ SecureRandom random)
+ throws InvalidKeyException, InvalidAlgorithmParameterException
+ {
+ engineInit(opmode, key, params, random);
+ }
+
+ protected byte[] internalEngineDoFinal(byte[] input,
+ int inputOffset,
+ int inputLen)
+ throws IllegalBlockSizeException, BadPaddingException
+ {
+ return engineDoFinal(input, inputOffset, inputLen);
+ }
+ }
protected byte[]
encrypt(
@@ -215,11 +241,11 @@
IESParameterSpec param = new IESParameterSpec(ECIES_D, ECIES_E, 128);
- JCEIESCipher cipher = new JCEIESCipher.ECIES();
+ InternalECIES cipher = new InternalECIES();
- cipher.engineInit( Cipher.ENCRYPT_MODE, key_spec, param, null );
+ cipher.internalEngineInit( Cipher.ENCRYPT_MODE, key_spec, param, null );
- return( cipher.engineDoFinal(data, 0, data.length ));
+ return( cipher.internalEngineDoFinal(data, 0, data.length ));
}catch( CryptoManagerException e ){
@@ -267,11 +293,11 @@
IESParameterSpec param = new IESParameterSpec(ECIES_D, ECIES_E, 128);
- JCEIESCipher cipher = new JCEIESCipher.ECIES();
+ InternalECIES cipher = new InternalECIES();
- cipher.engineInit( Cipher.DECRYPT_MODE, key_spec, param, null );
+ cipher.internalEngineInit( Cipher.DECRYPT_MODE, key_spec, param, null );
- return( cipher.engineDoFinal(data, 0, data.length ));
+ return( cipher.internalEngineDoFinal(data, 0, data.length ));
}catch( CryptoManagerException e ){
azureus-CryptoSTSEngineImpl-bcprov.patch:
--- NEW FILE azureus-CryptoSTSEngineImpl-bcprov.patch ---
--- /usr/src/redhat/BUILD/azureus2/com/aelitis/azureus/core/security/impl/CryptoSTSEngineImpl.java.~1.2.~ 2006-07-08 12:02:26.000000000 -0700
+++ /usr/src/redhat/BUILD/azureus2/com/aelitis/azureus/core/security/impl/CryptoSTSEngineImpl.java 2006-07-08 12:01:51.000000000 -0700
@@ -28,6 +28,9 @@
import java.security.PublicKey;
import java.security.SecureRandom;
import java.security.Signature;
+import java.security.Key;
+import java.security.InvalidKeyException;
+import java.security.InvalidAlgorithmParameterException;
import org.bouncycastle.jce.provider.JCEECDHKeyAgreement;
@@ -54,7 +57,36 @@
private PublicKey remotePubKey;
private byte[] sharedSecret;
- private JCEECDHKeyAgreement ecDH;
+ private InternalDH ecDH;
+
+ class InternalDH extends JCEECDHKeyAgreement.DH
+ {
+ public void
+ init(
+ Key key )
+
+ throws InvalidKeyException, InvalidAlgorithmParameterException
+ {
+ engineInit( key, null );
+ }
+
+ public Key
+ doPhase(
+ Key key,
+ boolean lastPhase )
+
+ throws InvalidKeyException, IllegalStateException
+ {
+ return( engineDoPhase( key, lastPhase ));
+ }
+
+ public byte[]
+ generateSecret()
+ throws IllegalStateException
+ {
+ return( engineGenerateSecret());
+ }
+ }
/**
*
@@ -75,7 +107,7 @@
ephemeralKeyPair = handler.createKeys();
try{
- ecDH = new JCEECDHKeyAgreement.DH();
+ ecDH = new InternalDH();
//ecDH = KeyAgreement.getInstance("ECDH", "BC");
azureus-SecureMessageServiceClientHelper-bcprov.patch:
--- NEW FILE azureus-SecureMessageServiceClientHelper-bcprov.patch ---
--- com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java.~1.4.~ 2006-02-09 19:43:06.000000000 -0800
+++ com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java 2006-07-08 11:05:19.000000000 -0700
@@ -36,7 +36,6 @@
import org.bouncycastle.crypto.encodings.PKCS1Encoding;
import org.bouncycastle.crypto.engines.RSAEngine;
import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.jce.provider.RSAUtil;
import org.gudy.azureus2.core3.util.Debug;
import org.gudy.azureus2.plugins.utils.StaticUtilities;
@@ -82,30 +81,12 @@
byte[] secret_bytes = session_key.getEncoded();
- try{
Cipher rsa_cipher = Cipher.getInstance( "RSA" );
rsa_cipher.init( Cipher.ENCRYPT_MODE, public_key );
encryped_session_key = rsa_cipher.doFinal( secret_bytes );
- }catch( Throwable e ){
-
- // fallback to the BC implementation for jdk1.4.2 as JCE RSA not available
-
- RSAEngine eng = new RSAEngine();
-
- PKCS1Encoding padded_eng = new PKCS1Encoding( eng );
-
- CipherParameters param = RSAUtil.generatePublicKeyParameter(public_key);
-
- param = new ParametersWithRandom(param, new SecureRandom());
-
- padded_eng.init( true, param );
-
- encryped_session_key = padded_eng.processBlock(secret_bytes, 0, secret_bytes.length);
- }
-
}catch( Throwable e ){
e.printStackTrace();
azureus-UDPConnectionSet-bcprov.patch:
--- NEW FILE azureus-UDPConnectionSet-bcprov.patch ---
--- com/aelitis/azureus/core/networkmanager/impl/udp/UDPConnectionSet.java.~1.12.~ 2006-07-01 05:30:35.000000000 -0700
+++ com/aelitis/azureus/core/networkmanager/impl/udp/UDPConnectionSet.java 2006-07-08 11:13:04.000000000 -0700
@@ -333,7 +333,7 @@
byte[] temp = new byte[1024];
- rc4_engine.processBytes( temp, temp );
+ rc4_engine.processBytes( temp, 0, temp.length, temp, 0 );
return( rc4_engine );
}
@@ -1683,7 +1683,7 @@
{
byte[] bytes = intToBytes( i );
- cipher.processBytes( bytes, bytes );
+ cipher.processBytes( bytes, 0, bytes.length, bytes, 0 );
return( bytesToInt( bytes, 0 ));
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 29 May 2006 16:02:45 -0000 1.6
+++ .cvsignore 30 Jul 2006 18:56:22 -0000 1.7
@@ -1,3 +1,3 @@
-azureus2-cvs-20060529.tar.bz2
+azureus2-cvs-20060729.tar.bz2
bdcc_2.2.2.zip
-azplugins_1.8.8.jar
+azplugins_1.9.jar
azureus-no-restart.patch:
Index: azureus-no-restart.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-restart.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-restart.patch 10 Feb 2006 17:00:46 -0000 1.1
+++ azureus-no-restart.patch 30 Jul 2006 18:56:22 -0000 1.2
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java~ 2006-02-09 20:09:11.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-02-09 20:09:17.000000000 -0500
-@@ -171,17 +171,6 @@
+--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-07-02 19:39:25.000000000 -0700
++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-07-08 12:51:28.000000000 -0700
+@@ -196,17 +196,6 @@
if(!Constants.isOSX) {
new MenuItem(fileMenu, SWT.SEPARATOR);
@@ -18,3 +18,47 @@
final MenuItem file_exit = new MenuItem(fileMenu, SWT.NULL);
if(!COConfigurationManager.getBooleanParameter("Enable System Tray") || !COConfigurationManager.getBooleanParameter("Close To Tray")) {
KeyBindings.setAccelerator(file_exit, "MainWindow.menu.file.exit");
+@@ -372,24 +361,6 @@
+
+ new MenuItem(pluginMenu, SWT.SEPARATOR);
+
+- MenuItem plugins_install_wizard = new MenuItem(pluginMenu, SWT.NULL);
+- KeyBindings.setAccelerator(plugins_install_wizard, "MainWindow.menu.plugins.installPlugins");
+- Messages.setLanguageText(plugins_install_wizard, "MainWindow.menu.plugins.installPlugins"); //$NON-NLS-1$
+- plugins_install_wizard.addListener(SWT.Selection, new Listener() {
+- public void handleEvent(Event e) {
+- new InstallPluginWizard(core, display);
+- }
+- });
+-
+- MenuItem plugins_uninstall_wizard = new MenuItem(pluginMenu, SWT.NULL);
+- KeyBindings.setAccelerator(plugins_uninstall_wizard, "MainWindow.menu.plugins.uninstallPlugins");
+- Messages.setLanguageText(plugins_uninstall_wizard, "MainWindow.menu.plugins.uninstallPlugins"); //$NON-NLS-1$
+- plugins_uninstall_wizard.addListener(SWT.Selection, new Listener() {
+- public void handleEvent(Event e) {
+- new UnInstallPluginWizard(core, display);
+- }
+- });
+-
+ // standard items
+ if(Constants.isOSX) {
+ // Window menu
+@@ -475,18 +446,6 @@
+
+ new MenuItem(helpMenu,SWT.SEPARATOR);
+
+- if ( !SystemProperties.isJavaWebStartInstance()){
+- MenuItem help_checkupdate = new MenuItem(helpMenu, SWT.NULL);
+- KeyBindings.setAccelerator(help_checkupdate, "MainWindow.menu.help.checkupdate");
+- Messages.setLanguageText(help_checkupdate, "MainWindow.menu.help.checkupdate"); //$NON-NLS-1$
+- help_checkupdate.addListener(SWT.Selection, new Listener() {
+- public void handleEvent(Event e) {
+- mainWindow.getShell().setFocus();
+- UpdateMonitor.getSingleton(core, mainWindow).performCheck(true);
+- }
+- });
+- }
+-
+ MenuItem help_donate = new MenuItem(helpMenu, SWT.NULL);
+ Messages.setLanguageText(help_donate, "MainWindow.menu.help.donate"); //$NON-NLS-1$
+ help_donate.addListener(SWT.Selection, new Listener() {
azureus-no-updates-PluginInitializer.patch:
Index: azureus-no-updates-PluginInitializer.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-updates-PluginInitializer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-updates-PluginInitializer.patch 10 Feb 2006 17:00:46 -0000 1.1
+++ azureus-no-updates-PluginInitializer.patch 30 Jul 2006 18:56:22 -0000 1.2
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.orig 2006-02-09 22:57:59.000000000 -0500
-+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2006-02-09 23:01:31.000000000 -0500
-@@ -47,11 +47,8 @@
+--- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.orig 2006-07-02 21:17:53.000000000 -0700
++++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2006-07-02 21:19:27.000000000 -0700
+@@ -49,13 +49,8 @@
import org.gudy.azureus2.plugins.*;
import org.gudy.azureus2.pluginsimpl.local.launch.PluginLauncherImpl;
import org.gudy.azureus2.pluginsimpl.local.ui.UIManagerImpl;
@@ -8,11 +8,13 @@
import org.gudy.azureus2.pluginsimpl.local.utils.UtilitiesImpl;
-import org.gudy.azureus2.update.UpdaterUpdateChecker;
+-import org.gudy.azureus2.update.UpdaterUtils;
+-
-
-
/**
-@@ -93,11 +90,6 @@
+ * @author Olivier
+@@ -96,11 +91,6 @@
"azbpsharehoster",
"ShareHoster",
"true" },
@@ -24,7 +26,7 @@
{ PluginManagerDefaults.PID_CLIENT_ID,
"com.aelitis.azureus.plugins.clientid.ClientIDPlugin",
"azbpclientid",
-@@ -123,16 +115,6 @@
+@@ -126,16 +116,6 @@
"azbpmagnet",
"Magnet URI Handler",
"true" },
@@ -38,10 +40,10 @@
- "azbpcorepatcher",
- "CorePatcher",
- "true" },
- { PluginManagerDefaults.PID_JPC,
- "com.aelitis.azureus.plugins.jpc.JPCPlugin",
- "azjpc",
-@@ -297,11 +279,7 @@
+ //{ PluginManagerDefaults.PID_JPC,
+ // "com.aelitis.azureus.plugins.jpc.JPCPlugin",
+ // "azjpc",
+@@ -302,11 +282,7 @@
listener = _listener;
@@ -49,11 +51,11 @@
-
plugin_manager = PluginManagerImpl.getSingleton( this );
-
-- UpdaterUpdateChecker.checkPlugin();
+- UpdaterUtils.checkPlugin();
}
- public void
-@@ -823,16 +801,11 @@
+ public List
+@@ -901,16 +877,11 @@
if ( load_failure != null ){
azureus-remove-win32-PlatformManagerUpdateChecker.patch:
Index: azureus-remove-win32-PlatformManagerUpdateChecker.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-remove-win32-PlatformManagerUpdateChecker.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus-remove-win32-PlatformManagerUpdateChecker.patch 9 Feb 2006 08:45:07 -0000 1.2
+++ azureus-remove-win32-PlatformManagerUpdateChecker.patch 30 Jul 2006 18:56:22 -0000 1.3
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.orig 2006-01-11 09:05:48.000000000 -0800
-+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2006-01-25 11:51:54.000000000 -0800
-@@ -133,11 +133,6 @@
+--- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.orig 2006-07-02 19:38:37.000000000 -0700
++++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2006-07-02 21:15:16.000000000 -0700
+@@ -136,11 +136,6 @@
"azbpcorepatcher",
"CorePatcher",
"true" },
@@ -9,6 +9,6 @@
- "azplatform2",
- "azplatform2",
- "true" },
- { PluginManagerDefaults.PID_JPC,
- "com.aelitis.azureus.plugins.jpc.JPCPlugin",
- "azjpc",
+ //{ PluginManagerDefaults.PID_JPC,
+ // "com.aelitis.azureus.plugins.jpc.JPCPlugin",
+ // "azjpc",
Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- azureus.spec 29 May 2006 16:02:45 -0000 1.21
+++ azureus.spec 30 Jul 2006 18:56:22 -0000 1.22
@@ -1,6 +1,6 @@
Name: azureus
Version: 2.4.0.3
-Release: 0.20060529cvs_1%{?dist}
+Release: 0.20060729cvs_1%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
@@ -9,53 +9,53 @@
# A cvs snapshot with the build and bouncycastle directories
# removed.
-Source0: azureus2-cvs-20060529.tar.bz2
+Source0: azureus2-cvs-20060702.tar.bz2
Source1: azureus.script
Source2: Azureus.desktop
Source3: azureus.applications
Source4: azureus-License.txt
-Source5: azplugins_1.8.8.jar
+Source5: azplugins_1.9.jar
Source6: bdcc_2.2.2.zip
Patch0: azureus-remove-win32-osx-platforms.patch
Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch
Patch2: azureus-cache-size.patch
Patch3: azureus-remove-manifest-classpath.patch
-Patch4: azureus-ConfigSectionPlugins-swt-3.1.patch
-Patch5: azureus-Messages-swt-3.1.patch
-Patch6: azureus-TableView-swt-3.1.patch
Patch7: azureus-themed.patch
Patch8: azureus-rh-bugzilla-180418.patch
Patch9: azureus-no-shared-plugins.patch
-Patch10: azureus-no-install-remove-plugins.patch
Patch11: azureus-no-restart.patch
Patch12: azureus-no-updates-PluginInitializer.patch
Patch13: azureus-no-updates-PluginInterfaceImpl.patch
Patch14: azureus-no-update-manager-AzureusCoreImpl.patch
Patch15: azureus-no-update-manager-CorePatchChecker.patch
Patch16: azureus-no-update-manager-CoreUpdateChecker.patch
-Patch17: azureus-no-update-manager-MainWindow.patch
+#Patch17: azureus-no-update-manager-MainWindow.patch
Patch18: azureus-no-update-manager-PluginInstallerImpl.patch
Patch19: azureus-no-update-manager-PluginUpdatePlugin.patch
Patch20: azureus-no-update-manager-SWTUpdateChecker.patch
-#Patch21: azureus-no-update-manager-TableView.patch
Patch22: azureus-no-update-manager-UpdateMonitor.patch
Patch23: azureus-no-update-manager-PluginInstallerImpl-2.patch
-Patch24: azureus-MessageSlideShell-swt-3.1.patch
Patch25: azureus-no-update-manager-MainStatusBar.patch
Patch26: azureus-nativetabs.patch
-#Patch27: azureus-debug3.patch
-#Patch28: azureus-debug4.patch
+Patch27: azureus-SecureMessageServiceClientHelper-bcprov.patch
+Patch28: azureus-UDPConnectionSet-bcprov.patch
+Patch29: azureus-CryptoHandlerECC-bcprov.patch
+Patch30: azureus-CryptoSTSEngineImpl-bcprov.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant, jpackage-utils >= 1.5, xml-commons-apis
-BuildRequires: jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
+BuildRequires: jakarta-commons-cli, log4j, gnu-crypto
BuildRequires: libgconf-java
-Requires: jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
+BuildRequires: bouncycastle >= 1.33-3
+BuildRequires: libswt3-gtk2 >= 3.2.0
+Requires: jakarta-commons-cli, log4j, gnu-crypto
+Requires: libswt3-gtk2 >= 3.2.0
Requires: libgconf-java
+Requires: bouncycastle >= 1.33-3
Requires: libgcj >= 4.1.0-0.15
BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
@@ -75,37 +75,38 @@
%patch1 -p0
%patch2 -p0
%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
%patch7 -p0
%patch8 -p0
%patch9 -p0
-%patch10 -p0
%patch11 -p0
%patch12 -p0
%patch13 -p0
%patch14 -p0
%patch15 -p0
%patch16 -p0
-#%patch17 -p0
%patch18 -p0
%patch19 -p0
%patch20 -p0
-#%patch21 -p0
%patch22 -p0
%patch23 -p0
-%patch24 -p0
%patch25 -p0
%patch26 -p0
-#%patch27 -p0
-#%patch28 -p0
+%patch27 -p0
+%patch28 -p0
+%patch29 -p0
+%patch30 -p0
cp %{SOURCE4} License.txt
%build
mkdir -p build/libs
-build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto gtk2.8 glib0.2
-ln -s /usr/share/java/gcj-endorsed/bcprov-1.31.jar build/libs
+#build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.2 log4j gnu-crypto gtk2.8 glib0.2
+ln -s /usr/share/java/jakarta-commons-cli.jar build/libs
+ln -s /usr/share/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.2.0.v3232m.jar build/libs
+ln -s /usr/share/java/log4j.jar build/libs
+ln -s /usr/share/java/gnu-crypto.jar build/libs
+ln -s /usr/share/java/gtk2.8.jar build/libs
+ln -s /usr/share/java/glib0.2.jar build/libs
+ln -s /usr/share/java/gcj-endorsed/bcprov-1.33.jar build/libs
find ./ -name osx | xargs rm -r
find ./ -name macosx | xargs rm -r
find ./ -name [Ww]in32\* | xargs rm -r
@@ -118,16 +119,18 @@
cd plugins/azplugins
unzip -q %{SOURCE5}
rm -f *.jar `find ./ -name \*class`
-find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.1.1`:../..:.
+#find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:.
+find ./ -name \*java | xargs javac -cp /usr/share/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.2.0.v3232m.jar:../..:.
find ./ -name \*java | xargs rm
-jar cvf azplugins_1.8.8.jar .
+jar cvf azplugins_1.9.jar .
cd ../..
unzip -q %{SOURCE6}
cd plugins/bdcc
unzip *.jar
rm -f *.jar `find ./ -name \*class`
-find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.1.1`:../..:.
+#find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:.
+find ./ -name \*java | xargs javac -cp /usr/share/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.2.0.v3232m.jar:../..:.
find ./ -name \*java | xargs rm
jar cvf bdcc_2.2.2.jar .
cd ../..
@@ -141,7 +144,7 @@
sed --in-place "s:/usr/lib:%{_libdir}:g" $RPM_BUILD_ROOT%{_bindir}/azureus
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins
-install -pm 644 plugins/azplugins/azplugins_1.8.8.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_1.8.8.jar
+install -pm 644 plugins/azplugins/azplugins_1.9.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_1.9.jar
install -pm 644 plugins/azplugins/plugin.properties $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/plugin.properties
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/bdcc
@@ -171,6 +174,7 @@
%{__sed} -i 's/\r//' ChangeLog.txt
chmod 644 *.txt
+#RPM_OPT_FLAGS="-O0" aot-compile-rpm
aot-compile-rpm
%clean
@@ -208,6 +212,30 @@
%{_libdir}/gcj/*
%changelog
+* Sat Jul 29 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060729cvs_1
+- Update to latest development sources. New release official upstream is soon.
+- Turn optimization back on. gcc has been fixed.
+
+* Tue Jul 18 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060702cvs_3
+- Work around swt installation problem.
+
+* Sat Jul 8 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060702cvs_2
+- Updated sources.
+- Build against swt 3.2. Update startup script. Remove swt 3.1.1 patches.
+- Build against bouncycastle 1.33 package. Add the following patches to work
+ with bouncycastle 1.33 out of the box:
+ azureus-SecureMessageServiceClientHelper-bcprov.patch,
+ azureus-UDPConnectionSet-bcprov.patch, azureus-CryptoHandlerECC-bcprov.patch,
+ azureus-CryptoSTSEngineImpl-bcprov.patch
+- Build with -O0 to avoid gcc bugzilla 19505.
+
+* Sun Jul 2 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060702cvs_1
+- Updated sources.
+
+* Sun Jun 4 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060604cvs_1
+- Updated sources.
+- Update azplugins jar file.
+
* Wed May 29 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060529cvs_1
- Updated sources.
- Re-enable close button on tabs in nativetabs patch.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 29 May 2006 16:02:45 -0000 1.6
+++ sources 30 Jul 2006 18:56:22 -0000 1.7
@@ -1,3 +1,3 @@
-086cf7f988efd91064b6da5ab78469a8 azureus2-cvs-20060529.tar.bz2
+d14e3c7b7d608697986dd030c51609bc azureus2-cvs-20060729.tar.bz2
0e88c3952b36ba221e277420a7080b43 bdcc_2.2.2.zip
-28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar
+7879202464bf4145f7d4848fb5f0e04f azplugins_1.9.jar
--- azureus-ConfigSectionPlugins-swt-3.1.patch DELETED ---
--- azureus-ConfigurationManager-improvement.patch DELETED ---
--- azureus-GKR.patch DELETED ---
--- azureus-MessageSlideShell-swt-3.1.patch DELETED ---
--- azureus-Messages-swt-3.1.patch DELETED ---
--- azureus-TableView-swt-3.1.patch DELETED ---
--- azureus-base64.patch DELETED ---
--- azureus-java.beans.XMLEncoder.patch DELETED ---
--- azureus-jessie.patch DELETED ---
--- azureus-no-bouncycastle.patch DELETED ---
--- azureus-no-install-remove-plugins.patch DELETED ---
--- azureus-no-shared-plugins2.patch DELETED ---
--- azureus-no-update-manager-TableView.patch DELETED ---
--- azureus-sun.misc.Cleaner.patch DELETED ---
--- azureus-sun.misc.Signal.patch DELETED ---
More information about the fedora-extras-commits
mailing list