From: Eray Aslan Date: Wed, 1 Apr 2015 05:19:26 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe84817943160928533342ffee3aebf5c7d01499;p=gentoo.git Version bump Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x77F1F175586A3B1F --- diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog index e48aeb8e20ec..6e5949bed96b 100644 --- a/net-proxy/squid/ChangeLog +++ b/net-proxy/squid/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-proxy/squid # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.520 2015/02/25 11:04:26 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.521 2015/04/01 05:19:13 eras Exp $ + +*squid-3.5.3 (01 Apr 2015) + + 01 Apr 2015; Eray Aslan +files/squid-3.5.3-eDirectory.patch, + +squid-3.5.3.ebuild: + Version bump *squid-3.4.12 (25 Feb 2015) diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index f5d3b465d6a3..7889a5138b9e 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -5,6 +5,7 @@ AUX squid-13211_13210.patch 1719 SHA256 2e1e45f4800cb17a5e35fdc5a8add7581e08cb7c AUX squid-13735_13734.patch 1704 SHA256 895f83d35c438e07c14d1780fcb25ede604ab4ed096cf72bea424396acf82735 SHA512 2bddcbf34413b20c03c0cbc2760cbbb53cf52ef00cefcb02200f74ca7d0f1621ae2c35d37a47bdff6ee705c1c22ad885f94b0c86c719565dfa794447d2719a26 WHIRLPOOL 782c92e8ae83bc3231a6eaf982af6467a386d5751664ae60f1ce1482e740f0d8811617c59963995e2b78382a49a42f6a6f3cee50cecbdfedfb4fe9c827cdc42a AUX squid-13934_13933.patch 694 SHA256 cc647f668c8b4df406af6007e342b7864483b7a42904e4af467194c0b2442220 SHA512 60a79fc7462abc3ea577a5e5eaa24a00722629733b9c86df2eb1cc8ca35ae802304d92a5822c74676ba7ac69876aeaac742594f28da846ada6ba8947eab324f8 WHIRLPOOL 80fabcdd07d9fccd8376e808b47b21bf8459fa2a402cec39b9f38ed901d2814151dbd20c8d9e00aa6e4e11a8fae8489f33f654aeff437e35c7b924cc23b6ca96 AUX squid-3.3.4-gentoo.patch 4358 SHA256 d52c1c89c81540dfd6c464f7c4245857fdd6cc9e45568a03d4f028fe5feb8bb0 SHA512 b1bfb0a1298e30ce30681b8bcaed292a883f8153e3df61861d1dfd691c5f4d5bc4651531ac69932fcbdc74c5896ed4495d54810203d4c0674ceb49b33454f297 WHIRLPOOL 3b98a43c1cc98d20f28dd5eb096344ff80ec5de1e4e17c4a3b8fb5d89044b6090466bfd3a7e24dfb975d9e02009af900372ee8c791991921def12820a191da97 +AUX squid-3.5.3-eDirectory.patch 568 SHA256 a12ae7c1940058e594a377208e9b3e62e20822ec15983be085b880ec3052010e SHA512 36b652c4ddefbab2ac3e45a7a0cf30234782caf7d40f64bce352f2c7c9b2d27c7b0c3f444d0a2b5612ed1bf23f0250f85891390f6e7a4acdb6d37c4fb8bbdb30 WHIRLPOOL b3f67fc4f6bc4643e0dad09ee1f5968deb17b839bc3372f3e31b3b690d7fc71402d455472b366fdbbe23c1ba8d10119c465927853c1eae1699c984389b26b4b4 AUX squid.confd-r1 493 SHA256 214a184495a3384eb452caef435256043bc51e35140a61b1f5fdff32603c8f7e SHA512 3f92645275e077bcf36e4cd2ccb56812540276d9456bc6f68268010aac57214f0d96b0aff74dc57cbc3446705a9fae8a5bb7a07304afeea45615ebf2cf2b7ab0 WHIRLPOOL 080cfb797ddb49f7c59463eaef0db8c3a6ec5e5da949884e9ccdf54d608b22fb81971aec21fab704c832c86a8c8e3d4795a7b09456c273d7c4bbb65692a68870 AUX squid.cron 143 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749 WHIRLPOOL 029c94d4e4826ee612c7dc12acc088e3100c9d1737baebb74b25b6e7ac2ba78d0bab9f744c12b5de4113c9727892c9a30dd17067409ac8da62afeee552de391e AUX squid.initd-r4 3370 SHA256 3830cb94600ac658a6ff1f9f31bdbece64caf3ad23c62ae0a887d152970125f5 SHA512 f4edec6d001292ae62bcc6a70f864c334ce3efd8ac7c1b7286e65f330453cbde4d3ec8ef9ca86df7cc2b58795808fe50349a48474165d12e2ffb158d8701e2ba WHIRLPOOL 697be7cd90ef06e8b29d86af26143b6d67e5bae84e89ab717d9f9b495ada6df2c446008c3f881914513127a8f893b9e1732bbd7b1b7c7eef6578e377c4c23baf @@ -14,28 +15,30 @@ DIST squid-3.4.11.tar.xz 2162148 SHA256 b4ede14221d043bbde94655aee195b090fe33a9a DIST squid-3.4.12.tar.xz 2162096 SHA256 a3f4f18fa17e81a8d8e1a2ec059cdbe3211a90ccd1717c3d9e092c0afdde2864 SHA512 7745e1a8ba7f458eae9b9017c16a13c3e724d54be48fc592fda9715d047db6f13a7b59dd9b6bd80e2f450373f30f7307a34d7d3cb3ff192a10abd8eb30da8b0a WHIRLPOOL 43d0db0137cfa35f91a4e1233c3a16e095742035b98331d983b047d5c6c45b5c36cb96def15764bc6c5c6eda892307387475953a94d5dd9fbfb10af4d86b06e0 DIST squid-3.5.1.tar.xz 2281248 SHA256 3a3bc6b424149da5a4816786100f32e47b45e139144726722df3a87a6414d6f4 SHA512 eec2e3c364fe4f6f6b62ede0af8f62d09fe53db0bcd4d302b75470ef2880844ab398b1f8e05473971bb052eb72347078329c0598ccbb5ea7ebf6cb8df34cc858 WHIRLPOOL d6e91e2b3ec3f647f15720037b0016ed5deee0d51a116b5e4ec3a9b79b04a8c301473778f3ea0cbe8e1c75b054b9b9932b6534cd8d5dba11cc8bb9d763e1ca5a DIST squid-3.5.2.tar.xz 2282116 SHA256 5af2e16f279466f9fb89c2fef6c09b6824a7e3e7996c9f1c2bc16e7daddd751f SHA512 c6ce7a1dc19919f489b096a4cfb0c9a4787090168d6fadb9ec0519abe5ddb15388477af41cf21586e84027a89c41ac29b02872a014b29273e808cd9fd1f00c27 WHIRLPOOL d8394b6ccc5b98fd50f3be358da4359552086d40407fca8de8991b089e9d79cf142c95cecdf8aca63d295b9b4c88fe4958d1f2fda7291c956dcf0503a6a43041 +DIST squid-3.5.3.tar.xz 2283580 SHA256 73ec65a08384a3ec93ccc17e89ef7a06ba221816551946f2f051cc736c2981c0 SHA512 aeafe302e81c78ae4cf9ca49133855559a2908d053aa5ce5e7ce6fc9a9e0188d824422c38f16e0b29182ac8103221d7f3aba765fd5160007a077be1be5343739 WHIRLPOOL a954c15872dd5b7efd260116358835f5f1f6c2e84374486efd1bfbc0f3c85515803dced352a4181d34084d02f65e58906cef00b4c58d17386d9697c56177c7a6 EBUILD squid-3.4.11-r1.ebuild 7960 SHA256 e9e7220e3b42984571ef7cc0f934df0fce8c446f11f1ce4d7a20c60b1c1fe5e5 SHA512 e8d844b10967636a475f73f7a6226c158c24e6a8346960cd2d1e149e787d55d55b2d2b65f23ced9af2f927e0f5a189045599c87be16abffc9d875c098c160df9 WHIRLPOOL 603270050f5e264c386ae3cc4712b46c7341d3cb866b7309ee2b3be413b26efed020d0ae8f424ff8be1a3ef589bb22e860392f564800c7994f066332c5a68891 EBUILD squid-3.4.12.ebuild 7919 SHA256 52d42e286d1d8b2d7de02121b0ff43636cef9f7251522a515ecce238272db2b7 SHA512 f5c0f7c7e59152ef5adc73a9b4c660e91b621c31cd1341906f9f7d2fdd59d5153a59600295b9f8d0a28e99ee4bb06f44c155d9e5ebf77f18bcbf38f8c0c63fc6 WHIRLPOOL 374ba7a85f0297245a45f9b4a39a9d7a9782a5c71f84bd42739c33c2e77ac8403070b4741067bb6687cc4148d6ff058bd0a1c07b0619ae2659da1ff41495dd18 EBUILD squid-3.5.1-r1.ebuild 7653 SHA256 8c16f6fd283e9856c126b1c562761a79a161a25eca7a9317eee14768ecb89e45 SHA512 a31573715105aac16b7fdfafba0ec9fa7256858cf0a2cf28ffe97a1bb4a501f4505ee405d7488ca958ad656e4097df1e61d39cd8a930929e2f112a958fd0e16f WHIRLPOOL 52a608ce6434f1df03f6cd557e754fc434e86acc0fcc0889061851579a39879b78e49722112659a858f96cd14f306896db0fa3e4948be02c481dd2f01c774d63 EBUILD squid-3.5.2.ebuild 7656 SHA256 6bb80352d066763166bbf13a9f1b7de727e11b3d370b5d806e04906f06382887 SHA512 0116bf3161d647c5c3d7317e17aabc54bb5ef48f92958a69b6dd110b763afe0310f8c17a8080baa7480cc6475cbbfafaca47a6984a2cc88f303a1fde6bafcc6d WHIRLPOOL 53b7d995a0b3305e8cc692a51b9c9884a8546ef8faf4fc361b395adaee930beee76c6923935f7ea853b5457145aa8a4890a63db3ead5cbc6752f551251f7577e -MISC ChangeLog 94674 SHA256 ff36471f7e9ca9b21ca4b183066fae04bbec745495905508a8b03b5c58c8e781 SHA512 398bcb18e15ea3a98fbbf94a0a11007ee829d486a9de72dd14df451298b6169fc59c32082becaaa050153f8785c4df01dca3e9f3da3b5ed3a4556ff6b8fad6d6 WHIRLPOOL 82036399b30aa34e35bab6f5a6c529356f35ff4497d0b9a3b8e0278d6c96a5d6c896c016a3745472dc9365a2ee3c3ccf603d59a7a66f620234144ffd798f8d92 +EBUILD squid-3.5.3.ebuild 7654 SHA256 e2d80d0d4e2b52764803ff41a701992505b7946c7658b6fa76954f1adb906501 SHA512 89be9158fa8a74df3d64d4995d22321a834a9f0466b4931e77db4f01e880c4aa892d64257471220a828601f08ff459a960334e40f133a6ad9214ead425af9e6e WHIRLPOOL 72487639f8353755ca15817520dbc68cbdc6629e5e59fb7401a20f6ac2dd576f3ba1ae84a366c0bf1e6ecd2e51473013a7ebceeb8916a66bcae4b2ccec9ab9ce +MISC ChangeLog 94822 SHA256 f3ccf67719db18b6503bbf2694b96607b392f29e85b6728b0334629ed75b9c0b SHA512 f845118c10bd0dada35c060ef74038924ab96c2b1ee3955a468a87ecd5968c1fea69ca718ae14576d8f8575813a9d3d2f4ee1a3734e915bf606277dc2b76f694 WHIRLPOOL 7349742db2c6b3665b28d7a2be0d495c5271e34b9d224f049298bd4c8af3718c8dfef8c55fbe118430c30486ccb5c133574ffcfede21fd06f4a0e420194c59ee MISC metadata.xml 1545 SHA256 72b1cd3b3476500f50f936459a522eca2fabcad046cc2647662bf18b75d57edf SHA512 20c78e621a6a58697108ae3e0a543a3ead301ccb50ba54266fa9775ef66fc24590ccc7a24d20883af656b8a295fac26527c65d236d4d46ae0e0df0c2d15c993d WHIRLPOOL 90a2470ab97b9d56e0b73410741194f30b1bed09f99ab71940ded398d3796ff8d87250ccfe419c544b2e85cebd8706d0c4beed926870f290694074c34317be90 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJU7axEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVG4AVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3 -N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsfmMkP/RJfkJRXBVWwMfn3XiG+WJEs -A7OVHQC3g6xCq8QWdm5fB16ckB26U7AWo+4fk6ixLuZM7xgmguP+e0QdUmhKs4qp -3o4VSFJLzBR2GfuQ28V8yep9Os/TBlJrBow4UO6ybuC/FjbjBNADAmBN++PFummu -TXMtOZIBg9jLapbYEbiZjk1I5adAM9NzpJv7pKh4+Raz4EPZZgRh8WetN4I0dQiH -LP07LqUBfOs4NjhTNvont0Hsg3pHaZd70S/hW+lVeBuOGByOKdDBAN25ubN9V/kL -v2Cw4/1fnR8XBYavBjglvnR2LUBOnAUL3kwVKcGpwhCsZEwww7IKr0ZsL+pV4foP -ifigEjIQC5IUUrv9qn0x2ec4lCr0QeeXb0a1PhykfrsqrqjyzRSa7TOKyFe224Pz -8dzU9eeVzl1VtuWQxfF6qC+ZJQumany/rf4rlWQA50+UYRq4LsjT9YXvF1DYY31/ -Mmm8yk6jPShIOm4CkY3091T6eLds1kAPCXkZkgCvayWWCg1bdvwz9v7vbZFcfe8p -blHMcEjWGkWnvTSOe8czB0sl1zJlW708n+WCjQJyXht7sqEpbbKZHnJDgzkQi7Hy -7Jdzo+YmrKKtutZ8EcOoLLmJIacfG2NYzFylbVU0iXtQvJ2eaYkHelkZ9f1lnYEF -Zg4a4HfQ+njgnx5iF7QE -=IkNi +N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsfX9MQAJiSeDvqc58os+DrXm2IAJ98 +tYC6ii8uyw70m7pZkOZ9Fen+L+i4/2kObyQkjQ39H5NtlwAed0XO29mQG1Qdn0zh +T3bfVMy43JE1YFlBaAjHxOxZ/Pc/JHhQMCWezzjcx6Pf8wevk5w2P+5iE5N5vmtd +RQR0qcfvQzqtaoo7O8QVfk+WynvKEs2ywC3Rc4JB4fRqvJQbjzJ79JWeylleke5m +dnVlwK3ic4PQQ2mnLpP0hZROgMA4FZZio/8S2KhJ+7oOWIaL8EDMv6T8Wu5ccQbR +iKkKmMVUrNZ4m94DPQ9biiYAp05Ytdi/SbF12QqJMOv7flSd9lnr8cZPktjLKDP3 +Ewhp8RRgJP99ZIQglU1597LzkOmFwuxmpCXZNC+ZoL2nzy2nd5l/Tr7A5Zqo13O+ +m2q88S93Eo3ehWDigmtuef1DilDk1B/QQ8P/1Fr7YnqScjfr7WnV6ezpc/3+/S19 +ppr4uRHPl2aEIQTwwr26y7BEcR81xmX9CBfsjsbXp8VgHmu1bABwKv1olbMga/mr +ldb5fvxYspcghdGvV+KYMWOjqgpElxXBKHJx5YH+ens7ksrJw5piaXIRgt7uu+bx +x3I6pRldTVA9mKawzvMMaevNgq7/I5aqkseX4HSfktljiYZs3tcS+j9YEFAz/Pi6 +x/OADbyBnNyFBtFZe5hS +=zjSR -----END PGP SIGNATURE----- diff --git a/net-proxy/squid/files/squid-3.5.3-eDirectory.patch b/net-proxy/squid/files/squid-3.5.3-eDirectory.patch new file mode 100644 index 000000000000..e536bb6303f1 --- /dev/null +++ b/net-proxy/squid/files/squid-3.5.3-eDirectory.patch @@ -0,0 +1,18 @@ +--- a/helpers/digest_auth/eDirectory/required.m4 ++++ b/helpers/digest_auth/eDirectory/required.m4 +@@ -5,4 +5,4 @@ + ## Please see the COPYING and CONTRIBUTORS files for details. + ## + +-AC_CHECK_HEADERS([ldap.h winldap.h],[BUILD_HELPER="LDAP"]) ++AC_CHECK_HEADERS([ldap.h winldap.h],[BUILD_HELPER="eDirectory"]) +--- a/helpers/digest_auth/eDirectory/Makefile.am ++++ b/helpers/digest_auth/eDirectory/Makefile.am +@@ -23,6 +23,7 @@ digest_edirectory_auth_LDADD = \ + $(COMPAT_LIB) \ + $(LDAPLIB) \ + $(LBERLIB) \ ++ $(NETTLELIB) \ + $(CRYPTLIB) \ + $(SSLLIB) \ + $(XTRA_LIBS) diff --git a/net-proxy/squid/squid-3.5.3.ebuild b/net-proxy/squid/squid-3.5.3.ebuild new file mode 100644 index 000000000000..47bbe65c764f --- /dev/null +++ b/net-proxy/squid/squid-3.5.3.ebuild @@ -0,0 +1,248 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.3.ebuild,v 1.1 2015/04/01 05:19:13 eras Exp $ + +EAPI=5 +inherit autotools eutils linux-info pam toolchain-funcs user versionator + +DESCRIPTION="A full-featured web proxy cache" +HOMEPAGE="http://www.squid-cache.org/" +SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ + ecap esi ssl-crtd \ + mysql postgres sqlite \ + qos tproxy \ + +htcp +wccp +wccpv2 \ + pf-transparent ipf-transparent kqueue \ + elibc_uclibc kernel_linux" + +COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) + pam? ( virtual/pam ) + ldap? ( net-nds/openldap ) + kerberos? ( virtual/krb5 ) + qos? ( net-libs/libnetfilter_conntrack ) + ssl? ( dev-libs/openssl:* dev-libs/nettle >=net-libs/gnutls-3.1.5 ) + sasl? ( dev-libs/cyrus-sasl ) + ecap? ( net-libs/libecap:1 ) + esi? ( dev-libs/expat dev-libs/libxml2 ) + !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) + >=sys-libs/db-4:* + dev-lang/perl + dev-libs/libltdl:0" +DEPEND="${COMMON_DEPEND} + ecap? ( virtual/pkgconfig ) + sys-apps/ed + test? ( dev-util/cppunit )" +RDEPEND="${COMMON_DEPEND} + samba? ( net-fs/samba ) + mysql? ( dev-perl/DBD-mysql ) + postgres? ( dev-perl/DBD-Pg ) + selinux? ( sec-policy/selinux-squid ) + sqlite? ( dev-perl/DBD-SQLite ) + !<=sci-biology/meme-4.8.1-r1" + +REQUIRED_USE="tproxy? ( caps ) + qos? ( caps )" + +pkg_pretend() { + if use tproxy; then + local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" + linux-info_pkg_setup + fi +} + +pkg_setup() { + enewgroup squid 31 + enewuser squid 31 -1 /var/cache/squid squid +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch" + epatch "${FILESDIR}/${P}-eDirectory.patch" + sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ + INSTALL QUICKSTART \ + scripts/fileno-to-pathname.pl \ + scripts/check_cache.pl \ + tools/cachemgr.cgi.8 \ + tools/purge/conffile.hh \ + tools/purge/README || die + sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \ + INSTALL QUICKSTART || die + sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \ + QUICKSTART || die + sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \ + QUICKSTART \ + src/log/access_log.cc || die + sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \ + src/log/access_log.cc || die + sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \ + helpers/external_acl/unix_group/ext_unix_group_acl.8 \ + helpers/external_acl/session/ext_session_acl.8 \ + src/ssl/ssl_crtd.8 || die + sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \ + scripts/check_cache.pl || die + sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \ + src/ssl/ssl_crtd.8 || die + sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ + src/ssl/ssl_crtd.8 || die + sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ + src/ssl/ssl_crtd.8 || die + # /var/run/squid to /run/squid + sed -i -e 's:$(localstatedir)::' \ + src/ipc/Makefile.am || die + sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \ + libltdl/configure.ac || die + + epatch_user + + eautoreconf +} + +src_configure() { + local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam" + use samba && basic_modules+=",SMB" + use ldap && basic_modules+=",LDAP" + use pam && basic_modules+=",PAM" + use sasl && basic_modules+=",SASL" + use nis && ! use elibc_uclibc && basic_modules+=",NIS" + use radius && basic_modules+=",RADIUS" + if use mysql || use postgres || use sqlite ; then + basic_modules+=",DB" + fi + + local digest_modules="file" + use ldap && digest_modules+=",LDAP,eDirectory" + + local negotiate_modules="none" + local myconf="--without-mit-krb5 --without-heimdal-krb5" + if use kerberos ; then + negotiate_modules="kerberos,wrapper" + if has_version app-crypt/heimdal ; then + myconf="--without-mit-krb5 --with-heimdal-krb5" + else + myconf="--with-mit-krb5 --without-heimdal-krb5" + fi + fi + + local ntlm_modules="none" + use samba && ntlm_modules="smb_lm" + + local ext_helpers="file_userip,session,unix_group" + use samba && ext_helpers+=",wbinfo_group" + use ldap && ext_helpers+=",LDAP_group,eDirectory_userip" + use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group" + + local storeio_modules="aufs,diskd,rock,ufs" + + local transparent + if use kernel_linux ; then + transparent+=" --enable-linux-netfilter" + use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack" + fi + + if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then + transparent+=" $(use_enable kqueue)" + if use pf-transparent; then + transparent+=" --enable-pf-transparent" + elif use ipf-transparent; then + transparent+=" --enable-ipf-transparent" + fi + fi + + tc-export CC AR + + econf \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/libexec/squid \ + --localstatedir=/var \ + --with-pidfile=/run/squid.pid \ + --datadir=/usr/share/squid \ + --with-logdir=/var/log/squid \ + --with-default-user=squid \ + --enable-removal-policies="lru,heap" \ + --enable-storeio="${storeio_modules}" \ + --enable-disk-io \ + --enable-auth-basic="${basic_modules}" \ + --enable-auth-digest="${digest_modules}" \ + --enable-auth-ntlm="${ntlm_modules}" \ + --enable-auth-negotiate="${negotiate_modules}" \ + --enable-external-acl-helpers="${ext_helpers}" \ + --enable-log-daemon-helpers \ + --enable-url-rewrite-helpers \ + --enable-cache-digests \ + --enable-delay-pools \ + --enable-eui \ + --enable-icmp \ + --enable-follow-x-forwarded-for \ + --with-large-files \ + --disable-strict-error-checking \ + --disable-arch-native \ + $(use_with caps libcap) \ + $(use_enable ipv6) \ + $(use_enable snmp) \ + $(use_with ssl openssl) \ + $(use_with ssl nettle) \ + $(use_with ssl gnutls) \ + $(use_enable ssl-crtd) \ + $(use_enable ecap) \ + $(use_enable esi) \ + $(use_enable htcp) \ + $(use_enable wccp) \ + $(use_enable wccpv2) \ + ${transparent} \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + # need suid root for looking into /etc/shadow + fowners root:squid /usr/libexec/squid/basic_ncsa_auth + fperms 4750 /usr/libexec/squid/basic_ncsa_auth + if use pam; then + fowners root:squid /usr/libexec/squid/basic_pam_auth + fperms 4750 /usr/libexec/squid/basic_pam_auth + fi + # pinger needs suid as well + fowners root:squid /usr/libexec/squid/pinger + fperms 4750 /usr/libexec/squid/pinger + + # cleanup + rm -f "${D}"/usr/bin/Run* + rm -rf "${D}"/run/squid "${D}"/var/cache/squid + + dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt + newdoc helpers/negotiate_auth/kerberos/README README.kerberos + newdoc helpers/basic_auth/RADIUS/README README.RADIUS + newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group + newdoc tools/purge/README README.purge + newdoc tools/helper-mux.README README.helper-mux + dohtml RELEASENOTES.html + + newpamd "${FILESDIR}/squid.pam" squid + newconfd "${FILESDIR}/squid.confd-r1" squid + newinitd "${FILESDIR}/squid.initd-r4" squid + if use logrotate; then + insinto /etc/logrotate.d + newins "${FILESDIR}/squid.logrotate" squid + else + exeinto /etc/cron.weekly + newexe "${FILESDIR}/squid.cron" squid.cron + fi + + diropts -m0750 -o squid -g squid + keepdir /var/log/squid /etc/ssl/squid /var/lib/squid +} + +pkg_postinst() { + if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \ + [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 ]]; then + elog "Please read the release notes at:" + elog " http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html" + echo + fi +}