fixed according to bug #35275

5 files changed, 70 insertions, 29 deletions

diff --git a/net-www/wwwoffle/ChangeLog b/net-www/wwwoffle/ChangeLog
index 8b2eeb353303..533e22c770ec 100644
--- a/net-www/wwwoffle/ChangeLog
+++ b/net-www/wwwoffle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/wwwoffle
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/ChangeLog,v 1.17 2004/05/07 13:05:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/ChangeLog,v 1.18 2004/06/05 16:12:54 dragonheart Exp $
+
+  06 Jun 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/wwwoffled-online-2.8b, wwwoffle-2.7h.ebuild, wwwoffle-2.8b.ebuild:
+  Fixed the remainder of bug #35275. QA fix to 2.7h
 
   07 May 2004; Daniel Black <dragonheart@gentoo.org> -wwwoffle-2.7d.ebuild,
   wwwoffle-2.7g.ebuild, wwwoffle-2.7h.ebuild:
diff --git a/net-www/wwwoffle/Manifest b/net-www/wwwoffle/Manifest
index 5602775842d9..198508aebd8f 100644
--- a/net-www/wwwoffle/Manifest
+++ b/net-www/wwwoffle/Manifest
@@ -1,8 +1,9 @@
-MD5 debe9cc230c0e8ae2d70dbcb51fd47c2 ChangeLog 2821
+MD5 d5a36080caf7e0a3d452242a055e1d14 ChangeLog 3002
 MD5 8be4fd1e048b7d6e83c6d2803bbff513 wwwoffle-2.7g.ebuild 1878
-MD5 07fe1341ef0f47b0fcefff56f40230fe wwwoffle-2.7h.ebuild 1898
-MD5 71e6a90a000004841545623f1c15cb81 wwwoffle-2.8b.ebuild 3393
+MD5 ce596de9ca6f3a61ef1a492a40350196 wwwoffle-2.7h.ebuild 1882
+MD5 e744d46cccb27bdd705edc883e718412 wwwoffle-2.8b.ebuild 4061
 MD5 1d58b504a9415220f2ee8c3b62e27aa9 metadata.xml 500
+MD5 efd40a1a2a7cbcaf26dd408042f562ad files/wwwoffled-online-2.8b 535
 MD5 1eb7e26a722b119b2750376f065f5403 files/digest-wwwoffle-2.7g 62
 MD5 a6914435a2f1de064fcdc7c784a2b85f files/digest-wwwoffle-2.7h 62
 MD5 1bdbb828062085b6df7543b85cc35a2b files/wwwoffled 518
diff --git a/net-www/wwwoffle/files/wwwoffled-online-2.8b b/net-www/wwwoffle/files/wwwoffled-online-2.8b
new file mode 100644
index 000000000000..276f8c669a24
--- /dev/null
+++ b/net-www/wwwoffle/files/wwwoffled-online-2.8b
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/files/wwwoffled-online-2.8b,v 1.1 2004/06/05 16:12:54 dragonheart Exp $
+
+depend() {
+	need wwwoffled net.${IFACE}
+}
+
+start() {
+	ebegin "Starting wwwoffled-online"
+	wwwoffle -online -c /etc/wwwoffle.conf
+	wwwoffle -fetch -c /etc/wwwoffle.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping wwwoffled-online"
+	wwwoffle -offline -c /etc/wwwoffle.conf
+	eend $?
+}
diff --git a/net-www/wwwoffle/wwwoffle-2.7h.ebuild b/net-www/wwwoffle/wwwoffle-2.7h.ebuild
index 7c62bc4741d1..24016bf17595 100644
--- a/net-www/wwwoffle/wwwoffle-2.7h.ebuild
+++ b/net-www/wwwoffle/wwwoffle-2.7h.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7h.ebuild,v 1.7 2004/05/07 13:05:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7h.ebuild,v 1.8 2004/06/05 16:12:54 dragonheart Exp $
 
 S=${WORKDIR}/${P}
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gedanken.demon.co.uk/"
 KEYWORDS="x86 ~sparc ~ppc ppc64"
 SLOT="0"
 LICENSE="GPL-2"
-
+IUSE="ipv6"
 DEPEND="sys-devel/flex
 	sys-libs/zlib
 	sys-devel/gcc
@@ -39,9 +39,7 @@ src_install() {
 	make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
 
 	cd ${D}/etc
-	mv wwwoffle.conf 1
-	sed -e "s:${D}::" 1 > wwwoffle.conf
-	rm 1
+	sed -i -e "s:${D}::"  wwwoffle.conf
 
 	# Install the wwwoffled init script
 	exeinto /etc/init.d
diff --git a/net-www/wwwoffle/wwwoffle-2.8b.ebuild b/net-www/wwwoffle/wwwoffle-2.8b.ebuild
index d80d31882055..a6e3f879dd84 100644
--- a/net-www/wwwoffle/wwwoffle-2.8b.ebuild
+++ b/net-www/wwwoffle/wwwoffle-2.8b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.8b.ebuild,v 1.2 2004/04/28 08:58:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.8b.ebuild,v 1.3 2004/06/05 16:12:54 dragonheart Exp $
 
 inherit eutils
 
@@ -59,16 +59,33 @@ src_compile() {
 	emake || die
 }
 
+pkg_preinst() {
+
+	# TODO rootjail ${ROOT}
+	source /etc/init.d/functions.sh
+	if [ -L ${svcdir}/started/wwwoffled ]; then
+		einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
+		restart the script."
+		/etc/init.d/wwwoffled stop
+		# Just to be sure...
+		start-stop-daemon --stop --quiet --name wwwoffled
+		touch ${T}/stopped
+	fi
+}
+
+
 src_install() {
 	emake DESTDIR=${D} install || die
 
 	# install the wwwoffled init script
 	exeinto /etc/init.d
-	doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
+	doexe ${FILESDIR}/wwwoffled
+	newexe  ${FILESDIR}/wwwoffled-online-${PV} wwwoffled-online
 
 	# keep spool
 	keepdir /var/spool/wwwoffle/{http,outgoing,monitor,lasttime,prevtime1,lastout,local}
 
+	fowners root:wwwoffle /var/spool/wwwoffle
 	# empty dirs are removed during update
 	keepdir \
 	/var/spool/wwwoffle/search/{mnogosearch/db,htdig/tmp,htdig/db-lasttime,htdig/db,namazu/db}
@@ -77,35 +94,35 @@ src_install() {
 	rmdir ${D}/usr/share/doc/${P}/{it,nl,ru}
 
 	chown -R wwwoffle:wwwoffle \
-		${D}/var/spool/wwwoffle/{http,outgoing,monitor,lasttime,prevtime1,lastout,local} \
+	${D}/var/spool/wwwoffle/{http,outgoing,monitor,lasttime,prevtime[1-9],prevout[1-9]lastout,local} \
 	${D}/var/spool/wwwoffle/search/{mnogosearch/db,htdig/tmp,htdig/db-lasttime,htdig/db,namazu/db}
 
-	# for those upgrading...
-	[ -f ${ROOT}/etc/wwwoffle.conf ] && \
-		sed -e 's/\(run-[gu]id\)[ \t]*=[ \t]*[a-zA-Z0-9]*[ \t]*$/\1 = wwwoffle/g' \
-			${ROOT}/etc/wwwoffle.conf > ${D}/etc/wwwoffle/wwwoffle.conf
-}
+	dodir /etc/conf.d
+	local config=${D}/etc/conf.d/wwwoffled-online
+	echo -e "\n\n# Enter the interface that connects you to the outside world" >> ${config}
+	echo '# This will correspond to /etc/init.d/net.${IFACE}' >> ${config}
+	echo -e "\n# IMPORTANT: Be sure to run depscan.sh after modifiying IFACE" >>  ${config}
+	echo "IFACE=ppp0" >> ${config}
 
-pkg_preinst() {
+	# for those upgrading...(removed)
+	#[ -f ${ROOT}/etc/wwwoffle.conf ] && \
+	#	sed -e 's/\(run-[gu]id\)[ \t]*=[ \t]*[a-zA-Z0-9]*[ \t]*$/\1 = wwwoffle/g' \
+	#		${ROOT}/etc/wwwoffle.conf > ${D}/etc/wwwoffle/wwwoffle.conf
 
-	# TODO rootjail ${ROOT}
-	source /etc/init.d/functions.sh
-	if [ -L ${svcdir}/started/wwwoffled ]; then
-		einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
-		restart the script."
-		/etc/init.d/wwwoffled stop
-		# Just to be sure...
-		start-stop-daemon --stop --quiet --name wwwoffled
-		touch ${T}/stopped
-	fi
 }
 
 pkg_postinst() {
 	# fix permissions for those upgrading
 	chown -R wwwoffle:wwwoffle \
-		${ROOT}/var/spool/wwwoffle/{http,outgoing,monitor,lasttime,prevtime1,lastout,local} \
+	${ROOT}/var/spool/wwwoffle/{http,outgoing,monitor,lasttime,prevtime[1-9],prevout[1-9],lastout,local} \
 	${ROOT}/var/spool/wwwoffle/search/{mnogosearch/db,htdig/tmp,htdig/db-lasttime,htdig/db,namazu/db}
 
+	chown root:wwwoffle /var/spool/wwwoffle
 	[ -f ${T}/stopped ] && \
 		ewarn "wwwoffled was stopped. /etc/init.d/wwwoffled start to restart AFTER etc-update"
+
+
+	einfo "wwwoffled should run as an ordinary user now. Please change run-uid and run-gid to wwwoffle in"
+	einfo "your /etc/wwwoffle/wwwoffle.conf"
+
 }