Version bump.

Package-Manager: portage-2.1.2.12

4 files changed, 152 insertions, 9 deletions

diff --git a/net-proxy/wwwoffle/ChangeLog b/net-proxy/wwwoffle/ChangeLog
index 7a05096a9cfb..6e40cd3735b0 100644
--- a/net-proxy/wwwoffle/ChangeLog
+++ b/net-proxy/wwwoffle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/wwwoffle
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.31 2007/06/17 16:19:30 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.32 2007/08/21 19:21:15 mrness Exp $
+
+*wwwoffle-2.9c (21 Aug 2007)
+
+  21 Aug 2007; Alin Năstac <mrness@gentoo.org> +wwwoffle-2.9c.ebuild:
+  Version bump.
 
   17 Jun 2007; Alin Năstac <mrness@gentoo.org>
   -files/wwwoffle-2.9-gcc41.patch, -files/wwwoffle-2.9-reload.patch,
diff --git a/net-proxy/wwwoffle/Manifest b/net-proxy/wwwoffle/Manifest
index 6df532d559c2..85b5c178ffc1 100644
--- a/net-proxy/wwwoffle/Manifest
+++ b/net-proxy/wwwoffle/Manifest
@@ -14,14 +14,19 @@ MD5 9976f6cc21d8fd01b67cb72fc7cf3198 files/wwwoffle.initd 539
 RMD160 f5f0c39adabadbdd74108d455a5b910ce66d92ea files/wwwoffle.initd 539
 SHA256 346b3d93113ed56096e8a052e62c3410eeb0936fe08842d64de0bdf0905e2db0 files/wwwoffle.initd 539
 DIST wwwoffle-2.9b.tgz 1076009 RMD160 0993246866fe9bafc505c4b10fb1c0f0ce95e5ad SHA1 4a7729f8ddb294356759561ea45d01366eaf0a79 SHA256 85d5650a1446c5f8d0f511345e12caa33693fffd556bee122f66531325d5fbf0
+DIST wwwoffle-2.9c.tgz 1078788 RMD160 d46829c2d51cb60bf303ef2c19a66abc1e8f86fb SHA1 f675719ed0ad8bec790131dd71c7592c097d8905 SHA256 6b134ac08daf1186c1cdd34fea4ad8c4f1ad2f52307db98786e262dc4243256c
 EBUILD wwwoffle-2.9b.ebuild 4234 RMD160 f61427524088f607a19b6ecfe403daea8a531be4 SHA1 3a0475271356d814194cbe42a1f6073fd5735688 SHA256 8c60a755c1c26acd181ac56b54f4a973a3a5614cb03ff1210441d8cd7650d86c
 MD5 8d3ffd157f69aabef6b4574915530106 wwwoffle-2.9b.ebuild 4234
 RMD160 f61427524088f607a19b6ecfe403daea8a531be4 wwwoffle-2.9b.ebuild 4234
 SHA256 8c60a755c1c26acd181ac56b54f4a973a3a5614cb03ff1210441d8cd7650d86c wwwoffle-2.9b.ebuild 4234
-MISC ChangeLog 9969 RMD160 8b369a14552a674123e6ba3fa5edf23f28a2e628 SHA1 10f9376ee37e08260e85845e3123e4f28c642811 SHA256 8ad3c08be891919a930eebb5461d043f7153343e2eefc1c45b3314cb84c847ee
-MD5 7615d2a24d9d821fb37a639a911cfcf4 ChangeLog 9969
-RMD160 8b369a14552a674123e6ba3fa5edf23f28a2e628 ChangeLog 9969
-SHA256 8ad3c08be891919a930eebb5461d043f7153343e2eefc1c45b3314cb84c847ee ChangeLog 9969
+EBUILD wwwoffle-2.9c.ebuild 4235 RMD160 2947cc568e90a55da128169458c60a78f2ddbb39 SHA1 71ee62c9c68bbb92137559cebc783a6c2e0a6ee8 SHA256 d47148b0220874069e64a14b693afbe7b5932a817f75fc24ade052e6829d4353
+MD5 7b16d68ab795b8f50808eea4b004e588 wwwoffle-2.9c.ebuild 4235
+RMD160 2947cc568e90a55da128169458c60a78f2ddbb39 wwwoffle-2.9c.ebuild 4235
+SHA256 d47148b0220874069e64a14b693afbe7b5932a817f75fc24ade052e6829d4353 wwwoffle-2.9c.ebuild 4235
+MISC ChangeLog 10087 RMD160 f39ee05ea1a88db440a36a9a619d1d0a7807a728 SHA1 ff40eb65ab5112e506faca052f65355e237a9635 SHA256 2ef95f338f478eccc98b585bbb6a3e33f72017185fd0251d494ecbbc0a0675b4
+MD5 0cd13af0a986d761606adb50b1afaf92 ChangeLog 10087
+RMD160 f39ee05ea1a88db440a36a9a619d1d0a7807a728 ChangeLog 10087
+SHA256 2ef95f338f478eccc98b585bbb6a3e33f72017185fd0251d494ecbbc0a0675b4 ChangeLog 10087
 MISC metadata.xml 496 RMD160 83dcce07fea8707824659b0e9f84d9ea50bed6e8 SHA1 234ff53e9be6079bd54ba6b74e433dfc0ead37d0 SHA256 400cf41c4924baa4c622731d8066b62876c5f3bce7aa51f550057ba2beebe788
 MD5 3acc1c195150e4b1528fc86076e4f292 metadata.xml 496
 RMD160 83dcce07fea8707824659b0e9f84d9ea50bed6e8 metadata.xml 496
@@ -29,10 +34,13 @@ SHA256 400cf41c4924baa4c622731d8066b62876c5f3bce7aa51f550057ba2beebe788 metadata
 MD5 92d43c7123ab207edaeeba3fd4a41ba6 files/digest-wwwoffle-2.9b 235
 RMD160 584bf31b7c0baa32f8958fc295f08c164c177e92 files/digest-wwwoffle-2.9b 235
 SHA256 344a821e89f67f360224e9b557a962eca874da31bab5906862fc2d32be465dfd files/digest-wwwoffle-2.9b 235
+MD5 2d768f183ff7321c16f315d6443ced6a files/digest-wwwoffle-2.9c 235
+RMD160 ddf4c1575d70789a0d2ec6d7f672f9fbc83e6f16 files/digest-wwwoffle-2.9c 235
+SHA256 fd1aacb85c98697d2258f4b6ae8f6604082c2a40131ce7540eaefe0e4763efb8 files/digest-wwwoffle-2.9c 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGdV8YJnxX6mF440QRAuuWAJ9R5hTv7JkWLJ+GWaJhQ4aN6NqrnACg4rI0
-j85Wl/MF6xvrKnrrbyi4iDQ=
-=xS8p
+iD8DBQFGyzs2VSA5X31g7/gRAvDCAJ93TYxVwe1Np1eGC+/mag1bzjOYogCdHSHo
+9+yHH257+dJmv50qW8K76sM=
+=vQZ5
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/wwwoffle/files/digest-wwwoffle-2.9c b/net-proxy/wwwoffle/files/digest-wwwoffle-2.9c
new file mode 100644
index 000000000000..43a64ae99610
--- /dev/null
+++ b/net-proxy/wwwoffle/files/digest-wwwoffle-2.9c
@@ -0,0 +1,3 @@
+MD5 50208b5c8d5c125accd18f9760225f9e wwwoffle-2.9c.tgz 1078788
+RMD160 d46829c2d51cb60bf303ef2c19a66abc1e8f86fb wwwoffle-2.9c.tgz 1078788
+SHA256 6b134ac08daf1186c1cdd34fea4ad8c4f1ad2f52307db98786e262dc4243256c wwwoffle-2.9c.tgz 1078788
diff --git a/net-proxy/wwwoffle/wwwoffle-2.9c.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9c.ebuild
new file mode 100644
index 000000000000..a730796708f8
--- /dev/null
+++ b/net-proxy/wwwoffle/wwwoffle-2.9c.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9c.ebuild,v 1.1 2007/08/21 19:21:15 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.demon.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
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
+		"${S}/cache/Makefile.in"
+}
+
+src_compile() {
+	econf $(use_with zlib) \
+		$(use_with gnutls) \
+		$(use_with ipv6) || die "econf failed"
+	emake || die "emake failed"
+}
+
+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}"
+
+	# 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"
+
+	# 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_preinst() {
+	# Add a wwwoffle user
+	enewgroup wwwoffle
+	enewuser wwwoffle -1 -1 /var/spool/wwwoffle wwwoffle
+
+	# Changing the user:group to wwwoffle:woffle
+	fowners -R wwwoffle:wwwoffle /var/spool/wwwoffle /etc/wwwoffle
+	sed -i -e 's/^[# \t]\(run-[gu]id[ \t]*=[ \t]*\)[a-zA-Z0-9]*[ \t]*$/ \1wwwoffle/g' \
+		"${D}/etc/wwwoffle/wwwoffle.conf"
+
+	# Stop the service if it is started
+	if [ "${ROOT}" = "/" ] ; then
+		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
+	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"
+
+	[ -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
+}