From 2fb7b25c7f17c47bcd9d6f2863408beecce3641e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alin=20N=C4=83stac?= Date: Thu, 21 Dec 2006 17:30:13 +0000 Subject: [PATCH] Use econf (#158708). Package-Manager: portage-2.1.1-r2 --- net-proxy/squid/Manifest | 28 ++-- net-proxy/squid/files/digest-squid-2.6.6 | 6 - net-proxy/squid/squid-2.6.6.ebuild | 196 ----------------------- 3 files changed, 14 insertions(+), 216 deletions(-) delete mode 100644 net-proxy/squid/files/digest-squid-2.6.6 delete mode 100644 net-proxy/squid/squid-2.6.6.ebuild diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index cb7ef6a5c443..02118331e759 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -62,14 +62,14 @@ EBUILD squid-2.6.5.ebuild 6618 RMD160 7a03da7fc2bc2632a80079d58f0f3ad43fae433c S MD5 392006b5ee870ea8e8c51cfaf28ba5ef squid-2.6.5.ebuild 6618 RMD160 7a03da7fc2bc2632a80079d58f0f3ad43fae433c squid-2.6.5.ebuild 6618 SHA256 0dd4136bc9544a17320b7534d54a87d7150a097e79189f1759a03513b451c940 squid-2.6.5.ebuild 6618 -EBUILD squid-2.6.6.ebuild 6122 RMD160 4d1266ef2eceee3ca9d16a48a7a9bd5e589d4573 SHA1 674b8a61cabc87505cb81b22477538e9dba9d0d2 SHA256 0460a03819df92d4a4d8c25c9c0974c4517b394fd235edead383aa8faeab9438 -MD5 085ab5ea942afaf3e37b0e9ca427a57c squid-2.6.6.ebuild 6122 -RMD160 4d1266ef2eceee3ca9d16a48a7a9bd5e589d4573 squid-2.6.6.ebuild 6122 -SHA256 0460a03819df92d4a4d8c25c9c0974c4517b394fd235edead383aa8faeab9438 squid-2.6.6.ebuild 6122 -MISC ChangeLog 30523 RMD160 495c68580a261d996accc66882a813f7e2e633eb SHA1 0281f964bdf685151e69ff18024e04182c21f95c SHA256 26351efcf496351ab7d4d5bab2097025c87da0a0a579dea5965b427cad1d2c52 -MD5 6028fe141cb72393c2bbe3347f9a4376 ChangeLog 30523 -RMD160 495c68580a261d996accc66882a813f7e2e633eb ChangeLog 30523 -SHA256 26351efcf496351ab7d4d5bab2097025c87da0a0a579dea5965b427cad1d2c52 ChangeLog 30523 +EBUILD squid-2.6.6-r1.ebuild 5986 RMD160 4d2f96f7f1dfb072b4ecb6b60fffad934443f2ec SHA1 1f29224fc82666a137df36acc68a6bd880c3c3df SHA256 c83b06a63c053faf42c51b232a583c61f20cd0e0e6c6f64168b6a055638b49d2 +MD5 a376dd7508791bddec79c727fd192e54 squid-2.6.6-r1.ebuild 5986 +RMD160 4d2f96f7f1dfb072b4ecb6b60fffad934443f2ec squid-2.6.6-r1.ebuild 5986 +SHA256 c83b06a63c053faf42c51b232a583c61f20cd0e0e6c6f64168b6a055638b49d2 squid-2.6.6-r1.ebuild 5986 +MISC ChangeLog 30673 RMD160 56c94276563b542613ee62242564387d593e944f SHA1 33b9aba06c1499298cee745230bbba1760462ae5 SHA256 e7856e114eca33217a6c752895f1926a669081146496051ec2efb5927c263b08 +MD5 1cc2a00d0be4895859de50a7f154984e ChangeLog 30673 +RMD160 56c94276563b542613ee62242564387d593e944f ChangeLog 30673 +SHA256 e7856e114eca33217a6c752895f1926a669081146496051ec2efb5927c263b08 ChangeLog 30673 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229 @@ -92,13 +92,13 @@ SHA256 6194b86ac425ead2f71ea960ef4e4e4b060a69b7af7001166a3955eaebcc4bbe files/di MD5 cf556b2b4afe6d8a8f02a43e0252746a files/digest-squid-2.6.5 554 RMD160 77a49ad5979119860725a304f19b516bbb3e2aae files/digest-squid-2.6.5 554 SHA256 c691f9d5c16ba2a14ce66add145963b4c3cdb58a5442e6365e7f74e20201a838 files/digest-squid-2.6.5 554 -MD5 6f8a61bcb61b59cc3fe028be4f8a8534 files/digest-squid-2.6.6 554 -RMD160 034ccaed8777131ddc2e8861edb19c1ed4a213fd files/digest-squid-2.6.6 554 -SHA256 401bcaf9999373992ebcf94f0c8f754e9d6a8e70ccc2539fb9af03a0c73e3811 files/digest-squid-2.6.6 554 +MD5 6f8a61bcb61b59cc3fe028be4f8a8534 files/digest-squid-2.6.6-r1 554 +RMD160 034ccaed8777131ddc2e8861edb19c1ed4a213fd files/digest-squid-2.6.6-r1 554 +SHA256 401bcaf9999373992ebcf94f0c8f754e9d6a8e70ccc2539fb9af03a0c73e3811 files/digest-squid-2.6.6-r1 554 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFiGAH3sf9c6kjmR8RAoZSAJ0aY+R4dIoxe+XSSy9oZR36dMn+wQCgs4MF -c8uVxNWwyxoEYsgprtB/dyc= -=fJRq +iD8DBQFFisSh3sf9c6kjmR8RAi7fAJ0dZ9pt3Ft2SiJbZIpUITlyzkSazgCfezRu +lFzO3YlR5EmdI7gRxu7e35Y= +=CDOh -----END PGP SIGNATURE----- diff --git a/net-proxy/squid/files/digest-squid-2.6.6 b/net-proxy/squid/files/digest-squid-2.6.6 deleted file mode 100644 index f23d0d08d271..000000000000 --- a/net-proxy/squid/files/digest-squid-2.6.6 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 02662bee48e9429bccb371fe32bbf68e squid-2.6.STABLE6-patches-20061219.tar.gz 7164 -RMD160 70e6af41dbb512603a70c1f1be68497c43213f1a squid-2.6.STABLE6-patches-20061219.tar.gz 7164 -SHA256 6d4799e2ca21fb8dc5722be36df7064d9d01c0f153b2ecb87f34618991e9e5f1 squid-2.6.STABLE6-patches-20061219.tar.gz 7164 -MD5 9e10815ed542fefa06fbcaefdfcb05b3 squid-2.6.STABLE6.tar.gz 1623289 -RMD160 de0d7d22ab7fedb77e8034fe2028610c9303257f squid-2.6.STABLE6.tar.gz 1623289 -SHA256 ed02b22dfe0980ccbbe76144fd95c52128319f53e0dd35232bd6a73b6182ab2c squid-2.6.STABLE6.tar.gz 1623289 diff --git a/net-proxy/squid/squid-2.6.6.ebuild b/net-proxy/squid/squid-2.6.6.ebuild deleted file mode 100644 index 31ff9f993789..000000000000 --- a/net-proxy/squid/squid-2.6.6.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# 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.6.6.ebuild,v 1.1 2006/12/19 21:56:08 mrness Exp $ - -inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info - -#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="20061219" - -DESCRIPTION="A full-featured web proxy cache" -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="pam ldap sasl nis ssl snmp selinux logrotate zero-penalty-hit \ - pf-transparent ipf-transparent \ - elibc_uclibc kernel_linux" - -RDEPEND="pam? ( virtual/pam ) - ldap? ( >=net-nds/openldap-2.1.26 ) - ssl? ( >=dev-libs/openssl-0.9.7j ) - sasl? ( >=dev-libs/cyrus-sasl-2.1.21 ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4" -DEPEND="${RDEPEND} dev-lang/perl" - -S="${WORKDIR}/${S_PP}" - -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 zero-penalty-hit || rm "${WORKDIR}"/patch/9*ToS_Hit* - EPATCH_SUFFIX="patch" - epatch "${WORKDIR}/patch" - - sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in - - #disable lazy bindings on (some at least) suided basic auth programs - sed -i -e '$aAM_LDFLAGS = '$(bindnow-flags) \ - helpers/basic_auth/*/Makefile.am - - eautoreconf -} - -src_compile() { - local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM" - use ldap && basic_modules="LDAP,${basic_modules}" - use pam && basic_modules="PAM,${basic_modules}" - use sasl && basic_modules="SASL,${basic_modules}" - use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" - - local ext_helpers="ip_user,session,unix_group,wbinfo_group" - use ldap && ext_helpers="ldap_group,${ext_helpers}" - - local myconf="" - - # 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 - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter" - if kernel_is ge 2 6 ; then - myconf="${myconf} --enable-epoll" - fi - elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} --enable-kqueue" - if use pf-transparent; then - myconf="${myconf} --enable-pf-transparent" - elif use ipf-transparent; then - myconf="${myconf} --enable-ipf-transparent" - fi - 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 \ - --datadir=/usr/share/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" \ - --enable-ident-lookups \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-pthreads \ - --with-large-files \ - --enable-htcp \ - --enable-carp \ - --enable-follow-x-forwarded-for \ - $(use_enable snmp) \ - $(use_enable ssl) \ - --host=${CHOST} ${myconf} || die "bad ./configure" - - sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \ - include/autoconf.h - - emake || die "compile problem" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - #need suid root for looking into /etc/shadow - fowners root:squid /usr/lib/squid/ncsa_auth - fowners root:squid /usr/lib/squid/pam_auth - fperms 4750 /usr/lib/squid/ncsa_auth - fperms 4750 /usr/lib/squid/pam_auth - - #some clean ups - rm -f "${D}"/usr/bin/Run* - - 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 - - #Remove this after all versions prior to 2.6.4 has been removed from the tree - if [[ -L "${ROOT}/etc/squid/errors" ]]; then - rm "${ROOT}/etc/squid/errors" - fi -} - -pkg_postinst() { - echo - ewarn "Squid authentication helpers have been installed suid root." - ewarn "This allows shadow based authentication (see bug #52977 for more)." - 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 - ewarn "/etc/squid/errors symlink has been removed from your system." - ewarn "Error templates can be customized through ${HILITE}error_directory${NORMAL} directive." - echo - ewarn "Squid can be configured to run in transparent mode like this:" - ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" -} -- 2.26.2