Version bump

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

6 files changed, 130 insertions, 12 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 05ca982b7262..e4fb161513b6 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.65 2009/08/10 00:33:35 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.66 2009/08/10 20:04:50 tommy Exp $
+
+*freenet-0.7.5_p1229 (10 Aug 2009)
+
+  10 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_p1229.ebuild, files/strip-version-check.patch:
+  Version bump
 
 *freenet-0.7.5_p1228 (10 Aug 2009)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index b118846454f3..774b26e13d3b 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,24 +1,26 @@
 -----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.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 strip-version-check.patch 349 RMD160 579ddfdf6549263e7ec2b9190eff6d08d6a2d5c4 SHA1 58e7422d180e4f443d415ec424646933eceeceb8 SHA256 35a33e5c52288505eefca96a6fbb98ae725d6fbefb727e73e513a1356b5cbfef
 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_p1228.ebuild 3110 RMD160 120d8d949642810b395e5557558312a4c9073c56 SHA1 d2d60e1e14ffede9635ce77ee113d5cb8ea65ce8 SHA256 c63deb5f30ff438e092f94ea1331f2d87f6bc601c82e85c746362e6a81cc6ebf
+EBUILD freenet-0.7.5_p1228.ebuild 3115 RMD160 177688bc4564db34dcb748b4ad6f9ca27e88e2ea SHA1 622e5bd95c0f441400055a6dfd2692b7c3ca590f SHA256 e6a462f756104650e620a3876270a1dd7e988d18f49983be01eb4d7553876282
+EBUILD freenet-0.7.5_p1229.ebuild 3110 RMD160 fa26e5c6df872b91d2a6f2aaba851d13e2729189 SHA1 7e1861ae60025ef1d8e42b8606288fd6d1cc7c55 SHA256 36c603a5bd85d61286b49736850e2866ceb96a11eb9a9e21dec72ac1bd29b26e
 EBUILD freenet-9999.ebuild 2551 RMD160 f2eff29f748334cbb32a7999e5d605f82ebd6545 SHA1 097203589039d568d6fa182d5761dbfec9709f7e SHA256 50430b5c3ccca4e15af0555f446f3d187a151e9077eaaea487c08ab410b2bb07
-MISC ChangeLog 3570 RMD160 a2a82d8657dd06c7a1614fe87dae3d0e3229d10b SHA1 7eeb10f47ae9905c065a7929e302a502bd7d1a8c SHA256 efcb255916bfac67113c84a2b4d94901303c3e3f0687b894163a15bf4d218a64
+MISC ChangeLog 3820 RMD160 8e3ac71da521ee489aee06c3d8e22b44ab9925bb SHA1 c834e13ca000dd0cdc78ac8aa8615149bd6ec88c SHA256 5f176d04d9c36511a0be39a7fdbdfb396217fc2787452f0fdf5b68e679909569
 MISC metadata.xml 332 RMD160 5e5c8b88681af85d63236c47f3a9a92881515679 SHA1 38a87952bb9389758e8700b4468b122ccf5199ea SHA256 3ca39205a9351767ed2901a4c8c8dd563ed1d83f6684f3bb6c2ab9e92ba4c10f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iJwEAQECAAYFAkp/avMACgkQG7kqcTWJkGdv9QP/Q8MrdGK3o9wQsa10oNWc0EOL
-4t9ClyR0VOwUIxGOLwFC8NnsE991cXV+xqUrpZoLvstFfZ99W+QnCujVppJdOltz
-qmYz+qa0MwHfWvw5JqQjgpPEcCqpvkBVhoP18gbRplPPS4cuJOEUe/PrKWVfOD1b
-cGmwZopeJrNlwz6lv1M=
-=tp/l
+iJwEAQECAAYFAkqAfXEACgkQG7kqcTWJkGfgTwP/ZuGi10b1ciOAt/a1cLxv9KQu
+1kPY6SSL2pWeMCOc0vyqdRWrh+RIw5AmZ7r2ci2hsOC+MILgRJxP3/Q+RmYoxZbz
+H72pmoxYpCYDNPCD+UNijeeaxgiMgtQv11FpXqSDEQkCAxSCyltwLcDB8ymVB1u6
+rsyUgBq781CBzYL47JQ=
+=rXj4
 -----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
new file mode 100644
index 000000000000..93d54c94cd16
--- /dev/null
+++ b/net-p2p/freenet/files/0.7.5_p1228strip-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/files/strip-version-check.patch b/net-p2p/freenet/files/strip-version-check.patch
index 93d54c94cd16..b00990658604 100644
--- a/net-p2p/freenet/files/strip-version-check.patch
+++ b/net-p2p/freenet/files/strip-version-check.patch
@@ -5,7 +5,7 @@
  				if(is150 && subver < 10)
  					spuriousOOMs = true;
 -				
--				if(is150 && subver < 15 || is160 && subver < 20)
+-				if(is150 && subver < 20 || is160 && subver < 15)
 -					xmlRemoteCodeExec = true;
  			}
  			
diff --git a/net-p2p/freenet/freenet-0.7.5_p1228.ebuild b/net-p2p/freenet/freenet-0.7.5_p1228.ebuild
index 2d121c851482..ae1eb3bb9df7 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1228.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1228.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2009/08/10 00:33:35 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1228.ebuild,v 1.2 2009/08/10 20:04:50 tommy Exp $
 
 EAPI="1"
 DATE=20090708
@@ -55,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,strip-version-check}.patch
+	epatch "${FILESDIR}"/{ext,${PV}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
diff --git a/net-p2p/freenet/freenet-0.7.5_p1229.ebuild b/net-p2p/freenet/freenet-0.7.5_p1229.ebuild
new file mode 100644
index 000000000000..d2c7900e8ef1
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1229.ebuild
@@ -0,0 +1,97 @@
+# 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_p1229.ebuild,v 1.1 2009/08/10 20:04:50 tommy Exp $
+
+EAPI="1"
+DATE=20090708
+
+EGIT_REPO_URI="git://github.com/freenet/fred-staging.git"
+EGIT_PROJECT="freenet/fred-staging"
+EGIT_TREE="127b7772c442079abdc0acb1f45a5aae91266cb9"
+
+inherit eutils git java-pkg-2 java-ant-2 multilib
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="http://www.freenetproject.org/"
+SRC_URI="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="|| ( >=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="|| ( >=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
+	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() {
+	java-pkg-2_pkg_setup
+	enewgroup freenet
+	enewuser freenet -1 -1 /var/freenet freenet
+}
+
+src_unpack() {
+	git_src_unpack
+	cd "${S}"
+	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+	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
+}
+
+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 [ -z has_version ]; 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
+}