From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C3903158009 for ; Sun, 18 Jun 2023 04:25:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CCADE0909; Sun, 18 Jun 2023 04:25:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46192E0909 for ; Sun, 18 Jun 2023 04:25:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A973335D6B for ; Sun, 18 Jun 2023 04:25:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9C0BA90 for ; Sun, 18 Jun 2023 04:25:06 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1687062294.8b6de11b7479f646a9f935ca3295aae637b124aa.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/squid/Manifest net-proxy/squid/files/squid-4.17-fix-libxml2-2.10.0.patch net-proxy/squid/files/squid-4.3-gentoo.patch net-proxy/squid/squid-4.17-r1.ebuild X-VCS-Directories: net-proxy/squid/files/ net-proxy/squid/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8b6de11b7479f646a9f935ca3295aae637b124aa X-VCS-Branch: master Date: Sun, 18 Jun 2023 04:25:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cfd80f2c-bce2-4c7e-9ebd-f8584f008aae X-Archives-Hash: 8375fa427de4b2c73f0fc13793f97702 commit: 8b6de11b7479f646a9f935ca3295aae637b124aa Author: Hank Leininger korelogic com> AuthorDate: Sat Jun 17 18:34:30 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 18 04:24:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6de11b net-proxy/squid: drop 4.17-r1 Signed-off-by: Hank Leininger korelogic.com> Closes: https://github.com/gentoo/gentoo/pull/31518 Signed-off-by: Sam James gentoo.org> net-proxy/squid/Manifest | 1 - .../files/squid-4.17-fix-libxml2-2.10.0.patch | 30 --- net-proxy/squid/files/squid-4.3-gentoo.patch | 79 ------ net-proxy/squid/squid-4.17-r1.ebuild | 283 --------------------- 4 files changed, 393 deletions(-) diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index 53f0c48eec29..51802a78e06a 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -1,4 +1,3 @@ -DIST squid-4.17.tar.xz 2464204 BLAKE2B e227dfbac846dff66f04c6c72d81d667076107653721d14804f079518cef68efc53f5404fbe3306efb0c775a10638661c300a8e7cd3d7ab43c0e57a344387674 SHA512 cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a DIST squid-5.7.tar.xz 2566560 BLAKE2B 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299 SHA512 624a39041a6ceda6c470dc0937616f1aa67200f3db02b4d74095d8d706ed31d6df5e0417dcacde45f6be40b617bee018849793d52c96a626aab32a2b182972aa DIST squid-5.8.tar.xz 2447560 BLAKE2B c9d1ae9464e68beabdf7ae1641a70d6c614bc4d4f4bae3fc5946c2bf61510634992cbd5abe63f071104edb2fa487a6c5c7fb8fbf8f06ac723a6522ec9ade8b68 SHA512 81a9a7d1dfcb58476369e08e99feb76411dd3242a3374feb175408fa0dc8161545a9a903603219c6fa2bcfb615461901e093428e97ac74cf4c596a7065d3247d DIST squid-5.9.tar.xz 2569204 BLAKE2B 898a34357f8019291379ea37c66fa312e1a6437e8f643987dd4e54d7d52728248e16129b00195c5f6e0378c0f32c9f9ade3f98ca0ec4bb952f9f443357face82 SHA512 7dc366ef6b2a397ca6adec993c05876949de5f5e72a8a4409c9c9c52c42a8a4b37f58e85a171eebd36a166951f6c764176cfebec30019b299abe34a5adc4e5ac diff --git a/net-proxy/squid/files/squid-4.17-fix-libxml2-2.10.0.patch b/net-proxy/squid/files/squid-4.17-fix-libxml2-2.10.0.patch deleted file mode 100644 index ebc0cd698e14..000000000000 --- a/net-proxy/squid/files/squid-4.17-fix-libxml2-2.10.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/866518 -https://github.com/squid-cache/squid/commit/c4e6b7c2a12fa218089fe839f769ffc8ae18dea4 - -From c4e6b7c2a12fa218089fe839f769ffc8ae18dea4 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Sun, 20 Feb 2022 19:42:40 +0000 -Subject: [PATCH] ESI: Drop incorrect and unnecessary xmlSetFeature() call - (#988) - -xmlSetFeature() has been deprecated for 10+ years and will eventually be -removed from libxml2. Squid calls xmlSetFeature() with the wrong -argument: a nil `value` pointer instead of a pointer to a zero value. -When called with a nil `value`, the function does nothing but returning -an error. Squid does not check whether xmlSetFeature() call is -successful, and the bug went unnoticed since libxml2 support was added -in commit 964b44c. - -Since libxml2 does not substitute entities by default, the call can be -removed to achieve the intended effect. ---- a/src/esi/Libxml2Parser.cc -+++ b/src/esi/Libxml2Parser.cc -@@ -118,7 +118,6 @@ ESILibxml2Parser::ESILibxml2Parser(ESIParserClient *aClient) : theClient (aClien - - /* TODO: grab the document encoding from the headers */ - parser = xmlCreatePushParserCtxt(&sax, static_cast(this), NULL, 0, NULL); -- xmlSetFeature(parser, "substitute entities", 0); - - if (entity_doc == NULL) - entity_doc = htmlNewDoc(NULL, NULL); - diff --git a/net-proxy/squid/files/squid-4.3-gentoo.patch b/net-proxy/squid/files/squid-4.3-gentoo.patch deleted file mode 100644 index f5152b898852..000000000000 --- a/net-proxy/squid/files/squid-4.3-gentoo.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/configure.ac 2018-10-14 17:22:35.000000000 +0300 -+++ b/configure.ac 2018-10-17 21:27:24.806986467 +0300 -@@ -32,9 +32,9 @@ PRESET_CXXFLAGS="$CXXFLAGS" - PRESET_LDFLAGS="$LDFLAGS" - - dnl Set default LDFLAGS --if test "x$LDFLAGS" = "x" ; then -- LDFLAGS="-g" --fi -+dnl if test "x$LDFLAGS" = "x" ; then -+dnl LDFLAGS="-g" -+dnl fi - - # Check for GNU cc - AC_PROG_CC ---- a/src/cf.data.pre 2018-10-14 08:25:34.000000000 +0300 -+++ b/src/cf.data.pre 2018-10-17 21:27:24.809986705 +0300 -@@ -1520,6 +1520,7 @@ acl Safe_ports port 280 # http-mgmt - acl Safe_ports port 488 # gss-http - acl Safe_ports port 591 # filemaker - acl Safe_ports port 777 # multiling http -+acl Safe_ports port 901 # SWAT - acl CONNECT method CONNECT - NOCOMMENT_END - DOC_END -@@ -6819,11 +6820,11 @@ COMMENT_END - - NAME: cache_mgr - TYPE: string --DEFAULT: webmaster -+DEFAULT: root - LOC: Config.adminEmail - DOC_START - Email-address of local cache manager who will receive -- mail if the cache dies. The default is "webmaster". -+ mail if the cache dies. The default is "root". - DOC_END - - NAME: mail_from ---- a/src/debug.cc 2018-10-14 08:25:34.000000000 +0300 -+++ b/src/debug.cc 2018-10-17 21:27:24.807986546 +0300 -@@ -490,7 +490,7 @@ _db_init(const char *logfile, const char - #if HAVE_SYSLOG && defined(LOG_LOCAL4) - - if (Debug::log_syslog) -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility); - - #endif /* HAVE_SYSLOG */ - ---- a/src/main.cc 2018-10-14 08:25:34.000000000 +0300 -+++ b/src/main.cc 2018-10-17 21:28:28.632044541 +0300 -@@ -1912,7 +1912,7 @@ watch_child(const CommandLine &masterCom - - enter_suid(); - -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); - - if (!opt_foreground) - GoIntoBackground(); -@@ -2012,7 +2012,7 @@ watch_child(const CommandLine &masterCom - - if ((pid = fork()) == 0) { - /* child */ -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); - (void)execvp(masterCommand.arg0(), kidCommand.argv()); - int xerrno = errno; - syslog(LOG_ALERT, "execvp failed: %s", xstrerr(xerrno)); -@@ -2024,7 +2024,7 @@ watch_child(const CommandLine &masterCom - } - - /* parent */ -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); - - // If Squid received a signal while checking for dying kids (below) or - // starting new kids (above), then do a fast check for a new dying kid diff --git a/net-proxy/squid/squid-4.17-r1.ebuild b/net-proxy/squid/squid-4.17-r1.ebuild deleted file mode 100644 index 1b47ce85183c..000000000000 --- a/net-proxy/squid/squid-4.17-r1.ebuild +++ /dev/null @@ -1,283 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" - -# Upstream patch ID for the most recent bug-fixed update to the formal release. -r= -#r=-20181117-r0022167 -if [[ -z "${r}" ]]; then - SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}.tar.xz" -else - SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}${r}.tar.bz2" - S="${S}${r}" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86" -IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ - ecap esi ssl-crtd \ - mysql postgres sqlite systemd \ - perl qos tproxy \ - +htcp +wccp +wccpv2" - -RESTRICT="!test? ( test )" - -BDEPEND="dev-lang/perl" - -COMMON_DEPEND="acct-group/squid - acct-user/squid - virtual/libcrypt:= - caps? ( >=sys-libs/libcap-2.16 ) - pam? ( sys-libs/pam ) - ldap? ( net-nds/openldap:= ) - kerberos? ( virtual/krb5 ) - qos? ( net-libs/libnetfilter_conntrack ) - ssl? ( - !gnutls? ( - =net-libs/gnutls-3.1.5:= ) - logrotate? ( app-admin/logrotate ) - >=sys-libs/db-4:* - dev-libs/libltdl:0" - -DEPEND="${COMMON_DEPEND} - ${BDEPEND} - ecap? ( virtual/pkgconfig ) - test? ( dev-util/cppunit )" - -RDEPEND="${COMMON_DEPEND} - samba? ( net-fs/samba ) - perl? ( dev-lang/perl ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - selinux? ( sec-policy/selinux-squid ) - sqlite? ( dev-perl/DBD-SQLite )" - -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 -} - -src_prepare() { - eapply "${FILESDIR}/${PN}-4.3-gentoo.patch" - eapply "${FILESDIR}/${PN}-4.17-use-system-libltdl.patch" - eapply "${FILESDIR}/${PN}-4.17-fix-libxml2-2.10.0.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/purge.1 || 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:' \ - src/acl/external/unix_group/ext_unix_group_acl.8 \ - src/acl/external/session/ext_session_acl.8 || die - sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \ - scripts/check_cache.pl || 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 - - sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die - - eapply_user - eautoreconf -} - -src_configure() { - local basic_modules="NCSA,POP3,getpwnam" - use samba && basic_modules+=",SMB" - use ldap && basic_modules+=",SMB_LM,LDAP" - use pam && basic_modules+=",PAM" - use sasl && basic_modules+=",SASL" - use nis && 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,delayer,time_quota" - use samba && ext_helpers+=",wbinfo_group" - use ldap && ext_helpers+=",LDAP_group,eDirectory_userip" - use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group" - if use mysql || use postgres || use sqlite ; then - ext_helpers+=",SQL_session" - fi - - 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 - - tc-export_build_env BUILD_CXX - export BUILDCXX=${BUILD_CXX} - export BUILDCXXFLAGS=${BUILD_CXXFLAGS} - tc-export CC AR - - # Should be able to drop this workaround with newer versions. - # https://bugs.squid-cache.org/show_bug.cgi?id=4224 - tc-is-cross-compiler && export squid_cv_gnu_atomics=no - - # Bug #719662 - (use ppc || use arm || use hppa) && append-libs -latomic - - 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 \ - --with-build-environment=default \ - --disable-strict-error-checking \ - --disable-arch-native \ - --without-included-ltdl \ - --with-ltdl-include="${ESYSROOT}"/usr/include \ - --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir) \ - $(use_with caps libcap) \ - $(use_enable ipv6) \ - $(use_enable snmp) \ - $(use_with ssl openssl) \ - $(use_with ssl nettle) \ - $(use_with gnutls) \ - $(use_enable ssl-crtd) \ - $(use_with systemd) \ - $(use_enable ecap) \ - $(use_enable esi) \ - $(use_enable htcp) \ - $(use_enable wccp) \ - $(use_enable wccpv2) \ - ${transparent} \ - ${myconf} -} - -src_install() { - default - - systemd_dounit "tools/systemd/squid.service" - - # 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 - - # these scripts depend on perl - if ! use perl; then - for f in basic_pop3_auth \ - ext_delayer_acl \ - helper-mux \ - log_db_daemon \ - security_fake_certverify \ - storeid_file_rewrite \ - url_lfs_rewrite; do - rm "${D}"/usr/libexec/squid/${f} || die - done - fi - - # cleanup - rm -r "${D}"/run "${D}"/var/cache || die - - dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt - newdoc src/auth/negotiate/kerberos/README README.kerberos - newdoc src/auth/basic/RADIUS/README README.RADIUS - newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group - dodoc RELEASENOTES.html - - if use pam; then - newpamd "${FILESDIR}/squid.pam" squid - fi - - newconfd "${FILESDIR}/squid.confd-r2" squid - newinitd "${FILESDIR}/squid.initd-r5" 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() { - elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'." - if [[ ${#r} -gt 0 ]]; then - elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support." - fi -}