Version bump

Package-Manager: portage-2.2_rc67-r4/cvs/Linux x86_64

7 files changed, 71 insertions, 140 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index bf2b094179d8..5a1bd59853b4 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.77 2010/03/18 17:28:58 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.78 2010/04/25 19:23:40 tommy Exp $
+
+*freenet-0.7.5_p1245 (25 Apr 2010)
+
+  25 Apr 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +files/0.7.5_p1245-strip-openjdk-check.patch, -freenet-0.7.5_p1243.ebuild,
+  -freenet-0.7.5_p1244.ebuild, +freenet-0.7.5_p1245.ebuild,
+  -files/freenet-0.7.5_p1232-strip-error.patch,
+  -files/freenet-0.7.5_p1232-strip-openjdk-warning.patch:
+  Version bump
 
 *freenet-0.7.5_p1244 (18 Mar 2010)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 8afada30e95b..e6fc55bfdc4a 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,29 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.7.5_p1245-strip-openjdk-check.patch 2149 RMD160 bad3c2ad70aae2f6c033741e95ef1abd4e48cf14 SHA1 d34f83ccc3413355aedd488eefeeb124680b14bb SHA256 9805b84f14342166d1817ba3d135226be4df08649309808c37ec2cd772b23dc6
 AUX ext.patch 2889 RMD160 1ad0e4912247b548633a951226db99676eb16326 SHA1 bb5dd7f1b608216acf73d7d59d7d2c8b034b187c SHA256 577cd63dbb2833c5ecf1ead95bb7ea28c95b64c9835e655f6e789dbdfdc77b14
 AUX freenet 476 RMD160 fdce44749587d73cb3f5b916e893e3bb95ef3200 SHA1 48eb8bfbd27a17b0bb3b29248ce4c43b59a76bda SHA256 4a8482117a434e9885438b7ca5384851bff49fefa28b13e33494a746c781342f
-AUX freenet-0.7.5_p1232-strip-error.patch 747 RMD160 ea1c7127d3b759ddab102322b865e92a12665c6b SHA1 2182f15e34c444d5924d26b2078da2f0bec6b0fe SHA256 bb3ca54049ee537f30c353c681ba6399f6bc47850fa2c7969e02c9622c1e1793
-AUX freenet-0.7.5_p1232-strip-openjdk-warning.patch 448 RMD160 fe46149bc653ebf8181f82940028e44817bf2b93 SHA1 ac4cdf3a18ac07f9f4fd1f9e2fb9fe19dd047f86 SHA256 6f129e24455e0c12d6b83f9940bb7e88b7896eb459cac248a76344171b2a3426
 AUX freenet.old 452 RMD160 e9e834fedf4270c14f3e8d754c58eb05f3f570c5 SHA1 edb5d0ab062d46f494db88560885d7ee7b026e29 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8fc72f1714fa6
 AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 123fb5cf1c9b50357156fa300c5015a7e0ca65ad SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef50b93b10d9fada7d7a
 AUX strip-version-check.patch 349 RMD160 579ddfdf6549263e7ec2b9190eff6d08d6a2d5c4 SHA1 58e7422d180e4f443d415ec424646933eceeceb8 SHA256 35a33e5c52288505eefca96a6fbb98ae725d6fbefb727e73e513a1356b5cbfef
 AUX wrapper1.conf 2396 RMD160 e029cb5feaf98a03234a061362c0989207fdfd23 SHA1 9b882dc0d366b946596bdecb1b1d45c1e221e4e0 SHA256 52e5e283ac4c43d78feecf1edf5ccb38e5505c89624769976fcbf4ac2c8a1572
-DIST freenet-0.7.5_p1243.zip 3012807 RMD160 05528f6d6ce649e16b9427837cac15041e0dc957 SHA1 b2b207ead4bd69111fdc78bc5b7b8adcf9b31945 SHA256 b38ca334c21f6ae8634d923b0273796fe28fc6cdc0ee744e488be424a9ff6e81
-DIST freenet-0.7.5_p1244.zip 3017017 RMD160 28a6e0c55803243e0481f427e96ab2bc1b9abe09 SHA1 d29ac61470eea10f1a16fa9fe49fad2e8deea9d5 SHA256 75e0ff7a5dac4c9123175fd98a8be39248a3ee6bcd9b2d0182ce2da7d2aeb3e6
+DIST freenet-0.7.5_p1245.zip 3100686 RMD160 a86115ee65cf2c5fbd3bf01f95249648eec8cc78 SHA1 785925bc59831d82e1a9f965e03c60634ab1c642 SHA256 80ab91a712a06b66291ef31b204ecb3b6ac9cbc1aecc2ba470ace1758721a539
 DIST seednodes-20091027.fref 22241 RMD160 5a21874cb0c8dd27cc46329253a10182ac1280bd SHA1 55a060aee01afa8e9bc94be04e2356b7e2f6c4b0 SHA256 42a00a8166deb01ad660600315a9624961c4403ebcf1509971f483ddb4b63e94
-DIST seednodes-20100316.fref 31879 RMD160 30faae00243308d22686aba9d62c989d51c06f56 SHA1 7e312a5235ba66e183e423fc1c8700c53e11ca74 SHA256 4b3eb208ade392eaf43d09a6fcedc61c7ed5a234681b2ee164830cde2a410776
-EBUILD freenet-0.7.5_p1243.ebuild 3169 RMD160 f711e3fb102fb0cf74aeb5964b60229c4cb6f7f1 SHA1 74ec81ef2fd5649f077a229bdcd71f80f132a043 SHA256 b6de96fede1b8890e17769292b178ad06824b9c56f055bd065df80d3fe7392f9
-EBUILD freenet-0.7.5_p1244.ebuild 3169 RMD160 c872594dcead96bdaee7f35204b155138712300b SHA1 65f8f96318b058880242c176db8720f2e3a83f7a SHA256 7bf581541c4654e0bf830ce74358d98833efdade97cc29a7c17f24e12460edb3
+DIST seednodes-20100425.fref 20718 RMD160 e1390d210cbcf2e54818215a6823fb981947db70 SHA1 fd884d67383a3e978e9fb26074be52bb32117eea SHA256 66371508ddbfaec902ca8b3d7fecd62c65ef66f87bcc9b50f0b5ee92f08b6c0b
+EBUILD freenet-0.7.5_p1245.ebuild 3155 RMD160 f1149e9ce75b57cb41a9b8178b9b3d24e76f0838 SHA1 e1958acc331bb53803910c57446584f21e91b4c7 SHA256 e19461b0f72324b1e667515a07a6543ad8396b1a733eacb9cfbcab0ff135173d
 EBUILD freenet-9999.ebuild 2579 RMD160 af27c89827ed87434431e2151a844d4e456b07b4 SHA1 bebe0bf774eb6a58a2f94b145021ee57bee4fc4f SHA256 c4f241bcea153172ebb8ef420e75101d987f70b8f3b190ffbde3ce9a42623ee1
-MISC ChangeLog 6006 RMD160 1a4521d617ad748211f327400ef6c06a1f0125d5 SHA1 d19d7c54a75268eb3cec5b17744b19649c870cdf SHA256 fcdafca1e5a8643fb9a0a9d2991cd59f60165e3b5e2c305f9716a57ac30bbc5d
+MISC ChangeLog 6360 RMD160 257c27c78273de1f13243fdea5339fe4bc74a0f2 SHA1 5166de43b9819fde2ef980d9880f6c5f44fb0ec5 SHA256 60071b7c8016fbffc9d32eb9fa88610585ec493c4b07863f5a4104658b7572a2
 MISC metadata.xml 332 RMD160 5e5c8b88681af85d63236c47f3a9a92881515679 SHA1 38a87952bb9389758e8700b4468b122ccf5199ea SHA256 3ca39205a9351767ed2901a4c8c8dd563ed1d83f6684f3bb6c2ab9e92ba4c10f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iJwEAQECAAYFAkuiYucACgkQG7kqcTWJkGdQFQP/d4pQzO6H3B5hbj069UjQ/qqR
-BMN1YIAEbV5f5WqAiwwR11JzJwXaCU5RMvQ+RiUcb1Qboq74R2eqiYGMiiWs2Zce
-avuKCk7MqsF2KnoGDH9B25+e5y1so0knkc9DLw/7nkvnAU3ey6z1bX++603cYT6U
-C4q/S34Ccfie/n3upMw=
-=QIK6
+iJwEAQECAAYFAkvUlskACgkQG7kqcTWJkGev/AP/VIyLV887/BCUcK854xE+X4Pn
+lfzM+sR8ROptWYBF+f/KD+H/wgTHTfeElQe6RbxeEJi9jiJDpR171HGTS/LMRB/K
+NOYZrDv5UJx6aIBiyALLlNCl4RMO+ljBhb6boXrxeiac2PTrKnOji3MIpJg3snNw
+2/6CJS5D7hDaYGv3geY=
+=d2XS
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/files/0.7.5_p1245-strip-openjdk-check.patch b/net-p2p/freenet/files/0.7.5_p1245-strip-openjdk-check.patch
new file mode 100644
index 000000000000..f7694a2f2b4c
--- /dev/null
+++ b/net-p2p/freenet/files/0.7.5_p1245-strip-openjdk-check.patch
@@ -0,0 +1,46 @@
+--- src/freenet/node/Node.java	2010-04-25 14:54:26.000000000 +0200
++++ src/freenet/node/Node.java.new	2010-04-25 14:55:51.000000000 +0200
+@@ -3647,43 +3647,6 @@
+ 
+ 		boolean isOpenJDK = false;
+ 
+-		if(jvmName.startsWith("OpenJDK ")) {
+-			isOpenJDK = true;
+-			if(javaVersion.startsWith("1.6.0")) {
+-				String subverString;
+-				if(jvmVersion.startsWith("14.0-b"))
+-					subverString = jvmVersion.substring("14.0-b".length());
+-				else if(jvmVersion.startsWith("1.6.0_0-b"))
+-					subverString = jvmVersion.substring("1.6.0_0-b".length());
+-				else
+-					subverString = null;
+-				if(subverString != null) {
+-					int subver;
+-					try {
+-						subver = Integer.parseInt(subverString);
+-					} catch (NumberFormatException e) {
+-						subver = -1;
+-					}
+-				if(subver > -1 && subver < 15) {
+-					File javaDir = new File(System.getProperty("java.home"));
+-
+-					// Assume that if the java home dir has been updated since August 11th, we have the fix.
+-
+-					final Calendar _cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+-					_cal.set(2009, Calendar.AUGUST, 11, 0, 0, 0);
+-					if(javaDir.exists() && javaDir.isDirectory() && javaDir.lastModified() > _cal.getTimeInMillis()) {
+-						System.err.println("Your Java appears to have been updated, we probably do not have the XML bug (http://www.cert.fi/en/reports/2009/vulnerability2009085.html).");
+-					} else {
+-						System.err.println("Old version of OpenJDK detected. It is possible that your Java may be vulnerable to a remote code execution vulnerability. Please update your operating system ASAP. We will not disable plugins because we cannot be sure whether there is a problem.");
+-						System.err.println("See here: http://www.cert.fi/en/reports/2009/vulnerability2009085.html");
+-						clientCore.alerts.register(new SimpleUserAlert(false, l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), UserAlert.ERROR));
+-					}
+-
+-				}
+-				}
+-			}
+-		}
+-
+ 		boolean isApple;
+ 
+ 		if(logMINOR) Logger.minor(this, "JVM vendor: "+jvmVendor+", JVM version: "+javaVersion+", OS name: "+osName+", OS version: "+osVersion);
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1232-strip-error.patch b/net-p2p/freenet/files/freenet-0.7.5_p1232-strip-error.patch
deleted file mode 100644
index 2237dfe63c54..000000000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1232-strip-error.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/freenet/node/Node.java	2009-08-21 19:00:38.056504773 +0200
-+++ src/freenet/node/Node.java.new	2009-08-21 19:08:40.042880252 +0200
-@@ -3634,7 +3634,6 @@
- 				System.err.println("Please upgrade your Java to 1.6.0 update 15 or 1.5.0 update 20 IMMEDIATELY!");
- 				System.err.println("Freenet plugins using XML, including the search function, and Freenet client applications such as Thaw which use XML are vulnerable to remote code execution!");
- 				
--				clientCore.alerts.register(new SimpleUserAlert(false, l10n("sunJVMxmlRemoteCodeExecTitle"), l10n("sunJVMxmlRemoteCodeExec"), l10n("sunJVMxmlRemoteCodeExecTitle"), UserAlert.CRITICAL_ERROR));
- 			}
- 			
- 		} else if (jvmVendor.startsWith("Apple ") || jvmVendor.startsWith("\"Apple ")) {
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1232-strip-openjdk-warning.patch b/net-p2p/freenet/files/freenet-0.7.5_p1232-strip-openjdk-warning.patch
deleted file mode 100644
index 62f59ef1a156..000000000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1232-strip-openjdk-warning.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/freenet/node/Node.java	2009-08-21 19:14:29.448754805 +0200
-+++ src/freenet/node/Node.java.new	2009-08-21 19:17:20.994504680 +0200
-@@ -3653,7 +3653,6 @@
- 				}
- 			}
- 
--			clientCore.alerts.register(new SimpleUserAlert(true, l10n("notUsingSunVMTitle"), l10n("notUsingSunVM", new String[] { "vendor", "version" }, new String[] { jvmVendor, javaVersion }), l10n("notUsingSunVMShort"), UserAlert.WARNING));
- 		}
- 			
- 		if(!isUsingWrapper()) {
diff --git a/net-p2p/freenet/freenet-0.7.5_p1244.ebuild b/net-p2p/freenet/freenet-0.7.5_p1244.ebuild
deleted file mode 100644
index 372735a4675a..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1244.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1244.ebuild,v 1.1 2010/03/18 17:28:58 tommy Exp $
-
-EAPI="2"
-DATE=20100316
-
-inherit eutils java-pkg-2 java-ant-2 multilib
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="http://github.com/${PN}/fred-official/zipball/build0${PV#*p} -> ${P}.zip
-	mirror://gentoo/seednodes-${DATE}.fref"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="freemail"
-
-CDEPEND="dev-db/db-je:3.3
-	dev-java/fec
-	dev-java/java-service-wrapper
-	dev-java/db4o-jdk11
-	dev-java/db4o-jdk12
-	dev-java/db4o-jdk5
-	dev-java/ant-core
-	dev-java/lzma
-	dev-java/lzmajio
-	dev-java/mersennetwister"
-#force secure versions for now
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	net-libs/nativebiginteger
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread
-	freemail? ( dev-java/bcprov )"
-
-EANT_BUILD_TARGET="dist"
-EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/freenet-fred-official-*
-	S=$(pwd)
-	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/ext.patch
-	epatch "${FILESDIR}"/${PN}-0.7.5_p1232-{strip-error,strip-openjdk-warning}.patch
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" freenet-wrapper.conf || die "sed failed"
-	use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
-	java-ant_rewrite-classpath
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_newjar lib/freenet-cvs-snapshot.jar ${PN}.jar
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-	dodoc AUTHORS README || die
-	insinto /etc
-	doins freenet-wrapper.conf || die
-	insinto /var/freenet
-	doins run.sh || die
-	newins "${DISTDIR}"/seednodes-${DATE}.fref seednodes.fref || die
-	fperms +x /var/freenet/run.sh
-	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
-}
-
-pkg_postinst () {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-	#workaround for previously existing freenet user
-	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet
-}
-
-pkg_postrm() {
-	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
-		elog " "
-		elog "If you dont want to use freenet any more"
-		elog "and dont want to keep your identity/other stuff"
-		elog "remember to do 'rm -rf /var/freenet' to remove everything"
-	fi
-}
diff --git a/net-p2p/freenet/freenet-0.7.5_p1243.ebuild b/net-p2p/freenet/freenet-0.7.5_p1245.ebuild
index b6e9b02f3f97..ed3b21c5156a 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1243.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1245.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1243.ebuild,v 1.1 2010/03/16 21:49:59 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1245.ebuild,v 1.1 2010/04/25 19:23:40 tommy Exp $
 
 EAPI="2"
-DATE=20100316
+DATE=20100425
 
 inherit eutils java-pkg-2 java-ant-2 multilib
 
@@ -53,12 +53,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cd "${WORKDIR}"/freenet-fred-official-*
-	S=$(pwd)
+	mv "${WORKDIR}"/freenet-fred-official-* "${S}"
+	cd "${S}"
 	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
 	epatch "${FILESDIR}"/ext.patch
-	epatch "${FILESDIR}"/${PN}-0.7.5_p1232-{strip-error,strip-openjdk-warning}.patch
+	epatch "${FILESDIR}"/0.7.5_p1245-strip-openjdk-check.patch
 	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" freenet-wrapper.conf || die "sed failed"
 	use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
 	java-ant_rewrite-classpath