diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-29 03:04:32 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-29 03:04:32 -0500 |
| commit | 1c2bb144efdfa7abb1e6ff9c0dc1f10c01eb43d1 (patch) | |
| tree | 977e8a4ceec4c6469193a34c8bd0f3cbb26f3878 /net-proxy/squid | |
| parent | d078a6bb97ca56a274a131a62e0cfe7d85c4452d (diff) | |
| download | baldeagleos-repo-1c2bb144efdfa7abb1e6ff9c0dc1f10c01eb43d1.tar.gz baldeagleos-repo-1c2bb144efdfa7abb1e6ff9c0dc1f10c01eb43d1.tar.xz baldeagleos-repo-1c2bb144efdfa7abb1e6ff9c0dc1f10c01eb43d1.zip | |
Adding metadata
Diffstat (limited to 'net-proxy/squid')
| -rw-r--r-- | net-proxy/squid/Manifest | 2 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-7.6-tests-perms.patch | 46 | ||||
| -rw-r--r-- | net-proxy/squid/squid-7.6.ebuild | 410 |
3 files changed, 458 insertions, 0 deletions
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index b233f742d904..34e14f9da3df 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -3,3 +3,5 @@ DIST squid-6.14.tar.xz.asc 745 BLAKE2B 5aede7d130194463cfa6ffea866ab483859cf47a9 DIST squid-6.9-memleak_fix.patch 22178 BLAKE2B bf87a98ac3ddcf27b817b7b09a1a7656cb6547c7c157d02a3daf4b337669180718e1df06040b9b4be252a9f60fc767d94ed698014113c072dd9b91ada08a1adc SHA512 38754b1f593dde3e7ab70601bdaaabf8c1c40beea0ae9913684d3de78d76cec4243abac8e315af2009b98e096a3b04c56181940f0528716278aaf7c44ea76dad DIST squid-7.5.tar.xz 2432664 BLAKE2B 3ceb6f9da34e9fdbf421de0058e211d1e71dcd2bffd6c26e139c01a272cdfe580b41ed4f3b11abd6a819fbeb6e37c8418824590a56058c369a8ca3efb5dbc5f3 SHA512 2abe4c7a719606b2f33a7e9af2a6e151a0c50bdf81210af5393f26d32fa3b3a4e88af2588b9b9d66513e83721e75a248c0891ee7099d32979948c2f3bb6c2a73 DIST squid-7.5.tar.xz.asc 659 BLAKE2B f40d7575aa58111a85a71490a50ef5dde997d30cedd77cccb567a0bc2ed05d5a54e714415a0b9d72008ac64eab1d479d8aa23845ca0e8f2b6e43ca08da517fa0 SHA512 980bb4522d8b086c9ccee976d39dcd4d80a604f1720d44f6700c14d46418750c06b324b4394c648775e7306d5068b51ade8340c62215dbd20a8b665765518001 +DIST squid-7.6.tar.xz 2436896 BLAKE2B 7ccf88a109ca4526d05f9fd7d248df9b93fd35467470124a1f43fc51fc39195a2ad07c1f6c4ba5ea775495d11ccc9673c0769c0da3613ae910f15710b7bc8809 SHA512 e1cf55c0ba55b6cddbc8ef9b1522622040327ec85ea454cdac8c3a7c6e5430a9f32e69b9b964f4689f19d924e90b06f4fb7c44cfbabcb06f3762844f4ba48b3a +DIST squid-7.6.tar.xz.asc 659 BLAKE2B bf8f848affb3107b270e3ee01043036cb1f2db2a2c90c5f9fcdf701a7c6564f7f0d061e942dbe47c01c4c52300c2e83626c0bb5cc39d8a2bbc250082f66f4148 SHA512 f4fed611ce64f5409741c3eaaa61b3ddb543afcb7adca3ccf336636b716065370b67443cf0afaad463e79f362acb3fc9cca72f629d8c244408a0b90a006c78e4 diff --git a/net-proxy/squid/files/squid-7.6-tests-perms.patch b/net-proxy/squid/files/squid-7.6-tests-perms.patch new file mode 100644 index 000000000000..fdd2cf2d11c0 --- /dev/null +++ b/net-proxy/squid/files/squid-7.6-tests-perms.patch @@ -0,0 +1,46 @@ +https://github.com/squid-cache/squid/pull/2442 + +From c21f102c8d6c6700c5d96e0f63ae3f880c2e1da0 Mon Sep 17 00:00:00 2001 +From: Renan Rodrigo <rr@ubuntu.com> +Date: Tue, 9 Jun 2026 18:15:46 -0300 +Subject: [PATCH 1/2] Fix tests when using rust-coreutils (#5237) + +testHeaders copies the 'true' binary to a file named testHeaders relying +on the fact that GNU's true always exits 0. When 'true' implementation +is a multicall binary (e.g., in rust-coreutils and on Alpine Linux), it +cannot be called by other name. Create an empty executable file instead. + +squid-conf-tests also copied the 'true' binary, but that Makefile target +is never executed and, hence, should not create an executable file. +--- + src/TestHeaders.am | 2 +- + test-suite/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/TestHeaders.am b/src/TestHeaders.am +index 0e6a023db25..40b8fddd527 100644 +--- a/src/TestHeaders.am ++++ b/src/TestHeaders.am +@@ -15,7 +15,7 @@ EXCLUDE_FROM_HDR_TESTING = + # headers to test + + testHeaders: $(SOURCES) $(noinst_HEADERS) $(EXTRA_DIST) $(top_srcdir)/test-suite/testHeader.cc.in +- $(MAKE) $(^:.h=.hdrtest) && cp $(TRUE) $@ ++ $(MAKE) $(^:.h=.hdrtest) && touch $@ && $(CHMOD) +x $@ + + .h.hdrtest: + @SrcFilePath=`echo $< | $(SED) 's%^$(top_srcdir)/%%'`; \ +diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am +index 1a7d91dd20a..a8a3cc53149 100644 +--- a/test-suite/Makefile.am ++++ b/test-suite/Makefile.am +@@ -150,7 +150,7 @@ squid-conf-tests: $(srcdir)/test-squid-conf.sh $(top_builddir)/src/squid.conf.de + sed s%$(srcdir)/squidconf/%% ; \ + else break; fi; \ + done; \ +- if test "$$failed" -eq 0; then cp $(TRUE) $@ ; else exit 1; fi ++ if test "$$failed" -eq 0; then touch $@ ; else exit 1; fi + + CLEANFILES += \ + squid-conf-tests \ + diff --git a/net-proxy/squid/squid-7.6.ebuild b/net-proxy/squid/squid-7.6.ebuild new file mode 100644 index 000000000000..8053900f3555 --- /dev/null +++ b/net-proxy/squid/squid-7.6.ebuild @@ -0,0 +1,410 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/squid.gpg +inherit autotools eapi9-ver flag-o-matic linux-info pam systemd toolchain-funcs verify-sig + +DESCRIPTION="Full-featured web proxy cache" +HOMEPAGE="https://www.squid-cache.org/" + +MY_PV_MAJOR=$(ver_cut 1) +MY_PV_MINOR=$(ver_cut 2) +# Upstream patch ID for the most recent bug-fixed update to the formal release. +#r=-20181117-r0022167 +r= +if [[ -z ${r} ]]; then + SRC_URI=" + https://github.com/squid-cache/squid/releases/download/SQUID_${MY_PV_MAJOR}_${MY_PV_MINOR}/${P}.tar.xz + verify-sig? ( https://github.com/squid-cache/squid/releases/download/SQUID_${MY_PV_MAJOR}_${MY_PV_MINOR}/${P}.tar.xz.asc ) + " +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 ~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.4.0:= ) + 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-3.4:= + !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-debug/valgrind )" +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + test? ( dev-util/cppunit ) + verify-sig? ( sec-keys/openpgp-keys-squid ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-7.5-gentoo.patch + "${FILESDIR}"/${PN}-7.5-use-system-libltdl.patch + "${FILESDIR}"/${PN}-7.5-ar.patch + "${FILESDIR}"/${PN}-7.6-tests-perms.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_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} + fi + + default +} + +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 || 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 + + # https://bugs.gentoo.org/956509 + AT_NO_RECURSIVE="yes" eautoreconf +} + +src_configure() { + # Workaround for bug #921688 + append-cxxflags -std=gnu++17 + + 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 '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 (none now, see bug #972634) + local ntlm_modules=( none ) + + # 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_test() { + default + + # Suppress QA warning (bug #877729) for no tests executed + # for some subsuites. The layout is odd and there's a bunch + # of useless/stub directories which confuses it. + find "${S}" -iname test-suite.log -delete || die +} + +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 + + if use pam; then + newpamd "${FILESDIR}"/squid.pam squid + fi + + newconfd "${FILESDIR}"/squid.confd-r2 squid + newinitd "${FILESDIR}"/squid.initd-r7 squid + + if use logrotate ; then + insinto /etc/logrotate.d + newins "${FILESDIR}"/squid.logrotate-r1 squid + else + exeinto /etc/cron.weekly + newexe "${FILESDIR}"/squid.cron-r1 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() { + if [[ ${#r} -gt 0 ]]; then + elog "You are using a release with the official ${r} patch! Make sure you mention that when asking for support." + fi + + if ver_replacing -lt 7.6 && use samba && use ldap ; then + ewarn "SMB_LM support is now gone from >= Squid 7.6. Please use ntlm_auth instead" + ewarn "from net-fs/samba." + fi +} |
