* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/
@ 2022-09-23 7:42 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-09-23 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 1efb38b2ae71a0cf0dc13480491b3cba754ccc1c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 07:16:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 07:16:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efb38b2
net-proxy/squid: fix build w/ libxml2-2.10.0
Closes: https://bugs.gentoo.org/866518
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/squid-4.17-fix-libxml2-2.10.0.patch | 30 ++++++++++++++++++++++
net-proxy/squid/squid-4.17-r1.ebuild | 1 +
net-proxy/squid/squid-5.4.1-r2.ebuild | 1 +
3 files changed, 32 insertions(+)
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
new file mode 100644
index 000000000000..ebc0cd698e14
--- /dev/null
+++ b/net-proxy/squid/files/squid-4.17-fix-libxml2-2.10.0.patch
@@ -0,0 +1,30 @@
+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 <wellnhofer@aevum.de>
+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<void *>(this), NULL, 0, NULL);
+- xmlSetFeature(parser, "substitute entities", 0);
+
+ if (entity_doc == NULL)
+ entity_doc = htmlNewDoc(NULL, NULL);
+
diff --git a/net-proxy/squid/squid-4.17-r1.ebuild b/net-proxy/squid/squid-4.17-r1.ebuild
index 106d72f54d7e..32578aaf7326 100644
--- a/net-proxy/squid/squid-4.17-r1.ebuild
+++ b/net-proxy/squid/squid-4.17-r1.ebuild
@@ -80,6 +80,7 @@ pkg_pretend() {
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 \
diff --git a/net-proxy/squid/squid-5.4.1-r2.ebuild b/net-proxy/squid/squid-5.4.1-r2.ebuild
index 94456703bd17..4a8f16e2cd05 100644
--- a/net-proxy/squid/squid-5.4.1-r2.ebuild
+++ b/net-proxy/squid/squid-5.4.1-r2.ebuild
@@ -82,6 +82,7 @@ pkg_pretend() {
src_prepare() {
eapply "${FILESDIR}/${PN}-5.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 \
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/
@ 2023-12-07 6:21 Arthur Zamarin
0 siblings, 0 replies; 11+ messages in thread
From: Arthur Zamarin @ 2023-12-07 6:21 UTC (permalink / raw
To: gentoo-commits
commit: 2a2b11bf740e489bd7f00271bc26c1d1bdba27de
Author: Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Sun Dec 3 17:39:07 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 06:20:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a2b11bf
net-proxy/squid: drop 5.7-r1, 5.8, 5.9, 6.2, 6.4
Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Bug: https://bugs.gentoo.org/917615
Bug: https://bugs.gentoo.org/916334
Closes: https://github.com/gentoo/gentoo/pull/34106
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-proxy/squid/Manifest | 5 -
net-proxy/squid/files/squid-5.3-gentoo.patch | 87 ------
net-proxy/squid/files/squid.initd-r5 | 125 ---------
net-proxy/squid/squid-5.7-r1.ebuild | 380 --------------------------
net-proxy/squid/squid-5.8.ebuild | 382 --------------------------
net-proxy/squid/squid-5.9.ebuild | 382 --------------------------
net-proxy/squid/squid-6.2.ebuild | 383 --------------------------
net-proxy/squid/squid-6.4.ebuild | 386 ---------------------------
8 files changed, 2130 deletions(-)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 2b40dfc56bd5..dee03380a4fe 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,6 +1 @@
-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
-DIST squid-6.2.tar.xz 2546172 BLAKE2B e934371e40093b1570c88c76f9427089087d2fa0b16629e7ca3afabd17f7bc5592b2b65354da54ebc43350ab6732081dd39a39e5db712f70a48246c22b8ae45d SHA512 a2f3ad666b88708ddc52958e610222778e4f64c2ac097b821867ae4022ca35dcbe225f2c5bba42a69fa56f89feebf63764d1a936444e4debce7e55e87b7366db
-DIST squid-6.4.tar.xz 2553476 BLAKE2B 0f55fb8b4bcc291b9d978c8a150d86986ca32cf7c866907ac03ff3995ad6fbce333b0ebe977827e01e51a08d7104e41300a402bb811be0692a61fa81fd160304 SHA512 7bbf759841448874090a145699ee01f67696c19da147e433b1ecc80a856095cbfae611ef910bc4f2c44218101d89f2ee13796f5b7ada2e21e95638d4dae077ab
DIST squid-6.5.tar.xz 2554492 BLAKE2B 91ed91f9b0f56f440a7f15a63bbc3e19537b60bc8b31b5bf7e16884367d0da060c5490e1721dbd7c5fce7f4a4e958fb3554d6bdc5b55f568598f907722b651de SHA512 d3a40f5f390f0042a8e981ca28755a90dd520230a06b4246ba7bec0c98025ce1cdc7426797a666f769addd60238e28e1f04d2c701ea2ef2d7329dbe87b830d70
diff --git a/net-proxy/squid/files/squid-5.3-gentoo.patch b/net-proxy/squid/files/squid-5.3-gentoo.patch
deleted file mode 100644
index 54c036e14e50..000000000000
--- a/net-proxy/squid/files/squid-5.3-gentoo.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 7bd608b..0a0a908 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,9 +33,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
-diff --git a/src/cf.data.pre b/src/cf.data.pre
-index 9275219..1e3aca2 100644
---- a/src/cf.data.pre
-+++ b/src/cf.data.pre
-@@ -1633,6 +1633,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
- NOCOMMENT_END
- DOC_END
-
-@@ -7200,11 +7201,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
-diff --git a/src/debug.cc b/src/debug.cc
-index 59ad1e9..265a9fe 100644
---- a/src/debug.cc
-+++ b/src/debug.cc
-@@ -496,7 +496,7 @@ _db_init(const char *logfile, const char *options)
- #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 */
-
-diff --git a/src/main.cc b/src/main.cc
-index 4b3988e..5622141 100644
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -1921,7 +1921,7 @@ watch_child(const CommandLine &masterCommand)
-
- 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();
-@@ -2013,7 +2013,7 @@ watch_child(const CommandLine &masterCommand)
-
- 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));
-@@ -2025,7 +2025,7 @@ watch_child(const CommandLine &masterCommand)
- }
-
- /* 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/files/squid.initd-r5 b/net-proxy/squid/files/squid.initd-r5
deleted file mode 100644
index 0572fbcefefb..000000000000
--- a/net-proxy/squid/files/squid.initd-r5
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-SQUID_SVCNAME=$( echo "${RC_SVCNAME}" | tr -cd '[a-zA-Z0-9]' )
-
-extra_started_commands="reload rotate"
-
-depend() {
- use dns net
-}
-
-checkconfig() {
- local CONFFILES="/etc/squid/${RC_SVCNAME}.conf /etc/squid/${RC_SVCNAME}.include /etc/squid/${RC_SVCNAME}.include.*"
- if [ ! -f /etc/squid/${RC_SVCNAME}.conf ]; then
- eerror "You need to create /etc/squid/${RC_SVCNAME}.conf first."
- eerror "The main configuration file and all included file names should have the following format:"
- eerror "${CONFFILES}"
- eerror "An example can be found in /etc/squid/squid.conf.default"
- return 1
- fi
-
- local PIDFILE=$(cat ${CONFFILES} 2>/dev/null 3>/dev/null | awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }')
- [ -z ${PIDFILE} ] && PIDFILE=/run/squid.pid
- if [ /run/${RC_SVCNAME}.pid != ${PIDFILE} ]; then
- eerror "/etc/squid/${RC_SVCNAME}.conf must set pid_filename to"
- eerror " /run/${RC_SVCNAME}.pid"
- eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
- eerror " in any other instance of squid."
- eerror "Make sure the main configuration file and all included file names have the following format:"
- eerror "${CONFFILES}"
- return 1
- fi
-
- # Maximum file descriptors squid can open is determined by:
- # a basic default of N=1024
- # ... altered by ./configure --with-filedescriptors=N
- # ... overridden on production by squid.conf max_filedescriptors (if,
- # and only if, setrlimit() RLIMIT_NOFILE is able to be built+used).
- # Since we do not configure hard coded # of filedescriptors anymore,
- # there is no need for ulimit calls in the init script.
- # Use max_filedescriptors in squid.conf instead.
-
- local CACHE_SWAP=$(cat ${CONFFILES} 2>/dev/null 3>/dev/null | awk '/^[ \t]*cache_dir[ \t]+/ { if ( $2 == "rock" ) printf "%s/rock ", $3; else if ( $2 == "coss" ) printf "%s/stripe ", $3; else printf "%s/00 ", $3; }')
- [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
-
- local x
- for x in $CACHE_SWAP ; do
- if [ ! -e $x ] ; then
- ebegin "Initializing cache directory ${x%/*}"
- local ORIG_UMASK=$(umask)
- umask 027
-
- if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
- eend 1
- return 1
- fi
-
- local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} 2>&1)"
- if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
- umask $ORIG_UMASK
- eend 1
- echo "$INIT_CACHE_RESPONSE"
- return 1
- fi
-
- umask $ORIG_UMASK
- eend 0
- break
- fi
- done
-
- return 0
-}
-
-start() {
- checkconfig || return 1
- checkpath -d -q -m 0750 -o squid:squid /run/${RC_SVCNAME}
-
- # see https://wiki.squid-cache.org/MultipleInstances
- ebegin "Starting ${RC_SVCNAME} (service name ${SQUID_SVCNAME}) with KRB5_KTNAME=\"${SQUID_KEYTAB}\" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
- KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
- eend $? && sleep 1
-}
-
-stop() {
- ebegin "Stopping ${RC_SVCNAME} with /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
- if /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} ; then
- # Now we have to wait until squid has _really_ stopped.
- sleep 1
- if [ -f /run/${RC_SVCNAME}.pid ] ; then
- einfon "Waiting for squid to shutdown ."
- cnt=0
- while [ -f /run/${RC_SVCNAME}.pid ] ; do
- cnt=$(expr $cnt + 1)
- if [ $cnt -gt 60 ] ; then
- # Waited 120 seconds now. Fail.
- echo
- eend 1 "Failed."
- break
- fi
- sleep 2
- printf "."
- done
- echo
- fi
- else
- eerror "Squid shutdown failed, probably service is already down."
- fi
- eend 0
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading ${RC_SVCNAME} with /usr/sbin/squid -k reconfigure -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
- /usr/sbin/squid -k reconfigure -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
- eend $?
-}
-
-rotate() {
- service_started ${RC_SVCNAME} || return 1
- ebegin "Rotating ${RC_SVCNAME} logs with /usr/sbin/squid -k rotate -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
- /usr/sbin/squid -k rotate -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
- eend $?
-}
diff --git a/net-proxy/squid/squid-5.7-r1.ebuild b/net-proxy/squid/squid-5.7-r1.ebuild
deleted file mode 100644
index adf1e1062c64..000000000000
--- a/net-proxy/squid/squid-5.7-r1.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-MY_PV_MAJOR=$(ver_cut 1)
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-#r=-20181117-r0022167
-r=
-if [[ -z ${r} ]]; then
- SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
-else
- SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
- S="${S}${r}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86"
-IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
-IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp +wccp +wccpv2"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tproxy? ( caps ) qos? ( caps )"
-
-DEPEND="
- acct-group/squid
- acct-user/squid
- dev-libs/libltdl
- sys-libs/tdb
- virtual/libcrypt:=
- caps? ( >=sys-libs/libcap-2.16 )
- ecap? ( net-libs/libecap:1 )
- esi? (
- dev-libs/expat
- dev-libs/libxml2
- )
- ldap? ( net-nds/openldap:= )
- gnutls? ( >=net-libs/gnutls-3.1.5:= )
- logrotate? ( app-admin/logrotate )
- nis? (
- net-libs/libtirpc:=
- net-libs/libnsl:=
- )
- kerberos? ( virtual/krb5 )
- pam? ( sys-libs/pam )
- qos? ( net-libs/libnetfilter_conntrack )
- ssl? (
- dev-libs/nettle:=
- !gnutls? (
- dev-libs/openssl:=
- )
- )
- sasl? ( dev-libs/cyrus-sasl )
- systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
- ${DEPEND}
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- perl? ( dev-lang/perl )
- samba? ( net-fs/samba )
- selinux? ( sec-policy/selinux-squid )
- sqlite? ( dev-perl/DBD-SQLite )
-"
-BDEPEND="
- dev-lang/perl
- ecap? ( virtual/pkgconfig )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.3-gentoo.patch
- "${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
-)
-
-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() {
- default
-
- # Fixup various paths
- 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 's:/var/run/:/run/:g' tools/systemd/squid.service || die
-
- sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
- libltdl/configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --datadir=/usr/share/squid
- --libexecdir=/usr/libexec/squid
- --localstatedir=/var
- --sysconfdir=/etc/squid
- --with-default-user=squid
- --with-logdir=/var/log/squid
- --with-pidfile=/run/squid.pid
-
- --enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
- --enable-log-daemon-helpers
- --enable-url-rewrite-helpers
- --enable-cache-digests
- --enable-delay-pools
- --enable-disk-io
- --enable-eui
- --enable-icmp
- --enable-ipv6
- --enable-follow-x-forwarded-for
- --enable-removal-policies="lru,heap"
- --disable-strict-error-checking
- --disable-arch-native
-
- --with-large-files
- --with-build-environment=default
-
- --with-tdb
-
- --without-included-ltdl
- --with-ltdl-include="${ESYSROOT}"/usr/include
- --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
-
- $(use_with caps libcap)
- $(use_enable snmp)
- $(use_with ssl openssl)
- $(use_with ssl nettle)
- $(use_with gnutls)
- $(use_enable ssl-crtd)
- $(use_with systemd)
- $(use_with test cppunit)
- $(use_enable ecap)
- $(use_enable esi)
- $(use_enable esi expat)
- $(use_enable esi libxml2)
- $(use_enable htcp)
- $(use_enable wccp)
- $(use_enable wccpv2)
- )
-
- # Basic modules
- local basic_modules=(
- NCSA
- POP3
- getpwnam
-
- $(usev samba 'SMB')
- $(usev ldap 'SMB_LM LDAP')
- $(usev pam 'PAM')
- $(usev sasl 'SASL')
- $(usev nis 'NIS')
- $(usev radius 'RADIUS')
- )
-
- use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
-
- if use mysql || use postgres || use sqlite; then
- basic_modules+=( DB )
- fi
-
- # Digests
- local digest_modules=(
- file
-
- $(usev ldap 'LDAP eDirectory')
- )
-
- # Kerberos
- local negotiate_modules=( none )
-
- myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
-
- if use kerberos; then
- # We intentionally overwrite negotiate_modules here to lose
- # the 'none'.
- negotiate_modules=( kerberos wrapper )
-
- if has_version app-crypt/heimdal; then
- myeconfargs+=(
- --without-mit-krb5
- --with-heimdal-krb5
- )
- else
- myeconfargs+=(
- --with-mit-krb5
- --without-heimdal-krb5
- )
- fi
- fi
-
- # NTLM modules
- local ntlm_modules=( none )
-
- if use samba ; then
- # We intentionally overwrite ntlm_modules here to lose
- # the 'none'.
- ntlm_modules=( SMB_LM )
- fi
-
- # External helpers
- local ext_helpers=(
- file_userip
- session
- unix_group
- delayer
- time_quota
-
- $(usev samba 'wbinfo_group')
- $(usev ldap '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
-
- # Storage modules
- local storeio_modules=(
- aufs
- diskd
- rock
- ufs
- )
-
- #
- local transparent
- if use kernel_linux; then
- myeconfargs+=(
- --enable-linux-netfilter
- $(usev qos '--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
- append-atomic-flags
-
- print_options_without_comma() {
- # IFS as ',' will cut off any trailing commas
- (
- IFS=','
- options=( $(printf "%s," "${@}") )
- echo "${options[*]}"
- )
- }
-
- myeconfargs+=(
- --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
- --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
- --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
- --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
- --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
- --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
- )
-
- econf "${myeconfargs[@]}"
-}
-
-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
- local perl_scripts=(
- basic_pop3_auth ext_delayer_acl helper-mux
- log_db_daemon security_fake_certverify
- storeid_file_rewrite url_lfs_rewrite
- )
-
- local script
- for script in "${perl_scripts[@]}"; do
- rm "${ED}"/usr/libexec/squid/${script} || 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
-
- # Hack for bug #834503 (see also bug #664940)
- # Please keep this for a few years until it's no longer plausible
- # someone is upgrading from < squid 5.7.
- mv "${ED}"/usr/share/squid/errors{,.new} || die
-}
-
-pkg_preinst() {
- # Remove file in EROOT that the directory collides with.
- rm -rf "${EROOT}"/usr/share/squid/errors || die
-
- # Following the collision protection check, reverse
- # src_install's rename in ED.
- mv "${ED}"/usr/share/squid/errors{.new,} || die
-}
-
-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
-}
diff --git a/net-proxy/squid/squid-5.8.ebuild b/net-proxy/squid/squid-5.8.ebuild
deleted file mode 100644
index f7f2f01d3c06..000000000000
--- a/net-proxy/squid/squid-5.8.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-MY_PV_MAJOR=$(ver_cut 1)
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-#r=-20181117-r0022167
-r=
-if [[ -z ${r} ]]; then
- SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
-else
- SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
- S="${S}${r}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
-IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
-
-DEPEND="
- acct-group/squid
- acct-user/squid
- dev-libs/libltdl
- sys-libs/tdb
- virtual/libcrypt:=
- caps? ( >=sys-libs/libcap-2.16 )
- ecap? ( net-libs/libecap:1 )
- esi? (
- dev-libs/expat
- dev-libs/libxml2
- )
- ldap? ( net-nds/openldap:= )
- gnutls? ( >=net-libs/gnutls-3.1.5:= )
- logrotate? ( app-admin/logrotate )
- nis? (
- net-libs/libtirpc:=
- net-libs/libnsl:=
- )
- kerberos? ( virtual/krb5 )
- pam? ( sys-libs/pam )
- qos? ( net-libs/libnetfilter_conntrack )
- ssl? (
- dev-libs/nettle:=
- !gnutls? (
- dev-libs/openssl:=
- )
- )
- sasl? ( dev-libs/cyrus-sasl )
- systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
- ${DEPEND}
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- perl? ( dev-lang/perl )
- samba? ( net-fs/samba )
- selinux? ( sec-policy/selinux-squid )
- sqlite? ( dev-perl/DBD-SQLite )
-"
-DEPEND+=" valgrind? ( dev-util/valgrind )"
-BDEPEND="
- dev-lang/perl
- ecap? ( virtual/pkgconfig )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.3-gentoo.patch
- "${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
-)
-
-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() {
- default
-
- # Fixup various paths
- 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 's:/var/run/:/run/:g' tools/systemd/squid.service || die
-
- sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
- libltdl/configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --datadir=/usr/share/squid
- --libexecdir=/usr/libexec/squid
- --localstatedir=/var
- --sysconfdir=/etc/squid
- --with-default-user=squid
- --with-logdir=/var/log/squid
- --with-pidfile=/run/squid.pid
-
- --enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
- --enable-log-daemon-helpers
- --enable-url-rewrite-helpers
- --enable-cache-digests
- --enable-delay-pools
- --enable-disk-io
- --enable-eui
- --enable-icmp
- --enable-ipv6
- --enable-follow-x-forwarded-for
- --enable-removal-policies="lru,heap"
- --disable-strict-error-checking
- --disable-arch-native
-
- --with-large-files
- --with-build-environment=default
-
- --with-tdb
-
- --without-included-ltdl
- --with-ltdl-include="${ESYSROOT}"/usr/include
- --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
-
- $(use_with caps libcap)
- $(use_enable snmp)
- $(use_with ssl openssl)
- $(use_with ssl nettle)
- $(use_with gnutls)
- $(use_enable ssl-crtd)
- $(use_with systemd)
- $(use_with test cppunit)
- $(use_enable ecap)
- $(use_enable esi)
- $(use_enable esi expat)
- $(use_enable esi libxml2)
- $(use_enable htcp)
- $(use_with valgrind valgrind-debug)
- $(use_enable wccp)
- $(use_enable wccpv2)
- )
-
- # Basic modules
- local basic_modules=(
- NCSA
- POP3
- getpwnam
-
- $(usev samba 'SMB')
- $(usev ldap 'SMB_LM LDAP')
- $(usev pam 'PAM')
- $(usev sasl 'SASL')
- $(usev nis 'NIS')
- $(usev radius 'RADIUS')
- )
-
- use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
-
- if use mysql || use postgres || use sqlite; then
- basic_modules+=( DB )
- fi
-
- # Digests
- local digest_modules=(
- file
-
- $(usev ldap 'LDAP eDirectory')
- )
-
- # Kerberos
- local negotiate_modules=( none )
-
- myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
-
- if use kerberos; then
- # We intentionally overwrite negotiate_modules here to lose
- # the 'none'.
- negotiate_modules=( kerberos wrapper )
-
- if has_version app-crypt/heimdal; then
- myeconfargs+=(
- --without-mit-krb5
- --with-heimdal-krb5
- )
- else
- myeconfargs+=(
- --with-mit-krb5
- --without-heimdal-krb5
- )
- fi
- fi
-
- # NTLM modules
- local ntlm_modules=( none )
-
- if use samba ; then
- # We intentionally overwrite ntlm_modules here to lose
- # the 'none'.
- ntlm_modules=( SMB_LM )
- fi
-
- # External helpers
- local ext_helpers=(
- file_userip
- session
- unix_group
- delayer
- time_quota
-
- $(usev samba 'wbinfo_group')
- $(usev ldap '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
-
- # Storage modules
- local storeio_modules=(
- aufs
- diskd
- rock
- ufs
- )
-
- #
- local transparent
- if use kernel_linux; then
- myeconfargs+=(
- --enable-linux-netfilter
- $(usev qos '--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
- append-atomic-flags
-
- print_options_without_comma() {
- # IFS as ',' will cut off any trailing commas
- (
- IFS=','
- options=( $(printf "%s," "${@}") )
- echo "${options[*]}"
- )
- }
-
- myeconfargs+=(
- --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
- --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
- --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
- --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
- --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
- --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
- )
-
- econf "${myeconfargs[@]}"
-}
-
-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
- local perl_scripts=(
- basic_pop3_auth ext_delayer_acl helper-mux
- log_db_daemon security_fake_certverify
- storeid_file_rewrite url_lfs_rewrite
- )
-
- local script
- for script in "${perl_scripts[@]}"; do
- rm "${ED}"/usr/libexec/squid/${script} || 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-r6 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
-
- # Hack for bug #834503 (see also bug #664940)
- # Please keep this for a few years until it's no longer plausible
- # someone is upgrading from < squid 5.7.
- mv "${ED}"/usr/share/squid/errors{,.new} || die
-}
-
-pkg_preinst() {
- # Remove file in EROOT that the directory collides with.
- rm -rf "${EROOT}"/usr/share/squid/errors || die
-
- # Following the collision protection check, reverse
- # src_install's rename in ED.
- mv "${ED}"/usr/share/squid/errors{.new,} || die
-}
-
-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
-}
diff --git a/net-proxy/squid/squid-5.9.ebuild b/net-proxy/squid/squid-5.9.ebuild
deleted file mode 100644
index f7f2f01d3c06..000000000000
--- a/net-proxy/squid/squid-5.9.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-MY_PV_MAJOR=$(ver_cut 1)
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-#r=-20181117-r0022167
-r=
-if [[ -z ${r} ]]; then
- SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
-else
- SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
- S="${S}${r}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
-IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
-
-DEPEND="
- acct-group/squid
- acct-user/squid
- dev-libs/libltdl
- sys-libs/tdb
- virtual/libcrypt:=
- caps? ( >=sys-libs/libcap-2.16 )
- ecap? ( net-libs/libecap:1 )
- esi? (
- dev-libs/expat
- dev-libs/libxml2
- )
- ldap? ( net-nds/openldap:= )
- gnutls? ( >=net-libs/gnutls-3.1.5:= )
- logrotate? ( app-admin/logrotate )
- nis? (
- net-libs/libtirpc:=
- net-libs/libnsl:=
- )
- kerberos? ( virtual/krb5 )
- pam? ( sys-libs/pam )
- qos? ( net-libs/libnetfilter_conntrack )
- ssl? (
- dev-libs/nettle:=
- !gnutls? (
- dev-libs/openssl:=
- )
- )
- sasl? ( dev-libs/cyrus-sasl )
- systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
- ${DEPEND}
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- perl? ( dev-lang/perl )
- samba? ( net-fs/samba )
- selinux? ( sec-policy/selinux-squid )
- sqlite? ( dev-perl/DBD-SQLite )
-"
-DEPEND+=" valgrind? ( dev-util/valgrind )"
-BDEPEND="
- dev-lang/perl
- ecap? ( virtual/pkgconfig )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.3-gentoo.patch
- "${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
-)
-
-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() {
- default
-
- # Fixup various paths
- 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 's:/var/run/:/run/:g' tools/systemd/squid.service || die
-
- sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
- libltdl/configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --datadir=/usr/share/squid
- --libexecdir=/usr/libexec/squid
- --localstatedir=/var
- --sysconfdir=/etc/squid
- --with-default-user=squid
- --with-logdir=/var/log/squid
- --with-pidfile=/run/squid.pid
-
- --enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
- --enable-log-daemon-helpers
- --enable-url-rewrite-helpers
- --enable-cache-digests
- --enable-delay-pools
- --enable-disk-io
- --enable-eui
- --enable-icmp
- --enable-ipv6
- --enable-follow-x-forwarded-for
- --enable-removal-policies="lru,heap"
- --disable-strict-error-checking
- --disable-arch-native
-
- --with-large-files
- --with-build-environment=default
-
- --with-tdb
-
- --without-included-ltdl
- --with-ltdl-include="${ESYSROOT}"/usr/include
- --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
-
- $(use_with caps libcap)
- $(use_enable snmp)
- $(use_with ssl openssl)
- $(use_with ssl nettle)
- $(use_with gnutls)
- $(use_enable ssl-crtd)
- $(use_with systemd)
- $(use_with test cppunit)
- $(use_enable ecap)
- $(use_enable esi)
- $(use_enable esi expat)
- $(use_enable esi libxml2)
- $(use_enable htcp)
- $(use_with valgrind valgrind-debug)
- $(use_enable wccp)
- $(use_enable wccpv2)
- )
-
- # Basic modules
- local basic_modules=(
- NCSA
- POP3
- getpwnam
-
- $(usev samba 'SMB')
- $(usev ldap 'SMB_LM LDAP')
- $(usev pam 'PAM')
- $(usev sasl 'SASL')
- $(usev nis 'NIS')
- $(usev radius 'RADIUS')
- )
-
- use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
-
- if use mysql || use postgres || use sqlite; then
- basic_modules+=( DB )
- fi
-
- # Digests
- local digest_modules=(
- file
-
- $(usev ldap 'LDAP eDirectory')
- )
-
- # Kerberos
- local negotiate_modules=( none )
-
- myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
-
- if use kerberos; then
- # We intentionally overwrite negotiate_modules here to lose
- # the 'none'.
- negotiate_modules=( kerberos wrapper )
-
- if has_version app-crypt/heimdal; then
- myeconfargs+=(
- --without-mit-krb5
- --with-heimdal-krb5
- )
- else
- myeconfargs+=(
- --with-mit-krb5
- --without-heimdal-krb5
- )
- fi
- fi
-
- # NTLM modules
- local ntlm_modules=( none )
-
- if use samba ; then
- # We intentionally overwrite ntlm_modules here to lose
- # the 'none'.
- ntlm_modules=( SMB_LM )
- fi
-
- # External helpers
- local ext_helpers=(
- file_userip
- session
- unix_group
- delayer
- time_quota
-
- $(usev samba 'wbinfo_group')
- $(usev ldap '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
-
- # Storage modules
- local storeio_modules=(
- aufs
- diskd
- rock
- ufs
- )
-
- #
- local transparent
- if use kernel_linux; then
- myeconfargs+=(
- --enable-linux-netfilter
- $(usev qos '--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
- append-atomic-flags
-
- print_options_without_comma() {
- # IFS as ',' will cut off any trailing commas
- (
- IFS=','
- options=( $(printf "%s," "${@}") )
- echo "${options[*]}"
- )
- }
-
- myeconfargs+=(
- --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
- --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
- --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
- --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
- --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
- --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
- )
-
- econf "${myeconfargs[@]}"
-}
-
-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
- local perl_scripts=(
- basic_pop3_auth ext_delayer_acl helper-mux
- log_db_daemon security_fake_certverify
- storeid_file_rewrite url_lfs_rewrite
- )
-
- local script
- for script in "${perl_scripts[@]}"; do
- rm "${ED}"/usr/libexec/squid/${script} || 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-r6 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
-
- # Hack for bug #834503 (see also bug #664940)
- # Please keep this for a few years until it's no longer plausible
- # someone is upgrading from < squid 5.7.
- mv "${ED}"/usr/share/squid/errors{,.new} || die
-}
-
-pkg_preinst() {
- # Remove file in EROOT that the directory collides with.
- rm -rf "${EROOT}"/usr/share/squid/errors || die
-
- # Following the collision protection check, reverse
- # src_install's rename in ED.
- mv "${ED}"/usr/share/squid/errors{.new,} || die
-}
-
-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
-}
diff --git a/net-proxy/squid/squid-6.2.ebuild b/net-proxy/squid/squid-6.2.ebuild
deleted file mode 100644
index 0c10c03e6c44..000000000000
--- a/net-proxy/squid/squid-6.2.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="Full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-MY_PV_MAJOR=$(ver_cut 1)
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-#r=-20181117-r0022167
-r=
-if [[ -z ${r} ]]; then
- SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
-else
- SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
- S="${S}${r}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
-IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
-
-DEPEND="
- acct-group/squid
- acct-user/squid
- dev-libs/libltdl
- sys-libs/tdb
- virtual/libcrypt:=
- caps? ( >=sys-libs/libcap-2.16 )
- ecap? ( net-libs/libecap:1 )
- esi? (
- dev-libs/expat
- dev-libs/libxml2
- )
- ldap? ( net-nds/openldap:= )
- gnutls? ( >=net-libs/gnutls-3.1.5:= )
- logrotate? ( app-admin/logrotate )
- nis? (
- net-libs/libtirpc:=
- net-libs/libnsl:=
- )
- kerberos? ( virtual/krb5 )
- pam? ( sys-libs/pam )
- qos? ( net-libs/libnetfilter_conntrack )
- ssl? (
- dev-libs/nettle:=
- !gnutls? (
- dev-libs/openssl:=
- )
- )
- sasl? ( dev-libs/cyrus-sasl )
- systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
- ${DEPEND}
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- perl? ( dev-lang/perl )
- samba? ( net-fs/samba )
- selinux? ( sec-policy/selinux-squid )
- sqlite? ( dev-perl/DBD-SQLite )
-"
-DEPEND+=" valgrind? ( dev-util/valgrind )"
-BDEPEND="
- dev-lang/perl
- ecap? ( virtual/pkgconfig )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.2-gentoo.patch
- "${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
-)
-
-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() {
- default
-
- # Fixup various paths
- 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 's:/var/run/:/run/:g' tools/systemd/squid.service || die
-
- sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
- libltdl/configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --datadir=/usr/share/squid
- --libexecdir=/usr/libexec/squid
- --localstatedir=/var
- --sysconfdir=/etc/squid
- --with-default-user=squid
- --with-logdir=/var/log/squid
- --with-pidfile=/run/squid.pid
-
- --enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
- --enable-log-daemon-helpers
- --enable-url-rewrite-helpers
- --enable-cache-digests
- --enable-delay-pools
- --enable-disk-io
- --enable-eui
- --enable-icmp
- --enable-ipv6
- --enable-follow-x-forwarded-for
- --enable-removal-policies="lru,heap"
- --disable-strict-error-checking
- --disable-arch-native
-
- --with-large-files
- --with-build-environment=default
-
- --with-tdb
-
- --without-included-ltdl
- --with-ltdl-include="${ESYSROOT}"/usr/include
- --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
-
- $(use_with caps cap)
- $(use_enable snmp)
- $(use_with ssl openssl)
- $(use_with ssl nettle)
- $(use_with gnutls)
- $(use_with ldap)
- $(use_enable ssl-crtd)
- $(use_with systemd)
- $(use_with test cppunit)
- $(use_enable ecap)
- $(use_enable esi)
- $(use_enable esi expat)
- $(use_enable esi xml2)
- $(use_enable htcp)
- $(use_with valgrind valgrind-debug)
- $(use_enable wccp)
- $(use_enable wccpv2)
- )
-
- # Basic modules
- local basic_modules=(
- NCSA
- POP3
- getpwnam
-
- $(usev samba 'SMB')
- $(usev ldap 'SMB_LM LDAP')
- $(usev pam 'PAM')
- $(usev sasl 'SASL')
- $(usev nis 'NIS')
- $(usev radius 'RADIUS')
- )
-
- use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
-
- if use mysql || use postgres || use sqlite; then
- basic_modules+=( DB )
- fi
-
- # Digests
- local digest_modules=(
- file
-
- $(usev ldap 'LDAP eDirectory')
- )
-
- # Kerberos
- local negotiate_modules=( none )
-
- myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
-
- if use kerberos; then
- # We intentionally overwrite negotiate_modules here to lose
- # the 'none'.
- negotiate_modules=( kerberos wrapper )
-
- if has_version app-crypt/heimdal; then
- myeconfargs+=(
- --without-mit-krb5
- --with-heimdal-krb5
- )
- else
- myeconfargs+=(
- --with-mit-krb5
- --without-heimdal-krb5
- )
- fi
- fi
-
- # NTLM modules
- local ntlm_modules=( none )
-
- if use samba ; then
- # We intentionally overwrite ntlm_modules here to lose
- # the 'none'.
- ntlm_modules=( SMB_LM )
- fi
-
- # External helpers
- local ext_helpers=(
- file_userip
- session
- unix_group
- delayer
- time_quota
-
- $(usev samba 'wbinfo_group')
- $(usev ldap '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
-
- # Storage modules
- local storeio_modules=(
- aufs
- diskd
- rock
- ufs
- )
-
- #
- local transparent
- if use kernel_linux; then
- myeconfargs+=(
- --enable-linux-netfilter
- $(usev qos '--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
- append-atomic-flags
-
- print_options_without_comma() {
- # IFS as ',' will cut off any trailing commas
- (
- IFS=','
- options=( $(printf "%s," "${@}") )
- echo "${options[*]}"
- )
- }
-
- myeconfargs+=(
- --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
- --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
- --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
- --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
- --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
- --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
- )
-
- econf "${myeconfargs[@]}"
-}
-
-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
- local perl_scripts=(
- basic_pop3_auth ext_delayer_acl helper-mux
- log_db_daemon security_fake_certverify
- storeid_file_rewrite url_lfs_rewrite
- )
-
- local script
- for script in "${perl_scripts[@]}"; do
- rm "${ED}"/usr/libexec/squid/${script} || 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-r6 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
-
- # Hack for bug #834503 (see also bug #664940)
- # Please keep this for a few years until it's no longer plausible
- # someone is upgrading from < squid 5.7.
- mv "${ED}"/usr/share/squid/errors{,.new} || die
-}
-
-pkg_preinst() {
- # Remove file in EROOT that the directory collides with.
- rm -rf "${EROOT}"/usr/share/squid/errors || die
-
- # Following the collision protection check, reverse
- # src_install's rename in ED.
- mv "${ED}"/usr/share/squid/errors{.new,} || die
-}
-
-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
-}
diff --git a/net-proxy/squid/squid-6.4.ebuild b/net-proxy/squid/squid-6.4.ebuild
deleted file mode 100644
index 0ecdce7be628..000000000000
--- a/net-proxy/squid/squid-6.4.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="Full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-MY_PV_MAJOR=$(ver_cut 1)
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-#r=-20181117-r0022167
-r=
-if [[ -z ${r} ]]; then
- SRC_URI="http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
-else
- SRC_URI="http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
- S="${S}${r}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
-IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
-
-DEPEND="
- acct-group/squid
- acct-user/squid
- dev-libs/libltdl
- sys-libs/tdb
- virtual/libcrypt:=
- caps? ( >=sys-libs/libcap-2.16 )
- ecap? ( net-libs/libecap:1 )
- esi? (
- dev-libs/expat
- dev-libs/libxml2
- )
- ldap? ( net-nds/openldap:= )
- gnutls? ( >=net-libs/gnutls-3.1.5:= )
- logrotate? ( app-admin/logrotate )
- nis? (
- net-libs/libtirpc:=
- net-libs/libnsl:=
- )
- kerberos? ( virtual/krb5 )
- pam? ( sys-libs/pam )
- qos? ( net-libs/libnetfilter_conntrack )
- ssl? (
- dev-libs/nettle:=
- !gnutls? (
- dev-libs/openssl:=
- )
- )
- sasl? ( dev-libs/cyrus-sasl )
- systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
- ${DEPEND}
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- perl? ( dev-lang/perl )
- samba? ( net-fs/samba )
- selinux? ( sec-policy/selinux-squid )
- sqlite? ( dev-perl/DBD-SQLite )
-"
-DEPEND+=" valgrind? ( dev-util/valgrind )"
-BDEPEND="
- dev-lang/perl
- ecap? ( virtual/pkgconfig )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.2-gentoo.patch
- "${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
- "${FILESDIR}"/${PN}-6.4-gcc14-algorithm.patch
-)
-
-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() {
- default
-
- # Fixup various paths
- 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 's:/var/run/:/run/:g' tools/systemd/squid.service || die
-
- sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
- libltdl/configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --cache-file="${S}"/config.cache
-
- --datadir=/usr/share/squid
- --libexecdir=/usr/libexec/squid
- --localstatedir=/var
- --sysconfdir=/etc/squid
- --with-default-user=squid
- --with-logdir=/var/log/squid
- --with-pidfile=/run/squid.pid
-
- --enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
- --enable-log-daemon-helpers
- --enable-url-rewrite-helpers
- --enable-cache-digests
- --enable-delay-pools
- --enable-disk-io
- --enable-eui
- --enable-icmp
- --enable-ipv6
- --enable-follow-x-forwarded-for
- --enable-removal-policies="lru,heap"
- --disable-strict-error-checking
- --disable-arch-native
-
- --with-large-files
- --with-build-environment=default
-
- --with-tdb
-
- --without-included-ltdl
- --with-ltdl-include="${ESYSROOT}"/usr/include
- --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
-
- $(use_with caps cap)
- $(use_enable snmp)
- $(use_with ssl openssl)
- $(use_with ssl nettle)
- $(use_with gnutls)
- $(use_with ldap)
- $(use_enable ssl-crtd)
- $(use_with systemd)
- $(use_with test cppunit)
- $(use_enable ecap)
- $(use_enable esi)
- $(use_enable esi expat)
- $(use_enable esi xml2)
- $(use_enable htcp)
- $(use_with valgrind valgrind-debug)
- $(use_enable wccp)
- $(use_enable wccpv2)
- )
-
- # Basic modules
- local basic_modules=(
- NCSA
- POP3
- getpwnam
-
- $(usev samba 'SMB')
- $(usev ldap 'SMB_LM LDAP')
- $(usev pam 'PAM')
- $(usev sasl 'SASL')
- $(usev nis 'NIS')
- $(usev radius 'RADIUS')
- )
-
- use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
-
- if use mysql || use postgres || use sqlite; then
- basic_modules+=( DB )
- fi
-
- # Digests
- local digest_modules=(
- file
-
- $(usev ldap 'LDAP eDirectory')
- )
-
- # Kerberos
- local negotiate_modules=( none )
-
- myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
-
- if use kerberos; then
- # We intentionally overwrite negotiate_modules here to lose
- # the 'none'.
- negotiate_modules=( kerberos wrapper )
-
- if has_version app-crypt/heimdal; then
- myeconfargs+=(
- --without-mit-krb5
- --with-heimdal-krb5
- )
- else
- myeconfargs+=(
- --with-mit-krb5
- --without-heimdal-krb5
- )
- fi
- fi
-
- # NTLM modules
- local ntlm_modules=( none )
-
- if use samba ; then
- # We intentionally overwrite ntlm_modules here to lose
- # the 'none'.
- ntlm_modules=( SMB_LM )
- fi
-
- # External helpers
- local ext_helpers=(
- file_userip
- session
- unix_group
- delayer
- time_quota
-
- $(usev samba 'wbinfo_group')
- $(usev ldap '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
-
- # Storage modules
- local storeio_modules=(
- aufs
- diskd
- rock
- ufs
- )
-
- #
- local transparent
- if use kernel_linux; then
- myeconfargs+=(
- --enable-linux-netfilter
- $(usev qos '--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
- append-atomic-flags
-
- print_options_without_comma() {
- # IFS as ',' will cut off any trailing commas
- (
- IFS=','
- options=( $(printf "%s," "${@}") )
- echo "${options[*]}"
- )
- }
-
- myeconfargs+=(
- --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
- --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
- --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
- --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
- --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
- --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
- )
-
- econf "${myeconfargs[@]}"
-}
-
-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
- local perl_scripts=(
- basic_pop3_auth ext_delayer_acl helper-mux
- log_db_daemon security_fake_certverify
- storeid_file_rewrite url_lfs_rewrite
- )
-
- local script
- for script in "${perl_scripts[@]}"; do
- rm "${ED}"/usr/libexec/squid/${script} || 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-r6 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
-
- # Hack for bug #834503 (see also bug #664940)
- # Please keep this for a few years until it's no longer plausible
- # someone is upgrading from < squid 5.7.
- mv "${ED}"/usr/share/squid/errors{,.new} || die
-}
-
-pkg_preinst() {
- # Remove file in EROOT that the directory collides with.
- rm -rf "${EROOT}"/usr/share/squid/errors || die
-
- # Following the collision protection check, reverse
- # src_install's rename in ED.
- mv "${ED}"/usr/share/squid/errors{.new,} || die
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/
@ 2023-08-09 4:49 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-08-09 4:49 UTC (permalink / raw
To: gentoo-commits
commit: a4c66f18e813aef8df6b4846b122212126d4d7f1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 9 04:16:48 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 04:48:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c66f18
net-proxy/squid: add 6.2
Closes: https://bugs.gentoo.org/911590
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-proxy/squid/Manifest | 1 +
net-proxy/squid/files/squid-6.2-gentoo.patch | 76 ++++++
net-proxy/squid/squid-6.2.ebuild | 383 +++++++++++++++++++++++++++
3 files changed, 460 insertions(+)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 51802a78e06a..c003dd6b50b7 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,4 @@
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
+DIST squid-6.2.tar.xz 2546172 BLAKE2B e934371e40093b1570c88c76f9427089087d2fa0b16629e7ca3afabd17f7bc5592b2b65354da54ebc43350ab6732081dd39a39e5db712f70a48246c22b8ae45d SHA512 a2f3ad666b88708ddc52958e610222778e4f64c2ac097b821867ae4022ca35dcbe225f2c5bba42a69fa56f89feebf63764d1a936444e4debce7e55e87b7366db
diff --git a/net-proxy/squid/files/squid-6.2-gentoo.patch b/net-proxy/squid/files/squid-6.2-gentoo.patch
new file mode 100644
index 000000000000..2444c74a71d0
--- /dev/null
+++ b/net-proxy/squid/files/squid-6.2-gentoo.patch
@@ -0,0 +1,76 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,9 +33,6 @@ PRESET_CFLAGS="$CFLAGS"
+ PRESET_CXXFLAGS="$CXXFLAGS"
+ PRESET_LDFLAGS="$LDFLAGS"
+
+-dnl Set default LDFLAGS
+-AS_IF([test "x$LDFLAGS" = "x"],[LDFLAGS="-g"])
+-
+ # check for host OS detail
+ AC_CANONICAL_HOST
+ AC_MSG_CHECKING([simplified host os])
+--- a/src/cf.data.pre
++++ b/src/cf.data.pre
+@@ -1669,6 +1669,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
+ CONFIG_END
+ DOC_END
+
+@@ -7447,11 +7448,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/debug.cc
++++ b/src/debug/debug.cc
+@@ -1144,7 +1144,7 @@ Debug::SettleSyslog()
+ #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);
+ Module().syslogChannel.markOpened();
+ }
+
+--- a/src/main.cc
++++ b/src/main.cc
+@@ -1867,7 +1867,7 @@ watch_child(const CommandLine &masterCommand)
+
+ 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();
+@@ -1959,7 +1959,7 @@ watch_child(const CommandLine &masterCommand)
+
+ 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));
+@@ -1971,7 +1971,7 @@ watch_child(const CommandLine &masterCommand)
+ }
+
+ /* 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-6.2.ebuild b/net-proxy/squid/squid-6.2.ebuild
new file mode 100644
index 000000000000..0c10c03e6c44
--- /dev/null
+++ b/net-proxy/squid/squid-6.2.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
+
+DESCRIPTION="Full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+
+MY_PV_MAJOR=$(ver_cut 1)
+# Upstream patch ID for the most recent bug-fixed update to the formal release.
+#r=-20181117-r0022167
+r=
+if [[ -z ${r} ]]; then
+ SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
+else
+ SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
+ S="${S}${r}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
+IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
+
+DEPEND="
+ acct-group/squid
+ acct-user/squid
+ dev-libs/libltdl
+ sys-libs/tdb
+ virtual/libcrypt:=
+ caps? ( >=sys-libs/libcap-2.16 )
+ ecap? ( net-libs/libecap:1 )
+ esi? (
+ dev-libs/expat
+ dev-libs/libxml2
+ )
+ ldap? ( net-nds/openldap:= )
+ gnutls? ( >=net-libs/gnutls-3.1.5:= )
+ logrotate? ( app-admin/logrotate )
+ nis? (
+ net-libs/libtirpc:=
+ net-libs/libnsl:=
+ )
+ kerberos? ( virtual/krb5 )
+ pam? ( sys-libs/pam )
+ qos? ( net-libs/libnetfilter_conntrack )
+ ssl? (
+ dev-libs/nettle:=
+ !gnutls? (
+ dev-libs/openssl:=
+ )
+ )
+ sasl? ( dev-libs/cyrus-sasl )
+ systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="
+ ${DEPEND}
+ mysql? ( dev-perl/DBD-mysql )
+ postgres? ( dev-perl/DBD-Pg )
+ perl? ( dev-lang/perl )
+ samba? ( net-fs/samba )
+ selinux? ( sec-policy/selinux-squid )
+ sqlite? ( dev-perl/DBD-SQLite )
+"
+DEPEND+=" valgrind? ( dev-util/valgrind )"
+BDEPEND="
+ dev-lang/perl
+ ecap? ( virtual/pkgconfig )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.2-gentoo.patch
+ "${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
+)
+
+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() {
+ default
+
+ # Fixup various paths
+ 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 's:/var/run/:/run/:g' tools/systemd/squid.service || die
+
+ sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+ libltdl/configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --datadir=/usr/share/squid
+ --libexecdir=/usr/libexec/squid
+ --localstatedir=/var
+ --sysconfdir=/etc/squid
+ --with-default-user=squid
+ --with-logdir=/var/log/squid
+ --with-pidfile=/run/squid.pid
+
+ --enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
+ --enable-log-daemon-helpers
+ --enable-url-rewrite-helpers
+ --enable-cache-digests
+ --enable-delay-pools
+ --enable-disk-io
+ --enable-eui
+ --enable-icmp
+ --enable-ipv6
+ --enable-follow-x-forwarded-for
+ --enable-removal-policies="lru,heap"
+ --disable-strict-error-checking
+ --disable-arch-native
+
+ --with-large-files
+ --with-build-environment=default
+
+ --with-tdb
+
+ --without-included-ltdl
+ --with-ltdl-include="${ESYSROOT}"/usr/include
+ --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
+
+ $(use_with caps cap)
+ $(use_enable snmp)
+ $(use_with ssl openssl)
+ $(use_with ssl nettle)
+ $(use_with gnutls)
+ $(use_with ldap)
+ $(use_enable ssl-crtd)
+ $(use_with systemd)
+ $(use_with test cppunit)
+ $(use_enable ecap)
+ $(use_enable esi)
+ $(use_enable esi expat)
+ $(use_enable esi xml2)
+ $(use_enable htcp)
+ $(use_with valgrind valgrind-debug)
+ $(use_enable wccp)
+ $(use_enable wccpv2)
+ )
+
+ # Basic modules
+ local basic_modules=(
+ NCSA
+ POP3
+ getpwnam
+
+ $(usev samba 'SMB')
+ $(usev ldap 'SMB_LM LDAP')
+ $(usev pam 'PAM')
+ $(usev sasl 'SASL')
+ $(usev nis 'NIS')
+ $(usev radius 'RADIUS')
+ )
+
+ use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
+
+ if use mysql || use postgres || use sqlite; then
+ basic_modules+=( DB )
+ fi
+
+ # Digests
+ local digest_modules=(
+ file
+
+ $(usev ldap 'LDAP eDirectory')
+ )
+
+ # Kerberos
+ local negotiate_modules=( none )
+
+ myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
+
+ if use kerberos; then
+ # We intentionally overwrite negotiate_modules here to lose
+ # the 'none'.
+ negotiate_modules=( kerberos wrapper )
+
+ if has_version app-crypt/heimdal; then
+ myeconfargs+=(
+ --without-mit-krb5
+ --with-heimdal-krb5
+ )
+ else
+ myeconfargs+=(
+ --with-mit-krb5
+ --without-heimdal-krb5
+ )
+ fi
+ fi
+
+ # NTLM modules
+ local ntlm_modules=( none )
+
+ if use samba ; then
+ # We intentionally overwrite ntlm_modules here to lose
+ # the 'none'.
+ ntlm_modules=( SMB_LM )
+ fi
+
+ # External helpers
+ local ext_helpers=(
+ file_userip
+ session
+ unix_group
+ delayer
+ time_quota
+
+ $(usev samba 'wbinfo_group')
+ $(usev ldap '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
+
+ # Storage modules
+ local storeio_modules=(
+ aufs
+ diskd
+ rock
+ ufs
+ )
+
+ #
+ local transparent
+ if use kernel_linux; then
+ myeconfargs+=(
+ --enable-linux-netfilter
+ $(usev qos '--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
+ append-atomic-flags
+
+ print_options_without_comma() {
+ # IFS as ',' will cut off any trailing commas
+ (
+ IFS=','
+ options=( $(printf "%s," "${@}") )
+ echo "${options[*]}"
+ )
+ }
+
+ myeconfargs+=(
+ --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
+ --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
+ --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
+ --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
+ --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
+ --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+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
+ local perl_scripts=(
+ basic_pop3_auth ext_delayer_acl helper-mux
+ log_db_daemon security_fake_certverify
+ storeid_file_rewrite url_lfs_rewrite
+ )
+
+ local script
+ for script in "${perl_scripts[@]}"; do
+ rm "${ED}"/usr/libexec/squid/${script} || 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-r6 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
+
+ # Hack for bug #834503 (see also bug #664940)
+ # Please keep this for a few years until it's no longer plausible
+ # someone is upgrading from < squid 5.7.
+ mv "${ED}"/usr/share/squid/errors{,.new} || die
+}
+
+pkg_preinst() {
+ # Remove file in EROOT that the directory collides with.
+ rm -rf "${EROOT}"/usr/share/squid/errors || die
+
+ # Following the collision protection check, reverse
+ # src_install's rename in ED.
+ mv "${ED}"/usr/share/squid/errors{.new,} || die
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/
@ 2023-06-18 4:25 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-06-18 4:25 UTC (permalink / raw
To: gentoo-commits
commit: 8b6de11b7479f646a9f935ca3295aae637b124aa
Author: Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Sat Jun 17 18:34:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <hlein <AT> korelogic.com>
Closes: https://github.com/gentoo/gentoo/pull/31518
Signed-off-by: Sam James <sam <AT> 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 <wellnhofer@aevum.de>
-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<void *>(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? (
- <dev-libs/openssl-3:=
- )
- dev-libs/nettle:=
- )
- sasl? ( dev-libs/cyrus-sasl )
- systemd? ( sys-apps/systemd:= )
- ecap? ( net-libs/libecap:1 )
- esi? ( dev-libs/expat dev-libs/libxml2 )
- 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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/
@ 2023-03-23 7:20 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-03-23 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 51e8c9959875a6be8ff3733e88122f58bbab886e
Author: Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Thu Mar 23 03:59:07 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 07:19:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e8c995
net-proxy/squid: add 5.8, minor fixes
Added SQUID_FAST_SHUTDOWN support, require USE=ssl when USE=ssl-crtd
Closes: https://bugs.gentoo.org/890913
Closes: https://bugs.gentoo.org/835088
Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://github.com/gentoo/gentoo/pull/30313
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-proxy/squid/Manifest | 1 +
net-proxy/squid/files/squid.initd-r6 | 129 ++++++++++++
net-proxy/squid/squid-5.8.ebuild | 380 +++++++++++++++++++++++++++++++++++
3 files changed, 510 insertions(+)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 53c02583c2f1..ccff7de79245 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,2 +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
diff --git a/net-proxy/squid/files/squid.initd-r6 b/net-proxy/squid/files/squid.initd-r6
new file mode 100644
index 000000000000..775ccbaddbb1
--- /dev/null
+++ b/net-proxy/squid/files/squid.initd-r6
@@ -0,0 +1,129 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+SQUID_SVCNAME=$( echo "${RC_SVCNAME}" | tr -cd '[a-zA-Z0-9]' )
+
+extra_started_commands="reload rotate"
+
+depend() {
+ use dns net
+}
+
+checkconfig() {
+ local CONFFILES="/etc/squid/${RC_SVCNAME}.conf /etc/squid/${RC_SVCNAME}.include /etc/squid/${RC_SVCNAME}.include.*"
+ if [ ! -f /etc/squid/${RC_SVCNAME}.conf ]; then
+ eerror "You need to create /etc/squid/${RC_SVCNAME}.conf first."
+ eerror "The main configuration file and all included file names should have the following format:"
+ eerror "${CONFFILES}"
+ eerror "An example can be found in /etc/squid/squid.conf.default"
+ return 1
+ fi
+
+ local PIDFILE=$(cat ${CONFFILES} 2>/dev/null 3>/dev/null | awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }')
+ [ -z ${PIDFILE} ] && PIDFILE=/run/squid.pid
+ if [ /run/${RC_SVCNAME}.pid != ${PIDFILE} ]; then
+ eerror "/etc/squid/${RC_SVCNAME}.conf must set pid_filename to"
+ eerror " /run/${RC_SVCNAME}.pid"
+ eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
+ eerror " in any other instance of squid."
+ eerror "Make sure the main configuration file and all included file names have the following format:"
+ eerror "${CONFFILES}"
+ return 1
+ fi
+
+ # Maximum file descriptors squid can open is determined by:
+ # a basic default of N=1024
+ # ... altered by ./configure --with-filedescriptors=N
+ # ... overridden on production by squid.conf max_filedescriptors (if,
+ # and only if, setrlimit() RLIMIT_NOFILE is able to be built+used).
+ # Since we do not configure hard coded # of filedescriptors anymore,
+ # there is no need for ulimit calls in the init script.
+ # Use max_filedescriptors in squid.conf instead.
+
+ local CACHE_SWAP=$(cat ${CONFFILES} 2>/dev/null 3>/dev/null | awk '/^[ \t]*cache_dir[ \t]+/ { if ( $2 == "rock" ) printf "%s/rock ", $3; else if ( $2 == "coss" ) printf "%s/stripe ", $3; else printf "%s/00 ", $3; }')
+ [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
+
+ local x
+ for x in $CACHE_SWAP ; do
+ if [ ! -e $x ] ; then
+ ebegin "Initializing cache directory ${x%/*}"
+ local ORIG_UMASK=$(umask)
+ umask 027
+
+ if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
+ eend 1
+ return 1
+ fi
+
+ local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} 2>&1)"
+ if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
+ umask $ORIG_UMASK
+ eend 1
+ echo "$INIT_CACHE_RESPONSE"
+ return 1
+ fi
+
+ umask $ORIG_UMASK
+ eend 0
+ break
+ fi
+ done
+
+ return 0
+}
+
+start() {
+ checkconfig || return 1
+ checkpath -d -q -m 0750 -o squid:squid /run/${RC_SVCNAME}
+
+ # see https://wiki.squid-cache.org/MultipleInstances
+ ebegin "Starting ${RC_SVCNAME} (service name ${SQUID_SVCNAME}) with KRB5_KTNAME=\"${SQUID_KEYTAB}\" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
+ KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
+ eend $? && sleep 1
+}
+
+stop() {
+ ebegin "Stopping ${RC_SVCNAME} with /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
+ if /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} ; then
+ if [ "x${SQUID_FAST_SHUTDOWN}" = "xyes" ]; then
+ einfo "Attempting fast shutdown."
+ /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
+ fi
+ # Now we have to wait until squid has _really_ stopped.
+ sleep 1
+ if [ -f /run/${RC_SVCNAME}.pid ] ; then
+ einfon "Waiting for squid to shutdown ."
+ cnt=0
+ while [ -f /run/${RC_SVCNAME}.pid ] ; do
+ cnt=$(expr $cnt + 1)
+ if [ $cnt -gt 60 ] ; then
+ # Waited 120 seconds now. Fail.
+ echo
+ eend 1 "Failed."
+ break
+ fi
+ sleep 2
+ printf "."
+ done
+ echo
+ fi
+ else
+ eerror "Squid shutdown failed, probably service is already down."
+ fi
+ eend 0
+}
+
+reload() {
+ checkconfig || return 1
+ ebegin "Reloading ${RC_SVCNAME} with /usr/sbin/squid -k reconfigure -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
+ /usr/sbin/squid -k reconfigure -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
+ eend $?
+}
+
+rotate() {
+ service_started ${RC_SVCNAME} || return 1
+ ebegin "Rotating ${RC_SVCNAME} logs with /usr/sbin/squid -k rotate -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
+ /usr/sbin/squid -k rotate -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
+ eend $?
+}
diff --git a/net-proxy/squid/squid-5.8.ebuild b/net-proxy/squid/squid-5.8.ebuild
new file mode 100644
index 000000000000..91df2c9eb25d
--- /dev/null
+++ b/net-proxy/squid/squid-5.8.ebuild
@@ -0,0 +1,380 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+
+MY_PV_MAJOR=$(ver_cut 1)
+# Upstream patch ID for the most recent bug-fixed update to the formal release.
+#r=-20181117-r0022167
+r=
+if [[ -z ${r} ]]; then
+ SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
+else
+ SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
+ S="${S}${r}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
+IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp +wccp +wccpv2"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
+
+DEPEND="
+ acct-group/squid
+ acct-user/squid
+ dev-libs/libltdl
+ sys-libs/tdb
+ virtual/libcrypt:=
+ caps? ( >=sys-libs/libcap-2.16 )
+ ecap? ( net-libs/libecap:1 )
+ esi? (
+ dev-libs/expat
+ dev-libs/libxml2
+ )
+ ldap? ( net-nds/openldap:= )
+ gnutls? ( >=net-libs/gnutls-3.1.5:= )
+ logrotate? ( app-admin/logrotate )
+ nis? (
+ net-libs/libtirpc:=
+ net-libs/libnsl:=
+ )
+ kerberos? ( virtual/krb5 )
+ pam? ( sys-libs/pam )
+ qos? ( net-libs/libnetfilter_conntrack )
+ ssl? (
+ dev-libs/nettle:=
+ !gnutls? (
+ dev-libs/openssl:=
+ )
+ )
+ sasl? ( dev-libs/cyrus-sasl )
+ systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="
+ ${DEPEND}
+ mysql? ( dev-perl/DBD-mysql )
+ postgres? ( dev-perl/DBD-Pg )
+ perl? ( dev-lang/perl )
+ samba? ( net-fs/samba )
+ selinux? ( sec-policy/selinux-squid )
+ sqlite? ( dev-perl/DBD-SQLite )
+"
+BDEPEND="
+ dev-lang/perl
+ ecap? ( virtual/pkgconfig )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.3-gentoo.patch
+ "${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
+)
+
+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() {
+ default
+
+ # Fixup various paths
+ 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 's:/var/run/:/run/:g' tools/systemd/squid.service || die
+
+ sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+ libltdl/configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --datadir=/usr/share/squid
+ --libexecdir=/usr/libexec/squid
+ --localstatedir=/var
+ --sysconfdir=/etc/squid
+ --with-default-user=squid
+ --with-logdir=/var/log/squid
+ --with-pidfile=/run/squid.pid
+
+ --enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
+ --enable-log-daemon-helpers
+ --enable-url-rewrite-helpers
+ --enable-cache-digests
+ --enable-delay-pools
+ --enable-disk-io
+ --enable-eui
+ --enable-icmp
+ --enable-ipv6
+ --enable-follow-x-forwarded-for
+ --enable-removal-policies="lru,heap"
+ --disable-strict-error-checking
+ --disable-arch-native
+
+ --with-large-files
+ --with-build-environment=default
+
+ --with-tdb
+
+ --without-included-ltdl
+ --with-ltdl-include="${ESYSROOT}"/usr/include
+ --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
+
+ $(use_with caps libcap)
+ $(use_enable snmp)
+ $(use_with ssl openssl)
+ $(use_with ssl nettle)
+ $(use_with gnutls)
+ $(use_enable ssl-crtd)
+ $(use_with systemd)
+ $(use_with test cppunit)
+ $(use_enable ecap)
+ $(use_enable esi)
+ $(use_enable esi expat)
+ $(use_enable esi libxml2)
+ $(use_enable htcp)
+ $(use_enable wccp)
+ $(use_enable wccpv2)
+ )
+
+ # Basic modules
+ local basic_modules=(
+ NCSA
+ POP3
+ getpwnam
+
+ $(usev samba 'SMB')
+ $(usev ldap 'SMB_LM LDAP')
+ $(usev pam 'PAM')
+ $(usev sasl 'SASL')
+ $(usev nis 'NIS')
+ $(usev radius 'RADIUS')
+ )
+
+ use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
+
+ if use mysql || use postgres || use sqlite; then
+ basic_modules+=( DB )
+ fi
+
+ # Digests
+ local digest_modules=(
+ file
+
+ $(usev ldap 'LDAP eDirectory')
+ )
+
+ # Kerberos
+ local negotiate_modules=( none )
+
+ myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
+
+ if use kerberos; then
+ # We intentionally overwrite negotiate_modules here to lose
+ # the 'none'.
+ negotiate_modules=( kerberos wrapper )
+
+ if has_version app-crypt/heimdal; then
+ myeconfargs+=(
+ --without-mit-krb5
+ --with-heimdal-krb5
+ )
+ else
+ myeconfargs+=(
+ --with-mit-krb5
+ --without-heimdal-krb5
+ )
+ fi
+ fi
+
+ # NTLM modules
+ local ntlm_modules=( none )
+
+ if use samba ; then
+ # We intentionally overwrite ntlm_modules here to lose
+ # the 'none'.
+ ntlm_modules=( SMB_LM )
+ fi
+
+ # External helpers
+ local ext_helpers=(
+ file_userip
+ session
+ unix_group
+ delayer
+ time_quota
+
+ $(usev samba 'wbinfo_group')
+ $(usev ldap '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
+
+ # Storage modules
+ local storeio_modules=(
+ aufs
+ diskd
+ rock
+ ufs
+ )
+
+ #
+ local transparent
+ if use kernel_linux; then
+ myeconfargs+=(
+ --enable-linux-netfilter
+ $(usev qos '--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
+ append-atomic-flags
+
+ print_options_without_comma() {
+ # IFS as ',' will cut off any trailing commas
+ (
+ IFS=','
+ options=( $(printf "%s," "${@}") )
+ echo "${options[*]}"
+ )
+ }
+
+ myeconfargs+=(
+ --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
+ --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
+ --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
+ --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
+ --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
+ --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+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
+ local perl_scripts=(
+ basic_pop3_auth ext_delayer_acl helper-mux
+ log_db_daemon security_fake_certverify
+ storeid_file_rewrite url_lfs_rewrite
+ )
+
+ local script
+ for script in "${perl_scripts[@]}"; do
+ rm "${ED}"/usr/libexec/squid/${script} || 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-r6 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
+
+ # Hack for bug #834503 (see also bug #664940)
+ # Please keep this for a few years until it's no longer plausible
+ # someone is upgrading from < squid 5.7.
+ mv "${ED}"/usr/share/squid/errors{,.new} || die
+}
+
+pkg_preinst() {
+ # Remove file in EROOT that the directory collides with.
+ rm -rf "${EROOT}"/usr/share/squid/errors || die
+
+ # Following the collision protection check, reverse
+ # src_install's rename in ED.
+ mv "${ED}"/usr/share/squid/errors{.new,} || die
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/
@ 2022-03-22 0:50 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-03-22 0:50 UTC (permalink / raw
To: gentoo-commits
commit: afd1d01bb5925d9c0be7a30ad985adc002c77207
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 00:50:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 00:50:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afd1d01b
net-proxy/squid: use system libltdl (avoid maintainer mode automake)
This bug has quite a long story, apparently, but it seems to be
enough here to just drop the subdir & force usage of the system version
with configure arguments (previous arguments weren't quite right).
Closes: https://bugs.gentoo.org/830099
Signed-off-by: Sam James <sam <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/23545
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../squid/files/squid-4.17-use-system-libltdl.patch | 16 ++++++++++++++++
net-proxy/squid/squid-4.17.ebuild | 6 ++++--
net-proxy/squid/squid-5.4.1-r1.ebuild | 6 ++++--
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch b/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch
new file mode 100644
index 000000000000..219f2ab6cf70
--- /dev/null
+++ b/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/830099
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,11 +6,8 @@
+ ##
+
+ AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
+-DIST_SUBDIRS = compat lib libltdl scripts icons errors contrib doc src test-suite tools
++DIST_SUBDIRS = compat lib scripts icons errors contrib doc src test-suite tools
+ SUBDIRS = compat lib
+-if ENABLE_LOADABLE_MODULES
+-SUBDIRS += libltdl
+-endif
+ SUBDIRS += scripts icons errors doc src tools test-suite
+
+ DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
diff --git a/net-proxy/squid/squid-4.17.ebuild b/net-proxy/squid/squid-4.17.ebuild
index 92eaac54a145..b0395042c782 100644
--- a/net-proxy/squid/squid-4.17.ebuild
+++ b/net-proxy/squid/squid-4.17.ebuild
@@ -79,6 +79,7 @@ pkg_pretend() {
src_prepare() {
eapply "${FILESDIR}/${PN}-4.3-gentoo.patch"
+ eapply "${FILESDIR}/${PN}-4.17-use-system-libltdl.patch"
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
INSTALL QUICKSTART \
@@ -197,8 +198,9 @@ src_configure() {
--with-build-environment=default \
--disable-strict-error-checking \
--disable-arch-native \
- --with-included-ltdl=/usr/include \
- --with-ltdl-libdir=/usr/$(get_libdir) \
+ --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) \
diff --git a/net-proxy/squid/squid-5.4.1-r1.ebuild b/net-proxy/squid/squid-5.4.1-r1.ebuild
index e5e9b869626f..d4d5ab2fd4fa 100644
--- a/net-proxy/squid/squid-5.4.1-r1.ebuild
+++ b/net-proxy/squid/squid-5.4.1-r1.ebuild
@@ -81,6 +81,7 @@ pkg_pretend() {
src_prepare() {
eapply "${FILESDIR}/${PN}-5.3-gentoo.patch"
+ eapply "${FILESDIR}/${PN}-4.17-use-system-libltdl.patch"
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
INSTALL QUICKSTART \
@@ -199,8 +200,9 @@ src_configure() {
--with-build-environment=default \
--disable-strict-error-checking \
--disable-arch-native \
- --with-included-ltdl=/usr/include \
- --with-ltdl-libdir=/usr/$(get_libdir) \
+ --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) \
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/
@ 2022-02-19 10:32 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2022-02-19 10:32 UTC (permalink / raw
To: gentoo-commits
commit: 31f3301b77f82cb456811519b87a007f384385f2
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Dec 28 22:18:36 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 10:32:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f3301b
net-proxy/squid: bump to 5.4.1
Closes: https://bugs.gentoo.org/814539
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23555
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
net-proxy/squid/Manifest | 1 +
net-proxy/squid/files/squid-5.3-gentoo.patch | 87 +++++++++
net-proxy/squid/squid-5.4.1.ebuild | 282 +++++++++++++++++++++++++++
3 files changed, 370 insertions(+)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 28a4987d88cb..d23055634c98 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,2 +1,3 @@
DIST squid-4.15.tar.xz 2454176 BLAKE2B 3cb08c806f03fcddd7233b05986434d2be3e62a50d006eb3f84bbc5b894ee3641929551d00a1800d6676add62f967067ec62b5b7c41d767766eeab5dfc17980e SHA512 8f0ce6e30dd9173927e8133618211ffb865fb5dde4c63c2fb465e2efccda4a6efb33f2c0846870c9b915340aff5f59461a60171882bcc0c890336b846fe60bd1
DIST squid-4.17.tar.xz 2464204 BLAKE2B e227dfbac846dff66f04c6c72d81d667076107653721d14804f079518cef68efc53f5404fbe3306efb0c775a10638661c300a8e7cd3d7ab43c0e57a344387674 SHA512 cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a
+DIST squid-5.4.1.tar.xz 2561444 BLAKE2B 3281f592c342b59a1017f4c0829543c857d61c4d1e191461f6e69bda2dc61ff59d5b92a04744dcebb75bd1b5d85c214c1f0bea78a791033a50f29891b6995fb8 SHA512 d53e64e8c44cfc978307f3965c52889d238121735fd201a8286139f974d5db9af41fe886d64e57dfacc87b777f5940cd6123a6e178d12530117cace945a9f6c1
diff --git a/net-proxy/squid/files/squid-5.3-gentoo.patch b/net-proxy/squid/files/squid-5.3-gentoo.patch
new file mode 100644
index 000000000000..54c036e14e50
--- /dev/null
+++ b/net-proxy/squid/files/squid-5.3-gentoo.patch
@@ -0,0 +1,87 @@
+diff --git a/configure.ac b/configure.ac
+index 7bd608b..0a0a908 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,9 +33,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
+diff --git a/src/cf.data.pre b/src/cf.data.pre
+index 9275219..1e3aca2 100644
+--- a/src/cf.data.pre
++++ b/src/cf.data.pre
+@@ -1633,6 +1633,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
+ NOCOMMENT_END
+ DOC_END
+
+@@ -7200,11 +7201,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
+diff --git a/src/debug.cc b/src/debug.cc
+index 59ad1e9..265a9fe 100644
+--- a/src/debug.cc
++++ b/src/debug.cc
+@@ -496,7 +496,7 @@ _db_init(const char *logfile, const char *options)
+ #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 */
+
+diff --git a/src/main.cc b/src/main.cc
+index 4b3988e..5622141 100644
+--- a/src/main.cc
++++ b/src/main.cc
+@@ -1921,7 +1921,7 @@ watch_child(const CommandLine &masterCommand)
+
+ 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();
+@@ -2013,7 +2013,7 @@ watch_child(const CommandLine &masterCommand)
+
+ 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));
+@@ -2025,7 +2025,7 @@ watch_child(const CommandLine &masterCommand)
+ }
+
+ /* 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-5.4.1.ebuild b/net-proxy/squid/squid-5.4.1.ebuild
new file mode 100644
index 000000000000..ecbe3c93599e
--- /dev/null
+++ b/net-proxy/squid/squid-5.4.1.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+
+MY_PV_MAJOR=$(ver_cut 1)
+# 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${MY_PV_MAJOR}/${P}.tar.xz"
+else
+ SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${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? (
+ dev-libs/openssl:0=
+ )
+ dev-libs/nettle:=
+ )
+ sasl? ( dev-libs/cyrus-sasl )
+ systemd? ( sys-apps/systemd:= )
+ ecap? ( net-libs/libecap:1 )
+ esi? ( dev-libs/expat dev-libs/libxml2 )
+ 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="!!<net-proxy/squid-5
+ ${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}-5.3-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/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 \
+ --with-included-ltdl=/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 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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/
@ 2020-05-03 15:05 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-05-03 15:05 UTC (permalink / raw
To: gentoo-commits
commit: 2ab08c4cff78184c68bc46730863d6427298e90d
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Sun May 3 09:53:08 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May 3 15:05:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab08c4c
net-proxy/squid: add patch for 4.11 (bug #719510)
Patch originates from upstream bug
(https://bugs.squid-cache.org/show_bug.cgi?id=5041)
Package-Manager: Portage-2.3.90, Repoman-2.3.22
Closes: https://bugs.gentoo.org/719510
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Closes: https://github.com/gentoo/gentoo/pull/15621
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
| 31 ++++++++++++++++++++++
net-proxy/squid/squid-4.11.ebuild | 1 +
2 files changed, 32 insertions(+)
--git a/net-proxy/squid/files/squid-4.11-missing-debug-extra.patch b/net-proxy/squid/files/squid-4.11-missing-debug-extra.patch
new file mode 100644
index 00000000000..cf4d3ebb9a5
--- /dev/null
+++ b/net-proxy/squid/files/squid-4.11-missing-debug-extra.patch
@@ -0,0 +1,31 @@
+From 0cbf89e7d266aabacc8651759a8509ebbe0f5c93 Mon Sep 17 00:00:00 2001
+From: Alex Rousskov <rousskov@measurement-factory.com>
+Date: Mon, 20 Apr 2020 15:32:48 -0400
+Subject: [PATCH] Bug 5041: Missing Debug::Extra breaks build on hosts with
+ systemd
+
+Master commit 6fa8c66 (i.e. Bug 5016 fix) relied on Debug::Extra added
+by master commit (ccfbe8f) that was not ported to v4. The port of the
+former master commit lacked the required piece of the latter commit.
+
+The problem is invisible on hosts without a systemd package (that Squid
+can find/use) and with Squids explicitly ./configured --without-systemd.
+---
+ src/Debug.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/Debug.h b/src/Debug.h
+index 6eecd01bf9..ddd9e38f8f 100644
+--- a/src/Debug.h
++++ b/src/Debug.h
+@@ -99,6 +99,10 @@ class Debug
+
+ /// configures the active debugging context to write syslog ALERT
+ static void ForceAlert();
++
++ /// prefixes each grouped debugs() line after the first one in the group
++ static std::ostream& Extra(std::ostream &os) { return os << "\n "; }
++
+ private:
+ static Context *Current; ///< deepest active context; nil outside debugs()
+ };
diff --git a/net-proxy/squid/squid-4.11.ebuild b/net-proxy/squid/squid-4.11.ebuild
index c63ab235d7d..b0fc4013b7d 100644
--- a/net-proxy/squid/squid-4.11.ebuild
+++ b/net-proxy/squid/squid-4.11.ebuild
@@ -78,6 +78,7 @@ pkg_pretend() {
src_prepare() {
eapply "${FILESDIR}/${PN}-4.3-gentoo.patch"
+ eapply "${FILESDIR}/${PN}-4.11-missing-debug-extra.patch"
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
INSTALL QUICKSTART \
scripts/fileno-to-pathname.pl \
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/
@ 2019-05-03 12:35 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2019-05-03 12:35 UTC (permalink / raw
To: gentoo-commits
commit: b766b3df55a0c3c9221f5a2e5f86cfd19c6de029
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri May 3 12:33:48 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri May 3 12:35:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b766b3df
net-proxy/squid: Drop old
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
net-proxy/squid/Manifest | 2 -
net-proxy/squid/files/squid-2018-1.patch | 28 --
net-proxy/squid/files/squid-2018-2.patch | 23 --
net-proxy/squid/files/squid-3.5.7-gentoo.patch | 100 ------
net-proxy/squid/files/squid-cppunit-1.14.patch | 417 -------------------------
net-proxy/squid/files/squid.confd-r1 | 12 -
net-proxy/squid/files/squid.initd-r4 | 117 -------
net-proxy/squid/squid-3.5.27-r1.ebuild | 270 ----------------
net-proxy/squid/squid-3.5.28.ebuild | 267 ----------------
9 files changed, 1236 deletions(-)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index ec29169dcdf..a01c50e0163 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1 @@
-DIST squid-3.5.27.tar.xz 2303468 BLAKE2B 448dbb703469bdd38a0e88da8e473510e9652fc7c7ae2e48bf687a4c2e1698f3baa92c212631fd3734ee51bead89980d31af58d64654418a7c4c4a16e1be751e SHA512 4172a053c3b7ffe7a12dfb3febac96942d0fbbe7e98e3f797f22cd75b0a3a89cbbfe7260b5daad099e79d5e9303bb5dfbfee7499cb30a90590aa1bd242ff4817
-DIST squid-3.5.28.tar.xz 2304680 BLAKE2B 9b41a191210ea441ebd2847e9dc2cfacf3ba9fa8ceb81513b4cb449b13f7e81d28e3f3c9c46003db6d3d8a936fbd2275e42e18c23bd9d7667b9bd6890a1627a8 SHA512 da8367d364725c7fd6330e7588b0ff70d32978a17ca0bc5fe58fa6d12c9d2adb42ade0a492c835761bc7fd67c1a55300b4b7402ad939cf2a2aa5104233bbb74b
DIST squid-4.6.tar.xz 2439792 BLAKE2B 1344acfd4ba135d5ec6881612614f735c6e4791f9b15dcc2f572b93e7f7c9e39585aa0b30aef5b09e40a9599e7fe7d3a118f878adac8f272b014ac3d65a83fae SHA512 dbe2b02b83d53d67459e22a19e71cbf99b66d74a2ddc4bc69310f03a0a6092e5840766ad699fc43893516e97ef89799ef2147dd40f76b0bd688c1e271fd20d06
diff --git a/net-proxy/squid/files/squid-2018-1.patch b/net-proxy/squid/files/squid-2018-1.patch
deleted file mode 100644
index 9392219a9ed..00000000000
--- a/net-proxy/squid/files/squid-2018-1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5)
-Author: Amos Jeffries <yadij@users.noreply.github.com>
-Date: 2018-01-19 13:54:14 +1300
-
- ESI: make sure endofName never exceeds tagEnd (#130)
-
-diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc
-index d86d2d3..db634d9 100644
---- a/src/esi/CustomParser.cc
-+++ b/src/esi/CustomParser.cc
-@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
-
- char * endofName = strpbrk(const_cast<char *>(tag), w_space);
-
-- if (endofName > tagEnd)
-+ if (!endofName || endofName > tagEnd)
- endofName = const_cast<char *>(tagEnd);
-
- *endofName = '\0';
-@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
-
- char * endofName = strpbrk(const_cast<char *>(tag), w_space);
-
-- if (endofName > tagEnd)
-+ if (!endofName || endofName > tagEnd)
- endofName = const_cast<char *>(tagEnd);
-
- *endofName = '\0';
diff --git a/net-proxy/squid/files/squid-2018-2.patch b/net-proxy/squid/files/squid-2018-2.patch
deleted file mode 100644
index 9ecd8a5b7cb..00000000000
--- a/net-proxy/squid/files/squid-2018-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5)
-Author: squidadm <squidadm@users.noreply.github.com>
-Date: 2018-01-21 08:07:08 +1300
-
- Fix indirect IP logging for transactions without a client connection (#129) (#136)
-
-diff --git a/src/client_side_request.cc b/src/client_side_request.cc
-index be124f3..203f89d 100644
---- a/src/client_side_request.cc
-+++ b/src/client_side_request.cc
-@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *data)
- * Ensure that the access log shows the indirect client
- * instead of the direct client.
- */
-- ConnStateData *conn = http->getConn();
-- conn->log_addr = request->indirect_client_addr;
-- http->al->cache.caddr = conn->log_addr;
-+ http->al->cache.caddr = request->indirect_client_addr;
-+ if (ConnStateData *conn = http->getConn())
-+ conn->log_addr = request->indirect_client_addr;
- }
- request->x_forwarded_for_iterator.clean();
- request->flags.done_follow_x_forwarded_for = true;
diff --git a/net-proxy/squid/files/squid-3.5.7-gentoo.patch b/net-proxy/squid/files/squid-3.5.7-gentoo.patch
deleted file mode 100644
index c4def050a2d..00000000000
--- a/net-proxy/squid/files/squid-3.5.7-gentoo.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a863327..deb44ed 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,9 +26,9 @@ PRESET_CFLAGS="$CFLAGS"
- 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
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6b69267..10f506a 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -867,8 +867,8 @@ DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR)
- DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
- DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
--DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/ssl_db
-+DEFAULT_NETDB_FILE = $(localstatedir)/lib/squid/netdb.state
-+DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/squid/ssl_db
- DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
-diff --git a/src/debug.cc b/src/debug.cc
-index 64ab0ba..062119a 100644
---- a/src/debug.cc
-+++ b/src/debug.cc
-@@ -450,7 +450,7 @@ _db_init(const char *logfile, const char *options)
- #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 */
-
-diff --git a/src/main.cc b/src/main.cc
-index d6eb01a..0b93f0e 100644
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -1657,7 +1657,7 @@ watch_child(char *argv[])
- if (!IamMasterProcess())
- return;
-
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
-
- if ((pid = fork()) < 0)
- syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1720,7 +1720,7 @@ watch_child(char *argv[])
-
- 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);
- prog = argv[0];
- argv[0] = const_cast<char*>(kid.name().termedBuf());
- execvp(prog, argv);
-@@ -1733,7 +1733,7 @@ watch_child(char *argv[])
- }
-
- /* parent */
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
-
- squid_signal(SIGINT, SIG_IGN, SA_RESTART);
-
---- a/src/cf.data.pre 2013-04-29 11:17:59.256167134 +0300
-+++ b/src/cf.data.pre 2013-04-29 11:20:17.043924313 +0300
-@@ -1019,6 +1019,7 @@
- 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
-@@ -5300,11 +5301,11 @@
-
- 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
diff --git a/net-proxy/squid/files/squid-cppunit-1.14.patch b/net-proxy/squid/files/squid-cppunit-1.14.patch
deleted file mode 100644
index f31268fc61d..00000000000
--- a/net-proxy/squid/files/squid-cppunit-1.14.patch
+++ /dev/null
@@ -1,417 +0,0 @@
-# backport rev 14707 from trunk
---- Makefile.am 2016-01-30 09:09:25 +0000
-+++ Makefile.am 2016-06-13 07:46:59 +0000
-@@ -48,7 +48,7 @@
- check: have-cppunit check-recursive
-
- have-cppunit:
-- @if test "$(SQUID_CPPUNIT_INC)$(SQUID_CPPUNIT_LA)$(SQUID_CPPUNIT_LIBS)" = "" ; then \
-+ @if test "$(LIBCPPUNIT_CFLAGS)$(LIBCPPUNIT_LIBS)" = "" ; then \
- echo "FATAL: 'make check' requires cppunit and cppunit development packages. They do not appear to be installed." ; \
- exit 1 ; \
- fi
-
---- compat/Makefile.am 2016-02-09 08:57:33 +0000
-+++ compat/Makefile.am 2016-06-13 07:46:59 +0000
-@@ -94,7 +94,7 @@
- testPreCompiler_SOURCES= \
- testPreCompiler.h \
- testPreCompiler.cc
--testPreCompiler_LDADD= $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS)
-+testPreCompiler_LDADD= $(LIBCPPUNIT_LIBS)
- testPreCompiler_LDFLAGS=
-
- # os/ subdir prevents us using src/TestHeaders.am
-
---- configure.ac 2016-06-11 05:28:18 +0000
-+++ configure.ac 2016-06-13 07:46:59 +0000
-@@ -115,10 +115,11 @@
- AC_PATH_PROG(CHMOD, chmod, $FALSE)
- AC_PATH_PROG(TR, tr, $FALSE)
- AC_PATH_PROG(RM, rm, $FALSE)
--AC_PATH_PROG(CPPUNITCONFIG, cppunit-config, false)
- dnl Libtool 2.2.6 requires: rm -f
- RM="$RM -f"
-
-+PKG_PROG_PKG_CONFIG
-+
- AC_PATH_PROG(PERL, perl, none)
- if test "x$ac_cv_path_PERL" = "xnone"; then
- AC_MSG_FAILURE([Perl is required to compile Squid. Please install Perl and then re-run configure ])
-@@ -984,9 +985,6 @@
- ]
- )
-
--dnl Necessary if the first PKG_CHECK_MODULES call is conditional
--PKG_PROG_PKG_CONFIG
--
- dnl Perform configuration consistency checks for eCAP
- if test "x$squid_opt_use_ecap" != "xno";
- then
-@@ -2725,45 +2723,29 @@
- [Enable support for the X-Accelerator-Vary HTTP header])
- AC_MSG_NOTICE([X-Accelerator-Vary support enabled: $enable_x_accelerator_vary])
-
--
--if $CPPUNITCONFIG --help >/dev/null; then
-- squid_cv_cppunit_version="`$CPPUNITCONFIG --version`"
-- AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version])
-- unset squid_cv_cppunit_version
-- SQUID_CPPUNIT_LIBS="`$CPPUNITCONFIG --libs`"
-- SQUID_CPPUNIT_LA=''
-- SQUID_CPPUNIT_INC="`$CPPUNITCONFIG --cflags`"
--else
-- AC_MSG_WARN([cppunit does not appear to be installed. squid does not require this, but code testing with 'make check' will fail.])
-- SQUID_CPPUNIT_LA=''
-- SQUID_CPPUNIT_LIBS=''
-- SQUID_CPPUNIT_INC=''
--fi
--
--AC_ARG_WITH(cppunit-basedir,
-- AS_HELP_STRING([--with-cppunit-basedir=PATH],
-- [Path where the cppunit headers are libraries can be found ]), [
--if test -f "$withval/include/cppunit/TestCase.h"; then
-- AC_MSG_NOTICE([Using cppunit includes from $withval])
-- SQUID_CPPUNIT_INC="-I${withval}/include"
--else
-- AC_MSG_ERROR(Cannot find cppunit at $withval)
--fi
--if test -f "$withval/lib/libcppunit.la"; then
-- AC_MSG_NOTICE([Using cppunit lib from $withval])
-- SQUID_CPPUNIT_LA="${withval}/lib/libcppunit.la"
-- SQUID_CPPUNIT_LIBS='$(SQUID_CPPUNIT_LA)'
--else
-- AC_MSG_ERROR(Cannot find cppunit at $withval)
--fi
--])
--SQUID_STATE_SAVE(squid_cppunit_state)
--CXXFLAGS="$CXXFLAGS $SQUID_CPPUNIT_INC"
--AC_CHECK_HEADERS(cppunit/extensions/HelperMacros.h)
--SQUID_STATE_ROLLBACK(squid_cppunit_state)
--AC_SUBST(SQUID_CPPUNIT_LIBS)
--AC_SUBST(SQUID_CPPUNIT_LA)
--AC_SUBST(SQUID_CPPUNIT_INC)
-+AC_ARG_WITH([cppunit], AS_HELP_STRING([--without-cppunit],[Do not use cppunit test framework]),[
-+ AS_CASE($with_cppunit, [yes|no],[],
-+ [
-+ AS_IF([test ! -d "$withval"],AC_MSG_ERROR([--with-cppunit PATH does not point to a directory]))
-+ LIBCPPUNIT_CFLAGS="-I$with_cppunit/include"
-+ LIBCPPUNIT_LIBS="-L$with_cppunit/lib -lcppunit"
-+ ])
-+])
-+AS_IF([test "x$with_cppunit" != "xno"],[
-+ PKG_CHECK_MODULES([LIBCPPUNIT],[cppunit],[
-+ squid_cv_cppunit_version="`pkg-config cppunit --version`"
-+ AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version])
-+ AS_UNSET(squid_cv_cppunit_version)
-+
-+ SQUID_STATE_SAVE(squid_cppunit_state)
-+ AS_VAR_APPEND(CXXFLAGS,[$LIBCPPUNIT_CFLAGS])
-+ AS_VAR_APPEND(LIBS,[$LIBCPPUNIT_LIBS])
-+ AC_CHECK_HEADERS(cppunit/extensions/HelperMacros.h)
-+ SQUID_STATE_ROLLBACK(squid_cppunit_state)
-+ ],[
-+ AC_MSG_WARN([cppunit does not appear to be installed. Squid does not require this, but code testing with 'make check' will fail.])
-+ ])
-+])
-
- # Force some compilers to use ANSI features
- #
-
---- src/Common.am 2017-06-01 16:49:00.000000000 +0300
-+++ src/Common.am 2017-06-15 16:10:20.000000000 +0300
-@@ -26,7 +26,7 @@
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/src \
- -I$(top_builddir)/include \
-- $(SQUID_CPPUNIT_INC)
-+ $(LIBCPPUNIT_CFLAGS)
-
- ## Kerberos headers require their include path.
- ## Because we use libcompat for comm_err.h header protections ...
---- src/Makefile.am 2017-06-01 16:49:00.000000000 +0300
-+++ src/Makefile.am 2017-06-15 16:38:40.000000000 +0300
-@@ -1112,9 +1112,9 @@
- # $(TESTSOURCES)
- #tests_testX_LDFLAGS = $(LIBADD_DL)
- #tests_testX_LDADD=\
--# $(SQUID_CPPUNIT_LIBS) \
--# $(SQUID_CPPUNIT_LA) \
--# $(COMPAT_LIB) \
-+# $(LIBCPPUNIT_LIBS) \
-+# $(COMPAT_LIB) \
-+# $(XTRA_LIBS)
- #tests_testX_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
-
-
-@@ -1221,8 +1221,7 @@
- $(top_builddir)/lib/libmisccontainers.la \
- $(top_builddir)/lib/libmiscencoding.la \
- $(top_builddir)/lib/libmiscutil.la \
-- $(SQUID_CPPUNIT_LIBS) \
-- $(SQUID_CPPUNIT_LA) \
-+ $(LIBCPPUNIT_LIBS) \
- $(NETTLELIB) \
- $(SSLLIB) \
- $(COMPAT_LIB) \
-@@ -1363,7 +1362,7 @@
- $(DISK_OS_LIBS) \
- $(NETTLELIB) \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
-+ $(LIBCPPUNIT_LIBS) \
- $(SSLLIB) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
-@@ -1383,14 +1382,14 @@
- tests/stub_MemBuf.cc \
- $(TESTSOURCES)
- tests_testBoilerplate_LDADD= \
-- $(SQUID_CPPUNIT_LIBS) \
- $(SSLLIB) \
- base/libbase.la \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testBoilerplate_LDFLAGS = $(LIBADD_DL)
- tests_testBoilerplate_DEPENDENCIES = \
-- $(SQUID_CPPUNIT_LA)
-+ $(LIBCPPUNIT_LIBS)
-
- ## Tests of base/libbase.la objects
- tests_testCharacterSet_SOURCES = \
-@@ -1405,9 +1404,8 @@
- tests_testCharacterSet_LDFLAGS = $(LIBADD_DL)
- tests_testCharacterSet_LDADD= \
- base/libbase.la \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
-- $(SQUID_CPPUNIT_LA) \
-- $(SQUID_CPPUNIT_LIBS) \
- $(XTRA_LIBS)
-
- ## Tests of the CacheManager module.
-@@ -1646,8 +1644,7 @@
- $(top_builddir)/lib/libmiscutil.la \
- $(NETTLELIB) \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
-- $(SQUID_CPPUNIT_LA) \
-+ $(LIBCPPUNIT_LIBS) \
- $(SSLLIB) \
- $(KRB5LIBS) \
- $(COMPAT_LIB) \
-@@ -1829,8 +1826,8 @@
- $(top_builddir)/lib/libmiscutil.la \
- $(NETTLELIB) \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
- $(SSLLIB) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
-
-@@ -2076,9 +2073,8 @@
- $(SNMP_LIBS) \
- $(NETTLELIB) \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
-- $(SQUID_CPPUNIT_LA) \
- $(SSLLIB) \
-+ $(LIBCPPUNIT_LIBS) \
- $(KRB5LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
-@@ -2323,10 +2319,9 @@
- $(SNMP_LIBS) \
- $(NETTLELIB) \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
-- $(SQUID_CPPUNIT_LA) \
- $(SSLLIB) \
- $(KRB5LIBS) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testEventLoop_LDFLAGS = $(LIBADD_DL)
-@@ -2564,10 +2559,9 @@
- $(top_builddir)/lib/libmiscutil.la \
- $(NETTLELIB) \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
-- $(SQUID_CPPUNIT_LA) \
- $(SSLLIB) \
- $(KRB5LIBS) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_test_http_range_LDFLAGS = $(LIBADD_DL)
-@@ -2613,7 +2607,7 @@
- base/libbase.la \
- ip/libip.la \
- $(top_builddir)/lib/libmiscutil.la \
-- $(SQUID_CPPUNIT_LIBS) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testHttpParser_LDFLAGS = $(LIBADD_DL)
-@@ -2639,9 +2633,8 @@
- parser/libsquid-parser.la \
- base/libbase.la \
- $(top_builddir)/lib/libmiscutil.la \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
-- $(SQUID_CPPUNIT_LA) \
-- $(SQUID_CPPUNIT_LIBS) \
- $(XTRA_LIBS)
-
- ## Tests of the HttpRequest module.
-@@ -2875,10 +2868,9 @@
- $(DISK_OS_LIBS) \
- $(NETTLELIB) \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
-- $(SQUID_CPPUNIT_LA) \
- $(SSLLIB) \
- $(KRB5LIBS) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
-@@ -2902,9 +2894,8 @@
- icmp/libicmp-core.la \
- ip/libip.la \
- base/libbase.la \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
-- $(SQUID_CPPUNIT_LA) \
-- $(SQUID_CPPUNIT_LIBS) \
- $(XTRA_LIBS)
-
- ## Tests for ip/* objects
-@@ -2918,9 +2909,8 @@
- tests_testIpAddress_LDADD= \
- ip/libip.la \
- base/libbase.la \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
-- $(SQUID_CPPUNIT_LA) \
-- $(SQUID_CPPUNIT_LIBS) \
- $(XTRA_LIBS)
- tests_testIpAddress_LDFLAGS= $(LIBADD_DL)
-
-@@ -3087,10 +3077,10 @@
- $(top_builddir)/lib/libmiscutil.la \
- $(NETTLELIB) \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
- $(SSLLIB) \
- CommCalls.o \
- DnsLookupDetails.o \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testStore_LDFLAGS = $(LIBADD_DL)
-@@ -3130,8 +3120,8 @@
- ip/libip.la \
- $(top_builddir)/lib/libmiscutil.la \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
- $(SSLLIB) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testString_LDFLAGS = $(LIBADD_DL)
-@@ -3326,8 +3316,8 @@
- $(top_builddir)/lib/libmiscutil.la \
- $(NETTLELIB) \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
- $(SSLLIB) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testUfs_LDFLAGS = $(LIBADD_DL)
-@@ -3506,8 +3496,8 @@
- $(top_builddir)/lib/libmiscutil.la \
- $(NETTLELIB) \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
- $(SSLLIB) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testRock_LDFLAGS = $(AM_CPPFLAGS) $(LIBADD_DL)
-@@ -3751,10 +3741,9 @@
- $(top_builddir)/lib/libmiscutil.la \
- $(NETTLELIB) \
- $(COMPAT_LIB) \
-- $(SQUID_CPPUNIT_LIBS) \
-- $(SQUID_CPPUNIT_LA) \
- $(SSLLIB) \
- $(KRB5LIBS) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testURL_LDFLAGS = $(LIBADD_DL)
-@@ -3794,7 +3783,7 @@
- mgr/libmgr.la \
- $(top_builddir)/lib/libmiscutil.la \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
-@@ -3838,7 +3827,7 @@
- ip/libip.la \
- mgr/libmgr.la \
- $(top_builddir)/lib/libmiscutil.la \
-- $(SQUID_CPPUNIT_LIBS) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testSBufList_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
-@@ -3876,8 +3865,8 @@
- ip/libip.la \
- $(top_builddir)/lib/libmiscutil.la \
- $(REGEXLIB) \
-- $(SQUID_CPPUNIT_LIBS) \
- $(SSLLIB) \
-+ $(LIBCPPUNIT_LIBS) \
- $(COMPAT_LIB) \
- $(XTRA_LIBS)
- tests_testConfigParser_LDFLAGS = $(LIBADD_DL)
-@@ -3922,9 +3911,9 @@
- base/libbase.la \
- $(top_builddir)/lib/libmiscutil.la \
- $(top_builddir)/lib/libmisccontainers.la \
-- $(SQUID_CPPUNIT_LIBS) \
-- $(SQUID_CPPUNIT_LA) \
-- $(COMPAT_LIB)
-+ $(LIBCPPUNIT_LIBS) \
-+ $(COMPAT_LIB) \
-+ $(XTRA_LIBS)
- tests_testStatHist_DEPENDENCIES = $(SQUID_CPPUNIT_LA)
-
- TESTS += testHeaders
---- lib/Makefile.am 2017-06-01 16:49:00.000000000 +0300
-+++ lib/Makefile.am 2017-06-16 07:19:54.000000000 +0300
-@@ -91,7 +91,7 @@
- tests/testRFC1035.cc
-
- tests_testRFC1035_LDADD= \
-- $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \
-+ $(LIBCPPUNIT_LIBS) \
- $(top_builddir)/lib/libmiscencoding.la \
- $(top_builddir)/lib/libmiscutil.la \
- $(COMPAT_LIB)
-@@ -103,7 +103,7 @@
- tests/testRFC1738.cc
-
- tests_testRFC1738_LDADD= \
-- $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \
-+ $(LIBCPPUNIT_LIBS) \
- $(top_builddir)/lib/libmiscencoding.la \
- $(top_builddir)/lib/libmiscutil.la \
- $(COMPAT_LIB)
diff --git a/net-proxy/squid/files/squid.confd-r1 b/net-proxy/squid/files/squid.confd-r1
deleted file mode 100644
index a29d33defb0..00000000000
--- a/net-proxy/squid/files/squid.confd-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/squid
-
-SQUID_OPTS="-YC"
-
-# Kerberos keytab file to use. This is required if you enable kerberos authentication.
-SQUID_KEYTAB=""
-
-# Use max_filedescriptors setting in squid.conf to determine the maximum number
-# of filedescriptors squid can open.
diff --git a/net-proxy/squid/files/squid.initd-r4 b/net-proxy/squid/files/squid.initd-r4
deleted file mode 100644
index 3e84eda38a6..00000000000
--- a/net-proxy/squid/files/squid.initd-r4
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload rotate"
-
-depend() {
- use dns net
-}
-
-checkconfig() {
- if [ ! -f /etc/squid/${SVCNAME}.conf ]; then
- eerror "You need to create /etc/squid/${SVCNAME}.conf first."
- eerror "An example can be found in /etc/squid/squid.conf.default"
- return 1
- fi
-
- local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf)
- [ -z ${PIDFILE} ] && PIDFILE=/run/squid.pid
- if [ /run/${SVCNAME}.pid != ${PIDFILE} ]; then
- eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to"
- eerror " /run/${SVCNAME}.pid"
- eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
- eerror " in any other instance of squid."
- return 1
- fi
-
- # Maximum file descriptors squid can open is determined by:
- # a basic default of N=1024
- # ... altered by ./configure --with-filedescriptors=N
- # ... overridden on production by squid.conf max_filedescriptors (if,
- # and only if, setrlimit() RLIMIT_NOFILE is able to be built+used).
- # Since we do not configure hard coded # of filedescriptors anymore,
- # there is no need for ulimit calls in the init script.
- # Use max_filedescriptors in squid.conf instead.
-
- local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ( $2 == "rock" ) printf "%s/rock ", $3; else if ( $2 == "coss" ) printf "%s/stripe ", $3; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf)
- [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
-
- local x
- for x in $CACHE_SWAP ; do
- if [ ! -e $x ] ; then
- ebegin "Initializing cache directory ${x%/*}"
- local ORIG_UMASK=$(umask)
- umask 027
-
- if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
- eend 1
- return 1
- fi
-
- local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)"
- if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
- umask $ORIG_UMASK
- eend 1
- echo "$INIT_CACHE_RESPONSE"
- return 1
- fi
-
- umask $ORIG_UMASK
- eend 0
- break
- fi
- done
-
- return 0
-}
-
-start() {
- checkconfig || return 1
- checkpath -d -q -m 0750 -o squid:squid /run/${SVCNAME}
-
- ebegin "Starting ${SVCNAME}"
- KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
- eend $? && sleep 1
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
- # Now we have to wait until squid has _really_ stopped.
- sleep 1
- if [ -f /run/${SVCNAME}.pid ] ; then
- einfon "Waiting for squid to shutdown ."
- cnt=0
- while [ -f /run/${SVCNAME}.pid ] ; do
- cnt=$(expr $cnt + 1)
- if [ $cnt -gt 60 ] ; then
- # Waited 120 seconds now. Fail.
- echo
- eend 1 "Failed."
- break
- fi
- sleep 2
- echo -n "."
- done
- echo
- fi
- else
- eerror "Squid shutdown failed, probably service is already down."
- fi
- eend 0
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading ${SVCNAME}"
- /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf
- eend $?
-}
-
-rotate() {
- service_started ${SVCNAME} || return 1
- ebegin "Rotating ${SVCNAME} logs"
- /usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf
- eend $?
-}
diff --git a/net-proxy/squid/squid-3.5.27-r1.ebuild b/net-proxy/squid/squid-3.5.27-r1.ebuild
deleted file mode 100644
index ff2d870e4cc..00000000000
--- a/net-proxy/squid/squid-3.5.27-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools linux-info pam toolchain-funcs user
-
-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 libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap esi ssl-crtd \
- mysql postgres sqlite \
- perl 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? (
- libressl? ( dev-libs/libressl:0 )
- !libressl? ( 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-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
- dev-lang/perl
- 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 )
- !<=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() {
- eapply "${FILESDIR}/${PN}-3.5.7-gentoo.patch"
- eapply -p0 "${FILESDIR}/${PN}-cppunit-1.14.patch"
- eapply "${FILESDIR}/${PN}-2018-1.patch"
- eapply "${FILESDIR}/${PN}-2018-2.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
-
- eapply_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_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
-
- 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 \
- --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
-
- # these scripts depend on perl
- if ! use perl; then
- local f
- local PERL_SCRIPTS=(
- "${D}"/usr/libexec/squid/basic_pop3_auth
- "${D}"/usr/libexec/squid/log_db_daemon
- "${D}"/usr/libexec/squid/basic_msnt_multi_domain_auth
- "${D}"/usr/libexec/squid/storeid_file_rewrite
- "${D}"/usr/libexec/squid/helper-mux.pl
- )
- for f in "${PERL_SCRIPTS[@]}"; do
- rm -v "${f}" || die
- done
- fi
-
- # 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
- dodoc 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
-}
diff --git a/net-proxy/squid/squid-3.5.28.ebuild b/net-proxy/squid/squid-3.5.28.ebuild
deleted file mode 100644
index c0af6b07ce1..00000000000
--- a/net-proxy/squid/squid-3.5.28.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools linux-info pam toolchain-funcs user
-
-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 libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap esi ssl-crtd \
- mysql postgres sqlite \
- perl 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? (
- libressl? ( dev-libs/libressl:0 )
- !libressl? ( 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-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
- dev-lang/perl
- 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 )
- !<=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() {
- eapply "${FILESDIR}/${PN}-3.5.7-gentoo.patch"
- eapply -p0 "${FILESDIR}/${PN}-cppunit-1.14.patch"
- #eapply "${FILESDIR}/${PN}-2018-1.patch"
- #eapply "${FILESDIR}/${PN}-2018-2.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
-
- eapply_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_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
-
- 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 \
- --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
-
- # these scripts depend on perl
- if ! use perl; then
- local f
- local PERL_SCRIPTS=(
- "${D}"/usr/libexec/squid/basic_pop3_auth
- "${D}"/usr/libexec/squid/log_db_daemon
- "${D}"/usr/libexec/squid/basic_msnt_multi_domain_auth
- "${D}"/usr/libexec/squid/storeid_file_rewrite
- "${D}"/usr/libexec/squid/helper-mux.pl
- )
- for f in "${PERL_SCRIPTS[@]}"; do
- rm -v "${f}" || die
- done
- fi
-
- # 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
- dodoc 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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/
@ 2017-06-16 6:26 Eray Aslan
0 siblings, 0 replies; 11+ messages in thread
From: Eray Aslan @ 2017-06-16 6:26 UTC (permalink / raw
To: gentoo-commits
commit: b3a818cd797e2ccf8a91ced4c6d356b001819394
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 04:54:41 2017 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 06:25:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a818cd
net-proxy/squid: bump to 3.5.26
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-proxy/squid/Manifest | 1 +
net-proxy/squid/files/squid-cppunit-1.14.patch | 417 +++++++++++++++++++++++++
net-proxy/squid/squid-3.5.26.ebuild | 241 ++++++++++++++
3 files changed, 659 insertions(+)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 9c27650a530..9d5514e53e0 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,4 @@
DIST squid-3.5.23.tar.xz 2325884 SHA256 fa4c0c99f41e92fe1330bed3968d176c6f47ef2e3aea2f83977d5501afa40bdb SHA512 3f2b3df60fc0b2aab3d0d9e3489832d60d0aac8222f09ad2ff6afb95202b904f41f6530d713e7ce446c6f62b66f0cd792a6b12005d43c53fe68d2371f9caa880 WHIRLPOOL 39338be97e3357759b9062e3c3b353a2118ca910e56584e73560489078e76a42b230ac24468ea62f6e3df7de210492beda54b0c178804c097d4b303d16cd2914
DIST squid-3.5.24.tar.xz 2326424 SHA256 4fe29f582eef357faa541a53835b6885e24e6f28b80a3abcdf3b57f5393bbdb2 SHA512 912a0882c71ba170e7c2eccf940cfca87d7fd0a6026a7aaa9dddacc1e17590809ad449e15913d180d5ce5b8d2828a68247ab920a4a499f3ee29ddd464e29344f WHIRLPOOL 1d245ee3bd6eff69b201ee1c57671617d06e36663d38d44bf4335ca1ebee251c0983f1f041c00cc823d7c5fc04d0a3725197beac407e2bfcfe81f679bc96f3a0
DIST squid-3.5.25.tar.xz 2327316 SHA256 28959254c32b8cd87e9599b6beb97352cf0638524e0f5ac3e1754f08462f3585 SHA512 9adfadd962954537c3364543ce4ca862e6f60801f1fb80bc3b74fbd99b60219aed4756affff8f7d956337f4b573d0ebecad01f689d0c6554aa2958f5bcfb972f WHIRLPOOL d29a4591fc8521e3ebd864d547c86341136b1aefa7679d35a01e5fcc102b4dfe1e340089f9e7ba9489911fbcd6a1e61a4715e1669348aa6e8a4379471ab18ec6
+DIST squid-3.5.26.tar.xz 2328352 SHA256 baa1eecb7d6e18881f4455060d80ee7cb95ae7e2695fdccf7e21ccc8f879a982 SHA512 08fc7fb5d1dea8d91cc318e5be9044fd75c69d0d2053a0c79ab594155aeb4a0f48bb0ff1dd754497485dc8db117b71f1787b0265842cf61b474293d5d38a9222 WHIRLPOOL 4d069b5beb91a0c688dacd72067f360a22bbf5565705c4d0a4ee9c6131c857adcbaa2130b0785f242bde23902cd32344f3c264f46f567088283f3de65d6acbd0
diff --git a/net-proxy/squid/files/squid-cppunit-1.14.patch b/net-proxy/squid/files/squid-cppunit-1.14.patch
new file mode 100644
index 00000000000..f31268fc61d
--- /dev/null
+++ b/net-proxy/squid/files/squid-cppunit-1.14.patch
@@ -0,0 +1,417 @@
+# backport rev 14707 from trunk
+--- Makefile.am 2016-01-30 09:09:25 +0000
++++ Makefile.am 2016-06-13 07:46:59 +0000
+@@ -48,7 +48,7 @@
+ check: have-cppunit check-recursive
+
+ have-cppunit:
+- @if test "$(SQUID_CPPUNIT_INC)$(SQUID_CPPUNIT_LA)$(SQUID_CPPUNIT_LIBS)" = "" ; then \
++ @if test "$(LIBCPPUNIT_CFLAGS)$(LIBCPPUNIT_LIBS)" = "" ; then \
+ echo "FATAL: 'make check' requires cppunit and cppunit development packages. They do not appear to be installed." ; \
+ exit 1 ; \
+ fi
+
+--- compat/Makefile.am 2016-02-09 08:57:33 +0000
++++ compat/Makefile.am 2016-06-13 07:46:59 +0000
+@@ -94,7 +94,7 @@
+ testPreCompiler_SOURCES= \
+ testPreCompiler.h \
+ testPreCompiler.cc
+-testPreCompiler_LDADD= $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS)
++testPreCompiler_LDADD= $(LIBCPPUNIT_LIBS)
+ testPreCompiler_LDFLAGS=
+
+ # os/ subdir prevents us using src/TestHeaders.am
+
+--- configure.ac 2016-06-11 05:28:18 +0000
++++ configure.ac 2016-06-13 07:46:59 +0000
+@@ -115,10 +115,11 @@
+ AC_PATH_PROG(CHMOD, chmod, $FALSE)
+ AC_PATH_PROG(TR, tr, $FALSE)
+ AC_PATH_PROG(RM, rm, $FALSE)
+-AC_PATH_PROG(CPPUNITCONFIG, cppunit-config, false)
+ dnl Libtool 2.2.6 requires: rm -f
+ RM="$RM -f"
+
++PKG_PROG_PKG_CONFIG
++
+ AC_PATH_PROG(PERL, perl, none)
+ if test "x$ac_cv_path_PERL" = "xnone"; then
+ AC_MSG_FAILURE([Perl is required to compile Squid. Please install Perl and then re-run configure ])
+@@ -984,9 +985,6 @@
+ ]
+ )
+
+-dnl Necessary if the first PKG_CHECK_MODULES call is conditional
+-PKG_PROG_PKG_CONFIG
+-
+ dnl Perform configuration consistency checks for eCAP
+ if test "x$squid_opt_use_ecap" != "xno";
+ then
+@@ -2725,45 +2723,29 @@
+ [Enable support for the X-Accelerator-Vary HTTP header])
+ AC_MSG_NOTICE([X-Accelerator-Vary support enabled: $enable_x_accelerator_vary])
+
+-
+-if $CPPUNITCONFIG --help >/dev/null; then
+- squid_cv_cppunit_version="`$CPPUNITCONFIG --version`"
+- AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version])
+- unset squid_cv_cppunit_version
+- SQUID_CPPUNIT_LIBS="`$CPPUNITCONFIG --libs`"
+- SQUID_CPPUNIT_LA=''
+- SQUID_CPPUNIT_INC="`$CPPUNITCONFIG --cflags`"
+-else
+- AC_MSG_WARN([cppunit does not appear to be installed. squid does not require this, but code testing with 'make check' will fail.])
+- SQUID_CPPUNIT_LA=''
+- SQUID_CPPUNIT_LIBS=''
+- SQUID_CPPUNIT_INC=''
+-fi
+-
+-AC_ARG_WITH(cppunit-basedir,
+- AS_HELP_STRING([--with-cppunit-basedir=PATH],
+- [Path where the cppunit headers are libraries can be found ]), [
+-if test -f "$withval/include/cppunit/TestCase.h"; then
+- AC_MSG_NOTICE([Using cppunit includes from $withval])
+- SQUID_CPPUNIT_INC="-I${withval}/include"
+-else
+- AC_MSG_ERROR(Cannot find cppunit at $withval)
+-fi
+-if test -f "$withval/lib/libcppunit.la"; then
+- AC_MSG_NOTICE([Using cppunit lib from $withval])
+- SQUID_CPPUNIT_LA="${withval}/lib/libcppunit.la"
+- SQUID_CPPUNIT_LIBS='$(SQUID_CPPUNIT_LA)'
+-else
+- AC_MSG_ERROR(Cannot find cppunit at $withval)
+-fi
+-])
+-SQUID_STATE_SAVE(squid_cppunit_state)
+-CXXFLAGS="$CXXFLAGS $SQUID_CPPUNIT_INC"
+-AC_CHECK_HEADERS(cppunit/extensions/HelperMacros.h)
+-SQUID_STATE_ROLLBACK(squid_cppunit_state)
+-AC_SUBST(SQUID_CPPUNIT_LIBS)
+-AC_SUBST(SQUID_CPPUNIT_LA)
+-AC_SUBST(SQUID_CPPUNIT_INC)
++AC_ARG_WITH([cppunit], AS_HELP_STRING([--without-cppunit],[Do not use cppunit test framework]),[
++ AS_CASE($with_cppunit, [yes|no],[],
++ [
++ AS_IF([test ! -d "$withval"],AC_MSG_ERROR([--with-cppunit PATH does not point to a directory]))
++ LIBCPPUNIT_CFLAGS="-I$with_cppunit/include"
++ LIBCPPUNIT_LIBS="-L$with_cppunit/lib -lcppunit"
++ ])
++])
++AS_IF([test "x$with_cppunit" != "xno"],[
++ PKG_CHECK_MODULES([LIBCPPUNIT],[cppunit],[
++ squid_cv_cppunit_version="`pkg-config cppunit --version`"
++ AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version])
++ AS_UNSET(squid_cv_cppunit_version)
++
++ SQUID_STATE_SAVE(squid_cppunit_state)
++ AS_VAR_APPEND(CXXFLAGS,[$LIBCPPUNIT_CFLAGS])
++ AS_VAR_APPEND(LIBS,[$LIBCPPUNIT_LIBS])
++ AC_CHECK_HEADERS(cppunit/extensions/HelperMacros.h)
++ SQUID_STATE_ROLLBACK(squid_cppunit_state)
++ ],[
++ AC_MSG_WARN([cppunit does not appear to be installed. Squid does not require this, but code testing with 'make check' will fail.])
++ ])
++])
+
+ # Force some compilers to use ANSI features
+ #
+
+--- src/Common.am 2017-06-01 16:49:00.000000000 +0300
++++ src/Common.am 2017-06-15 16:10:20.000000000 +0300
+@@ -26,7 +26,7 @@
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/src \
+ -I$(top_builddir)/include \
+- $(SQUID_CPPUNIT_INC)
++ $(LIBCPPUNIT_CFLAGS)
+
+ ## Kerberos headers require their include path.
+ ## Because we use libcompat for comm_err.h header protections ...
+--- src/Makefile.am 2017-06-01 16:49:00.000000000 +0300
++++ src/Makefile.am 2017-06-15 16:38:40.000000000 +0300
+@@ -1112,9 +1112,9 @@
+ # $(TESTSOURCES)
+ #tests_testX_LDFLAGS = $(LIBADD_DL)
+ #tests_testX_LDADD=\
+-# $(SQUID_CPPUNIT_LIBS) \
+-# $(SQUID_CPPUNIT_LA) \
+-# $(COMPAT_LIB) \
++# $(LIBCPPUNIT_LIBS) \
++# $(COMPAT_LIB) \
++# $(XTRA_LIBS)
+ #tests_testX_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
+
+
+@@ -1221,8 +1221,7 @@
+ $(top_builddir)/lib/libmisccontainers.la \
+ $(top_builddir)/lib/libmiscencoding.la \
+ $(top_builddir)/lib/libmiscutil.la \
+- $(SQUID_CPPUNIT_LIBS) \
+- $(SQUID_CPPUNIT_LA) \
++ $(LIBCPPUNIT_LIBS) \
+ $(NETTLELIB) \
+ $(SSLLIB) \
+ $(COMPAT_LIB) \
+@@ -1363,7 +1362,7 @@
+ $(DISK_OS_LIBS) \
+ $(NETTLELIB) \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
++ $(LIBCPPUNIT_LIBS) \
+ $(SSLLIB) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+@@ -1383,14 +1382,14 @@
+ tests/stub_MemBuf.cc \
+ $(TESTSOURCES)
+ tests_testBoilerplate_LDADD= \
+- $(SQUID_CPPUNIT_LIBS) \
+ $(SSLLIB) \
+ base/libbase.la \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testBoilerplate_LDFLAGS = $(LIBADD_DL)
+ tests_testBoilerplate_DEPENDENCIES = \
+- $(SQUID_CPPUNIT_LA)
++ $(LIBCPPUNIT_LIBS)
+
+ ## Tests of base/libbase.la objects
+ tests_testCharacterSet_SOURCES = \
+@@ -1405,9 +1404,8 @@
+ tests_testCharacterSet_LDFLAGS = $(LIBADD_DL)
+ tests_testCharacterSet_LDADD= \
+ base/libbase.la \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+- $(SQUID_CPPUNIT_LA) \
+- $(SQUID_CPPUNIT_LIBS) \
+ $(XTRA_LIBS)
+
+ ## Tests of the CacheManager module.
+@@ -1646,8 +1644,7 @@
+ $(top_builddir)/lib/libmiscutil.la \
+ $(NETTLELIB) \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+- $(SQUID_CPPUNIT_LA) \
++ $(LIBCPPUNIT_LIBS) \
+ $(SSLLIB) \
+ $(KRB5LIBS) \
+ $(COMPAT_LIB) \
+@@ -1829,8 +1826,8 @@
+ $(top_builddir)/lib/libmiscutil.la \
+ $(NETTLELIB) \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+ $(SSLLIB) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+
+@@ -2076,9 +2073,8 @@
+ $(SNMP_LIBS) \
+ $(NETTLELIB) \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+- $(SQUID_CPPUNIT_LA) \
+ $(SSLLIB) \
++ $(LIBCPPUNIT_LIBS) \
+ $(KRB5LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+@@ -2323,10 +2319,9 @@
+ $(SNMP_LIBS) \
+ $(NETTLELIB) \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+- $(SQUID_CPPUNIT_LA) \
+ $(SSLLIB) \
+ $(KRB5LIBS) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testEventLoop_LDFLAGS = $(LIBADD_DL)
+@@ -2564,10 +2559,9 @@
+ $(top_builddir)/lib/libmiscutil.la \
+ $(NETTLELIB) \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+- $(SQUID_CPPUNIT_LA) \
+ $(SSLLIB) \
+ $(KRB5LIBS) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_test_http_range_LDFLAGS = $(LIBADD_DL)
+@@ -2613,7 +2607,7 @@
+ base/libbase.la \
+ ip/libip.la \
+ $(top_builddir)/lib/libmiscutil.la \
+- $(SQUID_CPPUNIT_LIBS) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testHttpParser_LDFLAGS = $(LIBADD_DL)
+@@ -2639,9 +2633,8 @@
+ parser/libsquid-parser.la \
+ base/libbase.la \
+ $(top_builddir)/lib/libmiscutil.la \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+- $(SQUID_CPPUNIT_LA) \
+- $(SQUID_CPPUNIT_LIBS) \
+ $(XTRA_LIBS)
+
+ ## Tests of the HttpRequest module.
+@@ -2875,10 +2868,9 @@
+ $(DISK_OS_LIBS) \
+ $(NETTLELIB) \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+- $(SQUID_CPPUNIT_LA) \
+ $(SSLLIB) \
+ $(KRB5LIBS) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
+@@ -2902,9 +2894,8 @@
+ icmp/libicmp-core.la \
+ ip/libip.la \
+ base/libbase.la \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+- $(SQUID_CPPUNIT_LA) \
+- $(SQUID_CPPUNIT_LIBS) \
+ $(XTRA_LIBS)
+
+ ## Tests for ip/* objects
+@@ -2918,9 +2909,8 @@
+ tests_testIpAddress_LDADD= \
+ ip/libip.la \
+ base/libbase.la \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+- $(SQUID_CPPUNIT_LA) \
+- $(SQUID_CPPUNIT_LIBS) \
+ $(XTRA_LIBS)
+ tests_testIpAddress_LDFLAGS= $(LIBADD_DL)
+
+@@ -3087,10 +3077,10 @@
+ $(top_builddir)/lib/libmiscutil.la \
+ $(NETTLELIB) \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+ $(SSLLIB) \
+ CommCalls.o \
+ DnsLookupDetails.o \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testStore_LDFLAGS = $(LIBADD_DL)
+@@ -3130,8 +3120,8 @@
+ ip/libip.la \
+ $(top_builddir)/lib/libmiscutil.la \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+ $(SSLLIB) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testString_LDFLAGS = $(LIBADD_DL)
+@@ -3326,8 +3316,8 @@
+ $(top_builddir)/lib/libmiscutil.la \
+ $(NETTLELIB) \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+ $(SSLLIB) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testUfs_LDFLAGS = $(LIBADD_DL)
+@@ -3506,8 +3496,8 @@
+ $(top_builddir)/lib/libmiscutil.la \
+ $(NETTLELIB) \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+ $(SSLLIB) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testRock_LDFLAGS = $(AM_CPPFLAGS) $(LIBADD_DL)
+@@ -3751,10 +3741,9 @@
+ $(top_builddir)/lib/libmiscutil.la \
+ $(NETTLELIB) \
+ $(COMPAT_LIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+- $(SQUID_CPPUNIT_LA) \
+ $(SSLLIB) \
+ $(KRB5LIBS) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testURL_LDFLAGS = $(LIBADD_DL)
+@@ -3794,7 +3783,7 @@
+ mgr/libmgr.la \
+ $(top_builddir)/lib/libmiscutil.la \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
+@@ -3838,7 +3827,7 @@
+ ip/libip.la \
+ mgr/libmgr.la \
+ $(top_builddir)/lib/libmiscutil.la \
+- $(SQUID_CPPUNIT_LIBS) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testSBufList_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
+@@ -3876,8 +3865,8 @@
+ ip/libip.la \
+ $(top_builddir)/lib/libmiscutil.la \
+ $(REGEXLIB) \
+- $(SQUID_CPPUNIT_LIBS) \
+ $(SSLLIB) \
++ $(LIBCPPUNIT_LIBS) \
+ $(COMPAT_LIB) \
+ $(XTRA_LIBS)
+ tests_testConfigParser_LDFLAGS = $(LIBADD_DL)
+@@ -3922,9 +3911,9 @@
+ base/libbase.la \
+ $(top_builddir)/lib/libmiscutil.la \
+ $(top_builddir)/lib/libmisccontainers.la \
+- $(SQUID_CPPUNIT_LIBS) \
+- $(SQUID_CPPUNIT_LA) \
+- $(COMPAT_LIB)
++ $(LIBCPPUNIT_LIBS) \
++ $(COMPAT_LIB) \
++ $(XTRA_LIBS)
+ tests_testStatHist_DEPENDENCIES = $(SQUID_CPPUNIT_LA)
+
+ TESTS += testHeaders
+--- lib/Makefile.am 2017-06-01 16:49:00.000000000 +0300
++++ lib/Makefile.am 2017-06-16 07:19:54.000000000 +0300
+@@ -91,7 +91,7 @@
+ tests/testRFC1035.cc
+
+ tests_testRFC1035_LDADD= \
+- $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \
++ $(LIBCPPUNIT_LIBS) \
+ $(top_builddir)/lib/libmiscencoding.la \
+ $(top_builddir)/lib/libmiscutil.la \
+ $(COMPAT_LIB)
+@@ -103,7 +103,7 @@
+ tests/testRFC1738.cc
+
+ tests_testRFC1738_LDADD= \
+- $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \
++ $(LIBCPPUNIT_LIBS) \
+ $(top_builddir)/lib/libmiscencoding.la \
+ $(top_builddir)/lib/libmiscutil.la \
+ $(COMPAT_LIB)
diff --git a/net-proxy/squid/squid-3.5.26.ebuild b/net-proxy/squid/squid-3.5.26.ebuild
new file mode 100644
index 00000000000..fd4366d2d16
--- /dev/null
+++ b/net-proxy/squid/squid-3.5.26.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info pam toolchain-funcs user
+
+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 libressl 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? (
+ libressl? ( dev-libs/libressl:0 )
+ !libressl? ( 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 )
+ 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() {
+ eapply "${FILESDIR}/${PN}-3.5.7-gentoo.patch"
+ eapply -p0 "${FILESDIR}/${PN}-cppunit-1.14.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
+
+ eapply_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
+ dodoc 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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/
@ 2016-04-18 15:41 Eray Aslan
0 siblings, 0 replies; 11+ messages in thread
From: Eray Aslan @ 2016-04-18 15:41 UTC (permalink / raw
To: gentoo-commits
commit: 39f4399ca5ae5f49641b3d93ca95c82af3b8c961
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 15:40:46 2016 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 15:40:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f4399c
net-proxy/squid: Include upstream fix for varyEvaluateMatch
Fixes upstream bug 4481
Package-Manager: portage-2.2.28
net-proxy/squid/files/squid-3.5-14022.patch | 50 ++++++
net-proxy/squid/squid-3.5.16-r1.ebuild | 250 ++++++++++++++++++++++++++++
2 files changed, 300 insertions(+)
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 0000000..4b598b6
--- /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 0000000..d806f56
--- /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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-12-07 6:21 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-23 7:42 [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/files/, net-proxy/squid/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-12-07 6:21 Arthur Zamarin
2023-08-09 4:49 Sam James
2023-06-18 4:25 Sam James
2023-03-23 7:20 Sam James
2022-03-22 0:50 Sam James
2022-02-19 10:32 Mikle Kolyada
2020-05-03 15:05 Mikle Kolyada
2019-05-03 12:35 Mikle Kolyada
2017-06-16 6:26 Eray Aslan
2016-04-18 15:41 Eray Aslan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox