Add missing patches

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

4 files changed, 82 insertions, 2 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/Manifest b/net-p2p/vuze/Manifest
index 2c8a0013b4c8..c8c4fee23f24 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -27,5 +27,5 @@ EBUILD vuze-3.0.4.2-r1.ebuild 4973 RMD160 38796aa1607f29adc023a53440a9312888c76d
 EBUILD vuze-4.0.0.4.ebuild 5305 RMD160 fdd0bf888f8416f4248043f6d4ad83b8b50b16f9 SHA1 8eb41d93e913b025ab3e1d30f5ee97181fad533f SHA256 4c4557aecca620878356e28a110a11faf3f02c215efa12d39c3c6275f4effa38
 EBUILD vuze-4.1.0.4.ebuild 4587 RMD160 85e0135b04ff9631a9eea0c843ba6c3834718f71 SHA1 22f7e251184ebc4e0c7b66f6c5635e352163d809 SHA256 5b50a091e5a42dfaeaa68a4721e955fc83c1f411a05d3a7a5ad3ba3bc2a0c853
 EBUILD vuze-4.2.0.0.ebuild 4526 RMD160 8fbaaa46285e625718eeb129d109e84e8007f944 SHA1 a759a933e96497349e68be0b921e186b0c731771 SHA256 d1464a72f1a45eb5adf540e825c155887c4ceacf84bcc686a32761dcb117dbb2
-MISC ChangeLog 18168 RMD160 8c503d18b6be7d5eb9fbc1529b7e136a7702632e SHA1 7a3d18601b818fbe622f56e8781c81f8538f30d7 SHA256 8b74291512744c904ba5adb02520707b0978fef28954b478aa9f9e220f143a85
+MISC ChangeLog 18358 RMD160 7311f5e130fbafbe38536026f802b122a1943572 SHA1 7d6c5c0bf03844a5370988f15bf9876333c0b35d SHA256 cb7204eea28a6aef3cb19c35a3934d1f3fd61979fcb821449833bfa25cfd7f11
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
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
+