diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2009-03-27 22:02:15 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2009-03-27 22:02:15 +0000 |
| commit | e5dcf39e096b6239317cd0fe5b53e44eb28f601a (patch) | |
| tree | ea05cbe35874dfafd24b6ded89ec40bcb5e68935 /net-p2p/vuze | |
| parent | Stable for HPPA (bug #258040). (diff) | |
| download | gentoo-2-e5dcf39e096b6239317cd0fe5b53e44eb28f601a.tar.gz gentoo-2-e5dcf39e096b6239317cd0fe5b53e44eb28f601a.tar.bz2 gentoo-2-e5dcf39e096b6239317cd0fe5b53e44eb28f601a.zip | |
Add missing patches
(Portage version: 2.2_rc27/cvs/Linux x86_64)
Diffstat (limited to 'net-p2p/vuze')
| -rw-r--r-- | net-p2p/vuze/ChangeLog | 7 | ||||
| -rw-r--r-- | net-p2p/vuze/files/patches-4.2.0.0/0001-remove-osx-platform.patch | 29 | ||||
| -rw-r--r-- | net-p2p/vuze/files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch | 46 |
3 files changed, 81 insertions, 1 deletions
diff --git a/net-p2p/vuze/ChangeLog b/net-p2p/vuze/ChangeLog index 853402f27ad6..deddc6f4270a 100644 --- a/net-p2p/vuze/ChangeLog +++ b/net-p2p/vuze/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-p2p/vuze # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.9 2009/03/27 19:39:41 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.10 2009/03/27 22:02:15 caster Exp $ + + 27 Mar 2009; Vlastimil Babka <caster@gentoo.org> + +files/patches-4.2.0.0/0001-remove-osx-platform.patch, + +files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch: + Add missing patches. *vuze-4.2.0.0 (19 Mar 2009) diff --git a/net-p2p/vuze/files/patches-4.2.0.0/0001-remove-osx-platform.patch b/net-p2p/vuze/files/patches-4.2.0.0/0001-remove-osx-platform.patch new file mode 100644 index 000000000000..4a8388bdb628 --- /dev/null +++ b/net-p2p/vuze/files/patches-4.2.0.0/0001-remove-osx-platform.patch @@ -0,0 +1,29 @@ +diff --git a/org/gudy/azureus2/platform/PlatformManagerFactory.java b/org/gudy/azureus2/platform/PlatformManagerFactory.java +index 156e5ac..b0fd283 100644 +--- a/org/gudy/azureus2/platform/PlatformManagerFactory.java ++++ b/org/gudy/azureus2/platform/PlatformManagerFactory.java +@@ -50,10 +50,6 @@ PlatformManagerFactory + + platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton(); + +- }else if( getPlatformType() == PlatformManager.PT_MACOSX ){ +- +- platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton(); +- + }else if( getPlatformType() == PlatformManager.PT_UNIX ){ + + platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton(); +@@ -89,10 +85,6 @@ PlatformManagerFactory + + return (PlatformManager.PT_WINDOWS ); + +- } else if (Constants.isOSX) { +- +- return (PlatformManager.PT_MACOSX ); +- + } else if (Constants.isUnix) { + + return (PlatformManager.PT_UNIX ); +-- +1.6.2 + diff --git a/net-p2p/vuze/files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch b/net-p2p/vuze/files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch new file mode 100644 index 000000000000..7a57e53dee11 --- /dev/null +++ b/net-p2p/vuze/files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch @@ -0,0 +1,46 @@ +diff --git a/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java b/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java +index f4e1754..80d931f 100644 +--- a/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java ++++ b/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java +@@ -36,7 +36,6 @@ import org.bouncycastle.crypto.CipherParameters; + 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.core3.util.RandomUtils; + import org.gudy.azureus2.plugins.utils.StaticUtilities; +@@ -83,30 +82,12 @@ SecureMessageServiceClientHelper + + 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, RandomUtils.SECURE_RANDOM); +- +- padded_eng.init( true, param ); +- +- encryped_session_key = padded_eng.processBlock(secret_bytes, 0, secret_bytes.length); +- } +- + }catch( Throwable e ){ + + e.printStackTrace(); +-- +1.6.2 + |