Version bump, drop old

(Portage version: 2.2_rc39-r1/cvs/Linux x86_64)

5 files changed, 34 insertions, 17 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 91ccd81a43d7..5e56e5a3c0d1 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.67 2009/08/17 15:34:48 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.68 2009/08/22 14:50:29 tommy Exp $
+
+*freenet-0.7.5_p1232 (22 Aug 2009)
+
+  22 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -files/0.7.5_p1228strip-version-check.patch, -freenet-0.7.5_p1228.ebuild,
+  +freenet-0.7.5_p1232.ebuild, +files/freenet-0.7.5_p1232-strip-error.patch,
+  +files/freenet-0.7.5_p1232-strip-openjdk-warning.patch:
+  Version bump, drop old
 
   17 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   files/wrapper1.conf:
diff --git a/net-p2p/freenet/files/0.7.5_p1228strip-version-check.patch b/net-p2p/freenet/files/0.7.5_p1228strip-version-check.patch
deleted file mode 100644
index 93d54c94cd16..000000000000
--- a/net-p2p/freenet/files/0.7.5_p1228strip-version-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/freenet/node/Node.java	2009-08-09 23:26:38.000000000 +0200
-+++ src/freenet/node/Node.java.neu	2009-08-10 01:00:51.000000000 +0200
-@@ -3554,9 +3554,6 @@
- 				
- 				if(is150 && subver < 10)
- 					spuriousOOMs = true;
--				
--				if(is150 && subver < 15 || is160 && subver < 20)
--					xmlRemoteCodeExec = true;
- 			}
- 			
- 			if(spuriousOOMs) {
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
new file mode 100644
index 000000000000..2237dfe63c54
--- /dev/null
+++ b/net-p2p/freenet/files/freenet-0.7.5_p1232-strip-error.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..62f59ef1a156
--- /dev/null
+++ b/net-p2p/freenet/files/freenet-0.7.5_p1232-strip-openjdk-warning.patch
@@ -0,0 +1,10 @@
+--- 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_p1228.ebuild b/net-p2p/freenet/freenet-0.7.5_p1232.ebuild
index aa453c3ce16f..c83aca04ded5 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1228.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1232.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 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_p1228.ebuild,v 1.3 2009/08/17 17:23:58 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1232.ebuild,v 1.1 2009/08/22 14:50:29 tommy Exp $
 
 EAPI="1"
-DATE=20090708
+DATE=20090821
 
 EGIT_REPO_URI="git://github.com/freenet/fred-staging.git"
 EGIT_PROJECT="freenet/fred-staging"
-EGIT_TREE="11afcd3792fbb5c6099f5c6d170bfe0fc69d216a"
+EGIT_TREE="c9c29bce98478c2e30c178e26cffc8a98469e096"
 
 inherit eutils git java-pkg-2 java-ant-2 multilib
 
@@ -55,7 +55,8 @@ src_unpack() {
 	cd "${S}"
 	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/{ext,${PV}strip-version-check}.patch
+	epatch "${FILESDIR}"/ext.patch
+	epatch "${FILESDIR}"/${P}-{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