version bump. Solves bug #61965 by Stanislav Brabec <utx@penguin.cz>. Attempts to solve bug #7728 however there is still problems

7 files changed, 265 insertions, 1 deletions

diff --git a/www-proxy/wwwoffle/ChangeLog b/www-proxy/wwwoffle/ChangeLog
index 638f3925a5f2..021d39545c6a 100644
--- a/www-proxy/wwwoffle/ChangeLog
+++ b/www-proxy/wwwoffle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-proxy/wwwoffle
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/ChangeLog,v 1.3 2004/09/05 09:27:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/ChangeLog,v 1.4 2004/09/19 07:18:42 dragonheart Exp $
+
+*wwwoffle-2.8c (19 Sep 2004)
+
+  19 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/wwwoffle-2.8c-config-online, +files/wwwoffle-2.8c-init,
+  +files/wwwoffle-2.8c-init-online, +wwwoffle-2.8c.ebuild:
+  version bump. Solves bug #61965 by Stanislav Brabec <utx@penguin.cz>. Attempts
+  to solve bug #7728 however there is still problems
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/www-proxy/wwwoffle/Manifest b/www-proxy/wwwoffle/Manifest
index 5af3373044b5..a4d2b7b5bf48 100644
--- a/www-proxy/wwwoffle/Manifest
+++ b/www-proxy/wwwoffle/Manifest
@@ -1,12 +1,30 @@
+<<<<<<< Manifest
+MD5 5c57936b63b7001c8996a6d4a0ed0892 ChangeLog 4336
+=======
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+>>>>>>> 1.3
 MD5 1d58b504a9415220f2ee8c3b62e27aa9 metadata.xml 500
+<<<<<<< Manifest
+MD5 0ebf80ac3b77f5978548793a444da2ab wwwoffle-2.7h.ebuild 1850
+MD5 a8f604fd3665aabc1a2fc41cedeccf5d wwwoffle-2.8b.ebuild 4533
+MD5 87bf74db551c93c1eec3b2d0bb91bd05 wwwoffle-2.8c.ebuild 4681
+=======
 MD5 07fd41412527be803f47bc33f655d04a wwwoffle-2.7h.ebuild 1851
 MD5 f22ae7381da1e4ad894c3cfd1f0d6cb9 wwwoffle-2.8b.ebuild 4534
 MD5 29cb5ab8a9568f51d126da1cf67341dd ChangeLog 4699
+>>>>>>> 1.3
 MD5 a6914435a2f1de064fcdc7c784a2b85f files/digest-wwwoffle-2.7h 62
 MD5 009de7420924ad30ca9611df2d1d6299 files/digest-wwwoffle-2.8b 62
+<<<<<<< Manifest
+MD5 6cf4ab4a8f2db9c8e503aac035d38eae files/wwwoffled 506
+MD5 ecf6ff07d66bdc91ff7ff6014ab5c016 files/wwwoffled-online 510
+MD5 a426ce505020deefa18627d26d04eed0 files/wwwoffled-online-2.8b 524
+MD5 09bad363445f5ae84603fcb283b17003 files/digest-wwwoffle-2.8c 62
+MD5 3316c66ad7cc6db6100aba4bcf083eaa files/wwwoffled-online-config-2.8c 409
+MD5 a426ce505020deefa18627d26d04eed0 files/wwwoffled-online-2.8c 524
+=======
 MD5 6cf4ab4a8f2db9c8e503aac035d38eae files/wwwoffled 506
 MD5 ecf6ff07d66bdc91ff7ff6014ab5c016 files/wwwoffled-online 510
 MD5 a426ce505020deefa18627d26d04eed0 files/wwwoffled-online-2.8b 524
@@ -17,3 +35,4 @@ iD8DBQFBOtwNI1lqEGTUzyQRAlg6AJ9dRDxTsIi2XRicJaKLA3QnSTNqVACePAy1
 utAeLvTU56S7qiXj88HS4Ak=
 =Z8+r
 -----END PGP SIGNATURE-----
+>>>>>>> 1.3
diff --git a/www-proxy/wwwoffle/files/digest-wwwoffle-2.8c b/www-proxy/wwwoffle/files/digest-wwwoffle-2.8c
new file mode 100644
index 000000000000..b1dedbf04753
--- /dev/null
+++ b/www-proxy/wwwoffle/files/digest-wwwoffle-2.8c
@@ -0,0 +1 @@
+MD5 bf1cfba5f37cc0545c536a899713a8ee wwwoffle-2.8c.tgz 978899
diff --git a/www-proxy/wwwoffle/files/wwwoffle-2.8c-config-online b/www-proxy/wwwoffle/files/wwwoffle-2.8c-config-online
new file mode 100644
index 000000000000..14c740b0f204
--- /dev/null
+++ b/www-proxy/wwwoffle/files/wwwoffle-2.8c-config-online
@@ -0,0 +1,10 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/files/wwwoffle-2.8c-config-online,v 1.1 2004/09/19 07:18:43 dragonheart Exp $
+
+# Enter the interface that connects you to the outside world
+# This will correspond to /etc/wwwoffle/init.d/net.${IFACE}
+
+# IMPORTANT: Be sure to run depscan.sh after modifiying IFACE
+
+#IFACE=ppp0
diff --git a/www-proxy/wwwoffle/files/wwwoffle-2.8c-init b/www-proxy/wwwoffle/files/wwwoffle-2.8c-init
new file mode 100644
index 000000000000..0a5d27941fba
--- /dev/null
+++ b/www-proxy/wwwoffle/files/wwwoffle-2.8c-init
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/files/wwwoffle-2.8c-init,v 1.1 2004/09/19 07:18:43 dragonheart Exp $
+
+depend() {
+	need localmount
+}
+
+start() {
+	ebegin "Starting wwwoffled"
+	start-stop-daemon --start --quiet --exec /usr/sbin/wwwoffled \
+		-u wwwoffle -- -c /etc/wwwoffle/wwwoffle.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping wwwoffled"
+	start-stop-daemon --stop --quiet --name wwwoffled
+	eend $?
+}
diff --git a/www-proxy/wwwoffle/files/wwwoffle-2.8c-init-online b/www-proxy/wwwoffle/files/wwwoffle-2.8c-init-online
new file mode 100644
index 000000000000..725c3842f782
--- /dev/null
+++ b/www-proxy/wwwoffle/files/wwwoffle-2.8c-init-online
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/files/wwwoffle-2.8c-init-online,v 1.1 2004/09/19 07:18:43 dragonheart Exp $
+
+depend() {
+	need wwwoffled dns
+
+	if [ -n ${IFACE} ];
+	then
+		need net.${IFACE}
+	else
+		ewarn "No IFACE is defined in /etc/conf.d/wwwoffle-online"
+		need net
+	fi
+}
+
+start() {
+	ebegin "Starting wwwoffled-online"
+	wwwoffle -online -c /etc/wwwoffle/wwwoffle.conf
+	wwwoffle -fetch -c /etc/wwwoffle/wwwoffle.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping wwwoffled-online"
+	wwwoffle -offline -c /etc/wwwoffle/wwwoffle.conf
+	eend $?
+}
diff --git a/www-proxy/wwwoffle/wwwoffle-2.8c.ebuild b/www-proxy/wwwoffle/wwwoffle-2.8c.ebuild
new file mode 100644
index 000000000000..a3a1ac941c5f
--- /dev/null
+++ b/www-proxy/wwwoffle/wwwoffle-2.8c.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/wwwoffle-2.8c.ebuild,v 1.1 2004/09/19 07:18:42 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="wwwoffle = WWW Offline Explorer, an adv. caching proxy especially suitable for nonpermanent (e.g. dialup) Internet connections"
+
+SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/www/servers/${P}.tgz"
+HOMEPAGE="http://www.gedanken.demon.co.uk/wwwoffle"
+KEYWORDS="~x86 ~sparc ~ppc ~ppc64"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="ipv6"
+
+DEPEND=">=sys-apps/sed-4
+	sys-apps/gawk
+	sys-apps/grep
+	dev-lang/perl
+	sys-devel/flex
+	sys-libs/zlib
+	sys-devel/gcc
+	virtual/libc
+	app-arch/tar"
+
+RDEPEND="sys-libs/zlib
+	virtual/libc"
+
+# Unsure weither to depend or not
+#	>=www-misc/htdig-3.1.6-r4"
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
+		cache/Makefile.in
+}
+
+src_compile() {
+
+	# TODO confdir back to default /etc/wwwoffle
+	# allows to change config file using web interface.
+
+	local myconf
+	myconf="`use_with ipv6`"
+	econf ${myconf} || die
+	emake || die
+
+	if [ -f ${ROOT}/etc/wwwoffle.conf ]
+	then
+		einfo "Upgrading current configuration file"
+		cp ${ROOT}/etc/wwwoffle.conf conf/wwwoffle.conf
+		conf/upgrade-config.pl conf/wwwoffle.conf
+
+		# Hack to stop regeneration of config file
+		touch conf/conf-file
+
+		einfo "Changing the default user (and group) to wwwoffle"
+		sed -i -e 's/\(run-[gu]id\)[ \t]*=[ \t]*[a-zA-Z0-9]*[ \t]*$/\1 = wwwoffle/g' \
+			onf/wwwoffle.conf
+	else
+		einfo "Changing the default user (and group) to wwwoffle"
+		sed -i -e 's/#\(run-[gu]id\)[ \t]*=[ \t]*[a-zA-Z0-9]*[ \t]*$/\1 = wwwoffle/g' \
+			conf/wwwoffle.conf.template
+	fi
+
+}
+
+pkg_preinst() {
+
+	# Add a wwwoffle user - required here for binary packages
+	enewgroup wwwoffle
+	enewuser wwwoffle -1 /bin/false /var/spool/wwwoffle wwwoffle
+
+	# TODO maybe 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
+
+	# documentation fix
+	# del empty doc dirs
+	rmdir ${D}/usr/doc/${PN}/{it,nl,ru}
+	dodir /usr/share/doc
+	mv ${D}/usr/doc/wwwoffle ${D}/usr/share/doc/${PF}
+
+	#Updated configuration file
+	#if [ -f ${ROOT}/etc/wwwoffle.conf ];
+	#then
+	#	mv ${D}/etc/wwwoffle.conf ${D}/etc/wwwoffle.conf.updated
+	#fi
+
+	# install the wwwoffled init script
+	newinitd ${FILESDIR}/${P}-init ${PN}d
+	newinitd  ${FILESDIR}/${P}-init-online ${PN}d-online
+	newconfd ${FILESDIR}/${P}-config-online wwwoffled-online
+
+	keepdir /var/spool/wwwoffle/{http,outgoing,monitor,lasttime,lastout,local}
+	for number in 1 2 3 4 5 6 7 8 9;
+	do
+		keepdir /var/spool/wwwoffle/prevtime${number} /var/spool/wwwoffle/prevout${number}
+	done
+
+	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}
+
+	touch \
+	${D}/var/spool/wwwoffle/search/htdig/wwwoffle-htdig.log \
+	${D}/var/spool/wwwoffle/search/mnogosearch/wwwoffle-mnogosearch.log \
+	${D}/var/spool/wwwoffle/search/namazu/wwwoffle-namazu.log
+
+	chown -R wwwoffle:wwwoffle \
+	${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} \
+	${D}/var/spool/wwwoffle/search/{mnogosearch,htdig,namazu}/wwwoffle-*.log \
+	${D}/etc/wwwoffle
+
+	# TODO htdig indexing as part of initscripts
+
+	# robots.txt modification - /var/spool/wwwoffle/html/en
+	# 		- remove Disallow: /index
+	sed -i -e "s|Disallow:.*/index|#Disallow: /index|" ${D}/var/spool/wwwoffle/html/en/robots.txt
+
+	rmdir ${D}/usr/doc
+}
+
+pkg_postinst() {
+	# fix permissions for those upgrading
+
+	for number in 1 2 3 4 5 6 7 8 9;
+	do
+		[ ! -d ${ROOT}/var/spool/wwwoffle/prevtime${number} ] &&  keepdir \
+			${ROOT}/var/spool/wwwoffle/prevtime${number}
+		[ ! -d ${ROOT}/var/spool/wwwoffle/prevout${number} ] &&  keepdir \
+			${ROOT}/var/spool/wwwoffle/prevout${number}
+	done
+
+	chown -R wwwoffle:wwwoffle \
+	${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. The run-uid and run-gid should be set"
+	einfo "to \"wwwoffle\" in your /etc/wwwoffle/wwwoffle.conf. Please uncomment this if it hasn't been already"
+
+	einfo "This is for your own security. Otherwise wwwoffle is run as root which is relay bad if"
+	einfo "there is an exploit in this program that allows remote/local users to execute arbitary"
+	einfo "commands as the root user."
+
+
+	if [ -f ${ROOT}/etc/wwwoffle.conf ];
+	then
+		ewarn "Configuration file is /etc/wwwoffle/wwwoffle.conf now"
+		ewarn "Suggest you move ${ROOT}etc/wwwoffle.conf"
+	fi
+
+
+	# if htdig - run script for full database index
+	# TODO
+}