net-proxy/wwwoffle: use #!/sbin/openrc-run instead of #!/sbin/runscript

Gentoo-Bug: https://bugs.gentoo.org/573846

Package-Manager: portage-2.2.26

diff --git a/net-proxy/wwwoffle/files/wwwoffle-online.initd b/net-proxy/wwwoffle/files/wwwoffle-online.initd
index 780708a5ea6a080246455ebc80eecbc9419d97bd..82fc7309adbb3487f863d2bb8c504f7fc5e06bb1 100644 (file)
--- a/net-proxy/wwwoffle/files/wwwoffle-online.initd
+++ b/net-proxy/wwwoffle/files/wwwoffle-online.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/net-proxy/wwwoffle/files/wwwoffle.initd b/net-proxy/wwwoffle/files/wwwoffle.initd
index 8aa6e104036df36a013e4ad12757c0c6b54c9fe9..7feca3049d741592f2cad7094bd3f189ff647e60 100644 (file)
--- a/net-proxy/wwwoffle/files/wwwoffle.initd
+++ b/net-proxy/wwwoffle/files/wwwoffle.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/net-proxy/wwwoffle/wwwoffle-2.9i-r1.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9i-r1.ebuild
new file mode 100644 (file)
index 0000000..d84b479
--- /dev/null
+++ b/net-proxy/wwwoffle/wwwoffle-2.9i-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils user
+
+DESCRIPTION="Web caching proxy suitable for non-permanent Internet connections"
+HOMEPAGE="http://www.gedanken.org.uk/software/wwwoffle/"
+SRC_URI="http://www.gedanken.org.uk/software/${PN}/download/${P}.tgz"
+
+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_prepare() {
+       eapply "${FILESDIR}"/${PN}-2.9i-define.patch
+       sed -i cache/Makefile.in \
+               -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
+               || die
+       default
+}
+
+src_configure() {
+       econf \
+               $(use_with gnutls) \
+               $(use_with ipv6) \
+               $(use_with zlib)
+}
+
+src_install() {
+       default
+
+       # documentation fix
+       # del empty doc dirs
+       rmdir "${D}/usr/doc/${PN}"/{it,nl,ru} || die
+       dodir /usr/share/doc
+       mv "${D}/usr/doc/${PN}" "${D}/usr/share/doc/${PF}" || die
+       rmdir "${D}/usr/doc" || die
+
+       # 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"
+
+}
+
+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."
+}