diff options
Diffstat (limited to 'net-p2p/vuze')
| -rw-r--r-- | net-p2p/vuze/Manifest | 5 | ||||
| -rw-r--r-- | net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch | 51 | ||||
| -rw-r--r-- | net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch | 114 | ||||
| -rw-r--r-- | net-p2p/vuze/vuze-5.7.6.0-r1.ebuild | 2 | ||||
| -rw-r--r-- | net-p2p/vuze/vuze-5.7.6.0.ebuild | 145 |
5 files changed, 2 insertions, 315 deletions
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest index ef37fae032c4..f251b438bdf8 100644 --- a/net-p2p/vuze/Manifest +++ b/net-p2p/vuze/Manifest @@ -5,13 +5,10 @@ AUX vuze-5.3.0.0-disable-updaters.patch 1726 BLAKE2B 8a1d7ec1196ee27019f513d5129 AUX vuze-5.3.0.0-java5.patch 618 BLAKE2B d939b9708bc4fa2902d1b5f78ceb4d707ff59e421cc9b2308178d57e78dede189eeb0723bea8ac22a3b6502f59533f72a1207be59e36cca7c568d2e0c52ce120 SHA512 0ecddf69a7fdd72860262cc73dd4a0852ba8e31d73dfc7ad1d96ad18eaa41ec23ca977207d6bff32e183d95c1a6918909ef3cab697d0c9d754345613544eb90c AUX vuze-5.3.0.0-remove-classpath.patch 545 BLAKE2B 52a33a81cf3803fa6f0f8e10b89b255c4e72cee2606c88abbc8c8566087d816fa0d8c951631cafb77f49c43ecc6edb78e4a083112dfc21c6df141218fb78d7be SHA512 867e932eab1f33af6a8320cbe1f1cf565b68f39c6e1c0188dada018de4b50823047a7e9a53d558c00fe2253c48e4e6276e7725681b33a115de694c43265cf42c 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-r1.ebuild 4071 BLAKE2B 672f71c9acfdb81cc985a6fba4b35d109d0ac763d091180509156bacb3f1e3c722907b4e8ed587421579a7d3c21e5c30f7636386c8d3a8f188ddd119948904a2 SHA512 845b94ea88e08ba71b70368902d285f5eec8c889a149954b49c5bac650cc446ff441e767e12a1200a0e31894f551b7865c4eb8624adcbe3e7921b1a9763c0226 +EBUILD vuze-5.7.6.0-r1.ebuild 4068 BLAKE2B 1df51a38b5663a9869e2f572341cc0e7ddddfe5544ce659ea5f7419921349e83663f62fa52dfc3f3b72d6047b03a5e7975c583de619d765de1467e0d7810f2b1 SHA512 3d31e3b0bb898524720a4807762bbb17df573f0f6886ed5dd930c6a3be22f064355d86f09c6d4ff0dba7b0a08ca32bf53508799eff15a0e5cd9a4a2c8f02adb4 EBUILD vuze-5.7.6.0-r2.ebuild 4068 BLAKE2B cc886730154ee78f0a29f3e92dc989a6ab2e25bebe9ac1ffe18b24dc1118289152b573620ecc3bd6f0e044dc18c706cb7346d5a019f8db78eeee30e7e81fb546 SHA512 d9b7faa5b51d359fce3a5812ceb9c3c6069bc8952d684bf0f58e72b119bb2e7682d3ec5d4ed7485fa83ef75cbbf281e8e0e546de5f5b8a4041155233ccde1266 -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.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 { diff --git a/net-p2p/vuze/vuze-5.7.6.0-r1.ebuild b/net-p2p/vuze/vuze-5.7.6.0-r1.ebuild index fbae93cfb12f..a26544780ba1 100644 --- a/net-p2p/vuze/vuze-5.7.6.0-r1.ebuild +++ b/net-p2p/vuze/vuze-5.7.6.0-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip" LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ppc64 x86" # bundles parts of http://www.programmers-friend.org/ # bundles bcprov - 1.37 required but not in the tree diff --git a/net-p2p/vuze/vuze-5.7.6.0.ebuild b/net-p2p/vuze/vuze-5.7.6.0.ebuild deleted file mode 100644 index c6c1b2348292..000000000000 --- a/net-p2p/vuze/vuze-5.7.6.0.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="source" - -inherit desktop edos2unix java-pkg-2 java-ant-2 xdg-utils - -MY_PV=$(ver_rs 1- "") -MY_SRC="Vuze_${MY_PV}" - -DESCRIPTION="BitTorrent client in Java, formerly called Azureus" -HOMEPAGE="http://www.vuze.com/" -SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip" -LICENSE="GPL-2 BSD" - -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -# bundles parts of http://www.programmers-friend.org/ -# bundles bcprov - 1.37 required but not in the tree -CDEPEND=" - dev-java/log4j:0 - dev-java/swt:3.8[cairo] - dev-java/commons-cli:1 - dev-java/json-simple:0 - dev-java/commons-lang:2.1" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8" - -DEPEND=" - ${CDEPEND} - app-arch/unzip - dev-util/desktop-file-utils - >=virtual/jdk-1.8" - -PDEPEND="~net-p2p/vuze-coreplugins-${PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.3.0.0-java5.patch - "${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch - "${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch - "${FILESDIR}"/${PN}-5.7.2.0-disable-osx.patch - "${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch - "${FILESDIR}"/${P}-unbundle-commons.patch - "${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch - "${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch -# "${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov -) - -src_unpack() { - mkdir -p "${S}" || die - cd "${S}" || die - unpack ${A} - - # build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4 - if [[ -f build.xml ]]; then - die "upstream has build.xml again, don't overwrite" - fi - cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml" -} - -src_prepare() { - # upstream likes randomly changing a subset of files to CRLF every release - edos2unix $(find "${S}" -type f -name "*.java") - - default - - # OSX / Windows - rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java || die - rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java || die - rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die - - # Tree2 file does not compile on linux - rm -rf "${S}"/org/eclipse || die - # Bundled apache - rm -rf "${S}"/org/apache || die - # Bundled json - rm -rf "${S}"/org/json || die - # Bundled bcprov - # currently disabled - requires bcprov 1.37 - #rm -rf "${S}"/org/bouncycastle || die - - rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die - mkdir -p "${S}"/build/libs || die -} - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1" - -src_compile() { - local mem - use amd64 && mem="320" - use x86 && mem="256" - use ppc && mem="192" - use ppc64 && mem="256" - use sparc && mem="320" - export ANT_OPTS="-Xmx${mem}m" - java-pkg-2_src_compile - - # bug #302058 - build.xml excludes .txt but upstream jar has it... - jar uf dist/Azureus2.jar ChangeLog.txt || die -} - -src_install() { - java-pkg_dojar dist/Azureus2.jar - dodoc ChangeLog.txt - - java-pkg_dolauncher "${PN}" \ - --main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \ - --java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \ - --pkg_args '--ui=${UI}' - dosym vuze /usr/bin/azureus - - # https://bugs.gentoo.org/show_bug.cgi?id=204132 - java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins - - newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png - domenu "${FILESDIR}"/${PN}.desktop - - use source && java-pkg_dosrc "${S}"/{com,edu,org} -} - -pkg_postinst() { - ewarn "Running Vuze as root is not supported and may result in untracked" - ewarn "updates to shared components and then collisions on updates" - echo - elog "Vuze was formerly called Azureus and many references to the old name remain." - elog - elog "After running Vuze for the first time, configuration options will be" - elog "placed in '~/.azureus/gentoo.config'." - elog - elog "If you need to change some startup options, you should modify this file" - elog "rather than the startup script. You can enable the console UI by" - elog "editing this config file." - echo - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} |