Version bump

Package-Manager: portage-2.2_rc36-r2/cvs/Linux x86_64

5 files changed, 43 insertions, 21 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 0c5d81ed7e28..05ca982b7262 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # 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.64 2009/08/02 21:22:52 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.65 2009/08/10 00:33:35 tommy Exp $
+
+*freenet-0.7.5_p1228 (10 Aug 2009)
+
+  10 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1227.ebuild, +freenet-0.7.5_p1228.ebuild, files/ext.patch,
+  +files/strip-version-check.patch:
+  Version bump
 
 *freenet-0.7.5_p1227 (02 Aug 2009)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index d9abf24bc1a5..b118846454f3 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ext.patch 2696 RMD160 c6d3b033feb7ef80fa3f99b6dda0cee24d361877 SHA1 1c5fb77c045fc8762d230689ddb5f5485633f9b9 SHA256 cc87570b7ee917ef663e746e09215978fb82a41f0310f8f6faf203045e9a89c6
+AUX ext.patch 2644 RMD160 037d1f8d15e6f2da50c96ec172266b7ea4e14972 SHA1 7615f981a804ca8e553a98eeb3563cfd7720495b SHA256 d8131189125b31bdf37db90812ed7e53f7480f70e4c00bd35bd56c0427d6e709
 AUX freenet 476 RMD160 fdce44749587d73cb3f5b916e893e3bb95ef3200 SHA1 48eb8bfbd27a17b0bb3b29248ce4c43b59a76bda SHA256 4a8482117a434e9885438b7ca5384851bff49fefa28b13e33494a746c781342f
 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 774ab76fe4f54ae53ab047f39eb7826b4886faa6 SHA1 0f241381e2b49aa145481957daeb7258f0d093b0 SHA256 fc89ec37f46a595da4f85a475b34bcfb4dec81729eaec5853b62f98cfdcaaa32
 AUX wrapper1.conf 2367 RMD160 9bd2b0337e63b671c7bc4f03ad32b377953ec412 SHA1 1736bfee8a762c8083900e4c9eb7e0b0a3ece961 SHA256 eef1d68b0361444f50573dc2056793bb10aed7b218309cadb25007e8254745f2
 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_p1227.ebuild 2753 RMD160 df04db64daec8409ddea8cd3a9222188d844500c SHA1 b1b10847c0123d0d40d8d99550dc65b906a22262 SHA256 15a79eec9f16192335877fa9b9e554858a7ae8110dc97b44c5837551657b3b02
+EBUILD freenet-0.7.5_p1228.ebuild 3110 RMD160 120d8d949642810b395e5557558312a4c9073c56 SHA1 d2d60e1e14ffede9635ce77ee113d5cb8ea65ce8 SHA256 c63deb5f30ff438e092f94ea1331f2d87f6bc601c82e85c746362e6a81cc6ebf
 EBUILD freenet-9999.ebuild 2551 RMD160 f2eff29f748334cbb32a7999e5d605f82ebd6545 SHA1 097203589039d568d6fa182d5761dbfec9709f7e SHA256 50430b5c3ccca4e15af0555f446f3d187a151e9077eaaea487c08ab410b2bb07
-MISC ChangeLog 3346 RMD160 a82af515ecbf490c57cc545fecead7509c45b17a SHA1 c6ca33bc04efd0c62638d5dd53c5d113a56941cb SHA256 67738e5c4cf1c82c977bb690175627e9a19bf3a2315f05ec94f80f6455e65a2b
+MISC ChangeLog 3570 RMD160 a2a82d8657dd06c7a1614fe87dae3d0e3229d10b SHA1 7eeb10f47ae9905c065a7929e302a502bd7d1a8c SHA256 efcb255916bfac67113c84a2b4d94901303c3e3f0687b894163a15bf4d218a64
 MISC metadata.xml 332 RMD160 5e5c8b88681af85d63236c47f3a9a92881515679 SHA1 38a87952bb9389758e8700b4468b122ccf5199ea SHA256 3ca39205a9351767ed2901a4c8c8dd563ed1d83f6684f3bb6c2ab9e92ba4c10f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iJwEAQECAAYFAkp2A7cACgkQG7kqcTWJkGfgdwQAsDpjnbZlwLA5/VMwYgUT57FG
-2zO9BN/aEvqakliitLStd5Ptkd/h6kZGeVzWu479Au44/NG6Bf5Prs7wWC56lgoP
-CidOdIdJVcGmLQjINiLuGD7Je15fA+B/LrHO0I4LO9GA4MYbqZvtwC6/8T+8ZWbu
-bNurm3BG2alNi8tOT1I=
-=oXbA
+iJwEAQECAAYFAkp/avMACgkQG7kqcTWJkGdv9QP/Q8MrdGK3o9wQsa10oNWc0EOL
+4t9ClyR0VOwUIxGOLwFC8NnsE991cXV+xqUrpZoLvstFfZ99W+QnCujVppJdOltz
+qmYz+qa0MwHfWvw5JqQjgpPEcCqpvkBVhoP18gbRplPPS4cuJOEUe/PrKWVfOD1b
+cGmwZopeJrNlwz6lv1M=
+=tp/l
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/files/ext.patch b/net-p2p/freenet/files/ext.patch
index f461150c4648..73c4417ac0ef 100644
--- a/net-p2p/freenet/files/ext.patch
+++ b/net-p2p/freenet/files/ext.patch
@@ -1,15 +1,14 @@
-diff -ur freenet-old/build.xml freenet/build.xml
---- freenet/build.xml	2009-02-01 15:23:22.000000000 +0100
-+++ freenet/build.xml.new	2009-02-01 15:24:16.000000000 +0100
-@@ -53,19 +53,9 @@
+--- freenet/build.xml	2009-08-04 20:54:09.267989544 +0200
++++ freenet/build.xml.new	2009-08-04 20:57:01.295527065 +0200
+@@ -68,19 +68,9 @@
  		</exec>
  	</target>
  
 -	<target name="get-extjar" depends="env" unless="freenet-ext.present"
 -		description="Download some external libraries which Freenet relies on">
 -		<mkdir dir="${lib}"/>
--		<get src="http://checksums.freenetproject.org/cc/freenet-ext.jar" 
--			dest="${freenet-ext.location}" 
+-		<get src="http://checksums.freenetproject.org/cc/freenet-ext.jar"
+-			dest="${freenet-ext.location}"
 -			verbose="true"
 -			usetimestamp="true"/>
 -		<property name="freenet-ext.present" value="true"/>
@@ -21,7 +20,7 @@ diff -ur freenet-old/build.xml freenet/build.xml
 +	<target name="compile" depends="generate-CSSTokenizerFilter">
  		<!-- Create the time stamp -->
  		<tstamp/>
- 
+
 diff -ur freenet-old/src/freenet/node/NodeStarter.java freenet/src/freenet/node/NodeStarter.java
 --- freenet-old/src/freenet/node/NodeStarter.java	2008-10-28 21:40:50.000000000 +0100
 +++ freenet/src/freenet/node/NodeStarter.java	2008-10-28 21:39:14.000000000 +0100
diff --git a/net-p2p/freenet/files/strip-version-check.patch b/net-p2p/freenet/files/strip-version-check.patch
new file mode 100644
index 000000000000..93d54c94cd16
--- /dev/null
+++ b/net-p2p/freenet/files/strip-version-check.patch
@@ -0,0 +1,12 @@
+--- 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/freenet-0.7.5_p1227.ebuild b/net-p2p/freenet/freenet-0.7.5_p1228.ebuild
index 545219a2946b..2d121c851482 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1227.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1228.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_p1227.ebuild,v 1.1 2009/08/02 21:22:52 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1228.ebuild,v 1.1 2009/08/10 00:33:35 tommy Exp $
 
 EAPI="1"
 DATE=20090708
 
 EGIT_REPO_URI="git://github.com/freenet/fred-staging.git"
 EGIT_PROJECT="freenet/fred-staging"
-EGIT_TREE="c5009c153b0745ad19f16e478fc619a8864d241c"
+EGIT_TREE="11afcd3792fbb5c6099f5c6d170bfe0fc69d216a"
 
 inherit eutils git java-pkg-2 java-ant-2 multilib
 
@@ -30,9 +30,12 @@ CDEPEND="dev-db/db-je:3.3
 	dev-java/lzma
 	dev-java/lzmajio
 	dev-java/mersennetwister"
-DEPEND=">=virtual/jdk-1.5
+#force secure versions for now
+DEPEND="|| ( >=dev-java/icedtea6-1.5.1 >=dev-java/icedtea6-bin-1.5.1 >=dev-java/sun-jdk-1.5.0.20 >=dev-java/sun-jdk-1.6.0.15 )
+	>=virtual/jdk-1.5
 	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND="|| ( >=dev-java/icedtea6-1.5.1 >=dev-java/icedtea6-bin-1.5.1 >=dev-java/sun-jdk-1.5.0.20 >=dev-java/sun-jdk-1.6.0.15 >=dev-java/sun-jre-bin-1.5.0.20 >=dev-java/sun-jre-bin-1.6.0.15 )
+	>=virtual/jre-1.5
 	net-libs/nativebiginteger
 	${CDEPEND}"
 PDEPEND="net-libs/NativeThread
@@ -52,7 +55,7 @@ src_unpack() {
 	cd "${S}"
 	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/ext.patch
+	epatch "${FILESDIR}"/{ext,strip-version-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