Version bump, drop old versions

(Portage version: 2.2.0_alpha2-r1/cvs/Linux x86_64)

6 files changed, 76 insertions, 112 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index a97f834838c5..abe28362b125 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,14 @@
 # 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.100 2010/10/31 21:24:40 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.101 2010/11/10 21:08:56 tommy Exp $
+
+*freenet-0.7.5_p1302 (10 Nov 2010)
+
+  10 Nov 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +files/0.7.5_p1302-ext.patch, -freenet-0.7.5_p1296.ebuild,
+  -freenet-0.7.5_p1297.ebuild, +freenet-0.7.5_p1302.ebuild, files/build.xml,
+  files/strip-openjdk-check.patch:
+  Version bump, drop old versions
 
 *freenet-0.7.5_p1297 (31 Oct 2010)
 
diff --git a/net-p2p/freenet/files/0.7.5_p1302-ext.patch b/net-p2p/freenet/files/0.7.5_p1302-ext.patch
new file mode 100644
index 000000000000..035b4e638cc6
--- /dev/null
+++ b/net-p2p/freenet/files/0.7.5_p1302-ext.patch
@@ -0,0 +1,22 @@
+--- src/freenet/node/NodeStarter.java	2010-11-10 21:46:10.000000000 +0100
++++ src/freenet/node/NodeStarter.java.new	2010-11-10 21:50:12.000000000 +0100
+@@ -49,8 +49,8 @@
+ 	public static final String extRevisionNumber;
+ 	
+ 	static {
+-		extBuildNumber = ExtVersion.extBuildNumber();
+-		extRevisionNumber = ExtVersion.extRevisionNumber();
++		extBuildNumber = RECOMMENDED_EXT_BUILD_NUMBER;
++		extRevisionNumber = "";
+ 	}
+ 
+ 	private FreenetFilePersistentConfig cfg;
+@@ -86,7 +86,7 @@
+ 			return Integer.valueOf(-1);
+ 		}
+ 
+-		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + ExtVersion.buildNumber + " r" + ExtVersion.cvsRevision+" running with ext build "+extBuildNumber+" r" + extRevisionNumber;
++		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber + " running with ext build "+extBuildNumber;
+ 		Logger.normal(this, builtWithMessage);
+ 		System.out.println(builtWithMessage);
+ 
diff --git a/net-p2p/freenet/files/build.xml b/net-p2p/freenet/files/build.xml
index e80b23c59fef..a522e98471cd 100644
--- a/net-p2p/freenet/files/build.xml
+++ b/net-p2p/freenet/files/build.xml
@@ -121,7 +121,7 @@
 
 		
 		<javac target="1.5" destdir="${build}" source="1.5" debug="on" srcdir="${src}" optimize="on" classpath="${gentoo.classpath}" >
-			<compilerarg value="-Xlint" ></compilerarg>
+<!--			<compilerarg value="-Xlint" ></compilerarg> -->
 			
 			<sourcepath >
 				<pathelement path="${build}" ></pathelement>
diff --git a/net-p2p/freenet/files/strip-openjdk-check.patch b/net-p2p/freenet/files/strip-openjdk-check.patch
index 08e00152c6ea..15a9e3817999 100644
--- a/net-p2p/freenet/files/strip-openjdk-check.patch
+++ b/net-p2p/freenet/files/strip-openjdk-check.patch
@@ -1,6 +1,6 @@
---- src/freenet/node/Node.java	2010-07-17 02:53:39.633185065 +0200
-+++ src/freenet/node/Node.java.new	2010-07-17 02:58:31.246061950 +0200
-@@ -3726,43 +3726,6 @@
+--- src/freenet/node/Node.java	2010-11-10 21:58:45.000000000 +0100
++++ src/freenet/node/Node.java.new	2010-11-10 21:59:53.000000000 +0100
+@@ -3792,42 +3792,42 @@
  
  		boolean isOpenJDK = false;
  
@@ -40,7 +40,42 @@
 -				}
 -			}
 -		}
--
++//		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));
++//					}
++//
++//				}
++//				}
++//			}
++//		}
+ 
  		if(logMINOR) Logger.minor(this, "JVM vendor: "+jvmVendor+", JVM name: "+jvmName+", JVM version: "+javaVersion+", OS name: "+osName+", OS version: "+osVersion);
  
- 		if((!isOpenJDK) && (jvmVendor.startsWith("Sun ") || (jvmVendor.startsWith("The FreeBSD Foundation") && jvmSpecVendor.startsWith("Sun ")) || (jvmVendor.startsWith("Apple ")))) {
diff --git a/net-p2p/freenet/freenet-0.7.5_p1297.ebuild b/net-p2p/freenet/freenet-0.7.5_p1297.ebuild
deleted file mode 100644
index 6c47b2c0416a..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1297.ebuild
+++ /dev/null
@@ -1,102 +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_p1297.ebuild,v 1.1 2010/10/31 21:24:40 tommy Exp $
-
-EAPI="2"
-DATE=20101003
-
-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-1.7*
-	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() {
-	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}"/0.7.5_p1297-ext.patch
-	epatch "${FILESDIR}"/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
-	cp "${FILESDIR}"/build.xml . || die
-	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_p1296.ebuild b/net-p2p/freenet/freenet-0.7.5_p1302.ebuild
index 68584c85845b..9b2421a210c0 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1296.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1302.ebuild
@@ -1,6 +1,6 @@
 # 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_p1296.ebuild,v 1.1 2010/10/28 18:45:53 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1302.ebuild,v 1.1 2010/11/10 21:08:56 tommy Exp $
 
 EAPI="2"
 DATE=20101003
@@ -9,7 +9,7 @@ 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
+SRC_URI="mirror://gentoo/${P}.zip
 	mirror://gentoo/seednodes-${DATE}.fref"
 
 LICENSE="as-is GPL-2"
@@ -57,10 +57,11 @@ src_prepare() {
 	cd "${S}"
 	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/ext.patch
+	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch
 	epatch "${FILESDIR}"/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
+	cp "${FILESDIR}"/build.xml . || die
 	java-ant_rewrite-classpath
 	java-pkg-2_src_prepare
 }