enew{user,group} copied to pkg_preinst to fix binary packages (bug #58526). Added directories to keep (#58315).

4 files changed, 14 insertions, 74 deletions

diff --git a/net-www/wwwoffle/ChangeLog b/net-www/wwwoffle/ChangeLog
index f040b4e3e940..be0b57872312 100644
--- a/net-www/wwwoffle/ChangeLog
+++ b/net-www/wwwoffle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/wwwoffle
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/ChangeLog,v 1.23 2004/07/01 22:51:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/ChangeLog,v 1.24 2004/07/27 13:20:04 dragonheart Exp $
+
+  27 Jul 2004; Daniel Black <dragonheart@gentoo.org> -wwwoffle-2.7g.ebuild,
+  wwwoffle-2.8b.ebuild:
+  enew{user,group} copied to pkg_preinst to fix binary packages (bug #58526).
+  Added directories to keep (#58315). Thanks to Thomas Matthijs
+  <axxo@gentoo.org> and Antonio <netbix@tiscali.it>
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> wwwoffle-2.7g.ebuild,
   wwwoffle-2.7h.ebuild, wwwoffle-2.8b.ebuild:
diff --git a/net-www/wwwoffle/files/digest-wwwoffle-2.7g b/net-www/wwwoffle/files/digest-wwwoffle-2.7g
deleted file mode 100644
index e6df953ccfd0..000000000000
--- a/net-www/wwwoffle/files/digest-wwwoffle-2.7g
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94e4d0afb06635b7b25449b0c1957c58 wwwoffle-2.7g.tgz 888577
diff --git a/net-www/wwwoffle/wwwoffle-2.7g.ebuild b/net-www/wwwoffle/wwwoffle-2.7g.ebuild
deleted file mode 100644
index be2050bbce23..000000000000
--- a/net-www/wwwoffle/wwwoffle-2.7g.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7g.ebuild,v 1.9 2004/07/01 22:51:35 eradicator Exp $
-
-DESCRIPTION="wwwoffle = WWW Offline Explorer, an adv. caching proxy especially suitable for nonpermanent (e.g. dialup) Internet connections"
-
-SRC_URI="ftp://ftp.demon.co.uk/pub/unix/httpd/${P}.tgz
-	 ftp://metalab.unc.edu/pub/Linux/apps/www/servers/${P}.tgz"
-
-HOMEPAGE="http://www.gedanken.demon.co.uk/"
-KEYWORDS="x86 sparc"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="ipv6"
-DEPEND="sys-devel/flex
-	sys-libs/zlib
-	sys-devel/gcc
-	virtual/libc
-	>=sys-apps/sed-4"
-
-RDEPEND="sys-libs/zlib
-	virtual/libc"
-
-
-src_compile() {
-	local myconf
-	use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
-	./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
-
-	emake || die
-}
-
-src_install() {
-	sed -i -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' cache/Makefile
-
-	# Install the files
-	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
-
-	# Install the wwwoffled init script
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
-
-	# someday i'll make it use the file in /etc. for now we at least get
-	# config file protection this way.
-	dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
-}
-
-pkg_preinst() {
-	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
-		touch ${T}/restart
-	fi
-}
-
-pkg_postinst() {
-	if [ -f "${T}/restart" ]; then
-		einfo "Starting the wwwoffled initscript again..."
-		/etc/init.d/wwwoffled start
-		rm ${T}/restart
-	fi
-}
diff --git a/net-www/wwwoffle/wwwoffle-2.8b.ebuild b/net-www/wwwoffle/wwwoffle-2.8b.ebuild
index 51689a80dc73..8f390c40f3e9 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 Foundation
 # 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.7 2004/07/01 22:51:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.8b.ebuild,v 1.8 2004/07/27 13:20:04 dragonheart Exp $
 
 inherit eutils
 
@@ -61,6 +61,10 @@ src_compile() {
 
 pkg_preinst() {
 
+	# Add a wwwoffle user - duplicated for binary packages
+	enewgroup wwwoffle
+	enewuser wwwoffle -1 /bin/false /var/spool/wwwoffle wwwoffle
+
 	# TODO rootjail ${ROOT}
 	source /etc/init.d/functions.sh
 	if [ -L ${svcdir}/started/wwwoffled ]; then
@@ -83,7 +87,7 @@ src_install() {
 	newexe  ${FILESDIR}/wwwoffled-online-${PV} wwwoffled-online
 
 	# keep spool
-	keepdir /var/spool/wwwoffle/{http,outgoing,monitor,lasttime,prevtime1,lastout,local}
+	keepdir /var/spool/wwwoffle/{http,outgoing,monitor,lasttime,prevtime[1-9],prevout[1-9],lastout,local}
 
 	fowners root:wwwoffle /var/spool/wwwoffle
 	# empty dirs are removed during update
@@ -94,7 +98,7 @@ src_install() {
 	rmdir ${D}/usr/share/doc/${P}/{it,nl,ru}
 
 	chown -R wwwoffle:wwwoffle \
-	${D}/var/spool/wwwoffle/{http,outgoing,monitor,lasttime,prevtime[1-9],prevout[1-9]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}
 
 	dodir /etc/conf.d