Version bump, drop old

Package-Manager: portage-2.2_rc39-r1/cvs/Linux x86_64

6 files changed, 44 insertions, 25 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/Manifest b/net-p2p/freenet/Manifest
index d719b47c7277..909effd4c440 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.7.5_p1228strip-version-check.patch 349 RMD160 774ab76fe4f54ae53ab047f39eb7826b4886faa6 SHA1 0f241381e2b49aa145481957daeb7258f0d093b0 SHA256 fc89ec37f46a595da4f85a475b34bcfb4dec81729eaec5853b62f98cfdcaaa32
 AUX ext.patch 2644 RMD160 037d1f8d15e6f2da50c96ec172266b7ea4e14972 SHA1 7615f981a804ca8e553a98eeb3563cfd7720495b SHA256 d8131189125b31bdf37db90812ed7e53f7480f70e4c00bd35bd56c0427d6e709
 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 16218 RMD160 4805178fcff6e4414515c11709d8339c333f2fd0 SHA1 93a787a3d75a43dcd229ad422a05bb9f29eefda7 SHA256 a6c296bb39983349b43afbb3e758c3940e7ba86940d3a2615c47e97ad733dc19
 AUX strip-version-check.patch 349 RMD160 579ddfdf6549263e7ec2b9190eff6d08d6a2d5c4 SHA1 58e7422d180e4f443d415ec424646933eceeceb8 SHA256 35a33e5c52288505eefca96a6fbb98ae725d6fbefb727e73e513a1356b5cbfef
 AUX wrapper1.conf 2396 RMD160 e029cb5feaf98a03234a061362c0989207fdfd23 SHA1 9b882dc0d366b946596bdecb1b1d45c1e221e4e0 SHA256 52e5e283ac4c43d78feecf1edf5ccb38e5505c89624769976fcbf4ac2c8a1572
 DIST seednodes-20090413.fref 22342 RMD160 e9342614255f0e15c37eb830631ef4e62cf672e1 SHA1 2c966b82b42a72ecfbef717f9f5c30b6e5f2e52b SHA256 adfcda384f3b239a763d7a0bc4bd0cb7623febb534798d5f384ebd11efad7a92
 DIST seednodes-20090708.fref 25500 RMD160 43fc960ea4f54ce82f996f7174d7673b05ba52fb SHA1 941ff6852512cadfc095f69dcf35407545aaead5 SHA256 84f4692c2ac8ea5624d48e09a1a93f3832114c5e9a4598dbadc4a3a90f83c328
-EBUILD freenet-0.7.5_p1228.ebuild 3143 RMD160 44ef4a45fe41d90e5700e9dcd8326319dcd42f28 SHA1 ca723b72930105bf4c067f14a89dccb371c6dec2 SHA256 c4cd7f0c81474502ecb45a2f17e499a13fd4120029ec07f7146e0ffd1b38fc55
+DIST seednodes-20090821.fref 19121 RMD160 137cca51b4e74795eab722bec600655bf6bffca8 SHA1 d17a5d7b0603fed8352b5453eadd56fcfabcfb05 SHA256 ba0a1b6e8852125802653290ca895642075a4e940f3dd5a6215266eb427d40e2
 EBUILD freenet-0.7.5_p1229.ebuild 3138 RMD160 0176a21a5470453db4efec2a86523861bdc15429 SHA1 6dc46f74ba620c37549aa270fa7565cdd0221f01 SHA256 c1906b39d398a8ae632e322999e59a924908674c2d0dc9a43f3fd07ef170e191
+EBUILD freenet-0.7.5_p1232.ebuild 3185 RMD160 eaccfb0d6ce45fc3993f2773b629b52f0e0136fa SHA1 7aacab7cafd215f28196ae182bcac68d2e8a7ac3 SHA256 4eaa8053cc0c0e08359c5fb1c5e829c17ac27616e81cf55e6239dbeb84ea456c
 EBUILD freenet-9999.ebuild 2579 RMD160 255a5788443eab70fa464697582ecaebec34bd2c SHA1 41fc872b44bd96132b1084a75ae603ac0cd1214d SHA256 4153fcfcb720e3ac72c791d6d8b009afc62a3830278e8091f92fc4d73994fbdc
-MISC ChangeLog 3935 RMD160 7ecd9d2cc33d59c53d6476f477706f2a6f3d92bc SHA1 fe8acc549c39c35dbbd83cf1bdc13542c6cbe298 SHA256 e37637f53e8fbfa397ce502b965c7b8a185d0e4a7e5fe46222811dbea8ef9210
+MISC ChangeLog 4267 RMD160 1b3aa52260dbf9f26f41ebd4b7eaaea1db40e2e3 SHA1 887f4e4a6656a33c716206a924a812bb6187193c SHA256 1eccc7de9fbef45dbeef07fff440f59e84b12e475f4b307da522ea30f7186074
 MISC metadata.xml 332 RMD160 5e5c8b88681af85d63236c47f3a9a92881515679 SHA1 38a87952bb9389758e8700b4468b122ccf5199ea SHA256 3ca39205a9351767ed2901a4c8c8dd563ed1d83f6684f3bb6c2ab9e92ba4c10f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iJwEAQECAAYFAkqJkjsACgkQG7kqcTWJkGctUgP+N6O7BH//SIhw0AeMKgjP4lut
-wZyZNNd87mWHFbJWDHITztK5QuLUj/EERV6U3RkfS04OKiOhZ2BpX0dRS3JZpJi9
-YyTNpIIT8cOgkqyt6qcR5fIgp+CrGJ+3n4aSI9Y3tJuPqh4aYy3yMQ4cQQuTj4Xf
-AOA9xC/gVRW3zF/4Kgs=
-=YusU
+iJwEAQECAAYFAkqQBcAACgkQG7kqcTWJkGcvJwP+Jm8V3EkioWdHHCbmVZEKezY9
+3jmDkS879/AwWrRvLHmVPUWQRPT8uZoxwhKKZSsEwp0Nv7PsCG0XF/jcY54oROaP
+S9U/banKjymyLtGRDWtW3tsENpEJWJi4Bqg4lIBu2F/bimn7hGODzoy0GqR3n9PP
+qmxx4yRkX+U3cRcBtbE=
+=13os
 -----END PGP SIGNATURE-----
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