Version bump

(Portage version: 2.2_rc67-r4/cvs/Linux x86_64)

6 files changed, 61 insertions, 127 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/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