diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2005-04-22 19:15:12 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2005-04-22 19:15:12 +0000 |
| commit | f37e8c80d1499334a8b5d51bf781f5a655e68147 (patch) | |
| tree | 00cd35d8f79526e3d16c31f19bf342992ba539c2 /net-proxy | |
| parent | Adding pcmcia flag. Closes #90025, Cheers Georgi (diff) | |
| download | historical-f37e8c80d1499334a8b5d51bf781f5a655e68147.tar.gz historical-f37e8c80d1499334a8b5d51bf781f5a655e68147.tar.bz2 historical-f37e8c80d1499334a8b5d51bf781f5a655e68147.zip | |
www-proxy -> net-proxy
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'net-proxy')
153 files changed, 7450 insertions, 0 deletions
diff --git a/net-proxy/adzapper/ChangeLog b/net-proxy/adzapper/ChangeLog new file mode 100644 index 000000000000..da4307c132de --- /dev/null +++ b/net-proxy/adzapper/ChangeLog @@ -0,0 +1,108 @@ +# ChangeLog for www-proxy/adzapper +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + +*adzapper-20050316 (21 Mar 2005) + + 21 Mar 2005; Alin Nastac <mrness@gentoo.org> +adzapper-20050316.ebuild: + Version bump (#86041). + +*adzapper-20050106 (23 Feb 2005) + + 23 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> +adzapper-20050106.ebuild: + Version bump, thanks to Stefan Briesenick <sbriesen@gmx.de>, bug 63717. + + 17 Feb 2005; Alin Nastac <mrness@gentoo.org> metadata.xml, + -adzapper-20031105.ebuild, -adzapper-20040104.ebuild, + adzapper-20040408.ebuild: + Remove old versions + + 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + adzapper-20040408.ebuild: + Masked adzapper-20040408.ebuild stable for ppc + + 16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; adzapper-20031105.ebuild, + adzapper-20040104.ebuild, adzapper-20040408.ebuild: + Updating dependency from net-www/squid to www-proxy/squid + +*adzapper-20031105 (15 Aug 2004) + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml, + +adzapper-20031105.ebuild, +adzapper-20040104.ebuild, + +adzapper-20040408.ebuild: + Moved from net-www/adzapper to www-proxy/adzapper. + + 16 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> adzapper-20040408.ebuild: + Stable on alpha. + + 11 Jul 2004; Jason Wever <weeve@gentoo.org> adzapper-20040408.ebuild: + Stable on sparc. + + 06 Jul 2004; Brad Laue <brad@gentoo.org> adzapper-20040408.ebuild: + Stable on x86 finally. + +*adzapper-20040408 (23 Jun 2004) + + 23 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; +metadata.xml, + +adzapper-20040408.ebuild: + Adding 20040408 version, adding metadata.xml, cleaning out a few older versions + + 19 Jan 2004; Stewart Honsberger <blkdeath@gentoo.org> + adzapper-20031105.ebuild, adzapper-20040104.ebuild, metadata.xml: + Normalize ebuilds, remove Apache dependancy + +*adzapper-20040104 (19 Jan 2004) + + 19 Jan 2004; Stewart Honsberger <blkdeath@gentoo.org> + adzapper-20030111.ebuild, adzapper-20031105.ebuild, + adzapper-20040104.ebuild: + Version bump, removed oldest ebuild. + +*adzapper-20031105 (24 Dec 2003) + + 24 Dec 2003; Martin Holzer <mholzer@gentoo.org> adzapper-20031105.ebuild: + Version bumped + +*adzapper-20030611 (11 Jun 2003) + + 11 Jun 2003; Brad Laue <brad@gentoo.org> adzapper-20030611.ebuild: + Submitted by Stewart <bugsubmit@snerk.org> + + Update to 20030611 snapshot, add stable keywords for all platforms supported + by squid. + + 05 Jun 2003; Brad Laue <brad@gentoo.org> adzapper-20030525.ebuild: + Marking stable on x86. + +*adzapper-20030525 (04 June 2003) + + 04 June 2003; Brad Laue <brad@gentoo.org> : Version bump, + This is a perl script, so I'm adding architecture support for all + platforms squid supports. + +*adzapper-20030111 (13 Jan 2003) + + 13 Jan 2003; J Robert Ray <jrray@gentoo.org> : Version bump, removing old + versions because they are no longer available for download. + + 07 Jan 2003; J Robert Ray <jrray@gentoo.org> adzapper-20021128.ebuild : + Unmasking for x86. + +*adzapper-20021128 (02 Jan 2003) + + 02 Jan 2003; J Robert Ray <jrray@gentoo.org> : Version bump, and fixed + the digest of the old version, the rules changed a little but the file + was not renamed. + +*adzapper-20021111 (10 Nov 2002) + + 10 Nov 2002; J Robert Ray <jrray@gentoo.org> : New ebuild. diff --git a/net-proxy/adzapper/Manifest b/net-proxy/adzapper/Manifest new file mode 100644 index 000000000000..bd578efe7da3 --- /dev/null +++ b/net-proxy/adzapper/Manifest @@ -0,0 +1,8 @@ +MD5 059c2620a710734ce08b917d6979a04c adzapper-20040408.ebuild 1464 +MD5 997bb1344bb48f365235e3ddb4c721b5 adzapper-20050106.ebuild 1511 +MD5 d40a799e18b9a3684e9c98909cf18657 adzapper-20050316.ebuild 1513 +MD5 2facecd2db12ce0d411010c34c5a6a7e ChangeLog 3650 +MD5 865192a4aa5233381a3358f03460b9be metadata.xml 368 +MD5 d1666b04a8c2b141f1a5875a0eea33f0 files/digest-adzapper-20040408 65 +MD5 e7d816cf4877320a48ec63fb3b3b7d6c files/digest-adzapper-20050106 65 +MD5 2d648a6b3987ab877735484f8fa35b59 files/digest-adzapper-20050316 65 diff --git a/net-proxy/adzapper/adzapper-20040408.ebuild b/net-proxy/adzapper/adzapper-20040408.ebuild new file mode 100644 index 000000000000..79cec0e663da --- /dev/null +++ b/net-proxy/adzapper/adzapper-20040408.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20040408.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +DESCRIPTION="Redirector for squid that intercepts advertising, page counters and some web bugs" +HOMEPAGE="http://adzapper.sourceforge.net/" + +MY_P=${P/zapper/zap} +S="${WORKDIR}/adzap" + +SRC_URI="http://adzapper.sourceforge.net/${MY_P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="x86 ppc sparc alpha" +IUSE="" + +DEPEND="" +RDEPEND="net-proxy/squid" + +src_unpack() { + unpack ${A} + + SCRPATH="/etc/adzapper/squid_redirect" + + cd ${S}/scripts || die + + # update the zapper path in various scripts + for src in wrapzap update-zapper*; do + mv $src $src.orig || die + sed -e "s|^zapper=.*|zapper=${SCRPATH}|" \ + -e "s|^ZAPPER=.*|ZAPPER=\"${SCRPATH}\"|" \ + -e "s|^pidfile=.*|pidfile=/var/run/squid.pid|" \ + -e "s|^PIDFILE=.*|PIDFILE=\"/var/run/squid.pid\"|" \ + -e "s|^RESTARTCMD=.*|RESTARTCMD=\"/etc/init.d/squid restart\"|" \ + $src.orig > $src || die + rm $src.orig + done +} + +src_install() { + cd ${S}/scripts + exeinto /etc/adzapper + doexe wrapzap zapchain squid_redirect + + insinto /etc/adzapper + doins update-zapper* + + cd ${S}/zaps + insinto /var/www/localhost/htdocs/zap + doins * +} + +pkg_postinst() { + einfo "To enable adzapper add the following lines to squid.conf:" + einfo "redirect_program /etc/adzapper/wrapzap" + einfo "redirect_children 10" +} diff --git a/net-proxy/adzapper/adzapper-20050106.ebuild b/net-proxy/adzapper/adzapper-20050106.ebuild new file mode 100644 index 000000000000..19d82c6eee6f --- /dev/null +++ b/net-proxy/adzapper/adzapper-20050106.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20050106.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +DESCRIPTION="Redirector for squid that intercepts advertising, page counters and some web bugs" +HOMEPAGE="http://adzapper.sourceforge.net/" + +MY_P=${P/zapper/zap} +S="${WORKDIR}/adzap" + +SRC_URI="http://adzapper.sourceforge.net/${MY_P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64" +IUSE="" + +RDEPEND="net-proxy/squid" + +src_unpack() { + unpack ${A} + + SCRPATH="/etc/adzapper/squid_redirect" + + cd ${S}/scripts || die "Error no scripts dir." + + # update the zapper path in various scripts + for src in wrapzap update-zapper*; do + mv $src $src.orig || die + sed -e "s|^zapper=.*|zapper=${SCRPATH}|" \ + -e "s|^ZAPPER=.*|ZAPPER=\"${SCRPATH}\"|" \ + -e "s|^pidfile=.*|pidfile=/var/run/squid.pid|" \ + -e "s|^PIDFILE=.*|PIDFILE=\"/var/run/squid.pid\"|" \ + -e "s|^RESTARTCMD=.*|RESTARTCMD=\"/etc/init.d/squid restart\"|" \ + $src.orig > $src || die "sed updating failed." + rm $src.orig + done +} + +src_install() { + cd ${S}/scripts + exeinto /etc/adzapper + doexe wrapzap zapchain squid_redirect + + insinto /etc/adzapper + doins update-zapper* + + cd ${S}/zaps + insinto /var/www/localhost/htdocs/zap + doins * +} + +pkg_postinst() { + einfo "To enable adzapper add the following lines to squid.conf:" + einfo "redirect_program /etc/adzapper/wrapzap" + einfo "redirect_children 10" +} diff --git a/net-proxy/adzapper/adzapper-20050316.ebuild b/net-proxy/adzapper/adzapper-20050316.ebuild new file mode 100644 index 000000000000..4a2f5fae139a --- /dev/null +++ b/net-proxy/adzapper/adzapper-20050316.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/adzapper/adzapper-20050316.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +MY_P=${P/zapper/zap} + +DESCRIPTION="Redirector for squid that intercepts advertising, page counters and some web bugs" +HOMEPAGE="http://adzapper.sourceforge.net/" +SRC_URI="http://adzapper.sourceforge.net/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64" +IUSE="" + +RDEPEND="net-proxy/squid" + +S="${WORKDIR}/adzap" + +src_unpack() { + unpack ${A} + + SCRPATH="/etc/adzapper/squid_redirect" + + cd ${S}/scripts || die "Error no scripts dir." + + # update the zapper path in various scripts + for src in wrapzap update-zapper*; do + mv $src $src.orig || die + sed -e "s|^zapper=.*|zapper=${SCRPATH}|" \ + -e "s|^ZAPPER=.*|ZAPPER=\"${SCRPATH}\"|" \ + -e "s|^pidfile=.*|pidfile=/var/run/squid.pid|" \ + -e "s|^PIDFILE=.*|PIDFILE=\"/var/run/squid.pid\"|" \ + -e "s|^RESTARTCMD=.*|RESTARTCMD=\"/etc/init.d/squid restart\"|" \ + $src.orig > $src || die "sed updating failed." + rm $src.orig + done +} + +src_install() { + cd ${S}/scripts + exeinto /etc/adzapper + doexe wrapzap zapchain squid_redirect + + insinto /etc/adzapper + doins update-zapper* + + cd ${S}/zaps + insinto /var/www/localhost/htdocs/zap + doins * +} + +pkg_postinst() { + einfo "To enable adzapper add the following lines to squid.conf:" + einfo "redirect_program /etc/adzapper/wrapzap" + einfo "redirect_children 10" +} diff --git a/net-proxy/adzapper/files/digest-adzapper-20040408 b/net-proxy/adzapper/files/digest-adzapper-20040408 new file mode 100644 index 000000000000..e1a1adc5b9d6 --- /dev/null +++ b/net-proxy/adzapper/files/digest-adzapper-20040408 @@ -0,0 +1 @@ +MD5 fcc54ff2d318f0f192e23bc11b3aa894 adzap-20040408.tar.gz 38693 diff --git a/net-proxy/adzapper/files/digest-adzapper-20050106 b/net-proxy/adzapper/files/digest-adzapper-20050106 new file mode 100644 index 000000000000..3b9e345dd730 --- /dev/null +++ b/net-proxy/adzapper/files/digest-adzapper-20050106 @@ -0,0 +1 @@ +MD5 df586dc6839a9b6b3783cd000be3abf6 adzap-20050106.tar.gz 48058 diff --git a/net-proxy/adzapper/files/digest-adzapper-20050316 b/net-proxy/adzapper/files/digest-adzapper-20050316 new file mode 100644 index 000000000000..e617475e9192 --- /dev/null +++ b/net-proxy/adzapper/files/digest-adzapper-20050316 @@ -0,0 +1 @@ +MD5 c5e85d7664b873deea48f8ad16a5f68e adzap-20050316.tar.gz 49003 diff --git a/net-proxy/adzapper/metadata.xml b/net-proxy/adzapper/metadata.xml new file mode 100644 index 000000000000..3ab875ed1d42 --- /dev/null +++ b/net-proxy/adzapper/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<maintainer> + <email>cyfred@gentoo.org</email> + <name>Andrew Bevitt</name> +</maintainer> +<longdescription>Redirector for squid that intercepts advertising, page counters and some web bugs</longdescription> +</pkgmetadata> diff --git a/net-proxy/dansguardian-dgav/ChangeLog b/net-proxy/dansguardian-dgav/ChangeLog new file mode 100644 index 000000000000..deeffb16906c --- /dev/null +++ b/net-proxy/dansguardian-dgav/ChangeLog @@ -0,0 +1,25 @@ +# ChangeLog for www-proxy/dansguardian-dgav +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> dansguardian-dgav-6.3.8.ebuild: + Rename category & herd www-proxy to net-proxy. Demote ebuild to unstable (#89948). + + 06 Apr 2005; Alin Nastac <mrness@gentoo.org> + dansguardian-dgav-6.3.8.ebuild: + Stable on x86 + + 11 Mar 2005; Alin Nastac <mrness@gentoo.org> + dansguardian-dgav-6.3.8.ebuild: + Fix mode of init.d script. + + 10 Mar 2005; Alin Nastac <mrness@gentoo.org> dansguardian-dgav-6.3.8.ebuild: + Always link with pthread lib (needed by libesmtp). + +*dansguardian-dgav-6.3.8 (08 Mar 2005) + + 08 Mar 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml, + +files/dansguardian-xnaughty-2.7.6-1.diff, +files/dansguardian.init, + +files/dgav-6.3.8-virus-response.patch, +dansguardian-dgav-6.3.8.ebuild: + Initial import from bug #60093, thanks to Francisco Javier <ffelix@sshinf.com>. + diff --git a/net-proxy/dansguardian-dgav/Manifest b/net-proxy/dansguardian-dgav/Manifest new file mode 100644 index 000000000000..410339a15f8a --- /dev/null +++ b/net-proxy/dansguardian-dgav/Manifest @@ -0,0 +1,7 @@ +MD5 7bd2b3b9dcd6caf2946431c8eee91696 dansguardian-dgav-6.3.8.ebuild 1669 +MD5 e41a4a43828ce20aec5b3155eac1e299 ChangeLog 1065 +MD5 775fe3a71382d0807bfddb0235f35f30 metadata.xml 233 +MD5 50f8def5997a7e9daeefd0789bc56434 files/dansguardian.init 576 +MD5 dd34bc7952c9d271a3b5b25605afaafc files/digest-dansguardian-dgav-6.3.8 169 +MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325 +MD5 0fab1970b596ce0eb39925955884fa17 files/dgav-6.3.8-virus-response.patch 1083 diff --git a/net-proxy/dansguardian-dgav/dansguardian-dgav-6.3.8.ebuild b/net-proxy/dansguardian-dgav/dansguardian-dgav-6.3.8.ebuild new file mode 100644 index 000000000000..6e579e47652e --- /dev/null +++ b/net-proxy/dansguardian-dgav/dansguardian-dgav-6.3.8.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/dansguardian-dgav-6.3.8.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +DG_PN=${PN/-*/} +AV_PN=${PN/*-/} +DG_PV=2.8.0.3 + +DESCRIPTION="DansGuardian with Anti-Virus plugin" +HOMEPAGE="http://sourceforge.net/projects/dgav/" +SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${DG_PN}-${DG_PV}.source.tar.gz + mirror://sourceforge/${AV_PN}/${DG_PN}-${DG_PV}-antivirus-${PV}.patch.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~sparc ~ppc" +IUSE="" +DEPEND="!net-proxy/dansguardian + virtual/libc + net-libs/libesmtp + app-antivirus/clamav" + +S="${WORKDIR}/${DG_PN}-${DG_PV}" + +src_unpack() { + unpack ${A} + + cd ${S} || die "source dir not found" + epatch ${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff + epatch ../${DG_PN}-${DG_PV}-antivirus-${PV}.patch + epatch ${FILESDIR}/${AV_PN}-${PV}-virus-response.patch + epatch clamdscan.patch + + #need it by libesmtp + sed -i -e 's/^\(LIBS *=.*-lesmtp.*\)/\1 -pthread/' autoconf/linux.in +} + +src_compile() { + ./configure \ + --prefix= \ + --installprefix=${D} \ + --mandir=/usr/share/man/ \ + --cgidir=/var/www/localhost/cgi-bin/ || die "./configure failed" + emake OPTIMISE="${CFLAGS}" || die "emake failed" +} + +src_install() { + if [ -d "/etc/logrotate.d" ]; then + dodir /etc/logrotate.d + fi + make install || die "make install failed" + + exeinto /etc/init.d + newexe ${FILESDIR}/dansguardian.init dansguardian + + rm -rf ${D}/etc/rc.d + + #Fixing location of initscript + sed -i -e 's/rc.d\///' ${D}/etc/dansguardian/logrotation + + dodoc INSTALL README* LICENSE +} diff --git a/net-proxy/dansguardian-dgav/files/dansguardian-xnaughty-2.7.6-1.diff b/net-proxy/dansguardian-dgav/files/dansguardian-xnaughty-2.7.6-1.diff new file mode 100644 index 000000000000..d1e097ce0b08 --- /dev/null +++ b/net-proxy/dansguardian-dgav/files/dansguardian-xnaughty-2.7.6-1.diff @@ -0,0 +1,50 @@ +diff -ur DansGuardian-2.7.6-1/ConnectionHandler.cpp DansGuardian-2.7.6-1-new/ConnectionHandler.cpp +--- DansGuardian-2.7.6-1/ConnectionHandler.cpp 2003-12-03 16:04:18.000000000 -0600 ++++ DansGuardian-2.7.6-1-new/ConnectionHandler.cpp 2003-12-03 17:43:36.000000000 -0600 +@@ -990,6 +990,11 @@ + else if (o.reporting_level == -1) { // stealth + (*checkme).isItNaughty = false; // dont block + } ++ else if (o.reporting_level == -2) { // just add a header ++ (*docheader).addXNaughty("true", (*checkme).whatIsNaughty.c_str(), (*url).toCharArray()); ++ (*checkme).isItNaughty = false; // dont block ++ } ++ + } catch (exception& e) {} + if ((*checkme).isItNaughty) { // not stealth mode then + try { +Only in DansGuardian-2.7.6-1-new/: ConnectionHandler.cpp.orig +diff -ur DansGuardian-2.7.6-1/HTTPHeader.cpp DansGuardian-2.7.6-1-new/HTTPHeader.cpp +--- DansGuardian-2.7.6-1/HTTPHeader.cpp 2003-12-03 16:04:18.000000000 -0600 ++++ DansGuardian-2.7.6-1-new/HTTPHeader.cpp 2003-12-03 17:38:09.000000000 -0600 +@@ -456,6 +456,17 @@ + header.push_back(String(line.c_str())); + } + ++void HTTPHeader::addXNaughty(std::string naughty, std::string whatIsNaughty, std::string whereIsNaughty) { ++ std::string line; ++ ++ line = "X-Naughty: " + naughty + "\r"; ++ header.push_back(String(line.c_str())); ++ line = "X-Naughty-Why: " + whatIsNaughty + "\r"; ++ header.push_back(String(line.c_str())); ++ line = "X-Naughty-Where: " + whereIsNaughty + "\r"; ++ header.push_back(String(line.c_str())); ++} ++ + void HTTPHeader::setTimeout(int t) { + timeout = t; + } +Only in DansGuardian-2.7.6-1-new/: HTTPHeader.cpp.orig +diff -ur DansGuardian-2.7.6-1/HTTPHeader.hpp DansGuardian-2.7.6-1-new/HTTPHeader.hpp +--- DansGuardian-2.7.6-1/HTTPHeader.hpp 2003-12-03 16:04:18.000000000 -0600 ++++ DansGuardian-2.7.6-1-new/HTTPHeader.hpp 2003-12-03 17:38:09.000000000 -0600 +@@ -43,6 +43,7 @@ + std::string getXForwardedForIP(); + void setTimeout(int t); + void addXForwardedFor(std::string clientip); ++ void addXNaughty(std::string naughty, std::string whatIsNaughty, std::string whereIsNaughty); + bool isCompressed(); + String contentEncoding(); + void removeEncoding(int newlen); +Only in DansGuardian-2.7.6-1-new/: HTTPHeader.hpp.orig diff --git a/net-proxy/dansguardian-dgav/files/dansguardian.init b/net-proxy/dansguardian-dgav/files/dansguardian.init new file mode 100644 index 000000000000..dff3d21899d1 --- /dev/null +++ b/net-proxy/dansguardian-dgav/files/dansguardian.init @@ -0,0 +1,22 @@ +#!/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/dansguardian-dgav/files/dansguardian.init,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +depend() { + need net clamd + after squid +} + +start() { + ebegin "Starting DansGuardian" + start-stop-daemon --start --quiet --pidfile /var/run/dansguardian.pid \ + --exec /usr/sbin/dansguardian + eend $? +} + +stop() { + ebegin "Stopping DansGuardian" + start-stop-daemon --stop --quiet --pidfile /var/run/dansguardian.pid + eend $? +} diff --git a/net-proxy/dansguardian-dgav/files/dgav-6.3.8-virus-response.patch b/net-proxy/dansguardian-dgav/files/dgav-6.3.8-virus-response.patch new file mode 100644 index 000000000000..5c0a643a844e --- /dev/null +++ b/net-proxy/dansguardian-dgav/files/dgav-6.3.8-virus-response.patch @@ -0,0 +1,28 @@ +--- VirusScanner.cpp.ori 2004-12-03 19:15:56.000000000 +0100 ++++ VirusScanner.cpp 2004-12-03 19:10:19.000000000 +0100 +@@ -367,20 +367,20 @@ + } + else { + (*peerconn).writeString("<html><head>"); +- (*peerconn).writeString("<script language=JavaScript>"); +- (*peerconn).writeString("location.href="); ++ (*peerconn).writeString("<meta http-equiv=\"REFRESH\" content=\"0;url="); + (*peerconn).writeString(location.c_str()); + (*peerconn).writeString("?USER=="); + (*peerconn).writeString(username.c_str()); + (*peerconn).writeString("::REASON==Virus%20'"); + (*peerconn).writeString(virname); + (*peerconn).writeString("'%20found"); +- (*peerconn).writeString("::URL=="); ++ (*peerconn).writeString("::DENIEDURL=="); + (*peerconn).writeString(url.toCharArray()); +- (*peerconn).writeString("</script>"); ++ (*peerconn).writeString("::IP=="); ++ (*peerconn).writeString(clientip.c_str()); ++ (*peerconn).writeString("\">"); + (*peerconn).writeString("</head></html>"); + } +- + if (o.notify) { + #ifdef DGDEBUG + std::cout << "Sending email..." << endl; diff --git a/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.3.8 b/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.3.8 new file mode 100644 index 000000000000..43e9d3e1fcb7 --- /dev/null +++ b/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.3.8 @@ -0,0 +1,2 @@ +MD5 46bbb0d977b8cdd9e978ba5922c1d708 dansguardian-2.8.0.3.source.tar.gz 192351 +MD5 54ff9d90a47160cb3e2eea8d149782a8 dansguardian-2.8.0.3-antivirus-6.3.8.patch.bz2 31547 diff --git a/net-proxy/dansguardian-dgav/metadata.xml b/net-proxy/dansguardian-dgav/metadata.xml new file mode 100644 index 000000000000..7747d8275210 --- /dev/null +++ b/net-proxy/dansguardian-dgav/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<longdescription>DansGuardian with Anti-Virus plugin</longdescription> +</pkgmetadata> diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog new file mode 100644 index 000000000000..a28ba870e969 --- /dev/null +++ b/net-proxy/dansguardian/ChangeLog @@ -0,0 +1,113 @@ +# ChangeLog for www-proxy/dansguardian +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + + 09 Apr 2005; Markus Rothe <corsair@gentoo.org> + dansguardian-2.8.0.4.ebuild: + Stable on ppc64 + + 06 Apr 2005; Alin Nastac <mrness@gentoo.org> dansguardian-2.8.0.4.ebuild: + Stable on x86 + + 25 Mar 2005; <blubb@gentoo.org> dansguardian-2.8.0.4.ebuild: + added ~amd64 + + 11 Mar 2005; Alin Nastac <mrness@gentoo.org> -dansguardian-2.7.1.ebuild, + -dansguardian-2.7.6.ebuild, dansguardian-2.8.0.4.ebuild: + Remove obsolete versions and fix mode of init.d script. + + 08 Mar 2005; Alin Nastac <mrness@gentoo.org> dansguardian-2.7.1.ebuild, + dansguardian-2.7.6.ebuild, dansguardian-2.8.0.2.ebuild, + dansguardian-2.8.0.4.ebuild: + Inter-block this package with dansguardian-dgav. + +*dansguardian-2.8.0.4 (26 Feb 2005) + + 26 Feb 2005; Alin Nastac <mrness@gentoo.org> metadata.xml, + files/dansguardian.init, dansguardian-2.8.0.2.ebuild, + +dansguardian-2.8.0.4.ebuild: + Version bump. Fix bug #66177. Append user CFLAGS. Change herd to www-proxy. + + 06 Feb 2005; Markus Rothe <corsair@gentoo.org> dansguardian-2.8.0.2.ebuild: + Stable on ppc64 + + 30 Dec 2004; Markus Rothe <corsair@gentoo.org> dansguardian-2.8.0.2.ebuild: + Added ~ppc64 to KEYWORDS + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + + 29 Aug 2004; David Holm <dholm@gentoo.org> dansguardian-2.8.0.2.ebuild: + Added to ~ppc. + +*dansguardian-2.8.0.2 (27 Aug 2004) + + 27 Aug 2004; Renat Lumpau <rl03@gentoo.org> +dansguardian-2.8.0.2.ebuild: + Version bump, updated location of cgi-in. Closes #58400, 54961. + + 27 Aug 2004; Renat Lumpau <rl03@gentoo.org> metadata.xml: + Method is no longer maintaining dansguardian; reassigning to web-apps. + + 16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; dansguardian-2.7.1.ebuild: + Changing net-www/squid to www-proxy/squid in 2.7.1 depends + +*dansguardian-2.7.1 (15 Aug 2004) + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml, + +files/dansguardian-xnaughty-2.7.6-1.diff, +files/dansguardian.init, + +dansguardian-2.7.1.ebuild, +dansguardian-2.7.6.ebuild: + Moved from net-www/dansguardian to www-proxy/dansguardian. + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> + dansguardian-2.7.6.ebuild: + virtual/glibc -> virtual/libc + + 15 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org> dansguardian-2.7.6.ebuild: + Added ~sparc, + + 14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> + dansguardian-2.7.1.ebuild, dansguardian-2.7.6.ebuild: + don't assign to P; inherit eutils for epatch; error messages + + 14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> + dansguardian-2.6.0.ebuild, dansguardian-2.7.2.ebuild, + dansguardian-2.7.5.ebuild: + tidy extra versions, leaving one stable and one unstable + +*dansguardian-2.7.6 (05 Dec 2003) + + 05 Dec 2003; Joshua Brindle <method@gentoo.org> dansguardian-2.7.6.ebuild, + files/dansguardian-xnaughty-2.7.6-1.diff: + version bump, took squid out of DEPEND since you can use any proxy + (particularly lighter weight ones), added my patch to add an X-Naughty header + to naughty pages but otherwise leave them alone (for better control upstream) + +*dansguardian-2.7.5 (19 Nov 2003) + + 19 Nov 2003; Joshua Brindle <method@gentoo.org> dansguardian-2.7.5.ebuild: + version bump + + 05 Aug 2003; Joshua Brindle <method@gentoo.org> dansguardian-2.7.1.ebuild, + dansguardian-2.7.2.ebuild: + fixed logrotate issue + +*dansguardian-2.7.2 (31 Jul 2003) + + 31 Jul 2003; Joshua Brindle <method@gentoo.org> dansguardian-2.7.2.ebuild: + upstream bump + +*dansguardian-2.7.1 (28 May 2003) + + 28 May 2003; Joshua Brindle <method@gentoo.org> dansguardian-2.6.0.ebuild, + dansguardian-2.7.1.ebuild, files/dansguardian.init: + initial import thanks to Pat Double <double@inebraska.com> + +*dansguardian-2.6.0 (28 May 2003) + + 28 May 2003; Joshua Brindle <method@gentoo.org> dansguardian-2.6.0.ebuild, + dansguardian-2.7.1.ebuild, files/dansguardian.init: + initial import thanks to Pat Double <double@inebraska.com> + diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest new file mode 100644 index 000000000000..0e03f2e94963 --- /dev/null +++ b/net-proxy/dansguardian/Manifest @@ -0,0 +1,8 @@ +MD5 1e4434ca9533fb6090aa5f2a573934cd dansguardian-2.8.0.2.ebuild 1305 +MD5 60c577f55a6a615b898487b756f51932 dansguardian-2.8.0.4.ebuild 1195 +MD5 fee62f35bb3d7a67eaeb0e377e4574b3 ChangeLog 4199 +MD5 30b14eaf02c479d70f60157c1a29a294 metadata.xml 568 +MD5 2eac5634ff8ad0ba6701815c2befce6b files/digest-dansguardian-2.8.0.2 79 +MD5 579f2cac2dbebe18ff6900fd3aa87f66 files/digest-dansguardian-2.8.0.4 79 +MD5 4365b34f67519fc4539e0d1b404ae11e files/dansguardian.init 565 +MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325 diff --git a/net-proxy/dansguardian/dansguardian-2.8.0.2.ebuild b/net-proxy/dansguardian/dansguardian-2.8.0.2.ebuild new file mode 100644 index 000000000000..b900a4454d20 --- /dev/null +++ b/net-proxy/dansguardian/dansguardian-2.8.0.2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.8.0.2.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +DESCRIPTION="Web content filtering via proxy" +HOMEPAGE="http://dansguardian.org" +SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${P}.source.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ~sparc ~ppc ppc64" +IUSE="" +DEPEND="!net-proxy/dansguardian-dgav + virtual/libc" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff +} + +src_compile() { + ./configure \ + --prefix= \ + --installprefix=${D} \ + --mandir=/usr/share/man/ \ + --cgidir=/var/www/localhost/cgi-bin/ || die "./configure failed" + emake || die "emake failed" +} + +src_install() { + if [ -d "/etc/logrotate.d" ]; then mkdir -p ${D}/etc/logrotate.d; fi + make install || die "make install failed" + + dodir /etc/init.d + cp ${FILESDIR}/dansguardian.init ${D}/etc/init.d/dansguardian + + rm -rf ${D}/etc/rc.d + + einfo "Fixing location of initscript" + sed 's/rc.d\///' ${D}/etc/dansguardian/logrotation > ${D}/etc/dansguardian/logrotation.fixed + mv -f ${D}/etc/dansguardian/logrotation.fixed ${D}/etc/dansguardian/logrotation + + dodoc INSTALL README LICENSE +} diff --git a/net-proxy/dansguardian/dansguardian-2.8.0.4.ebuild b/net-proxy/dansguardian/dansguardian-2.8.0.4.ebuild new file mode 100644 index 000000000000..943cdfb201f6 --- /dev/null +++ b/net-proxy/dansguardian/dansguardian-2.8.0.4.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.8.0.4.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +DESCRIPTION="Web content filtering via proxy" +HOMEPAGE="http://dansguardian.org" +SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${P}.source.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ~sparc ~ppc ppc64 ~amd64" +IUSE="" +DEPEND="!net-proxy/dansguardian-dgav + virtual/libc" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff +} + +src_compile() { + ./configure \ + --prefix= \ + --installprefix=${D} \ + --mandir=/usr/share/man/ \ + --cgidir=/var/www/localhost/cgi-bin/ || die "./configure failed" + emake OPTIMISE="${CFLAGS}" || die "emake failed" +} + +src_install() { + if [ -d "/etc/logrotate.d" ]; then + dodir /etc/logrotate.d + fi + make install || die "make install failed" + + exeinto /etc/init.d + newexe ${FILESDIR}/dansguardian.init dansguardian + + rm -rf ${D}/etc/rc.d + + #Fixing location of initscript + sed -i -e 's/rc.d\///' ${D}/etc/dansguardian/logrotation + + dodoc INSTALL README LICENSE +} diff --git a/net-proxy/dansguardian/files/dansguardian-xnaughty-2.7.6-1.diff b/net-proxy/dansguardian/files/dansguardian-xnaughty-2.7.6-1.diff new file mode 100644 index 000000000000..d1e097ce0b08 --- /dev/null +++ b/net-proxy/dansguardian/files/dansguardian-xnaughty-2.7.6-1.diff @@ -0,0 +1,50 @@ +diff -ur DansGuardian-2.7.6-1/ConnectionHandler.cpp DansGuardian-2.7.6-1-new/ConnectionHandler.cpp +--- DansGuardian-2.7.6-1/ConnectionHandler.cpp 2003-12-03 16:04:18.000000000 -0600 ++++ DansGuardian-2.7.6-1-new/ConnectionHandler.cpp 2003-12-03 17:43:36.000000000 -0600 +@@ -990,6 +990,11 @@ + else if (o.reporting_level == -1) { // stealth + (*checkme).isItNaughty = false; // dont block + } ++ else if (o.reporting_level == -2) { // just add a header ++ (*docheader).addXNaughty("true", (*checkme).whatIsNaughty.c_str(), (*url).toCharArray()); ++ (*checkme).isItNaughty = false; // dont block ++ } ++ + } catch (exception& e) {} + if ((*checkme).isItNaughty) { // not stealth mode then + try { +Only in DansGuardian-2.7.6-1-new/: ConnectionHandler.cpp.orig +diff -ur DansGuardian-2.7.6-1/HTTPHeader.cpp DansGuardian-2.7.6-1-new/HTTPHeader.cpp +--- DansGuardian-2.7.6-1/HTTPHeader.cpp 2003-12-03 16:04:18.000000000 -0600 ++++ DansGuardian-2.7.6-1-new/HTTPHeader.cpp 2003-12-03 17:38:09.000000000 -0600 +@@ -456,6 +456,17 @@ + header.push_back(String(line.c_str())); + } + ++void HTTPHeader::addXNaughty(std::string naughty, std::string whatIsNaughty, std::string whereIsNaughty) { ++ std::string line; ++ ++ line = "X-Naughty: " + naughty + "\r"; ++ header.push_back(String(line.c_str())); ++ line = "X-Naughty-Why: " + whatIsNaughty + "\r"; ++ header.push_back(String(line.c_str())); ++ line = "X-Naughty-Where: " + whereIsNaughty + "\r"; ++ header.push_back(String(line.c_str())); ++} ++ + void HTTPHeader::setTimeout(int t) { + timeout = t; + } +Only in DansGuardian-2.7.6-1-new/: HTTPHeader.cpp.orig +diff -ur DansGuardian-2.7.6-1/HTTPHeader.hpp DansGuardian-2.7.6-1-new/HTTPHeader.hpp +--- DansGuardian-2.7.6-1/HTTPHeader.hpp 2003-12-03 16:04:18.000000000 -0600 ++++ DansGuardian-2.7.6-1-new/HTTPHeader.hpp 2003-12-03 17:38:09.000000000 -0600 +@@ -43,6 +43,7 @@ + std::string getXForwardedForIP(); + void setTimeout(int t); + void addXForwardedFor(std::string clientip); ++ void addXNaughty(std::string naughty, std::string whatIsNaughty, std::string whereIsNaughty); + bool isCompressed(); + String contentEncoding(); + void removeEncoding(int newlen); +Only in DansGuardian-2.7.6-1-new/: HTTPHeader.hpp.orig diff --git a/net-proxy/dansguardian/files/dansguardian.init b/net-proxy/dansguardian/files/dansguardian.init new file mode 100644 index 000000000000..0c27c771d30f --- /dev/null +++ b/net-proxy/dansguardian/files/dansguardian.init @@ -0,0 +1,22 @@ +#!/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/dansguardian/files/dansguardian.init,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +depend() { + need net + after squid +} + +start() { + ebegin "Starting DansGuardian" + start-stop-daemon --start --quiet --pidfile /var/run/dansguardian.pid \ + --exec /usr/sbin/dansguardian + eend $? +} + +stop() { + ebegin "Stopping DansGuardian" + start-stop-daemon --stop --quiet --pidfile /var/run/dansguardian.pid + eend $? +} diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.2 b/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.2 new file mode 100644 index 000000000000..10ecce2193d7 --- /dev/null +++ b/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.2 @@ -0,0 +1 @@ +MD5 94e967f97930739de6c531ec4db67d48 dansguardian-2.8.0.2.source.tar.gz 192297 diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.4 b/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.4 new file mode 100644 index 000000000000..10e27cf9e6b6 --- /dev/null +++ b/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.4 @@ -0,0 +1 @@ +MD5 91d65adf4087a863ad605dddd6e18046 dansguardian-2.8.0.4.source.tar.gz 194475 diff --git a/net-proxy/dansguardian/metadata.xml b/net-proxy/dansguardian/metadata.xml new file mode 100644 index 000000000000..0139b229d603 --- /dev/null +++ b/net-proxy/dansguardian/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<longdescription>DansGuardian is an award winning Open Source web content filter which currently runs on Linux, FreeBSD, OpenBSD, NetBSD, Mac OS X, HP-UX, and Solaris. It filters the actual content of pages based on many methods including phrase matching, PICS filtering and URL filtering. It does not purely filter based on a banned list of sites like lesser totally commercial filters.</longdescription> +</pkgmetadata> diff --git a/net-proxy/httpush/ChangeLog b/net-proxy/httpush/ChangeLog new file mode 100644 index 000000000000..398c417d82cf --- /dev/null +++ b/net-proxy/httpush/ChangeLog @@ -0,0 +1,13 @@ +# ChangeLog for www-proxy/httpush +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/httpush/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + +*httpush-0.9_beta11 (01 Apr 2005) + + 01 Apr 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml, + +httpush-0.9_beta11.ebuild: + Initial import from bug #87307. + diff --git a/net-proxy/httpush/Manifest b/net-proxy/httpush/Manifest new file mode 100644 index 000000000000..86dc3121ce44 --- /dev/null +++ b/net-proxy/httpush/Manifest @@ -0,0 +1,4 @@ +MD5 5d6738eb89a93379cf55d6341be67333 httpush-0.9_beta11.ebuild 1407 +MD5 f0cc5b23cd201a1cef5030837239f1ff ChangeLog 467 +MD5 4465953c86462494dd13e67580e4fd8b metadata.xml 415 +MD5 c9beb4a47643787632f3a8010dba451f files/digest-httpush-0.9_beta11 65 diff --git a/net-proxy/httpush/files/digest-httpush-0.9_beta11 b/net-proxy/httpush/files/digest-httpush-0.9_beta11 new file mode 100644 index 000000000000..a11bcc3deab8 --- /dev/null +++ b/net-proxy/httpush/files/digest-httpush-0.9_beta11 @@ -0,0 +1 @@ +MD5 bad2220807a6b2345887ce25953d6ae4 httpush-0.9b11.tar.gz 39342 diff --git a/net-proxy/httpush/httpush-0.9_beta11.ebuild b/net-proxy/httpush/httpush-0.9_beta11.ebuild new file mode 100644 index 000000000000..625d2972d2d8 --- /dev/null +++ b/net-proxy/httpush/httpush-0.9_beta11.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/httpush/httpush-0.9_beta11.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +MY_P="${P/_beta/b}" + +DESCRIPTION="Httpush is an intercepting proxy, allowing user to modify HTTP requests on-the-fly" +HOMEPAGE="http://httpush.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~x86" +IUSE="xml2" + +RDEPEND="dev-perl/URI + dev-perl/MIME-Base64 + dev-perl/libwww-perl + dev-perl/Net-SSLeay + dev-perl/Crypt-SSLeay + dev-perl/HTML-Parser + xml2? ( dev-perl/XML-Twig )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if ! useq xml2 ; then + echo + einfo "If you'd like to use httpush's learning mode, please CTRL-C now" + einfo "and enable the xml2 USE flag." + epause 3 + echo + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + sed -i 's:^\(require httpush;\)$:push @INC, "/usr/lib/httpush";\n\1:' \ + httpush.pl || die "sed INC failed" + sed -i 's:^\(.*DATADIR="\)data\(.*\)$:\1/var/lib/httpush\2:' *.pl \ + lib/plugin/broker.pm || die "sed DATADIR= failed" +} + +src_install() { + keepdir /var/lib/httpush + + insinto /usr/lib/httpush + doins -r httpush.{dtd,lck,pem,pm} lib + + insinto /usr/share/httpush/plugins + doins plugins/* + + newbin httpush.pl httpush + newbin reindex.pl reindex + + dodoc README ChangeLog LICENSE doc/* +} diff --git a/net-proxy/httpush/metadata.xml b/net-proxy/httpush/metadata.xml new file mode 100644 index 000000000000..da12e1aef8d6 --- /dev/null +++ b/net-proxy/httpush/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<longdescription>HTTPush aims at providing an easy way to audit HTTP and HTTPS application/server security. It supports on-the-fly request modification, automated decision making and vulnerability detection through the use of plugins.</longdescription> +</pkgmetadata> diff --git a/net-proxy/junkbuster/ChangeLog b/net-proxy/junkbuster/ChangeLog new file mode 100644 index 000000000000..7d0b8cee3b6e --- /dev/null +++ b/net-proxy/junkbuster/ChangeLog @@ -0,0 +1,58 @@ +# ChangeLog for www-proxy/junkbuster +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/junkbuster/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + +*junkbuster-2.0.2-r3 (12 Apr 2005) + + 12 Apr 2005; Alin Nastac <mrness@gentoo.org> + files/junkbuster-2.0.2-fixups.patch, -junkbuster-2.0.2-r2.ebuild, + +junkbuster-2.0.2-r3.ebuild: + Fix remote exploitable vulnerability and heap corruption, thanks to James Ranson + <euclid80@users.sf.net> and Tavis Ormandy <taviso@gentoo.org> (#88537). + +*junkbuster-2.0.2-r2 (08 Mar 2005) + + 08 Mar 2005; Alin Nastac <mrness@gentoo.org> + +files/junkbuster-2.0.2-fixups.patch, + -junkbuster-2.0.2-r1.ebuild, +junkbuster-2.0.2-r2.ebuild: + Various fixes, thanks to James Ranson <euclid80@users.sf.net>. + +*junkbuster-2.0.2-r1 (23 Feb 2005) + + 23 Feb 2005; Alin Nastac <mrness@gentoo.org> +junkbuster-2.0.2-r1.ebuild, + -junkbuster-2.0.2.ebuild: + Fix CFLAGS (#59511). + + 17 Feb 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml: + Add metadata.xml + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + +*junkbuster-2.0.2 (15 Aug 2004) + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +files/junkbuster.rc6, + +junkbuster-2.0.2.ebuild: + Moved from net-www/junkbuster to www-proxy/junkbuster. + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> + junkbuster-2.0.2.ebuild: + virtual/glibc -> virtual/libc + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*junkbuster-2.0.2 (1 Feb 2002) + + 14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> junkbuster-2.0.2.ebuild : + Added LICENSE, KEYWORDS, SLOT. + + 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/net-proxy/junkbuster/Manifest b/net-proxy/junkbuster/Manifest new file mode 100644 index 000000000000..8d8d578d53b4 --- /dev/null +++ b/net-proxy/junkbuster/Manifest @@ -0,0 +1,6 @@ +MD5 b3c185a99ebbee6ea12d5450c48e6cec junkbuster-2.0.2-r3.ebuild 996 +MD5 9753170dc43e19193f33d5f78ac8668d ChangeLog 2188 +MD5 1d7888b1ea9ce027a9822471cd49a627 metadata.xml 218 +MD5 144473c056c1fe200cf39e691a8417ba files/digest-junkbuster-2.0.2-r3 70 +MD5 6c8d7b83685f02017218f73763bd8b71 files/junkbuster.rc6 583 +MD5 77a51c2ad0d03e74b67b9f6caa0d4048 files/junkbuster-2.0.2-fixups.patch 1871 diff --git a/net-proxy/junkbuster/files/digest-junkbuster-2.0.2-r3 b/net-proxy/junkbuster/files/digest-junkbuster-2.0.2-r3 new file mode 100644 index 000000000000..b8d73f6b66ec --- /dev/null +++ b/net-proxy/junkbuster/files/digest-junkbuster-2.0.2-r3 @@ -0,0 +1 @@ +MD5 608ae3aee43ffd09117e00e28086946b junkbuster-2.0.2-8.tar.gz 233713 diff --git a/net-proxy/junkbuster/files/junkbuster-2.0.2-fixups.patch b/net-proxy/junkbuster/files/junkbuster-2.0.2-fixups.patch new file mode 100644 index 000000000000..47ed33eed0d0 --- /dev/null +++ b/net-proxy/junkbuster/files/junkbuster-2.0.2-fixups.patch @@ -0,0 +1,67 @@ +diff -Nru ijb20.orig/filters.c ijb20/filters.c +--- ijb20.orig/filters.c 2000-03-29 16:05:42.000000000 +0300 ++++ ijb20/filters.c 2005-04-12 22:54:06.295702048 +0300 +@@ -652,7 +652,7 @@ + ij_untrusted_url(struct http_request *http, struct client_state *csp) + { + int n; +- char *hostport, *path, *p, *v[9]; ++ char *hostport, *path, *referrer, *p, *v[9]; + char buf[BUFSIZ]; + struct url_spec **tl, *t; + +@@ -700,9 +700,9 @@ + freez(hostport); + freez(path ); + +- strsav(p, "The referrer in this request was <strong>"); +- strsav(p, referrer); +- strsav(p, "</strong><br>\n"); ++ p = strsav(p, "The referrer in this request was <strong>"); ++ p = strsav(p, referrer); ++ p = strsav(p, "</strong><br>\n"); + + p = strsav(p, "<h3>The following referrers are trusted</h3>\n"); + +@@ -773,7 +773,7 @@ + + sprintf(out_str, + "%d requests received, %d filtered " +- "(%6.2f \%).\0", ++ "(%6.2f %%).", + urls_read, urls_rejected+1, perc_rej); + + s = strsav(s,out_str); +diff -Nru ijb20.orig/socks4.c ijb20/socks4.c +--- ijb20.orig/socks4.c 1998-10-30 23:58:48.000000000 +0200 ++++ ijb20/socks4.c 2005-04-12 22:44:47.367672024 +0300 +@@ -9,6 +9,7 @@ + #include <stdio.h> + #include <sys/types.h> + #include <errno.h> ++#include <string.h> + + #ifdef _WIN32 + #include <io.h> +@@ -56,7 +57,7 @@ + unsigned char sbuf[BUFSIZ]; + struct socks_op *c = (struct socks_op *)cbuf; + struct socks_reply *s = (struct socks_reply *)sbuf; +- int web_server_addr; ++ int web_server_addr = 0; + int n, csiz, sfd, target_port; + int err = 0; + char *errstr, *target_host; +diff -Nru ijb20.orig/ssplit.c ijb20/ssplit.c +--- ijb20.orig/ssplit.c 1998-10-30 23:58:48.000000000 +0200 ++++ ijb20/ssplit.c 2005-04-12 22:44:47.368671872 +0300 +@@ -19,6 +19,9 @@ + */ + + #include <string.h> ++#include <stdlib.h> ++ ++extern void *zalloc(int); + + int ssplit(char *s, char *c, char *v[], int n, int m, int l) + { diff --git a/net-proxy/junkbuster/files/junkbuster.rc6 b/net-proxy/junkbuster/files/junkbuster.rc6 new file mode 100644 index 000000000000..65051763911b --- /dev/null +++ b/net-proxy/junkbuster/files/junkbuster.rc6 @@ -0,0 +1,17 @@ +#!/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/junkbuster/files/junkbuster.rc6,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +start() { + ebegin "Starting junkbuster" + start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/junkbuster.pid --exec /usr/sbin/junkbuster -- /etc/junkbuster/config & + eend $? +} + +stop() { + ebegin "Stopping junkbuster" + start-stop-daemon --stop --quiet --pidfile /var/run/junkbuster.pid + rm -f /var/run/junkbuster.pid + eend $? +} diff --git a/net-proxy/junkbuster/junkbuster-2.0.2-r3.ebuild b/net-proxy/junkbuster/junkbuster-2.0.2-r3.ebuild new file mode 100644 index 000000000000..843b1ba7bfd3 --- /dev/null +++ b/net-proxy/junkbuster/junkbuster-2.0.2-r3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/junkbuster/junkbuster-2.0.2-r3.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ +inherit eutils + +DESCRIPTION="Filtering HTTP proxy" +HOMEPAGE="http://internet.junkbuster.com" +SRC_URI="http://www.waldherr.org/redhat/rpm/srpm/junkbuster-2.0.2-8.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 sparc ppc" +IUSE="" + +DEPEND="virtual/libc" + +S=${WORKDIR}/ijb20 + +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-fixups.patch + + sed -i -e 's:^CFLAGS *=:CFLAGS +=:' ${S}/Makefile +} + +src_install () { + dosbin junkbuster + + dodir /etc/init.d + exeinto /etc/init.d + newexe ${FILESDIR}/junkbuster.rc6 junkbuster + + dodir /etc/junkbuster + insinto /etc/junkbuster + doins blocklist config cookiefile forward imagelist + + dohtml gpl.html ijbman.html ijbfaq.html + dodoc README README.TOO README.WIN squid.txt + + doman junkbuster.1 + + dodir /var/log/junkbuster +} diff --git a/net-proxy/junkbuster/metadata.xml b/net-proxy/junkbuster/metadata.xml new file mode 100644 index 000000000000..c3460bec585d --- /dev/null +++ b/net-proxy/junkbuster/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<longdescription>Filtering HTTP proxy</longdescription> +</pkgmetadata> diff --git a/net-proxy/metadata.xml b/net-proxy/metadata.xml new file mode 100644 index 000000000000..4e1b430093df --- /dev/null +++ b/net-proxy/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<catmetadata> + <longdescription lang="en"> + The net-proxy category contains network proxy software. + </longdescription> + <longdescription lang="es"> + La categoría net-proxy contiene proxies de red. + </longdescription> + <longdescription lang="de"> + Die Kategorie net-proxy enthält verschiedene Netzwerk-Proxies. + </longdescription> +</catmetadata> + diff --git a/net-proxy/middleman/ChangeLog b/net-proxy/middleman/ChangeLog new file mode 100644 index 000000000000..c48f91a7c5ad --- /dev/null +++ b/net-proxy/middleman/ChangeLog @@ -0,0 +1,115 @@ +# ChangeLog for www-proxy/middleman +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + + 06 Apr 2005; Alin Nastac <mrness@gentoo.org> + -files/middleman-1.9.1-makefile.patch, + +files/middleman-2.0.1-gcc-34.patch, -middleman-1.9.1-r1.ebuild, + -middleman-2.0.1-r1.ebuild, middleman-2.0.1-r2.ebuild: + Fix compilation on gcc-3.4 and mark stable on x86. Remove obsolete versions. + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + middleman-2.0.1-r1.ebuild, middleman-2.0.1-r2.ebuild: + Masked middleman-2.0.1-r2.ebuild stable for ppc + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + middleman-2.0.1-r1.ebuild: + Masked middleman-2.0.1-r1.ebuild stable for ppc + +*middleman-1.9.1-r1 (15 Aug 2004) + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml, + +files/middleman-1.9.1-makefile.patch, + +files/middleman-2.0.1-putlog-fix.patch, +files/conf.d/mman, + +files/init.d/mman, +middleman-1.9.1-r1.ebuild, +middleman-2.0.1-r1.ebuild, + +middleman-2.0.1-r2.ebuild, +middleman-2.0.1.ebuild: + Moved from net-www/middleman to www-proxy/middleman. + +*middleman-2.0.1-r2 (28 Jul 2004) + + 28 Jul 2004; <solar@gentoo.org> middleman-2.0.1-r2.ebuild, + files/middleman-2.0.1-putlog-fix.patch: + patched putlog() function which would cause segfaults on really long url's. + patch source comes from battousai@gentoo + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> + middleman-1.9.1-r1.ebuild, middleman-2.0.1-r1.ebuild, + middleman-2.0.1.ebuild: + virtual/glibc -> virtual/libc + + 25 Apr 2004; David Holm <dholm@gentoo.org> middleman-2.0.1-r1.ebuild: + Added to ~ppc. + + 23 Apr 2004; Stuart Herbert <stuart@gentoo.org> files/conf.d/mman: + Added missing SECTION to conf.d file + + 23 Apr 2004; Stuart Herbert <stuart@gentoo.org> files/init.d/mman: + Added missing start up options to the init.d file + +*middleman-2.0.1-r1 (23 Apr 2004) + + 23 Apr 2004; Stuart Herbert <stuart@gentoo.org> middleman-2.0.1-r1.ebuild: + Config files now go into /etc/mman, and not /etc/mman/mman ;-) Fix for bug + #47376; thanks to Malte S. Stretz <gentoo-contrib@msquadrat.de> + +*middleman-2.0.1 (29 Mar 2004) + + 29 Mar 2004; <solar@gentoo.org> middleman-1.9.1-r1.ebuild, + middleman-1.9.1.ebuild, middleman-2.0.1.ebuild: + version bump 2.0.1... removed old 1.9.1 from portage tree + +*middleman-1.9.1-r1 (28 Nov 2003) + + 28 Nov 2003; <solar@gentoo.org> middleman-1.9.1-r1.ebuild, + middleman-1.9.ebuild, files/middleman-1.9.1-makefile.patch, + files/init.d/mman: + updated initscripts and added a small patch to its makefile so it would + install into the correct /etc/mman dir + +*middleman-1.9.1 (11 Nov 2003) + + 11 Nov 2003; <solar@gentoo.org> middleman-1.8.1.ebuild, + middleman-1.8.2.ebuild, middleman-1.9.1.ebuild: + version bump + + 09 Nov 2003; zhen <zhen@gentoo.org> middleman-1.9.ebuild: + changed sanbox to sandbox in patch msg + + 25 Oct 2003; <solar@gentoo.org> middleman-1.9.ebuild: + bumping to stable + +*middleman-1.9 (11 Sep 2003) + + 11 Sep 2003; <solar@gentoo.org> middleman-1.9.ebuild: + version bumpage, The changes in this release are as follows: + Support for ICP (Internet cache protocol) was added, making it + possible to arrange several proxies in a hierarchy and share cached + objects. It is now possible to specify multiple directories for + cached objects to be stored. The 'Host' and 'File' options in most + configuration sections were removed in favor of enabling/ disable + profiles based on the URL requested. A workaround was added for a + bug triggered by improper headers sent by Apache 1.3 when a tar.gz + file was requested by a client that doesn't support gzip + compression. + +*middleman-1.8.2 (11 Aug 2003) + + 11 Aug 2003; <solar@gentoo.org> middleman-1.8.2.ebuild: + version bump + + 26 Jul 2003; <solar@gentoo.org> middleman-1.8.1.ebuild: + Added missing support for pam and zlib, next version will have better + sysloging features + +*middleman-1.8.1 (25 Jul 2003) + + 25 Jul 2003; <solar@gentoo.org> metadata.xml, middleman-1.8.1.ebuild, + files/conf.d/mman, files/init.d/mman: + Initial import of middle-man filtering proxy to gentoo + diff --git a/net-proxy/middleman/Manifest b/net-proxy/middleman/Manifest new file mode 100644 index 000000000000..b63d4ac18bd9 --- /dev/null +++ b/net-proxy/middleman/Manifest @@ -0,0 +1,10 @@ +MD5 09a107b85bc5676b9d532807cdff8647 middleman-2.0.1-r2.ebuild 2012 +MD5 8c493d7fe8efde573c25dcdee34b0711 middleman-2.0.1.ebuild 1831 +MD5 c4f44329733723815da6abc01f959236 ChangeLog 4390 +MD5 b3089a22f33a39676bb267f8d3d59c07 metadata.xml 1012 +MD5 900b7f67e15e2549a495775afebed6b9 files/digest-middleman-2.0.1-r2 67 +MD5 22c116e20fcb12dbd46cbb38125f2e68 files/middleman-2.0.1-putlog-fix.patch 3671 +MD5 900b7f67e15e2549a495775afebed6b9 files/digest-middleman-2.0.1 67 +MD5 bb883e451ed1555f5171f3b196874712 files/middleman-2.0.1-gcc-34.patch 1091 +MD5 cca46008c83644944b263535a7d2ead1 files/conf.d/mman 138 +MD5 9505c222e2602ecc27c6e9ecdd1c08f5 files/init.d/mman 968 diff --git a/net-proxy/middleman/files/conf.d/mman b/net-proxy/middleman/files/conf.d/mman new file mode 100644 index 000000000000..3ed0e52c7b8e --- /dev/null +++ b/net-proxy/middleman/files/conf.d/mman @@ -0,0 +1,7 @@ +# +# MiddleMan filtering proxy server +# +LOGFILE=/var/log/mman.log +CONFIG=/etc/mman/config.xml +LOGLEVEL=32767 +SECTION=/etc/mman/section.xml diff --git a/net-proxy/middleman/files/digest-middleman-2.0.1 b/net-proxy/middleman/files/digest-middleman-2.0.1 new file mode 100644 index 000000000000..05e783e77584 --- /dev/null +++ b/net-proxy/middleman/files/digest-middleman-2.0.1 @@ -0,0 +1 @@ +MD5 8bf596a4810184c8f7534d63b1e94cf1 middleman-2.0.1.tar.gz 743404 diff --git a/net-proxy/middleman/files/digest-middleman-2.0.1-r2 b/net-proxy/middleman/files/digest-middleman-2.0.1-r2 new file mode 100644 index 000000000000..05e783e77584 --- /dev/null +++ b/net-proxy/middleman/files/digest-middleman-2.0.1-r2 @@ -0,0 +1 @@ +MD5 8bf596a4810184c8f7534d63b1e94cf1 middleman-2.0.1.tar.gz 743404 diff --git a/net-proxy/middleman/files/init.d/mman b/net-proxy/middleman/files/init.d/mman new file mode 100755 index 000000000000..9412c0ed869a --- /dev/null +++ b/net-proxy/middleman/files/init.d/mman @@ -0,0 +1,38 @@ +#!/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/middleman/files/init.d/mman,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + +opts="depend checkconfig stop start" + +depend() { + need net +} + +checkconfig() { + if [ ! -e /etc/mman/config.xml ]; then + eerror "You need to create a /etc/mman/config.xml first." + return 1 + fi +} + +stop() { + ebegin "Stopping mman" + start-stop-daemon --stop --quiet --pidfile /var/run/mman.pid + result=$? + eend $result +} + +start() { + local myopts="-p /var/run/mman.pid" + [ "${CONFIG}" != "" ] && myopts="${myopts} -c ${CONFIG}" + [ "${LOGFILE}" != "" ] && myopts="${myopts} -l ${LOGFILE}" + [ "${LOGLEVEL}" != "" ] && myopts="${myopts} -d ${LOGLEVEL}" + [ "${SECTION}" != "" ] && myopts="${myopts} -s ${SECTION}" + + ebegin "Starting mman" + start-stop-daemon --start --quiet --exec /usr/bin/mman -- ${myopts} + result=$? + eend $result +} diff --git a/net-proxy/middleman/files/middleman-2.0.1-gcc-34.patch b/net-proxy/middleman/files/middleman-2.0.1-gcc-34.patch new file mode 100644 index 000000000000..0e046b043413 --- /dev/null +++ b/net-proxy/middleman/files/middleman-2.0.1-gcc-34.patch @@ -0,0 +1,33 @@ +diff -Nru middleman-2.0.1.orig/src/main.c middleman-2.0.1/src/main.c +--- middleman-2.0.1.orig/src/main.c 2004-03-12 00:28:57.000000000 +0200 ++++ middleman-2.0.1/src/main.c 2005-04-06 21:12:10.580927424 +0300 +@@ -407,7 +407,7 @@ + #else + pcre_free = xfree; + // grr... argument to malloc is int on some systems, and long on others +- (void *) pcre_malloc = (void *) xmalloc; ++ (void *&) pcre_malloc = (void *) xmalloc; + #endif + + global->dns_cache = hash_create(DNS_HASH_SIZE); +diff -Nru middleman-2.0.1.orig/src/stats.c middleman-2.0.1/src/stats.c +--- middleman-2.0.1.orig/src/stats.c 2004-03-12 00:27:16.000000000 +0200 ++++ middleman-2.0.1/src/stats.c 2005-04-06 21:11:29.636151976 +0300 +@@ -175,7 +175,7 @@ + + sc.name = stat; + sc.type = type | StatCounter::CALLBACK; +- (void *)sc.value.callback = (void *)cb; ++ (void *&)sc.value.callback = (void *)cb; + + counter_list.push_back(sc); + +@@ -193,7 +193,7 @@ + + sc.name = stat; + sc.type = type | StatCounter::CALLBACK; +- (void *)sc.value.callback = (void *)cb; ++ (void *&)sc.value.callback = (void *)cb; + + counter_list.push_back(sc); + diff --git a/net-proxy/middleman/files/middleman-2.0.1-putlog-fix.patch b/net-proxy/middleman/files/middleman-2.0.1-putlog-fix.patch new file mode 100644 index 000000000000..27f5931378a8 --- /dev/null +++ b/net-proxy/middleman/files/middleman-2.0.1-putlog-fix.patch @@ -0,0 +1,155 @@ +--- middleman-2.0.1/src/log.c.orig 2004-07-28 15:42:46.389571608 -0400 ++++ middleman-2.0.1/src/log.c 2004-07-28 15:43:11.422765984 -0400 +@@ -30,6 +30,8 @@ + #include <syslog.h> + #endif /* USE_SYSLOG */ + ++#define LINELEN 512 ++ + int logfd = -1; + extern int loglevel; + extern int daemonize; +@@ -46,105 +48,99 @@ + time_t tt; + struct tm *tv; + #endif +- int ret; + va_list valist; +- char buf[1024], *ptr; ++ char ptr[LINELEN], tmp[LINELEN]; + + pthread_mutex_lock(&logfile_lock); + +- ptr = buf; +- + #ifndef USE_SYSLOG + time(&tt); + tv = localtime(&tt); + +- ptr += strftime(ptr, 24, TIMEFORMAT, tv); ++ strftime(ptr, 24, TIMEFORMAT, tv); ++ sprintf(tmp, " [%u] ", (unsigned int) getpid()); ++ strcat(ptr, tmp); + +- ptr += sprintf(ptr, " [%u] ", (unsigned int) getpid()); + #endif + + switch (level) { + case MMLOG_REQUEST: +- ptr += sprintf(ptr, "request: "); ++ strcat(ptr, "request: "); + break; + case MMLOG_NETWORK: +- ptr += sprintf(ptr, "network: "); ++ strcat(ptr, "network: "); + break; + case MMLOG_FILTER: +- ptr += sprintf(ptr, "url filter: "); ++ strcat(ptr, "url filter: "); + break; + case MMLOG_HEADER: +- ptr += sprintf(ptr, "header: "); ++ strcat(ptr, "header: "); + break; + case MMLOG_MIME: +- ptr += sprintf(ptr, "mime filter: "); ++ strcat(ptr, "mime filter: "); + break; + case MMLOG_COOKIE: +- ptr += sprintf(ptr, "cooke filter: "); ++ strcat(ptr, "cooke filter: "); + break; + case MMLOG_REDIRECT: +- ptr += sprintf(ptr, "redirect: "); ++ strcat(ptr, "redirect: "); + break; + case MMLOG_TEMPLATE: +- ptr += sprintf(ptr, "template: "); ++ strcat(ptr, "template: "); + break; + case MMLOG_KEYWORDS: +- ptr += sprintf(ptr, "keyword filter: "); ++ strcat(ptr, "keyword filter: "); + break; + case MMLOG_REWRITE: +- ptr += sprintf(ptr, "rewriting: "); ++ strcat(ptr, "rewriting: "); + break; + case MMLOG_LIMITS: +- ptr += sprintf(ptr, "limits: "); ++ strcat(ptr, "limits: "); + break; + case MMLOG_PREFETCH: +- ptr += sprintf(ptr, "prefetch: "); ++ strcat(ptr, "prefetch: "); + break; + case MMLOG_CACHE: +- ptr += sprintf(ptr, "cache: "); ++ strcat(ptr, "cache: "); + break; + case MMLOG_ICP: +- ptr += sprintf(ptr, "ICP: "); ++ strcat(ptr, "ICP: "); + break; + case MMLOG_FORWARD: +- ptr += sprintf(ptr, "forwarding: "); ++ strcat(ptr, "forwarding: "); + break; + case MMLOG_SECURITY: +- ptr += sprintf(ptr, "security: "); ++ strcat(ptr, "security: "); + break; + case MMLOG_WARN: +- ptr += sprintf(ptr, "warning: "); ++ strcat(ptr, "warning: "); + break; + case MMLOG_ERROR: +- ptr += sprintf(ptr, "error: "); ++ strcat(ptr, "error: "); + break; + case MMLOG_DEBUG: +- ptr += sprintf(ptr, "debug: "); ++ strcat(ptr, "debug: "); + break; + } + + va_start(valist, fmt); +- ret = vsnprintf(ptr, sizeof(buf) - (ptr - buf), fmt, valist); ++ vsnprintf(tmp, LINELEN - strlen(ptr) - 1, fmt, valist); + va_end(valist); ++ s_strncat(ptr, tmp, LINELEN - strlen(ptr) - 1); ++ strcat(ptr, "\n"); + +- ptr += (ret > sizeof(buf) || ret == -1) ? sizeof(buf) - (ptr - buf) : ret; + + if (level != MMLOG_DEBUG) +- logbuffer_add(global->logbuffer, buf); +- +- if (*(ptr - 1) != '\n') { +- *(ptr++) = '\n'; +- *ptr = '\0'; +- } ++ logbuffer_add(global->logbuffer, ptr); + + if ((loglevel & level) && daemonize == FALSE) +- printf("%s", buf); ++ printf("%s", ptr); + + if (!*logfile || !(loglevel & level)) + goto out; + + #ifdef USE_SYSLOG +- syslog(LOG_INFO, "%s", buf); ++ syslog(LOG_INFO, "%s", ptr); + #else + if (logfd == -1) { + logfd = open(logfile, O_RDWR | O_CREAT, 0640); +@@ -154,7 +150,7 @@ + lseek(logfd, 0, SEEK_END); + } + +- write(logfd, buf, strlen(buf)); ++ write(logfd, ptr, strlen(ptr)); + #endif + out: + pthread_mutex_unlock(&logfile_lock); diff --git a/net-proxy/middleman/metadata.xml b/net-proxy/middleman/metadata.xml new file mode 100644 index 000000000000..5a66385e992a --- /dev/null +++ b/net-proxy/middleman/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>hardened</herd> + <maintainer> + <email>solar@gentoo.org</email> + <description>Primary Maintainer</description> + </maintainer> +<longdescription> +Middleman is a robust proxy server with many features designed to +remove unwanted content, increase privacy, and to simply make surfing +the Web a more pleasant experience. Some of the highlights include +banner and popup blocking, HTTP and FTP content caching, NTLM and +Basic authentication when forwarding through another proxy server, +regular expression substitution in downloaded files and HTTP headers, +regular expression substitution on requested URLs, many URL commands +to temporarily change the proxy settings or to view information about +a requested file, complete support for HTTP/1.1 including persistent +connections and gzip encoding, and an intutive Web interface for +configuring the proxy. +</longdescription> +</pkgmetadata> diff --git a/net-proxy/middleman/middleman-2.0.1-r2.ebuild b/net-proxy/middleman/middleman-2.0.1-r2.ebuild new file mode 100644 index 000000000000..b076fba3e467 --- /dev/null +++ b/net-proxy/middleman/middleman-2.0.1-r2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/middleman-2.0.1-r2.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +DESCRIPTION="Advanced HTTP/1.1 proxy server with features designed to increase privacy and remove unwanted content" +SRC_URI="mirror://sourceforge/middle-man/${P}.tar.gz" +HOMEPAGE="http://sourceforge.net/projects/middle-man" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ppc" +IUSE="${IUSE} pam zlib" + +DEPEND="virtual/libc + dev-libs/libpcre + pam? ( sys-libs/pam ) + zlib? ( sys-libs/zlib ) +" + +src_unpack() { + unpack ${A} + [ -f ${FILESDIR}/${P}-gentoo.diff ] && epatch ${FILESDIR}/${P}-gentoo.diff + cd ${S} + epatch ${FILESDIR}/${P}-putlog-fix.patch + epatch ${FILESDIR}/${P}-gcc-34.patch +} + +src_compile() { + local myconf="" + MAKEOPTS="-j1" + + cd ${S} + for opt in ${IUSE}; do + use ${opt} && + myconf="${myconf} --enable-${opt}" || + myconf="$myconf --disable-${opt}" + done + + econf --sysconfdir=/etc ${myconf} || die "econf failed: ${myconf}" + emake || die "emake failed" +} + +src_install() { + cd ${S} + # mkdir -p ${D}/usr/share/man/man8/ + make DESTDIR="${D}" install || die "einstall failed" + + dodoc CHANGELOG COPYING + dohtml README.html + + insinto /etc/conf.d + newins ${FILESDIR}/conf.d/mman mman + exeinto /etc/init.d + newexe ${FILESDIR}/init.d/mman mman +} + +#pkg_preinst() { +# enewgroup mman 8080 +# enewuser mman 8080 +#} + +pkg_postinst() { + #einfo "A mman user has been added to your system if one did not already exist" + einfo "-" + einfo "Note: init/conf scripts and a sample config has been provided for you." + einfo "They can be found at or in /etc/conf.d/mman /etc/init.d/mman /etc/mman/" + + if [ -d /etc/mman/mman ]; then + ewarn "A previous version of this ebuild installed the config scripts into" + ewarn + ewarn " /etc/mman/mman/" + ewarn + ewarn "by mistake. Please move these files into /etc/mman instead, and remove" + ewarn "your /etc/mman/mman/ directory." + fi +} diff --git a/net-proxy/middleman/middleman-2.0.1.ebuild b/net-proxy/middleman/middleman-2.0.1.ebuild new file mode 100644 index 000000000000..44dfa096577f --- /dev/null +++ b/net-proxy/middleman/middleman-2.0.1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/middleman-2.0.1.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +DESCRIPTION="Advanced HTTP/1.1 proxy server with features designed to increase privacy and remove unwanted content" +SRC_URI="mirror://sourceforge/middle-man/${P}.tar.gz" +HOMEPAGE="http://sourceforge.net/projects/middle-man" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86" +IUSE="${IUSE} pam zlib" + +#S=${WORKDIR}/ + +DEPEND="virtual/libc + dev-libs/libpcre + pam? ( sys-libs/pam ) + zlib? ( sys-libs/zlib ) +" + +src_unpack() { + unpack ${A} + [ -f ${FILESDIR}/${P}-gentoo.diff ] && epatch ${FILESDIR}/${P}-gentoo.diff + cd ${S} + #if [ "$PV" = "1.9" ]; then + # einfo "Patching Makefile.in to avoid sandbox problems" + # sed -i -e s:"INSTALL) -d /var":"INSTALL) -d \$(DESTDIR)/var":g Makefile.in + #fi +} + +src_compile() { + local myconf="" + MAKEOPTS="-j1" + + cd ${S} + for opt in ${IUSE}; do + use ${opt} && + myconf="${myconf} --enable-${opt}" || + myconf="$myconf --disable-${opt}" + done + + econf --sysconfdir=/etc/mman ${myconf} || die "econf failed: ${myconf}" + emake || die "emake failed" +} + +src_install() { + cd ${S} + # mkdir -p ${D}/usr/share/man/man8/ + make DESTDIR="${D}" install || die "einstall failed" + + dodoc CHANGELOG COPYING + dohtml README.html + + insinto /etc/conf.d + newins ${FILESDIR}/conf.d/mman mman + exeinto /etc/init.d + newexe ${FILESDIR}/init.d/mman mman +} + +#pkg_preinst() { +# enewgroup mman 8080 +# enewuser mman 8080 +#} + +pkg_postinst() { + #einfo "A mman user has been added to your system if one did not already exist" + einfo "-" + einfo "Note: init/conf scripts and a sample config has been provided for you." + einfo "They can be found at or in /etc/conf.d/mman /etc/init.d/mman /etc/mman/" +} diff --git a/net-proxy/ntlmaps/ChangeLog b/net-proxy/ntlmaps/ChangeLog new file mode 100644 index 000000000000..fc4b1948af37 --- /dev/null +++ b/net-proxy/ntlmaps/ChangeLog @@ -0,0 +1,53 @@ +# ChangeLog for www-proxy/ntlmaps +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + + 02 Apr 2005; Simon Stelling <blubb@gentoo.org> ntlmaps-0.9.9.ebuild: + added ~amd64 + +*ntlmaps-0.9.9 (24 Feb 2005) + + 24 Feb 2005; Alin Nastac <mrness@gentoo.org> -files/ntlmaps-0.9.8.patch, + +files/ntlmaps-0.9.9-gentoo.patch, files/ntlmaps.init, + -ntlmaps-0.9.8-r1.ebuild, -ntlmaps-0.9.8.ebuild, +ntlmaps-0.9.9.ebuild: + Version bump. *nixize paths and filenames (#78197). + + 09 Jan 2005; Markus Rothe <corsair@gentoo.org> ntlmaps-0.9.8-r1.ebuild: + Added ~ppc64 to KEYWORDS + +*ntlmaps-0.9.8-r1 (05 Jan 2005) + + 05 Jan 2005; Christian Andreetta <satya@gentoo.org> files/ntlmaps.init, + +ntlmaps-0.9.8-r1.ebuild, ntlmaps-0.9.8.ebuild: + 0.9.8: changed config name to make portage depcache happy. + 0.9.8-r1: better pkg removal options, minor bugfix in conf file install + + 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> ntlmaps-0.9.8.ebuild: + Keyword ~alpha, bug 64113. + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + +*ntlmaps-0.9.8 (15 Aug 2004) + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml, + +files/ntlmaps-0.9.8.patch, +files/ntlmaps.init, +ntlmaps-0.9.8.ebuild: + Moved from net-www/ntlmaps to www-proxy/ntlmaps. + + 17 Jun 2004; Christian Andreetta <satya@gentoo.org> ntlmaps-0.9.8.ebuild: + added inherit eutils + +*ntlmaps-0.9.8 (11 Jun 2004) + + 11 Jun 2004; David Holm <dholm@gentoo.org> ntlmaps-0.9.8.ebuild: + Added to ~ppc. + + 10 Jun 2004; satya@gentoo.org : + New ebuild, as per bug #49958. Initscripts. + diff --git a/net-proxy/ntlmaps/Manifest b/net-proxy/ntlmaps/Manifest new file mode 100644 index 000000000000..c07768ad3d65 --- /dev/null +++ b/net-proxy/ntlmaps/Manifest @@ -0,0 +1,6 @@ +MD5 e2fd4eeb91e7685257f39b6b0e830e52 ntlmaps-0.9.9.ebuild 1248 +MD5 9d205f5bd7e920f2dcd8ce2478ee44f5 ChangeLog 1883 +MD5 a65bb25d95d5de35ca0f2727b1e8e7c9 metadata.xml 489 +MD5 4ac59759588c1d0764a9dba7cb7bff23 files/ntlmaps.init 697 +MD5 89d940c1a5df0a265c10c920498f1a03 files/ntlmaps-0.9.9-gentoo.patch 1165 +MD5 677c6c0d28b021c5c460dcd020ca6dce files/digest-ntlmaps-0.9.9 64 diff --git a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9 b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9 new file mode 100644 index 000000000000..9d4bc473464f --- /dev/null +++ b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9 @@ -0,0 +1 @@ +MD5 02d0f83f499eaf988de4ffab2dfd3618 ntlmaps-0.9.9.tar.gz 55459 diff --git a/net-proxy/ntlmaps/files/ntlmaps-0.9.9-gentoo.patch b/net-proxy/ntlmaps/files/ntlmaps-0.9.9-gentoo.patch new file mode 100644 index 000000000000..02e90f2ccf9d --- /dev/null +++ b/net-proxy/ntlmaps/files/ntlmaps-0.9.9-gentoo.patch @@ -0,0 +1,37 @@ +diff -Nru ntlmaps-0.9.9.orig/__init__.py ntlmaps-0.9.9/__init__.py +--- ntlmaps-0.9.9.orig/__init__.py 2004-11-10 01:27:05.000000000 +0200 ++++ ntlmaps-0.9.9/__init__.py 2005-02-24 13:07:56.601327735 +0200 +@@ -22,8 +22,7 @@ + + import os, sys + +-ntlmaps_dir = os.path.dirname(os.path.abspath(__file__)) +-ntlmaps_libdir = ntlmaps_dir + '/lib' ++ntlmaps_dir = '/usr/lib/ntlmaps' + sys.path.append(ntlmaps_libdir) + + del os, sys +diff -Nru ntlmaps-0.9.9.orig/main.py ntlmaps-0.9.9/main.py +--- ntlmaps-0.9.9.orig/main.py 2005-02-01 04:45:02.000000000 +0200 ++++ ntlmaps-0.9.9/main.py 2005-02-24 13:11:46.762545214 +0200 +@@ -18,17 +18,17 @@ + # Free Software Foundation, Inc., + # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + # +-import __init__ +- + import sys + ++sys.path.append('/usr/lib/ntlmaps') ++ + import server, config, config_affairs + + + #-------------------------------------------------------------- + # config affairs + # look for default config name in lib/config.py +-conf = config.read_config(config.findConfigFileNameInArgv(sys.argv, __init__.ntlmaps_dir+'/')) ++conf = config.read_config('/etc/ntlmaps/server.cfg') + + conf['GENERAL']['VERSION'] = '0.9.9' + diff --git a/net-proxy/ntlmaps/files/ntlmaps.init b/net-proxy/ntlmaps/files/ntlmaps.init new file mode 100644 index 000000000000..8cf3288a0db0 --- /dev/null +++ b/net-proxy/ntlmaps/files/ntlmaps.init @@ -0,0 +1,26 @@ +#!/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/ntlmaps/files/ntlmaps.init,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +PID_FILE="/var/run/ntlmaps.pid" + +depend() { + need net +} + +start() { + ebegin "Starting ntlmaps" + touch ${PID_FILE} + chown nobody:nogroup ${PID_FILE} + start-stop-daemon --quiet --start --background --exec /usr/bin/python \ + --make-pidfile --pidfile ${PID_FILE} --chuid nobody -- /usr/bin/ntlmaps < /dev/null && \ + sleep 1 + eend $? +} +stop() { + ebegin "Stopping ntlmaps" + start-stop-daemon --stop --quiet --pidfile ${PID_FILE} && \ + rm -f ${PID_FILE} + eend $? +} diff --git a/net-proxy/ntlmaps/metadata.xml b/net-proxy/ntlmaps/metadata.xml new file mode 100644 index 000000000000..9166bd3974db --- /dev/null +++ b/net-proxy/ntlmaps/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<maintainer> + <email>satya@gentoo.org</email> + <name>Christian A. Andreetta</name> +</maintainer> +<longdescription>ntlmaps is a http/ftp/socks proxy server written in python that implements samba-like ntlm authentication against a Microsoft Proxy Server (which does not support 'normal' digest authentication)</longdescription> +</pkgmetadata> diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9.ebuild new file mode 100644 index 000000000000..8242b0ad63a9 --- /dev/null +++ b/net-proxy/ntlmaps/ntlmaps-0.9.9.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +DESCRIPTION="NTLM proxy Authentication against MS proxy/web server" +HOMEPAGE="http://ntlmaps.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~arm ~hppa ~ia64 ~ppc ~s390 ~x86 ~ppc64 ~amd64" +IUSE="" + +DEPEND="dev-lang/python" + +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.patch + + sed -i -e 's/\r//' server.cfg *.txt doc/*.txt # stupid windoze style +} + +src_install() { + # exes ------------------------------------------------------------------ + exeinto /usr/bin + newexe main.py ${PN} || die + insinto /usr/lib/${PN} + doins lib/* || die + # doc ------------------------------------------------------------------- + dodoc *.txt doc/*.txt + dohtml doc/* + # conf ------------------------------------------------------------------ + insinto /etc/${PN} + doins server.cfg + newinitd ${FILESDIR}/${PN}.init ${PN} +} +pkg_prerm() { + einfo "Removing init script and python compiled bytecode" + rm -f /usr/lib/${PN}/*.py? + rm -f /etc/init.d/${PN} +} diff --git a/net-proxy/oops/ChangeLog b/net-proxy/oops/ChangeLog new file mode 100644 index 000000000000..04455ccbe5d2 --- /dev/null +++ b/net-proxy/oops/ChangeLog @@ -0,0 +1,63 @@ +# ChangeLog for www-proxy/oops +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + + 01 Apr 2005; Alin Nastac <mrness@gentoo.org> -oops-1.5.22.ebuild, + -oops-1.5.6.ebuild: + Remove old (and currently broken) versions. + + 01 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> oops-1.5.23.ebuild: + Stable on sparc wrt #87406 + + 31 Mar 2005; Alin Nastac <mrness@gentoo.org> oops-1.5.23.ebuild: + Fix makefile and mark stable on x86 (#87406). + +*oops-1.5.23 (24 Feb 2005) + + 24 Feb 2005; Alin Nastac <mrness@gentoo.org> +oops-1.5.23.ebuild: + Version bump. Fix bugs #10047, #51247 and #58881. + + 17 Feb 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml: + Add metadata.xml + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + +*oops-1.5.6 (15 Aug 2004) + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +files/oops.cfg, + +oops-1.5.22.ebuild, +oops-1.5.6.ebuild: + Moved from net-www/oops to www-proxy/oops. + + 27 Jul 2004; Rob Holland <tigger@gentoo.org> : + Fix silly typo which breaks ebuild. Its been broken for a year :/ Closes + #57775. Thanks to gejzer@ibt.com.pl. + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> oops-1.5.6.ebuild: + virtual/glibc -> virtual/libc + + 08 Dec 2003; <spider@gentoo.org> oops-1.5.6.ebuild: + Fixing a chown user.group issue + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*oops-1.5.22 (21 Oct 2002) + + 21 Oct 2002; Maik Schreiber <blizzy@gentoo.org> : New version, closes bug + #5990. + + 14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> oops-1.5.6.ebuild: Added + LICENSE, KEYWORDS, SLOT. + +*oops-1.5.6 (01 Feb 2002) + + 01 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog: + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/net-proxy/oops/Manifest b/net-proxy/oops/Manifest new file mode 100644 index 000000000000..a11a96f5716b --- /dev/null +++ b/net-proxy/oops/Manifest @@ -0,0 +1,5 @@ +MD5 2ceaa8e9ed78fda116480b2b2eb1799d ChangeLog 2267 +MD5 0bba18e763cee72e6af83a6bc6e1db87 metadata.xml 241 +MD5 e21dd0c617690c511268f9c9870a6424 oops-1.5.23.ebuild 2330 +MD5 6f1e80af4f1280cfb10b31ab9d2ab820 files/oops.cfg 17896 +MD5 5ecad9ef80ba71f386b700b68e68754e files/digest-oops-1.5.23 63 diff --git a/net-proxy/oops/files/digest-oops-1.5.23 b/net-proxy/oops/files/digest-oops-1.5.23 new file mode 100644 index 000000000000..fd9e7dcf9fcf --- /dev/null +++ b/net-proxy/oops/files/digest-oops-1.5.23 @@ -0,0 +1 @@ +MD5 bfa19752af517bb5a6cd746acf61064c oops-1.5.23.tar.gz 473290 diff --git a/net-proxy/oops/files/oops.cfg b/net-proxy/oops/files/oops.cfg new file mode 100644 index 000000000000..03dc19dc83c5 --- /dev/null +++ b/net-proxy/oops/files/oops.cfg @@ -0,0 +1,656 @@ +## +# nameservers. Use your own, not our. +## + +nameserver 195.114.128.50 +nameserver 193.219.193.130 + +## +# Ports and address to use for HTTP and ICP +## + +#bind ip_addr|hostname +http_port 3128 +icp_port 3130 + +## +## Change euid to that user +## +## WARNING: if you use 'userid, then you 'reconfigure will not be able to +## open new sockets on reserved (< 1024) ports and will not be able +## to return to original userid. +## +userid squid + +## +## Change root directory. If don't know exactly what are you doing - +## leave commented. +#chroot ??? + +## +# Logfile - just debug output +# When used in form 'filename [{N S}] [[un]buffered]' +# will be rotated automatically (up to N files up to S bytes in size) +## +logfile /var/log/oops/oops.log +#logfile /usr/oops/logs/oops.log { 3 1m } unbuffered + +## +# Accesslog - the same as for squid. Re rotating - see note for logfile +## +accesslog /var/log/oops/oops.access +#accesslog /usr/oops/logs/access.log + +## +# Pidfile. for kill -1 `cat oops.pid` and for locking. +## +pidfile /var/run/oops/oops.pid + +## +# Statistics file - once per minute flush some statistics to this file +## +statistics /var/log/oops/oops_statfile + +## +# icons - where to find link.gif, dir.gif, binary.gif and so on (for +# ftp lists). If omitted - name of running host will be used. But +# using explicit names is better way. +## + +#icons-host ss5.paco.net +#icons-port 80 +#icons-path icons + +## +# When total object volume in memory grow over this (this mean +# that cachable data from network came faster then we can save on disk) +# drop objects (without attempt to save on disk). +## +mem_max 64m + +## +# Hint, how much cached objects keep in memory. +# When total amount become larger then this limit - start +# swaping cachable objects to disk +## +lo_mark 8m + +## +# start random early drop when number of clients reach some level. +# this can protect you against attacks and against situation when +# oops cant handle too much connections. By default - 0 (or no limits). +## +#start_red 0 + +## +# refuse any connection when number of already connected clients reach some +# level. By default - 0 (or no limits). +## +#refuse_at 0 + +## +# if document contain no Expires: then expire after (in days) +# ftp-expire-value - expire time for ftp (in days) +## +default-expire-value 7 +ftp-expire-value 7 + +## +# Maximum expite time - doc will not keep in cache more then +# this number of days (except if defaiult-expire-value used for this documeny) +## +max-expire-value 30 + +## +# in which proportion time passed since last document modification +# will accounted in expire time. For example, if last-modified-factor=5 +# and there was passed 10 days since document modification, then expiration +# will be setted to 2 days in future (but no nore then max-expire-value) +## +last-modified-factor 5 + +## +# If you want not cache replies without Last-Modified: +# uncomment next line. +## +#dont_cache_without_last_modified + +# run expire every ( in hours ) +## +default-expire-interval 1 + +## +# icp_timeout - how long to wait icp reply from peer (in ms, e.g 1000 = 1sec) +## +icp_timeout 1000 + +## +# start disk cache cleanup when free space will be (in %%) +# As on the very large storages 1% is large space (1% from 9G is +# 90M), then on such storages you can set both disk-low-free and +# disk-ok-free to 0. Oops will start cleanup if it have less then 256 +# free blocks(1M), and stop when it reach 512 bree blocks(2M). +## +disk-low-free 3 + +## +# stop disk cache cleanup when free space will be (in %%) +## +disk-ok-free 5 + +## +# Force_http11 - turn on http/1.1 for each request to document server +# This option required if module 'vary' used. +## +force_http11 + +## +# Always check document freshness, even it is not stale or expired +# This force Oops behave like squid - first check cached doc, then send +## +#always_check_freshness + +## +# If user-requestor aborted connection to proxy, but there was received more +# then some percent ot the document - then continue. +# default value - 75% +## +force_completion 75 + +## +# maximum size of the object we will cache +## +maxresident 1m + +insert_x_forwarded_for yes +insert_via yes + +## +# If host have several interfaces or aliases, use exactly +# this name when connecting to server: +## +#connect-from proxy.paco.net + +## +# ACLs - currently: urlregex, urlpath, usercharset +# port, dstdom, dstdom_regex, src_ip, time +# each acl can be loaded from file. +## +#acl CACHEABLECGI urlregex http://www\.topping\.com\.ua/cgi-bin/pingstat\.cgi\?072199131826 +#acl WWWPACO urlregex www\.paco\.net +#acl NO_RLH urlregex zipper +#acl REWRITEPORTS urlregex (www.job.ru|www.sale.ru) +#acl REWRITEHOSTS urlregex (www.asm.ru|zipper\.paco) +#acl WINUSER usercharset windows-1251 +#acl DOSUSER usercharset ibm866 +#acl UNIXUSER usercharset koi8-r +#acl RUS dstdom ru su +#acl UKR dstdom ua +#acl BADPORTS port [0:79],110,138,139,513,[6000:6010] +#acl BADDOMAIN dstdom baddomain1.com baddomain2.com +#acl BADDOMREGEX dstdom_regex baddomain\.((com)|(org)) +#acl LOCAL_NETWORKS src_ip include:/etc/oops/acl_local_networks +#acl BADNETWORKS src_ip 192.168.10/24 +#acl WORKTIME time Mon,Tue:Fri 0900:1800 +#acl HTMLS content_type text/html +#acl USERS username joe +acl ADMINS src_ip 127.0.0.1 +acl PURGE method PURGE + +## +# acl_deny [!]ACL [!]ACL ... +# deny access for combined acl +## +acl_deny PURGE !ADMINS + +## +# Never cache objects with URL, containing... +## +stop_cache ? +stop_cache cgi-bin + +## +# stop_cache_acl [!]ACL [!]ACL ... +# Stop cache using ACL +## +#stop_cache_acl WWWPACO + +## +# refresh_pattern ACLNAME min percent max +# 'min' and 'max' are limits between Expite time will be assigned +# Iff document have no expire: header and have Last-Modified: header +# we will use 'percent' to estimate how far in the future document will +# be expired. +## +#refresh_pattern CACHEABLECGI 20 50% 200 +#refresh_pattern WWWPACO 0 0% 0 + +## +# bind_acl {hostname|ip} [!]ACL [!]ACL ... +# bind to given address when connecting to server +# if request match ACLNAME +## +#bind_acl outname1 RUS +#bind_acl outname2 UKR + +## +# Always check document freshness, but now on acl basis. +# You can have several such lines. +## This example will force to check freshness only for html documents. +#always_check_freshness_acl HTMLS + +## +# line 'parent ....' will force all connections (except to destinations +# in local-domain or local-networks) go through parent host +## +#parent proxy.paco.net 3128 + +## +# parent_auth login:password +# if your parent require login/password from your proxy +## +#parent_auth login:password + +# ICP peer's +#peer proxy.paco.net 3128 3130 { +## ^^^ peer name ^http port ^icp port +## icp port can be 0, in which case we assume this is non-icp +## proxy. We assume that non-icp peer act like parent which +## answer MISS all th etime. If this peer refused connection +## then it goes down for 60 seconds - it doesn't take part in +## any peer-related decisions. +# sibling ; +## if this peer require login/password from your proxy +# my_auth my_login:my_password; +## we will send requests for these domains +# allow dstdomain * ; +## we will NOT send requests for these domains +# deny dstdomain * ; +## we will send only requests matched to this acl +# peer_access [!]ACL1 [!]ACL2 +## if (and only if) peer is not icp-capable, then , in case of fail we +## leave failed peer alone for the down_timeout interval (in seconds). +## Then we will try again +# down_timeout 60 ; +#} + +#peer proxy.gu.net 80 3130 { +# parent ; +# allow dstdomain * ; +# deny dstdomain paco.net odessa.ua ; +#} + +## +# Never use "parent" when connecting to server in these domains +## +local-domain odessa.ua od.ua +local-domain odessa.net paco.net netsy.net netsy.com te.net.ua + +local-networks 195.114.128/19 10/8 192.168/16 + +# +# Groups +# + +group main { +## +# You can describe group ip adresses here, or using src_ip acl's +# with networks_acl directive. +# networks_acl always have higher preference (checked first) and +# are checked in the order of appearance. +# If host wil not fall in any networks_acl - we check in networks. +# networks are ordered by masklen - longest masks(most specific networks) +# are checked first. +## + +#Next line enables redirection features and transparent proxying + redir_mods fastredir transparent; +#Change this next line to list the IP's of everyone in this group + networks 195.114.128/19 127/8 195.5.40.93/32 ; + +# networks_acl LOCAL_NETWORKS !BAD_NETWORKS ; + badports [0:79],110,138,139,513,[6000:6010] ; + miss allow; +## +# denytime - when deny access to proxy server for this group +## +# denytime Sat,Sun 0642:1000 +# denytime Mon,Thu:Fri,Sun 0900:2100 +## +# Authentication modules for this group (seprated by space) +## +# auth_mods passwd_file; + +## +# URL-Redirector (porno, ad. filtering) modules for this group (separate by +# space) +## +# redir_mods redir; + + +## +# limit whole group to 8Kbytes per sec +## +# bandwidth 8k; + +## +# limit each host 8Kbytes per sec +## +# per_ip_bw 8k; + +## +# limit connections number from each host +# +# per_ip_conn 8; + +## +# limit request rate from this group (requests per second). This is crude, +# and must be used as last resort +## +# maxreqrate 100; + +## +# icp acl ... +## +# icp { +# allow dstdomain * ; +# } + +## +# http acl +## + http { +## +# http acls can be in form 'allow dstdomain domainname domainname ... domainname ; +# or in form 'allow dstdomain include:filename ; +# where filename - name of the file, which contain +# domainnames (one per line, # - comment line); +# the same rules for 'deny' +## + allow dstdomain * ; + } +} + +group world { + networks 0/0; + badports [0:79],110,138,139,513,[6000:6010]; + http { + deny dstdomain * ; + } + icp { + deny dstdomain * ; + } +} + +## +# Storage section +# Change this for your own situation. Oops can work without +# storages (using only in-memory cache). +## + +## +# Storage description (can be several) +# path - filename of storage. can be raw device (be carefull!) +# size - size (of storage file). Can be smthng like 100k or 200m or 4g +# Size used only durig format process (oops -z). +## + +storage { + path /var/lib/oops/storage/oops_storage ; +# Size of the storage. Can be in bytes or 'auto'. Auto is +# usefull for pre-created storages or disk slices. +# NOTE: 'size auto' won't work for Linux on disk slices. +# To use large ( > 2G ) files run configure with --enable-large-files + + size 100m ; + +# You have to use 'offset' in the case your raw device (or slice) +# require that. For example if you use entire disk as storage +# under AIX and Soalris/Sparc - you have to skip first block +# which contain disk label (that is storage will start from +# next 512 sector. +# offset 512; +} + +#storage { +# path /usr/oops/storages/oops_storage1 ; +# size 600m ; +#} + +module lang { + + default_charset eng + + # Recode tables and other charset stuff + CharsetRecodeTable windows-1251 /etc/oops/tables/koi-win.tab + CharsetRecodeTable ISO-8859-5 /etc/oops/tables/koi-iso.tab + CharsetRecodeTable ibm866 /etc/oops/tables/koi-alt.tab + CharsetAgent windows-1251 AIR_Mosaic IWENG/1 MSIE WinMosaic (Windows (WinNT; + CharsetAgent windows-1251 (Win16; (Win95; (Win98; (16-bit) Opera/3.0 + CharsetAgent ibm866 DosLynx Lynx2/OS/2 +} + +module err { + # error reporting module + + # template + template /etc/oops/err_template.html + + # Language to use when generate Error messages + lang eng +} + +module passwd_file { + # password proxy-authentication module + # + # default realm, scheme and passwd file + # the only thing you really want to change is 'file' and 'template' + # you don't have to reconfigure oops if you only + # change content passwd file or template: oops authomatically + # reload file + + realm oops + scheme Basic + file /etc/oops/passwd + template /etc/oops/auth_template.html +} + +module passwd_pgsql { + # proxy authentication using postgresql + # "Ivan B. Yelnikov" <bahek@khspu.ru> + # + # host - host where database live, + # user,password - login and password for database access + # database - database name + # select - file with request body + # template - file with html doc which user will receive + # during authentication + scheme Basic + realm oops + host <host address/name> + user <database_user> + password <user_password> + database <database_name> + select /etc/oops/select.sql + template /etc/oops/auth_template.html +} + +module passwd_mysql { + # proxy authentication usin mysql + # "Ivan B. Yelnikov" <bahek@khspu.ru> + # + # look passwd_pgsql description + # + scheme Basic + realm oops + host <host address/name> + user <database_user> + password <user_password> + database <database_name> + select /etc/oops/select.sql + template /etc/oops/auth_template.html +} + +module redir { + # file - regex rules. + # each line consist of one or two fields (separated with white space) + # 1. regular expression + # 2. redirect-location + # if requested (by client) url match regex then + # if we have redirect-url then we send '302 Moved Temporary' to + # redirect-location + # if we have no redirect-location (i.e. we have no 2-nd field) + # then we send template.html (%R will be substituted by rule) + # or some default message if we have no template. + # you don't have to reconfigure oops each time + # you edit rules or template, they will be reloaded authomatically + + file /etc/oops/redir_rules + template /etc/oops/redir_template.html +## mode control will redir rewrite url or send Location: header +## with new location. Values are 'rewrite' or 'bounce' +# mode rewrite + + # This module can process requests which come on http_port + # and/or on different port. For example, you wish oops + # bind on two ports - 3128 and 3129, and all requests which come on + # port 3129 must pass through filters, and requests which come on port + # 3128 (common http_port) - not. Then you have to uncomment next line + # myport 3129 + # which means exactly: bind oops to additional port 3129 and process + # requests which come on this port. + # myport can be in the next form: + # myport [{hostname|ip_addr}:]port +} + +module oopsctl { + # path to oopsctl unix socket + socket_path /var/run/oops/oopsctl + # time to auto-refresh page (seconds) + html_refresh 300 +} + +## +## This module hadnle 'Vary' header - it was written to better support +## Russian Apache +## +module vary { + user-agent by_charset + accept-charset ignore +} + +## +## WWW -accelerator. To use - add word accel to +## redir_mods line for +## the group 'world' description +## You will find more description of this module in supplied accel_maps file +## +#module accel { +# myport can have next form: +# myport [{hostname|ip_addr}:]port ... +# myport 80 +## +# allow access to proxy through accel module. +# Deny will stop proxy through accel completely, regardless +# of any other access rules +## +# proxy_requests deny +# +## +# File with maps and other config directives +# Checked once per minute. No need to restart oops if maps changed +## +# file /etc/oops/accel_maps +#} + +## +## Transparent proxy. To use - add word 'transparent' into +## redir_mods line for your group. +## in the your local (or any other) group description +## +#module transparent { +# myport can have next form: +# myport [{hostname|ip_addr}:]port ... +# myport 3128 +#} + +## +## %h - remote ip address +## %A - local ip address +## %d - ip address of source (peer or document server) +## %l - remote logname from identd (not suported now) +## %U - remote user (from 'Authorization' header) +## %u - remote user (from proxy-auth) +## %{format}t - time with optional {format} (for strftime) +## %t - time with standard format %d/%b/%Y:%T %Z +## %r - request line +## %s - status code +## %b - bytes received +## %{header}i - value of header in request +## %m - HIT/MISS +## %k - hierarchy (DIRECT/NONE/...) +## +## directive buffered can be followed by size of the buffer, +## like 'buffered 32000' +## +#module customlog { +# path /usr/local/oops/logs/access_custom1 +# format "%h %l %u %t \"%r\" %>s %b" +# squid httpd mode log emulation +# format "%h %u %l %t \"%r\" %s %b %m:%k" +# buffered +# path /usr/local/oops/logs/access_custom2 +# format "%h->%A %l %u [%t] \"%r\" %s %b \"%{User-Agent}i\"" +#} + +module berkeley_db { + ## + # dbhome - directory where all DB indexes reside. Use full path + # this directory must exist. + # dbname - filename for index file. Use just filename (no full path) + ## + + dbhome /var/lib/oops/db + dbname dburl + + ## + # This parameter specifies internal cache size of BerkeleyDB. + # Increase this parameter for best performance (if you have a lot of memory). + # For example: db_cache_mem 64m + # Default and minimum value: 4m + # + # This memory pool is not part of memory pool, specified by mem_max parameter. + # WARNING: the amount of RAM used by oops will be increased by the value of + # this parameter. + ## + #db_cache_mem 4m + +} + +#module gigabase_db { +# This module enable GigaBASE as database engine. +# You can use berkeley_db or gigabase_db, not both. +# Also, important notice - indexes created with different modules +# are not compatible. +# ## +# # dbhome - directory where all DB indexes reside. Use full path +# # this directory must exist. +# # dbname - filename for index file. Use just filename (no full path) +# ## +# +# dbhome /var/lib/oops/db +# dbname gdburl +# +# ## +# # This parameter specifies internal cache size of BerkeleyDB. +# # Increase this parameter for best performance (if you have a lot of memory). +# # For example: db_cache_mem 64m +# # Default and minimum value: 4m +# # +# # This memory pool is not part of memory pool, specified by mem_max parameter. +# # WARNING: the amount of RAM used by oops will be increased by the value of +# # this parameter. +# ## +# #db_cache_mem 4m +# +#} diff --git a/net-proxy/oops/metadata.xml b/net-proxy/oops/metadata.xml new file mode 100644 index 000000000000..e0ff5017dd8b --- /dev/null +++ b/net-proxy/oops/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<longdescription>An advanced multithreaded caching web proxy</longdescription> +</pkgmetadata> diff --git a/net-proxy/oops/oops-1.5.23.ebuild b/net-proxy/oops/oops-1.5.23.ebuild new file mode 100644 index 000000000000..cf7e5081eced --- /dev/null +++ b/net-proxy/oops/oops-1.5.23.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/oops-1.5.23.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +DESCRIPTION="An advanced multithreaded caching web proxy" +HOMEPAGE="http://zipper.paco.net/~igor/oops.eng/" +SRC_URI="http://zipper.paco.net/~igor/oops/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 sparc" +IUSE="" + +RDEPEND="virtual/libc + dev-libs/libpcre + >=sys-libs/db-3" +DEPEND="${RDEPEND} + sys-devel/flex" + +src_unpack() { + unpack ${A} + + cd ${S} + cp configure configure.orig + sed -e 's:/usr/local/lib/libpcre:/usr/lib/libpcre:g' configure.orig > configure + sed -e 's:y\.tab\.h:y.tab.c:' Makefile.in + cd ${S}/src/modules +} + +src_compile() { + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib/oops \ + --enable-oops-user=squid \ + --sysconfdir=/etc/oops \ + --sbindir=/usr/sbin \ + --with-regexp=pcre \ + --localstatedir=/var/run/oops \ + || die "configure problem" + + cd src + mv config.h.in config.h.in.orig + sed <config.h.in.orig >config.h.in \ + -e '/STRERROR_R/d' + mv Makefile Makefile.orig + sed <Makefile.orig >Makefile \ + -e "s|OOPS_LIBDIR = /usr/lib/oops|OOPS_LIBDIR = ${D}/usr/lib/oops|" \ + -e "s|OOPS_SBINDIR = /usr/sbin|OOPS_SBINDIR = ${D}/usr/sbin|" \ + -e "s|OOPS_SYSCONFDIR = /etc/oops|OOPS_SYSCONFDIR = ${D}/etc/oops|" \ + -e "s|OOPS_LOCALSTATEDIR = /var/run/oops|OOPS_LOCALSTATEDIR = ${D}/var/run/oops|" \ + -e "s|OOPSPATH=/usr/oops|OOPSPATH=${D}/usr/oops|" + cd .. + emake || die "compile problem" +} + +src_install() { + dodir /usr/sbin + chown squid:squid ${D} + einstall || die "install problem" + #chmod -R g+srw ${D}/etc/oops Remove this if proved to work without it + + insinto /etc/oops + doins ${FILESDIR}/oops.cfg + cd ${D} + + diropts -m0755 -o squid + dodir /var/run/oops + diropts -m0770 -o squid + dodir /var/log/oops + dodir /var/lib/oops + dodir /var/lib/oops/storage + keepdir /var/lib/oops/storage + dodir /var/lib/oops/db + keepdir /var/lib/oops/db + + # cleanups + rm -rf ${D}/usr/oops + rm -rf ${D}/usr/lib/oops/modules + + # config files; if already exist, move them to *.eg + cd ${D}/etc/oops + local x y + for y in . tables ; do + for x in ${y}/* ; do + if [ -f ${x} ] ; then + if [ -f ${ROOT}/etc/oops/${x} ]; then + mv ${x} ${x}.eg + else + cp ${x} ${x}.eg + fi + fi + done + done +} + diff --git a/net-proxy/paros/ChangeLog b/net-proxy/paros/ChangeLog new file mode 100644 index 000000000000..c78646dbfc87 --- /dev/null +++ b/net-proxy/paros/ChangeLog @@ -0,0 +1,13 @@ +# ChangeLog for www-proxy/paros +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/paros/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + +*paros-3.2.0 (22 Mar 2005) + + 22 Mar 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml, + +paros-3.2.0.ebuild: + Initial import from bug #85290. + diff --git a/net-proxy/paros/Manifest b/net-proxy/paros/Manifest new file mode 100644 index 000000000000..14c9d122b8a6 --- /dev/null +++ b/net-proxy/paros/Manifest @@ -0,0 +1,4 @@ +MD5 6df6ddcc47c17858af3408c86434ac9d paros-3.2.0.ebuild 703 +MD5 3c4659f9a555460ffcc84cd04f508255 ChangeLog 449 +MD5 4b03e120ede9dfedec0594e35156b38c metadata.xml 256 +MD5 63433745c47ead240f2be10aa5d8954d files/digest-paros-3.2.0 66 diff --git a/net-proxy/paros/files/digest-paros-3.2.0 b/net-proxy/paros/files/digest-paros-3.2.0 new file mode 100644 index 000000000000..64f311b35c3c --- /dev/null +++ b/net-proxy/paros/files/digest-paros-3.2.0 @@ -0,0 +1 @@ +MD5 6999bd9089eabf9517386664ad2e3d6e paros-3.2.0-unix.zip 1219536 diff --git a/net-proxy/paros/metadata.xml b/net-proxy/paros/metadata.xml new file mode 100644 index 000000000000..ca8a2ae474d8 --- /dev/null +++ b/net-proxy/paros/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<longdescription>HTTP/HTTPS proxy for evaluate security of web applications</longdescription> +</pkgmetadata> diff --git a/net-proxy/paros/paros-3.2.0.ebuild b/net-proxy/paros/paros-3.2.0.ebuild new file mode 100644 index 000000000000..d5ffd575ab51 --- /dev/null +++ b/net-proxy/paros/paros-3.2.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/paros/paros-3.2.0.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +DESCRIPTION="HTTP/HTTPS proxy for evaluate security of web applications" +HOMEPAGE="http://www.parosproxy.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}-unix.zip" + +LICENSE="Clarified-Artistic" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +RDEPEND=">=virtual/jre-1.4" + +S=${WORKDIR}/${PN} + +src_install() { + sed -i -e '1i#!/bin/sh' -e '1icd /opt/paros' startserver.sh + exeinto /usr/sbin + newbin startserver.sh paros + rm startserver.* + + dodir /opt && cp -a ${S} ${D}/opt || die "failed to copy files" +} diff --git a/net-proxy/polipo/ChangeLog b/net-proxy/polipo/ChangeLog new file mode 100644 index 000000000000..03185c42fd7d --- /dev/null +++ b/net-proxy/polipo/ChangeLog @@ -0,0 +1,14 @@ +# ChangeLog for www-proxy/polipo +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + +*polipo-0.9.8 (26 Mar 2005) + + 26 Mar 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml, +files/config, + +files/polipo-0.9.8-gentoo.patch, +files/polipo.crond, +files/polipo.initd, + +polipo-0.9.8.ebuild: + Initial import from bug #79618. + diff --git a/net-proxy/polipo/Manifest b/net-proxy/polipo/Manifest new file mode 100644 index 000000000000..8146bdc7e7eb --- /dev/null +++ b/net-proxy/polipo/Manifest @@ -0,0 +1,8 @@ +MD5 73ccf95507242eaec22f869cc6f5b67c polipo-0.9.8.ebuild 1325 +MD5 ea8f54b7d4622a3fcbddecb6f823c446 ChangeLog 546 +MD5 c3de0bbc117c44cd0aad81e19a01094c metadata.xml 294 +MD5 15a13f10a2c408c2e448d0db6fe8d382 files/digest-polipo-0.9.8 64 +MD5 fdf9f12df918b0d2623ebe825a1aa705 files/config 167 +MD5 0fd77c27b055734f263f462304ab3a45 files/polipo-0.9.8-gentoo.patch 935 +MD5 70dea09e9d7e630836c05c4e32b9a1cc files/polipo.crond 76 +MD5 077c0228730fee72173aabf92ea11b19 files/polipo.initd 767 diff --git a/net-proxy/polipo/files/config b/net-proxy/polipo/files/config new file mode 100644 index 000000000000..4c9235582594 --- /dev/null +++ b/net-proxy/polipo/files/config @@ -0,0 +1,8 @@ +daemonise=false +diskCacheRoot=/var/cache/polipo/ +proxyAddress=127.0.0.1 +proxyName=localhost +serverSlots=4 +serverMaxSlots=8 +cacheIsShared=true +allowedClients=127.0.0.1 diff --git a/net-proxy/polipo/files/digest-polipo-0.9.8 b/net-proxy/polipo/files/digest-polipo-0.9.8 new file mode 100644 index 000000000000..0ed95f54de0c --- /dev/null +++ b/net-proxy/polipo/files/digest-polipo-0.9.8 @@ -0,0 +1 @@ +MD5 1a2c7bd7710197daee1c26ce5175edbf polipo-0.9.8.tar.gz 148275 diff --git a/net-proxy/polipo/files/polipo-0.9.8-gentoo.patch b/net-proxy/polipo/files/polipo-0.9.8-gentoo.patch new file mode 100644 index 000000000000..2f02b52232f6 --- /dev/null +++ b/net-proxy/polipo/files/polipo-0.9.8-gentoo.patch @@ -0,0 +1,28 @@ +diff -Nru polipo-0.9.8.orig/Makefile polipo-0.9.8/Makefile +--- polipo-0.9.8.orig/Makefile 2004-06-29 00:30:07.000000000 +0300 ++++ polipo-0.9.8/Makefile 2005-03-26 14:29:21.448931408 +0200 +@@ -80,11 +80,6 @@ + cp -f localindex.html $(TARGET)$(LOCAL_ROOT)/index.html + + install.man: all +- mkdir -p $(TARGET)$(MANDIR)/man1 +- mkdir -p $(TARGET)$(INFODIR) +- cp -f polipo.man $(TARGET)$(MANDIR)/man1/polipo.1 +- cp polipo.info $(TARGET)$(INFODIR)/ +- install-info --info-dir=$(INFODIR) polipo.info + + + polipo.info: polipo.texi +diff -Nru polipo-0.9.8.orig/polipo.h polipo-0.9.8/polipo.h +--- polipo-0.9.8.orig/polipo.h 2005-01-20 01:45:03.000000000 +0200 ++++ polipo-0.9.8/polipo.h 2005-03-26 14:30:20.303984080 +0200 +@@ -61,7 +61,9 @@ + #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + /* nothing */ + #elif defined(__GNUC__) ++#ifndef inline + #define inline __inline ++#endif + #if (__GNUC__ >= 3) + #define restrict __restrict + #else diff --git a/net-proxy/polipo/files/polipo.crond b/net-proxy/polipo/files/polipo.crond new file mode 100644 index 000000000000..0acd842ec55f --- /dev/null +++ b/net-proxy/polipo/files/polipo.crond @@ -0,0 +1,4 @@ +#!/bin/bash + +#Expire old cached objects +nice -n 15 sudo -u polipo polipo -x diff --git a/net-proxy/polipo/files/polipo.initd b/net-proxy/polipo/files/polipo.initd new file mode 100644 index 000000000000..df0e6dbb27e0 --- /dev/null +++ b/net-proxy/polipo/files/polipo.initd @@ -0,0 +1,32 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/files/polipo.initd,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting Polipo HTTP proxy" + + if [ ! -f "/etc/polipo/config" ]; then + eerror "Unable to read configuration file: /etc/polipo/config" + return 1 + fi + + start-stop-daemon --start --quiet --chuid polipo \ + --background --pidfile /var/run/polipo.pid --make-pidfile \ + --exec /usr/bin/polipo + + eend $? +} + +stop() { + ebegin "Stopping Polipo HTTP proxy" + start-stop-daemon --stop --quiet --pidfile /var/run/polipo.pid + eend $? + + [ -f /var/run/polipo.pid ] && rm /var/run/polipo.pid +} + diff --git a/net-proxy/polipo/metadata.xml b/net-proxy/polipo/metadata.xml new file mode 100644 index 000000000000..913049ec5cda --- /dev/null +++ b/net-proxy/polipo/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<longdescription>A small and fast caching web proxy designed to be used by one person or a small group of people.</longdescription> +</pkgmetadata> diff --git a/net-proxy/polipo/polipo-0.9.8.ebuild b/net-proxy/polipo/polipo-0.9.8.ebuild new file mode 100644 index 000000000000..8de671cbad66 --- /dev/null +++ b/net-proxy/polipo/polipo-0.9.8.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-0.9.8.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +DESCRIPTION="A caching web proxy" +HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/" +SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +DEPEND="virtual/libc + sys-apps/texinfo" +RDEPEND="${DEPEND} + app-admin/sudo" + +pkg_setup() { + enewgroup polipo + enewuser polipo -1 /bin/false /var/cache/polipo polipo +} + +src_unpack() { + unpack ${A} + + epatch ${FILESDIR}/${P}-gentoo.patch +} + +src_compile() { + emake "PREFIX=/usr" "CDEBUGFLAGS=${CFLAGS}" all || die "build failed" +} + +src_install() { + einstall "PREFIX=/usr" "TARGET=${D}" || die "install failed" + mv polipo.man polipo.1 + doman ${S}/polipo.1 + doinfo ${S}/polipo.info + + exeinto /etc/init.d ; newexe ${FILESDIR}/polipo.initd polipo + insinto /etc/polipo ; doins ${FILESDIR}/config + insinto /etc/cron.daily ; newins ${FILESDIR}/polipo.crond polipo.sh + + diropts -m0750 -o polipo -g polipo + dodir /var/cache/polipo +} + +pkg_preinst() { + pkg_setup +} + +pkg_postinst() { + einfo "Do not forget to read the manual." + einfo "Change the config file in /etc/polipo to suit your needs." +} diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog new file mode 100644 index 000000000000..4ed2f8d6ea3a --- /dev/null +++ b/net-proxy/privoxy/ChangeLog @@ -0,0 +1,148 @@ +# ChangeLog for www-proxy/privoxy +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + + 08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> + privoxy-3.0.3-r3.ebuild: + Stable on ppc. + + 08 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> + privoxy-3.0.3-r3.ebuild: + Stable on sparc + + 06 Apr 2005; Alin Nastac <mrness@gentoo.org> privoxy-3.0.3-r3.ebuild: + Stable on x86 + +*privoxy-3.0.3-r3 (27 Feb 2005) + + 27 Feb 2005; Alin Nastac <mrness@gentoo.org> -files/privoxy-3.0.3.2.patch, + -privoxy-3.0.3-r1.ebuild, -privoxy-3.0.3-r2.ebuild, + +privoxy-3.0.3-r3.ebuild: + Remove patch added from #83205. See #83278 for more info. + +*privoxy-3.0.3-r2 (27 Feb 2005) + + 27 Feb 2005; Alin Nastac <mrness@gentoo.org> +files/privoxy-3.0.3.2.patch, + +files/privoxy-zlib.patch, privoxy-3.0.2.ebuild, privoxy-3.0.3-r1.ebuild, + +privoxy-3.0.3-r2.ebuild, privoxy-3.0.3.ebuild: + Bump version to 3.0.3-2 (#83205) and add support for zlib decompression + (#83278). + +*privoxy-3.0.3-r1 (24 Feb 2005) + + 24 Feb 2005; Alin Nastac <mrness@gentoo.org> metadata.xml, + -files/privoxy-gentoo.diff, +files/privoxy.logrotate, +files/privoxy.rc7, + -privoxy-2.9.14_beta.ebuild, +privoxy-3.0.3-r1.ebuild: + Changed herd from web-apps to www-proxy. Added pcre and logrotate support, + thanks to Torsten Veller <tove@gentoo.org> (#71557). Removed old version. + + 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + privoxy-3.0.2.ebuild: + Masked privoxy-3.0.2.ebuild stable for ppc + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> privoxy-2.9.14_beta.ebuild, + privoxy-3.0.2.ebuild, privoxy-3.0.3.ebuild: + Fix pkg_preinst() -> pkg_setup() + +*privoxy-3.0.2 (08 Aug 2004) + + 08 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml, + +files/privoxy-gentoo.diff, +files/privoxy.rc6, +privoxy-2.9.14_beta.ebuild, + +privoxy-3.0.2.ebuild, +privoxy-3.0.3.ebuild: + Moved from net-www/privoxy to www-proxy/privoxy. + + 27 Jul 2004; Rob Holland <tigger@gentoo.org> privoxy-2.9.14_beta.ebuild, + privoxy-3.0.2.ebuild, privoxy-3.0.3.ebuild: + Fix user/group addition re #58526 + + 11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> privoxy-3.0.3.ebuild: + Stable on alpha. + + 26 Apr 2004; Aron Griffis <agriffis@gentoo.org> privoxy-3.0.2.ebuild, + privoxy-3.0.3.ebuild: + Add die following econf for bug 48950 + + 13 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> privoxy-3.0.3.ebuild: + marked ~amd64 + + 11 Apr 2004; Jason Wever <weeve@gentoo.org> privoxy-3.0.2.ebuild: + Stable on sparc. + + 06 Apr 2004; Joshua Brindle <method@gentoo.org> privoxy-2.9.14_beta.ebuild, + privoxy-3.0.2.ebuild, privoxy-3.0.3.ebuild: + added selinux policy to rdepend + + 22 Mar 2004; Jason Wever <weeve@gentoo.org> privoxy-3.0.2.ebuild, + privoxy-3.0.3.ebuild: + Added ~sparc keywords to 3.0.2 and 3.0.3 + +*privoxy-3.0.3 (16 Feb 2004) + + 16 Feb 2004; Martin Holzer <mholzer@gentoo.org> privoxy-3.0.3.ebuild: + Version bumped. + + 03 Feb 2004; Martin Holzer <mholzer@gentoo.org> privoxy-2.9.14_beta.ebuild: + fixing .keep issue. closes 39827 + + 18 Jan 2004; Martin Holzer <mholzer@gentoo.org> privoxy-3.0.0.ebuild, + privoxy-3.0.2.ebuild: + adding keepdir for logfile and RESTRICT=nomirror + + 19 Oct 2003; Martin Holzer <mholzer@gentoo.org> privoxy-3.0.2.ebuild: + x86 stable. + + 01 Oct 2003; Tavis Ormandy <taviso@gentoo.org> privoxy-3.0.2.ebuild: + Stable on alpha + + 11 Jun 2003; Jon Portnoy <avenj@gentoo.org> privoxy-3.0.2.ebuild : + Removed textbrowser dependency to fix bug #20265. + + 09 Jun 2003; <msterret@gentoo.org> privoxy-3.0.0.ebuild, + privoxy-3.0.2.ebuild: + DEPEND on sed >= 4 + +*privoxy-3.0.2 (29 Apr 2003) + + 29 Apr 2003; Martin Holzer <mholzer@gentoo.org> privoxy-3.0.0.ebuild, + privoxy-3.0.2.ebuild, files/privoxy-3.0.0-gentoo.diff: + diff now done with sed. Version bumped. Closes #20011. + +*privoxy-3.0.0 (14 Dec 2002) + + 16 Apr 2003; Tavis Ormandy <taviso@gentoo.org> privoxy-3.0.0.ebuild: + Marking ~alpha. + + 27 Feb 2003; Martin Holzer <mholzer@gentoo.org> privoxy-3.0.0.ebuild : + Marked as stable and changed SLOT="2" to prevent broken package. + Closes #16462. + + 15 Feb 2003; Mark Guertin <gerk@gentoo.org> privoxy-3.0.0.ebuild : + set ~ppc in keywords + + 14 Dec 2002; Seemant Kulleen <seemant@gentoo.org> privoxy-3.0.0.ebuild + files/digest-privoxy-3.0.0 files/privoxy-3.0.0-gentoo.diff + files/privoxy.rc6 : + + Version bump and fixes from fridtjof@fbunet.de (Fridtjof Busse) in bug + #11835 + +*privoxy-2.9.14_beta (07 Jul 2002) + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + + 29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> privoxy-2.9.14_beta : + + Cleaned up ebuild slightly, and added a virtual/textbrowser dependency, + which closes bug #7175 by: fridtjof@fbunet.de Also added a .keep file in + /var/log/privoxy + + 07 Jul 2002; Georg Sauthoff <g_sauthoff@web.de> *: Initial Ebuild! diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest new file mode 100644 index 000000000000..b6dfa1bec2f9 --- /dev/null +++ b/net-proxy/privoxy/Manifest @@ -0,0 +1,12 @@ +MD5 623fd4631d3784e06924205a3c72855c privoxy-3.0.2.ebuild 1878 +MD5 0d4c0e667675cc4fd69eba5ee963957f privoxy-3.0.3-r3.ebuild 2333 +MD5 03f61f7eb4a83bf5a165d804b8e982e0 privoxy-3.0.3.ebuild 1888 +MD5 a62a59cd69d9802a895414b8be06cd69 ChangeLog 5208 +MD5 a31f52e5785898edac47ca00310413e2 metadata.xml 291 +MD5 2760360001df367f12d98ee964007363 files/privoxy.logrotate 191 +MD5 56d88e9a6970c67adde3386b83dcb2ae files/digest-privoxy-3.0.3-r3 77 +MD5 84c5590bae09be1d5419c27a1d5b676d files/privoxy.rc6 523 +MD5 ad897a8372898fe35da88ff91c90afe4 files/privoxy.rc7 579 +MD5 498b2ae85af76ed736ac4979e28bfe8a files/digest-privoxy-3.0.2 77 +MD5 56d88e9a6970c67adde3386b83dcb2ae files/digest-privoxy-3.0.3 77 +MD5 199b985be5ba80912fdd3bf5776e697f files/privoxy-zlib.patch 17945 diff --git a/net-proxy/privoxy/files/digest-privoxy-3.0.2 b/net-proxy/privoxy/files/digest-privoxy-3.0.2 new file mode 100644 index 000000000000..2e45d5b22967 --- /dev/null +++ b/net-proxy/privoxy/files/digest-privoxy-3.0.2 @@ -0,0 +1 @@ +MD5 9a9e25ad4420dac73d57a8efe6be58a0 privoxy-3.0.2-stable-src.tar.gz 1925287 diff --git a/net-proxy/privoxy/files/digest-privoxy-3.0.3 b/net-proxy/privoxy/files/digest-privoxy-3.0.3 new file mode 100644 index 000000000000..8293b5fba301 --- /dev/null +++ b/net-proxy/privoxy/files/digest-privoxy-3.0.3 @@ -0,0 +1 @@ +MD5 b0710be8af09409bfb03f52523a17010 privoxy-3.0.3-stable-src.tar.gz 1561072 diff --git a/net-proxy/privoxy/files/digest-privoxy-3.0.3-r3 b/net-proxy/privoxy/files/digest-privoxy-3.0.3-r3 new file mode 100644 index 000000000000..8293b5fba301 --- /dev/null +++ b/net-proxy/privoxy/files/digest-privoxy-3.0.3-r3 @@ -0,0 +1 @@ +MD5 b0710be8af09409bfb03f52523a17010 privoxy-3.0.3-stable-src.tar.gz 1561072 diff --git a/net-proxy/privoxy/files/privoxy-zlib.patch b/net-proxy/privoxy/files/privoxy-zlib.patch new file mode 100644 index 000000000000..174ce9182b17 --- /dev/null +++ b/net-proxy/privoxy/files/privoxy-zlib.patch @@ -0,0 +1,508 @@ +diff -Nru privoxy-3.0.3-stable.orig/actionlist.h privoxy-3.0.3-stable/actionlist.h +--- privoxy-3.0.3-stable.orig/actionlist.h 2002-09-25 18:25:25.000000000 +0300 ++++ privoxy-3.0.3-stable/actionlist.h 2005-02-27 01:01:23.072737744 +0200 +@@ -116,6 +116,7 @@ + DEFINE_ACTION_STRING ("deanimate-gifs", ACTION_DEANIMATE, ACTION_STRING_DEANIMATE) + DEFINE_CGI_PARAM_RADIO ("deanimate-gifs", ACTION_DEANIMATE, ACTION_STRING_DEANIMATE, "first", 0) + DEFINE_CGI_PARAM_RADIO ("deanimate-gifs", ACTION_DEANIMATE, ACTION_STRING_DEANIMATE, "last", 1) ++DEFINE_ACTION_BOOL ("decompress-from-server", ACTION_DECOMPRESS_IN) + DEFINE_ACTION_BOOL ("downgrade-http-version", ACTION_DOWNGRADE) + DEFINE_ACTION_BOOL ("fast-redirects", ACTION_FAST_REDIRECTS) + DEFINE_ACTION_MULTI ("filter", ACTION_MULTI_FILTER) +diff -Nru privoxy-3.0.3-stable.orig/configure.in privoxy-3.0.3-stable/configure.in +--- privoxy-3.0.3-stable.orig/configure.in 2004-01-30 11:26:03.000000000 +0200 ++++ privoxy-3.0.3-stable/configure.in 2005-02-27 00:59:01.813373408 +0200 +@@ -1234,6 +1234,20 @@ + libpcrs is available], + [ if test $enableval = "no"; then have_pcrs=no; fi ]) + ++AC_ARG_ENABLE(zlib, ++[ --enable-zlib Use the zlib library to allow compressing or ++ decompressing data on the fly.], ++[enableval2=$enableval], ++[enableval2=no]) ++if test $enableval2 = yes; then ++ AC_CHECK_LIB(z, zlibVersion, , [ ++ AC_MSG_ERROR([Unable to find a copy of zlib. The zlib library ++is necessary to enable compresion support. ]) ++ ]) ++ AC_DEFINE(FEATURE_ZLIB,1, ++ [ Define to 1 to use compression through the zlib library. ]) ++fi ++ + + # If we have libpcre and either we also have pcreposix or + # we don't need pcreposix, then link pcre dynamically; else +diff -Nru privoxy-3.0.3-stable.orig/default.action.master privoxy-3.0.3-stable/default.action.master +--- privoxy-3.0.3-stable.orig/default.action.master 2004-01-30 17:28:45.000000000 +0200 ++++ privoxy-3.0.3-stable/default.action.master 2005-02-27 00:59:01.815373104 +0200 +@@ -452,7 +452,7 @@ + -hide-user-agent \ + -kill-popups \ + -limit-connect \ +-+prevent-compression \ ++-prevent-compression \ + -send-vanilla-wafer \ + -send-wafer \ + +session-cookies-only \ +diff -Nru privoxy-3.0.3-stable.orig/filters.c privoxy-3.0.3-stable/filters.c +--- privoxy-3.0.3-stable.orig/filters.c 2003-11-11 15:10:31.000000000 +0200 ++++ privoxy-3.0.3-stable/filters.c 2005-02-27 01:01:23.073737592 +0200 +@@ -1320,6 +1320,38 @@ + csp->flags |= CSP_FLAG_MODIFIED; + } + ++#ifdef FEATURE_ZLIB ++ /* If the body has a compressed transfer-encoding, uncompress ++ * it first, adjusting size and iob->eod. Note that ++ * decompression occurs after de-chunking. ++ */ ++ if (csp->content_type & CT_GZIP || csp->content_type & CT_DEFLATE) ++ { ++ /* Notice that we at least tried to decompress. */ ++ if (JB_ERR_OK != decompress_iob(csp)) ++ { ++ /* We failed to decompress the data; there's no point ++ * in continuing since we can't filter. This is ++ * slightly tricky because we need to remember not to ++ * modify the Content-Encoding header later; using ++ * CT_TABOO flag is a kludge for this purpose. ++ */ ++ csp->content_type |= CT_TABOO; ++ return(NULL); ++ } ++ log_error(LOG_LEVEL_RE_FILTER, "Decompressing successful"); ++ ++ /* Decompression gives us a completely new iob, so we ++ * need to update. ++ */ ++ size = csp->iob->eod - csp->iob->cur; ++ old_buf = csp->iob->cur; ++ ++ csp->flags |= CSP_FLAG_MODIFIED; ++ } ++#endif ++ ++ + /* + * For all applying +filter actions, look if a filter by that + * name exists and if yes, execute it's pcrs_joblist on the +diff -Nru privoxy-3.0.3-stable.orig/jcc.c privoxy-3.0.3-stable/jcc.c +--- privoxy-3.0.3-stable.orig/jcc.c 2003-12-12 14:52:53.000000000 +0200 ++++ privoxy-3.0.3-stable/jcc.c 2005-02-27 01:06:08.737310128 +0200 +@@ -659,6 +659,10 @@ + # include <select.h> + # endif + ++#ifdef FEATURE_ZLIB ++#include <zlib.h> ++#endif ++ + #endif + + #include "project.h" +@@ -1605,6 +1609,8 @@ + + if ((csp->content_type & CT_TEXT) && /* It's a text / * MIME-Type */ + !http->ssl && /* We talk plaintext */ ++ !(csp->content_type & CT_GZIP) && ++ !(csp->content_type & CT_DEFLATE) && + block_popups) /* Policy allows */ + { + block_popups_now = 1; +diff -Nru privoxy-3.0.3-stable.orig/parsers.c privoxy-3.0.3-stable/parsers.c +--- privoxy-3.0.3-stable.orig/parsers.c 2003-07-11 16:21:25.000000000 +0300 ++++ privoxy-3.0.3-stable/parsers.c 2005-02-27 01:01:23.078736832 +0200 +@@ -433,6 +433,10 @@ + #include <assert.h> + #include <string.h> + ++#ifdef FEATURE_ZLIB ++#include <zlib.h> ++#endif ++ + #if !defined(_WIN32) && !defined(__OS2__) + #include <unistd.h> + #endif +@@ -632,6 +636,281 @@ + } + + ++#ifdef FEATURE_ZLIB ++/********************************************************************* ++ * ++ * Function : decompress_iob ++ * ++ * Description : Decompress buffered page, expanding the ++ * buffer as necessary. csp->iob->cur ++ * should point to the the beginning of the ++ * compressed data block. ++ * ++ * Parameters : ++ * 1 : csp = Current client state (buffers, headers, etc...) ++ * ++ * Returns : JB_ERR_OK on success, JB_ERR_MEMORY if out-of-memory ++ * limit reached, JB_ERR_GENERIC if error decompressing ++ * buffer. ++ * ++ *********************************************************************/ ++jb_err decompress_iob(struct client_state *csp) ++{ ++ char *buf; /* new, uncompressed buffer */ ++ int bufsize = csp->iob->size; /* allocated size of the new buffer */ ++ /* Number of bytes at the beginning ++ * of the iob that we should NOT ++ * decompress. ++ */ ++ int skip_size = csp->iob->cur - csp->iob->buf; ++ int status; /* return status of the inflate() call */ ++ z_stream zstr; /* used by calls to zlib */ ++ ++ /* This is to protect the parsing of gzipped data, but it should(?) ++ * be valid for deflated data also. ++ */ ++ if (bufsize < 10) ++ { ++ log_error (LOG_LEVEL_ERROR, "Buffer too small decompressing iob"); ++ return JB_ERR_GENERIC; ++ } ++ ++ if (csp->content_type & CT_GZIP) ++ { ++ /* Our task is slightly complicated by the facts that data ++ * compressed by gzip does not include a zlib header, and ++ * that there is no easily accessible interface in zlib to ++ * handle a gzip header. We strip off the gzip header by ++ * hand, and later inform zlib not to expect a header. ++ */ ++ ++ /* Strip off the gzip header. Please see RFC 1952 for more ++ * explanation of the appropriate fields. ++ */ ++ if ((*csp->iob->cur++ != (char)0x1f) ++ || (*csp->iob->cur++ != (char)0x8b) ++ || (*csp->iob->cur++ != Z_DEFLATED)) ++ { ++ log_error (LOG_LEVEL_ERROR, ++ "Invalid gzip header when decompressing"); ++ return JB_ERR_GENERIC; ++ } ++ else { ++ int flags = *csp->iob->cur++; ++ if (flags & 0xe0) ++ { ++ /* The gzip header has reserved bits set; bail out. */ ++ log_error (LOG_LEVEL_ERROR, ++ "Invalid gzip header when decompressing"); ++ return JB_ERR_GENERIC; ++ } ++ csp->iob->cur += 6; ++ ++ /* Skip extra fields if necessary. */ ++ if (flags & 0x04) ++ { ++ /* Skip a given number of bytes, specified as a 16-bit ++ * little-endian value. ++ */ ++ csp->iob->cur += *csp->iob->cur++ + (*csp->iob->cur++ << 8); ++ } ++ ++ /* Skip the filename if necessary. */ ++ if (flags & 0x08) ++ { ++ /* A null-terminated string follows. */ ++ while (*csp->iob->cur++); ++ } ++ ++ /* Skip the comment if necessary. */ ++ if (flags & 0x10) ++ { ++ while (*csp->iob->cur++); ++ } ++ ++ /* Skip the CRC if necessary. */ ++ if (flags & 0x02) ++ { ++ csp->iob->cur += 2; ++ } ++ } ++ } ++ else if (csp->content_type & CT_DEFLATE) ++ { ++ log_error (LOG_LEVEL_INFO, "Decompressing deflated iob: %d", *csp->iob->cur); ++ /* In theory (that is, according to RFC 1950), deflate-compressed ++ * data should begin with a two-byte zlib header and have an ++ * adler32 checksum at the end. It seems that in practice the ++ * only the raw compressed data is sent. Note that this means that ++ * we are not RFC 1950-compliant here, but the advantage is that ++ * this actually works. :) ++ * ++ * We add a dummy null byte to tell zlib where the data ends, ++ * and later inform it not to expect a header. ++ * ++ * Fortunately, add_to_iob() has thoughtfully null-terminated ++ * the buffer; we can just increment the end pointer to include ++ * the dummy byte. ++ */ ++ csp->iob->eod++; ++ } ++ else ++ { ++ log_error (LOG_LEVEL_ERROR, ++ "Unable to determine compression format for decompression"); ++ return JB_ERR_GENERIC; ++ } ++ ++ /* Set up the fields required by zlib. */ ++ zstr.next_in = csp->iob->cur; ++ zstr.avail_in = csp->iob->eod - csp->iob->cur; ++ zstr.zalloc = Z_NULL; ++ zstr.zfree = Z_NULL; ++ zstr.opaque = Z_NULL; ++ ++ /* Passing -MAX_WBITS to inflateInit2 tells the library ++ * that there is no zlib header. ++ */ ++ if (inflateInit2 (&zstr, -MAX_WBITS) != Z_OK) ++ { ++ log_error (LOG_LEVEL_ERROR, ++ "Error initializing decompression"); ++ return JB_ERR_GENERIC; ++ } ++ ++ /* Next, we allocate new storage for the inflated data. ++ * We don't modify the existing iob yet, so in case there ++ * is error in decompression we can recover gracefully. ++ */ ++ buf = zalloc (bufsize); ++ if (NULL == buf) ++ { ++ log_error (LOG_LEVEL_ERROR, ++ "Out of memory decompressing iob"); ++ return JB_ERR_MEMORY; ++ } ++ ++ assert(bufsize >= skip_size); ++ memcpy(buf, csp->iob->buf, skip_size); ++ zstr.avail_out = bufsize - skip_size; ++ zstr.next_out = buf + skip_size; ++ ++ /* Try to decompress the whole stream in one shot. */ ++ while (Z_BUF_ERROR == (status = inflate(&zstr, Z_FINISH))) ++ { ++ /* We need to allocate more memory for the output buffer. */ ++ ++ char *tmpbuf; /* used for realloc'ing the buffer */ ++ int oldbufsize = bufsize; /* keep track of the old bufsize */ ++ ++ /* If zlib wants more data then there's a problem, because ++ * the complete compressed file should have been buffered. ++ */ ++ if (0 == zstr.avail_in) ++ { ++ log_error(LOG_LEVEL_ERROR, ++ "Unexpected end of compressed iob"); ++ return JB_ERR_GENERIC; ++ } ++ ++ /* If we tried the limit and still didn't have enough ++ * memory, just give up. ++ */ ++ if (bufsize == csp->config->buffer_limit) ++ { ++ log_error(LOG_LEVEL_ERROR, "Out of memory decompressing iob"); ++ return JB_ERR_MEMORY; ++ } ++ ++ /* Try doubling the buffer size each time. */ ++ bufsize *= 2; ++ ++ /* Don't exceed the buffer limit. */ ++ if (bufsize > csp->config->buffer_limit) ++ { ++ bufsize = csp->config->buffer_limit; ++ } ++ ++ /* Try to allocate the new buffer. */ ++ tmpbuf = realloc(buf, bufsize); ++ if (NULL == tmpbuf) ++ { ++ log_error(LOG_LEVEL_ERROR, "Out of memory decompressing iob"); ++ freez(buf); ++ return JB_ERR_MEMORY; ++ } ++ else ++ { ++ char *oldnext_out = zstr.next_out; ++ ++ /* Update the fields for inflate() to use the new ++ * buffer, which may be in a different location from ++ * the old one. ++ */ ++ zstr.avail_out += bufsize - oldbufsize; ++ zstr.next_out = tmpbuf + bufsize - zstr.avail_out; ++ ++ /* Compare with an uglier method of calculating these values ++ * that doesn't require the extra oldbufsize variable. ++ */ ++ assert(zstr.avail_out == ++ tmpbuf + bufsize - (char *)zstr.next_out); ++ assert((char *)zstr.next_out == ++ tmpbuf + ((char *)oldnext_out - buf)); ++ assert(zstr.avail_out > 0); ++ ++ buf = tmpbuf; ++ } ++ } ++ ++ inflateEnd(&zstr); ++ if (status != Z_STREAM_END) ++ { ++ /* We failed to decompress the stream. */ ++ log_error(LOG_LEVEL_ERROR, ++ "Error in decompressing to the buffer (iob): %s", ++ zstr.msg); ++ return JB_ERR_GENERIC; ++ } ++ ++ /* Finally, we can actually update the iob, since the ++ * decompression was successful. First, free the old ++ * buffer. ++ */ ++ freez(csp->iob->buf); ++ ++ /* Now, update the iob to use the new buffer. */ ++ csp->iob->buf = buf; ++ csp->iob->cur = csp->iob->buf + skip_size; ++ csp->iob->eod = zstr.next_out; ++ csp->iob->size = bufsize; ++ ++ /* Make sure the new uncompressed iob obeys some minimal ++ * consistency conditions. ++ */ ++ if ((csp->iob->buf < csp->iob->cur) ++ && (csp->iob->cur <= csp->iob->eod) ++ && (csp->iob->eod <= csp->iob->buf + csp->iob->size)) ++ { ++ char t = csp->iob->cur[100]; ++ csp->iob->cur[100] = 0; ++ log_error(LOG_LEVEL_INFO, ++ "Sucessfully decompressed: %s", csp->iob->cur); ++ csp->iob->cur[100] = t; ++ return JB_ERR_OK; ++ } ++ else ++ { ++ /* It seems that zlib did something weird. */ ++ log_error(LOG_LEVEL_ERROR, ++ "Unexpected error decompressing the buffer (iob): %d==%d, %d>%d, %d<%d", csp->iob->cur, csp->iob->buf + skip_size, csp->iob->eod, csp->iob->buf, csp->iob->eod, csp->iob->buf + csp->iob->size); ++ return JB_ERR_GENERIC; ++ } ++ ++} ++#endif /* defined(FEATURE_ZLIB) */ ++ ++ + /********************************************************************* + * + * Function : get_header +@@ -937,13 +1216,59 @@ + *********************************************************************/ + jb_err server_content_encoding(struct client_state *csp, char **header) + { ++#ifdef FEATURE_ZLIB ++ if (strstr(*header, "gzip")) ++ { ++ /* ++ * If the body was modified, we have tried to ++ * decompress it, so adjust the header if necessary. ++ */ ++ if ((csp->flags & CSP_FLAG_MODIFIED) /* we attempted to decompress */ ++ && !(csp->content_type & CT_TABOO)) /* decompression was successful */ ++ { ++ freez(*header); ++ *header = strdup("Content-Encoding: identity"); ++ return (header == NULL) ? JB_ERR_MEMORY : JB_ERR_OK; ++ } ++ else ++ { ++ csp->content_type |= CT_GZIP; ++ } ++ } ++ else if (strstr(*header, "deflate")) ++ { ++ /* ++ * If the body was modified, we have tried to ++ * decompress it, so adjust the header if necessary. ++ */ ++ if ((csp->flags & CSP_FLAG_MODIFIED) /* we attempted to decompress */ ++ && !(csp->content_type & CT_TABOO)) /* decompression was successful */ ++ { ++ freez(*header); ++ *header = strdup("Content-Encoding: identity"); ++ return (header == NULL) ? JB_ERR_MEMORY : JB_ERR_OK; ++ } ++ else ++ { ++ csp->content_type |= CT_DEFLATE; ++ } ++ } ++ else if (strstr(*header, "compress")) ++ { ++ /* We can't decompress this; therefore we can't filter ++ * it either. ++ */ ++ csp->content_type |= CT_TABOO; ++ } ++#else /* !defined(FEATURE_GZIP) */ + /* + * Turn off pcrs and gif filtering if body compressed + */ + if (strstr(*header, "gzip") || strstr(*header, "compress") || strstr(*header, "deflate")) + { +- csp->content_type = CT_TABOO; ++ csp->content_type |= CT_TABOO; + } ++#endif /* !defined(FEATURE_GZIP) */ + + return JB_ERR_OK; + +diff -Nru privoxy-3.0.3-stable.orig/parsers.h privoxy-3.0.3-stable/parsers.h +--- privoxy-3.0.3-stable.orig/parsers.h 2002-09-25 17:52:46.000000000 +0300 ++++ privoxy-3.0.3-stable/parsers.h 2005-02-27 01:01:23.079736680 +0200 +@@ -194,6 +194,7 @@ + + extern int flush_socket(jb_socket fd, struct client_state *csp); + extern jb_err add_to_iob(struct client_state *csp, char *buf, int n); ++extern jb_err decompress_iob(struct client_state *csp); + extern char *get_header(struct client_state *csp); + extern char *get_header_value(const struct list *header_list, const char *header_name); + extern char *sed(const struct parsers pats[], const add_header_func_ptr more_headers[], struct client_state *csp); +diff -Nru privoxy-3.0.3-stable.orig/project.h privoxy-3.0.3-stable/project.h +--- privoxy-3.0.3-stable.orig/project.h 2004-01-30 17:29:29.000000000 +0200 ++++ privoxy-3.0.3-stable/project.h 2005-02-27 01:01:23.081736376 +0200 +@@ -818,6 +818,15 @@ + #define CT_TABOO 4 /**< csp->content_type bitmask: + DO NOT filter, irrespective of other flags. */ + ++/* Although these are not, strictly speaking, content types ++ * (they are content encodings), it is simple to handle ++ * them as such. ++ */ ++#define CT_GZIP 8 /**< csp->content_type bitmask: ++ gzip-compressed data. */ ++#define CT_DEFLATE 16 /**< csp->content_type bitmask: ++ zlib-compressed data. */ ++ + /** + * The mask which includes all actions. + */ +@@ -862,6 +871,8 @@ + #define ACTION_VANILLA_WAFER 0x00008000UL + /** Action bitmap: Limit CONNECT requests to safe ports. */ + #define ACTION_LIMIT_CONNECT 0x00010000UL ++/** Action bitmap: Uncompress incoming text for filtering. */ ++#define ACTION_DECOMPRESS_IN 0x00020000UL + + /** Action string index: How to deanimate GIFs */ + #define ACTION_STRING_DEANIMATE 0 diff --git a/net-proxy/privoxy/files/privoxy.logrotate b/net-proxy/privoxy/files/privoxy.logrotate new file mode 100644 index 000000000000..f5d6b2b91703 --- /dev/null +++ b/net-proxy/privoxy/files/privoxy.logrotate @@ -0,0 +1,9 @@ +/var/log/privoxy/privoxy.log /var/log/privoxy/jarfile { + missingok + notifempty + create 0750 privoxy privoxy + sharedscripts + postrotate + killall -HUP privoxy 2>/dev/null || true + endscript +} diff --git a/net-proxy/privoxy/files/privoxy.rc6 b/net-proxy/privoxy/files/privoxy.rc6 new file mode 100644 index 000000000000..50650d4b8edf --- /dev/null +++ b/net-proxy/privoxy/files/privoxy.rc6 @@ -0,0 +1,20 @@ +#!/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/privoxy/files/privoxy.rc6,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting privoxy" + start-stop-daemon --start --quiet --exec /usr/sbin/privoxy -- /etc/privoxy/config --user privoxy.privoxy & + eend $? +} + +stop() { + ebegin "Stopping privoxy" + start-stop-daemon --stop --quiet --exec /usr/sbin/privoxy + eend $? +} diff --git a/net-proxy/privoxy/files/privoxy.rc7 b/net-proxy/privoxy/files/privoxy.rc7 new file mode 100644 index 000000000000..b06d990b273d --- /dev/null +++ b/net-proxy/privoxy/files/privoxy.rc7 @@ -0,0 +1,22 @@ +#!/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/privoxy/files/privoxy.rc7,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting privoxy" + start-stop-daemon --start --quiet --exec /usr/sbin/privoxy -- \ + --pidfile /var/run/privoxy.pid \ + --user privoxy.privoxy /etc/privoxy/config 2>/dev/null + eend $? +} + +stop() { + ebegin "Stopping privoxy" + start-stop-daemon --stop --quiet --pidfile /var/run/privoxy.pid + eend $? +} diff --git a/net-proxy/privoxy/metadata.xml b/net-proxy/privoxy/metadata.xml new file mode 100644 index 000000000000..f1810cf5c4a6 --- /dev/null +++ b/net-proxy/privoxy/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<longdescription>A web proxy with advanced filtering capabilities for protecting privacy against internet junk</longdescription> +</pkgmetadata> diff --git a/net-proxy/privoxy/privoxy-3.0.2.ebuild b/net-proxy/privoxy/privoxy-3.0.2.ebuild new file mode 100644 index 000000000000..3dbb5ff0952b --- /dev/null +++ b/net-proxy/privoxy/privoxy-3.0.2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.2.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +S="${WORKDIR}/${P}-stable" +HOMEPAGE="http://www.privoxy.org" +DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against internet junk." +SRC_URI="mirror://sourceforge/ijbswa/${P}-stable-src.tar.gz" +RESTRICT="nomirror" + +IUSE="selinux" +SLOT="0" +KEYWORDS="x86 ppc alpha sparc" +LICENSE="GPL-2" + +DEPEND=">=sys-apps/sed-4" +RDEPEND="selinux? ( sec-policy/selinux-privoxy )" + +pkg_setup() { + enewgroup privoxy + enewuser privoxy -1 /bin/false /etc/privoxy privoxy +} + +src_unpack() { + unpack ${A} + cd ${S} + sed -i 's:confdir .:confdir /etc/privoxy:' config + sed -i 's:logdir .:logdir /var/log/privoxy:' config + sed -i 's:logfile logfile:logfile privoxy.log:' config + sed -i 's:set-image-blocker{pattern}:set-image-blocker{blank}:' default.action.master + + autoheader || die "autoheader failed" + autoconf || die "autoconf failed" +} + +src_compile() { + econf \ + --sysconfdir=/etc/privoxy || die "econf failed" + + emake || die "make failed." +} + +src_install () { + diropts -m 0750 -g privoxy -o privoxy + dodir /var/log/privoxy + keepdir /var/log/privoxy + dodir /etc/privoxy /etc/privoxy/templates + + insopts -m 0640 -g privoxy -o privoxy + insinto /etc/privoxy + doins default.action default.filter config standard.action trust user.action + + insinto /etc/privoxy/templates + doins templates/* + + doman privoxy.1 + + dodoc LICENSE README AUTHORS doc/text/faq.txt ChangeLog + + insopts + for i in developer-manual faq man-page user-manual + do + insinto /usr/share/doc/${PF}/$i + doins doc/webserver/$i/* + done + + insopts -m 0750 -g root -o root + insinto /usr/sbin + doins privoxy + insinto /etc/init.d + newins ${FILESDIR}/privoxy.rc6 privoxy +} diff --git a/net-proxy/privoxy/privoxy-3.0.3-r3.ebuild b/net-proxy/privoxy/privoxy-3.0.3-r3.ebuild new file mode 100644 index 000000000000..cf538a1aa0f6 --- /dev/null +++ b/net-proxy/privoxy/privoxy-3.0.3-r3.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.3-r3.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit toolchain-funcs eutils + +HOMEPAGE="http://www.privoxy.org" +DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against internet junk." +SRC_URI="mirror://sourceforge/ijbswa/${P}-stable-src.tar.gz" + +IUSE="pcre selinux" +SLOT="0" +KEYWORDS="~alpha ~amd64 ppc sparc x86" +LICENSE="GPL-2" + +DEPEND=">=sys-apps/sed-4 + =sys-devel/autoconf-2.1* + virtual/libc + pcre? ( dev-libs/libpcre )" + +RDEPEND="virtual/libc + selinux? ( sec-policy/selinux-privoxy ) + pcre? ( dev-libs/libpcre )" + +S="${WORKDIR}/${P}-stable" + +pkg_setup() { + enewgroup privoxy + enewuser privoxy -1 /bin/false /etc/privoxy privoxy +} + +src_unpack() { + unpack ${A} + cd ${S} + + # add gzip and zlib decompression + epatch ${FILESDIR}/privoxy-zlib.patch + + rm ${S}/autom4te.cache/{output.0,requests,traces.0} + + sed -e 's:confdir .:confdir /etc/privoxy:' \ + -e 's:logdir .:logdir /var/log/privoxy:' \ + -e 's:logfile logfile:logfile privoxy.log:' \ + -i ${S}/config || die "sed failed." + sed -e 's:^\+set-image-blocker{pattern}:+set-image-blocker{blank}:' \ + -i ${S}/default.action.master || die "sed 2 failed." +} + +src_compile() { + export WANT_AUTOCONF=2.1 + autoheader || die "autoheader failed" + autoconf || die "autoconf failed" + + export CC=$(tc-getCC) + econf \ + $(use_enable pcre dynamic-pcre) \ + --sysconfdir=/etc/privoxy || die "econf failed" + + emake || die "make failed." +} + +src_install () { + diropts -m 0750 -g privoxy -o privoxy + insopts -m 0640 -g privoxy -o privoxy + + keepdir /var/log/privoxy + + insinto /etc/privoxy + doins default.action default.filter config standard.action trust user.action + + insinto /etc/privoxy/templates + doins templates/* + + doman privoxy.1 + dodoc LICENSE README AUTHORS doc/text/faq.txt ChangeLog + + insopts -m 0644 -g root -o root + diropts -m 0755 -g root -o root + for i in developer-manual faq man-page user-manual + do + insinto /usr/share/doc/${PF}/$i + doins doc/webserver/$i/* + done + + insopts -m 0750 -g root -o root + insinto /usr/sbin + doins privoxy + newinitd ${FILESDIR}/privoxy.rc7 privoxy + insopts -m 0640 + insinto /etc/logrotate.d + newins ${FILESDIR}/privoxy.logrotate privoxy +} diff --git a/net-proxy/privoxy/privoxy-3.0.3.ebuild b/net-proxy/privoxy/privoxy-3.0.3.ebuild new file mode 100644 index 000000000000..69f748c9b244 --- /dev/null +++ b/net-proxy/privoxy/privoxy-3.0.3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.3.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +S="${WORKDIR}/${P}-stable" +HOMEPAGE="http://www.privoxy.org" +DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against internet junk." +SRC_URI="mirror://sourceforge/ijbswa/${P}-stable-src.tar.gz" +RESTRICT="nomirror" + +IUSE="selinux" +SLOT="0" +KEYWORDS="~x86 ~ppc alpha ~sparc ~amd64" +LICENSE="GPL-2" + +DEPEND=">=sys-apps/sed-4" +RDEPEND="selinux? ( sec-policy/selinux-privoxy )" + +pkg_setup() { + enewgroup privoxy + enewuser privoxy -1 /bin/false /etc/privoxy privoxy +} + +src_unpack() { + unpack ${A} + cd ${S} + sed -i 's:confdir .:confdir /etc/privoxy:' config + sed -i 's:logdir .:logdir /var/log/privoxy:' config + sed -i 's:logfile logfile:logfile privoxy.log:' config + sed -i 's:set-image-blocker{pattern}:set-image-blocker{blank}:' default.action.master + + autoheader || die "autoheader failed" + autoconf || die "autoconf failed" +} + +src_compile() { + econf \ + --sysconfdir=/etc/privoxy || die "econf failed" + + emake || die "make failed." +} + +src_install () { + diropts -m 0750 -g privoxy -o privoxy + dodir /var/log/privoxy + keepdir /var/log/privoxy + dodir /etc/privoxy /etc/privoxy/templates + + insopts -m 0640 -g privoxy -o privoxy + insinto /etc/privoxy + doins default.action default.filter config standard.action trust user.action + + insinto /etc/privoxy/templates + doins templates/* + + doman privoxy.1 + + dodoc LICENSE README AUTHORS doc/text/faq.txt ChangeLog + + insopts + for i in developer-manual faq man-page user-manual + do + insinto /usr/share/doc/${PF}/$i + doins doc/webserver/$i/* + done + + insopts -m 0750 -g root -o root + insinto /usr/sbin + doins privoxy + insinto /etc/init.d + newins ${FILESDIR}/privoxy.rc6 privoxy +} diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog new file mode 100644 index 000000000000..6afbe9c6d5eb --- /dev/null +++ b/net-proxy/squid/ChangeLog @@ -0,0 +1,467 @@ +# ChangeLog for www-proxy/squid +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + + 19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> squid-2.5.9-r3.ebuild: + Stable on alpha and ia64, bug 89149. + +*squid-2.5.9-r3 (19 Apr 2005) + + 19 Apr 2005; Alin Nastac <mrness@gentoo.org> -squid-2.5.9-r2.ebuild, + +squid-2.5.9-r3.ebuild: + Replace 2.5.9-r2 version with 2.5.9-r3 for fixing broken 2GB patch. See bug + #89586 for more info. + + 17 Apr 2005; Jason Wever <weeve@gentoo.org> squid-2.5.9-r2.ebuild: + Stable on SPARC wrt security bug #89149. + + 17 Apr 2005; Markus Rothe <corsair@gentoo.org> squid-2.5.9-r2.ebuild: + Stable on ppc64; bug #89149 + + 17 Apr 2005; Alin Nastac <mrness@gentoo.org> squid-2.5.9-r2.ebuild: + Stable on x86 + + 16 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> squid-2.5.9-r2.ebuild: + Stable on ppc. + + 16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> squid-2.5.9-r2.ebuild: + stable on amd64 wrt security bug #89149 + + 01 Apr 2005; Aron Griffis <agriffis@gentoo.org> squid-2.5.9.ebuild: + stable on ia64 + +*squid-2.5.9-r2 (28 Mar 2005) + + 28 Mar 2005; Alin Nastac <mrness@gentoo.org> -squid-2.5.9-r1.ebuild, + +squid-2.5.9-r2.ebuild: + Add customlog local USE flag which decides whether or not customlog patch is + applied (#85740). + + 13 Mar 2005; Hardave Riar <hardave@gentoo.org> squid-2.5.9.ebuild: + Stable on mips, bug #83955. + +*squid-2.5.9-r1 (06 Mar 2005) + + 06 Mar 2005; Alin Nastac <mrness@gentoo.org> +squid-2.5.9-r1.ebuild: + Add current official patches and fix minor inconsistency in squid.conf + comments (#84184). + + 05 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> squid-2.5.9.ebuild: + Stable on alpha, bug 83955. + + 04 Mar 2005; Markus Rothe <corsair@gentoo.org> squid-2.5.9.ebuild: + Stable on ppc64; bug #83955 + + 04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> squid-2.5.9.ebuild: + Stable on sparc wrt #83955 + + 03 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> squid-2.5.9.ebuild: + stable on amd64 wrt to #83955 + + 03 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> squid-2.5.9.ebuild: + Stable on ppc. + +*squid-2.5.9 (03 Mar 2005) + + 03 Mar 2005; Alin Nastac <mrness@gentoo.org> + +files/squid-2.5.9-gentoo.diff, +squid-2.5.9.ebuild: + Security bump (#83955). Turn off by default client IP disclosure (#83976). + + 28 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> + squid-2.5.8-r1.ebuild: + Use correct compiler. + +*squid-2.5.8-r1 (23 Feb 2005) + + 23 Feb 2005; Alin Nastac <mrness@gentoo.org> + -files/squid-2.4.7-debian.diff, -files/squid-2.4.7-gentoo.diff, + -files/squid-2.5.3-gentoo.diff, -files/squid-2.5.5-ntml-auth-fix.patch, + -files/squid-2.5.6-ufs-no-valid-dir.patch, -files/squid-2.5.7-gentoo.diff, + +files/squid-logrotate, -squid-2.4.7.ebuild, -squid-2.5.5-r3.ebuild, + -squid-2.5.6-r3.ebuild, -squid-2.5.7-r6.ebuild, +squid-2.5.8-r1.ebuild: + Incorporate combined log patch (#76333). Add support for logrotate selected + by a new USE flag (#71658). Remove obsolete versions. + + 20 Feb 2005; Aron Griffis <agriffis@gentoo.org> squid-2.5.8.ebuild: + stable on ia64 #81997 + + 18 Feb 2005; Hardave Riar <hardave@gentoo.org> squid-2.5.8.ebuild: + Stable on mips, bug #81997 + + 17 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> squid-2.5.8.ebuild: + Stable on alpha, bug 81997. + + 16 Feb 2005; Jason Wever <weeve@gentoo.org> squid-2.5.8.ebuild: + Stable on sparc wrt security bug #81997. + + 16 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> squid-2.5.8.ebuild: + Stable on hppa and ppc. + + 16 Feb 2005; Markus Rothe <corsair@gentoo.org> squid-2.5.8.ebuild: + Stable on ppc64; bug #81997 + + 15 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> squid-2.5.8.ebuild: + stable on amd64. see #81997 + +*squid-2.5.8 (15 Feb 2005) + + 15 Feb 2005; Alin Nastac <mrness@gentoo.org> metadata.xml, + +files/squid-2.5.8-gentoo.diff, +squid-2.5.8.ebuild: + Security bump for bug #81997. + +*squid-2.5.7-r6 (09 Feb 2005) + + 09 Feb 2005; Andrew Bevitt <cyfred@gentoo.org> -squid-2.5.7-r5.ebuild, + +squid-2.5.7-r6.ebuild: + More patchset bumps + + 06 Feb 2005; Joshua Kinard <kumba@gentoo.org> squid-2.5.7-r5.ebuild: + Marked stable on mips. + +*squid-2.5.7-r5 (01 Feb 2005) + + 01 Feb 2005; Andrew Bevitt <cyfred@gentoo.org> -squid-2.5.7-r4.ebuild, + +squid-2.5.7-r5.ebuild: + Security bump for bug #80201 + +*squid-2.5.7-r4 (27 Jan 2005) + + 27 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> -squid-2.5.7-r3.ebuild, + +squid-2.5.7-r4.ebuild: + Security bump bug #79495 + +*squid-2.5.7-r3 (21 Jan 2005) + + 21 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> -squid-2.5.7-r2.ebuild, + +squid-2.5.7-r3.ebuild: + Security bump for bug #78776 + +*squid-2.5.7-r2 (14 Jan 2005) + + 14 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> -squid-2.5.7-r1.ebuild, + +squid-2.5.7-r2.ebuild: + Security bump for bug #77934 + +*squid-2.5.7-r1 (12 Jan 2005) + + 12 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> +squid-2.5.7-r1.ebuild, + -squid-2.5.7.ebuild: + Revision bump to get the patchset out there + + 12 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> squid-2.5.7.ebuild: + Security patchset update see bug #77521 + + 30 Dec 2004; Andrew Bevitt <cyfred@gentoo.org> + files/squid-2.5.7-gentoo.diff, files/squid.confd, files/squid.rc6, + squid-2.5.7.ebuild: + Changes to give squid a max of 8192 descriptors (default 1024). + + 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 12 Dec 2004; Andrew Bevitt <cyfred@gentoo.org> squid-2.5.7.ebuild: + Adding underscores use flag to IUSE + + 10 Dec 2004; Andrew Bevitt <cyfred@gentoo.org> squid-2.5.7.ebuild: + Security patchset update see bug #73908 + + 04 Dec 2004; Andrew Bevitt <cyfred@gentoo.org> squid-2.5.7.ebuild: + Added more bug fix patches to the STABLE7 patchset. + + 04 Dec 2004; Andrew Bevitt <cyfred@gentoo.org> + -files/squid-2.5.3-gentoo.diff, files/squid-2.5.7-gentoo.diff, + -files/squid.cron, -squid-2.5.6-r2.ebuild, squid-2.5.6-r3.ebuild: + Fixing bug #68524 and removing a few old ebuilds. + + 17 Oct 2004; Hardave Riar <hardave@gentoo.org> squid-2.5.6-r2.ebuild: + Stable on mips, bug #61280. + +*squid-2.5.6-r3 (17 Oct 2004) + + 17 Oct 2004; Andrew Bevitt <cyfred@gentoo.org>; +squid-2.5.6-r3.ebuild, + squid-2.5.7.ebuild: + More patches for 2.5.STABLE6 and started the patchset for STABLE7, see bug + #57081 + +*squid-2.5.7 (17 Oct 2004) + + 17 Oct 2004; Andrew Bevitt <cyfred@gentoo.org>; + +files/squid-2.5.7-gentoo.diff, +squid-2.5.7.ebuild: + Version bump to STABLE7 + bug #67167 DoS fix + + 12 Oct 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.4.7.ebuild, + -squid-2.5.5-r2.ebuild, squid-2.5.5-r3.ebuild, -squid-2.5.6-r1.ebuild, + squid-2.5.6-r2.ebuild, -squid-2.5.6.ebuild: + added selinux to IUSE + + 26 Sep 2004; Tom Gall <tgall@gentoo.org> squid-2.5.6-r2.ebuild: + stable on ppc64, bug #61280 + + 14 Sep 2004; Guy Martin <gmsoft@gentoo.org> squid-2.5.6-r2.ebuild: + Stable on hppa. + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + + 01 Sep 2004; Travis Tilley <lv@gentoo.org> squid-2.5.6-r2.ebuild: + stable on amd64 + + 27 Aug 2004; Jason Wever <weeve@gentoo.org> squid-2.5.6-r2.ebuild: + Stable on sparc wrt security bug #61280. + + 27 Aug 2004; Martin Holzer <mholzer@gentoo.org> squid-2.5.6-r2.ebuild: + x86 stable + + 26 Aug 2004; Bryan ÃÂstergaard <kloeri@gentoo.org> squid-2.5.6-r2.ebuild: + Stable on alpha, bug 61280. + +*squid-2.5.6-r2 (23 Aug 2004) + + 23 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; +squid-2.5.6-r2.ebuild: + Security Update: NTML DoS Vunerability see bug #61280 + + 23 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.6-r1.ebuild: + Adding support for uclibc to 2.5 Stable 6 see #61175 + + 16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.5-r3.ebuild: + Patches introduced for 2.5.5-r3 fix the sasl sedding done in the ebuilds, + removing. + +*squid-2.5.5-r3 (16 Aug 2004) + + 16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.4.7.ebuild, + +squid-2.5.5-r3.ebuild, +squid-2.5.6-r1.ebuild: + Updating patchsets for all versions, see bug #57081 for more + +*squid-2.4.7 (15 Aug 2004) + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml, + +files/squid-2.4.7-debian.diff, +files/squid-2.4.7-gentoo.diff, + +files/squid-2.5.3-gentoo.diff, +files/squid-2.5.5-ntml-auth-fix.patch, + +files/squid-2.5.6-ufs-no-valid-dir.patch, +files/squid-r1.cron, + +files/squid.confd, +files/squid.cron, +files/squid.pam, +files/squid.rc6, + +squid-2.4.7.ebuild, +squid-2.5.5-r2.ebuild, +squid-2.5.6.ebuild: + Moved from net-www/squid to www-proxy/squid. + + 18 Jul 2004; Bryan ÃÂstergaard <kloeri@gentoo.org> squid-2.5.6.ebuild: + Keyworded ~alpha. + + 16 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.6.ebuild: + SASL V 1/2 is now supported natively + + 15 Jul 2004; Tom Gall <tgall@gentoo.org> squid-2.5.5-r2.ebuild: + stable on ppc64, bug #55406 + + 15 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; -squid-2.5.3.ebuild, + -squid-2.5.4.ebuild, -squid-2.5.5-r1.ebuild, squid-2.5.5-r2.ebuild, + -squid-2.5.5.ebuild: + Removing old versions of 2.5. Marking -r2 amd64 stable. Closing bug #52977 + +*squid-2.5.6 (15 Jul 2004) + + 15 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; + +files/squid-2.5.6-ufs-no-valid-dir.patch, +squid-2.5.6.ebuild: + Squid 2.5 Stable 6; inital ebuild thanks to ali3nx, included patches from + squid-caches updates + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> squid-2.5.3.ebuild, + squid-2.5.4.ebuild, squid-2.5.5-r1.ebuild, squid-2.5.5-r2.ebuild, + squid-2.5.5.ebuild: + virtual/glibc -> virtual/libc + + 25 Jun 2004; Aron Griffis <agriffis@gentoo.org> squid-2.4.7.ebuild, + squid-2.5.3.ebuild, squid-2.5.4.ebuild, squid-2.5.5-r1.ebuild, + squid-2.5.5-r2.ebuild, squid-2.5.5.ebuild: + QA - fix use invocation + + 24 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> + squid-2.5.5-r2.ebuild: + Marked ~amd64. amd64 needs --disable-internal-dns to run properly. + + 16 Jun 2004; Daniel Ostrowv<dostrow@gentoo.org> squid-2.5.5-r2.ebuild: + Stable on ppc. + + 15 Jun 2004; Brandon Hale <tseng@gentoo.org> squid-2.5.5-r2.ebuild: + Stable on x86. + + 12 Jun 2004; Jason Wever <weeve@gentoo.org> squid-2.5.5-r2.ebuild: + Stable on sparc wrt bug #53367. + + 12 Jun 2004; Guy Martin <gmsoft@gentoo.org> squid-2.5.5-r2.ebuild: + Marked stable on hppa. + + 12 Jun 2004; Bryan ÃÂstergaard <kloeri@gentoo.org> squid-2.5.5-r2.ebuild: + Stable on alpha, bug #53367. + +*squid-2.5.5-r2 (12 Jun 2004) + + 12 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; + +files/squid-2.5.5-ntml-auth-fix.patch, +squid-2.5.5-r2.ebuild: + Closing bugs #52977 and #53367, 53367 fixes an issue in NTLM Authentication, + where a buffer overflow is possible -- Please upgrade, see the bug for more + information + + 12 May 2004; Michael McCabe <randy@gentoo.org> squid-2.5.5-r1.ebuild: + Added s390 keywords + + 01 May 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.5-r1.ebuild: + Adding support for underscores in the domain name; local use flag underscores. + Ebuild provides warning that bind (or equivelent) must support this or you + will get dns failures. + + 01 May 2004; Andrew Bevitt <cyfred@gentoo.org>; metadata.xml: + Taking over squid maintainers role + +*squid-2.5.5-r1 (01 May 2004) + + 01 May 2004; Bryan ÃÂstergaard <kloeri@gentoo.org> +files/squid-r1.cron, + +squid-2.5.5-r1.ebuild: + New cron script, close bug #30475. + + 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> squid-2.4.7.ebuild: + Add inherit eutils + + 31 Mar 2004; Joshua Brindle <method@gentoo.org> : + Added selinux policy deps, removed ppc64 as it had badindev and no changelog + entry + + 30 Mar 2004; <plasmaroo@gentoo.org> squid-2.5.5.ebuild: + Marked stable on X86 for GLSA release; bug #45273. + + 30 Mar 2004; Lars Weiler <pylon@gentoo.org> squid-2.5.5.ebuild: + Stable on ppc due to security bug #45273. + + 30 Mar 2004; Guy Martin <gmsoft@gentoo.org> squid-2.5.5.ebuild: + Marked stable on hppa. + + 21 Mar 2004; Aron Griffis <agriffis@gentoo.org> squid-2.5.5.ebuild: + Stable on alpha and ia64. + + 21 Mar 2004; Jason Wever <weeve@gentoo.org> squid-2.5.5.ebuild: + Marked stable on sparc wrt #45273. + +*squid-2.5.5 (18 Mar 2004) + + 18 Mar 2004; Donny Davies <woodchip@gentoo.org> squid-2.5.5.ebuild, + files/squid.rc6: + Version bump and add reload() to the rc-script, both thanks to + Wolfram Schlich <wschlich@gentoo.org>. + + 19 Feb 2004; Donny Davies <woodchip@gentoo.org> squid-2.5.4.ebuild: + Bug #41882; add 'export WANT_AUTOCONF=2.1'. + + 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> squid-2.5.4.ebuild: + stable on ia64 + + 21 Jan 2004; Guy Martin <gmsoft@gentoo.org> squid-2.5.4.ebuild : + Marked stable on hppae + + 10 Jan 2004; Aron Griffis <agriffis@gentoo.org> squid-2.5.4.ebuild: + stable on alpha + + 15 Dec 2003; <spider@gentoo.org> squid-2.4.7.ebuild, squid-2.5.3.ebuild, + squid-2.5.4.ebuild: + QA: fixing chown user.group to user:group, bug #35127 + + 05 Nov 2003; Christian Birchinger <joker@gentoo.org> squid-2.5.4.ebuild: + Added sparc stable keyword + + 02 Nov 2003; Donny Davies <woodchip@gentoo.org> squid-2.5.4.ebuild: + Mark x86 stable, add metadata.xml. + +*squid-2.5.4 (18 Sep 2003) + + 18 Sep 2003; Donny Davies <woodchip@gentoo.org> squid-2.5.4.ebuild: + Version bump. Add --enable-ident-lookups, closing #24591. + + 10 Jul 2003; Christian Birchinger <joker@gentoo.org> squid-2.5.3.ebuild: + Added sparc stable keyword + + 10 Jul 2003; Christian Birchinger <joker@gentoo.org> squid-2.5.3.ebuild: + Added sparc stable keyword + + 03 Jul 2003; Brad Laue <brad@gentoo.org> squid-2.5.3.ebuild: + Mark 2.5.3 stable on x86. + + 10 Jun 2003; Christian Birchinger <joker@gentoo.org> squid-2.5.2.ebuild: + Added sparc stable keyword + +*squid-2.5.3 (04 Jun 2003) + + 05 Jul 2003; Guy martin <gmsoft@gentoo.org> squid-2.5.3.ebuild : + Fixed the loop problem with glibc-2.3.1 on hppa . Marked stable for hppa. + + 04 Jun 2003; Donny Davies <woodchip@gentoo.org> Manifest, squid-2.5.3.ebuild, + files/squid-2.5.3-gentoo.diff: + Version bump. Re-diff patch. + +*squid-2.5.2 (27 Mar 2003) + + 04 Jun 2003; Brad Laue <brad@gentoo.org> Manifest, squid-2.5.2.ebuild, + Mark stable on x86. + + 27 Mar 2003; Donny Davies <woodchip@gentoo.org> squid-2.5.2.ebuild, + files/squid-2.5.2-gentoo.diff: + Bump to latest. Made new patch, clean some docs, fix cron snip install. + +*squid-2.5.1-r2 (31 Jan 2003) + + 30 Mar 2003; Christian Birchinger <joker@gentoo.org> squid-2.5.1-r2.ebuild: + Added sparc stable keyword + + 31 Jan 2003; Nick Hadaway <raker@gentoo.org> squid-2.5.1-r2.ebuild, + files/digest-squid-2.5.1-r2 : + Added logic so if sasl2 is installed, squid uses it. A couple + of sed statements are included to adjust incompatible code. + + 14 Dec 2002; Donny Davies <woodchip@gentoo.org> : #8738. + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*squid-2.5.1-r1 (19 Nov 2002) + + 19 Nov 2002; Donny Davies <woodchip@gentoo.org> : Fix for #10865. + +*squid-2.5.1 (07 Nov 2002) + + 07 Sep 2002; Donny Davies <woodchip@gentoo.org> : Chase latest release. + Major patch cleanup. Added USE ssl and sasl support. Fixed KEYWORDS. + Big authentication and helper modules reorganization. Make dealing with + the lame archive versioning scheme easier. Some general cleanups. + + 15 Sep 2002; Maik Schreiber <blizzy@gentoo.org> files/squid.rc6 : Removed + hard dependency on /var/cache/squid. + +*squid-2.4.7 (12 Jul 2002) + + 12 Jul 2002; Bruce A. Locke <blocke@shivan.org> : Version bump and added KEYWORDS. + +*squid-2.4.6-r1 (4 May 2002) + + 4 May 2002; Donny Davies <woodchip@gentoo.org> : Added LICENSE, SLOT, $Headers, + pam_stack aware pam.d/ file. + +*squid-2.4.6 (20 Mar 2002) + + 20 Mar 2002; Donny Davies <woodchip@gentoo.org> : Be sure to upgrade! This + version fixes some security glitches in older squids! Updated to latest available + release; fixed permissions on /usr/lib/squid/*_auth programs, made the initscript + stop() function more robust, grabbed Debian's latest patch which includes tweaking + SQUID_MAXFD (works this time ;) plus other fixes. We now install the error pages + for all available languages, defaulting to English. Simply change the errors symlink + in /etc/squid to whichever you prefer. Changed the cache location to /var/cache/squid; + sorry if this bothers anybody but it fits better here and matches /etc/passwd + properly now. If you're upgrading you could make /var/cache/squid a symlink to + /var/spool/squid, or move the subdirectories manually. Heads up :) + Changed some ./configure options; enabled cache-digests, disabled the pinger + and added two more auth-modules. Added ability to compile without debugging. + Removed the stale config file and the old rc5 initscript. Also removed the older + ebuilds; they had numerous bugs. Added a pam_stack aware pam config, for future + deployment. + + 8 Feb 2002; Donny Davies <woodchip@gentoo.org> files/squid.rc6 : + Squid can often take a long time to shutdown. Tried to make things a little more + friendly in that situation. diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest new file mode 100644 index 000000000000..26b181358e86 --- /dev/null +++ b/net-proxy/squid/Manifest @@ -0,0 +1,17 @@ +MD5 3a2538e403f25c33ed40b387976acfb9 squid-2.5.8-r1.ebuild 6107 +MD5 1bd2eb184daf3062dcfd24296417609d squid-2.5.9.ebuild 6021 +MD5 f2881ab9b7a08ed59e6f62d772193dfb squid-2.5.8.ebuild 5893 +MD5 4bd9d89aff5d6512b6a9c032f26337fa ChangeLog 17055 +MD5 c2a21a50fca07975a99242ebc54c2f88 metadata.xml 330 +MD5 f57ebd3d0f0c0ff8fd5a2309b744ac48 squid-2.5.9-r3.ebuild 5914 +MD5 c2d230465ceefe887175cb8121d0fbc8 files/digest-squid-2.5.8-r1 156 +MD5 5b59fde3a3fdf6140efd79a82120b5e3 files/digest-squid-2.5.9-r3 156 +MD5 e4e44e57aa7d93849649c3ceb67a3a65 files/squid.confd 437 +MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid-r1.cron 133 +MD5 c3048f19a1c725e2c53f86640b752382 files/squid-2.5.8-gentoo.diff 17233 +MD5 bea1d2ef8cb2f1590f89bf37f28b9268 files/squid.pam 505 +MD5 20bbd41f88ddbcbe57380697c2675862 files/squid.rc6 1980 +MD5 5286e7e73ca5687381fa09ff41dccbd1 files/squid-logrotate 101 +MD5 89952d7cb51de1e4dbe9b5a1992aaf13 files/squid-2.5.9-gentoo.diff 17411 +MD5 b1028824f46381ebe326b5faf0e06d35 files/digest-squid-2.5.8 155 +MD5 7aec9f6b933e46cb25a72c56c0993e9e files/digest-squid-2.5.9 156 diff --git a/net-proxy/squid/files/digest-squid-2.5.8 b/net-proxy/squid/files/digest-squid-2.5.8 new file mode 100644 index 000000000000..ba76ca7b4637 --- /dev/null +++ b/net-proxy/squid/files/digest-squid-2.5.8 @@ -0,0 +1,2 @@ +MD5 687db8c5f0fec3798dbc77f94340b185 squid-2.5.STABLE8.tar.bz2 1057299 +MD5 0b89a0dc22c34350fd2349f580433b53 squid-2.5.STABLE8-patches-20050215.tar.gz 4222 diff --git a/net-proxy/squid/files/digest-squid-2.5.8-r1 b/net-proxy/squid/files/digest-squid-2.5.8-r1 new file mode 100644 index 000000000000..512edad30fae --- /dev/null +++ b/net-proxy/squid/files/digest-squid-2.5.8-r1 @@ -0,0 +1,2 @@ +MD5 687db8c5f0fec3798dbc77f94340b185 squid-2.5.STABLE8.tar.bz2 1057299 +MD5 b33c4bc57348b5e2672b9781e5ccc3ce squid-2.5.STABLE8-patches-20050223.tar.gz 20076 diff --git a/net-proxy/squid/files/digest-squid-2.5.9 b/net-proxy/squid/files/digest-squid-2.5.9 new file mode 100644 index 000000000000..43eeb55a79bf --- /dev/null +++ b/net-proxy/squid/files/digest-squid-2.5.9 @@ -0,0 +1,2 @@ +MD5 5a34a303dcab8851c7ab20e24af69b61 squid-2.5.STABLE9.tar.bz2 1057776 +MD5 51a7419adc3f45cfdd735e4b2e5dcdb9 squid-2.5.STABLE9-patches-20050303.tar.gz 10519 diff --git a/net-proxy/squid/files/digest-squid-2.5.9-r3 b/net-proxy/squid/files/digest-squid-2.5.9-r3 new file mode 100644 index 000000000000..d6a39d660db8 --- /dev/null +++ b/net-proxy/squid/files/digest-squid-2.5.9-r3 @@ -0,0 +1,2 @@ +MD5 5a34a303dcab8851c7ab20e24af69b61 squid-2.5.STABLE9.tar.bz2 1057776 +MD5 a913900336d2c9007094bed423779d32 squid-2.5.STABLE9-patches-20050419.tar.gz 84235 diff --git a/net-proxy/squid/files/squid-2.5.8-gentoo.diff b/net-proxy/squid/files/squid-2.5.8-gentoo.diff new file mode 100644 index 000000000000..38baf525a555 --- /dev/null +++ b/net-proxy/squid/files/squid-2.5.8-gentoo.diff @@ -0,0 +1,453 @@ +diff -uNr squid-2.5.STABLE8.orig/errors/Makefile.in squid-2.5.STABLE8/errors/Makefile.in +--- squid-2.5.STABLE8.orig/errors/Makefile.in 2004-07-10 15:11:41.000000000 +0300 ++++ squid-2.5.STABLE8/errors/Makefile.in 2005-02-15 22:52:28.576794400 +0200 +@@ -118,7 +118,7 @@ + install_sh = @install_sh@ + makesnmplib = @makesnmplib@ + +-errordir = $(datadir)/errors ++errordir = $(libexecdir)/errors + + DEFAULT_ERROR_DIR = $(errordir) + +diff -uNr squid-2.5.STABLE8.orig/helpers/basic_auth/SMB/Makefile.in squid-2.5.STABLE8/helpers/basic_auth/SMB/Makefile.in +--- squid-2.5.STABLE8.orig/helpers/basic_auth/SMB/Makefile.in 2004-07-10 15:11:41.000000000 +0300 ++++ squid-2.5.STABLE8/helpers/basic_auth/SMB/Makefile.in 2005-02-15 22:52:28.576794400 +0200 +@@ -128,7 +128,7 @@ + makesnmplib = @makesnmplib@ + + SMB_AUTH_HELPER = smb_auth.sh +-SAMBAPREFIX = /usr/local/samba ++SAMBAPREFIX = /usr + SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) + + libexec_SCRIPTS = $(SMB_AUTH_HELPER) +diff -uNr squid-2.5.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.5.STABLE8/helpers/basic_auth/SMB/smb_auth.sh +--- squid-2.5.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-08 01:36:46.000000000 +0200 ++++ squid-2.5.STABLE8/helpers/basic_auth/SMB/smb_auth.sh 2005-02-15 22:52:28.577794248 +0200 +@@ -24,7 +24,7 @@ + read AUTHSHARE + read AUTHFILE + read SMBUSER +-read SMBPASS ++read -r SMBPASS + + # Find domain controller + echo "Domain name: $DOMAINNAME" +@@ -47,7 +47,7 @@ + addropt="" + fi + echo "Query address options: $addropt" +-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` ++dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` + echo "Domain controller IP address: $dcip" + [ -n "$dcip" ] || exit 1 + +diff -uNr squid-2.5.STABLE8.orig/icons/Makefile.in squid-2.5.STABLE8/icons/Makefile.in +--- squid-2.5.STABLE8.orig/icons/Makefile.in 2004-07-10 15:11:47.000000000 +0300 ++++ squid-2.5.STABLE8/icons/Makefile.in 2005-02-15 22:52:28.577794248 +0200 +@@ -146,7 +146,7 @@ + anthony-xpm.gif + + +-icondir = $(datadir)/icons ++icondir = $(libexecdir)/icons + icon_DATA = $(ICON1) $(ICON2) + EXTRA_DIST = $(ICON1) $(ICON2) icons.shar + DISTCLEANFILES = +diff -uNr squid-2.5.STABLE8.orig/snmplib/snmp_api.c squid-2.5.STABLE8/snmplib/snmp_api.c +--- squid-2.5.STABLE8.orig/snmplib/snmp_api.c 2002-02-13 03:43:43.000000000 +0200 ++++ squid-2.5.STABLE8/snmplib/snmp_api.c 2005-02-15 22:52:28.617788168 +0200 +@@ -121,7 +121,7 @@ + } + + /* +- * Parses the packet recieved on the input session, and places the data into ++ * Parses the packet received on the input session, and places the data into + * the input pdu. length is the length of the input packet. If any errors + * are encountered, NULL is returned. If not, the community is. + */ +diff -uNr squid-2.5.STABLE8.orig/src/Makefile.in squid-2.5.STABLE8/src/Makefile.in +--- squid-2.5.STABLE8.orig/src/Makefile.in 2004-09-26 00:37:59.000000000 +0300 ++++ squid-2.5.STABLE8/src/Makefile.in 2005-02-15 22:52:28.579793944 +0200 +@@ -376,18 +376,18 @@ + DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf + DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf + DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` +-DEFAULT_LOG_PREFIX = $(localstatedir)/logs +-DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log +-DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log +-DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log +-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid +-DEFAULT_SWAP_DIR = $(localstatedir)/cache ++DEFAULT_LOG_PREFIX = $(localstatedir)/log ++DEFAULT_CACHE_LOG = $(localstatedir)/log/squid/cache.log ++DEFAULT_ACCESS_LOG = $(localstatedir)/log/squid/access.log ++DEFAULT_STORE_LOG = $(localstatedir)/log/squid/store.log ++DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid ++DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid + DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` +-DEFAULT_ICON_DIR = $(datadir)/icons +-DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@ +-DEFAULT_MIB_PATH = $(datadir)/mib.txt ++DEFAULT_ICON_DIR = $(libexecdir)/icons ++DEFAULT_ERROR_DIR = $(sysconfdir)/errors ++DEFAULT_MIB_PATH = $(libexecdir)/mib.txt + + DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" + +@@ -838,12 +838,12 @@ + uninstall-info-am: + install-dataDATA: $(data_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(datadir) ++ $(mkinstalldirs) $(DESTDIR)$(libexecdir) + @list='$(data_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \ +- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \ ++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f"; \ ++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f; \ + done + + uninstall-dataDATA: +diff -uNr squid-2.5.STABLE8.orig/src/auth/digest/auth_digest.c squid-2.5.STABLE8/src/auth/digest/auth_digest.c +--- squid-2.5.STABLE8.orig/src/auth/digest/auth_digest.c 2004-08-29 01:31:15.000000000 +0300 ++++ squid-2.5.STABLE8/src/auth/digest/auth_digest.c 2005-02-15 22:52:28.618788016 +0200 +@@ -1252,7 +1252,7 @@ + nonce = authenticateDigestNonceFindNonce(digest_request->nonceb64); + if (!nonce) { + /* we couldn't find a matching nonce! */ +- debug(29, 4) ("authenticateDigestDecode: Unexpected or invalid nonce recieved\n"); ++ debug(29, 4) ("authenticateDigestDecode: Unexpected or invalid nonce received\n"); + authDigestLogUsername(auth_user_request, username); + + /* we don't need the scheme specific data anymore */ +@@ -1266,8 +1266,8 @@ + /* check the qop is what we expected. Note that for compatability with + * RFC 2069 we should support a missing qop. Tough. */ + if (!digest_request->qop || strcmp(digest_request->qop, QOP_AUTH)) { +- /* we recieved a qop option we didn't send */ +- debug(29, 4) ("authenticateDigestDecode: Invalid qop option recieved\n"); ++ /* we received a qop option we didn't send */ ++ debug(29, 4) ("authenticateDigestDecode: Invalid qop option received\n"); + authDigestLogUsername(auth_user_request, username); + + /* we don't need the scheme specific data anymore */ +diff -uNr squid-2.5.STABLE8.orig/src/auth/ntlm/auth_ntlm.c squid-2.5.STABLE8/src/auth/ntlm/auth_ntlm.c +--- squid-2.5.STABLE8.orig/src/auth/ntlm/auth_ntlm.c 2005-02-04 01:22:12.000000000 +0200 ++++ squid-2.5.STABLE8/src/auth/ntlm/auth_ntlm.c 2005-02-15 22:52:28.620787712 +0200 +@@ -950,7 +950,7 @@ + } + switch (ntlm_request->auth_state) { + case AUTHENTICATE_STATE_NONE: +- /* we've recieved a negotiate request. pass to a helper */ ++ /* we've received a negotiate request. pass to a helper */ + debug(29, 9) ("authenticateNTLMAuthenticateUser: auth state ntlm none. %s\n", proxy_auth); + ntlm_request->auth_state = AUTHENTICATE_STATE_NEGOTIATE; + ntlm_request->ntlmnegotiate = xstrdup(proxy_auth); +@@ -969,7 +969,7 @@ + return; + break; + case AUTHENTICATE_STATE_CHALLENGE: +- /* we should have recieved a NTLM challenge. pass it to the same ++ /* we should have received a NTLM challenge. pass it to the same + * helper process */ + debug(29, 9) ("authenticateNTLMAuthenticateUser: auth state challenge with header %s.\n", proxy_auth); + /* do a cache lookup here. If it matches it's a successful ntlm +diff -uNr squid-2.5.STABLE8.orig/src/cf.data.pre squid-2.5.STABLE8/src/cf.data.pre +--- squid-2.5.STABLE8.orig/src/cf.data.pre 2005-02-10 12:07:05.000000000 +0200 ++++ squid-2.5.STABLE8/src/cf.data.pre 2005-02-15 22:52:28.622787408 +0200 +@@ -156,12 +156,12 @@ + NAME: htcp_port + IFDEF: USE_HTCP + TYPE: ushort +-DEFAULT: 4827 ++DEFAULT: 0 + LOC: Config.Port.htcp + DOC_START + The port number where Squid sends and receives HTCP queries to +- and from neighbor caches. Default is 4827. To disable use +- "0". ++ and from neighbor caches. To turn it on you want to set it to ++ 4827. By default it is set to "0" (disabled). + DOC_END + + +@@ -2100,7 +2100,7 @@ + # acls. + + acl aclname rep_mime_type mime-type1 ... +- # regex match against the mime type of the reply recieved by ++ # regex match against the mime type of the reply received by + # squid. Can be used to detect file download or some + # types HTTP tunelling requests. + # NOTE: This has no effect in http_access rules. It only has +@@ -2140,6 +2140,8 @@ + acl Safe_ports port 488 # gss-http + acl Safe_ports port 591 # filemaker + acl Safe_ports port 777 # multiling http ++acl Safe_ports port 901 # SWAT ++acl purge method PURGE + acl CONNECT method CONNECT + NOCOMMENT_END + DOC_END +@@ -2173,6 +2175,9 @@ + # Only allow cachemgr access from localhost + http_access allow manager localhost + http_access deny manager ++# Only allow purge requests from localhost ++http_access allow purge localhost ++http_access deny purge + # Deny requests to unknown ports + http_access deny !Safe_ports + # Deny CONNECT to other than SSL ports +@@ -2191,6 +2196,9 @@ + #acl our_networks src 192.168.1.0/24 192.168.2.0/24 + #http_access allow our_networks + ++# Allow the localhost to have access by default ++http_access allow localhost ++ + # And finally deny all other access to this proxy + http_access deny all + NOCOMMENT_END +@@ -2388,7 +2396,7 @@ + DOC_START + This option specifies the maximum size of a reply body in bytes. + It can be used to prevent users from downloading very large files, +- such as MP3's and movies. When the reply headers are recieved, ++ such as MP3's and movies. When the reply headers are received, + the reply_body_max_size lines are processed, and the first line with + a result of "allow" is used as the maximum body size for this reply. + This size is checked twice. First when we get the reply headers, +@@ -2415,7 +2423,7 @@ + + NAME: cache_mgr + TYPE: string +-DEFAULT: webmaster ++DEFAULT: root + LOC: Config.adminEmail + DOC_START + Email-address of local cache manager who will receive +@@ -2425,7 +2433,7 @@ + + NAME: cache_effective_user + TYPE: string +-DEFAULT: nobody ++DEFAULT: squid + LOC: Config.effectiveUser + DOC_START + If you start Squid as root, it will change its effective/real +@@ -2440,7 +2448,7 @@ + + NAME: cache_effective_group + TYPE: string +-DEFAULT: none ++DEFAULT: squid + LOC: Config.effectiveGroup + DOC_START + If you want Squid to run with a specific GID regardless of +@@ -2592,7 +2600,7 @@ + DOC_START + If you are running Squid as an accelerator and have a single backend + server set this to on. This causes Squid to forward the request +- to this server, regardles of what any redirectors or Host headers ++ to this server, regardless of what any redirectors or Host headers + say. + + Leave this at off if you have multiple backend servers, and use a +@@ -3229,7 +3237,11 @@ + If you wish to create your own versions of the default + (English) error files, either to customize them to suit your + language or company copy the template English files to another +- directory and point this tag at them. ++ directory where the error files are read from. ++ /usr/lib/squid/errors contains sets of error files ++ in different languages. The default error directory ++ is /etc/squid/errors, which is a link to one of these ++ error sets. + DOC_END + + NAME: maximum_single_addr_tries +@@ -3252,12 +3264,15 @@ + NAME: snmp_port + TYPE: ushort + LOC: Config.Port.snmp +-DEFAULT: 3401 ++DEFAULT: 0 + IFDEF: SQUID_SNMP + DOC_START + Squid can now serve statistics and status information via SNMP. + By default it listens to port 3401 on the machine. If you don't + wish to use SNMP, set this to "0". ++ ++ Note: on Gentoo Linux, the default is zero - you need to ++ set it to 3401 to enable it. + DOC_END + + NAME: snmp_access +diff -uNr squid-2.5.STABLE8.orig/src/debug.c squid-2.5.STABLE8/src/debug.c +--- squid-2.5.STABLE8.orig/src/debug.c 2001-12-17 20:01:54.000000000 +0200 ++++ squid-2.5.STABLE8/src/debug.c 2005-02-15 22:52:28.580793792 +0200 +@@ -200,9 +200,9 @@ + } + debugOpenLog(logfile); + +-#if HAVE_SYSLOG && defined(LOG_LOCAL4) ++#if HAVE_SYSLOG + if (opt_syslog_enable) +- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); + #endif /* HAVE_SYSLOG */ + + } +diff -uNr squid-2.5.STABLE8.orig/src/defines.h squid-2.5.STABLE8/src/defines.h +--- squid-2.5.STABLE8.orig/src/defines.h 2002-08-08 23:17:39.000000000 +0300 ++++ squid-2.5.STABLE8/src/defines.h 2005-02-15 22:52:28.580793792 +0200 +@@ -219,7 +219,7 @@ + + /* were to look for errors if config path fails */ + #ifndef DEFAULT_SQUID_ERROR_DIR +-#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors" ++#define DEFAULT_SQUID_ERROR_DIR "/usr/lib/squid/errors/English" + #endif + + /* gb_type operations */ +diff -uNr squid-2.5.STABLE8.orig/src/delay_pools.c squid-2.5.STABLE8/src/delay_pools.c +--- squid-2.5.STABLE8.orig/src/delay_pools.c 2003-06-19 02:53:35.000000000 +0300 ++++ squid-2.5.STABLE8/src/delay_pools.c 2005-02-15 22:52:28.624787104 +0200 +@@ -609,7 +609,7 @@ + } + + /* +- * this records actual bytes recieved. always recorded, even if the ++ * this records actual bytes received. always recorded, even if the + * class is disabled - it's more efficient to just do it than to do all + * the checks. + */ +diff -uNr squid-2.5.STABLE8.orig/src/main.c squid-2.5.STABLE8/src/main.c +--- squid-2.5.STABLE8.orig/src/main.c 2004-12-28 14:54:35.000000000 +0200 ++++ squid-2.5.STABLE8/src/main.c 2005-02-15 22:52:28.613788776 +0200 +@@ -326,6 +326,21 @@ + asnFreeMemory(); + } + ++#if USE_UNLINKD ++static int ++needUnlinkd(void) ++{ ++ int i; ++ int r = 0; ++ for (i = 0; i < Config.cacheSwap.n_configured; i++) { ++ if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 || ++ strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0) ++ r++; ++ } ++ return r; ++} ++#endif ++ + static void + mainReconfigure(void) + { +@@ -351,6 +366,7 @@ + redirectShutdown(); + authenticateShutdown(); + externalAclShutdown(); ++ unlinkdClose(); + storeDirCloseSwapLogs(); + storeLogClose(); + accessLogClose(); +@@ -381,6 +397,9 @@ + #if USE_WCCP + wccpInit(); + #endif ++#if USE_UNLINKD ++ if (needUnlinkd()) unlinkdInit(); ++#endif + serverConnectionsOpen(); + if (theOutIcpConnection >= 0) { + if (!Config2.Accel.on || Config.onoff.accel_with_proxy) +@@ -524,7 +543,7 @@ + + if (!configured_once) { + #if USE_UNLINKD +- unlinkdInit(); ++ if (needUnlinkd()) unlinkdInit(); + #endif + urlInitialize(); + cachemgrInit(); +@@ -857,7 +876,7 @@ + int nullfd; + if (*(argv[0]) == '(') + return; +- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); + if ((pid = fork()) < 0) + syslog(LOG_ALERT, "fork failed: %s", xstrerror()); + else if (pid > 0) +@@ -891,14 +910,14 @@ + mainStartScript(argv[0]); + if ((pid = fork()) == 0) { + /* child */ +- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); + prog = xstrdup(argv[0]); + argv[0] = xstrdup("(squid)"); + execvp(prog, argv); + syslog(LOG_ALERT, "execvp failed: %s", xstrerror()); + } + /* parent */ +- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); + syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); + time(&start); + squid_signal(SIGINT, SIG_IGN, SA_RESTART); +diff -uNr squid-2.5.STABLE8.orig/src/mib.txt squid-2.5.STABLE8/src/mib.txt +--- squid-2.5.STABLE8.orig/src/mib.txt 2004-06-01 01:39:00.000000000 +0300 ++++ squid-2.5.STABLE8/src/mib.txt 2005-02-15 22:52:28.623787256 +0200 +@@ -290,7 +290,7 @@ + MAX-ACCESS read-only + STATUS current + DESCRIPTION +- " Number of HTTP KB's recieved " ++ " Number of HTTP KB's received " + ::= { cacheProtoAggregateStats 4 } + + cacheHttpOutKb OBJECT-TYPE +@@ -330,7 +330,7 @@ + MAX-ACCESS read-only + STATUS current + DESCRIPTION +- " Number of ICP KB's recieved " ++ " Number of ICP KB's received " + ::= { cacheProtoAggregateStats 9 } + + cacheServerRequests OBJECT-TYPE +@@ -354,7 +354,7 @@ + MAX-ACCESS read-only + STATUS current + DESCRIPTION +- " KB's of traffic recieved from servers " ++ " KB's of traffic received from servers " + ::= { cacheProtoAggregateStats 12 } + + cacheServerOutKb OBJECT-TYPE +diff -uNr squid-2.5.STABLE8.orig/src/url.c squid-2.5.STABLE8/src/url.c +--- squid-2.5.STABLE8.orig/src/url.c 2003-01-18 16:16:49.000000000 +0200 ++++ squid-2.5.STABLE8/src/url.c 2005-02-15 22:52:28.614788624 +0200 +@@ -312,8 +312,8 @@ + return NULL; + } + #endif +- if (Config.appendDomain && !strchr(host, '.')) +- strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN); ++ if (Config.appendDomain && !strchr(host, '.') && strcasecmp(host, "localhost") != 0) ++ strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN); + /* remove trailing dots from hostnames */ + while ((l = strlen(host)) > 0 && host[--l] == '.') + host[l] = '\0'; diff --git a/net-proxy/squid/files/squid-2.5.9-gentoo.diff b/net-proxy/squid/files/squid-2.5.9-gentoo.diff new file mode 100644 index 000000000000..63e488be2173 --- /dev/null +++ b/net-proxy/squid/files/squid-2.5.9-gentoo.diff @@ -0,0 +1,463 @@ +diff -Nru squid-2.5.STABLE9.orig/errors/Makefile.in squid-2.5.STABLE9/errors/Makefile.in +--- squid-2.5.STABLE9.orig/errors/Makefile.in 2004-07-10 15:11:41.000000000 +0300 ++++ squid-2.5.STABLE9/errors/Makefile.in 2005-03-03 20:19:24.874936344 +0200 +@@ -118,7 +118,7 @@ + install_sh = @install_sh@ + makesnmplib = @makesnmplib@ + +-errordir = $(datadir)/errors ++errordir = $(libexecdir)/errors + + DEFAULT_ERROR_DIR = $(errordir) + +diff -Nru squid-2.5.STABLE9.orig/helpers/basic_auth/SMB/Makefile.in squid-2.5.STABLE9/helpers/basic_auth/SMB/Makefile.in +--- squid-2.5.STABLE9.orig/helpers/basic_auth/SMB/Makefile.in 2004-07-10 15:11:41.000000000 +0300 ++++ squid-2.5.STABLE9/helpers/basic_auth/SMB/Makefile.in 2005-03-03 20:19:24.875936192 +0200 +@@ -128,7 +128,7 @@ + makesnmplib = @makesnmplib@ + + SMB_AUTH_HELPER = smb_auth.sh +-SAMBAPREFIX = /usr/local/samba ++SAMBAPREFIX = /usr + SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) + + libexec_SCRIPTS = $(SMB_AUTH_HELPER) +diff -Nru squid-2.5.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.5.STABLE9/helpers/basic_auth/SMB/smb_auth.sh +--- squid-2.5.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-08 01:36:46.000000000 +0200 ++++ squid-2.5.STABLE9/helpers/basic_auth/SMB/smb_auth.sh 2005-03-03 20:19:24.876936040 +0200 +@@ -24,7 +24,7 @@ + read AUTHSHARE + read AUTHFILE + read SMBUSER +-read SMBPASS ++read -r SMBPASS + + # Find domain controller + echo "Domain name: $DOMAINNAME" +@@ -47,7 +47,7 @@ + addropt="" + fi + echo "Query address options: $addropt" +-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` ++dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` + echo "Domain controller IP address: $dcip" + [ -n "$dcip" ] || exit 1 + +diff -Nru squid-2.5.STABLE9.orig/icons/Makefile.in squid-2.5.STABLE9/icons/Makefile.in +--- squid-2.5.STABLE9.orig/icons/Makefile.in 2004-07-10 15:11:47.000000000 +0300 ++++ squid-2.5.STABLE9/icons/Makefile.in 2005-03-03 20:19:24.876936040 +0200 +@@ -146,7 +146,7 @@ + anthony-xpm.gif + + +-icondir = $(datadir)/icons ++icondir = $(libexecdir)/icons + icon_DATA = $(ICON1) $(ICON2) + EXTRA_DIST = $(ICON1) $(ICON2) icons.shar + DISTCLEANFILES = +diff -Nru squid-2.5.STABLE9.orig/snmplib/snmp_api.c squid-2.5.STABLE9/snmplib/snmp_api.c +--- squid-2.5.STABLE9.orig/snmplib/snmp_api.c 2002-02-13 03:43:43.000000000 +0200 ++++ squid-2.5.STABLE9/snmplib/snmp_api.c 2005-03-03 20:19:24.877935888 +0200 +@@ -121,7 +121,7 @@ + } + + /* +- * Parses the packet recieved on the input session, and places the data into ++ * Parses the packet received on the input session, and places the data into + * the input pdu. length is the length of the input packet. If any errors + * are encountered, NULL is returned. If not, the community is. + */ +diff -Nru squid-2.5.STABLE9.orig/src/Makefile.in squid-2.5.STABLE9/src/Makefile.in +--- squid-2.5.STABLE9.orig/src/Makefile.in 2004-09-26 00:37:59.000000000 +0300 ++++ squid-2.5.STABLE9/src/Makefile.in 2005-03-03 20:19:24.878935736 +0200 +@@ -376,18 +376,18 @@ + DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf + DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf + DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` +-DEFAULT_LOG_PREFIX = $(localstatedir)/logs +-DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log +-DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log +-DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log +-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid +-DEFAULT_SWAP_DIR = $(localstatedir)/cache ++DEFAULT_LOG_PREFIX = $(localstatedir)/log ++DEFAULT_CACHE_LOG = $(localstatedir)/log/squid/cache.log ++DEFAULT_ACCESS_LOG = $(localstatedir)/log/squid/access.log ++DEFAULT_STORE_LOG = $(localstatedir)/log/squid/store.log ++DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid ++DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid + DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` +-DEFAULT_ICON_DIR = $(datadir)/icons +-DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@ +-DEFAULT_MIB_PATH = $(datadir)/mib.txt ++DEFAULT_ICON_DIR = $(libexecdir)/icons ++DEFAULT_ERROR_DIR = $(sysconfdir)/errors ++DEFAULT_MIB_PATH = $(libexecdir)/mib.txt + + DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" + +@@ -838,12 +838,12 @@ + uninstall-info-am: + install-dataDATA: $(data_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(datadir) ++ $(mkinstalldirs) $(DESTDIR)$(libexecdir) + @list='$(data_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \ +- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \ ++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f"; \ ++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f; \ + done + + uninstall-dataDATA: +diff -Nru squid-2.5.STABLE9.orig/src/auth/digest/auth_digest.c squid-2.5.STABLE9/src/auth/digest/auth_digest.c +--- squid-2.5.STABLE9.orig/src/auth/digest/auth_digest.c 2004-08-29 01:31:15.000000000 +0300 ++++ squid-2.5.STABLE9/src/auth/digest/auth_digest.c 2005-03-03 20:19:24.879935584 +0200 +@@ -1252,7 +1252,7 @@ + nonce = authenticateDigestNonceFindNonce(digest_request->nonceb64); + if (!nonce) { + /* we couldn't find a matching nonce! */ +- debug(29, 4) ("authenticateDigestDecode: Unexpected or invalid nonce recieved\n"); ++ debug(29, 4) ("authenticateDigestDecode: Unexpected or invalid nonce received\n"); + authDigestLogUsername(auth_user_request, username); + + /* we don't need the scheme specific data anymore */ +@@ -1266,8 +1266,8 @@ + /* check the qop is what we expected. Note that for compatability with + * RFC 2069 we should support a missing qop. Tough. */ + if (!digest_request->qop || strcmp(digest_request->qop, QOP_AUTH)) { +- /* we recieved a qop option we didn't send */ +- debug(29, 4) ("authenticateDigestDecode: Invalid qop option recieved\n"); ++ /* we received a qop option we didn't send */ ++ debug(29, 4) ("authenticateDigestDecode: Invalid qop option received\n"); + authDigestLogUsername(auth_user_request, username); + + /* we don't need the scheme specific data anymore */ +diff -Nru squid-2.5.STABLE9.orig/src/auth/ntlm/auth_ntlm.c squid-2.5.STABLE9/src/auth/ntlm/auth_ntlm.c +--- squid-2.5.STABLE9.orig/src/auth/ntlm/auth_ntlm.c 2005-02-04 01:22:12.000000000 +0200 ++++ squid-2.5.STABLE9/src/auth/ntlm/auth_ntlm.c 2005-03-03 20:19:24.880935432 +0200 +@@ -950,7 +950,7 @@ + } + switch (ntlm_request->auth_state) { + case AUTHENTICATE_STATE_NONE: +- /* we've recieved a negotiate request. pass to a helper */ ++ /* we've received a negotiate request. pass to a helper */ + debug(29, 9) ("authenticateNTLMAuthenticateUser: auth state ntlm none. %s\n", proxy_auth); + ntlm_request->auth_state = AUTHENTICATE_STATE_NEGOTIATE; + ntlm_request->ntlmnegotiate = xstrdup(proxy_auth); +@@ -969,7 +969,7 @@ + return; + break; + case AUTHENTICATE_STATE_CHALLENGE: +- /* we should have recieved a NTLM challenge. pass it to the same ++ /* we should have received a NTLM challenge. pass it to the same + * helper process */ + debug(29, 9) ("authenticateNTLMAuthenticateUser: auth state challenge with header %s.\n", proxy_auth); + /* do a cache lookup here. If it matches it's a successful ntlm +diff -Nru squid-2.5.STABLE9.orig/src/cf.data.pre squid-2.5.STABLE9/src/cf.data.pre +--- squid-2.5.STABLE9.orig/src/cf.data.pre 2005-02-23 02:06:34.000000000 +0200 ++++ squid-2.5.STABLE9/src/cf.data.pre 2005-03-03 20:19:24.883934976 +0200 +@@ -156,12 +156,12 @@ + NAME: htcp_port + IFDEF: USE_HTCP + TYPE: ushort +-DEFAULT: 4827 ++DEFAULT: 0 + LOC: Config.Port.htcp + DOC_START + The port number where Squid sends and receives HTCP queries to +- and from neighbor caches. Default is 4827. To disable use +- "0". ++ and from neighbor caches. To turn it on you want to set it to ++ 4827. By default it is set to "0" (disabled). + DOC_END + + +@@ -2100,7 +2100,7 @@ + # acls. + + acl aclname rep_mime_type mime-type1 ... +- # regex match against the mime type of the reply recieved by ++ # regex match against the mime type of the reply received by + # squid. Can be used to detect file download or some + # types HTTP tunelling requests. + # NOTE: This has no effect in http_access rules. It only has +@@ -2140,6 +2140,8 @@ + acl Safe_ports port 488 # gss-http + acl Safe_ports port 591 # filemaker + acl Safe_ports port 777 # multiling http ++acl Safe_ports port 901 # SWAT ++acl purge method PURGE + acl CONNECT method CONNECT + NOCOMMENT_END + DOC_END +@@ -2173,6 +2175,9 @@ + # Only allow cachemgr access from localhost + http_access allow manager localhost + http_access deny manager ++# Only allow purge requests from localhost ++http_access allow purge localhost ++http_access deny purge + # Deny requests to unknown ports + http_access deny !Safe_ports + # Deny CONNECT to other than SSL ports +@@ -2191,6 +2196,9 @@ + #acl our_networks src 192.168.1.0/24 192.168.2.0/24 + #http_access allow our_networks + ++# Allow the localhost to have access by default ++http_access allow localhost ++ + # And finally deny all other access to this proxy + http_access deny all + NOCOMMENT_END +@@ -2388,7 +2396,7 @@ + DOC_START + This option specifies the maximum size of a reply body in bytes. + It can be used to prevent users from downloading very large files, +- such as MP3's and movies. When the reply headers are recieved, ++ such as MP3's and movies. When the reply headers are received, + the reply_body_max_size lines are processed, and the first line with + a result of "allow" is used as the maximum body size for this reply. + This size is checked twice. First when we get the reply headers, +@@ -2415,7 +2423,7 @@ + + NAME: cache_mgr + TYPE: string +-DEFAULT: webmaster ++DEFAULT: root + LOC: Config.adminEmail + DOC_START + Email-address of local cache manager who will receive +@@ -2425,7 +2433,7 @@ + + NAME: cache_effective_user + TYPE: string +-DEFAULT: nobody ++DEFAULT: squid + LOC: Config.effectiveUser + DOC_START + If you start Squid as root, it will change its effective/real +@@ -2440,7 +2448,7 @@ + + NAME: cache_effective_group + TYPE: string +-DEFAULT: none ++DEFAULT: squid + LOC: Config.effectiveGroup + DOC_START + If you want Squid to run with a specific GID regardless of +@@ -2592,7 +2600,7 @@ + DOC_START + If you are running Squid as an accelerator and have a single backend + server set this to on. This causes Squid to forward the request +- to this server, regardles of what any redirectors or Host headers ++ to this server, regardless of what any redirectors or Host headers + say. + + Leave this at off if you have multiple backend servers, and use a +@@ -2918,6 +2918,9 @@ + If you disable this, it will appear as + + X-Forwarded-For: unknown ++NOCOMMENT_START ++forwarded_for off ++NOCOMMENT_END + DOC_END + + NAME: log_icp_queries +@@ -3229,7 +3237,11 @@ + If you wish to create your own versions of the default + (English) error files, either to customize them to suit your + language or company copy the template English files to another +- directory and point this tag at them. ++ directory where the error files are read from. ++ /usr/lib/squid/errors contains sets of error files ++ in different languages. The default error directory ++ is /etc/squid/errors, which is a link to one of these ++ error sets. + DOC_END + + NAME: maximum_single_addr_tries +@@ -3263,12 +3275,15 @@ + NAME: snmp_port + TYPE: ushort + LOC: Config.Port.snmp +-DEFAULT: 3401 ++DEFAULT: 0 + IFDEF: SQUID_SNMP + DOC_START + Squid can now serve statistics and status information via SNMP. + By default it listens to port 3401 on the machine. If you don't + wish to use SNMP, set this to "0". ++ ++ Note: on Gentoo Linux, the default is zero - you need to ++ set it to 3401 to enable it. + DOC_END + + NAME: snmp_access +diff -Nru squid-2.5.STABLE9.orig/src/debug.c squid-2.5.STABLE9/src/debug.c +--- squid-2.5.STABLE9.orig/src/debug.c 2001-12-17 20:01:54.000000000 +0200 ++++ squid-2.5.STABLE9/src/debug.c 2005-03-03 20:19:24.884934824 +0200 +@@ -200,9 +200,9 @@ + } + debugOpenLog(logfile); + +-#if HAVE_SYSLOG && defined(LOG_LOCAL4) ++#if HAVE_SYSLOG + if (opt_syslog_enable) +- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); + #endif /* HAVE_SYSLOG */ + + } +diff -Nru squid-2.5.STABLE9.orig/src/defines.h squid-2.5.STABLE9/src/defines.h +--- squid-2.5.STABLE9.orig/src/defines.h 2002-08-08 23:17:39.000000000 +0300 ++++ squid-2.5.STABLE9/src/defines.h 2005-03-03 20:19:24.884934824 +0200 +@@ -219,7 +219,7 @@ + + /* were to look for errors if config path fails */ + #ifndef DEFAULT_SQUID_ERROR_DIR +-#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors" ++#define DEFAULT_SQUID_ERROR_DIR "/usr/lib/squid/errors/English" + #endif + + /* gb_type operations */ +diff -Nru squid-2.5.STABLE9.orig/src/delay_pools.c squid-2.5.STABLE9/src/delay_pools.c +--- squid-2.5.STABLE9.orig/src/delay_pools.c 2003-06-19 02:53:35.000000000 +0300 ++++ squid-2.5.STABLE9/src/delay_pools.c 2005-03-03 20:19:24.885934672 +0200 +@@ -609,7 +609,7 @@ + } + + /* +- * this records actual bytes recieved. always recorded, even if the ++ * this records actual bytes received. always recorded, even if the + * class is disabled - it's more efficient to just do it than to do all + * the checks. + */ +diff -Nru squid-2.5.STABLE9.orig/src/main.c squid-2.5.STABLE9/src/main.c +--- squid-2.5.STABLE9.orig/src/main.c 2005-02-21 04:55:04.000000000 +0200 ++++ squid-2.5.STABLE9/src/main.c 2005-03-03 20:19:24.887934368 +0200 +@@ -326,6 +326,21 @@ + asnFreeMemory(); + } + ++#if USE_UNLINKD ++static int ++needUnlinkd(void) ++{ ++ int i; ++ int r = 0; ++ for (i = 0; i < Config.cacheSwap.n_configured; i++) { ++ if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 || ++ strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0) ++ r++; ++ } ++ return r; ++} ++#endif ++ + static void + mainReconfigure(void) + { +@@ -351,6 +366,7 @@ + redirectShutdown(); + authenticateShutdown(); + externalAclShutdown(); ++ unlinkdClose(); + storeDirCloseSwapLogs(); + storeLogClose(); + accessLogClose(); +@@ -381,6 +397,9 @@ + #if USE_WCCP + wccpInit(); + #endif ++#if USE_UNLINKD ++ if (needUnlinkd()) unlinkdInit(); ++#endif + serverConnectionsOpen(); + if (theOutIcpConnection >= 0) { + if (!Config2.Accel.on || Config.onoff.accel_with_proxy) +@@ -525,7 +544,7 @@ + + if (!configured_once) { + #if USE_UNLINKD +- unlinkdInit(); ++ if (needUnlinkd()) unlinkdInit(); + #endif + urlInitialize(); + cachemgrInit(); +@@ -860,7 +879,7 @@ + int nullfd; + if (*(argv[0]) == '(') + return; +- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); + if ((pid = fork()) < 0) + syslog(LOG_ALERT, "fork failed: %s", xstrerror()); + else if (pid > 0) +@@ -894,14 +913,14 @@ + mainStartScript(argv[0]); + if ((pid = fork()) == 0) { + /* child */ +- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); + prog = xstrdup(argv[0]); + argv[0] = xstrdup("(squid)"); + execvp(prog, argv); + syslog(LOG_ALERT, "execvp failed: %s", xstrerror()); + } + /* parent */ +- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); + syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); + time(&start); + squid_signal(SIGINT, SIG_IGN, SA_RESTART); +diff -Nru squid-2.5.STABLE9.orig/src/mib.txt squid-2.5.STABLE9/src/mib.txt +--- squid-2.5.STABLE9.orig/src/mib.txt 2004-06-01 01:39:00.000000000 +0300 ++++ squid-2.5.STABLE9/src/mib.txt 2005-03-03 20:19:24.887934368 +0200 +@@ -290,7 +290,7 @@ + MAX-ACCESS read-only + STATUS current + DESCRIPTION +- " Number of HTTP KB's recieved " ++ " Number of HTTP KB's received " + ::= { cacheProtoAggregateStats 4 } + + cacheHttpOutKb OBJECT-TYPE +@@ -330,7 +330,7 @@ + MAX-ACCESS read-only + STATUS current + DESCRIPTION +- " Number of ICP KB's recieved " ++ " Number of ICP KB's received " + ::= { cacheProtoAggregateStats 9 } + + cacheServerRequests OBJECT-TYPE +@@ -354,7 +354,7 @@ + MAX-ACCESS read-only + STATUS current + DESCRIPTION +- " KB's of traffic recieved from servers " ++ " KB's of traffic received from servers " + ::= { cacheProtoAggregateStats 12 } + + cacheServerOutKb OBJECT-TYPE +diff -Nru squid-2.5.STABLE9.orig/src/url.c squid-2.5.STABLE9/src/url.c +--- squid-2.5.STABLE9.orig/src/url.c 2003-01-18 16:16:49.000000000 +0200 ++++ squid-2.5.STABLE9/src/url.c 2005-03-03 20:19:24.888934216 +0200 +@@ -312,8 +312,8 @@ + return NULL; + } + #endif +- if (Config.appendDomain && !strchr(host, '.')) +- strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN); ++ if (Config.appendDomain && !strchr(host, '.') && strcasecmp(host, "localhost") != 0) ++ strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN); + /* remove trailing dots from hostnames */ + while ((l = strlen(host)) > 0 && host[--l] == '.') + host[l] = '\0'; diff --git a/net-proxy/squid/files/squid-logrotate b/net-proxy/squid/files/squid-logrotate new file mode 100644 index 000000000000..72486b016fbf --- /dev/null +++ b/net-proxy/squid/files/squid-logrotate @@ -0,0 +1,8 @@ +/var/log/squid/*.log { + copytruncate + compress + notifempty + missingok + sharedscripts +} + diff --git a/net-proxy/squid/files/squid-r1.cron b/net-proxy/squid/files/squid-r1.cron new file mode 100644 index 000000000000..02309459b0bb --- /dev/null +++ b/net-proxy/squid/files/squid-r1.cron @@ -0,0 +1,4 @@ +#!/bin/sh +test -e /var/run/squid.pid && \ +test -n "$(cat /var/run/squid.pid|xargs ps -p|grep squid)" && \ + /usr/sbin/squid -k rotate diff --git a/net-proxy/squid/files/squid.confd b/net-proxy/squid/files/squid.confd new file mode 100644 index 000000000000..75cebd0abab1 --- /dev/null +++ b/net-proxy/squid/files/squid.confd @@ -0,0 +1,11 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +# Config file for /etc/init.d/squid + +SQUID_OPTS="-DYC" + +# Max. number of filedescriptors to use. You can increase this on a busy +# cache to a maximum of (currently) 8192 filedescriptors. Default is 1024. +SQUID_MAXFD=1024 diff --git a/net-proxy/squid/files/squid.pam b/net-proxy/squid/files/squid.pam new file mode 100644 index 000000000000..3f634a3cfae0 --- /dev/null +++ b/net-proxy/squid/files/squid.pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.pam,v 1.1 2005/04/22 19:15:11 mrness Exp $ +auth required /lib/security/pam_stack.so service=system-auth +auth required /lib/security/pam_nologin.so +account required /lib/security/pam_stack.so service=system-auth +password required /lib/security/pam_stack.so service=system-auth +session required /lib/security/pam_stack.so service=system-auth +session required /lib/security/pam_limits.so diff --git a/net-proxy/squid/files/squid.rc6 b/net-proxy/squid/files/squid.rc6 new file mode 100644 index 000000000000..f97e6f94dc48 --- /dev/null +++ b/net-proxy/squid/files/squid.rc6 @@ -0,0 +1,89 @@ +#!/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/squid/files/squid.rc6,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +opts="${opts} reload" + +depend() { + need net +} + +# Try to increase the # of filedescriptors we can open. +maxfds() { + [ -n "$SQUID_MAXFD" ] || return + [ -f /proc/sys/fs/file-max ] || return 0 + [ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192 + global_file_max=`cat /proc/sys/fs/file-max` + minimal_file_max=$(($SQUID_MAXFD + 4096)) + if [ "$global_file_max" -lt $minimal_file_max ] + then + echo $minimal_file_max > /proc/sys/fs/file-max + fi + ulimit -n $SQUID_MAXFD +} + +checkconfig() { + maxfds + CACHE_SWAP=`sed -e 's/#.*//g' /etc/squid/squid.conf | \ + grep cache_dir | awk '{ print $3 }'` + [ -z "$CACHE_SWAP" ] && CACHE_SWAP=/var/cache/squid + umask 027 + for x in $CACHE_SWAP ; do + if [ ! -d $x/00 ] ; then + einfo "Initializing cache directory: $x" + cd $x + /usr/sbin/squid -z -F 2>/dev/null + if [ $? -ne 0 ] ; then + eerror "Error initializing: $x" + return 1 + fi + fi + done +} + +start() { + checkconfig || return 1 + ebegin "Starting squid" + start-stop-daemon --quiet --start --exec /usr/sbin/squid \ + --pidfile /var/run/squid.pid -- ${SQUID_OPTS} < /dev/null + sleep 1 + eend $? +} + +stop() { + ebegin "Stopping squid" + PID=`cat /var/run/squid.pid 2>/dev/null` + start-stop-daemon --stop --quiet --exec /usr/sbin/squid \ + --pidfile /var/run/squid.pid + # Now we have to wait until squid has _really_ stopped. + sleep 2 + if test -n "$PID" && kill -0 $PID 2>/dev/null + then + einfon "Waiting ." + cnt=0 + while kill -0 $PID 2>/dev/null + do + cnt=`expr $cnt + 1` + if [ $cnt -gt 60 ] + then + # Waited 120 seconds now. Fail. + eend 1 "Failed." + break + fi + sleep 2 + echo -n "." + done + echo -n "done." + eend 0 + else + eend 0 + fi +} + +reload() { + checkconfig || return 1 + ebegin "Reloading squid" + /usr/sbin/squid -k reconfigure + eend $? +} diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml new file mode 100644 index 000000000000..c6c33480dd2c --- /dev/null +++ b/net-proxy/squid/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<maintainer> + <email>cyfred@gentoo.org</email> + <name>Andrew Bevitt</name> +</maintainer> +<longdescription>A caching web proxy, with advanced features</longdescription> +</pkgmetadata> diff --git a/net-proxy/squid/squid-2.5.8-r1.ebuild b/net-proxy/squid/squid-2.5.8-r1.ebuild new file mode 100644 index 000000000000..906884ff6b84 --- /dev/null +++ b/net-proxy/squid/squid-2.5.8-r1.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.8-r1.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils toolchain-funcs + +#lame archive versioning scheme.. +S_PV=${PV%.*} +S_PL=${PV##*.} +S_PP=${PN}-${S_PV}.STABLE${S_PL} +PATCH_VERSION="20050223" + +DESCRIPTION="A caching web proxy, with advanced features" +HOMEPAGE="http://www.squid-cache.org/" + +S=${WORKDIR}/${S_PP} +SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2 + mirror://gentoo/squid-2.5.STABLE8-patches-${PATCH_VERSION}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips" +IUSE="pam ldap ssl sasl snmp debug uclibc selinux underscores logrotate" + +RDEPEND="virtual/libc + pam? ( >=sys-libs/pam-0.75 ) + ldap? ( >=net-nds/openldap-2.1.26 ) + ssl? ( >=dev-libs/openssl-0.9.6m ) + sasl? ( >=dev-libs/cyrus-sasl-1.5.27 ) + selinux? ( sec-policy/selinux-squid ) + !mips? ( logrotate? ( app-admin/logrotate ) )" +DEPEND="${RDEPEND} dev-lang/perl" + +src_unpack() { + unpack ${A} || die "unpack failed" + cd ${S} || die "dir ${S} not found" + + #do NOT just remove this patch. yes, it's here for a reason. + #woodchip@gentoo.org (07 Nov 2002) + patch -p1 <${FILESDIR}/squid-${PV}-gentoo.diff || die "failed to apply squid-{PV}-gentoo.diff" + + # Do bulk patching from squids bug fix list for stable 6 see #57081 + EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch + + #hmm #10865 + cd helpers/external_acl/ldap_group + cp Makefile.in Makefile.in.orig + sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \ + Makefile.in.orig > Makefile.in + + if ! use debug + then + cd ${S} + mv configure.in configure.in.orig + sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in + export WANT_AUTOCONF=2.1 + autoconf || die "autoconf failed" + fi +} + +src_compile() { + # Support for uclibc #61175 + if use uclibc; then + local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,winbind" + else + local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind" + fi + + use ldap && basic_modules="LDAP,${basic_modules}" + use pam && basic_modules="PAM,${basic_modules}" + use sasl && basic_modules="SASL,${basic_modules}" + # SASL 1 / 2 Supported Natively + + local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group" + use ldap && ext_helpers="ldap_group,${ext_helpers}" + + local myconf="" + use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp" + use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl" + + use amd64 && myconf="${myconf} --disable-internal-dns " + + if use underscores; then + ewarn "Enabling underscores in domain names will result in dns resolution" + ewarn "failure if your local DNS client (probably bind) is not compatible." + myconf="${myconf} --enable-underscores" + fi + + # Support for uclibc #61175 + if use uclibc; then + myconf="${myconf} --enable-storeio='ufs,diskd,aufs,null' " + myconf="${myconf} --disable-async-io " + else + myconf="${myconf} --enable-storeio='ufs,diskd,coss,aufs,null' " + myconf="${myconf} --enable-async-io " + fi + + export CC=$(tc-getCC) + + ./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --exec-prefix=/usr \ + --sbindir=/usr/sbin \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/lib/squid \ + \ + --enable-auth="basic,digest,ntlm" \ + --enable-removal-policies="lru,heap" \ + --enable-digest-auth-helpers="password" \ + --enable-basic-auth-helpers=${basic_modules} \ + --enable-external-acl-helpers=${ext_helpers} \ + --enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \ + --enable-linux-netfilter \ + --enable-ident-lookups \ + --enable-useragent-log \ + --enable-cache-digests \ + --enable-delay-pools \ + --enable-referer-log \ + --enable-truncate \ + --enable-arp-acl \ + --with-pthreads \ + --enable-htcp \ + --enable-carp \ + --enable-poll \ + --host=${CHOST} ${myconf} || die "bad ./configure" + #--enable-icmp + + mv include/autoconf.h include/autoconf.h.orig + sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \ + include/autoconf.h.orig > include/autoconf.h + +# if [ "${ARCH}" = "hppa" ] +# then +# mv include/autoconf.h include/autoconf.h.orig +# sed -e "s:^#define HAVE_MALLOPT 1:#undef HAVE_MALLOPT:" \ +# include/autoconf.h.orig > include/autoconf.h +# fi + + emake || die "compile problem" +} + +src_install() { + make DESTDIR=${D} install || die + + #--enable-icmp + #make -C src install-pinger libexecdir=${D}/usr/lib/squid || die + #chown root:squid ${D}/usr/lib/squid/pinger + #chmod 4750 ${D}/usr/lib/squid/pinger + + #need suid root for looking into /etc/shadow + chown root:squid ${D}/usr/lib/squid/ncsa_auth + chown root:squid ${D}/usr/lib/squid/pam_auth + chmod 4750 ${D}/usr/lib/squid/ncsa_auth + chmod 4750 ${D}/usr/lib/squid/pam_auth + + #some clean ups + rm -rf ${D}/var + mv ${D}/usr/bin/Run* ${D}/usr/lib/squid + + #simply switch this symlink to choose the desired language.. + dosym /usr/lib/squid/errors/English /etc/squid/errors + + dodoc CONTRIBUTORS COPYING COPYRIGHT CREDITS \ + ChangeLog QUICKSTART SPONSORS doc/*.txt \ + helpers/ntlm_auth/no_check/README.no_check_ntlm_auth + newdoc helpers/basic_auth/SMB/README README.auth_smb + dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html + newdoc helpers/basic_auth/LDAP/README README.auth_ldap + doman helpers/basic_auth/LDAP/*.8 + dodoc helpers/basic_auth/SASL/squid_sasl_auth* + + insinto /etc/pam.d + newins ${FILESDIR}/squid.pam squid + exeinto /etc/init.d + newexe ${FILESDIR}/squid.rc6 squid + insinto /etc/conf.d + newins ${FILESDIR}/squid.confd squid + if useq logrotate; then + insinto /etc/logrotate.d + newins ${FILESDIR}/squid-logrotate squid + else + exeinto /etc/cron.weekly + newexe ${FILESDIR}/squid-r1.cron squid.cron + fi +} + +pkg_postinst() { + # empty dirs.. + install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid + install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid + + echo + ewarn "Squid authentication helpers have been installed suid root" + ewarn "This allows shadow based authentication, see bug #52977 for more" + echo +} diff --git a/net-proxy/squid/squid-2.5.8.ebuild b/net-proxy/squid/squid-2.5.8.ebuild new file mode 100644 index 000000000000..9758cc23eb81 --- /dev/null +++ b/net-proxy/squid/squid-2.5.8.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.8.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +#lame archive versioning scheme.. +S_PV=${PV%.*} +S_PL=${PV##*.} +S_PP=${PN}-${S_PV}.STABLE${S_PL} +PATCH_VERSION="20050215" + +DESCRIPTION="A caching web proxy, with advanced features" +HOMEPAGE="http://www.squid-cache.org/" + +S=${WORKDIR}/${S_PP} +SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2 + mirror://gentoo/squid-2.5.STABLE8-patches-${PATCH_VERSION}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 mips" +IUSE="pam ldap ssl sasl snmp debug uclibc selinux underscores" + +RDEPEND="virtual/libc + pam? ( >=sys-libs/pam-0.75 ) + ldap? ( >=net-nds/openldap-2.1.26 ) + ssl? ( >=dev-libs/openssl-0.9.6m ) + sasl? ( >=dev-libs/cyrus-sasl-1.5.27 ) + selinux? ( sec-policy/selinux-squid )" +DEPEND="${RDEPEND} dev-lang/perl" + +src_unpack() { + unpack ${A} || die "unpack failed" + cd ${S} || die "dir ${S} not found" + + #do NOT just remove this patch. yes, it's here for a reason. + #woodchip@gentoo.org (07 Nov 2002) + patch -p1 <${FILESDIR}/squid-${PV}-gentoo.diff || die "failed to apply squid-{PV}-gentoo.diff" + + # Do bulk patching from squids bug fix list for stable 6 see #57081 + EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch + + #hmm #10865 + cd helpers/external_acl/ldap_group + cp Makefile.in Makefile.in.orig + sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \ + Makefile.in.orig > Makefile.in + + if ! use debug + then + cd ${S} + mv configure.in configure.in.orig + sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in + export WANT_AUTOCONF=2.1 + autoconf || die "autoconf failed" + fi +} + +src_compile() { + # Support for uclibc #61175 + if use uclibc; then + local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,winbind" + else + local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind" + fi + + use ldap && basic_modules="LDAP,${basic_modules}" + use pam && basic_modules="PAM,${basic_modules}" + use sasl && basic_modules="SASL,${basic_modules}" + # SASL 1 / 2 Supported Natively + + local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group" + use ldap && ext_helpers="ldap_group,${ext_helpers}" + + local myconf="" + use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp" + use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl" + + use amd64 && myconf="${myconf} --disable-internal-dns " + + if use underscores; then + ewarn "Enabling underscores in domain names will result in dns resolution" + ewarn "failure if your local DNS client (probably bind) is not compatible." + myconf="${myconf} --enable-underscores" + fi + + # Support for uclibc #61175 + if use uclibc; then + myconf="${myconf} --enable-storeio='ufs,diskd,aufs,null' " + myconf="${myconf} --disable-async-io " + else + myconf="${myconf} --enable-storeio='ufs,diskd,coss,aufs,null' " + myconf="${myconf} --enable-async-io " + fi + + ./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --exec-prefix=/usr \ + --sbindir=/usr/sbin \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/lib/squid \ + \ + --enable-auth="basic,digest,ntlm" \ + --enable-removal-policies="lru,heap" \ + --enable-digest-auth-helpers="password" \ + --enable-basic-auth-helpers=${basic_modules} \ + --enable-external-acl-helpers=${ext_helpers} \ + --enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \ + --enable-linux-netfilter \ + --enable-ident-lookups \ + --enable-useragent-log \ + --enable-cache-digests \ + --enable-delay-pools \ + --enable-referer-log \ + --enable-truncate \ + --enable-arp-acl \ + --with-pthreads \ + --enable-htcp \ + --enable-carp \ + --enable-poll \ + --host=${CHOST} ${myconf} || die "bad ./configure" + #--enable-icmp + + mv include/autoconf.h include/autoconf.h.orig + sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \ + include/autoconf.h.orig > include/autoconf.h + +# if [ "${ARCH}" = "hppa" ] +# then +# mv include/autoconf.h include/autoconf.h.orig +# sed -e "s:^#define HAVE_MALLOPT 1:#undef HAVE_MALLOPT:" \ +# include/autoconf.h.orig > include/autoconf.h +# fi + + emake || die "compile problem" +} + +src_install() { + make DESTDIR=${D} install || die + + #--enable-icmp + #make -C src install-pinger libexecdir=${D}/usr/lib/squid || die + #chown root:squid ${D}/usr/lib/squid/pinger + #chmod 4750 ${D}/usr/lib/squid/pinger + + #need suid root for looking into /etc/shadow + chown root:squid ${D}/usr/lib/squid/ncsa_auth + chown root:squid ${D}/usr/lib/squid/pam_auth + chmod 4750 ${D}/usr/lib/squid/ncsa_auth + chmod 4750 ${D}/usr/lib/squid/pam_auth + + #some clean ups + rm -rf ${D}/var + mv ${D}/usr/bin/Run* ${D}/usr/lib/squid + + #simply switch this symlink to choose the desired language.. + dosym /usr/lib/squid/errors/English /etc/squid/errors + + dodoc CONTRIBUTORS COPYING COPYRIGHT CREDITS \ + ChangeLog QUICKSTART SPONSORS doc/*.txt \ + helpers/ntlm_auth/no_check/README.no_check_ntlm_auth + newdoc helpers/basic_auth/SMB/README README.auth_smb + dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html + newdoc helpers/basic_auth/LDAP/README README.auth_ldap + doman helpers/basic_auth/LDAP/*.8 + dodoc helpers/basic_auth/SASL/squid_sasl_auth* + + insinto /etc/pam.d ; newins ${FILESDIR}/squid.pam squid + exeinto /etc/init.d ; newexe ${FILESDIR}/squid.rc6 squid + insinto /etc/conf.d ; newins ${FILESDIR}/squid.confd squid + exeinto /etc/cron.weekly ; newexe ${FILESDIR}/squid-r1.cron squid.cron +} + +pkg_postinst() { + # empty dirs.. + install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid + install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid + + echo + ewarn "Squid authentication helpers have been installed suid root" + ewarn "This allows shadow based authentication, see bug #52977 for more" + echo +} diff --git a/net-proxy/squid/squid-2.5.9-r3.ebuild b/net-proxy/squid/squid-2.5.9-r3.ebuild new file mode 100644 index 000000000000..e8a2456b0e02 --- /dev/null +++ b/net-proxy/squid/squid-2.5.9-r3.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.9-r3.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils toolchain-funcs + +#lame archive versioning scheme.. +S_PV=${PV%.*} +S_PL=${PV##*.} +S_PP=${PN}-${S_PV}.STABLE${S_PL} +PATCH_VERSION="20050419" + +DESCRIPTION="A caching web proxy, with advanced features" +HOMEPAGE="http://www.squid-cache.org/" + +S=${WORKDIR}/${S_PP} +SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2 + mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~mips" +IUSE="pam ldap ssl sasl snmp debug uclibc selinux underscores logrotate customlog" + +RDEPEND="virtual/libc + pam? ( >=sys-libs/pam-0.75 ) + ldap? ( >=net-nds/openldap-2.1.26 ) + ssl? ( >=dev-libs/openssl-0.9.6m ) + sasl? ( >=dev-libs/cyrus-sasl-1.5.27 ) + selinux? ( sec-policy/selinux-squid ) + !mips? ( logrotate? ( app-admin/logrotate ) )" +DEPEND="${RDEPEND} dev-lang/perl" + +src_unpack() { + unpack ${A} || die "unpack failed" + cd ${S} || die "dir ${S} not found" + + # Do bulk patching from squids bug fix list as well as our patches + useq customlog || rm ${WORKDIR}/patch/9*customlog* + EPATCH_SUFFIX="patch" + epatch ${WORKDIR}/patch + + #hmm #10865 + cd helpers/external_acl/ldap_group + cp Makefile.in Makefile.in.orig + sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \ + Makefile.in.orig > Makefile.in + + if ! useq debug ; then + cd ${S} + mv configure.in configure.in.orig + sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in + export WANT_AUTOCONF=2.1 + autoconf || die "autoconf failed" + fi +} + +src_compile() { + # Support for uclibc #61175 + if use uclibc; then + local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,winbind" + else + local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind" + fi + + use ldap && basic_modules="LDAP,${basic_modules}" + use pam && basic_modules="PAM,${basic_modules}" + use sasl && basic_modules="SASL,${basic_modules}" + # SASL 1 / 2 Supported Natively + + local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group" + use ldap && ext_helpers="ldap_group,${ext_helpers}" + + local myconf="" + use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp" + use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl" + + use amd64 && myconf="${myconf} --disable-internal-dns " + + if use underscores; then + ewarn "Enabling underscores in domain names will result in dns resolution" + ewarn "failure if your local DNS client (probably bind) is not compatible." + myconf="${myconf} --enable-underscores" + fi + + # Support for uclibc #61175 + if use uclibc; then + myconf="${myconf} --enable-storeio='ufs,diskd,aufs,null' " + myconf="${myconf} --disable-async-io " + else + myconf="${myconf} --enable-storeio='ufs,diskd,coss,aufs,null' " + myconf="${myconf} --enable-async-io " + fi + + export CC=$(tc-getCC) + + ./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --exec-prefix=/usr \ + --sbindir=/usr/sbin \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/lib/squid \ + \ + --enable-auth="basic,digest,ntlm" \ + --enable-removal-policies="lru,heap" \ + --enable-digest-auth-helpers="password" \ + --enable-basic-auth-helpers=${basic_modules} \ + --enable-external-acl-helpers=${ext_helpers} \ + --enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \ + --enable-linux-netfilter \ + --enable-ident-lookups \ + --enable-useragent-log \ + --enable-cache-digests \ + --enable-delay-pools \ + --enable-referer-log \ + --enable-truncate \ + --enable-arp-acl \ + --with-pthreads \ + --with-large-files \ + --enable-htcp \ + --enable-carp \ + --enable-poll \ + --host=${CHOST} ${myconf} || die "bad ./configure" + #--enable-icmp + + mv include/autoconf.h include/autoconf.h.orig + sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \ + include/autoconf.h.orig > include/autoconf.h + +# if [ "${ARCH}" = "hppa" ] +# then +# mv include/autoconf.h include/autoconf.h.orig +# sed -e "s:^#define HAVE_MALLOPT 1:#undef HAVE_MALLOPT:" \ +# include/autoconf.h.orig > include/autoconf.h +# fi + + emake || die "compile problem" +} + +src_install() { + make DESTDIR=${D} install || die + + #--enable-icmp + #make -C src install-pinger libexecdir=${D}/usr/lib/squid || die + #chown root:squid ${D}/usr/lib/squid/pinger + #chmod 4750 ${D}/usr/lib/squid/pinger + + #need suid root for looking into /etc/shadow + chown root:squid ${D}/usr/lib/squid/ncsa_auth + chown root:squid ${D}/usr/lib/squid/pam_auth + chmod 4750 ${D}/usr/lib/squid/ncsa_auth + chmod 4750 ${D}/usr/lib/squid/pam_auth + + #some clean ups + rm -rf ${D}/var + mv ${D}/usr/bin/Run* ${D}/usr/lib/squid + + #simply switch this symlink to choose the desired language.. + dosym /usr/lib/squid/errors/English /etc/squid/errors + + dodoc CONTRIBUTORS COPYING COPYRIGHT CREDITS \ + ChangeLog QUICKSTART SPONSORS doc/*.txt \ + helpers/ntlm_auth/no_check/README.no_check_ntlm_auth + newdoc helpers/basic_auth/SMB/README README.auth_smb + dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html + newdoc helpers/basic_auth/LDAP/README README.auth_ldap + doman helpers/basic_auth/LDAP/*.8 + dodoc helpers/basic_auth/SASL/squid_sasl_auth* + + insinto /etc/pam.d + newins ${FILESDIR}/squid.pam squid + exeinto /etc/init.d + newexe ${FILESDIR}/squid.rc6 squid + insinto /etc/conf.d + newins ${FILESDIR}/squid.confd squid + if useq logrotate; then + insinto /etc/logrotate.d + newins ${FILESDIR}/squid-logrotate squid + else + exeinto /etc/cron.weekly + newexe ${FILESDIR}/squid-r1.cron squid.cron + fi + + diropts -m0755 -o squid -g squid + dodir /var/cache/squid /var/log/squid +} + +pkg_postinst() { + echo + ewarn "Squid authentication helpers have been installed suid root" + ewarn "This allows shadow based authentication, see bug #52977 for more" + echo +} diff --git a/net-proxy/squid/squid-2.5.9.ebuild b/net-proxy/squid/squid-2.5.9.ebuild new file mode 100644 index 000000000000..bae4c030270c --- /dev/null +++ b/net-proxy/squid/squid-2.5.9.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.9.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils toolchain-funcs + +#lame archive versioning scheme.. +S_PV=${PV%.*} +S_PL=${PV##*.} +S_PP=${PN}-${S_PV}.STABLE${S_PL} +PATCH_VERSION="20050303" + +DESCRIPTION="A caching web proxy, with advanced features" +HOMEPAGE="http://www.squid-cache.org/" + +S=${WORKDIR}/${S_PP} +SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2 + mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 mips" +IUSE="pam ldap ssl sasl snmp debug uclibc selinux underscores logrotate" + +RDEPEND="virtual/libc + pam? ( >=sys-libs/pam-0.75 ) + ldap? ( >=net-nds/openldap-2.1.26 ) + ssl? ( >=dev-libs/openssl-0.9.6m ) + sasl? ( >=dev-libs/cyrus-sasl-1.5.27 ) + selinux? ( sec-policy/selinux-squid ) + !mips? ( logrotate? ( app-admin/logrotate ) )" +DEPEND="${RDEPEND} dev-lang/perl" + +src_unpack() { + unpack ${A} || die "unpack failed" + cd ${S} || die "dir ${S} not found" + + #do NOT just remove this patch. yes, it's here for a reason. + #woodchip@gentoo.org (07 Nov 2002) + patch -p1 <${FILESDIR}/squid-${PV}-gentoo.diff || die "failed to apply squid-{PV}-gentoo.diff" + + # Do bulk patching from squids bug fix list for stable 6 see #57081 + EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch + + #hmm #10865 + cd helpers/external_acl/ldap_group + cp Makefile.in Makefile.in.orig + sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \ + Makefile.in.orig > Makefile.in + + if ! use debug + then + cd ${S} + mv configure.in configure.in.orig + sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in + export WANT_AUTOCONF=2.1 + autoconf || die "autoconf failed" + fi +} + +src_compile() { + # Support for uclibc #61175 + if use uclibc; then + local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,winbind" + else + local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind" + fi + + use ldap && basic_modules="LDAP,${basic_modules}" + use pam && basic_modules="PAM,${basic_modules}" + use sasl && basic_modules="SASL,${basic_modules}" + # SASL 1 / 2 Supported Natively + + local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group" + use ldap && ext_helpers="ldap_group,${ext_helpers}" + + local myconf="" + use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp" + use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl" + + use amd64 && myconf="${myconf} --disable-internal-dns " + + if use underscores; then + ewarn "Enabling underscores in domain names will result in dns resolution" + ewarn "failure if your local DNS client (probably bind) is not compatible." + myconf="${myconf} --enable-underscores" + fi + + # Support for uclibc #61175 + if use uclibc; then + myconf="${myconf} --enable-storeio='ufs,diskd,aufs,null' " + myconf="${myconf} --disable-async-io " + else + myconf="${myconf} --enable-storeio='ufs,diskd,coss,aufs,null' " + myconf="${myconf} --enable-async-io " + fi + + export CC=$(tc-getCC) + + ./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --exec-prefix=/usr \ + --sbindir=/usr/sbin \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/lib/squid \ + \ + --enable-auth="basic,digest,ntlm" \ + --enable-removal-policies="lru,heap" \ + --enable-digest-auth-helpers="password" \ + --enable-basic-auth-helpers=${basic_modules} \ + --enable-external-acl-helpers=${ext_helpers} \ + --enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \ + --enable-linux-netfilter \ + --enable-ident-lookups \ + --enable-useragent-log \ + --enable-cache-digests \ + --enable-delay-pools \ + --enable-referer-log \ + --enable-truncate \ + --enable-arp-acl \ + --with-pthreads \ + --enable-htcp \ + --enable-carp \ + --enable-poll \ + --host=${CHOST} ${myconf} || die "bad ./configure" + #--enable-icmp + + mv include/autoconf.h include/autoconf.h.orig + sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \ + include/autoconf.h.orig > include/autoconf.h + +# if [ "${ARCH}" = "hppa" ] +# then +# mv include/autoconf.h include/autoconf.h.orig +# sed -e "s:^#define HAVE_MALLOPT 1:#undef HAVE_MALLOPT:" \ +# include/autoconf.h.orig > include/autoconf.h +# fi + + emake || die "compile problem" +} + +src_install() { + make DESTDIR=${D} install || die + + #--enable-icmp + #make -C src install-pinger libexecdir=${D}/usr/lib/squid || die + #chown root:squid ${D}/usr/lib/squid/pinger + #chmod 4750 ${D}/usr/lib/squid/pinger + + #need suid root for looking into /etc/shadow + chown root:squid ${D}/usr/lib/squid/ncsa_auth + chown root:squid ${D}/usr/lib/squid/pam_auth + chmod 4750 ${D}/usr/lib/squid/ncsa_auth + chmod 4750 ${D}/usr/lib/squid/pam_auth + + #some clean ups + rm -rf ${D}/var + mv ${D}/usr/bin/Run* ${D}/usr/lib/squid + + #simply switch this symlink to choose the desired language.. + dosym /usr/lib/squid/errors/English /etc/squid/errors + + dodoc CONTRIBUTORS COPYING COPYRIGHT CREDITS \ + ChangeLog QUICKSTART SPONSORS doc/*.txt \ + helpers/ntlm_auth/no_check/README.no_check_ntlm_auth + newdoc helpers/basic_auth/SMB/README README.auth_smb + dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html + newdoc helpers/basic_auth/LDAP/README README.auth_ldap + doman helpers/basic_auth/LDAP/*.8 + dodoc helpers/basic_auth/SASL/squid_sasl_auth* + + insinto /etc/pam.d + newins ${FILESDIR}/squid.pam squid + exeinto /etc/init.d + newexe ${FILESDIR}/squid.rc6 squid + insinto /etc/conf.d + newins ${FILESDIR}/squid.confd squid + if useq logrotate; then + insinto /etc/logrotate.d + newins ${FILESDIR}/squid-logrotate squid + else + exeinto /etc/cron.weekly + newexe ${FILESDIR}/squid-r1.cron squid.cron + fi + + diropts -m0755 -o squid -g squid + dodir /var/cache/squid /var/log/squid +} + +pkg_postinst() { + echo + ewarn "Squid authentication helpers have been installed suid root" + ewarn "This allows shadow based authentication, see bug #52977 for more" + echo +} diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog new file mode 100644 index 000000000000..2ce3ab626292 --- /dev/null +++ b/net-proxy/squidguard/ChangeLog @@ -0,0 +1,73 @@ +# ChangeLog for www-proxy/squidguard +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + + 07 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> + squidguard-1.2.0-r1.ebuild: + Marked ~amd64, closes bug 87088. + + 07 Mar 2005; Markus Rothe <corsair@gentoo.org> squidguard-1.2.0-r1.ebuild: + Stable on ppc64 + + 26 Jan 2005; Markus Rothe <corsair@gentoo.org> squidguard-1.2.0-r1.ebuild: + Added ~ppc64 to KEYWORDS; bug #79564 + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + squidguard-1.2.0-r1.ebuild: + Masked squidguard-1.2.0-r1.ebuild stable for ppc + + 31 Aug 2004; David Holm <dholm@gentoo.org> squidguard-1.2.0-r1.ebuild: + Added to ~ppc. + + 26 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; + +files/squidguard-1.2.0-db42.patch, squidguard-1.2.0-r1.ebuild: + Adding db4.2 support, see bug #61578 + + 16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squidguard-1.2.0-r1.ebuild: + Changing net-www/squid to www-proxy/squid in depends + +*squidguard-1.2.0-r1 (15 Aug 2004) + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml, + +files/blockedsites, +files/squidGuard.conf.blocksites, + +files/squidGuard.conf.minimal, +files/squidguard-1.2.0-db4.patch, + +files/squidguard-1.2.0-db41.patch, +squidguard-1.2.0-r1.ebuild: + Moved from net-www/squidguard to www-proxy/squidguard. + + 15 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; + +files/squidguard-1.2.0-db41.patch, squidguard-1.2.0-r1.ebuild, + -squidguard-1.2.0.ebuild: + Adding support for DB 4.1, closing bugs #34154 and #44546; removing old + version. + + 23 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; +metadata.xml: + Adding metadata.xml + + 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> squidguard-1.2.0-r1.ebuild: + Add inherit eutils + + 20 Sep 2003; Todd Sunderlin <todd@gentoo.org> squidguard-1.2.0.ebuild: + marked unstable for sparc + +*squidguard-1.2.0-r1 (04 Aug 2003) + + 04 Aug 2003; Martin Holzer <mholzer@gentoo.org> squidguard-1.2.0-r1.ebuild: + Adding config option. Submitted by Maik Schreiber <blizzy@blizzy.de> in #25516. + + 28 May 2003; Paul de Vrieze <pauldv@gentoo.org> squidguard-1.2.0.ebuild: + Fix squidguard to properly recognize db4's versioned symbols. + +*squidguard-1.2.0 (23 Oct 2002) + + 13 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest, + squidguard-1.2.0.ebuild: + Corrected Homepage. Closes #19255. + + 23 Oct 2002; Maik Schreiber <blizzy@gentoo.org> : Initial import. ebuild done + by myself. diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest new file mode 100644 index 000000000000..6d2ca8bc73bb --- /dev/null +++ b/net-proxy/squidguard/Manifest @@ -0,0 +1,10 @@ +MD5 ff6ae5ac78a0ad3f3ebabc066d8bca6f squidguard-1.2.0-r1.ebuild 1944 +MD5 133d522b708b84898bd2316c42b85047 ChangeLog 2703 +MD5 6910c65b0c4ea4edfa1c7e642b16ef97 metadata.xml 353 +MD5 127270fbe0d0bfbc141ffaf56313f3e6 files/blockedsites 8 +MD5 0c3ba4835c98256ad8ee4bf3336eb277 files/squidGuard.conf.minimal 61 +MD5 5838403ff8fe47285fdc4235a53467ba files/squidguard-1.2.0-db4.patch 685 +MD5 71814cadfec6eed3d7ee2437fdd1f0ab files/squidguard-1.2.0-db41.patch 794 +MD5 bca506ead890af8fe52e0fdf5e73440f files/digest-squidguard-1.2.0-r1 69 +MD5 3e17e52277c56640bb3a9a24da57dae9 files/squidGuard.conf.blocksites 192 +MD5 d639b977d8cfd92f19913f1d9fa12564 files/squidguard-1.2.0-db42.patch 1348 diff --git a/net-proxy/squidguard/files/blockedsites b/net-proxy/squidguard/files/blockedsites new file mode 100644 index 000000000000..46279a47eed4 --- /dev/null +++ b/net-proxy/squidguard/files/blockedsites @@ -0,0 +1 @@ +sex.com diff --git a/net-proxy/squidguard/files/digest-squidguard-1.2.0-r1 b/net-proxy/squidguard/files/digest-squidguard-1.2.0-r1 new file mode 100644 index 000000000000..d941cb9c00f7 --- /dev/null +++ b/net-proxy/squidguard/files/digest-squidguard-1.2.0-r1 @@ -0,0 +1 @@ +MD5 c6e2e9112fdbda0602656f94c1ce31fd squidGuard-1.2.0.tar.gz 1852737 diff --git a/net-proxy/squidguard/files/squidGuard.conf.blocksites b/net-proxy/squidguard/files/squidGuard.conf.blocksites new file mode 100644 index 000000000000..eaa8cdeef051 --- /dev/null +++ b/net-proxy/squidguard/files/squidGuard.conf.blocksites @@ -0,0 +1,13 @@ +logdir /var/log/squidGuard +dbhome /etc/squidGuard/db + +dest blockedsites { + domainlist blockedsites +} + +acl { + default { + pass !blockedsites all + redirect http://www.sample.com/empty.png + } +} diff --git a/net-proxy/squidguard/files/squidGuard.conf.minimal b/net-proxy/squidguard/files/squidGuard.conf.minimal new file mode 100644 index 000000000000..3b0ebf55c766 --- /dev/null +++ b/net-proxy/squidguard/files/squidGuard.conf.minimal @@ -0,0 +1,7 @@ +logdir /var/log/squidGuard + +acl { + default { + pass all + } +} diff --git a/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch b/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch new file mode 100644 index 000000000000..37da3f1bfded --- /dev/null +++ b/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch @@ -0,0 +1,23 @@ +diff -urN squidGuard-1.2.0.orig/configure.in squidGuard-1.2.0/configure.in +--- squidGuard-1.2.0.orig/configure.in 2001-12-18 11:16:36.000000000 +0100 ++++ squidGuard-1.2.0/configure.in 2003-05-28 09:57:42.000000000 +0200 +@@ -71,7 +71,9 @@ + + dnl Checks for libraries. + +-AC_CHECK_LIB(db,db_version,,[ ++AC_CHECK_LIB(db,db_version,, ++AC_CHECK_LIB(db,db_version_4000,, ++AC_CHECK_LIB(db,db_version_4001,,[ + echo + echo "** The Berkley DB library is required for squidGuard" + echo " to compile. Get it from http://www.sleepycat.com" +@@ -79,7 +81,7 @@ + echo " its location. (default is $dbprefix/BerkeleyDB)" + echo + exit 1 +- ]) ++ ]))) + + dnl Checks for header files. + AC_HEADER_STDC diff --git a/net-proxy/squidguard/files/squidguard-1.2.0-db41.patch b/net-proxy/squidguard/files/squidguard-1.2.0-db41.patch new file mode 100644 index 000000000000..76a57a5f1deb --- /dev/null +++ b/net-proxy/squidguard/files/squidguard-1.2.0-db41.patch @@ -0,0 +1,24 @@ +--- src/sgDb.c 2004-07-04 11:36:19.020675285 +0100 ++++ src/sgDb.ok.c 2004-07-04 11:40:25.011222369 +0100 +@@ -98,13 +98,21 @@ + if(createdb) + flag = flag | DB_TRUNCATE; + if ((ret = ++#if DB_VERSION_MINOR == 1 ++ Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { ++#else + Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { ++#endif + (void) Db->dbp->close(Db->dbp, 0); + sgLogFatalError("Error db_open: %s", strerror(ret)); + } + } else { + if ((ret = ++#if DB_VERSION_MINOR == 1 ++ Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { ++#else + Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { ++#endif + sgLogFatalError("Error db_open: %s", strerror(ret)); + } + } diff --git a/net-proxy/squidguard/files/squidguard-1.2.0-db42.patch b/net-proxy/squidguard/files/squidguard-1.2.0-db42.patch new file mode 100644 index 000000000000..bc7e567ac1a5 --- /dev/null +++ b/net-proxy/squidguard/files/squidguard-1.2.0-db42.patch @@ -0,0 +1,41 @@ +--- squidGuard-1.2.0/configure.in.chris 2004-08-25 02:44:38 +0000 ++++ squidGuard-1.2.0/configure.in 2004-08-25 02:46:18 +0000 +@@ -73,7 +73,8 @@ + + AC_CHECK_LIB(db,db_version,, + AC_CHECK_LIB(db,db_version_4000,, +-AC_CHECK_LIB(db,db_version_4001,,[ ++AC_CHECK_LIB(db,db_version_4001,, ++AC_CHECK_LIB(db,db_version_4002,,[ + echo + echo "** The Berkley DB library is required for squidGuard" + echo " to compile. Get it from http://www.sleepycat.com" +@@ -82,7 +82,7 @@ + echo " its location. (default is $dbprefix/BerkeleyDB)" + echo + exit 1 +- ]))) ++ ])))) + + dnl Checks for header files. + AC_HEADER_STDC +--- squidGuard-1.2.0/src/sgDb.c.chris 2004-08-25 02:46:44 +0000 ++++ squidGuard-1.2.0/src/sgDb.c 2004-08-25 02:47:01 +0000 +@@ -98,7 +98,7 @@ + if(createdb) + flag = flag | DB_TRUNCATE; + if ((ret = +-#if DB_VERSION_MINOR == 1 ++#if DB_VERSION_MINOR == 1 || DB_VERSION_MINOR == 2 + Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { + #else + Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { +@@ -108,7 +108,7 @@ + } + } else { + if ((ret = +-#if DB_VERSION_MINOR == 1 ++#if DB_VERSION_MINOR == 1 || DB_VERSION_MINOR == 2 + Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { + #else + Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { diff --git a/net-proxy/squidguard/metadata.xml b/net-proxy/squidguard/metadata.xml new file mode 100644 index 000000000000..2d81b548192e --- /dev/null +++ b/net-proxy/squidguard/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<maintainer> + <email>cyfred@gentoo.org</email> + <name>Andrew Bevitt</name> +</maintainer> +<longdescription>Combined filter, redirector and access controller plugin for Squid</longdescription> +</pkgmetadata> diff --git a/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild b/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild new file mode 100644 index 000000000000..377a57141761 --- /dev/null +++ b/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +inherit eutils + +MY_P=squidGuard-${PV} +DESCRIPTION="Combined filter, redirector and access controller plugin for Squid." +HOMEPAGE="http://www.squidguard.org" +SRC_URI="http://ftp.teledanmark.no/pub/www/proxy/squidGuard/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ppc ppc64 ~amd64" +IUSE="" + +RDEPEND="net-proxy/squid + >=sys-libs/db-2" +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} || die "unpack problem" + cd ${S} + epatch ${FILESDIR}/${P}-db4.patch || die + epatch ${FILESDIR}/${P}-db41.patch || die + epatch ${FILESDIR}/${P}-db42.patch || die + + autoconf || die "autoconf problem" +} + +src_compile() { + econf \ + --with-sg-config=/etc/squidGuard/squidGuard.conf \ + --with-sg-logdir=/var/log/squidGuard \ + || die "configure problem" + + mv src/Makefile src/Makefile.orig + sed <src/Makefile.orig >src/Makefile \ + -e "s|logdir\t= /var/log/squidGuard|logdir\t= ${D}/var/log/squidGuard|" \ + -e "s|cfgdir\t= /etc/squidGuard|cfgdir\t= ${D}/etc/squidGuard|" + + emake || die "compile problem" +} + +src_install() { + make prefix=${D}/usr install + + dodir /var/log/squidGuard + fowners squid:squid /var/log/squidGuard + + insinto /etc/squidGuard/sample + doins ${FILESDIR}/squidGuard.conf.* + insinto /etc/squidGuard/sample/db + doins ${FILESDIR}/blockedsites + + dodoc ANNOUNCE CHANGELOG COPYING GPL README + dohtml doc/*.html + docinto text + dodoc doc/*.txt +} + +pkg_postinst() { + einfo "To use squidGuard, you should add the following line to your" + einfo "/etc/squid/squid.conf:" + einfo "" + einfo "\tredirect_program /usr/bin/squidGuard" + einfo "" + einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!" + einfo "Examples can be found in /etc/squidGuard/sample/" +} diff --git a/net-proxy/squirm/ChangeLog b/net-proxy/squirm/ChangeLog new file mode 100644 index 000000000000..367ad36b2ace --- /dev/null +++ b/net-proxy/squirm/ChangeLog @@ -0,0 +1,34 @@ +# ChangeLog for www-proxy/squirm +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> squirm-1.23.ebuild: + Masked squirm-1.23.ebuild stable for ppc + + 31 Aug 2004; David Holm <dholm@gentoo.org> squirm-1.23.ebuild: + Added to ~ppc. + + 16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squirm-1.23.ebuild: + Changing net-www/squid to www-proxy/squid in depends + +*squirm-1.23 (15 Aug 2004) + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml, + +squirm-1.23.ebuild: + Moved from net-www/squirm to www-proxy/squirm. + + 23 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; : + Adding metadata.xml + + 07 Jan 2003; J Robert Ray <jrray@gentoo.org> : Unmasking for x86. + +*squirm-1.23 (08 Nov 2002) + + 08 Nov 2002; J Robert Ray <jrray@gentoo.org> : + New ebuild. diff --git a/net-proxy/squirm/Manifest b/net-proxy/squirm/Manifest new file mode 100644 index 000000000000..5a5f74bbc915 --- /dev/null +++ b/net-proxy/squirm/Manifest @@ -0,0 +1,4 @@ +MD5 ce7199cd209d36d90fc9de1f08c7fbc8 squirm-1.23.ebuild 1073 +MD5 268019ac6f766b679d0944e2f07bac43 ChangeLog 1117 +MD5 5db2cab7098ae659adf1c2aeb50e96b5 metadata.xml 309 +MD5 09f57f010bc9572e95566ab97181d8fc files/digest-squirm-1.23 59 diff --git a/net-proxy/squirm/files/digest-squirm-1.23 b/net-proxy/squirm/files/digest-squirm-1.23 new file mode 100644 index 000000000000..3ba17c36c83c --- /dev/null +++ b/net-proxy/squirm/files/digest-squirm-1.23 @@ -0,0 +1 @@ +MD5 aedcaab22ca3ae0c8440bd0ef9d6e75e squirm-1.23.tgz 43151 diff --git a/net-proxy/squirm/metadata.xml b/net-proxy/squirm/metadata.xml new file mode 100644 index 000000000000..2c2c7d21f647 --- /dev/null +++ b/net-proxy/squirm/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<maintainer> + <email>cyfred@gentoo.org</email> + <name>Andrew Bevitt</name> +</maintainer> +<longdescription>A redirector for Squid</longdescription> +</pkgmetadata> diff --git a/net-proxy/squirm/squirm-1.23.ebuild b/net-proxy/squirm/squirm-1.23.ebuild new file mode 100644 index 000000000000..dabe59b0f553 --- /dev/null +++ b/net-proxy/squirm/squirm-1.23.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/squirm-1.23.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +DESCRIPTION="A redirector for Squid" +HOMEPAGE="http://squirm.foote.com.au" +SRC_URI="http://squirm.foote.com.au/${P}.tgz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ppc" +IUSE="" + +RDEPEND="net-proxy/squid" + +S="${WORKDIR}/${P}" + +src_unpack() { + unpack ${A} || die "unpack failed" + cd ${S} || die + mv Makefile Makefile.orig + sed -e 's|^EXTRALIBS=.*|EXTRALIBS=|' \ + -e 's|^PREFIX=.*|PREFIX=/usr/squirm|' \ + -e "s|^OPTIMISATION=.*|OPTIMISATION=${CFLAGS}|" \ + -e "s|^CFLAGS =.*|CFLAGS=${CFLAGS} -DPREFIX=\\\\\"\$(PREFIX)\\\\\"|" Makefile.orig > Makefile +} + +src_compile() { + cd ${S} + emake || die "make failed" +} + +src_install() { + make PREFIX=${D}/usr/squirm install || die "make install failed" +} + +pkg_postinst() { + einfo "To enable squirm add the following lines to squid.conf:" + einfo "redirect_program /usr/squirm/bin/squirm" + einfo "redirect_children 10" +} diff --git a/net-proxy/tinyproxy/ChangeLog b/net-proxy/tinyproxy/ChangeLog new file mode 100644 index 000000000000..1b8ff78c5783 --- /dev/null +++ b/net-proxy/tinyproxy/ChangeLog @@ -0,0 +1,68 @@ +# ChangeLog for www-proxy/tinyproxy +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.1 2005/04/22 19:15:11 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + + 08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> + tinyproxy-1.6.3.ebuild: + Stable on ppc. + + 06 Apr 2005; Alin Nastac <mrness@gentoo.org> tinyproxy-1.6.3.ebuild: + Stable on x86 + +*tinyproxy-1.6.3 (22 Feb 2005) + + 22 Feb 2005; Alin Nastac <mrness@gentoo.org> +tinyproxy-1.6.3.ebuild: + Version bump (#82962). + + 17 Feb 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml, + -tinyproxy-1.6.1.ebuild, tinyproxy-1.6.2.ebuild: + Remove old version and add metadata.xml + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + tinyproxy-1.6.2.ebuild: + Masked tinyproxy-1.6.2.ebuild stable for ppc + + 31 Aug 2004; David Holm <dholm@gentoo.org> tinyproxy-1.6.2.ebuild: + Added to ~ppc. + + 30 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> tinyproxy-1.6.2.ebuild: + Keyworded ~sparc wrt #61783 + +*tinyproxy-1.6.1 (15 Aug 2004) + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +files/tinyproxy.rc, + +tinyproxy-1.6.1.ebuild, +tinyproxy-1.6.2.ebuild: + Moved from net-www/tinyproxy to www-proxy/tinyproxy. + +*tinyproxy-1.6.2 (27 Oct 2003) + + 27 Oct 2003; Mike Frysinger <vapier@gentoo.org> : + Version bump. + +*tinyproxy-1.6.1 (06 Sep 2003) + + 09 Oct 2003; Mike Frysinger <vapier@gentoo.org> : + Add a small init.d script. + + 06 Sep 2003; Mike Frysinger <vapier@gentoo.org> : + Version bump. + +*tinyproxy-1.5.2 (10 Mar 2003) + + 12 Jun 2003; <msterret@gentoo.org> tinyproxy-1.5.1.ebuild, + tinyproxy-1.5.2.ebuild: + fix Header + + 10 Mar 2003; Mike Frysinger <vapier@gentoo.org> : + Version bump. + +*tinyproxy-1.5.1 (11 Nov 2002) + + 11 Nov 2002; Mike Frysinger <vapier@gentoo.org> : + Initial import. Ebuild submitted by me. diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest new file mode 100644 index 000000000000..e574195808e4 --- /dev/null +++ b/net-proxy/tinyproxy/Manifest @@ -0,0 +1,7 @@ +MD5 84ff13b31cf587fe52b68ab2c841a629 tinyproxy-1.6.3.ebuild 1100 +MD5 e5a20e5686a9a7cd87c395915105d8b7 tinyproxy-1.6.2.ebuild 1099 +MD5 da6667bf5a0c8f746b328b22dd299dbd ChangeLog 2013 +MD5 9cafc01ae2d4a91da29afd4613e9683f metadata.xml 226 +MD5 abaaa5a551eca73c41945d48b358ecbd files/digest-tinyproxy-1.6.2 67 +MD5 9a5f65bb4b75d82277efa9cddc4d05ca files/digest-tinyproxy-1.6.3 67 +MD5 038979904fe8567468d0c8244fc5fb81 files/tinyproxy.rc 552 diff --git a/net-proxy/tinyproxy/files/digest-tinyproxy-1.6.2 b/net-proxy/tinyproxy/files/digest-tinyproxy-1.6.2 new file mode 100644 index 000000000000..5bc1da061a22 --- /dev/null +++ b/net-proxy/tinyproxy/files/digest-tinyproxy-1.6.2 @@ -0,0 +1 @@ +MD5 08abe93ebd3a229a68e471bb5e013c46 tinyproxy-1.6.2.tar.gz 463274 diff --git a/net-proxy/tinyproxy/files/digest-tinyproxy-1.6.3 b/net-proxy/tinyproxy/files/digest-tinyproxy-1.6.3 new file mode 100644 index 000000000000..ab7140134762 --- /dev/null +++ b/net-proxy/tinyproxy/files/digest-tinyproxy-1.6.3 @@ -0,0 +1 @@ +MD5 bd14d029b12621bcfd7ee71b2f4893da tinyproxy-1.6.3.tar.gz 467348 diff --git a/net-proxy/tinyproxy/files/tinyproxy.rc b/net-proxy/tinyproxy/files/tinyproxy.rc new file mode 100755 index 000000000000..83aa85c27645 --- /dev/null +++ b/net-proxy/tinyproxy/files/tinyproxy.rc @@ -0,0 +1,26 @@ +#!/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/tinyproxy/files/tinyproxy.rc,v 1.1 2005/04/22 19:15:12 mrness Exp $ + +depend() { + use logger dns + need net +} + +start() { + ebegin "Starting tinyproxy" + /usr/sbin/tinyproxy + eend $? +} + +stop() { + local pid=0 + if [ -f /var/run/tinyproxy.pid ] ; then + pid=$(</var/run/tinyproxy.pid) + rm /var/run/tinyproxy.pid + fi + ebegin "Stopping tinyproxy" + [ ${pid} -ne 0 ] && kill ${pid} + eend $? +} diff --git a/net-proxy/tinyproxy/metadata.xml b/net-proxy/tinyproxy/metadata.xml new file mode 100644 index 000000000000..9b4d980a7bd7 --- /dev/null +++ b/net-proxy/tinyproxy/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<longdescription>A lightweight HTTP/SSL proxy</longdescription> +</pkgmetadata> diff --git a/net-proxy/tinyproxy/tinyproxy-1.6.2.ebuild b/net-proxy/tinyproxy/tinyproxy-1.6.2.ebuild new file mode 100644 index 000000000000..8f6087dd9295 --- /dev/null +++ b/net-proxy/tinyproxy/tinyproxy-1.6.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.6.2.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +DESCRIPTION="A lightweight HTTP/SSL proxy" +HOMEPAGE="http://tinyproxy.sourceforge.net/" +SRC_URI="mirror://sourceforge/tinyproxy/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ~sparc ppc" +IUSE="socks5 transparent-proxy debug" + +DEPEND="socks5? ( net-misc/dante )" + +src_compile() { + econf \ + --enable-xtinyproxy \ + --enable-filter \ + --enable-tunnel \ + --enable-upstream \ + `use_enable transparent-proxy` \ + `use_enable debug` \ + `use_enable debug profiling` \ + `use_enable socks5 socks` \ + || die + emake || die "emake failed" +} + +src_install() { + sed -i \ + 's:mkdir $(datadir)/tinyproxy:mkdir -p $(DESTDIR)$(datadir)/tinyproxy:' \ + Makefile + make DESTDIR=${D} install || die "install failed" + dodoc AUTHORS ChangeLog NEWS README TODO + mv ${D}/usr/share/tinyproxy ${D}/usr/share/doc/${PF}/html + exeinto /etc/init.d ; newexe ${FILESDIR}/tinyproxy.rc tinyproxy +} diff --git a/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild b/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild new file mode 100644 index 000000000000..bbb3848a96ac --- /dev/null +++ b/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $ + +DESCRIPTION="A lightweight HTTP/SSL proxy" +HOMEPAGE="http://tinyproxy.sourceforge.net/" +SRC_URI="mirror://sourceforge/tinyproxy/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ~sparc ppc" +IUSE="socks5 transparent-proxy debug" + +DEPEND="socks5? ( net-misc/dante )" + +src_compile() { + econf \ + --enable-xtinyproxy \ + --enable-filter \ + --enable-tunnel \ + --enable-upstream \ + `use_enable transparent-proxy` \ + `use_enable debug` \ + `use_enable debug profiling` \ + `use_enable socks5 socks` \ + || die + emake || die "emake failed" +} + +src_install() { + sed -i \ + 's:mkdir $(datadir)/tinyproxy:mkdir -p $(DESTDIR)$(datadir)/tinyproxy:' \ + Makefile + make DESTDIR=${D} install || die "install failed" + + dodoc AUTHORS ChangeLog NEWS README TODO + mv ${D}/usr/share/tinyproxy ${D}/usr/share/doc/${PF}/html + + exeinto /etc/init.d + newexe ${FILESDIR}/tinyproxy.rc tinyproxy +} diff --git a/net-proxy/webscarab/ChangeLog b/net-proxy/webscarab/ChangeLog new file mode 100644 index 000000000000..9e4e4f63b179 --- /dev/null +++ b/net-proxy/webscarab/ChangeLog @@ -0,0 +1,19 @@ +# ChangeLog for www-proxy/webscarab +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/webscarab/ChangeLog,v 1.1 2005/04/22 19:15:12 mrness Exp $ + + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> -webscarab-20050311.ebuild: + Rename category & herd www-proxy to net-proxy. Remove old version. + +*webscarab-20050411 (13 Apr 2005) + + 13 Apr 2005; Alin Nastac <mrness@gentoo.org> +webscarab-20050411.ebuild: + Version bump (#89015) + +*webscarab-20050311 (09 Apr 2005) + + 09 Apr 2005; Alin Nastac <mrness@gentoo.org> +files/webscarab.sh, + +metadata.xml, +webscarab-20050311.ebuild: + Initial import from bug #87126, thanks to Michael Zanetta <grimmlin@pentoo.ch>. + diff --git a/net-proxy/webscarab/Manifest b/net-proxy/webscarab/Manifest new file mode 100644 index 000000000000..94b6eaa9984e --- /dev/null +++ b/net-proxy/webscarab/Manifest @@ -0,0 +1,5 @@ +MD5 bd07370e5a57364e49ab498e9a2a9184 webscarab-20050411.ebuild 691 +MD5 3f9c985843c0b67b5ca89f24dedaf5cf ChangeLog 723 +MD5 ca053d1e95015fb10ae3772bf20fa65d metadata.xml 509 +MD5 5cb4880cfa82a9c95f56a036d0b74529 files/webscarab.sh 49 +MD5 a9922048bc664eadbdcdc43d8b1ffe60 files/digest-webscarab-20050411 87 diff --git a/net-proxy/webscarab/files/digest-webscarab-20050411 b/net-proxy/webscarab/files/digest-webscarab-20050411 new file mode 100644 index 000000000000..6eb1c25bc1f6 --- /dev/null +++ b/net-proxy/webscarab/files/digest-webscarab-20050411 @@ -0,0 +1 @@ +MD5 fd6d6646357bce2858fcee7cfede1a4b webscarab-selfcontained-20050411-1640.jar 1101665 diff --git a/net-proxy/webscarab/files/webscarab.sh b/net-proxy/webscarab/files/webscarab.sh new file mode 100644 index 000000000000..f056097623f9 --- /dev/null +++ b/net-proxy/webscarab/files/webscarab.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec java -jar /usr/lib/webscarab.jar diff --git a/net-proxy/webscarab/metadata.xml b/net-proxy/webscarab/metadata.xml new file mode 100644 index 000000000000..9b3f1e714803 --- /dev/null +++ b/net-proxy/webscarab/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<longdescription>WebScarab is designed to be a tool for anyone who needs to expose the workings +of an HTTP(S) based application, whether to allow the developer to debug otherwise difficult problems +or to allow a security specialist to identify vulnerabilities in the way that the application has been +designed or implemented.</longdescription> +</pkgmetadata> diff --git a/net-proxy/webscarab/webscarab-20050411.ebuild b/net-proxy/webscarab/webscarab-20050411.ebuild new file mode 100644 index 000000000000..7558291d7a38 --- /dev/null +++ b/net-proxy/webscarab/webscarab-20050411.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/webscarab/webscarab-20050411.ebuild,v 1.1 2005/04/22 19:15:12 mrness Exp $ + +DESCRIPTION="A framework for analysing applications that communicate using the HTTP and HTTPS protocols" +HOMEPAGE="http://www.owasp.org/software/webscarab.html" +SRC_URI="mirror://sourceforge/owasp/${PN}-selfcontained-${PV}-1640.jar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +RDEPEND=">=virtual/jre-1.4" + +src_unpack() { + einfo "Nothing to unpack" +} + +src_install() { + newbin ${FILESDIR}/${PN}.sh ${PN} + insinto /usr/lib + newins ${DISTDIR}/${A} ${PN}.jar +} diff --git a/net-proxy/wwwoffle/ChangeLog b/net-proxy/wwwoffle/ChangeLog new file mode 100644 index 000000000000..b000fd1e9e74 --- /dev/null +++ b/net-proxy/wwwoffle/ChangeLog @@ -0,0 +1,173 @@ +# ChangeLog for www-proxy/wwwoffle +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.1 2005/04/22 19:15:12 mrness Exp $ + + 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : + Rename category & herd www-proxy to net-proxy + + 09 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> wwwoffle-2.8e.ebuild: + Marked ~amd64, closes bug 88482. + + 09 Apr 2005; Alin Nastac <mrness@gentoo.org> wwwoffle-2.8e.ebuild: + Recursively set ownership to wwwoffle:wwwoffle on /etc/wwwoffle and + /var/spool/wwwoffle (#88482) + + 09 Apr 2005; Markus Rothe <corsair@gentoo.org> wwwoffle-2.8b.ebuild: + Stable on ppc64 + +*wwwoffle-2.8e (06 Apr 2005) + + 06 Apr 2005; Alin Nastac <mrness@gentoo.org> + -files/wwwoffle-2.8c-config-online, -files/wwwoffle-2.8c-init, + -files/wwwoffle-2.8c-init-online, +files/wwwoffle.initd, + +files/wwwoffle-online.confd, +files/wwwoffle-online.initd, + -wwwoffle-2.8c.ebuild, +wwwoffle-2.8e.ebuild: + Version bump + + 20 Nov 2004; Daniel Black <dragonheart@gentoo.org> files/wwwoffle-2.8c-init, + files/wwwoffle-2.8c-init-online: + more init script fixes as per bug #71674. Thanks again to BlaisorBlade + <blaisorblade_spam@yahoo.it> + + 19 Nov 2004; Daniel Black <dragonheart@gentoo.org> + files/wwwoffle-2.8c-init-online: + Modified online init.d script to fetch in background. Thanks to BlaisorBlade + <blaisorblade_spam@yahoo.it> in bug #71674 + + 19 Sep 2004; Daniel Black <dragonheart@gentoo.org> wwwoffle-2.8c.ebuild: + Ownership of /var/spool/wwwoffle changed to wwwoffle:wwwoffle. Thanks to Alan + Swanson <swanson@ukfsn.org> in bug #64629 + +*wwwoffle-2.8c (19 Sep 2004) + + 19 Sep 2004; Daniel Black <dragonheart@gentoo.org> + +files/wwwoffle-2.8c-config-online, +files/wwwoffle-2.8c-init, + +files/wwwoffle-2.8c-init-online, +wwwoffle-2.8c.ebuild: + version bump. Solves bug #61965 by Stanislav Brabec <utx@penguin.cz>. Attempts + to solve bug #7728 however there is still problems + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + wwwoffle-2.7h.ebuild, wwwoffle-2.8b.ebuild: + Masked wwwoffle-2.8b.ebuild stable for ppc + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + wwwoffle-2.7h.ebuild: + Masked wwwoffle-2.7h.ebuild stable for ppc + +*wwwoffle-2.8b (15 Aug 2004) + + 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml, + +files/wwwoffled, +files/wwwoffled-online, +files/wwwoffled-online-2.8b, + +wwwoffle-2.7h.ebuild, +wwwoffle-2.8b.ebuild: + Moved from net-www/wwwoffle to www-proxy/wwwoffle. + + 28 Jul 2004; Daniel Black <dragonheart@gentoo.org> wwwoffle-2.8b.ebuild: + Changed post-install message - wrong path of config file displayed in message. + Thanks to Antonio <netbix@tiscali.it> in bug #58315. Also modified the + ebuild to make wwwoffled run as the user wwwoffle. Used a config convert + script to update the user's previous configuration. + + 27 Jul 2004; Daniel Black <dragonheart@gentoo.org> -wwwoffle-2.7g.ebuild, + wwwoffle-2.8b.ebuild: + enew{user,group} copied to pkg_preinst to fix binary packages (bug #58526). + Added directories to keep (#58315). Thanks to Thomas Matthijs + <axxo@gentoo.org> and Antonio <netbix@tiscali.it> + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> wwwoffle-2.7g.ebuild, + wwwoffle-2.7h.ebuild, wwwoffle-2.8b.ebuild: + virtual/glibc -> virtual/libc + + 17 Jun 2004; Jason Wever <weeve@gentoo.org> wwwoffle-2.8b.ebuild: + Stable on sparc. + + 15 Jun 2004; Daniel Black <dragonheart@gentoo.org> wwwoffle-2.8b.ebuild: + x86 stable + + 06 Jun 2004; Daniel Black <dragonheart@gentoo.org> wwwoffle-2.7h.ebuild: + QA fix + + 06 Jun 2004; Daniel Black <dragonheart@gentoo.org> + +files/wwwoffled-online-2.8b, wwwoffle-2.7h.ebuild, wwwoffle-2.8b.ebuild: + Fixed the remainder of bug #35275. QA fix to 2.7h + + 07 May 2004; Daniel Black <dragonheart@gentoo.org> -wwwoffle-2.7d.ebuild, + wwwoffle-2.7g.ebuild, wwwoffle-2.7h.ebuild: + Remove old version. QA fix and added x86 keywords on 2.7{gh} + + 28 Apr 2004; Daniel Black <dragonheart@gentoo.org> wwwoffle-2.8b.ebuild: + Some fixes thanks to tove <bugs@veller.net> in bug #35275. Still some more to + go + +*wwwoffle-2.8b (25 Apr 2004) + + 25 Apr 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml, + wwwoffle-2.7-r1.ebuild, wwwoffle-2.7b.ebuild, wwwoffle-2.7d.ebuild, + wwwoffle-2.7g.ebuild, wwwoffle-2.7h.ebuild, wwwoffle-2.8b.ebuild, + files/wwwoffled: + Thanks to tove <bugs@veller.net> in bug #35275. files/wwwoffled changed to use + --name in stop. 2.7g and 2.7h fixed tar unpack. Version bump to 2.8b as well. + Removed old versions. Changed 2.8b so it stops wwwoffle before installation + + + 19 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> wwwoffle-2.7g.ebuild: + stable on sparc + + 22 Mar 2003; Dan Armak <danarmak@gentoo.org> files/wwwoffled-online: + + Fix bug #16293 - tell wwwoffle to read the /etc/wwwoffle.conf config file + so that it knows over which cnotrol port to communicate with the wwwoffled + server. + +*wwwoffle-2.7h (14 Jan 2003) + + 14 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog : + + A new upstream release that adds some bugfixes. + +*wwwoffle-2.7g (14 Dec 2002) + + 14 Dec 2002; Dan Armak <danarmak@gentoo.org> ChangeLog : + + New upstream vesrion. + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*wwwoffle-2.7d (29 Jul 2002) + + 29 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog : + + Bugfix version. + +*wwwoffle-2.7b (02 Jun 2002) + + 14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> wwwoffle-2.7b.ebuild : + Added LICENSE, KEYWORDS, SLOT. + + 02 Jun 2002; Wout Mertens <wmertens@gentoo.org>: + New mainstream version. This one fixes the problem where it wouldn't pass + on length information. + +*wwwoffle-2.7-r1 (16 Mar 2002) + + 14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> wwwoffle-2.7-r1.ebuild : + Added LICENSE, KEYWORDS, SLOT. + + 26 Mar 2002; Dan Armak <danarmak@gentoo.org>: general cleanup + of the ebuild. Fix bug that made the default spooldir /var/tmp/portage/... + + 16 Mar 2002; Dan Armak <danarmak@gentoo.org> Changelog: + + Now, if the wwwoffle init script is running, it is stopped before merging, + and started again afterwards. + +*wwwoffle-2.7 (4 Mar 2002) + + 4 Mar 2002; Dan Armak <danarmak@gentoo.org> Changelog: + + New upstream version, which adds some new features and bugfixes. Also cleaned up + ebuild in various small ways. + +*wwwoffle-2.6d-r6 (1 Feb 2002) diff --git a/net-proxy/wwwoffle/Manifest b/net-proxy/wwwoffle/Manifest new file mode 100644 index 000000000000..8130aba8a8f5 --- /dev/null +++ b/net-proxy/wwwoffle/Manifest @@ -0,0 +1,14 @@ +MD5 05f59e77d3c9a274835c4261c6cf1793 wwwoffle-2.8b.ebuild 4532 +MD5 03d481b8c1ea435dbc7a9c40029c8f47 wwwoffle-2.7h.ebuild 1851 +MD5 bd1cf2cb7b324dc39a86f789ef0b5eb5 ChangeLog 6467 +MD5 2f092f7d958b226c98713d29cff08f9d metadata.xml 502 +MD5 b1b90b961686c74ce6bf4455ed792c5c wwwoffle-2.8e.ebuild 5154 +MD5 ecf6ff07d66bdc91ff7ff6014ab5c016 files/wwwoffled-online 510 +MD5 a426ce505020deefa18627d26d04eed0 files/wwwoffled-online-2.8b 524 +MD5 1185ed7839f3a2620b3968e3c1d345f0 files/wwwoffle-online.confd 426 +MD5 06fec5f0a5b36dd1d1121b17d8882760 files/wwwoffle-online.initd 696 +MD5 faaff49563ae133cdb50ca1bf1ac93b8 files/wwwoffle.initd 539 +MD5 a6914435a2f1de064fcdc7c784a2b85f files/digest-wwwoffle-2.7h 62 +MD5 009de7420924ad30ca9611df2d1d6299 files/digest-wwwoffle-2.8b 62 +MD5 a627d44111b7ff1d162ac248f5c35376 files/digest-wwwoffle-2.8e 63 +MD5 6cf4ab4a8f2db9c8e503aac035d38eae files/wwwoffled 506 diff --git a/net-proxy/wwwoffle/files/digest-wwwoffle-2.7h b/net-proxy/wwwoffle/files/digest-wwwoffle-2.7h new file mode 100644 index 000000000000..d419996746a2 --- /dev/null +++ b/net-proxy/wwwoffle/files/digest-wwwoffle-2.7h @@ -0,0 +1 @@ +MD5 3226cbe65feca747f92393114d9de5f0 wwwoffle-2.7h.tgz 886577 diff --git a/net-proxy/wwwoffle/files/digest-wwwoffle-2.8b b/net-proxy/wwwoffle/files/digest-wwwoffle-2.8b new file mode 100644 index 000000000000..9cb59667b7c6 --- /dev/null +++ b/net-proxy/wwwoffle/files/digest-wwwoffle-2.8b @@ -0,0 +1 @@ +MD5 ef5a756adc8b8c37b9684b3155494227 wwwoffle-2.8b.tgz 975589 diff --git a/net-proxy/wwwoffle/files/digest-wwwoffle-2.8e b/net-proxy/wwwoffle/files/digest-wwwoffle-2.8e new file mode 100644 index 000000000000..a0f40e52b471 --- /dev/null +++ b/net-proxy/wwwoffle/files/digest-wwwoffle-2.8e @@ -0,0 +1 @@ +MD5 30828cc5a8a459f04f719bbb220003e7 wwwoffle-2.8e.tgz 1015694 diff --git a/net-proxy/wwwoffle/files/wwwoffle-online.confd b/net-proxy/wwwoffle/files/wwwoffle-online.confd new file mode 100644 index 000000000000..fcb5c5156e1f --- /dev/null +++ b/net-proxy/wwwoffle/files/wwwoffle-online.confd @@ -0,0 +1,10 @@ +# 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/wwwoffle-online.confd,v 1.1 2005/04/22 19:15:12 mrness Exp $ + +# Enter the interface that connects you to the outside world +# This will correspond to /etc/wwwoffle/init.d/net.${IFACE} + +# IMPORTANT: Be sure to run depscan.sh after modifiying IFACE + +#IFACE=ppp0 diff --git a/net-proxy/wwwoffle/files/wwwoffle-online.initd b/net-proxy/wwwoffle/files/wwwoffle-online.initd new file mode 100644 index 000000000000..55aafc20fb91 --- /dev/null +++ b/net-proxy/wwwoffle/files/wwwoffle-online.initd @@ -0,0 +1,30 @@ +#!/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/wwwoffle-online.initd,v 1.1 2005/04/22 19:15:12 mrness Exp $ + +depend() { + need wwwoffled + use dns + + if [ -n ${IFACE} ]; + then + need net.${IFACE} + else + ewarn "No IFACE is defined in /etc/conf.d/wwwoffle-online" + need net + fi +} + +start() { + ebegin "Starting wwwoffled-online" + wwwoffle -online -c /etc/wwwoffle/wwwoffle.conf + wwwoffle -fetch -c /etc/wwwoffle/wwwoffle.conf & > /dev/null 2>&1 + eend $? +} + +stop() { + ebegin "Stopping wwwoffled-online" + wwwoffle -offline -c /etc/wwwoffle/wwwoffle.conf + eend $? +} diff --git a/net-proxy/wwwoffle/files/wwwoffle.initd b/net-proxy/wwwoffle/files/wwwoffle.initd new file mode 100644 index 000000000000..74d805c79ee1 --- /dev/null +++ b/net-proxy/wwwoffle/files/wwwoffle.initd @@ -0,0 +1,21 @@ +#!/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/wwwoffle.initd,v 1.1 2005/04/22 19:15:12 mrness Exp $ + +depend() { + need localmount +} + +start() { + ebegin "Starting wwwoffled" + start-stop-daemon --start --quiet --exec /usr/sbin/wwwoffled \ + -u wwwoffle -- -c /etc/wwwoffle/wwwoffle.conf 2>&1 + eend $? +} + +stop() { + ebegin "Stopping wwwoffled" + start-stop-daemon --stop --quiet --name wwwoffled + eend $? +} diff --git a/net-proxy/wwwoffle/files/wwwoffled b/net-proxy/wwwoffle/files/wwwoffled new file mode 100755 index 000000000000..5c868c1811d7 --- /dev/null +++ b/net-proxy/wwwoffle/files/wwwoffled @@ -0,0 +1,21 @@ +#!/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 b/net-proxy/wwwoffle/files/wwwoffled-online new file mode 100755 index 000000000000..9c409d3afe57 --- /dev/null +++ b/net-proxy/wwwoffle/files/wwwoffled-online @@ -0,0 +1,21 @@ +#!/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,v 1.1 2005/04/22 19:15:12 mrness Exp $ + +depend() { + need wwwoffled net +} + +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/files/wwwoffled-online-2.8b b/net-proxy/wwwoffle/files/wwwoffled-online-2.8b new file mode 100755 index 000000000000..bcb98b23cfef --- /dev/null +++ b/net-proxy/wwwoffle/files/wwwoffled-online-2.8b @@ -0,0 +1,21 @@ +#!/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/metadata.xml b/net-proxy/wwwoffle/metadata.xml new file mode 100644 index 000000000000..fdcfd741744c --- /dev/null +++ b/net-proxy/wwwoffle/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-proxy</herd> +<maintainer> + <email>dragonheart@gentoo.org</email> + <name>Daniel Black</name> +</maintainer> +<longdescription>The wwwoffled program is a simple proxy server with special features for use +with dial-up internet links. This means that it is possible to browse web pages and read them +without having to remain connected. +</longdescription> +</pkgmetadata> diff --git a/net-proxy/wwwoffle/wwwoffle-2.7h.ebuild b/net-proxy/wwwoffle/wwwoffle-2.7h.ebuild new file mode 100644 index 000000000000..681b855546cc --- /dev/null +++ b/net-proxy/wwwoffle/wwwoffle-2.7h.ebuild @@ -0,0 +1,67 @@ +# 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.7h.ebuild,v 1.1 2005/04/22 19:15:12 mrness Exp $ + +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/" +KEYWORDS="x86 ~sparc ppc ppc64" +SLOT="0" +LICENSE="GPL-2" +IUSE="ipv6" +DEPEND="sys-devel/flex + sys-libs/zlib + sys-devel/gcc + virtual/libc + >=sys-apps/sed-4" + +RDEPEND="sys-libs/zlib + virtual/libc" + +src_compile() { + local myconf + use ipv6 && myconf="$myconf --with-ipv6" || myconf="$myconf --without-ipv6" + ./configure $myconf --prefix=/usr --with-confdir=/etc || die + + emake || die +} + +src_install() { + + sed -i -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' cache/Makefile + + # Install the files + make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die + + cd ${D}/etc + sed -i -e "s:${D}::" wwwoffle.conf + + # Install the wwwoffled init script + exeinto /etc/init.d + doexe ${FILESDIR}/{wwwoffled-online,wwwoffled} + + # someday i'll make it use the file in /etc. for now we at least get + # config file protection this way. + dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf +} + +pkg_preinst() { + 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 + touch ${T}/restart + fi +} + +pkg_postinst() { + if [ -f "${T}/restart" ]; then + einfo "Starting the wwwoffled initscript again..." + /etc/init.d/wwwoffled start + rm ${T}/restart + fi +} diff --git a/net-proxy/wwwoffle/wwwoffle-2.8b.ebuild b/net-proxy/wwwoffle/wwwoffle-2.8b.ebuild new file mode 100644 index 000000000000..5e3812811499 --- /dev/null +++ b/net-proxy/wwwoffle/wwwoffle-2.8b.ebuild @@ -0,0 +1,139 @@ +# 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.1 2005/04/22 19:15:12 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 /bin/false /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 new file mode 100644 index 000000000000..2cd413f2652c --- /dev/null +++ b/net-proxy/wwwoffle/wwwoffle-2.8e.ebuild @@ -0,0 +1,176 @@ +# 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.8e.ebuild,v 1.1 2005/04/22 19:15:12 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="~x86 ~sparc ~ppc ~ppc64 ~amd64" +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" + +# Unsure weither to depend or not +# >=www-misc/htdig-3.1.6-r4" + +src_unpack(){ + unpack ${A} + cd ${S} + sed -i -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \ + cache/Makefile.in +} + +src_compile() { + + # TODO confdir back to default /etc/wwwoffle + # allows to change config file using web interface. + + local myconf + myconf="`use_with ipv6`" + econf ${myconf} || die + emake || die + + 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 + + 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 + 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 /bin/false /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 + + # 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} + + #Updated configuration file + #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 + + 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 + + # 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 + + 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 +} + +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 +} |