diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /net-p2p/vuze | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'net-p2p/vuze')
-rw-r--r-- | net-p2p/vuze/Manifest | 2 | ||||
-rw-r--r-- | net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch | 130 | ||||
-rw-r--r-- | net-p2p/vuze/vuze-5.7.6.0-r2.ebuild | 147 |
3 files changed, 279 insertions, 0 deletions
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest index 6283b7676bf4..fcec604a15eb 100644 --- a/net-p2p/vuze/Manifest +++ b/net-p2p/vuze/Manifest @@ -7,7 +7,9 @@ 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.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-log4j-12-api.patch 5749 BLAKE2B 87a63f03103e15a0a6d3ec6a44ef678c00b679ff205ce56d821676188a2042f8933b3dc9cdd623a89b1f5d225e1c94c29fe4b6ada7769ab3ccfab589c961518d SHA512 ded2cce1292e0cff747ed1e0209ab5f5728e5a2ac5d8f7037edba2380ca32e02fa6ae4f66f27780381ac53f347d0957ba04cf0cda468f54bf97769c8fcf3601c 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 4068 BLAKE2B 1df51a38b5663a9869e2f572341cc0e7ddddfe5544ce659ea5f7419921349e83663f62fa52dfc3f3b72d6047b03a5e7975c583de619d765de1467e0d7810f2b1 SHA512 3d31e3b0bb898524720a4807762bbb17df573f0f6886ed5dd930c6a3be22f064355d86f09c6d4ff0dba7b0a08ca32bf53508799eff15a0e5cd9a4a2c8f02adb4 +EBUILD vuze-5.7.6.0-r2.ebuild 4099 BLAKE2B 202185aca35625c3b08e1d4e38b9d117b746872dda467084b23adee5584f2dc64b8f4476049376f38c846c89fde813635c2c1b7c588709b58cc3846e6f597fe4 SHA512 d21c03eb83ac577ef452be29b2ab27af04c7eb456db2d731c2de2d662b54cdc1ee50e50a011344c30a4c3c84c3ac2746bef30e3df3a7406ae69b894fe77c6546 MISC metadata.xml 314 BLAKE2B 6e8758ffb95e1641ddb121951555ed9a9da59d48688db9bc51cf9d2d02574faddf35d874a9ca901e73f47bf456221bd8b5f2035b3e789ea13196a8c2c58b03c4 SHA512 bf06d56995ee3bb79073d3c12ed3486126dc336dc77d0fb86a6fb3229596df39836e0f0682128b883c66eb02061aff512ef64299f6cd2067bb10bd6c7f63527e diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch b/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch new file mode 100644 index 000000000000..4bcce5d5f32d --- /dev/null +++ b/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch @@ -0,0 +1,130 @@ +From d960f15294c451bda338e4d9998e8d009970f380 Mon Sep 17 00:00:00 2001 +From: Yuan Liao <liaoyuan@gmail.com> +Date: Fri, 18 Feb 2022 12:47:20 -0800 +Subject: [PATCH] Migrate from Log4j 1.2 to log4j-1.2-api bridge from Log4j 2 + +Signed-off-by: Yuan Liao <liaoyuan@gmail.com> +--- + org/gudy/azureus2/ui/common/Main.java | 7 +++--- + .../azureus2/ui/console/ConsoleInput.java | 8 +++--- + .../azureus2/ui/console/commands/Log.java | 25 ++++++++++--------- + 3 files changed, 21 insertions(+), 19 deletions(-) + +diff --git a/org/gudy/azureus2/ui/common/Main.java b/org/gudy/azureus2/ui/common/Main.java +index 8c533fb..f93e685 100644 +--- a/org/gudy/azureus2/ui/common/Main.java ++++ b/org/gudy/azureus2/ui/common/Main.java +@@ -43,7 +43,8 @@ import org.apache.log4j.Appender; + import org.apache.log4j.ConsoleAppender; + import org.apache.log4j.Logger; + import org.apache.log4j.PatternLayout; +-import org.apache.log4j.varia.DenyAllFilter; ++import org.apache.log4j.bridge.FilterWrapper; ++import org.apache.logging.log4j.core.filter.DenyAllFilter; + + import com.aelitis.azureus.core.*; + import com.aelitis.azureus.core.impl.AzureusCoreSingleInstanceClient; +@@ -113,9 +114,9 @@ public class Main { + public static void initRootLogger() { + if (Logger.getRootLogger().getAppender("ConsoleAppender")==null) { + Appender app; +- app = new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)); ++ app = new ConsoleAppender(); + app.setName("ConsoleAppender"); +- app.addFilter( new DenyAllFilter() ); //'log off' by default ++ app.addFilter( new FilterWrapper(DenyAllFilter.newBuilder().build()) ); //'log off' by default + Logger.getRootLogger().addAppender(app); + } + } +diff --git a/org/gudy/azureus2/ui/console/ConsoleInput.java b/org/gudy/azureus2/ui/console/ConsoleInput.java +index d660bbb..0559f72 100644 +--- a/org/gudy/azureus2/ui/console/ConsoleInput.java ++++ b/org/gudy/azureus2/ui/console/ConsoleInput.java +@@ -34,8 +34,8 @@ import java.util.Vector; + import org.apache.log4j.Appender; + import org.apache.log4j.ConsoleAppender; + import org.apache.log4j.Logger; +-import org.apache.log4j.PatternLayout; +-import org.apache.log4j.varia.DenyAllFilter; ++import org.apache.log4j.bridge.FilterWrapper; ++import org.apache.logging.log4j.core.filter.DenyAllFilter; + import org.gudy.azureus2.core3.config.COConfigurationManager; + import org.gudy.azureus2.core3.download.DownloadManager; + import org.gudy.azureus2.core3.download.DownloadManagerState; +@@ -157,9 +157,9 @@ public class ConsoleInput extends Thread { + + if (Logger.getRootLogger().getAppender("ConsoleAppender")==null) { + Appender app; +- app = new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)); ++ app = new ConsoleAppender(); + app.setName("ConsoleAppender"); +- app.addFilter( new DenyAllFilter() ); //'log off' by default ++ app.addFilter( new FilterWrapper(DenyAllFilter.newBuilder().build()) ); //'log off' by default + Logger.getRootLogger().addAppender(app); + } + +diff --git a/org/gudy/azureus2/ui/console/commands/Log.java b/org/gudy/azureus2/ui/console/commands/Log.java +index 43f66d5..8e9b222 100644 +--- a/org/gudy/azureus2/ui/console/commands/Log.java ++++ b/org/gudy/azureus2/ui/console/commands/Log.java +@@ -18,10 +18,13 @@ import org.apache.commons.cli.Option; + import org.apache.commons.cli.Options; + import org.apache.log4j.Appender; + import org.apache.log4j.ConsoleAppender; +-import org.apache.log4j.FileAppender; + import org.apache.log4j.Logger; + import org.apache.log4j.PatternLayout; +-import org.apache.log4j.varia.DenyAllFilter; ++import org.apache.log4j.bridge.AppenderWrapper; ++import org.apache.log4j.bridge.FilterWrapper; ++import org.apache.log4j.bridge.LayoutAdapter; ++import org.apache.logging.log4j.core.appender.FileAppender; ++import org.apache.logging.log4j.core.filter.DenyAllFilter; + import org.gudy.azureus2.plugins.PluginInterface; + import org.gudy.azureus2.plugins.logging.LoggerChannel; + import org.gudy.azureus2.plugins.logging.LoggerChannelListener; +@@ -54,7 +57,7 @@ public class Log extends OptionsConsoleCommand { + String subcommand = (String) args.get(0); + if ("off".equalsIgnoreCase(subcommand) ) { + if ( args.size() == 1 ){ +- con.addFilter(new DenyAllFilter()); ++ con.addFilter(new FilterWrapper(DenyAllFilter.newBuilder().build())); + ci.out.println("> Console logging off"); + }else{ + +@@ -81,25 +84,23 @@ public class Log extends OptionsConsoleCommand { + { + // send log output to a file + String filename = commandLine.getOptionValue('f'); +- +- try +- { +- Appender newAppender = new FileAppender(new PatternLayout("%d{ISO8601} %c{1}-%p: %m%n"), filename, true); ++ ++ Appender newAppender = new AppenderWrapper(FileAppender.newBuilder() ++ .setLayout(new LayoutAdapter(new PatternLayout("%d{ISO8601} %c{1}-%p: %m%n"))) ++ .withFileName(filename) ++ .withAppend(true) ++ .build()); + newAppender.setName("ConsoleAppender"); + Logger.getRootLogger().removeAppender(con); + Logger.getRootLogger().addAppender(newAppender); + ci.out.println("> Logging to filename: " + filename); +- } catch (IOException e) +- { +- ci.out.println("> Unable to log to file: " + filename + ": " + e); +- } + } + else + { + if( ! (con instanceof ConsoleAppender) ) + { + Logger.getRootLogger().removeAppender(con); +- con = new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)); ++ con = new ConsoleAppender(); + con.setName("ConsoleAppender"); + Logger.getRootLogger().addAppender(con); + } +-- +2.34.1 + diff --git a/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild b/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild new file mode 100644 index 000000000000..b2c74be487d2 --- /dev/null +++ b/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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="https://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 +CP_DEPEND=" + dev-java/log4j-12-api:2 + dev-java/log4j-core:2 + dev-java/swt:3.8[cairo] + dev-java/commons-cli:1 + dev-java/commons-text:0 + dev-java/json-simple:0" + +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:*" + +# does not compile with java 11, uses classes deprecated even in java 8 +DEPEND=" + ${CP_DEPEND} + virtual/jdk:1.8" + +BDEPEND="app-arch/unzip" + +IDEPEND="dev-util/desktop-file-utils" + +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}"/${PN}-5.3.0.0-unbundle-json.patch + "${FILESDIR}"/${PN}-5.7.6.0-commons-lang.patch + "${FILESDIR}"/${PN}-5.7.6.0-log4j-12-api.patch +) + +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" + +src_compile() { + local mem + use amd64 && mem="512" + use x86 && mem="448" + use ppc && mem="384" + use ppc64 && mem="448" + use sparc && mem="512" + 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 +} |