From 34ae82edab3f4caf85fb8b8e2902342aae3a6c33 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Tue, 24 Jan 2006 18:15:02 +0000 Subject: Add upstream patches. Add warning about diskd performance (#119574). (Portage version: 2.0.54) --- net-proxy/squid/ChangeLog | 7 +- net-proxy/squid/Manifest | 14 +- net-proxy/squid/files/digest-squid-2.5.12-r1 | 2 + net-proxy/squid/squid-2.5.12-r1.ebuild | 211 +++++++++++++++++++++++++++ 4 files changed, 222 insertions(+), 12 deletions(-) create mode 100644 net-proxy/squid/files/digest-squid-2.5.12-r1 create mode 100644 net-proxy/squid/squid-2.5.12-r1.ebuild (limited to 'net-proxy') diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog index ffc5a95b8840..18630ea66b2b 100644 --- a/net-proxy/squid/ChangeLog +++ b/net-proxy/squid/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-proxy/squid # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.61 2006/01/18 21:39:10 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.62 2006/01/24 18:15:02 mrness Exp $ + +*squid-2.5.12-r1 (24 Jan 2006) + + 24 Jan 2006; Alin Nastac +squid-2.5.12-r1.ebuild: + Add upstream patches. Add warning about diskd performance (#119574). 18 Jan 2006; Alin Nastac files/squid.initd, files/squid.initd-logrotate: diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index 4236639b4a64..9c474ec34dae 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -1,9 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 d89745a584c053f1ba91b7896f7ea29e ChangeLog 24880 +MD5 2186d0d089fd91a7889cfdbb4d13b14f ChangeLog 25056 MD5 9aae33d4872e127be17e8a1bc587c2a7 files/digest-squid-2.5.11 157 MD5 3e02deef24558936110d58663433ace3 files/digest-squid-2.5.12 157 +MD5 5d6f903d6b8e8bbcd6fd6f93b8db5986 files/digest-squid-2.5.12-r1 157 MD5 8e7207b10699502e573d9d60ff0e07a6 files/squid.confd 437 MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid.cron 133 MD5 29c067429711e7189923fcfc522000b3 files/squid.initd 2015 @@ -12,11 +10,5 @@ MD5 5286e7e73ca5687381fa09ff41dccbd1 files/squid.logrotate 101 MD5 2957ca0ec8bf84e4af8ed5adef7acb90 files/squid.pam 315 MD5 cf398556bce540358644ce9a452abfba metadata.xml 241 MD5 e134f5c38aadc2fd333ac8b006dbc252 squid-2.5.11.ebuild 6389 +MD5 e9334a5e62aac7778cae14aaa9575cde squid-2.5.12-r1.ebuild 6716 MD5 31e9c5b0a022091d02569297aec7e5e4 squid-2.5.12.ebuild 6414 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDzrc6jG8pv1lIUX4RAtiJAJ96HpqPu8dNFLk6VV6t8WgDrM0+RgCgl318 -mnzWwXehVxOUh/eJgLnW71A= -=JcTL ------END PGP SIGNATURE----- diff --git a/net-proxy/squid/files/digest-squid-2.5.12-r1 b/net-proxy/squid/files/digest-squid-2.5.12-r1 new file mode 100644 index 000000000000..5a037f2ff53b --- /dev/null +++ b/net-proxy/squid/files/digest-squid-2.5.12-r1 @@ -0,0 +1,2 @@ +MD5 33f76d99bccd759e35c52479fe3009ad squid-2.5.STABLE12-patches-20060124.tar.gz 23027 +MD5 de6238427bed63728970b7e3d6cba40a squid-2.5.STABLE12.tar.gz 1394653 diff --git a/net-proxy/squid/squid-2.5.12-r1.ebuild b/net-proxy/squid/squid-2.5.12-r1.ebuild new file mode 100644 index 000000000000..e9ee5a5c2940 --- /dev/null +++ b/net-proxy/squid/squid-2.5.12-r1.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.12-r1.ebuild,v 1.1 2006/01/24 18:15:02 mrness Exp $ + +inherit eutils pam toolchain-funcs flag-o-matic + +#lame archive versioning scheme.. +S_PV=${PV%.*} +S_PL=${PV##*.} +S_PL=${S_PL/_rc/-RC} +S_PP=${PN}-${S_PV}.STABLE${S_PL} +PATCH_VERSION="20060124" + +DESCRIPTION="A caching web proxy, with advanced features" +HOMEPAGE="http://www.squid-cache.org/" +SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz + mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz" + +S=${WORKDIR}/${S_PP} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="pam ldap ssl sasl snmp debug selinux underscores logrotate customlog zero-penalty-hit follow-xff" + +RDEPEND="pam? ( virtual/pam ) + 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" + +pkg_setup() { + enewgroup squid 31 + enewuser squid 31 -1 /var/cache/squid squid +} + +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 + use customlog || rm ${WORKDIR}/patch/9*customlog* + use zero-penalty-hit || rm ${WORKDIR}/patch/9*ToS_Hit* + use follow-xff || rm ${WORKDIR}/patch/9*follow_xff* + EPATCH_SUFFIX="patch" + epatch ${WORKDIR}/patch + + #hmm #10865 + sed -i -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \ + helpers/external_acl/ldap_group/Makefile.in + + #disable lazy bindings on (some at least) suided basic auth programs + sed -i -e 's:_LDFLAGS[ ]*=:_LDFLAGS = '$(bindnow-flags)':' \ + helpers/basic_auth/*/Makefile.in + + if ! use debug ; then + sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in + fi + export WANT_AUTOCONF=2.1 + autoconf || die "autoconf failed" +} + +src_compile() { + # Support for uclibc #61175 + if use elibc_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" + + 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 elibc_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 \ + `use_enable follow-xff follow-x-forwarded-for` \ + --host=${CHOST} ${myconf} || die "bad ./configure" + #--enable-icmp + + sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \ + include/autoconf.h + +# if [ "${ARCH}" = "hppa" ] +# then +# sed -i -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 -f ${D}/usr/bin/Run* + + #simply switch this symlink to choose the desired language.. + dosym /usr/lib/squid/errors/English /etc/squid/errors + + dodoc CONTRIBUTORS 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* + + newpamd "${FILESDIR}/squid.pam" squid + newconfd "${FILESDIR}/squid.confd" squid + if use logrotate; then + newinitd "${FILESDIR}/squid.initd-logrotate" squid + insinto /etc/logrotate.d + newins "${FILESDIR}/squid.logrotate" squid + else + newinitd "${FILESDIR}/squid.initd" squid + exeinto /etc/cron.weekly + newexe "${FILESDIR}/squid.cron" squid.cron + fi + + rm -rf ${D}/var + diropts -m0755 -o squid -g squid + keepdir /var/cache/squid /var/log/squid +} + +pkg_preinst() { + enewgroup squid 31 + enewuser squid 31 -1 /var/cache/squid 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 + einfo "For winbind authentication to work with squid you should change the" + einfo "/var/cache/samba/winbindd_privileged group to the same one you use" + einfo "in the cache_effective_group option on your squid.conf:" + einfo " chgrp squid /var/cache/samba/winbindd_privileged" + echo + ewarn "Be careful what type of cache_dir you select!" + ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow" + ewarn "when there isn't sufficient traffic to keep squid reasonably busy." + ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'." + echo +} -- cgit v1.2.3-65-gdbad