Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-proxy/squid/ChangeLog9
-rw-r--r--net-proxy/squid/Manifest38
-rw-r--r--net-proxy/squid/squid-3.4.11-r1.ebuild4
-rw-r--r--net-proxy/squid/squid-3.4.12.ebuild254
-rw-r--r--net-proxy/squid/squid-3.5.1-r1.ebuild4
-rw-r--r--net-proxy/squid/squid-3.5.2.ebuild4
6 files changed, 288 insertions, 25 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 2c95f1bf0365..e48aeb8e20ec 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,13 @@
# 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.519 2015/02/25 10:11:51 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.520 2015/02/25 11:04:26 eras Exp $
+
+*squid-3.4.12 (25 Feb 2015)
+
+ 25 Feb 2015; Eray Aslan <eras@gentoo.org> +squid-3.4.12.ebuild,
+ squid-3.4.11-r1.ebuild, squid-3.5.1-r1.ebuild, squid-3.5.2.ebuild:
+ Version bump. Remove NETFILTER_TPROXY kernel check - no longer in the kernel
+ - bug #539150
25 Feb 2015; Eray Aslan <eras@gentoo.org> -files/squid-12683_12681.patch,
-squid-3.3.13-r1.ebuild, -squid-3.4.10.ebuild, -squid-3.4.11.ebuild,
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index fa65ee77c55d..f5d3b465d6a3 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -11,29 +11,31 @@ AUX squid.initd-r4 3370 SHA256 3830cb94600ac658a6ff1f9f31bdbece64caf3ad23c62ae0a
AUX squid.logrotate 103 SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55 WHIRLPOOL 1cbce1fb05d4661d26f80baeafad0d3a5de1108a21eb6519775b9be2c549d1ca1b85575b72941fd246e4e9fbdf466b302b767aa7ce002f990f6ca4a9844e1e41
AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f SHA512 a73c98eef2d99bfd871c192195f3c815bff1cd4fa66b87ac185fde891e5cf5fb464fe0ce376c16ac68065c53726784229ad96c24835138244eee2ca2807887c3 WHIRLPOOL e8a6345c634694ce1e21fc4d69ea059d2da9f5d3b7ad34b4a49c570161cddab615fb4ed9e274397ddd4887e4b027aa90339bb8fbb5a71f3bdf506d70cefb99c1
DIST squid-3.4.11.tar.xz 2162148 SHA256 b4ede14221d043bbde94655aee195b090fe33a9a0a3d4ed83a9b41fcd46cac1d SHA512 e485e195f6ef95d7d2f5d327d9e229d9b3b678b035595853bc5d9a56a0494536239fa591bd56213014e08f9584e56d3511b0429e9fe9076d6e64a8b09867be69 WHIRLPOOL 5a3b1829eeda2b507971346bab3af142f19c650185940af82a238787b7265ab5e51535e815e1f87f0800071ca3053d8a0195da0ef02d27361e83951c4631ea63
+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
-EBUILD squid-3.4.11-r1.ebuild 7977 SHA256 ab9c54453df1a0b3c64978e335d861dfc16aa0fed9f4de9fc8b798fdf154f8c9 SHA512 b832b7e9d950158ad8b6ddbcd0bf2d41f2ca18ac8a5feb612b72217439750a47169cbdbf96a326b5a08ff144b17fe136167408e1ccdc31f0e45d1e5518faff66 WHIRLPOOL 087661e5e603b37679fec373352d540c46819a7eb0fa1749cff230a0edea78b4880b6a4d9179482293c5883ade4ac386d1cf51c13db540649c5a70b10a2df2b0
-EBUILD squid-3.5.1-r1.ebuild 7671 SHA256 76942f30c8a5bc4412c703619da01854bba5632ab037a6a58188b122a501e62f SHA512 680691fc99af72fb0315d8d26730413f4ba441500df7e50a6970194097f98b85e1ca03070786c177567ddaf29e9c27e142ed524c815932a852b941e1deaeb75f WHIRLPOOL 6495e6c073e289a454d4fb210ea48c73ca8714dbba937d67f5907b69779509bfbf2a0aa66a37051d0cb169eb66a1c279a0d84f13094aff0f98f442afe06a44a7
-EBUILD squid-3.5.2.ebuild 7674 SHA256 dde4d53a5a7ec2c74bbfc240444528adf55dd108b1e91c4be61d95b7080ccf50 SHA512 69540f19e0d89da9a0d61ff43725d30749d990bb17b506a47d8644773ef2ee6642137b8214360bda009d3fe6d72eec22c248f289e4d5044c8379bb25935a0de4 WHIRLPOOL 687b1cf268a67580a0ed3d01de51c8f8f535290127a0e59390ce49e237c976d981cfce742726394d860a76c0dc97c2e09be58fb27c7ad7aa2a1beacae783fb35
-MISC ChangeLog 94413 SHA256 0e884b924b7602ad3528dc1cbcac8ca6595472f56919be7e550d8734b078cfab SHA512 0203ec6a1b51045fe398e348283f82797d8fe9f13ab4ecb427e83a0ebc913f9dcaa18ee852b2cdf7991bb2705c160e2778ba2144d0fa3ac33e1aaf2c1ee880b7 WHIRLPOOL f8a08e8d985229a462a99a489bb13b2d0bac8af495c48bfbb5e91b47b019262a9ba85b47f82025d73502378aef368429a3d1b394dd1f1ac25e697362aa6274d8
+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
MISC metadata.xml 1545 SHA256 72b1cd3b3476500f50f936459a522eca2fabcad046cc2647662bf18b75d57edf SHA512 20c78e621a6a58697108ae3e0a543a3ead301ccb50ba54266fa9775ef66fc24590ccc7a24d20883af656b8a295fac26527c65d236d4d46ae0e0df0c2d15c993d WHIRLPOOL 90a2470ab97b9d56e0b73410741194f30b1bed09f99ab71940ded398d3796ff8d87250ccfe419c544b2e85cebd8706d0c4beed926870f290694074c34317be90
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCABmBQJU7Z/yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU7axEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
-N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsffEEP/REzBVHJqyiweOzTGdeoIBmO
-uS6tjTipT3BSR2ltvmvgR/4s/cH775hA2hKkSMDtPhLYqJWOs+Qd88rpaWAPJB7L
-RIbL1usLbcs8PoBZwMti4qbS2Mp9Fp/04t/q+YeJwnUGQfVjQTKtMwo2KuNWSNY7
-HOizdJ5paFfYIB5agRaRjg9LnXQRzo2zPyC0rYTI7axL4SR5voEGnmoT9SlzID4Z
-+TsZXLGuhPgxHFb046vOvHyExSocwps7bXvnxibtqVJ8jyGavkihQnL52n3WVwWp
-S4MhS+yR0Hw2q8+zSGiGx7vmKwaOxR4F9oQYY9qtWa4Me85XnI4JJ+H5NzBo5FPb
-4e2p2fTXsZwQkFQ3ZIBRlSZQ8i2sUEmkvhRRHHwkX3jraa5zgx7/8ntdBF3gz4lA
-/qvngJMKj+RoDKvV0P0ZWLhmRdksiHpBX54YtzzXMw+fnogIcEAU9kg+x5dPn+Aq
-F6bZeRw3FVo9SvCkxopz/wli8391SFDYAWdLsNewUSwWs3BiW1TTdtGbcp3Pu8No
-PnN0rU4n8MQKi1MV+hRnGb21JnoR8bTis1kadF7do8onDug+Kqie3NAEbe4eHr/h
-e5Vcx96bLEG0tYeYaSC0O3rju1LUXJu5KPZOTDldq12MtYl99ivy5kXj2qRtZ/Ce
-qDwDgDmeUlb8iP4tE+0y
-=6SsW
+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
-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.4.11-r1.ebuild b/net-proxy/squid/squid-3.4.11-r1.ebuild
index 56150d139176..df0f25bf6071 100644
--- a/net-proxy/squid/squid-3.4.11-r1.ebuild
+++ b/net-proxy/squid/squid-3.4.11-r1.ebuild
@@ -1,6 +1,6 @@
# 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.4.11-r1.ebuild,v 1.10 2015/02/24 10:57:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.11-r1.ebuild,v 1.11 2015/02/25 11:04:26 eras Exp $
EAPI=5
inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -50,7 +50,7 @@ REQUIRED_USE="tproxy? ( caps )
pkg_pretend() {
if use tproxy; then
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+ local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
linux-info_pkg_setup
fi
}
diff --git a/net-proxy/squid/squid-3.4.12.ebuild b/net-proxy/squid/squid-3.4.12.ebuild
new file mode 100644
index 000000000000..e300e642a35b
--- /dev/null
+++ b/net-proxy/squid/squid-3.4.12.ebuild
@@ -0,0 +1,254 @@
+# 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.4.12.ebuild,v 1.1 2015/02/25 11:04:26 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.4/${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 icap-client 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 )
+ sasl? ( dev-libs/cyrus-sasl )
+ ecap? ( net-libs/libecap:0.2 )
+ esi? ( dev-libs/expat dev-libs/libxml2 )
+ !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+ >=sys-libs/db-4
+ dev-lang/perl
+ dev-libs/libltdl"
+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"
+ sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+ INSTALL QUICKSTART \
+ helpers/basic_auth/MSNT/README.html \
+ helpers/basic_auth/MSNT/confload.cc \
+ helpers/basic_auth/MSNT/msntauth.conf.default \
+ 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/bin:/usr/bin:' \
+ helpers/basic_auth/MSNT/README.html || 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,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 myconf
+ if use kerberos ; then
+ negotiate_modules="kerberos,wrapper"
+ myconf="--with-krb5-config=yes"
+ else
+ negotiate_modules="none"
+ myconf="--with-krb5-config=no"
+ 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"
+
+ # uclibc does not have aio support - needed for coss (#61175)
+ 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 \
+ --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_enable ssl) \
+ $(use_with ssl nettle) \
+ $(use_enable ssl-crtd) \
+ $(use_enable icap-client) \
+ $(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/MSNT-multi-domain/README.txt README.MSNT-multi-domain
+ newdoc helpers/basic_auth/LDAP/README README.LDAP
+ 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 4 ]]; then
+ elog "Please read the release notes at:"
+ elog " http://www.squid-cache.org/Versions/v3/3.4/RELEASENOTES.html"
+ echo
+ fi
+}
diff --git a/net-proxy/squid/squid-3.5.1-r1.ebuild b/net-proxy/squid/squid-3.5.1-r1.ebuild
index 3dd80f436099..ee33971860d2 100644
--- a/net-proxy/squid/squid-3.5.1-r1.ebuild
+++ b/net-proxy/squid/squid-3.5.1-r1.ebuild
@@ -1,6 +1,6 @@
# 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.1-r1.ebuild,v 1.1 2015/02/04 16:10:18 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.1-r1.ebuild,v 1.2 2015/02/25 11:04:26 eras Exp $
EAPI=5
inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -50,7 +50,7 @@ REQUIRED_USE="tproxy? ( caps )
pkg_pretend() {
if use tproxy; then
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+ local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
linux-info_pkg_setup
fi
}
diff --git a/net-proxy/squid/squid-3.5.2.ebuild b/net-proxy/squid/squid-3.5.2.ebuild
index f532deb36c82..d2e1d2cc7ebd 100644
--- a/net-proxy/squid/squid-3.5.2.ebuild
+++ b/net-proxy/squid/squid-3.5.2.ebuild
@@ -1,6 +1,6 @@
# 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.2.ebuild,v 1.1 2015/02/23 08:52:19 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.2.ebuild,v 1.2 2015/02/25 11:04:26 eras Exp $
EAPI=5
inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -50,7 +50,7 @@ REQUIRED_USE="tproxy? ( caps )
pkg_pretend() {
if use tproxy; then
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+ local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
linux-info_pkg_setup
fi
}