diff options
| -rw-r--r-- | net-proxy/wwwoffle/ChangeLog | 7 | ||||
| -rw-r--r-- | net-proxy/wwwoffle/files/digest-wwwoffle-2.9-r1 | 3 | ||||
| -rw-r--r-- | net-proxy/wwwoffle/files/digest-wwwoffle-2.9a | 3 | ||||
| -rw-r--r-- | net-proxy/wwwoffle/files/wwwoffle-2.9-gcc41.patch | 43 | ||||
| -rw-r--r-- | net-proxy/wwwoffle/files/wwwoffle-2.9-reload.patch | 12 | ||||
| -rw-r--r-- | net-proxy/wwwoffle/wwwoffle-2.9-r1.ebuild | 143 | ||||
| -rw-r--r-- | net-proxy/wwwoffle/wwwoffle-2.9a.ebuild | 141 |
7 files changed, 6 insertions, 346 deletions
diff --git a/net-proxy/wwwoffle/ChangeLog b/net-proxy/wwwoffle/ChangeLog index eb6b712b2d1d..7a05096a9cfb 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.30 2007/04/24 18:34:27 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.31 2007/06/17 16:19:30 mrness Exp $ + + 17 Jun 2007; Alin Năstac <mrness@gentoo.org> + -files/wwwoffle-2.9-gcc41.patch, -files/wwwoffle-2.9-reload.patch, + -wwwoffle-2.9-r1.ebuild, -wwwoffle-2.9a.ebuild: + Remove old versions. 24 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> wwwoffle-2.9b.ebuild: diff --git a/net-proxy/wwwoffle/files/digest-wwwoffle-2.9-r1 b/net-proxy/wwwoffle/files/digest-wwwoffle-2.9-r1 deleted file mode 100644 index 5b6f24397ad7..000000000000 --- a/net-proxy/wwwoffle/files/digest-wwwoffle-2.9-r1 +++ /dev/null @@ -1,3 +0,0 @@ -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/digest-wwwoffle-2.9a b/net-proxy/wwwoffle/files/digest-wwwoffle-2.9a deleted file mode 100644 index 7aa63821fffe..000000000000 --- a/net-proxy/wwwoffle/files/digest-wwwoffle-2.9a +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3ba32fc842a6af96b28cd3c7ff8f6f56 wwwoffle-2.9a.tgz 1071362 -RMD160 b183fe881f9824a0dbf11480fc8d98f57cd5a7f8 wwwoffle-2.9a.tgz 1071362 -SHA256 23a469f6b4be39333fdbafb750dff890c0c6e9000144ad98d27c5461dddf9de1 wwwoffle-2.9a.tgz 1071362 diff --git a/net-proxy/wwwoffle/files/wwwoffle-2.9-gcc41.patch b/net-proxy/wwwoffle/files/wwwoffle-2.9-gcc41.patch deleted file mode 100644 index bd9e6291230c..000000000000 --- a/net-proxy/wwwoffle/files/wwwoffle-2.9-gcc41.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ur wwwoffle-2.9-orig/src/proto.h wwwoffle-2.9/src/proto.h ---- wwwoffle-2.9-orig/src/proto.h 2006-05-02 01:06:01.316639546 +0000 -+++ wwwoffle-2.9/src/proto.h 2006-05-02 01:13:24.080901246 +0000 -@@ -62,7 +62,7 @@ - char /*@null@*/ /*@only@*/ *HTTP_Open(URL *Url); - char /*@null@*/ /*@only@*/ *HTTP_Request(URL *Url,Header *request_head,Body *request_body); - int HTTP_ReadHead(/*@out@*/ Header **reply_head); --int HTTP_ReadBody(char *s,size_t n); -+ssize_t HTTP_ReadBody(char *s,size_t n); - int HTTP_Close(void); - - #if USE_GNUTLS -@@ -82,7 +82,7 @@ - char /*@null@*/ /*@only@*/ *FTP_Open(URL *Url); - char /*@null@*/ /*@only@*/ *FTP_Request(URL *Url,Header *request_head,Body *request_body); - int FTP_ReadHead(/*@out@*/ Header **reply_head); --int FTP_ReadBody(char *s,size_t n); -+ssize_t FTP_ReadBody(char *s,size_t n); - int FTP_Close(void); - - /* In finger.c */ -@@ -90,7 +90,7 @@ - char /*@null@*/ /*@only@*/ *Finger_Open(URL *Url); - char /*@null@*/ /*@only@*/ *Finger_Request(URL *Url,Header *request_head,Body *request_body); - int Finger_ReadHead(/*@out@*/ Header **reply_head); --int Finger_ReadBody(char *s,size_t n); -+ssize_t Finger_ReadBody(char *s,size_t n); - int Finger_Close(void); - - /* In ssl.c */ -diff -ur wwwoffle-2.9-orig/src/wwwoffles.c wwwoffle-2.9/src/wwwoffles.c ---- wwwoffle-2.9-orig/src/wwwoffles.c 2006-05-02 01:06:01.316639546 +0000 -+++ wwwoffle-2.9/src/wwwoffles.c 2006-05-02 01:07:33.428854807 +0000 -@@ -3026,7 +3026,7 @@ - This function is used as a callback from gifmodify.c and htmlmodify.l - ++++++++++++++++++++++++++++++++++++++*/ - --int wwwoffles_read_data(char *data,size_t len) -+ssize_t wwwoffles_read_data(char *data,size_t len) - { - if(modify_err==-1) - return(0); - diff --git a/net-proxy/wwwoffle/files/wwwoffle-2.9-reload.patch b/net-proxy/wwwoffle/files/wwwoffle-2.9-reload.patch deleted file mode 100644 index 422f2b973237..000000000000 --- a/net-proxy/wwwoffle/files/wwwoffle-2.9-reload.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 6685cf77192d..000000000000 --- a/net-proxy/wwwoffle/wwwoffle-2.9-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# 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.9-r1.ebuild,v 1.7 2007/03/10 13:34:21 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() { - 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" - - 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 - - # 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" - - # 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 -} diff --git a/net-proxy/wwwoffle/wwwoffle-2.9a.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9a.ebuild deleted file mode 100644 index 183e7cdbc8dd..000000000000 --- a/net-proxy/wwwoffle/wwwoffle-2.9a.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# 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.9a.ebuild,v 1.5 2007/03/10 13:34:21 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} - - 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" - - 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 - - # 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" - - # 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 -} |