net-p2p/freenet-bin: Added wrapper init script, so login shell not longer needed

svn path=/sunrise/; revision=4654

4 files changed, 32 insertions, 8 deletions

diff --git a/net-p2p/freenet-bin/ChangeLog b/net-p2p/freenet-bin/ChangeLog
index e680cd8c2..2e08264a3 100644
--- a/net-p2p/freenet-bin/ChangeLog
+++ b/net-p2p/freenet-bin/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   14 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  -freenet-bin-0.7.1061-r1.ebuild, +freenet-bin-0.7.1061-r2.ebuild:
+  Added wrapper init script, so login shell not longer needed
+
+  14 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
   freenet-bin-0.7.1061-r1.ebuild:
   Revert emerge command and delete useless groupdel
 
diff --git a/net-p2p/freenet-bin/Manifest b/net-p2p/freenet-bin/Manifest
index 9e25de19d..3b486a877 100644
--- a/net-p2p/freenet-bin/Manifest
+++ b/net-p2p/freenet-bin/Manifest
@@ -1,8 +1,9 @@
+AUX freenet 416 RMD160 95efeda98fe723027c74729b03fd293ca29bdc7a SHA1 796d336341796d081454ebcc45248e90fffaed91 SHA256 d3b665e8d619d995ef9cb67ed4006c96bc4fdf80e6b7923247e022268ab8bae5
 DIST freenet-ext.jar 2452429 RMD160 fdac9646f7fbb5ee82ad62580191695cc6bef593 SHA1 712aaf061e5e35df47ab6727476b78a0cf8c47da SHA256 1ab33492054eb6e8550f608d3b7d6f3a5117b5905f342bfad8cb38a2a9350bf2
 DIST freenet-r15122-snapshot.jar 2131696 RMD160 416483369415688b6dcf090e3e4f22469418c98a SHA1 146585c7b4df213f4fd2ac9b83ec0fe5ca073327 SHA256 c89cab533b2146d63ee12981aa507d9e85ee79993c261d855906d26cc72be6ae
 DIST freenet07.tar.gz 383366 RMD160 d6f7baee05c1fe2d713fa345fae10bc25287b61e SHA1 8e9ddde6420f5cc24824467747b7a3bcbc21b15c SHA256 aae56bd0d2ed7d80217b1eccab1cf3a946a517df83fc6c1a9de7b95fd82724aa
 DIST update.sh 3115 RMD160 e65f151e06b5a6425dcb59f03b4874ec1e8b5047 SHA1 e024bcfc443982fcc3d888088ef427943fa62f71 SHA256 df80518672316ae8d330e08ef50f170eabacd9003eeac975a400523d0f61922c
 DIST wrapper.conf 1706 RMD160 413f4fec1f60b6d4651f1ffd945e6d9ec2275e39 SHA1 8ec5648d5677325a867118e687f1e05cfe4a417a SHA256 f56a8e897297107c3ea2c95da5f321556e1ac82e87d81f339610f8bb27ecd88b
-EBUILD freenet-bin-0.7.1061-r1.ebuild 2908 RMD160 801b31ebe4daecc5b9e37f41ec7e4002e6d710ca SHA1 a33937d22142d6aeed2a7a295fb1404a45da8af8 SHA256 115a761d59ef686c181d8782be1e465874139d1468b6d057b1fa3ebdc2563c67
-MISC ChangeLog 2664 RMD160 9b0080f1f3ac5463da283dfc86f67fcd0cc1040c SHA1 cfa0125693f4a8fbb9689f66be91119797e45243 SHA256 99dd56f6661ba29e39f4540f66df787864347527b1a5a981f70f922a5a42d436
+EBUILD freenet-bin-0.7.1061-r2.ebuild 2897 RMD160 00e42f1a0778ae0e013b487f79893f2ade268ad2 SHA1 67bea73122a24702ea63d925daacbfad26082025 SHA256 4997762ca12fb605fc34cfa3478354bf1e3413faa37c2447ccabdca859c598e8
+MISC ChangeLog 2856 RMD160 9168dd449ef3a47863b732277d72b1e55af5e4a5 SHA1 3027e07c08f4d93c64e3995a0412f635509490eb SHA256 7ecd599cdc633088203ffa88e7e51a7525d5b55c7edd4467d9d5f903f92fd71c
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-p2p/freenet-bin/files/freenet b/net-p2p/freenet-bin/files/freenet
new file mode 100644
index 000000000..8236bdab9
--- /dev/null
+++ b/net-p2p/freenet-bin/files/freenet
@@ -0,0 +1,18 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	start-stop-daemon --start --chuid freenet --exec /opt/freenet/run.sh start
+	eend 0
+}
+
+status() {
+	start-stop-daemon --start --chuid freenet --exec /opt/freenet/run.sh status
+	eend 0
+}
+
+stop() {
+	start-stop-daemon --start --chuid freenet --exec /opt/freenet/run.sh stop
+	eend 0
+}
diff --git a/net-p2p/freenet-bin/freenet-bin-0.7.1061-r1.ebuild b/net-p2p/freenet-bin/freenet-bin-0.7.1061-r2.ebuild
index 1d7e62e8e..e2be695f8 100644
--- a/net-p2p/freenet-bin/freenet-bin-0.7.1061-r1.ebuild
+++ b/net-p2p/freenet-bin/freenet-bin-0.7.1061-r2.ebuild
@@ -33,16 +33,15 @@ QA_TEXTRELS="opt/freenet/lib/libwrapper-linux-x86-32.so"
 
 pkg_setup() {
 	# previous versions created a passwordless login for freenet user
-	if has_version "<${CATEGORY}/${PN}-0.7.1061-r1" ; then
+	if has_version "<${CATEGORY}/${PN}-0.7.1061-r2" ; then
 		eerror "Previous versions created user account with a passwordless login shell."
 		eerror "You must unmerge the old version first and delete that user account."
-		eerror "emerge -C \\<${CATEGORY}/${PN}-0.7.1061-r1; userdel freenet"
+		eerror "emerge -C \\<${CATEGORY}/${PN}-0.7.1061-r2; userdel freenet"
 		die "Insecure version installed!"
 	fi
 
-	local PASSWD=$(printf "%04hX%04hX%04hX%04hX\n" ${RANDOM} ${RANDOM} ${RANDOM} ${RANDOM})
 	enewgroup freenet
-	enewuser freenet -1 /bin/sh /opt/freenet freenet -p ${PASSWD}
+	enewuser freenet -1 -1 /opt/freenet freenet
 }
 
 src_unpack() {
@@ -64,14 +63,15 @@ src_compile() {
 
 src_install() {
 	cd "${S}"
-	newinitd run.sh freenet
+	doinitd "${FILESDIR}"/freenet
 
 	insinto /opt/freenet
 	doins "${DISTDIR}/freenet-ext.jar" "${DISTDIR}/${MY_JAR_FILE}"
 	doins "${DISTDIR}/update.sh" "${DISTDIR}/wrapper.conf"
-	doins -r update.sh bin lib
+	doins -r update.sh run.sh bin lib
 	dosym freenet-stable-latest.jar /opt/freenet/freenet.jar
 	fperms 755 /opt/freenet/bin/wrapper-linux-x86-{32,64}
+	fperms 755 /opt/freenet/{update,run}.sh
 	fowners -R freenet:freenet /opt/freenet/
 }
 
@@ -85,5 +85,6 @@ pkg_postinst () {
 		:;
 	else
 		cp /opt/freenet/${MY_JAR_FILE} /opt/freenet/freenet-stable-latest.jar
+		chown freenet:freenet /opt/freenet/*jar
 	fi
 }