Version bump (#214487).

Package-Manager: portage-2.1.4.4

3 files changed, 146 insertions, 3 deletions

diff --git a/net-proxy/wwwoffle/ChangeLog b/net-proxy/wwwoffle/ChangeLog
index a4b5beb85d6f..c0d45ab50d83 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.38 2007/12/30 13:02:12 mrness Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.39 2008/05/15 22:04:02 mrness Exp $
+
+*wwwoffle-2.9d (15 May 2008)
+
+  15 May 2008; Alin Năstac <mrness@gentoo.org> +wwwoffle-2.9d.ebuild:
+  Version bump (#214487).
 
   30 Dec 2007; Alin Năstac <mrness@gentoo.org> -wwwoffle-2.9b.ebuild,
   wwwoffle-2.9c.ebuild:
diff --git a/net-proxy/wwwoffle/Manifest b/net-proxy/wwwoffle/Manifest
index 9f0d508f243c..94340ab683ab 100644
--- a/net-proxy/wwwoffle/Manifest
+++ b/net-proxy/wwwoffle/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wwwoffle-online.confd 426 RMD160 2f6e76dcbb9d0d2d7159f8ee86ffe3426414cbb0 SHA1 b5f74da31da73dd9cfe797ee1778d667230c572a SHA256 43782eff21a0e064b36fe9bf4ef56a8f93a4b9c6e7b30d8266c656a59e89b19d
 AUX wwwoffle-online.initd 696 RMD160 6603e96b4d83aacbc769e179b386a95ec64330c8 SHA1 0cb125c9f65cfa5e65715e15039fd5e0a151f103 SHA256 caea4a37d676a7190d215fa36fcf41bc812eea8dd0cf0f30d8f71b98bef4d5f4
 AUX wwwoffle.initd 539 RMD160 f5f0c39adabadbdd74108d455a5b910ce66d92ea SHA1 54347804aca2ece13eb33a18c064a443f5b5b6bf SHA256 346b3d93113ed56096e8a052e62c3410eeb0936fe08842d64de0bdf0905e2db0
 DIST wwwoffle-2.9c.tgz 1078788 RMD160 d46829c2d51cb60bf303ef2c19a66abc1e8f86fb SHA1 f675719ed0ad8bec790131dd71c7592c097d8905 SHA256 6b134ac08daf1186c1cdd34fea4ad8c4f1ad2f52307db98786e262dc4243256c
+DIST wwwoffle-2.9d.tgz 1097304 RMD160 8d14d3ccdb86aec4693b1a624cef8c9460e33ee0 SHA1 3713a58272833cbc34f4c567f1301bc3994c3c7f SHA256 abf0d224380133c73411ee0c304b94e85da71f498cbf1021e80f40ac4c853ad3
 EBUILD wwwoffle-2.9c.ebuild 4229 RMD160 7f6c6212aac96542186a5162cb097e5bf5bb4679 SHA1 183152988be794e414478acf2a4f37fa02612bcc SHA256 d4d39151ae450f51b1a9e4e1de6df9ce667d74707c9f22aa1c11c31affeb8859
-MISC ChangeLog 10727 RMD160 a4259f4ee411a95898b2a6e4f046f0b89592dcae SHA1 5f09454b4bf0df13b9ddc7922b4bbf77e1fd3848 SHA256 d8759f8161d6263bda4c636b49cf30b1aa7e554b2e5f7a24072722cc5cd49d21
+EBUILD wwwoffle-2.9d.ebuild 4234 RMD160 d2c0cb534ebf6986ffece8adae860ee79148910f SHA1 020082a47a0774b0704eb788151b73e45c57b5f8 SHA256 02ce0c7a4a926d1521c13f871bca6aa1dc207d08a78d3865af15187070503dda
+MISC ChangeLog 10855 RMD160 4597701c4d5a74c3892f20033d5d3ede0670b854 SHA1 657deeed89dda0305ad2f20b0e1995d857bfb3bc SHA256 f480b762490c133d50e01ccaae49dacfd17c7c69f8ecf84186e8167426816b65
 MISC metadata.xml 496 RMD160 83dcce07fea8707824659b0e9f84d9ea50bed6e8 SHA1 234ff53e9be6079bd54ba6b74e433dfc0ead37d0 SHA256 400cf41c4924baa4c622731d8066b62876c5f3bce7aa51f550057ba2beebe788
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgss2IACgkQ+fWpoTWIA9EavQCfUrM/hxOrG+NUnw3KifZo8bLT
+mZ8AoIq7Hm/P416PIbYsJyoZr6leEkPp
+=ZcuL
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/wwwoffle/wwwoffle-2.9d.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9d.ebuild
new file mode 100644
index 000000000000..9b8f9ed84eca
--- /dev/null
+++ b/net-proxy/wwwoffle/wwwoffle-2.9d.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9d.ebuild,v 1.1 2008/05/15 22:04:02 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}"
+	rmdir "${D}/usr/doc"
+
+	# 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"
+}
+
+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
+}