From b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Jun 2021 14:47:38 +0100 Subject: gentoo resync : 24.06.2021 --- net-proxy/Manifest.gz | Bin 5539 -> 5541 bytes net-proxy/privoxy/Manifest | 2 +- net-proxy/privoxy/privoxy-3.0.32-r1.ebuild | 148 +++++++++++++++ net-proxy/privoxy/privoxy-3.0.32.ebuild | 148 --------------- net-proxy/squid/Manifest | 2 +- net-proxy/squid/squid-4.15-r1.ebuild | 286 +++++++++++++++++++++++++++++ net-proxy/squid/squid-4.15.ebuild | 286 ----------------------------- 7 files changed, 436 insertions(+), 436 deletions(-) create mode 100644 net-proxy/privoxy/privoxy-3.0.32-r1.ebuild delete mode 100644 net-proxy/privoxy/privoxy-3.0.32.ebuild create mode 100644 net-proxy/squid/squid-4.15-r1.ebuild delete mode 100644 net-proxy/squid/squid-4.15.ebuild (limited to 'net-proxy') diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz index 9f8634d7e59d..52bb7f8057d5 100644 Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest index e9096f4124c9..1f22ce867655 100644 --- a/net-proxy/privoxy/Manifest +++ b/net-proxy/privoxy/Manifest @@ -4,5 +4,5 @@ AUX privoxy.initd-3 639 BLAKE2B 69d935e42ef4bf79868e0b457751b1dfb6a0b5805d19c74b AUX privoxy.logrotate 191 BLAKE2B 587f6211d4938481a1dac77b79a1c32ea491c88514ed7dd42f1cdd7e2c344bfa1a4cde29010a5700f7a1847df1f91e9e59ffed45a386ba12a3cf29fac12a5488 SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9 AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32979627608f2a3926b2459822c827d557a86c20da5c8c6291941eb01db9adc7fb458e913672d574a0 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0 DIST privoxy-3.0.32-stable-src.tar.gz 1834528 BLAKE2B c846dada5fd34b80be9f7a75dc4177f3907241f6cf28b4120929687523d449d73b6a78bfe73f0a1086fbb3a8388103beb1e5a62becdffa24bf57d34cbb6cda56 SHA512 da41c0045bf593219df64718645eff984b5df43737811cc0fa12fce7e8ae1ab59eefbe20f23d6ce8f62216cfd81f1a9c319688d15693c25eed36010f3e1d5ffd -EBUILD privoxy-3.0.32.ebuild 3999 BLAKE2B 3748a08db2f9e0c275f12fc6a796b549d9727a3d290110a430aedd4419779843cbdb42ce109beae7e9390d18868a7e91ab6ef8f30362b124cd8a0223731977f9 SHA512 a31005ced871206007b3b6b9009d79f5eb2c737cb6bba62bdf26d05800e5c8feb3f9e95f0137892e3d19b0977204f91d52dfff724aba026971ecb570a0d0bea1 +EBUILD privoxy-3.0.32-r1.ebuild 4005 BLAKE2B 9530c718ad70a70666ae43e0fa4009ddf58c901a245b870ff8f14e89be26d582e63f24f8d448f92d8df997a3b4d649ae0e8df2da5bd096da9b707e4e2e6e5376 SHA512 026a896d14549d3f904598588dfc5eadbb690b61bc39b9315f2219a3991b41f011b2ddc3aa2e7199fc7bfc9563ddadbd4494acf35203d69f7dc4cfcf658f150c MISC metadata.xml 2796 BLAKE2B 2da7f1b6b5cbdd5a175d017b579b902fee758821b49e5d5cdc172f0b85fa41accd90c571e447867aa6324f1913b3fea90e2d9d9d981640ebe99735a5dabbd6ac SHA512 d1452008357be66b661c500f9f352afb94c1c221a3afbaa3e6b27d3e576232259ee50ea81890119d7c8dda153a3587f3de0f732fe097f4097293b06736ab921b diff --git a/net-proxy/privoxy/privoxy-3.0.32-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.32-r1.ebuild new file mode 100644 index 000000000000..cbcdc645d5f6 --- /dev/null +++ b/net-proxy/privoxy/privoxy-3.0.32-r1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd toolchain-funcs + +[ "${PV##*_}" = "beta" ] && + PRIVOXY_STATUS="beta" || + PRIVOXY_STATUS="stable" + +HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/" +DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy" +SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz" + +IUSE="+acl brotli client-tags compression editor extended-host-patterns +extended-statistics external-filters +fast-redirects +force fuzz +graceful-termination +image-blocking ipv6 lfs +mbedtls openssl +png-images selinux ssl +stats +threads toggle tools whitelists ++zlib" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86" +LICENSE="GPL-2+" + +DEPEND=" + acct-group/privoxy + acct-user/privoxy + dev-libs/libpcre + brotli? ( app-arch/brotli ) + ssl? ( + mbedtls? ( net-libs/mbedtls:= ) + openssl? ( dev-libs/openssl:= ) + ) + zlib? ( sys-libs/zlib:= ) +" +RDEPEND="${DEPEND} + extended-host-patterns? ( dev-lang/perl ) + selinux? ( sec-policy/selinux-privoxy ) + tools? ( + net-misc/curl + dev-lang/perl + ) +" +REQUIRED_USE=" + client-tags? ( threads ) + toggle? ( editor ) + compression? ( zlib ) + brotli? ( zlib ) + fuzz? ( zlib ) + ssl? ( ^^ ( mbedtls openssl ) threads ) +" + +S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.32-gentoo.patch + "${FILESDIR}"/${PN}-3.0.28-strip.patch +) + +pkg_pretend() { + if ! use threads; then + ewarn + ewarn "Privoxy may be very slow without threads support, consider to enable them." + ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS" + ewarn + fi +} + +src_prepare() { + default + mv configure.in configure.ac || die + sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die + + # autoreconf needs to be called even if we don't modify any autotools source files + # See main makefile + eautoreconf +} + +src_configure() { + local myconf="--without-mbedtls --without-openssl" + if use ssl; then + myconf="$(use_with mbedtls) $(use_with openssl)" + fi + + # --with-debug only enables debug CFLAGS + # --with-docbook and --with-db2html and their deps are useless, + # since docs are already pregenerated in the source tarball + econf \ + --sysconfdir=/etc/privoxy \ + --enable-dynamic-pcre \ + --without-assertions \ + --with-user=privoxy \ + --with-group=privoxy \ + $(use_enable acl acl-support) \ + $(use_enable compression) \ + $(use_enable client-tags) \ + $(use_enable editor) \ + $(use_enable extended-host-patterns pcre-host-patterns) \ + $(use_enable extended-statistics) \ + $(use_enable fast-redirects) \ + $(use_enable force) \ + $(use_enable fuzz) \ + $(use_enable graceful-termination) \ + $(use_enable image-blocking) \ + $(use_enable ipv6 ipv6-support) \ + $(use_enable kernel_FreeBSD accept-filter) \ + $(use_enable lfs large-file-support) \ + $(use_enable png-images no-gifs) \ + $(use_enable stats) \ + $(use_enable threads pthread) \ + $(use_enable toggle) \ + $(use_enable whitelists trust-files) \ + $(use_enable zlib) \ + $(use_with brotli) \ + ${myconf} +} + +src_install() { + default + + newinitd "${FILESDIR}/privoxy.initd-3" privoxy + systemd_dounit "${FILESDIR}"/${PN}.service + + insinto /etc/logrotate.d + newins "${FILESDIR}/privoxy.logrotate" privoxy + + diropts -m 0750 -g privoxy -o privoxy + keepdir /var/log/privoxy + + use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl + if use tools; then + dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl} + newbin tools/uagen.pl privoxy-uagen.pl + fi + + rmdir "${ED}/var/run" || die + chown privoxy:root "${ED}/etc/privoxy" || die +} + +pkg_postinst() { + if use extended-host-patterns; then + ewarn + ewarn "You enabled extended-host-patterns, now you *must* convert all action files in" + ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool" + ewarn "privoxy-url-pattern-translator.pl is available." + ewarn + fi +} diff --git a/net-proxy/privoxy/privoxy-3.0.32.ebuild b/net-proxy/privoxy/privoxy-3.0.32.ebuild deleted file mode 100644 index 260557c5c6e3..000000000000 --- a/net-proxy/privoxy/privoxy-3.0.32.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd toolchain-funcs - -[ "${PV##*_}" = "beta" ] && - PRIVOXY_STATUS="beta" || - PRIVOXY_STATUS="stable" - -HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/" -DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy" -SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz" - -IUSE="+acl brotli client-tags compression editor extended-host-patterns -extended-statistics external-filters +fast-redirects +force fuzz -graceful-termination +image-blocking ipv6 lfs +mbedtls openssl -png-images selinux ssl +stats +threads toggle tools whitelists -+zlib" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86" -LICENSE="GPL-2+" - -DEPEND=" - acct-group/privoxy - acct-user/privoxy - dev-libs/libpcre - brotli? ( app-arch/brotli ) - ssl? ( - mbedtls? ( net-libs/mbedtls ) - openssl? ( dev-libs/openssl ) - ) - zlib? ( sys-libs/zlib ) -" -RDEPEND="${DEPEND} - extended-host-patterns? ( dev-lang/perl ) - selinux? ( sec-policy/selinux-privoxy ) - tools? ( - net-misc/curl - dev-lang/perl - ) -" -REQUIRED_USE=" - client-tags? ( threads ) - toggle? ( editor ) - compression? ( zlib ) - brotli? ( zlib ) - fuzz? ( zlib ) - ssl? ( ^^ ( mbedtls openssl ) threads ) -" - -S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}" - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.32-gentoo.patch - "${FILESDIR}"/${PN}-3.0.28-strip.patch -) - -pkg_pretend() { - if ! use threads; then - ewarn - ewarn "Privoxy may be very slow without threads support, consider to enable them." - ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS" - ewarn - fi -} - -src_prepare() { - default - mv configure.in configure.ac || die - sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die - - # autoreconf needs to be called even if we don't modify any autotools source files - # See main makefile - eautoreconf -} - -src_configure() { - local myconf="--without-mbedtls --without-openssl" - if use ssl; then - myconf="$(use_with mbedtls) $(use_with openssl)" - fi - - # --with-debug only enables debug CFLAGS - # --with-docbook and --with-db2html and their deps are useless, - # since docs are already pregenerated in the source tarball - econf \ - --sysconfdir=/etc/privoxy \ - --enable-dynamic-pcre \ - --without-assertions \ - --with-user=privoxy \ - --with-group=privoxy \ - $(use_enable acl acl-support) \ - $(use_enable compression) \ - $(use_enable client-tags) \ - $(use_enable editor) \ - $(use_enable extended-host-patterns pcre-host-patterns) \ - $(use_enable extended-statistics) \ - $(use_enable fast-redirects) \ - $(use_enable force) \ - $(use_enable fuzz) \ - $(use_enable graceful-termination) \ - $(use_enable image-blocking) \ - $(use_enable ipv6 ipv6-support) \ - $(use_enable kernel_FreeBSD accept-filter) \ - $(use_enable lfs large-file-support) \ - $(use_enable png-images no-gifs) \ - $(use_enable stats) \ - $(use_enable threads pthread) \ - $(use_enable toggle) \ - $(use_enable whitelists trust-files) \ - $(use_enable zlib) \ - $(use_with brotli) \ - ${myconf} -} - -src_install() { - default - - newinitd "${FILESDIR}/privoxy.initd-3" privoxy - systemd_dounit "${FILESDIR}"/${PN}.service - - insinto /etc/logrotate.d - newins "${FILESDIR}/privoxy.logrotate" privoxy - - diropts -m 0750 -g privoxy -o privoxy - keepdir /var/log/privoxy - - use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl - if use tools; then - dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl} - newbin tools/uagen.pl privoxy-uagen.pl - fi - - rmdir "${ED}/var/run" || die - chown privoxy:root "${ED}/etc/privoxy" || die -} - -pkg_postinst() { - if use extended-host-patterns; then - ewarn - ewarn "You enabled extended-host-patterns, now you *must* convert all action files in" - ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool" - ewarn "privoxy-url-pattern-translator.pl is available." - ewarn - fi -} diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index c28970f7ceb6..f4022e8ba53d 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -5,5 +5,5 @@ AUX squid.initd-r5 4339 BLAKE2B 3529ddaab2e708215e6674514ce8e20e9d28d26e45860e19 AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594 DIST squid-4.15.tar.xz 2454176 BLAKE2B 3cb08c806f03fcddd7233b05986434d2be3e62a50d006eb3f84bbc5b894ee3641929551d00a1800d6676add62f967067ec62b5b7c41d767766eeab5dfc17980e SHA512 8f0ce6e30dd9173927e8133618211ffb865fb5dde4c63c2fb465e2efccda4a6efb33f2c0846870c9b915340aff5f59461a60171882bcc0c890336b846fe60bd1 -EBUILD squid-4.15.ebuild 8341 BLAKE2B d447060aeed4f41e59433f76c539033df3844b78035d1ef8d55e8ff626930e1d55b1334f105ed8abb6d3afd7d5b107d994aac01ebaf6e0c8cec4b8efdc154bba SHA512 e2bd55da9c76e8dca34d86097a6cba04c859885632aa30ce977ec331a62be9be00cf0178e8b3779b66005b91006e7f13f1444fe5cab99d4c588a76fabd7f9f6d +EBUILD squid-4.15-r1.ebuild 8342 BLAKE2B 0c20240385d0618ca154d9716776f091a0ec15397d0ad01a24623cf1d1a67752440ebe16ff9f5a89d86d6ef5a38c153eca6a3293bf1ed74763c4608addf07827 SHA512 fd36d790300a69048fd8c3f9b33d53bacc8ddecd00a4d3ef41b8a734d6e8e1d111545a94990c99ba801780695a44cba39e0401c76f2212763d63fc2f7777a60e MISC metadata.xml 1472 BLAKE2B ba8020d30b7fb7740a160a06f2f4323f1ae181c79bc89fe390b25b156000a5c751a68333a634753cb1a96a9097577b379369226db8ee6e04c22c4b9f0e8626bc SHA512 19fce272b91077d6114ee400adc6360993558c02bc6595c50fdf43323eb7aebd0f2c0d7cb6d688fd8f1db6af06305de24a7c5a0cddce62d150391c50da46e056 diff --git a/net-proxy/squid/squid-4.15-r1.ebuild b/net-proxy/squid/squid-4.15-r1.ebuild new file mode 100644 index 000000000000..2b53ff4c50dc --- /dev/null +++ b/net-proxy/squid/squid-4.15-r1.ebuild @@ -0,0 +1,286 @@ +# Copyright 1999-2021 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 \ + pf-transparent ipf-transparent kqueue \ + elibc_uclibc kernel_linux" + +RESTRICT="!test? ( test )" + +BDEPEND="dev-lang/perl" + +COMMON_DEPEND="acct-group/squid + acct-user/squid + 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="${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" + 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 && ! 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,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 + + 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 + + # 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 +} diff --git a/net-proxy/squid/squid-4.15.ebuild b/net-proxy/squid/squid-4.15.ebuild deleted file mode 100644 index ce0034568696..000000000000 --- a/net-proxy/squid/squid-4.15.ebuild +++ /dev/null @@ -1,286 +0,0 @@ -# Copyright 1999-2021 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 \ - pf-transparent ipf-transparent kqueue \ - elibc_uclibc kernel_linux" - -RESTRICT="!test? ( test )" - -BDEPEND="dev-lang/perl" - -COMMON_DEPEND="acct-group/squid - acct-user/squid - 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="${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" - 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 && ! 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,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 - - 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 - - # 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 -} -- cgit v1.2.3