From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 15 Jun 2021 14:57:03 +0100
Subject: gentoo resync : 15.06.2021

---
 .../files/vuze-5.6.0.0-commons-lang-entities.patch |  51 ---------
 .../vuze/files/vuze-5.7.6.0-unbundle-commons.patch | 114 ---------------------
 2 files changed, 165 deletions(-)
 delete mode 100644 net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch
 delete mode 100644 net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch

(limited to 'net-p2p/vuze/files')

diff --git a/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch b/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch
deleted file mode 100644
index c58d475995ee..000000000000
--- a/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/org/gudy/azureus2/core3/util/AddressUtils.java b/org/gudy/azureus2/core3/util/AddressUtils.java
-index 6691951..38f14ee 100644
---- a/org/gudy/azureus2/core3/util/AddressUtils.java
-+++ b/org/gudy/azureus2/core3/util/AddressUtils.java
-@@ -494,11 +494,11 @@ AddressUtils
- 			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] = '/';
-diff --git a/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java b/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-index a67a8a2..da4a46c 100644
---- a/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-+++ b/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-@@ -25,7 +25,7 @@ package org.gudy.azureus2.pluginsimpl.local.utils.xml.simpleparser;
- import javax.xml.parsers.*;
- 
- import org.xml.sax.*;
--import org.apache.commons.lang.Entities;
-+import org.apache.commons.lang.StringEscapeUtils;
- import org.gudy.azureus2.core3.util.AENetworkClassifier;
- import org.gudy.azureus2.core3.util.Constants;
- import org.gudy.azureus2.core3.util.Debug;
-@@ -656,17 +656,8 @@ SimpleXMLParserDocumentImpl
- 		     					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 );
--		     					}
-+
-+								replacement = StringEscapeUtils.escapeHtml(ref);
- 		     				}
- 		     				
- 		     				char[] chars = replacement.toCharArray();
diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch b/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch
deleted file mode 100644
index d8643dbe680f..000000000000
--- a/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff --git a/com/aelitis/azureus/core/metasearch/Result.java b/com/aelitis/azureus/core/metasearch/Result.java
-index bec05e1..9481f86 100644
---- a/com/aelitis/azureus/core/metasearch/Result.java
-+++ b/com/aelitis/azureus/core/metasearch/Result.java
-@@ -28,7 +28,7 @@ import java.util.Locale;
- import java.util.Map;
- import java.util.Random;
- 
--import org.apache.commons.lang.Entities;
-+import org.apache.commons.lang.StringEscapeUtils;
- import org.gudy.azureus2.core3.util.AENetworkClassifier;
- import org.gudy.azureus2.core3.util.DisplayFormatters;
- import org.gudy.azureus2.core3.util.HostNameToIPResolver;
-@@ -464,6 +464,6 @@ public abstract class Result {
- 		if ( input == null ){
- 			return( null );
- 		}
--		return( Entities.HTML40.unescape( input ));
-+		return( StringEscapeUtils.unescapeHtml( input ));
- 	}
- }
-diff --git a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-index 2d353b8..8ebf9ff 100644
---- a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-+++ b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-@@ -87,14 +87,14 @@ public class WebResult extends Result {
- 	public void setNameFromHTML(String name) {
- 		if(name != null) {
- 			name = removeHTMLTags(name);
--			this.name = Entities.HTML40.unescape(name);
-+			this.name = StringEscapeUtils.unescapeHtml(name);
- 		}
- 	}
- 	
- 	public void setCommentsFromHTML(String comments) {
- 		if(comments != null) {
- 			comments = removeHTMLTags(comments);
--			comments = Entities.HTML40.unescape(comments);
-+			comments = StringEscapeUtils.unescapeHtml(comments);
- 			comments = comments.replaceAll(",", "");
- 			comments = comments.replaceAll(" ", "");
- 			try{
-@@ -107,7 +107,7 @@ public class WebResult extends Result {
- 	public void setCategoryFromHTML(String category) {
- 		if(category != null) {
- 			category = removeHTMLTags(category);
--			this.category = Entities.HTML40.unescape(category).trim();
-+			this.category = StringEscapeUtils.unescapeHtml(category).trim();
- 			/*int separator = this.category.indexOf(">");
- 			
- 			if(separator != -1) {
-@@ -136,7 +136,7 @@ public class WebResult extends Result {
- 	public void setNbPeersFromHTML(String nbPeers) {
- 		if(nbPeers != null) {
- 			nbPeers = removeHTMLTags(nbPeers);
--			String nbPeersS = Entities.HTML40.unescape(nbPeers);
-+			String nbPeersS = StringEscapeUtils.unescapeHtml(nbPeers);
- 			nbPeersS = nbPeersS.replaceAll(",", "");
- 			nbPeersS = nbPeersS.replaceAll(" ", "");
- 			try {
-@@ -151,7 +151,7 @@ public class WebResult extends Result {
- 	public void setNbSeedsFromHTML(String nbSeeds) {
- 		if(nbSeeds != null) {
- 			nbSeeds = removeHTMLTags(nbSeeds);
--			String nbSeedsS = Entities.HTML40.unescape(nbSeeds);
-+			String nbSeedsS = StringEscapeUtils.unescapeHtml(nbSeeds);
- 			nbSeedsS = nbSeedsS.replaceAll(",", "");
- 			nbSeedsS = nbSeedsS.replaceAll(" ", "");
- 			try {
-@@ -166,7 +166,7 @@ public class WebResult extends Result {
- 	public void setNbSuperSeedsFromHTML(String nbSuperSeeds) {
- 		if(nbSuperSeeds != null) {
- 			nbSuperSeeds = removeHTMLTags(nbSuperSeeds);
--			String nbSuperSeedsS = Entities.HTML40.unescape(nbSuperSeeds);
-+			String nbSuperSeedsS = StringEscapeUtils.unescapeHtml(nbSuperSeeds);
- 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(",", "");
- 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(" ", "");
- 			try {
-@@ -248,7 +248,7 @@ public class WebResult extends Result {
- 	public void setPublishedDateFromHTML(String publishedDate) {
- 		if(publishedDate != null && publishedDate.length() > 0) {
- 			publishedDate = removeHTMLTags(publishedDate);
--			String publishedDateS = Entities.HTML40.unescape(publishedDate).replace((char)160,(char)32);
-+			String publishedDateS = StringEscapeUtils.unescapeHtml(publishedDate).replace((char)160,(char)32);
- 			this.publishedDate = dateParser.parseDate(publishedDateS);
- 		}
- 	}
-@@ -257,7 +257,7 @@ public class WebResult extends Result {
- 	public void setSizeFromHTML(String size) {
- 		if(size != null) {
- 			size = removeHTMLTags(size);
--			String sizeS = Entities.HTML40.unescape(size).replace((char)160,(char)32);
-+			String sizeS = StringEscapeUtils.unescapeHtml(size).replace((char)160,(char)32);
- 			sizeS = sizeS.replaceAll("<[^>]+>", " ");
- 			//Add a space between the digits and unit if there is none
- 			sizeS = sizeS.replaceFirst("(\\d)([a-zA-Z])", "$1 $2");
-@@ -303,7 +303,7 @@ public class WebResult extends Result {
- 	public void setVotesFromHTML(String votes_str) {
- 		if(votes_str != null) {
- 			votes_str = removeHTMLTags(votes_str);
--			votes_str = Entities.HTML40.unescape(votes_str);
-+			votes_str = StringEscapeUtils.unescapeHtml(votes_str);
- 			votes_str = votes_str.replaceAll(",", "");
- 			votes_str = votes_str.replaceAll(" ", "");
- 			try {
-@@ -317,7 +317,7 @@ public class WebResult extends Result {
- 	public void setVotesDownFromHTML(String votes_str) {
- 		if(votes_str != null) {
- 			votes_str = removeHTMLTags(votes_str);
--			votes_str = Entities.HTML40.unescape(votes_str);
-+			votes_str = StringEscapeUtils.unescapeHtml(votes_str);
- 			votes_str = votes_str.replaceAll(",", "");
- 			votes_str = votes_str.replaceAll(" ", "");
- 			try {
-- 
cgit v1.2.3