Version bump

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

5 files changed, 120 insertions, 4 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/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
+}