summaryrefslogtreecommitdiff
path: root/net-proxy
diff options
context:
space:
mode:
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/Manifest.gzbin5377 -> 5376 bytes
-rw-r--r--net-proxy/haproxy/Manifest2
-rw-r--r--net-proxy/haproxy/haproxy-3.0.3.ebuild217
-rw-r--r--net-proxy/privoxy/Manifest6
-rw-r--r--net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch13
-rw-r--r--net-proxy/privoxy/privoxy-3.0.33-r1.ebuild159
-rw-r--r--net-proxy/privoxy/privoxy-3.0.33.ebuild158
-rw-r--r--net-proxy/privoxy/privoxy-3.0.34.ebuild2
-rw-r--r--net-proxy/squid/Manifest3
-rw-r--r--net-proxy/squid/squid-6.10.ebuild402
-rw-r--r--net-proxy/sshuttle/Manifest5
-rw-r--r--net-proxy/sshuttle/sshuttle-1.1.1.ebuild74
-rw-r--r--net-proxy/sshuttle/sshuttle-1.1.2.ebuild2
-rw-r--r--net-proxy/trojan/Manifest4
-rw-r--r--net-proxy/trojan/metadata.xml3
-rw-r--r--net-proxy/trojan/trojan-1.16.0-r3.ebuild (renamed from net-proxy/trojan/trojan-1.16.0-r2.ebuild)7
16 files changed, 638 insertions, 419 deletions
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 8628d0b16b64..db5f5d0c6e4e 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
Binary files differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 434a19ed7e0e..fc974ffa8030 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -15,6 +15,7 @@ DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B 5666624d340cba70bc21f53efbe0a7b37897a6
DIST haproxy-2.9.7.tar.gz 4516225 BLAKE2B 60590f2ff726bce2078c2075fe7f5476b870bda935560bcbecaf2deeb097c031d458105920f04b441dd59418b7a45b451b16be142f3bb89ddc5efd92ba98303c SHA512 23f320d49f822761cc0a4d8b7e15c8a58b804e4601c9421fa2433afe19798944d5a7264bf83502534b99236dda7c44ec72b97c1e6cdbcf203ab3090ae5313b3b
DIST haproxy-2.9.9.tar.gz 4527952 BLAKE2B ef20ad71bf4ac0bf628267bc496c57598b2166002c71bd566323ec9e73bc2cea8ebac406d1eb87c5ec07b1253a54604f6b5f798caa29655c342d9846f62619a6 SHA512 6c0cd9fefc82d340ff2ac8427936b0c3e5a48208728f31239c511ee6c1e09299f8bb77b46a20194a31fee8b8299092979978d6564c0bbab033b2e437331c7dae
DIST haproxy-3.0.2.tar.gz 4679721 BLAKE2B 301605d6e0c3e05241aeaac0c2c4d208896f0a8a239d0961f002c981da844ac8006cf11cd89e6017fe96030723d3dbea910a52d311fc82342f5eea196dea2a57 SHA512 f8add239e7c85ceff7a2fbc1a4e2394a449e247682d1868983ddb34943f14e01b74c710ded7a758b1e985dfaecf24e07a0b47c4c9d195f74ee1d3c2ef4567c71
+DIST haproxy-3.0.3.tar.gz 4684023 BLAKE2B d5f10110f0c95e214885b3a2248ed048adaf747e382fd343f90cfd35ed58e58f71a643260d87208e70f4d37101ba80471cd06ccd2d4cd9915031aa42fc86104f SHA512 a5aa15c0b95ab7920b6cd531a640f6a1fd75339b92a7b5dd0905ff281dea138ac287fc92cd5d8910fbbd18f2ae92d76d7ce09482debba9838def511b02f998c5
EBUILD haproxy-2.4.23.ebuild 6637 BLAKE2B 53be34d7dbb5ccb6d871dceae60492769ef48a44f484b85d2bfe5024224cb4fc1eca299fd660333a59865be563aa8bdfcfd092af879ef19071429834c4f1ab18 SHA512 306d7f23b250c1537f4b62745211724b89990442c40037a464358d494387dc5c66ba175dcc824ac791b55cc1c5fc9002f8d5070c92c230f467246eb21066c5f2
EBUILD haproxy-2.4.25.ebuild 6637 BLAKE2B 53be34d7dbb5ccb6d871dceae60492769ef48a44f484b85d2bfe5024224cb4fc1eca299fd660333a59865be563aa8bdfcfd092af879ef19071429834c4f1ab18 SHA512 306d7f23b250c1537f4b62745211724b89990442c40037a464358d494387dc5c66ba175dcc824ac791b55cc1c5fc9002f8d5070c92c230f467246eb21066c5f2
EBUILD haproxy-2.4.27.ebuild 6640 BLAKE2B 01b5855988197a1cf18619ca10400699ecdab66db56fca87714833bedbf32e608f596ed3c3476db6ca73c87a438e991cce579a8114c0cad4f58ce4fe172a1f6b SHA512 8cd574c578a7dbaa1fed5357d0af31b4a661055c3c79aabeaade71c67fff139b01193293042704112ebb1e0b767289e50fd0416b5cb4fc00e1124d27613d7141
@@ -34,6 +35,7 @@ EBUILD haproxy-2.9.7.ebuild 6635 BLAKE2B 2f7647df104b260d33088b3e2d2db3833e697e1
EBUILD haproxy-2.9.9.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
EBUILD haproxy-2.9.9999.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557
EBUILD haproxy-3.0.2.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130
+EBUILD haproxy-3.0.3.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130
EBUILD haproxy-3.0.9999.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130
EBUILD haproxy-9999.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130
MISC metadata.xml 1950 BLAKE2B ac55c0bbf5c5d26f92eb2e7cf4c7bf9ab6a432e45c192c6d591a3ba8c5457f3e17ecee6ad3fcbf13108d1893e3c8e582a4c6a5a3d842f0376b32869a59373526 SHA512 bbd3bc13f40649db82489e2f50acec08ec2cc7b401b81c071eabf3508bccda789da6d0bd50267d81b5d08c2eadee4cf3ce7fe8a2b57a04841cab38623025f121
diff --git a/net-proxy/haproxy/haproxy-3.0.3.ebuild b/net-proxy/haproxy/haproxy-3.0.3.ebuild
new file mode 100644
index 000000000000..019b7ed1219f
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-3.0.3.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+ # This is arbitrary; upstream uses master. Try to update when possible
+ VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
+ VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
+ SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
+ test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
+ KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+elif [[ ${PV} == 9999 ]]; then
+ VTEST_DIR="${WORKDIR}/VTest"
+ EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
+ EGIT_BRANCH=master
+else
+ VTEST_DIR="${WORKDIR}/VTest"
+ EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+ EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
+ssl systemd test +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+ lua? ( ${LUA_REQUIRED_USE} )
+ ?? ( slz zlib )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ crypt? ( virtual/libcrypt:= )
+ pcre? (
+ dev-libs/libpcre2:=
+ pcre-jit? ( dev-libs/libpcre2:=[jit] )
+ )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ systemd? ( sys-apps/systemd )
+ zlib? ( sys-libs/zlib )
+ lua? ( ${LUA_DEPS} )
+ test? (
+ dev-libs/libpcre2
+ sys-libs/zlib
+ )"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
+
+haproxy_use() {
+ (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+ usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+ if use net_ns; then
+ CONFIG_CHECK="~NET_NS"
+ linux-info_pkg_setup
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ default
+ else
+ git-r3_src_unpack
+ EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
+ fi
+}
+
+src_compile() {
+ local -a args=(
+ V=1
+ # Switching to PCRE2 by default, bug 838013
+ PCRE=
+ PCRE_JIT=
+ )
+
+ if use elibc_musl; then
+ args+=( TARGET=linux-musl )
+ else
+ args+=( TARGET=linux-glibc )
+ fi
+
+ # TODO: PCRE2_WIDTH?
+ args+=( $(haproxy_use threads THREAD) )
+ args+=( $(haproxy_use crypt LIBCRYPT) )
+ args+=( $(haproxy_use net_ns NS) )
+ args+=( $(haproxy_use pcre PCRE2) )
+ args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
+ args+=( $(haproxy_use ssl OPENSSL) )
+ args+=( $(haproxy_use slz SLZ) )
+ args+=( $(haproxy_use zlib ZLIB) )
+ args+=( $(haproxy_use lua LUA) )
+ args+=( $(haproxy_use 51degrees 51DEGREES) )
+ args+=( $(haproxy_use wurfl WURFL) )
+ args+=( $(haproxy_use systemd SYSTEMD) )
+ args+=( $(haproxy_use prometheus-exporter PROMEX) )
+
+ # Bug #668002
+ if use ppc || use arm || use hppa; then
+ TARGET_LDFLAGS=-latomic
+ fi
+
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+ emake -C admin/systemd CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+ SBINDIR=/usr/sbin
+
+ if use tools ; then
+ for extra in ${EXTRAS[@]} ; do
+ if [ "${extra}" = "admin/halog" ]; then
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+ elif [ "${extra}" = "dev/hpack" ]; then
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+ else
+ # Those two includes are a workaround for hpack Makefile missing those
+ emake -C ${extra} \
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
+ fi
+ done
+ fi
+}
+
+src_test() {
+ # https://github.com/vtest/VTest/issues/12
+ emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
+ ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
+ env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
+ HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
+}
+
+src_install() {
+ dosbin haproxy
+
+ newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+
+ doman doc/haproxy.1
+
+ systemd_dounit admin/systemd/haproxy.service
+
+ einstalldocs
+
+ # The errorfiles are used by upstream defaults.
+ insinto /etc/haproxy/errors/
+ doins examples/errorfiles/*
+
+ if use doc; then
+ dodoc doc/*.txt
+ #if use lua; then
+ # TODO: doc/lua-api/
+ #fi
+ fi
+
+ if use tools ; then
+ has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
+ has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
+ has dev/hpack "${EXTRAS[@]}" && {
+ newbin dev/hpack/gen-rht haproxy_gen-rht
+ newbin dev/hpack/gen-enc haproxy_gen-enc
+ newbin dev/hpack/decode haproxy_decode
+ }
+ fi
+
+ if use examples ; then
+ docinto examples
+ dodoc examples/*.cfg
+ dodoc doc/seamless_reload.txt
+ fi
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins admin/syntax-highlight/haproxy.vim
+}
+
+pkg_postinst() {
+ if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+ ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+ ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+ ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+ if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+ einfo "Please consult the installed documentation for learning the configuration file's syntax."
+ einfo "The documentation and sample configuration files are installed here:"
+ einfo " ${EROOT}/usr/share/doc/${PF}"
+ fi
+ fi
+}
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index ddd5dfa3c9da..acc188aa7b8e 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,13 +1,9 @@
AUX privoxy-3.0.28-strip.patch 1784 BLAKE2B 4f92d7a34a9023405cca813629bb9b200d802061c49d72c0aa413d16b3e714d723c4aba48640e050b0960559a0170bc688742deeb8bcd233eee96be0cfc1bb7b SHA512 78713e7bf1379a0e65c775e415e15ed140873cc48b388d46ce79a24acf64f5c777f1e0e489d912fa7bff8b6acc910fd074e0d755116e4e5d52194d483a30ed67
AUX privoxy-3.0.32-gentoo.patch 4309 BLAKE2B 609960b124bbd66d3246f071f93c43a552a48937b8c3540d2b0267845f64ce84d2daeefb0880895291b698f22660d86b2bb089621ccaf250a343b3b80dab1425 SHA512 fb6a0f4ea2b0d3ee22c605f25339c80a7b5448cd8cdfd3e7a50c825ddf6a887121771e475f1c17be4ba6fc5ac00b4524f3819e5ba6ae25e772fed68b3d879914
AUX privoxy-3.0.33-configure-c99.patch 868 BLAKE2B 70a88ddc893ed8207707635ca77aa73134ad18faf4012febe34ba548ddffd94593e6f2008132a4e6f8ffeca36e31996a12df0df9356bdb59e5e8a9a056f08ab2 SHA512 993b9b84647c1eb149ea32da7de3fdabbda9d45b94ce8a7fd776d69ac3d72c6af5ac03f6602e8d47b57be7774b6a56f9894cc5b6c0cb8451d6652234e7f71b2a
-AUX privoxy-3.0.33-configure-msan.patch 525 BLAKE2B 0d48ca986762a37478284653b509f9c2d4b3935b3a438a6cefa5d6cefd0b2e6ac65737ad9e4f2ab5d8951917bd43a19b7e9f9c89fab9098a4b2ada5184a2b833 SHA512 52336a47fac816b1b9ecc43693f6312e45be7e1ef9ad1d7ddf696f2357bb92301074c9151e20ca38fa43ee1ed2da75fba597fa72133e4399b465b3f750e29622
AUX privoxy.initd-3 639 BLAKE2B 69d935e42ef4bf79868e0b457751b1dfb6a0b5805d19c74bdef007b54ad60adab784f98c4a9898306778cc41157f91b029978a6534aa00c0b00fcecdbc1ca11f SHA512 0bfd7ab2e42c4905f2542a4dbd93cf30d15a8808d527e6bcb6b14f75de226c94c0e0dea6ff69bbac37d3da605acfa2035e2d0e9fe0a41d7beb33cfea5ed2340b
AUX privoxy.logrotate 191 BLAKE2B 587f6211d4938481a1dac77b79a1c32ea491c88514ed7dd42f1cdd7e2c344bfa1a4cde29010a5700f7a1847df1f91e9e59ffed45a386ba12a3cf29fac12a5488 SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9
AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32979627608f2a3926b2459822c827d557a86c20da5c8c6291941eb01db9adc7fb458e913672d574a0 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0
-DIST privoxy-3.0.33-stable-src.tar.gz 1579540 BLAKE2B 4b76aa2e84160bab346d0548019158edb5562ca1dbf5356f765a6b91967f352f99c45c852254acf3d8e85cf8e8d210c050d1cf69ace3e5dbda8cdd13c1138df3 SHA512 9684455dbce7f6d8f5defd31aa9a7316e0c1dc896525ab4d562d0359462b541b1c366dea9db07b798f3e00b9cbcc44f494d8c431bcb10f2cb05b5bca3cfeaf75
DIST privoxy-3.0.34-stable-src.tar.gz 1589785 BLAKE2B d879d3827dc1e6dd6a3d13ab07b788a235a16dcc4b050f17dd43543c0fad1cf9c9ceb2a0ae1ec3885798db5041a6c1fc2c270befd4d8ecf10254a58533458dba SHA512 f963419ae2cb6dd72cd892fa043768d99a4118792833de2e666d6a800fbe9a7fcb0641f15e3211e0b01a74609c65aeb60af1051f1a19daa1048314599679b685
-EBUILD privoxy-3.0.33-r1.ebuild 4481 BLAKE2B 877c91cc1ea7ae01c22f8604c1bc715e000cb23aa3917e60ef2c4d9215bd94652ef5b34442650ea5808c3c71ab233030121c57f2d7464dd761e6f631131362e2 SHA512 02f37c09d22bc900e3801b3d2730443bc1c7ceb76bac61fc0e761337ffb9ed3b60ba2f058bac19121a370b2432d965f8561ef1b16a54e198d273d96379f26856
-EBUILD privoxy-3.0.33.ebuild 4430 BLAKE2B a003ce2d7a8fc3ca5d82c9f1a5cdf8d662086a9778c165670639970ec8bf641d74898fd18c5e287d09a0aa0ce97beeb826ac04cabbd7cb2068c6445ae357c6df SHA512 2517ff141ce5712b68e06c820a12bba8e9adaa753541d58232671c3bd0fb4ba426fef9d3f37f34c21dd140dfafe1ba5735c87adf7130ac3ddbba6252b2ddf2c4
-EBUILD privoxy-3.0.34.ebuild 4432 BLAKE2B a06aa4abee34a05c73448b9167236a9b72cf7456e9c101a60bd03f62ff1e98987564db2613b8f393899f3eb04d43ff5c2039017c329806ccb5f0f81f9f03bf8f SHA512 f1ff6c824bc32df248dc4f90b6dc3fe90eab533800db92166ecb442ba585b5899e5e998afd29222f218045f179c4577ac66672440069ddb697a5089e7c7c39e6
+EBUILD privoxy-3.0.34.ebuild 4426 BLAKE2B f08db345d5ee13ce00b8df736666f5f36962a0fa6f46bca2e9be69f683b9bf194267995642c5675a16ff0457967b67b80b93a0fbc0f02838589ca7ff04958d08 SHA512 245e5f333f86b2e8661d316eb7f8a7bbf5ac1114b6341894b444b4ce684819a503eab12af3e0be0611e7ec80af225d441a9271d09fdd56fcde23c7cd8a28fe12
MISC metadata.xml 3115 BLAKE2B d50dc83a207733323276a71df61dc3ac631a2a4030a61559976844ba88087b0bea18bcb2b7bc72cdf63d33a21a46292d3bd069ecce584df85282237947762161 SHA512 c98295871135407a797597d791960b24c4d31be9f0069cec5eec963c6a56271647b48e714a22382a3acd0acd7cbf3c41db15eb7c4071eb359577479d2cd788e4
diff --git a/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch b/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch
deleted file mode 100644
index c89fed3947f3..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 84f6a0db7..e7e68be0c 100644
---- a/configure.in
-+++ b/configure.in
-@@ -168,7 +168,7 @@ if test "x$with_asan" = "xyes"; then
- LDFLAGS="$LDFLAGS -fsanitize=address"
- fi
-
--AC_ARG_WITH(asan, [ --with-msan Enable MemorySanitizer. Requires compiler support.])
-+AC_ARG_WITH(msan, [ --with-msan Enable MemorySanitizer. Requires compiler support.])
- if test "x$with_msan" = "xyes"; then
- CFLAGS="$CFLAGS -fsanitize=memory"
- LDFLAGS="$LDFLAGS -fsanitize=memory"
diff --git a/net-proxy/privoxy/privoxy-3.0.33-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.33-r1.ebuild
deleted file mode 100644
index c7271be14a3d..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.33-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="https://downloads.sourceforge.net/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 +jit lfs +mbedtls openssl
-png-images sanitize selinux ssl +stats +threads toggle tools whitelists
-+zlib"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~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="
- brotli? ( zlib )
- client-tags? ( threads )
- compression? ( zlib )
- extended-statistics? ( threads )
- fuzz? ( zlib )
- ssl? ( ^^ ( mbedtls openssl ) threads )
- toggle? ( editor )
-"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.32-gentoo.patch
- "${FILESDIR}"/${PN}-3.0.28-strip.patch
- "${FILESDIR}"/${PN}-3.0.33-configure-msan.patch
- "${FILESDIR}"/${PN}-3.0.33-configure-c99.patch
-)
-
-pkg_pretend() {
- if ! use threads; then
- ewarn
- ewarn "Privoxy may be very slow without threads support, consider enabling it."
- ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
- ewarn "Additionally some features may not build or work poperly. You are on your own."
- 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
- if use sanitize; then
- myconf+=" --with-usan"
- # msan is available in clang only
- # asan is broken with current configure tests in gcc
- tc-is-clang && myconf+=" --with-msan --with-asan"
- 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 \
- --disable-accept-filter \
- --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 jit pcre-jit-compilation) \
- $(use_enable ipv6 ipv6-support) \
- $(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.33.ebuild b/net-proxy/privoxy/privoxy-3.0.33.ebuild
deleted file mode 100644
index 7bb2a6c39864..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.33.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="https://downloads.sourceforge.net/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 +jit lfs +mbedtls openssl
-png-images sanitize selinux ssl +stats +threads toggle tools whitelists
-+zlib"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~riscv 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="
- brotli? ( zlib )
- client-tags? ( threads )
- compression? ( zlib )
- extended-statistics? ( threads )
- fuzz? ( zlib )
- ssl? ( ^^ ( mbedtls openssl ) threads )
- toggle? ( editor )
-"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.32-gentoo.patch
- "${FILESDIR}"/${PN}-3.0.28-strip.patch
- "${FILESDIR}"/${PN}-3.0.33-configure-msan.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 "Additionally some features may not build or work poperly. You are on your own."
- 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
- if use sanitize; then
- myconf+=" --with-usan"
- # msan is available in clang only
- # asan is broken with current configure tests in gcc
- tc-is-clang && myconf+=" --with-msan --with-asan"
- 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 \
- --disable-accept-filter \
- --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 jit pcre-jit-compilation) \
- $(use_enable ipv6 ipv6-support) \
- $(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.34.ebuild b/net-proxy/privoxy/privoxy-3.0.34.ebuild
index caa72d8f71b5..20df6ca09563 100644
--- a/net-proxy/privoxy/privoxy-3.0.34.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.34.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~riscv sparc x86"
IUSE="+acl brotli client-tags compression editor extended-host-patterns
extended-statistics external-filters +fast-redirects +force fuzz
graceful-termination +image-blocking ipv6 +jit lfs +mbedtls openssl
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index fec369590fb1..f684a290b672 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -9,6 +9,8 @@ AUX squid.initd-r7 4473 BLAKE2B e5fd96a8bb6492c31c452791dce185fc4d6fa655f0c05d0b
AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55
AUX squid.logrotate-r1 166 BLAKE2B 62bd821aabd7394e4644e19d2d243775154fca1c09776373d62bd56d1bbfbc3f4ec440ac17d44a29afbe0692e3b4ccb311ad5cd5790b18737ce15f2bfca5de31 SHA512 e26f661d07029c86a82e635c741252f1c5861764e5a695ab980750a238047d9fe74f80f63552f47d0a32960c74b5435d458f2f88d267c7b5950a27e62f0ecb19
AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594
+DIST squid-6.10.tar.xz 2558208 BLAKE2B 608b49c25549e73bc58ee4ec82a4d582f6f28b6dd324261806931eb2e37f0b5d63f6c2f6373a3db43823e805f5d6df56b2a4b5a8324cd6e623c4302d2c4b9421 SHA512 c0b75c3d383b1cd234b30dd02e84e1c5655fc53f63b75704bf4bac9ee0b86ba27e4656116893aff8b95dea19ff1befabcbb9dab3875da52fcb65f1d30f0fe5a9
+DIST squid-6.10.tar.xz.asc 647 BLAKE2B 22c41fae76b5e2efb5adc7d34beac0dce8218af0a4e77268989078acb91b6822a41f9a44cb60796548bb392040ad35317b5cfde9fdc51a37ffae616bbe9faede SHA512 5e9d053db90549760f7a675d9f4703ecde460906cb09dff489f9db5d0f7826fb30487c9b009cc4577f3f061f3c7b3a667418af298f55f882f696884dc536bf53
DIST squid-6.6.tar.xz 2554824 BLAKE2B 7c3c96f5cd5f819f6f020fb3e63ee8d9bb26b7fb4ff4405d7963a643c6766344e6492505bc1b33f3040ad800b3d7a3ad6a4b067b031ac4d178ddcac04c6e74dc SHA512 4ab261ed85ad674288467500aca9d8a48e3918b55f777635c0ba7a2551f248d35536848a5fbf2c946490a818004727f2aed33144f0a3ebab0be36cc4cffb020c
DIST squid-6.6.tar.xz.asc 1193 BLAKE2B c37a400c51c30de35c6fe52123389c134d05670a36b1ffae4d67e7d06981bbf94788343daf2fdeafb782d464a977ee31bc601e3b1b92b45cd40ba6a6725b9a16 SHA512 08550569759c403a1a9747d08ea7055751fbf251355691074f6d09baca76a0987c5dff36e1f01b64edd446d568c7244b14124f6f8a1b19ccfc30293eed83a297
DIST squid-6.7.tar.xz 2427468 BLAKE2B 0cd892213085326d1f4cc065778d95d74c03edaaf98b839b4422397fdcd449716b022e74adcbac636ca98e9d5c45a8f7aa156c3edc9f306fb13fc5cc21125dd6 SHA512 6221437056c600119fe9ff1ceeeaa9955cf9f21df481ad29a3515f8439a41b779d51f37b820b75641d0d4d6de54554f6f924dbd347834bf4a6ad6b5b317084a0
@@ -16,6 +18,7 @@ DIST squid-6.7.tar.xz.asc 646 BLAKE2B 6d4e6075b261f54269577fc31b28e7cb74b835c851
DIST squid-6.9-memleak_fix.patch 22178 BLAKE2B bf87a98ac3ddcf27b817b7b09a1a7656cb6547c7c157d02a3daf4b337669180718e1df06040b9b4be252a9f60fc767d94ed698014113c072dd9b91ada08a1adc SHA512 38754b1f593dde3e7ab70601bdaaabf8c1c40beea0ae9913684d3de78d76cec4243abac8e315af2009b98e096a3b04c56181940f0528716278aaf7c44ea76dad
DIST squid-6.9.tar.xz 2557992 BLAKE2B cac10d3a16fe31a9becfcd0fc278413d53c52285cdca9ece897ca4e3a0e50806e186960091f9050243180996382c6b5209360d9fff249d26b20d1e529285a038 SHA512 2666551caca39fa6ca49b56b537645dd043ee0c99b805c433cf714172e6062590fd6ed942043df1a3b543f30c039f3ab701493187dc6a0a4a8311217417c366e
DIST squid-6.9.tar.xz.asc 646 BLAKE2B fafa49d40af849103d04c0f07e19e5b9007306ba0f85bcabed761b53f94015aefc65ec2035963c95fd938cb04dfdb878363fcf5150a06889b563fa48922ef289 SHA512 ccd053476e91544bf797cf38a7e57acdc1c02c1edb2804230f061d9b24abbbd2e06abbaaa0fe2b209951631c0369510f60f0b7137fe950f3ccf59e8a212bc0fa
+EBUILD squid-6.10.ebuild 10172 BLAKE2B 8abd47831cadd34a63aa1b0c87ad6b30a269e5b66b66843770cae0e052b21c17fe36e393d78138bb5706a3158f32eba4a899ea3a0778839f3b288cf04f74541e SHA512 9a769a942aea2905cbf3e3e69119c31ea39605ac6cac3e05b1fa53bb1d8b9b12d5b7aafe12003ac7dd778466f8b05980ff2bc359e3b7869046e040f43688bf33
EBUILD squid-6.6.ebuild 9837 BLAKE2B f8b4826ed09f36b6bf1e56d01099b60b371de35fa3c0772dfe49fec939e38de5aad88362ccd2591364abe9a7390811357b9ee5b1a1dc325aff5b4b410ca034b5 SHA512 7d177f1cd2c4fcc8ca4ea630c339a76d715c9c0251668512d95b6e38500b672d6006d953d2a0b5739ef804e15479e75eef4f9902cfc6d821381457bbd500934f
EBUILD squid-6.7.ebuild 9840 BLAKE2B 02eaff938405892c095b760cfc393eba182b74f0c87949605ee9d47836a48669af4bb4fbd70a03d171442c5a6ef1ea1cbb9f2d4306077e72c2faabf73be90d70 SHA512 717c71669293d9240aaf9ce64d074fc60585000170ec6633b414d2090ef18412b838bfa52384741e2e6462e62430adf0a50321e6e82aadeefdc278dcd52fa916
EBUILD squid-6.9.ebuild 10172 BLAKE2B 8abd47831cadd34a63aa1b0c87ad6b30a269e5b66b66843770cae0e052b21c17fe36e393d78138bb5706a3158f32eba4a899ea3a0778839f3b288cf04f74541e SHA512 9a769a942aea2905cbf3e3e69119c31ea39605ac6cac3e05b1fa53bb1d8b9b12d5b7aafe12003ac7dd778466f8b05980ff2bc359e3b7869046e040f43688bf33
diff --git a/net-proxy/squid/squid-6.10.ebuild b/net-proxy/squid/squid-6.10.ebuild
new file mode 100644
index 000000000000..266c40c8dce1
--- /dev/null
+++ b/net-proxy/squid/squid-6.10.ebuild
@@ -0,0 +1,402 @@
+# Copyright 1999-2024 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 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)
+# 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
+ https://dev.gentoo.org/~juippis/distfiles/squid-6.9-memleak_fix.patch
+ verify-sig? ( http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz.asc )
+ "
+else
+ SRC_URI="http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2
+ https://dev.gentoo.org/~juippis/distfiles/squid-6.9-memleak_fix.patch"
+ 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-debug/valgrind )"
+BDEPEND="
+ dev-lang/perl
+ ecap? ( virtual/pkgconfig )
+ test? ( dev-util/cppunit )
+ verify-sig? ( sec-keys/openpgp-keys-squid )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.2-gentoo.patch
+ "${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
+ "${DISTDIR}"/${PN}-6.9-memleak_fix.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 \
+ 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-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() {
+ 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/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index 667f749a870c..967a4ee597ba 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,7 +1,4 @@
-DIST sshuttle-1.1.1-docs.tar.xz 8048 BLAKE2B f6318110f67a4882a733d9b389c52eefd2e769b70f3282e7699425b6e6d3a9c5a60219978e248aaf1e7f184491db9aea4aab2efad09eb0af3ee095e0cf527d54 SHA512 c2ef822f872f6afd1d9c64e7a412ad65cca0486115dcfa0673a7a1b0554bfd1413f673248e30fa01759daaf1a1a0061f48a42170d7b234448093d3562f757cd9
-DIST sshuttle-1.1.1.tar.gz 93639 BLAKE2B 63725146dd5fcd07f4b291f981ca947a514735014f4f8173023d3982796ce4ef96b9defb39beef026d32b2162d11951742c57dee1f04cd453cf85ca08c8d2468 SHA512 07a3371c4998f37410692f9c5eaa456ff28b2dbffff731a0be3877d96c820b42c83cb386ec3ab54b524d4b333edd1a2289cd949c7d59b98a11b1ee2d6867da4f
DIST sshuttle-1.1.2-docs.tar.xz 8300 BLAKE2B efbffcda40422b76e18ad8e85b1ccd392a5ca342897d3a179b31b5f000954b2021c877680eda6a0aae70c8594704afb8a81599f2c79dd1c954665c437ad789f2 SHA512 b48896b48da2540e561fec10ae20a8b53ffc8df59c7917e7166f138b6c2ad2d3555949d9f10934886e3c6d5a062e20460e985c064b1502a3951149265c332956
DIST sshuttle-1.1.2.gh.tar.gz 111767 BLAKE2B 7f2a63df0a6e2815e8787c6e02cd81924ff3d80d4b2309d8ebb875b49db33ff5b7b8c8249760b27a942f69db049c862041433099a06f009fe3532c4cb4493bac SHA512 c24a6490c1877b9ded8f5f4f44571953c4c204c33f0238c709ca32c7a581ddc919bfc48beb4fafd3a4d346cccd9b02dc7051b6233ff989a0ad329d55c1c5ec47
-EBUILD sshuttle-1.1.1.ebuild 2072 BLAKE2B 492868bc3fee22a3a1dfde28a41042bbb7723f6f34c311c2305850809738010852eb5b298630ca3ec457a67183cd84b38d790e628ae5bf60458dbb63df35fa02 SHA512 ffb90f6f59c6c79582893e3fb52fd4ba0410e331618e244edc7f16693a8d3b8f8f70a7aeb587586c6078bb70de3a76693a3eeb2bab06ad4df074aec8cb533e43
-EBUILD sshuttle-1.1.2.ebuild 2202 BLAKE2B a06ef6457069e926537f8ac77e435b551d30100175720100b7f61dd57df825f876faa865a6a5c9d24926c91c02382632e41a9ba7b097a70a4409894d4348fe72 SHA512 5ab4f0e4685da38071a304248de80a6f7912ac66a87b595ca4585b29a5b525363ea287a0f0a3d6dd2aa09af30ae3597e5a78553d482b0300e40de8ba1903b89b
+EBUILD sshuttle-1.1.2.ebuild 2202 BLAKE2B 262310d7f620e32f502688e05d8813800307115c26e5c1577c3361bb2462bc966c48dfb819e135491082ffc310f471e67db19e2d10540491c6858a9fa7483cc7 SHA512 87bbc5ce6d45eed71dd3e65c36bbebc5629feb111fec73ab081baf3b635a0f2593617836124ae686158fc290b695fbbdf7f8d5231e50b77f84272cee0597195c
MISC metadata.xml 368 BLAKE2B 8781826aa94f38296cb3c0ef628c931875cf7d8c1f3080970be16c3dd01862d067d4051f4d2c271bc63dd9260c4652ba5fd48002eb5747eab68ba9f02a6a3629 SHA512 a4609eb161d14b0b12d93406a257774465e377c432731cd6d72267baa3396545f45e5df9a16577ff143254797e872aa988213af190d47134d9f09de8d820b6d2
diff --git a/net-proxy/sshuttle/sshuttle-1.1.1.ebuild b/net-proxy/sshuttle/sshuttle-1.1.1.ebuild
deleted file mode 100644
index f2826293e380..000000000000
--- a/net-proxy/sshuttle/sshuttle-1.1.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-sshuttle-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${SSHUTTLE_DOCS_PREBUILT:=1}
-
-SSHUTTLE_DOCS_PREBUILT_DEV=sam
-SSHUTTLE_DOCS_VERSION=${PV}
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-SSHUTTLE_DOCS_USEFLAG="+doc"
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 linux-info pypi
-
-DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
-HOMEPAGE="https://github.com/sshuttle/sshuttle https://pypi.org/project/sshuttle/"
-if [[ ${SSHUTTLE_DOCS_PREBUILT} == 1 ]] ; then
- SRC_URI+=" !doc? ( https://dev.gentoo.org/~${SSHUTTLE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${SSHUTTLE_DOCS_VERSION}-docs.tar.xz )"
-
- SSHUTTLE_DOCS_USEFLAG="doc"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="${SSHUTTLE_DOCS_USEFLAG}"
-
-BDEPEND="
- doc? ( dev-python/sphinx )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- dev-python/psutil[${PYTHON_USEDEP}]
- || ( net-firewall/iptables net-firewall/nftables )
-"
-
-CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~NF_NAT"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # Don't run tests via setup.py pytest
- sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die
-
- # Don't require pytest-cov when running tests
- sed -i "s/^addopts =/#\0/" setup.cfg || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc ; then
- emake -j1 -C docs html man
- fi
-}
-
-python_install_all() {
- # If USE=doc, there'll be newly generated docs which we install instead.
- if ! use doc && [[ ${SSHUTTLE_DOCS_PREBUILT} == 1 ]] ; then
- doman "${WORKDIR}"/${PN}-${SSHUTTLE_DOCS_VERSION}-docs/sshuttle.1
- else
- HTML_DOCS=( docs/_build/html/. )
- doman docs/_build/man/*
- fi
-
- distutils-r1_python_install_all
-}
diff --git a/net-proxy/sshuttle/sshuttle-1.1.2.ebuild b/net-proxy/sshuttle/sshuttle-1.1.2.ebuild
index 0c3c7b286c31..6580b9328e37 100644
--- a/net-proxy/sshuttle/sshuttle-1.1.2.ebuild
+++ b/net-proxy/sshuttle/sshuttle-1.1.2.ebuild
@@ -14,7 +14,7 @@ SSHUTTLE_DOCS_VERSION=${PV}
SSHUTTLE_DOCS_USEFLAG="+doc"
DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit distutils-r1 linux-info
DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 48f3c5bc3d59..0c90d9efd00d 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,5 +1,5 @@
AUX README.gentoo 418 BLAKE2B ee8bd518461641a83a67f28ce0e93fe0c2763cda74cddae26ca547010b8a9095982e7ee1339bea9fcbcb248f6a800a1fed63902dd2ac9724e8d6a0d47fbd1f02 SHA512 54594e7813f6618e959f8c52cab5804f9403a8f0afbbdbc3bfadb46899c5d383ec3b9ff28a2721912f1b348f7e6c53a783745b5e0fddaca689c97a0ba9ef83fa
AUX trojan.initd 981 BLAKE2B 8c021142a6c59dc2fde43bdc75d80c784600583aa997d4bc74539963ec41bdb7a15e57eb7b31ff4ea69e6d3f0034df8bf04fa3f971ca927d306bd9fe12ef9ab5 SHA512 6d419e1c142d8f6c091acb29f0a128742129b7c87f625a7b13e11fdaca6a58c1d2e528cd9ba34658109413735bd6ed8095f16e5eff258ac76f06a727e514793e
DIST trojan-1.16.0.tar.gz 51669 BLAKE2B 9238f9886820ca3625a894ac8de1e199e238029593634436f3aa529d5c576f2636d5183b64a2e6155a888fe8f45629c94625f02119fbfb4ada01b1bd9e502fcf SHA512 60aa8539731eee6f15cbcb18b20b45435fc2dfe439a2f67fe9770257c3b6ffe219efe376cfd909f748d523a18645c96f6859b8487cacaba04ac7d93cf762f153
-EBUILD trojan-1.16.0-r2.ebuild 1455 BLAKE2B 53749e4f3d755888821aa1923a1cbc4aeb5f30c833c97d2e8fa217614f035debe5f931c93b2305dfb7a49ca0b9386ca664536a0e41ba07f2d53a043e71469171 SHA512 685801e95cb43e804cbe6fbfc036a56b22fb99fb7e6b1cabe372fcd3a0ce890dd6739189c601aa800d21fd626a53b772ae68e1b8962fbd6aecf8fa6afb1eb997
-MISC metadata.xml 1155 BLAKE2B 4b36b42fd226c7ffb5b28eed065d16bbf10abf68108044d64ae97b5ca46e4b2d38a95f472da080d8884a10ba06a942e9a2aa6a9c3cc79b13a51d33cb06b28859 SHA512 bdbcab7001c48932fdc01158e9b0345141ffc66f0dd413c8d387882b01c73a08dfe5668cc27cdf7f028da7ec3f18613fca46509496d37b1e8ee66efd7fc1f12f
+EBUILD trojan-1.16.0-r3.ebuild 1593 BLAKE2B d024064eed3c92e4c309263aa5272190d56871d50424160079345459556f4951fd4e8513a872dc343b24e107b49eb81cc729685e75af00e5f432ba35d644545f SHA512 2bc07fefc50098219d93fcd5215eb0cb2d58da2b8dedc260443d9240c610203083f37054865b79c620742c0ea5252df265359e34816da020c5927e7f96602cb5
+MISC metadata.xml 1341 BLAKE2B 8f28f3a075c3e6f6342ec0f767d135df4e4b91737ad866ba90f34097abac622eea5ec4887b3de4b5c3c736b6b54586d6dfd800b201a1dcb76ce255dc7d47ca6e SHA512 035045fb694f354ca1d669d435882a21e7f9c174a70a80c8215403ed91c0240ed01572c0b5172de8a7bb3441782956ef84c3e8a66491dc672408f16f7d0614dd
diff --git a/net-proxy/trojan/metadata.xml b/net-proxy/trojan/metadata.xml
index c141a430b420..c04b8ddb549e 100644
--- a/net-proxy/trojan/metadata.xml
+++ b/net-proxy/trojan/metadata.xml
@@ -25,6 +25,9 @@
</longdescription>
<use>
<flag name="mysql">build with MySQL support</flag>
+ <flag name="nat">Build with NAT support</flag>
+ <flag name="reuseport">Build with SO_REUSEPORT support</flag>
+ <flag name="tcpfastopen">Force build with TCP Fast Open support</flag>
</use>
<upstream>
<remote-id type="github">trojan-gfw/trojan</remote-id>
diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild b/net-proxy/trojan/trojan-1.16.0-r3.ebuild
index b5b332947cbb..f77acffb22dc 100644
--- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISABLE_AUTOFORMATTING=1
FORCE_PRINT_ELOG=1
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-3+"
SLOT="0"
-IUSE="mysql test"
+IUSE="mysql +nat +reuseport tcpfastopen test"
# Some hiccups setting up local network server.
RESTRICT="test"
@@ -50,6 +50,9 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DENABLE_MYSQL=$(usex mysql)
+ -DENABLE_NAT=$(usex nat)
+ -DENABLE_REUSE_PORT=$(usex reuseport)
+ -DFORCE_TCP_FASTOPEN=$(usex tcpfastopen)
-DSYSTEMD_SERVICE=ON
-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
)
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 15:01:59 +0000