diff options
author | Repository QA checks <repo-qa-checks@gentoo.org> | 2016-04-18 16:08:11 +0000 |
---|---|---|
committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2016-04-18 16:08:11 +0000 |
commit | 8b4b968c705ea59076ed7a3ce7ffc2651be2b27d (patch) | |
tree | a59e59991ce7ebb7810bd4f404e5355d30a867e6 | |
parent | 2016-04-18 15:27:30 UTC (diff) | |
parent | net-proxy/squid: Include upstream fix for varyEvaluateMatch (diff) | |
download | gentoo-8b4b968c705ea59076ed7a3ce7ffc2651be2b27d.tar.gz gentoo-8b4b968c705ea59076ed7a3ce7ffc2651be2b27d.tar.bz2 gentoo-8b4b968c705ea59076ed7a3ce7ffc2651be2b27d.zip |
Merge updates from master
-rw-r--r-- | net-proxy/squid/files/squid-3.5-14022.patch | 50 | ||||
-rw-r--r-- | net-proxy/squid/squid-3.5.16-r1.ebuild | 250 | ||||
-rw-r--r-- | profiles/prefix/windows/cygwin/2.0/package.use | 7 |
3 files changed, 307 insertions, 0 deletions
diff --git a/net-proxy/squid/files/squid-3.5-14022.patch b/net-proxy/squid/files/squid-3.5-14022.patch new file mode 100644 index 000000000000..4b598b643b72 --- /dev/null +++ b/net-proxy/squid/files/squid-3.5-14022.patch @@ -0,0 +1,50 @@ +------------------------------------------------------------ +revno: 14022 +revision-id: squid3@treenet.co.nz-20160411131130-z2lp1uj94sovgthy +parent: squid3@treenet.co.nz-20160411124138-zsrf0ltaxlj25k2x +fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4481 +committer: Amos Jeffries <squid3@treenet.co.nz> +branch nick: 3.5 +timestamp: Tue 2016-04-12 01:11:30 +1200 +message: + Bug 4481: varyEvaluateMatch: Oops. Not a Vary match on second attempt +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3@treenet.co.nz-20160411131130-z2lp1uj94sovgthy +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# testament_sha1: 91af3a71dfc316577c5661733fc0c9fdeeb8ba83 +# timestamp: 2016-04-11 13:50:55 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# base_revision_id: squid3@treenet.co.nz-20160411124138-\ +# zsrf0ltaxlj25k2x +# +# Begin patch +=== modified file 'src/StoreMetaVary.cc' +--- src/StoreMetaVary.cc 2016-04-01 06:15:31 +0000 ++++ src/StoreMetaVary.cc 2016-04-11 13:11:30 +0000 +@@ -22,6 +22,9 @@ + /* XXX separate this mutator from the query */ + /* Assume the object is OK.. remember the vary request headers */ + e->mem_obj->vary_headers.assign(static_cast<const char *>(value), length); ++ /* entries created before SBuf vary handling may include string terminator */ ++ static const SBuf nul("\0", 1); ++ e->mem_obj->vary_headers.trim(nul); + return true; + } + + +=== modified file 'src/store_swapmeta.cc' +--- src/store_swapmeta.cc 2016-04-01 06:15:31 +0000 ++++ src/store_swapmeta.cc 2016-04-11 13:11:30 +0000 +@@ -89,9 +89,7 @@ + SBuf vary(e->mem_obj->vary_headers); + + if (!vary.isEmpty()) { +- // TODO: do we still need +1 here? StoreMetaVary::checkConsistency +- // no longer relies on nul-termination, but other things might. +- t = StoreMeta::Factory(STORE_META_VARY_HEADERS, vary.length() + 1, vary.c_str()); ++ t = StoreMeta::Factory(STORE_META_VARY_HEADERS, vary.length(), vary.c_str()); + + if (!t) { + storeSwapTLVFree(TLV); + diff --git a/net-proxy/squid/squid-3.5.16-r1.ebuild b/net-proxy/squid/squid-3.5.16-r1.ebuild new file mode 100644 index 000000000000..d806f5680d7d --- /dev/null +++ b/net-proxy/squid/squid-3.5.16-r1.ebuild @@ -0,0 +1,250 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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:0 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 + enewuser squid -1 -1 /var/cache/squid squid +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-3.5-14022.patch" + epatch "${FILESDIR}/${PN}-3.5.7-gentoo.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 \ + --with-ltdl-includedir=/usr/include \ + --with-ltdl-libdir=/usr/$(get_libdir) \ + $(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 +} diff --git a/profiles/prefix/windows/cygwin/2.0/package.use b/profiles/prefix/windows/cygwin/2.0/package.use new file mode 100644 index 000000000000..d701f36dfe00 --- /dev/null +++ b/profiles/prefix/windows/cygwin/2.0/package.use @@ -0,0 +1,7 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Michael Haubenwallner <haubi@gentoo.org> (18 Apr 2016) +# Cygwin coreutils provide kill as gkill +sys-apps/coreutils kill |