diff options
author | 2008-05-28 19:48:54 +0000 | |
---|---|---|
committer | 2008-05-28 19:48:54 +0000 | |
commit | 1469ae2bb597e476cd4462dba02a34406c11433a (patch) | |
tree | 7398a4eb3d0882d7adbb3da36c4b1b7b7d604319 /net-proxy | |
parent | amd64 stable, bug #223707. (diff) | |
download | historical-1469ae2bb597e476cd4462dba02a34406c11433a.tar.gz historical-1469ae2bb597e476cd4462dba02a34406c11433a.tar.bz2 historical-1469ae2bb597e476cd4462dba02a34406c11433a.zip |
Fix issues with the new linux-headers-2.6.25 (#223051)
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-proxy')
-rw-r--r-- | net-proxy/squid/ChangeLog | 10 | ||||
-rw-r--r-- | net-proxy/squid/Manifest | 12 | ||||
-rw-r--r-- | net-proxy/squid/files/squid-2.6.20-lincapver.patch | 21 | ||||
-rw-r--r-- | net-proxy/squid/files/squid-3.0.6-lincapver.patch | 21 | ||||
-rw-r--r-- | net-proxy/squid/squid-2.6.20-r1.ebuild | 181 | ||||
-rw-r--r-- | net-proxy/squid/squid-3.0.6-r1.ebuild | 178 |
6 files changed, 418 insertions, 5 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog index 8d5a875822eb..e3d1c3a454c0 100644 --- a/net-proxy/squid/ChangeLog +++ b/net-proxy/squid/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-proxy/squid # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.189 2008/05/25 20:46:50 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.190 2008/05/28 19:48:53 mrness Exp $ + +*squid-3.0.6-r1 (28 May 2008) +*squid-2.6.20-r1 (28 May 2008) + + 28 May 2008; Alin Năstac <mrness@gentoo.org> + +files/squid-2.6.20-lincapver.patch, +files/squid-3.0.6-lincapver.patch, + +squid-2.6.20-r1.ebuild, +squid-3.0.6-r1.ebuild: + Fix issues with the new linux-headers-2.6.25 (#223051). *squid-3.0.6 (25 May 2008) diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index e14d446f82c1..7c26ac362bdd 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -10,10 +10,12 @@ AUX squid-2.6.19-qos.patch 10046 RMD160 899e9142137282b6861d44655874cbef3f0766c6 AUX squid-2.6.19-tcp_outg-x_fwd_for.patch 1126 RMD160 2164f14884e51b4518447df2ba8328cf00ac0f4a SHA1 5edd464cc89bd12af2587fd4fd1032236250ef6f SHA256 9d00b91fae8cf1d574a739e45cef176a9581c12b0aaf51a0502b55e2a9decb70 AUX squid-2.6.20-ToS_Hit_ToS_Preserve.patch 7810 RMD160 b8331b081e699c67931b8b96fbfee066596d5cc2 SHA1 21f1853e1d8931825950689bdcd5ad86f692f604 SHA256 1e5cd717ced7e75c468c1c9d555659105554b1c8da3bc18700831b59bd2acc88 AUX squid-2.6.20-gentoo.patch 11898 RMD160 661dd41756c6fe579cde485bbf49a1c7d0958df4 SHA1 b82039c97a16e3ebe3bb5ad5c6d11c5df1867e2d SHA256 94dc58f6a9d588f7c19627807f6e0deb40be197c41d7f6ecdc31122b8ff98a12 +AUX squid-2.6.20-lincapver.patch 910 RMD160 a7e7d02b377f893c94a558dbbb5745626eb089b9 SHA1 a734499233278dac2d5534f61bba242c3030533b SHA256 82fc1305ed8499aba0fd0ea19cec2eec650b5f064ad755fe004cb7f67103c3d2 AUX squid-2.6.20-qos.patch 10046 RMD160 d45c12f01f9c71ef6dd026a2e84e364a82a4fe13 SHA1 6e082842a0e09cd016ec9fa67920c428eb978304 SHA256 f40f5cfefec401ec5567feac816c50d1b2250af6fc4cea550ff6cf814fa33c11 AUX squid-3.0.4-gentoo.patch 8934 RMD160 3961e96f8bd04bf2fe422ee975f1afb98452183e SHA1 2d9cb25af596dff69de70a83639527566175e4fa SHA256 d50e02fbaa23159c752fb7accc42302850679904be4de301a7911ba19472fdba AUX squid-3.0.5-gentoo.patch 8934 RMD160 f319968e71fde615d005c1be3570f288dcff50a7 SHA1 975178133eff7d27c107e3649630e889ab11c60f SHA256 03fa8e17afa920b5a49df4b8380c0ee7719a5cc28245b0159882199384bce0dc AUX squid-3.0.6-gentoo.patch 8934 RMD160 7ed62dff715f8aed0ed3033c96735fc1d966f9ce SHA1 47864c2bcdb1d55d3f7175c84a492696066b3cb7 SHA256 cf2f9956f33638fc4d80829e9b718e42cab17db150970025dd0f10d5d4f5462d +AUX squid-3.0.6-lincapver.patch 904 RMD160 b8c9a2b302642572d106e555e6bc7a2726305759 SHA1 1ca09a655cf938854f04db40366c7f4c681cb8d7 SHA256 20877e8a62ca4db7c3b125a2f8aa792856f2d585771ae26e38bede3a0f1dbda1 AUX squid.confd 437 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 SHA1 59e15695bf4d7269002eac5015592419ad8155cc SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f AUX squid.initd 2171 RMD160 f0e96395e869526a7daf5072d3ed1b2ea8e1a2b9 SHA1 aaacc2b0a879a7225db17bc725c8c028d6d393e3 SHA256 a64c0aaae506be98bcc024b9d3b3a883b1b9be91b8a73960d3a7cff445b8217f @@ -28,16 +30,18 @@ DIST squid-3.0.STABLE5.tar.gz 2418416 RMD160 e99adb0418eea01f982da50c0dba12d2ec7 DIST squid-3.0.STABLE6.tar.gz 2431180 RMD160 b805e5638ba1c6af4d03fd1ac1c732b78c5c26bf SHA1 767996bfea6e9024b0d8fd8caf9af1e9e127afb8 SHA256 e3128a30d5b7b95e862ed2d408da12737c83cc20543c42e1f88668e54d3103c2 EBUILD squid-2.6.18.ebuild 5736 RMD160 6124f6c388572e127513e40a38bfd7678a8c022d SHA1 36b6690af1488b08f44365a3039699cdc93d27e3 SHA256 5973cf5ef472c2f99451ea33fd9c227179ce03d52f76e8de2dfa785c9db08a80 EBUILD squid-2.6.19-r1.ebuild 5538 RMD160 40cd230f6ab529522e1f9c7c363f520d8bd708d3 SHA1 02cdce277da00284f4af7a0a8637007ccf75c552 SHA256 22f0a9aadb29c27639d0afc4316fd1cf19f0da7fd7f157ffc8447c1cf7db491d +EBUILD squid-2.6.20-r1.ebuild 5592 RMD160 bc6e2118857f7c030d1b735506cf2d283d33de9a SHA1 0ef6b742e74e1699455ff676889178d82e148d8d SHA256 0e2aa2fcfa9c2701b79d281bdb2f0197a15448f5fab997c9460136a31204d6a6 EBUILD squid-2.6.20.ebuild 5546 RMD160 0d9d85bd8993db7d08e71765f7f483fcc731f78f SHA1 5ad27c104e27153c1110272bad7796923157fdbc SHA256 83bd30c979eea380fa8c70c54014f9b625dee4d2bd37dec7bd105c71f2286efa EBUILD squid-3.0.4-r1.ebuild 5555 RMD160 14dbced2298c05b78a76a7f7a890823249225c7c SHA1 37d2a8fcd4d56009603b364f1b2a20c677352ed9 SHA256 cfef7eca7949f4fc82d657f7ddf7221e7866311df4f82b07863d8653784197af EBUILD squid-3.0.5.ebuild 5552 RMD160 05caebd3f3ac001e0c6690e931273affe30159a7 SHA1 479fe9afdf584658c2996417518fb585640ac006 SHA256 849624ab607d822d3c68e39acc1ed5d05ed4b9078b17ed3de4ebf11dcbe0a4e7 +EBUILD squid-3.0.6-r1.ebuild 5598 RMD160 be83d000f8ddcf4f899d856d1067772af4a96c14 SHA1 f8d73b7bd10e43de1fe1435a871efe838265d19a SHA256 3a0e6befc6a978ee378f9b87248520310c84eeda86881a019104fdb62f0fdc92 EBUILD squid-3.0.6.ebuild 5552 RMD160 ca2f94484f1bbbd3903cca58a28726ea8afeb155 SHA1 dd0175151e911dc6a583d12ab88558d3f44ce869 SHA256 7599077b2cf3b7aca4dcda1254fe9079da59a4d6195f4a15a8cbbe02396aaa2d -MISC ChangeLog 43153 RMD160 7d9ebb8ad26eb722c2f1108063e145bb0f5fc141 SHA1 0c7737ee57c9fd2a4454b730671cd685294de10f SHA256 98886bbb688ff53798e7edbb5c5818dfc6321bee1555cb21f8db8352f81607f3 +MISC ChangeLog 43448 RMD160 62676e1db46517436b151cf92d3539ae592b781a SHA1 744b683bb73d6e09b6fe34e8d13367e510faa1ec SHA256 cdcf705ad0a8f27fe6a535c60dddb0e595cdc323342732458ff2392d46caac4e MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkg50EQACgkQ+fWpoTWIA9E3SQCeKwnHY9MwQ7KHGAxsdweH8eIQ -pRIAoIP6bfDldmKRuavvbRqdog2AZYJe -=EA51 +iEYEARECAAYFAkg9tzIACgkQ+fWpoTWIA9GSigCdEoOgir3P5hjhAAq9VSteWGTr +i1gAnRpwEHMtS+oj4iEVTtpH2DwAYLO2 +=5Yik -----END PGP SIGNATURE----- diff --git a/net-proxy/squid/files/squid-2.6.20-lincapver.patch b/net-proxy/squid/files/squid-2.6.20-lincapver.patch new file mode 100644 index 000000000000..6a11e5be8514 --- /dev/null +++ b/net-proxy/squid/files/squid-2.6.20-lincapver.patch @@ -0,0 +1,21 @@ +diff -Nru squid-2.6.STABLE20.orig/src/tools.c squid-2.6.STABLE20/src/tools.c +--- squid-2.6.STABLE20.orig/src/tools.c 2008-01-02 19:06:50.000000000 +0200 ++++ squid-2.6.STABLE20/src/tools.c 2008-05-28 22:31:28.000000000 +0300 +@@ -1337,10 +1337,15 @@ + restoreCapabilities(int keep) + { + #if defined(_SQUID_LINUX_) && HAVE_SYS_CAPABILITY_H +- cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(cap_user_header_t)); +- cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(cap_user_data_t)); ++ cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(*head)); ++ cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(*cap)); + ++#ifdef _LINUX_CAPABILITY_VERSION_1 ++ head->version = _LINUX_CAPABILITY_VERSION_1; ++#else + head->version = _LINUX_CAPABILITY_VERSION; ++#endif ++ + if (capget(head, cap) != 0) { + debug(50, 1) ("Can't get current capabilities\n"); + goto nocap; diff --git a/net-proxy/squid/files/squid-3.0.6-lincapver.patch b/net-proxy/squid/files/squid-3.0.6-lincapver.patch new file mode 100644 index 000000000000..9bc43f9fe4ca --- /dev/null +++ b/net-proxy/squid/files/squid-3.0.6-lincapver.patch @@ -0,0 +1,21 @@ +diff -Nru squid-3.0.STABLE6.orig/src/tools.cc squid-3.0.STABLE6/src/tools.cc +--- squid-3.0.STABLE6.orig/src/tools.cc 2008-05-20 18:01:16.000000000 +0300 ++++ squid-3.0.STABLE6/src/tools.cc 2008-05-28 22:41:54.000000000 +0300 +@@ -1354,10 +1354,14 @@ + restoreCapabilities(int keep) + { + #if defined(_SQUID_LINUX_) && HAVE_SYS_CAPABILITY_H +- cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(cap_user_header_t)); +- cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(cap_user_data_t)); +- ++ cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(*head)); ++ cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(*cap)); ++ ++#ifdef _LINUX_CAPABILITY_VERSION_1 ++ head->version = _LINUX_CAPABILITY_VERSION_1; ++#else + head->version = _LINUX_CAPABILITY_VERSION; ++#endif + + if (capget(head, cap) != 0) { + debugs(50, 1, "Can't get current capabilities"); diff --git a/net-proxy/squid/squid-2.6.20-r1.ebuild b/net-proxy/squid/squid-2.6.20-r1.ebuild new file mode 100644 index 000000000000..9d14fd84fc8c --- /dev/null +++ b/net-proxy/squid/squid-2.6.20-r1.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.20-r1.ebuild,v 1.1 2008/05/28 19:48:53 mrness Exp $ + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +inherit eutils pam toolchain-funcs autotools linux-info + +#lame archive versioning scheme.. +S_PMV="${PV%%.*}" +S_PV="${PV%.*}" +S_PL="${PV##*.}" +S_PL="${S_PL/_rc/-RC}" +S_PP="${PN}-${S_PV}.STABLE${S_PL}" + +DESCRIPTION="A full-featured web proxy cache" +HOMEPAGE="http://www.squid-cache.org/" +SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate qos zero-penalty-hit \ + pf-transparent ipf-transparent \ + elibc_uclibc kernel_linux" + +DEPEND="pam? ( virtual/pam ) + ldap? ( net-nds/openldap ) + ssl? ( dev-libs/openssl ) + sasl? ( dev-libs/cyrus-sasl ) + selinux? ( sec-policy/selinux-squid ) + !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) + >=sys-libs/db-4 + dev-lang/perl" +RDEPEND="${DEPEND} + samba? ( net-fs/samba )" + +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" + + epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-lincapver.patch + use zero-penalty-hit && epatch "${FILESDIR}"/${P}-ToS_Hit_ToS_Preserve.patch + use qos && epatch "${FILESDIR}"/${P}-qos.patch + + sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in + + eautoreconf +} + +src_compile() { + local basic_modules="getpwnam,NCSA,MSNT" + use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" + 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" + use samba && ext_helpers="wbinfo_group,${ext_helpers}" + use ldap && ext_helpers="ldap_group,${ext_helpers}" + + local ntlm_helpers="fakeauth" + use samba && ntlm_helpers="SMB,${ntlm_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 && linux_chkconfig_present EPOLL ; 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) + + econf \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/libexec/squid \ + --localstatedir=/var \ + --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="${ntlm_helpers}" \ + --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 \ + --with-maxfd=8192 \ + $(use_enable snmp) \ + $(use_enable ssl) \ + ${myconf} || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + + # need suid root for looking into /etc/shadow + fowners root:squid /usr/libexec/squid/ncsa_auth + fowners root:squid /usr/libexec/squid/pam_auth + fperms 4750 /usr/libexec/squid/ncsa_auth + fperms 4750 /usr/libexec/squid/pam_auth + + # some cleanups + 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_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 "Squid can be configured to run in transparent mode like this:" + ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" +} diff --git a/net-proxy/squid/squid-3.0.6-r1.ebuild b/net-proxy/squid/squid-3.0.6-r1.ebuild new file mode 100644 index 000000000000..ee7cb5b937de --- /dev/null +++ b/net-proxy/squid/squid-3.0.6-r1.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.6-r1.ebuild,v 1.1 2008/05/28 19:48:53 mrness Exp $ + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +inherit eutils pam toolchain-funcs autotools linux-info + +# lame archive versioning scheme.. +S_PMV="${PV%%.*}" +S_PV="${PV%.*}" +S_PL="${PV##*.}" +S_PP="${PN}-${S_PV}.STABLE${S_PL}" + +RESTRICT="test" # check if test works in next bump + +DESCRIPTION="A full-featured web proxy cache" +HOMEPAGE="http://www.squid-cache.org/" +SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="pam ldap samba sasl nis radius ssl snmp selinux icap-client logrotate \ + pf-transparent ipf-transparent \ + elibc_uclibc kernel_linux" + +DEPEND="pam? ( virtual/pam ) + ldap? ( net-nds/openldap ) + ssl? ( dev-libs/openssl ) + sasl? ( dev-libs/cyrus-sasl ) + selinux? ( sec-policy/selinux-squid ) + !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) + >=sys-libs/db-4 + dev-lang/perl" +RDEPEND="${DEPEND} + samba? ( net-fs/samba )" + +S="${WORKDIR}/${S_PP}" + +pkg_setup() { + if hasq qos ${USE} || hasq zero-penalty-hit ${USE} ; then + eerror "qos and zero-penalty-hit useflags are not supported by squid-3." + eerror "Please remove them from your USE or use =net-proxy/squid-2.6* instead." + die "unsupported USE flags detected" + fi + enewgroup squid 31 + enewuser squid 31 -1 /var/cache/squid squid +} + +src_unpack() { + unpack ${A} || die "unpack failed" + cd "${S}" || die "source dir not found" + + epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-lincapver.patch + + sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in + + eautoreconf +} + +src_compile() { + local basic_modules="getpwnam,NCSA,MSNT" + use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" + 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}" + use radius && basic_modules="squid_radius_auth,${basic_modules}" + + local ext_helpers="ip_user,session,unix_group" + use samba && ext_helpers="wbinfo_group,${ext_helpers}" + use ldap && ext_helpers="ldap_group,${ext_helpers}" + + local ntlm_helpers="fakeauth" + use samba && ntlm_helpers="SMB,${ntlm_helpers}" + + local myconf="" + + # Support for uclibc #61175 + if use elibc_uclibc; then + myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null" + else + myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null" + fi + + if use kernel_linux; then + myconf="${myconf} --enable-linux-netfilter" + 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) + + econf \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/libexec/squid \ + --localstatedir=/var \ + --datadir=/usr/share/squid \ + --with-default-user=squid \ + --enable-auth="basic,digest,negotiate,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="${ntlm_helpers}" \ + --enable-useragent-log \ + --enable-cache-digests \ + --enable-delay-pools \ + --enable-referer-log \ + --enable-arp-acl \ + --with-large-files \ + --with-filedescriptors=8192 \ + $(use_enable snmp) \ + $(use_enable ssl) \ + $(use_enable icap-client) \ + ${myconf} || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + + # need suid root for looking into /etc/shadow + fowners root:squid /usr/libexec/squid/ncsa_auth + fowners root:squid /usr/libexec/squid/pam_auth + fperms 4750 /usr/libexec/squid/ncsa_auth + fperms 4750 /usr/libexec/squid/pam_auth + + # some cleanups + 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_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 "Squid can be configured to run in transparent mode like this:" + ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" +} |