diff options
author | Alin Năstac <mrness@gentoo.org> | 2006-03-06 22:54:55 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2006-03-06 22:54:55 +0000 |
commit | 0e86c3259ab24457de0978a21b4461e152215bd2 (patch) | |
tree | b7c6f1599641c43a80a757f54de1cedc6347e7aa /net-proxy/wwwoffle | |
parent | Version bump. (diff) | |
download | historical-0e86c3259ab24457de0978a21b4461e152215bd2.tar.gz historical-0e86c3259ab24457de0978a21b4461e152215bd2.tar.bz2 historical-0e86c3259ab24457de0978a21b4461e152215bd2.zip |
Remove old version. Sanitize the ebuild code.
Package-Manager: portage-2.0.54
Diffstat (limited to 'net-proxy/wwwoffle')
-rw-r--r-- | net-proxy/wwwoffle/ChangeLog | 8 | ||||
-rw-r--r-- | net-proxy/wwwoffle/Manifest | 22 | ||||
-rw-r--r-- | net-proxy/wwwoffle/files/digest-wwwoffle-2.8b | 1 | ||||
-rwxr-xr-x | net-proxy/wwwoffle/files/wwwoffled | 21 | ||||
-rwxr-xr-x | net-proxy/wwwoffle/files/wwwoffled-online-2.8b | 21 | ||||
-rw-r--r-- | net-proxy/wwwoffle/wwwoffle-2.8b.ebuild | 139 | ||||
-rw-r--r-- | net-proxy/wwwoffle/wwwoffle-2.8e.ebuild | 135 |
7 files changed, 79 insertions, 268 deletions
diff --git a/net-proxy/wwwoffle/ChangeLog b/net-proxy/wwwoffle/ChangeLog index 239a9ce5381c..ee7bbdc38b9e 100644 --- a/net-proxy/wwwoffle/ChangeLog +++ b/net-proxy/wwwoffle/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-proxy/wwwoffle -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.7 2005/08/14 10:05:36 hansmi Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.8 2006/03/06 22:54:55 mrness Exp $ + + 06 Mar 2006; Alin Nastac <mrness@gentoo.org> -files/wwwoffled-online-2.8b, + -files/wwwoffled, -wwwoffle-2.8b.ebuild, wwwoffle-2.8e.ebuild: + Remove old version. Sanitize the ebuild code. 14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> wwwoffle-2.8e.ebuild: Stable on ppc. diff --git a/net-proxy/wwwoffle/Manifest b/net-proxy/wwwoffle/Manifest index 11bba9cb2418..467f035ca008 100644 --- a/net-proxy/wwwoffle/Manifest +++ b/net-proxy/wwwoffle/Manifest @@ -1,11 +1,17 @@ -MD5 2f092f7d958b226c98713d29cff08f9d metadata.xml 502 -MD5 716ffa45c25e150d27928af950de9472 ChangeLog 6946 -MD5 a057208bad0f8630cd1b5569d807490a wwwoffle-2.8e.ebuild 5143 -MD5 57e4c31d427acf4dbbc0a9e552b1d682 wwwoffle-2.8b.ebuild 4523 -MD5 009de7420924ad30ca9611df2d1d6299 files/digest-wwwoffle-2.8b 62 -MD5 308017c3bca9dafb495514ccf1abe63b files/wwwoffled-online-2.8b 524 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 d1eba39850476671b45ccfbf0d95bda0 ChangeLog 7137 MD5 a627d44111b7ff1d162ac248f5c35376 files/digest-wwwoffle-2.8e 63 MD5 848cabe3390aa24c7aea9d08c8d1d937 files/wwwoffle-online.confd 426 -MD5 9976f6cc21d8fd01b67cb72fc7cf3198 files/wwwoffle.initd 539 MD5 f710c01ec4b28de6014c40ee7f4f6046 files/wwwoffle-online.initd 696 -MD5 5460db8b11a1189b90e0b88980fe4e2d files/wwwoffled 506 +MD5 9976f6cc21d8fd01b67cb72fc7cf3198 files/wwwoffle.initd 539 +MD5 2f092f7d958b226c98713d29cff08f9d metadata.xml 502 +MD5 b32055c6ea5422b6186b09203a4315e2 wwwoffle-2.8e.ebuild 5140 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2.1 (GNU/Linux) + +iD8DBQFEDL3PjG8pv1lIUX4RAsQtAKDqpwVhGonB/D63tx4LHxnD607rdgCg4RvE +qumt9Tw3phNO4I89eoKtJhs= +=091c +-----END PGP SIGNATURE----- diff --git a/net-proxy/wwwoffle/files/digest-wwwoffle-2.8b b/net-proxy/wwwoffle/files/digest-wwwoffle-2.8b deleted file mode 100644 index 9cb59667b7c6..000000000000 --- a/net-proxy/wwwoffle/files/digest-wwwoffle-2.8b +++ /dev/null @@ -1 +0,0 @@ -MD5 ef5a756adc8b8c37b9684b3155494227 wwwoffle-2.8b.tgz 975589 diff --git a/net-proxy/wwwoffle/files/wwwoffled b/net-proxy/wwwoffle/files/wwwoffled deleted file mode 100755 index 5c868c1811d7..000000000000 --- a/net-proxy/wwwoffle/files/wwwoffled +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/files/wwwoffled,v 1.1 2005/04/22 19:15:12 mrness Exp $ - -depend() { - need localmount -} - -start() { - ebegin "Starting wwwoffled" - start-stop-daemon --start --quiet --exec `which wwwoffled` \ - -- -c /etc/wwwoffle.conf - eend $? -} - -stop() { - ebegin "Stopping wwwoffled" - start-stop-daemon --stop --quiet --name wwwoffled - eend $? -} diff --git a/net-proxy/wwwoffle/files/wwwoffled-online-2.8b b/net-proxy/wwwoffle/files/wwwoffled-online-2.8b deleted file mode 100755 index bcb98b23cfef..000000000000 --- a/net-proxy/wwwoffle/files/wwwoffled-online-2.8b +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/files/wwwoffled-online-2.8b,v 1.1 2005/04/22 19:15:12 mrness Exp $ - -depend() { - need wwwoffled net.${IFACE} -} - -start() { - ebegin "Starting wwwoffled-online" - wwwoffle -online -c /etc/wwwoffle.conf - wwwoffle -fetch -c /etc/wwwoffle.conf - eend $? -} - -stop() { - ebegin "Stopping wwwoffled-online" - wwwoffle -offline -c /etc/wwwoffle.conf - eend $? -} diff --git a/net-proxy/wwwoffle/wwwoffle-2.8b.ebuild b/net-proxy/wwwoffle/wwwoffle-2.8b.ebuild deleted file mode 100644 index e7081fa37d27..000000000000 --- a/net-proxy/wwwoffle/wwwoffle-2.8b.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.8b.ebuild,v 1.2 2005/07/20 05:37:20 mrness 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.demon.co.uk/pub/unix/httpd/${P}.tgz - 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" - -src_unpack(){ - unpack ${A} - cd ${S} - sed -i -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' cache/Makefile.in - sed -i -e "s#^docdir=.*#docdir=\$(DESTDIR)\${prefix}/share/doc/${P}#" doc/Makefile.in - - - ### adjust path for htdig - /usr/share/webapps/${PF}/cgi-bin/ - ## (as per http://www.gentoo.org/proj/en/glep/glep-0011.html) - ## Not impliemented yet. - - echo '/usr/share/webapps/*/cgi-bin/htsearch -c /var/spool/wwwoffle/search/htdig/conf/htsearch.conf' \ - > cache/search/htdig/scripts/wwwoffle-htsearch - chmod a+x cache/search/htdig/scripts/wwwoffle-htsearch -} - -src_compile() { - - local myconf - myconf="`use_with ipv6`" - econf --with-confdir=/etc ${myconf} || die - emake || die - - local conffile=conf/wwwoffle.conf.template - 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 - conffile=conf/wwwoffle.conf - fi - # change to user wwwoffle - 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' \ - ${conffile} -} - -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 -} - - -src_install() { - emake DESTDIR=${D} install || die - - # install the wwwoffled init script - exeinto /etc/init.d - doexe ${FILESDIR}/wwwoffled - newexe ${FILESDIR}/wwwoffled-online-${PV} wwwoffled-online - - # keep spool - keepdir /var/spool/wwwoffle/{http,outgoing,monitor,lasttime,prevtime[1-9],prevout[1-9],lastout,local} - - 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} - - # del empty doc dirs - rmdir ${D}/usr/share/doc/${P}/{it,nl,ru} - - 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} - - dodir /etc/conf.d - local config=${D}/etc/conf.d/wwwoffled-online - echo -e "\n\n# Enter the interface that connects you to the outside world" >> ${config} - echo '# This will correspond to /etc/init.d/net.${IFACE}' >> ${config} - echo -e "\n# IMPORTANT: Be sure to run depscan.sh after modifiying IFACE" >> ${config} - echo "IFACE=ppp0" >> ${config} - -} - -pkg_postinst() { - # fix permissions for those upgrading - 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.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." - -} diff --git a/net-proxy/wwwoffle/wwwoffle-2.8e.ebuild b/net-proxy/wwwoffle/wwwoffle-2.8e.ebuild index 02934b10e776..8b676bd73ca9 100644 --- a/net-proxy/wwwoffle/wwwoffle-2.8e.ebuild +++ b/net-proxy/wwwoffle/wwwoffle-2.8e.ebuild @@ -1,43 +1,39 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.8e.ebuild,v 1.6 2005/08/14 10:05:36 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.8e.ebuild,v 1.7 2006/03/06 22:54:55 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="ipv6" -DEPEND=">=sys-apps/sed-4 - sys-apps/gawk - sys-apps/grep - dev-lang/perl +DEPEND="dev-lang/perl sys-devel/flex - sys-libs/zlib - sys-devel/gcc - virtual/libc - app-arch/tar" + sys-libs/zlib" +RDEPEND="sys-libs/zlib" -RDEPEND="sys-libs/zlib - virtual/libc" +# Unsure whether to depend on >=www-misc/htdig-3.1.6-r4 or not -# Unsure weither to depend or not -# >=www-misc/htdig-3.1.6-r4" +pkg_setup() { + # Add a wwwoffle user + enewgroup wwwoffle + enewuser wwwoffle -1 -1 /var/spool/wwwoffle wwwoffle +} -src_unpack(){ +src_unpack() { unpack ${A} - cd ${S} + sed -i -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \ - cache/Makefile.in + "${S}/cache/Makefile.in" } src_compile() { - # TODO confdir back to default /etc/wwwoffle # allows to change config file using web interface. @@ -46,10 +42,9 @@ src_compile() { econf ${myconf} || die emake || die - if [ -f ${ROOT}/etc/wwwoffle.conf ] - then + if [ -f "${ROOT}/etc/wwwoffle.conf" ] ; then einfo "Upgrading current configuration file" - cp ${ROOT}/etc/wwwoffle.conf conf/wwwoffle.conf + cp "${ROOT}/etc/wwwoffle.conf" conf/wwwoffle.conf conf/upgrade-config.pl conf/wwwoffle.conf # Hack to stop regeneration of config file @@ -57,82 +52,74 @@ src_compile() { 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 + 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 - } -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 -} - - src_install() { - emake DESTDIR=${D} install || die + emake DESTDIR="${D}" install || die # documentation fix # del empty doc dirs - rmdir ${D}/usr/doc/${PN}/{it,nl,ru} + rmdir "${D}/usr/doc/${PN}"/{it,nl,ru} dodir /usr/share/doc - mv ${D}/usr/doc/wwwoffle ${D}/usr/share/doc/${PF} + 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 + #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 + 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} + 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 - # Need to sumbit patch upstream to allow this. - #fowners root:wwwoffle /var/spool/wwwoffle - #fowners wwwoffle: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 + "${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 + 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 + 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 - rmdir ${D}/usr/doc + # 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() { @@ -140,22 +127,21 @@ pkg_postinst() { 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} + [ ! -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 + 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 ] && \ + [ -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" @@ -163,14 +149,11 @@ pkg_postinst() { 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 + 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 } |