diff options
| -rw-r--r-- | net-proxy/squid/ChangeLog | 5 | ||||
| -rw-r--r-- | net-proxy/squid/Manifest | 29 | ||||
| -rw-r--r-- | net-proxy/squid/squid-3.4.7.ebuild | 255 |
3 files changed, 18 insertions, 271 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog index d612385fbe5a..af8e2ac6ba61 100644 --- a/net-proxy/squid/ChangeLog +++ b/net-proxy/squid/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-proxy/squid # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.483 2014/10/01 07:45:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.484 2014/10/03 05:12:55 eras Exp $ + + 03 Oct 2014; Eray Aslan <eras@gentoo.org> -squid-3.4.7.ebuild: + Remove vulnerable version 01 Oct 2014; Agostino Sarubbo <ago@gentoo.org> squid-3.3.13-r1.ebuild: Stable for x86, wrt bug #522498 diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index 9ab3e62a27c6..8adc059f4dad 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -14,23 +14,22 @@ DIST squid-3.4.7.tar.xz 2158672 SHA256 cc40a3cccdcdfc11269ea969e658d99e3ef220299 EBUILD squid-3.3.13-r1.ebuild 7926 SHA256 6368f68719f98e9344b1812d0c6800e953ee6813cf9659856fed48d12618d1fb SHA512 fd4cb23bd9e7a4ac60347cf61c3075e73faaca787209ba08e2a998a8eee8c1016c93ea8f9ec796ee7ad8c24d5d52bc718acb676dfc2e1f7c4439b0b8b938bb4a WHIRLPOOL f837ad559838aabc0bc077e66617a30944087a2781ddc569dbf0a2a58d12ed64e111ed790018d21876f7e9e64f7a79391fb3d768f446bae07c0618adbe3b21dc EBUILD squid-3.3.13.ebuild 7872 SHA256 d8841a735f5ed78440f79dea9bb20cf1819dc83307efbf7e784d74a0f9b51c72 SHA512 8904cc2967240442e23d288069302e9bfae1403ad0d284835c6bd7ffe3fe6f26cc3f91238cb749a39dd04826a8a84ad0829a4424f856b6c4bc91a4e00e8af570 WHIRLPOOL 571a60b5d77c76a8134f5aa50fb053d0e28bee7acee13236c198777f8121a646479e2e257b986ff08eb332831fcb0ef3dae713422c4764f67f39c0c3daba1572 EBUILD squid-3.4.7-r1.ebuild 8079 SHA256 21a99db68c9072aed1ae33ac2fe38f3fb3c0ddb1eb823b86c79c0d82020c43e2 SHA512 f83b61506e54e73803184e488f508ac82470fbeb8227cb90c502e5e6e2d91713f09e5211d6cf3688a30f02520cecee2cf229f2b5104becbfd3c14c3bb1b33680 WHIRLPOOL 0e84966cf62d638110efe4fabff90edf6ff7158e7fb30672aca9c5daffe213d5c8c23b40def060eff5d55e1242441a81767c4a41d080cc02665d7e8b2440bb22 -EBUILD squid-3.4.7.ebuild 8030 SHA256 3b0f07f8f724e98b7ff6efc42baf5c5557108d6ef52941753a7d72da5fb3dc90 SHA512 43670ec1d3d588f553fd06e71af25cd659d4ab526a48e58bfb4c7e73bada1d8c0e2d815f4f84af81a68e06376c0b03eb92a19482d7451c51a3819c596cfbda7c WHIRLPOOL c648b730caf79597c7c0bcca7c327092f7dc66ab694db78ee0726f1afb77331271fceb671ccc3fc711c5cedb625004e66a0ccf85b4fe71d9ae9484d91edad0c0 -MISC ChangeLog 89903 SHA256 ec760268c5c3430a78444ba049c1a8e12b07827e4be66d2ab52614eb5f44610e SHA512 21df3f7f03a4f36ae8e9f5046362769fc63011cc162f9c4897b97860e6bc59163c7ea87dfe73e89cd1e7ae6fc9f570fc1ffce955dd9aa805f771fe725e8f0076 WHIRLPOOL dc09a9d8a7c2d081270ba2701a48ae5b404aeb67ab3abd77b17ae3c7699f6d5fabbad3266abe50089cf0f859b8b14060577d283e35ce28755b21be55c81c1a7d +MISC ChangeLog 89998 SHA256 3e8ebc4e42c1beb954a2a6ad1868c3676b306194777e4062491049e7253c6bde SHA512 813f07cf22ab58a01fc0314724d73e15f2e36296a0e9921278edbac217e7f950f1bcd2ccc4a37ba31e86a269afe27592a150cfe0000b16ee984f89f5a7dfd042 WHIRLPOOL cce5d881e27b185f32f7c0f07a10293b9288b69f2e451f610013de878b8833f9e84e2e83b08668edcbbf4a29300fffaa2ebbb98b55715d0bfe6b11612de0ea71 MISC metadata.xml 1570 SHA256 7a084172a69649c4565af822f331e3085911a506e422ffc68b8a0082ee07ec6e SHA512 74ee493ede7181e22dd1d6a2889ddf3b4443ab677d3801b0c50b7c728c303f813e0a53dfc0931efbade78b98185401b15079e80e8742358a2a080d5a21f7b7b4 WHIRLPOOL d8239bc47c931b8a0e10ec4f16d91845482c35a029bb1d50914874150ec71b5f1a61def07f566ae4f6b10468426e8426ea8a319c30e41f985f5faf82ab1e6942 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUK7EKAAoJELp701BxlEWfoiUP/iQct+oxrGpKAcrvb/K41MWp -KAmvrNZAnfboDEwXO5rNFxbeOa7GI1gZ9JSxpFeNfBzSFBag1bMTQN7x9xA8f/uw -3Cer6Da4pK83aXph/bWEtr7uOQ1iyFsGw4LiG0OzMQ3j+vqKlgqJtqiyHl2NU4Xj -pq91NyZMllQnoJ9epCEYH67fWZMDUzfi+NuiiqgyWBdNO5Vp/AmhuUVTDuUY5ed5 -Vy/q4DmYUP3ZrXL8kFtJEN3jpkNpFnR7OnJSXRHoZqZmor6vaITkRauQR4YaMMRk -GrKAjU6WIfLaLRsnw6ylYFAxL0KLjydhs+z9RaDs9Sujq/OQJj9cuVbbDOTOvrI5 -uQ9P4siy1los+fHfcxcTh7/s1uesbuoOMu8C/5m3ZB38gBCs5kb4vw1kioluKyqP -Tskze+cmCiEX9yTtWrvvR1gnI5PaHy73Vinw+GPFW6KbRjUwJVRW7RJH7NPRpXLm -fbH45i0R3bUZ1ad3AWe4+5iwLzh3qzwdGN32mtzoyG3hovJX2yxANEWQ/nRhusS5 -xkU+/jhWZzucj3o3N0sFBx/fP3zOT8Vfbp0lZVNVFuQAmuQ9LGuffcHvg1Za8vuj -DG/v79ezytXSq/T1BhwgqZqkQvnzuS5LPLYudagCFaPUImXndhfCa165JjUfykCX -9CCREM+vWixtVX5IW72O -=cs8e +iQIcBAEBCAAGBQJULjBiAAoJEHfx8XVYajsfbV4P/3y8USN2rGrj757QecLl+PSp +1Ud+LKowiHQoCkiT9kufgOt8qGYru5JjNwNTmm3wCZYD4YVazS2YuDH/JmkTNOuA +kpNmkp/KEnDugpiahJvGsABFGoqPt5mQucu9GogN85hVysa4PWDtV2TOflbPSMKr +MBKfH4H4dmsq6EzA7kT6zFwnh/uUC94nUrvDU/CANEF9X0GHdNu4wbI/nbYNJNTO +iDe+9To/CqNFhj9Tmhq//Mla2RmZS5yoXzLBC0dTE2vSeSQthYwWmk8Yl5hdNU4J +ndcYgd/WU0DeNPuhUjDK0oLhPtx9r+HqY8mOI66wJVMu3IGr5XvQD8w7iZ9eVWJl +VOvuM0NnCYTNDhCssAW9lK1olyjxcOu6l1eYbr0G7giHk8glQVTheZMnERpbVJa9 +KvbovCpnkLiE8qlzUywcCdcS3vhTmkBq3WmATR/eyfCsM8vvdxg6kpk/aDVL80SD +na7jbRKsH2bJR7Ji0kadMiqUwkaQ+PmfUuuF+/RIV5UmqtV/xOu15FCTbl2dCWUH +pMsuXADX2EhYZ5cK8MfeHtTmJNie8MjOZMBJAjSfOdywdlyNqSjBDiB4UGJ6o8rk +Chfo/HJlH4MoBxHaGPiil09VGW7IT7BRZm2xtMfZ0F9Cgb9U7YXIi/eK9mmlVTiL +10b+kEK+N5hqJQSIkmez +=bLk+ -----END PGP SIGNATURE----- diff --git a/net-proxy/squid/squid-3.4.7.ebuild b/net-proxy/squid/squid-3.4.7.ebuild deleted file mode 100644 index 7bfc35694e51..000000000000 --- a/net-proxy/squid/squid-3.4.7.ebuild +++ /dev/null @@ -1,255 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.7.ebuild,v 1.2 2014/08/28 07:57:59 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="ftp://ftp.squid-cache.org/pub/archive/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 ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - sys-devel/libtool - dev-lang/perl - sys-devel/libtool" -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 ) - 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_TPROXY ~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 - - epatch_user - - # Bug #419685 - eautoreconf in src_prepare() fails in libltdl/ - # aclocal-1.11: `configure.ac' or `configure.in' is required - MAKEOPTS="${MAKEOPTS} -j1" 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 -} |