Add patch which fixes page reloads (#141697).

Package-Manager: portage-2.1-r1

5 files changed, 208 insertions, 5 deletions

diff --git a/net-proxy/wwwoffle/ChangeLog b/net-proxy/wwwoffle/ChangeLog
index 137ebb1d2903..1930c591e8ac 100644
--- a/net-proxy/wwwoffle/ChangeLog
+++ b/net-proxy/wwwoffle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/wwwoffle
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.13 2006/07/06 06:29:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.14 2006/07/25 15:05:56 mrness Exp $
+
+*wwwoffle-2.9-r1 (25 Jul 2006)
+
+  25 Jul 2006; Alin Nastac <mrness@gentoo.org>
+  +files/wwwoffle-2.9-reload.patch, +wwwoffle-2.9-r1.ebuild:
+  Add patch which fixes page reloads (#141697).
 
   06 Jul 2006; Markus Rothe <corsair@gentoo.org> wwwoffle-2.9.ebuild:
   Stable on ppc64
diff --git a/net-proxy/wwwoffle/Manifest b/net-proxy/wwwoffle/Manifest
index 023892cc78cf..973360ba6c2e 100644
--- a/net-proxy/wwwoffle/Manifest
+++ b/net-proxy/wwwoffle/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wwwoffle-2.9-gcc41.patch 1728 RMD160 30664073ca03b3e1ef554a7d78e2c91fd75383e4 SHA1 eca8194632a4f525f37b007edfcf4e37ab34f4ce SHA256 9fb9f470964e6e307f11f88c5bb9afae87c1e807aa6bae939d965c5783f783b5
 MD5 81b9c9d0eaf6200078fdb1380202de80 files/wwwoffle-2.9-gcc41.patch 1728
 RMD160 30664073ca03b3e1ef554a7d78e2c91fd75383e4 files/wwwoffle-2.9-gcc41.patch 1728
 SHA256 9fb9f470964e6e307f11f88c5bb9afae87c1e807aa6bae939d965c5783f783b5 files/wwwoffle-2.9-gcc41.patch 1728
+AUX wwwoffle-2.9-reload.patch 275 RMD160 2abff89f6344d5ec1b81a6f90ff7a12dfc592f63 SHA1 357ecaeb21d492f00f792eca42511d48c9871f7d SHA256 a0a7b4dbcb6880fe96e797c23ce10b50c2e6e93834d498cee5452264658649a7
+MD5 204ad9b60046c9873321d816c6a48e77 files/wwwoffle-2.9-reload.patch 275
+RMD160 2abff89f6344d5ec1b81a6f90ff7a12dfc592f63 files/wwwoffle-2.9-reload.patch 275
+SHA256 a0a7b4dbcb6880fe96e797c23ce10b50c2e6e93834d498cee5452264658649a7 files/wwwoffle-2.9-reload.patch 275
 AUX wwwoffle-online.confd 426 RMD160 2f6e76dcbb9d0d2d7159f8ee86ffe3426414cbb0 SHA1 b5f74da31da73dd9cfe797ee1778d667230c572a SHA256 43782eff21a0e064b36fe9bf4ef56a8f93a4b9c6e7b30d8266c656a59e89b19d
 MD5 848cabe3390aa24c7aea9d08c8d1d937 files/wwwoffle-online.confd 426
 RMD160 2f6e76dcbb9d0d2d7159f8ee86ffe3426414cbb0 files/wwwoffle-online.confd 426
@@ -20,14 +27,18 @@ EBUILD wwwoffle-2.8e.ebuild 5140 RMD160 43521ff92569aba2dc04f9b72c9d57fbf3974b78
 MD5 b32055c6ea5422b6186b09203a4315e2 wwwoffle-2.8e.ebuild 5140
 RMD160 43521ff92569aba2dc04f9b72c9d57fbf3974b78 wwwoffle-2.8e.ebuild 5140
 SHA256 201b15e1add50c2180f2f1c2715e7b0792ba560a2876c84deeba15eb9a28d38c wwwoffle-2.8e.ebuild 5140
+EBUILD wwwoffle-2.9-r1.ebuild 5333 RMD160 be21f1919202db40f6b1dd996fb1a31dd412a665 SHA1 aff9ac04b8f14d99740b6f23c47b682401af4dfa SHA256 0285c21bc577f3cecc92c70cbcf53e9c98e9894a48d9b0f2b078a54d60646657
+MD5 54b6e8d72fbae6d2034eaa56f3d163ea wwwoffle-2.9-r1.ebuild 5333
+RMD160 be21f1919202db40f6b1dd996fb1a31dd412a665 wwwoffle-2.9-r1.ebuild 5333
+SHA256 0285c21bc577f3cecc92c70cbcf53e9c98e9894a48d9b0f2b078a54d60646657 wwwoffle-2.9-r1.ebuild 5333
 EBUILD wwwoffle-2.9.ebuild 5288 RMD160 81c487c80dfc90204a300f2e70bf766db08dfd80 SHA1 ae94b860b3e3c2bab5fc9d0ccad402c0dee0cb95 SHA256 ea29299cb7042dbfc2963c61a71b7053d68dfdd1801f8b4a7baee38fa611f8c5
 MD5 7971ab26a042d3be0174ef843d8a2426 wwwoffle-2.9.ebuild 5288
 RMD160 81c487c80dfc90204a300f2e70bf766db08dfd80 wwwoffle-2.9.ebuild 5288
 SHA256 ea29299cb7042dbfc2963c61a71b7053d68dfdd1801f8b4a7baee38fa611f8c5 wwwoffle-2.9.ebuild 5288
-MISC ChangeLog 7778 RMD160 dbcb3712d946b474ff2353a883a45ed996737d8f SHA1 5a589939e651282da8b1f31f9a0656433d890640 SHA256 7ba27e04ef165aaf6b2fcfdcd9734339f57eb7cf556f6cd0f4754c5a3b591b28
-MD5 f9cf31ca21e6f5f72e55e1e3657d646e ChangeLog 7778
-RMD160 dbcb3712d946b474ff2353a883a45ed996737d8f ChangeLog 7778
-SHA256 7ba27e04ef165aaf6b2fcfdcd9734339f57eb7cf556f6cd0f4754c5a3b591b28 ChangeLog 7778
+MISC ChangeLog 7966 RMD160 58bec05e3eccfa4f8c0d9b3207f362d40b7d804a SHA1 b238675df35b41ecf23ccf6b0462fc8a7a567422 SHA256 efd7c132cd53da94c572b82f17fbadf9ae528f241912d62c6db15528c083f62e
+MD5 c504cd3fb535e9d40ff5dafa502df710 ChangeLog 7966
+RMD160 58bec05e3eccfa4f8c0d9b3207f362d40b7d804a ChangeLog 7966
+SHA256 efd7c132cd53da94c572b82f17fbadf9ae528f241912d62c6db15528c083f62e ChangeLog 7966
 MISC metadata.xml 496 RMD160 83dcce07fea8707824659b0e9f84d9ea50bed6e8 SHA1 234ff53e9be6079bd54ba6b74e433dfc0ead37d0 SHA256 400cf41c4924baa4c622731d8066b62876c5f3bce7aa51f550057ba2beebe788
 MD5 3acc1c195150e4b1528fc86076e4f292 metadata.xml 496
 RMD160 83dcce07fea8707824659b0e9f84d9ea50bed6e8 metadata.xml 496
@@ -38,3 +49,13 @@ SHA256 e3e0eddd5f0ff1706e741a42325080efefa52bb8ade65db03eecda2033c96529 files/di
 MD5 102c4a4c1eb23bcd1da560a1a754f67c files/digest-wwwoffle-2.9 232
 RMD160 450ced670f302827b7b23c1c2e95ee7d57da671b files/digest-wwwoffle-2.9 232
 SHA256 416572f05bfdbe9206351e861e69ed7ec558bda4b9e66dc33305d3da76ce01c7 files/digest-wwwoffle-2.9 232
+MD5 102c4a4c1eb23bcd1da560a1a754f67c files/digest-wwwoffle-2.9-r1 232
+RMD160 450ced670f302827b7b23c1c2e95ee7d57da671b files/digest-wwwoffle-2.9-r1 232
+SHA256 416572f05bfdbe9206351e861e69ed7ec558bda4b9e66dc33305d3da76ce01c7 files/digest-wwwoffle-2.9-r1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFExjNg3sf9c6kjmR8RAszmAJ96aZ46xjsJC0M8LFP/IPD2Z8LssQCeOzdt
+ECS4KkhFX6Nk9a5YZgz/Cr0=
+=dnbR
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/wwwoffle/files/digest-wwwoffle-2.9-r1 b/net-proxy/wwwoffle/files/digest-wwwoffle-2.9-r1
new file mode 100644
index 000000000000..5b6f24397ad7
--- /dev/null
+++ b/net-proxy/wwwoffle/files/digest-wwwoffle-2.9-r1
@@ -0,0 +1,3 @@
+MD5 e8e7f3bdf1ff0a9baa26e5aebd6ad396 wwwoffle-2.9.tgz 1074108
+RMD160 f5cbe205c3d0b5ba0cdc23bfa51f185cb8ec1f6c wwwoffle-2.9.tgz 1074108
+SHA256 ac5e779beae963cf2f3b0dd44f7ed64114a1c15aa2fb6f41ad7db9bc0f096df3 wwwoffle-2.9.tgz 1074108
diff --git a/net-proxy/wwwoffle/files/wwwoffle-2.9-reload.patch b/net-proxy/wwwoffle/files/wwwoffle-2.9-reload.patch
new file mode 100644
index 000000000000..422f2b973237
--- /dev/null
+++ b/net-proxy/wwwoffle/files/wwwoffle-2.9-reload.patch
@@ -0,0 +1,12 @@
+diff -Nru wwwoffle-2.9.orig/src/parse.c wwwoffle-2.9/src/parse.c
+--- wwwoffle-2.9.orig/src/parse.c	2006-02-11 22:00:24.000000000 +0200
++++ wwwoffle-2.9/src/parse.c	2006-07-25 17:52:16.970260250 +0300
+@@ -317,7 +317,7 @@
+       }
+    }
+ 
+- return(0);
++ return(retval);
+ }
+ 
+ 
diff --git a/net-proxy/wwwoffle/wwwoffle-2.9-r1.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9-r1.ebuild
new file mode 100644
index 000000000000..35d387f1ed3d
--- /dev/null
+++ b/net-proxy/wwwoffle/wwwoffle-2.9-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9-r1.ebuild,v 1.1 2006/07/25 15:05:56 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="wwwoffle = WWW Offline Explorer, an adv. caching proxy especially suitable for nonpermanent (e.g. dialup) Internet connections"
+SRC_URI="http://www.gedanken.freeserve.co.uk/download-wwwoffle/${P}.tgz"
+HOMEPAGE="http://www.gedanken.demon.co.uk/wwwoffle"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gnutls ipv6 zlib"
+
+RDEPEND="gnutls? ( net-libs/gnutls )
+	zlib? ( sys-libs/zlib )"
+DEPEND="dev-lang/perl
+	sys-devel/flex
+	${RDEPEND}"
+
+# Unsure whether to depend on >=www-misc/htdig-3.1.6-r4 or not
+
+pkg_setup() {
+	# Add a wwwoffle user
+	enewgroup wwwoffle
+	enewuser wwwoffle -1 -1 /var/spool/wwwoffle wwwoffle
+}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}/${P}-reload.patch"
+	sed -i -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
+		"${S}/cache/Makefile.in"
+}
+
+src_compile() {
+	# TODO confdir back to default /etc/wwwoffle
+	# allows to change config file using web interface.
+
+	econf $(use_with zlib) $(use_with gnutls) \
+		$(use_with ipv6) || die "econf failed"
+	emake || die "emake failed"
+
+	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' \
+			conf/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
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# 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}/${PN}.initd" wwwoffled
+	newinitd "${FILESDIR}/${PN}-online.initd" wwwoffled-online
+	newconfd "${FILESDIR}/${PN}-online.confd" 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
+
+	# 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" "${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"
+	chmod -R o-w "${D}/var/spool/wwwoffle" #some file have w permission for world!
+}
+
+pkg_preinst() {
+	# Add a wwwoffle user - required here for binary packages
+	enewgroup wwwoffle
+	enewuser wwwoffle -1 -1 /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
+}
+
+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" "${ROOT}/etc/wwwoffle"
+
+	# Need to sumbit patch upstream to allow this.
+	#fowners root:wwwoffle /var/spool/wwwoffle
+	#fowners wwwoffle: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
+}