Added patch for changes in bcprov due to revision bump per bug #172657

Package-Manager: portage-2.1.2.2

diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog
index 00d3e5219c35bb0696c2145a198dba9b8b51871c..0209ceccda2f182ce83247f9f1664aa6be226260 100644 (file)
--- a/net-p2p/azureus/ChangeLog
+++ b/net-p2p/azureus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/azureus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.43 2007/03/15 17:18:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.44 2007/03/29 18:04:31 wltjr Exp $
+
+*azureus-2.5.0.4-r1 (29 Mar 2007)
+
+  29 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/fedora-2.5.0.4/azureus-bcprov-1.35.patch,
+  +azureus-2.5.0.4-r1.ebuild:
+  Added patch for changes in bcprov due to revision bump per bug #172657
 
   15 Mar 2007; Simon Stelling <blubb@gentoo.org> azureus-2.5.0.4.ebuild:
   stable on amd64; bug 170955

diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest
index 280f2a53198e4b0ef6bfbecc1b5474917a16e0f9..2deb1dbabd440ea0c6e9f711a53299453ab4e345 100644 (file)
--- a/net-p2p/azureus/Manifest
+++ b/net-p2p/azureus/Manifest
@@ -34,6 +34,10 @@ AUX fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205 RMD160 84682f22
 MD5 3c5862f1afbf48b4006a91247358e916 files/fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205
 RMD160 84682f22471425f74dd5710d331f50341ef1a26d files/fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205
 SHA256 babb97a8005b936b2ee127dd72f3534d47d33af803811a7041130fecd3fdbd3d files/fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205
+AUX fedora-2.5.0.4/azureus-bcprov-1.35.patch 1060 RMD160 6c81c8fe3e270d67027e135cb676bef38acd5c27 SHA1 87d04bb8c0481b5b04dcf697c9f2438dc0821f21 SHA256 3c94891dc070d543884d5e874c35e089ef5a59ef5b578b19e494a2d15b5186d2
+MD5 1ac74562ed0ac29781d2a5fa3e57df73 files/fedora-2.5.0.4/azureus-bcprov-1.35.patch 1060
+RMD160 6c81c8fe3e270d67027e135cb676bef38acd5c27 files/fedora-2.5.0.4/azureus-bcprov-1.35.patch 1060
+SHA256 3c94891dc070d543884d5e874c35e089ef5a59ef5b578b19e494a2d15b5186d2 files/fedora-2.5.0.4/azureus-bcprov-1.35.patch 1060
 AUX fedora-2.5.0.4/azureus-cache-size.patch 578 RMD160 767c48837a762f99bd36f841a178e19c765390e8 SHA1 c389d6e7d14d9352786adef624251ce43e47e574 SHA256 c929ca71e2a2435127eeb4a42f0a8c6a000f9130c240cf72f13ba000f1fb1548
 MD5 eb0038e89f3506fde9b807ac4860cc3e files/fedora-2.5.0.4/azureus-cache-size.patch 578
 RMD160 767c48837a762f99bd36f841a178e19c765390e8 files/fedora-2.5.0.4/azureus-cache-size.patch 578
@@ -60,14 +64,18 @@ EBUILD azureus-2.5.0.0-r3.ebuild 4184 RMD160 277d02e306b6cdd8155340882b3927b4799
 MD5 e87dd370cac2f809a576da1d8015552a azureus-2.5.0.0-r3.ebuild 4184
 RMD160 277d02e306b6cdd8155340882b3927b479921234 azureus-2.5.0.0-r3.ebuild 4184
 SHA256 8b0556db47934c98302a3328cffeef97654fe4a04144a88e7ca623b010d71a4f azureus-2.5.0.0-r3.ebuild 4184
+EBUILD azureus-2.5.0.4-r1.ebuild 4261 RMD160 55c62eeab4c4aa5e830c02bcd96fa1ed2f250eff SHA1 ecb4e59da074eb2600a83f14cfd2db48aae1f976 SHA256 b9401b9e0cc13f20d9b383fc54a1ce94001b2a5d34ccb6b69e305c0b2c782788
+MD5 8dfdb6949d0c7cd00fc6f2a7c9d14f44 azureus-2.5.0.4-r1.ebuild 4261
+RMD160 55c62eeab4c4aa5e830c02bcd96fa1ed2f250eff azureus-2.5.0.4-r1.ebuild 4261
+SHA256 b9401b9e0cc13f20d9b383fc54a1ce94001b2a5d34ccb6b69e305c0b2c782788 azureus-2.5.0.4-r1.ebuild 4261
 EBUILD azureus-2.5.0.4.ebuild 4256 RMD160 238992e420e7b2c76c28df6a0db1ced7493e0060 SHA1 d81100f05523dd0cae21575e10fa8f43e8735006 SHA256 00dc2b6522e243931fdc025a7d6419c33478b25e173f7bcf67f41ae0924f86ec
 MD5 c349ceebc14fd9fcda5afb8e4e8aaa58 azureus-2.5.0.4.ebuild 4256
 RMD160 238992e420e7b2c76c28df6a0db1ced7493e0060 azureus-2.5.0.4.ebuild 4256
 SHA256 00dc2b6522e243931fdc025a7d6419c33478b25e173f7bcf67f41ae0924f86ec azureus-2.5.0.4.ebuild 4256
-MISC ChangeLog 9087 RMD160 3f8029fb7c3872a0f0f15dea2dd2cad94931605f SHA1 d95f1bf7fd4d89235e1c7ff28db9bfb7067db9d1 SHA256 490bc738d7e3b4f07fd12486c9727710a405bee818db7be3c36d385fbf789eb8
-MD5 f1912e2f79ec6edb01e81f11ef664c7a ChangeLog 9087
-RMD160 3f8029fb7c3872a0f0f15dea2dd2cad94931605f ChangeLog 9087
-SHA256 490bc738d7e3b4f07fd12486c9727710a405bee818db7be3c36d385fbf789eb8 ChangeLog 9087
+MISC ChangeLog 9334 RMD160 2cd3ebeab481ba75ede41dd7b40c79895a30c0db SHA1 b26822d1dd04a735c1e77cfe69aaea8d92f01f3d SHA256 5f140052394637b4bdf4f1e2df04e2e9d0f6793c19a406002609aec6ddb0d2db
+MD5 47baa0b868c14fe6498b07fba073bdf3 ChangeLog 9334
+RMD160 2cd3ebeab481ba75ede41dd7b40c79895a30c0db ChangeLog 9334
+SHA256 5f140052394637b4bdf4f1e2df04e2e9d0f6793c19a406002609aec6ddb0d2db ChangeLog 9334
 MISC metadata.xml 295 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 SHA1 f3aea2718d0f8b93e91c9fddd328b5108ce2bf53 SHA256 a96064243aa67bd00e443fd98621e45910882d3790467f8b0a837b694a351307
 MD5 315f038f311b0cb987f793266b9f5f2a metadata.xml 295
 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 metadata.xml 295
@@ -78,3 +86,6 @@ SHA256 ad75c73e602eabb4101378fffa1ab0d105f2695046695eff6beb82ea70988253 files/di
 MD5 5f9475c83b5dc85ff00804857bb5d525 files/digest-azureus-2.5.0.4 262
 RMD160 3e3f22f5dc0512b8044a11f388a7e540fdebdddc files/digest-azureus-2.5.0.4 262
 SHA256 b1bf328abef9e68ee1df0a5087bffa4e54b5fcba2f2f7823a1980ddd4f952266 files/digest-azureus-2.5.0.4 262
+MD5 5f9475c83b5dc85ff00804857bb5d525 files/digest-azureus-2.5.0.4-r1 262
+RMD160 3e3f22f5dc0512b8044a11f388a7e540fdebdddc files/digest-azureus-2.5.0.4-r1 262
+SHA256 b1bf328abef9e68ee1df0a5087bffa4e54b5fcba2f2f7823a1980ddd4f952266 files/digest-azureus-2.5.0.4-r1 262

diff --git a/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild b/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild
new file mode 100644 (file)
index 0000000..af7c9b7
--- /dev/null
+++ b/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild,v 1.1 2007/03/29 18:04:31 wltjr Exp $
+
+inherit eutils fdo-mime java-pkg-2 java-ant-2
+
+DESCRIPTION="Azureus - Java BitTorrent Client"
+HOMEPAGE="http://azureus.sourceforge.net/"
+SRC_URI="mirror://sourceforge/azureus/azureus_${PV}_source.zip"
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+IUSE="source"
+
+# >=swt-3.2 for bug
+# https://bugs.gentoo.org/show_bug.cgi?id=135835
+
+RDEPEND="
+       >=virtual/jre-1.5
+       >=dev-java/swt-3.2-r1
+       >=dev-java/log4j-1.2.8
+       >=dev-java/commons-cli-1.0
+       >=dev-java/bcprov-1.35
+       !net-p2p/azureus-bin"
+DEPEND="${RDEPEND}
+       >=virtual/jdk-1.5
+       dev-util/desktop-file-utils
+       >=dev-java/ant-core-1.6.2
+       || ( =dev-java/eclipse-ecj-3.2* =dev-java/eclipse-ecj-3.1* )
+       source? ( app-arch/zip )
+       >=app-arch/unzip-5.0"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+       mkdir ${S}
+       cd ${S}
+       unpack ${A}
+
+       # patches from 2.5.0.0 still work here
+       EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+               epatch ${FILESDIR}/fedora-${PV}/
+
+       #removing osx files and entries
+       rm -fr org/gudy/azureus2/ui/swt/osx org/gudy/azureus2/platform/macosx
+       #removing windows files
+       rm -fr org/gudy/azureus2/ui/swt/win32 org/gudy/azureus2/platform/win32
+       #removing test files
+       rm -fr org/gudy/azureus2/ui/swt/test
+       rm -f org/gudy/azureus2/ui/console/multiuser/TestUserManager.java
+       #removing bouncycastle
+       rm -fr org/bouncycastle
+
+       mkdir -p build/libs
+       cd build/libs
+       java-pkg_jar-from log4j
+       java-pkg_jar-from commons-cli-1
+       java-pkg_jar-from swt-3
+       java-pkg_jar-from bcprov
+}
+
+src_compile() {
+       # javac likes to run out of memory during build... use ecj instead
+       java-pkg_force-compiler ecj-3.2 ecj-3.1
+
+       eant ${ant_extra_opts} jar
+}
+
+src_install() {
+       java-pkg_dojar dist/Azureus2.jar || die "dojar failed"
+
+
+       java-pkg_dolauncher ${PN} \
+               --main org.gudy.azureus2.ui.common.Main \
+               -pre ${FILESDIR}/${PN}-2.5.0.0-pre \
+               --pkg_args '--ui=${UI}' \
+               --java_args '-Dazureus.install.path=${HOME}/.azureus/ ${JAVA_OPTIONS}'
+
+       doicon "${FILESDIR}/azureus.png"
+       domenu "${FILESDIR}/azureus.desktop"
+       use source && java-pkg_dosrc ${S}/{com,org}
+}
+
+pkg_postinst() {
+       echo
+       elog "Due to the nature of the portage system, we recommend"
+       elog "that users check portage for new versions of Azureus"
+       elog "instead of attempting to use the auto-update feature."
+       elog "We also set azureus.install.path to ~/.azureus so auto"
+       elog "update probably does not even work."
+       elog ""
+       elog "You can disable auto-update in"
+       elog "Tools->Options...->Interface->Start"
+       echo
+       elog "After running azureus for the first time, configuration"
+       elog "options will be placed in ~/.azureus/gentoo.config"
+       elog "It is recommended that you modify this file rather than"
+       elog "the azureus startup script directly."
+       echo
+       elog "As of this version, the new ui type 'console' is supported,"
+       elog "and this may be set in ~/.azureus/gentoo.config."
+       echo
+       elog "If you have problems starting azureus, try starting it"
+       elog "from the command line to look at debugging output."
+       echo
+       ewarn "If you are upgrading, and the menu in azureus has entries like"
+       ewarn "\"!MainWindow.menu.transfers!\" then you have a stray"
+       ewarn "MessageBundle.properties file,"
+       ewarn "and you may safely delete ~/.azureus/MessagesBundle.properties"
+       echo
+       elog "It's recommended to use Sun's Java version 1.5 or later."
+       elog "If you're experiencing problems running azureus and you've"
+       elog "using an older version of Java, try to upgrading to a new version. "
+       echo
+       elog "New in 2.5.0.0-r3:"
+       ewarn 'azureus.install.path was changed to ${HOME}/.azureus/. Before'
+       ewarn 'the Azureus plugin dir was created to the current working directory.'
+       ewarn 'This means that you probably have a useless plugins directory in'
+       ewarn 'your home directory.'
+       ewarn 'See http://bugs.gentoo.org/show_bug.cgi?id=145908'
+       ewarn 'for more information. Also you probably need to move the user'
+       ewarn 'installed plugins to the new plugin directory.'
+       echo
+       ewarn "Please, do not run azureus as root!"
+       ewarn "Azureus has not been developed for multi-user environments!"
+
+       fdo-mime_desktop_database_update
+}
+
+pkg_prerm() {
+       fdo-mime_desktop_database_update
+}

diff --git a/net-p2p/azureus/files/digest-azureus-2.5.0.4-r1 b/net-p2p/azureus/files/digest-azureus-2.5.0.4-r1
new file mode 100644 (file)
index 0000000..880298a
--- /dev/null
+++ b/net-p2p/azureus/files/digest-azureus-2.5.0.4-r1
@@ -0,0 +1,3 @@
+MD5 032c42578b455599a00714781438afa7 azureus_2.5.0.4_source.zip 6482560
+RMD160 c4f245abf19a963e077b354fccd6a04547c741b1 azureus_2.5.0.4_source.zip 6482560
+SHA256 9ae32cbf88baf04b0e17456e92bc2634dd54e890dbece7211a83318b96d1b081 azureus_2.5.0.4_source.zip 6482560

diff --git a/net-p2p/azureus/files/fedora-2.5.0.4/azureus-bcprov-1.35.patch b/net-p2p/azureus/files/fedora-2.5.0.4/azureus-bcprov-1.35.patch
new file mode 100644 (file)
index 0000000..4e96230
--- /dev/null
+++ b/net-p2p/azureus/files/fedora-2.5.0.4/azureus-bcprov-1.35.patch
@@ -0,0 +1,20 @@
+--- azureus/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java.orig       2007-01-20 18:23:49.000000000 +0100
++++ azureus/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java    2007-01-20 18:25:29.000000000 +0100
+@@ -36,7 +36,7 @@
+ import org.bouncycastle.crypto.encodings.PKCS1Encoding;\r
+ import org.bouncycastle.crypto.engines.RSAEngine;\r
+ import org.bouncycastle.crypto.params.ParametersWithRandom;\r
+-import org.bouncycastle.jce.provider.RSAUtil;\r
++import org.bouncycastle.jce.provider.DSAUtil;\r
+ import org.gudy.azureus2.core3.util.Debug;\r
+ import org.gudy.azureus2.plugins.utils.StaticUtilities;\r
+ \r
+@@ -97,7 +97,7 @@
+                               \r
+                               PKCS1Encoding   padded_eng = new PKCS1Encoding( eng );\r
+                               \r
+-                  CipherParameters param = RSAUtil.generatePublicKeyParameter(public_key);\r
++                  CipherParameters param = DSAUtil.generatePublicKeyParameter(public_key);\r
+                   \r
+                   param = new ParametersWithRandom(param, new SecureRandom());\r
+                   \r