[azureus] 06/08: Updated patches to remove commons lang and bouncy castle bundling

[Stephen Nelson]

This is an automated email from the git hooks/post-receive script.

stephenonelson-guest pushed a commit to branch vuze5.6
in repository azureus.

commit c21996f96aa2e971c3fb923cfd7888b42fe4646d
Author: Stephen Nelson <stephen at eccostudio.com>
Date:   Fri Jul 31 21:51:31 2015 +0100

    Updated patches to remove commons lang and bouncy castle bundling
---
 debian/patches/05_unbundle_commons_lang.patch  | 44 ++++++++++++++++++++++++++
 debian/patches/06_unbundle_bouncy_castle.patch | 19 +++++++++++
 2 files changed, 63 insertions(+)

diff --git a/debian/patches/05_unbundle_commons_lang.patch b/debian/patches/05_unbundle_commons_lang.patch
index e046c29..977404b 100644
--- a/debian/patches/05_unbundle_commons_lang.patch
+++ b/debian/patches/05_unbundle_commons_lang.patch
@@ -134,3 +134,47 @@
  		<!--<fileset dir="${azureus2.dir}/lib" includes="*.jar" excludes="swt-carbon.jar"/>
  		<fileset dir="${azureus3.dir}/lib" includes="*.jar" />
  		<fileset dir="${uis.dir}/lib" includes="*.jar" />-->
+--- a/azureus2/src/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
++++ b/azureus2/src/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
+@@ -25,7 +25,6 @@
+ import javax.xml.parsers.*;
+ 
+ import org.xml.sax.*;
+-import org.apache.commons.lang.Entities;
+ import org.gudy.azureus2.core3.util.AENetworkClassifier;
+ import org.gudy.azureus2.core3.util.Constants;
+ import org.gudy.azureus2.core3.util.Debug;
+@@ -642,32 +641,7 @@
+ 		     				
+ 		     				buffer[ buffer_pos++ ] = (char)b;
+ 		     				
+-		     				String	ref = new String( buffer, 1, buffer_pos-2 ).toLowerCase( Locale.US );
+-		     				
+-		     				String	replacement;
+-		     				
+-		     				if ( 	ref.equals( "amp") 		|| 
+-		     						ref.equals( "lt" ) 		|| 
+-		     						ref.equals( "gt" ) 		|| 
+-		     						ref.equals( "quot" )	|| 
+-		     						ref.equals( "apos" ) 	||
+-		     						ref.startsWith( "#" )){
+-		     					
+-		     					replacement = new String( buffer, 0, buffer_pos );
+-		     					
+-		     				}else{
+-		     							     							     					
+-			     				int num = Entities.HTML40.entityValue( ref );
+-			     					
+-		     					if ( num != -1 ){
+-		     					
+-		     						replacement = "&#" + num + ";";
+-		     						
+-		     					}else{
+-		     						
+-		     						replacement = new String( buffer, 0, buffer_pos );
+-		     					}
+-		     				}
++		     				String	replacement = new String( buffer, 0, buffer_pos );
+ 		     				
+ 		     				char[] chars = replacement.toCharArray();
+ 		     				
diff --git a/debian/patches/06_unbundle_bouncy_castle.patch b/debian/patches/06_unbundle_bouncy_castle.patch
index f76921e..a0ded59 100644
--- a/debian/patches/06_unbundle_bouncy_castle.patch
+++ b/debian/patches/06_unbundle_bouncy_castle.patch
@@ -235,3 +235,22 @@
 -	}
  }
 +
+--- a/azureus2/src/org/gudy/azureus2/core3/util/AddressUtils.java
++++ b/azureus2/src/org/gudy/azureus2/core3/util/AddressUtils.java
+@@ -525,12 +525,12 @@
+ 			
+ 			try{
+ 					// unfortunately we have an incompatible base64 standard in i2p, they replaced / with ~ and + with -
+-				
+-				char[]	encoded = to_decode.toCharArray();
++
++				byte[]	encoded = to_decode.getBytes();
+ 				
+ 				for ( int i=0;i<encoded.length;i++){
+-					
+-					char c = encoded[i];
++
++					byte c = encoded[i];
+ 					
+ 					if ( c == '~' ){
+ 						encoded[i] = '/';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/azureus.git