From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- net-p2p/vuze/Manifest | 4 +- net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch | 174 +++++++++++++++++++++ net-p2p/vuze/vuze-5.7.6.0-r1.ebuild | 144 +++++++++++++++++ net-p2p/vuze/vuze-5.7.6.0.ebuild | 4 +- 4 files changed, 323 insertions(+), 3 deletions(-) create mode 100644 net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch create mode 100644 net-p2p/vuze/vuze-5.7.6.0-r1.ebuild (limited to 'net-p2p/vuze') diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest index 2eb2a71ebf3a..c4346b89fb5e 100644 --- a/net-p2p/vuze/Manifest +++ b/net-p2p/vuze/Manifest @@ -7,8 +7,10 @@ AUX vuze-5.3.0.0-remove-classpath.patch 545 BLAKE2B 52a33a81cf3803fa6f0f8e10b89b AUX vuze-5.3.0.0-unbundle-json.patch 1322 BLAKE2B fc387740073933b9f99474dd2ac5e7ed8978e387ed5b903c7489d41684a6eafc44f4c85b7453d275988ad0105457966064b718e229cf8485d9fe4bb454062bb8 SHA512 60b8dc8216f5f51a4cb6c6b793d1b31b686f63d03e373741d76856a594468fa5c97781fc99fc9af30f2db8173bb86414cd52cb30ea7ebeac5a018633f661ce26 AUX vuze-5.6.0.0-commons-lang-entities.patch 2085 BLAKE2B 547ab6aa8e964280f72bc161775c4eaec5371c06d8e98629013068d3d69b160f8cac36377a14811ad714cc011f3293d7c82dd873d2bbed536110ab4b4d6fd016 SHA512 a08d23a1947ad668048f49c8137d4494da662d65f5cf98acd5e44656f7d6a2bf691eebba4fd8033996594d1c4edc1a2eec3ce3f92d23b1818c03b405fc081899 AUX vuze-5.7.2.0-disable-osx.patch 2278 BLAKE2B 760b82f75b310d01b94891a3c1528fe48200e7c8fdc04baecb18965316e3ffb347c9b131540f7a30061751fd1b449d924536f9d8f77bde7743c88579b33e9be5 SHA512 39797193297d61c1e91bfdcbf6e4fa6acb523c067ac96a0de99d5f79fab69b327688f87f8c8f24c0d7967c4c1017bde478ecc10aa117f96f0b891dc10a21420a +AUX vuze-5.7.6.0-commons-lang.patch 7613 BLAKE2B 00df394b0dddd442b693251d29a3bfd5c647e20b47bd94e1c5bf07267d0bee66f98c1ede2f2d070526f6829211755343184e25ee2e78c46100f5f866340571f2 SHA512 bc44e26d3ae93891e01023b2afe614c680caada24398459efa6640295b9bd9e0cc7e734c42364bac21082ec827c54f12d818b19db4ea20ff6b3046c145ffb998 AUX vuze-5.7.6.0-unbundle-commons.patch 5156 BLAKE2B 641a0264521e97d808046a9d76cb362302dd25679a6e8df6878646d59f04b1a6cc0ab1fd7e83d8f76cb7250b9b2fbd64cf1efbbbc4eb14a0432f2eceea3c22c7 SHA512 f4c5082b618a2feb9c19bb1ddc53e7a61f1511d804488ce279e3c3174fc185d93d31316de58d185e3f6a6f19af11d587c9b11c4361c3f07622c11843eff6b51c AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480 DIST Vuze_5760_source.zip 10928786 BLAKE2B df8bbb797f2a1b0c92bc19be122a0da3b6382dc80f51bb652026e3d68503d19ddb3b16e3bc6c333f12c8bfa52b014f85b0812fd5683fe4553040feff39ab77d8 SHA512 c4c1cc84d3c8ce31772bd677f105f6d00e0a6d867d6890b6a834c9e189bb1752e065a64308cdf1315bace1ca4783843553b45fbf3c15240c57584e2926ba92c5 -EBUILD vuze-5.7.6.0.ebuild 4107 BLAKE2B dea72150fc73f0bcc623218d4af88c87317901c56917b4135332672aadd553724e947344ca147fee312043072b3edf91efe4b0ff62b2d192299fb4876ee32867 SHA512 7166554a864d0aa7b7a77d596e0045695acc55a1d8cb7ec36f720d75b0bb8a0c462a8623ceec3c4f75ac3b1b7d8c45cae7c56d79630c2bc99097d708dd8e2d08 +EBUILD vuze-5.7.6.0-r1.ebuild 4064 BLAKE2B 73e9da24605ee260faf1bab6d3de3ba11a30bbc00f82a0173d870d5a17964731735425dcff517c80b4d8d2f40339d516818847dbbc1d206176f7c60023bc653f SHA512 bfe3e7eb47859dd413f41ebf8d49c23f33733eac58584a6a926db1f925f1e3eb43dda3419ae3115a905f89d2bed4486e245bc6d18dc13167f69e279125883665 +EBUILD vuze-5.7.6.0.ebuild 4110 BLAKE2B d2318a6f7b57f629ac3211256b24475012133c9ac102020d88ac0681af93d7d746cf317e07709f1f328f8a72cf4ffc852677424e0ffb1cafa367019cd147602a SHA512 de63a2b00b95cc31f25e20dde85791721fcfee763fa491ec2c973b5d1a496d3327233bf3839afe41e3f11836b4943e97cfa23f6828f8f0d6c82c9b1fe58c5f3d MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1 diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch b/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch new file mode 100644 index 000000000000..a03995d167a6 --- /dev/null +++ b/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch @@ -0,0 +1,174 @@ +diff --git a/com/aelitis/azureus/core/metasearch/Result.java b/com/aelitis/azureus/core/metasearch/Result.java +index bec05e1..9588f9a 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.text.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.unescapeHtml4( 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..e03916b 100644 +--- a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java ++++ b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java +@@ -22,7 +22,7 @@ package com.aelitis.azureus.core.metasearch.impl.web; + import java.util.Date; + import java.util.StringTokenizer; + +-import org.apache.commons.lang.*; ++import org.apache.commons.text.StringEscapeUtils; + import org.gudy.azureus2.core3.util.Base32; + import org.gudy.azureus2.core3.util.ByteFormatter; + import org.gudy.azureus2.core3.util.Debug; +@@ -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.unescapeHtml4(name); + } + } + + public void setCommentsFromHTML(String comments) { + if(comments != null) { + comments = removeHTMLTags(comments); +- comments = Entities.HTML40.unescape(comments); ++ comments = StringEscapeUtils.unescapeHtml4(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.unescapeHtml4(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.unescapeHtml4(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.unescapeHtml4(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.unescapeHtml4(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.unescapeHtml4(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.unescapeHtml4(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.unescapeHtml4(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.unescapeHtml4(votes_str); + votes_str = votes_str.replaceAll(",", ""); + votes_str = votes_str.replaceAll(" ", ""); + try { +diff --git a/org/gudy/azureus2/core3/util/AddressUtils.java b/org/gudy/azureus2/core3/util/AddressUtils.java +index 2558313..8cafd8a 100644 +--- a/org/gudy/azureus2/core3/util/AddressUtils.java ++++ b/org/gudy/azureus2/core3/util/AddressUtils.java +@@ -592,11 +592,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