From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- .../vuze/files/vuze-5.3.0.0-unbundle-commons.patch | 110 --------------------- .../files/vuze-5.6.0.0-invalid-characters.patch | 26 ----- 2 files changed, 136 deletions(-) delete mode 100644 net-p2p/vuze/files/vuze-5.3.0.0-unbundle-commons.patch delete mode 100644 net-p2p/vuze/files/vuze-5.6.0.0-invalid-characters.patch (limited to 'net-p2p/vuze/files') diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-commons.patch b/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-commons.patch deleted file mode 100644 index deed0af9c7b2..000000000000 --- a/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-commons.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/com/aelitis/azureus/core/metasearch/Result.java -+++ b/com/aelitis/azureus/core/metasearch/Result.java -@@ -27,7 +27,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.DisplayFormatters; - import org.json.simple.JSONObject; - -@@ -372,6 +372,6 @@ public abstract class Result { - if ( input == null ){ - return( null ); - } -- return( Entities.HTML40.unescape( input )); -+ return( StringEscapeUtils.unescapeHtml( input )); - } - } ---- a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java -+++ b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java -@@ -88,14 +88,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{ -@@ -108,7 +108,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) { -@@ -133,7 +133,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 { -@@ -148,7 +148,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 { -@@ -163,7 +163,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 { -@@ -230,7 +230,7 @@ public class WebResult extends Result { - public void setPublishedDateFromHTML(String publishedDate) { - if(publishedDate != null) { - 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); - } - } -@@ -239,7 +239,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"); -@@ -285,7 +285,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 { -@@ -299,7 +299,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 { diff --git a/net-p2p/vuze/files/vuze-5.6.0.0-invalid-characters.patch b/net-p2p/vuze/files/vuze-5.6.0.0-invalid-characters.patch deleted file mode 100644 index ee3b07047eca..000000000000 --- a/net-p2p/vuze/files/vuze-5.6.0.0-invalid-characters.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java b/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java -index 34e898c..2e5bcaa 100644 ---- a/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java -+++ b/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java -@@ -49,17 +49,17 @@ public class DateParserRegex extends DateParser { - - private static final String[] MONTHS_LIST = new String[] { - " january janvier enero januar", -- " february fevrier f�vrier febrero februar", -- " march mars marzo marz marz m�rz" , -+ " february fevrier febrero februar", -+ " march mars marzo marz marz", - " april avril abril april ", - " may mai mayo mai", - " june juin junio juni", - " july juillet julio juli", -- " august aout ao�t agosto august", -+ " august aout agosto august", - " september septembre septiembre september", - " october octobre octubre oktober", - " november novembre noviembre november", -- " december decembre d�cembre diciembre dezember"}; -+ " december decembre diciembre dezember"}; - - public DateParserRegex() { - this("GMT-7",true,null); -- cgit v1.2.3