6 files changed, 50 insertions, 132 deletions
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 8f61a2e7c573..3a00df5cba55 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/lyrebird/Manifest b/net-proxy/lyrebird/Manifest
index 8defbb11b62d..a5ec4c01bb02 100644
--- a/net-proxy/lyrebird/Manifest
+++ b/net-proxy/lyrebird/Manifest
@@ -2,6 +2,9 @@ DIST lyrebird-0.1.0-deps.tar.xz 88991580 BLAKE2B ba9113d847bc900ad3001e91a67ac93
 DIST lyrebird-0.1.0.tar.bz2 76753 BLAKE2B af168a25093b68b10b489adc282f1ee65b70193602f79d9cc352c78e2a9c71205191dc6487ea58584f76ce1cbbf653d3fd0e1f645d7972d3e73173a90ae39361 SHA512 f9b8686d1c5f9ddb41a255a1a8954e05cefd50523ada7360432b456c62475ba606872df407ba8ebd7714d4f185eef0efae63e3e53c5c1c18fd323a97912f951e
 DIST lyrebird-0.4.0-deps.tar.xz 44450504 BLAKE2B 7d8010c4f2d911f26d37b7069908368ac56e4237c9cb25f7845b16cf881e2b25d30e135314b0f8cd60c42c7a34aedd17586689134b7357ff33e2673f9664c7c0 SHA512 8cf0b3e80a0d1bdc2af0d6900862fbc48d7fa02593d3c0a92f9d21598fd3df69aa312f55ae122837fa409b0ee83fc7373c2fd5d2a43c14f8d3e3bab77b8b77a4
 DIST lyrebird-0.4.0.tar.bz2 80497 BLAKE2B 060ceba6389f8f6a739e43162bf6b54e410c5206348f323e83130903c9dd07622393a28a0da8cf6e59376406be10d17b003e416dba3dcca8fa9ad3e41b68d4db SHA512 406d62d7da76807ad9fa1107bb9f335fc14f54dfecda26964886869e35122172d302ccc83442b355c055d506c84a212da11ea3b1f456f6fd19674a5c1bcd1773
+DIST lyrebird-0.5.0-deps.tar.xz 49717604 BLAKE2B cb490f3c5b13512f2c9238c8ea47121627d1b77c33e637096cd466d1f59fc71b6113bb10ba2ac3cee16bf9f8c8885a8f4587384bfe6f09ff8b2bbcef087e819c SHA512 33b8ab0e4850c06720430df90ca0a174925b2c03366b1dc2b71480ed3c7c8344dee4c12145654e757d9c8c2dc583a5d44b952ed021b570b86878edfa57b1cfa5
+DIST lyrebird-0.5.0.tar.bz2 111189 BLAKE2B d534074f6db7ad190b12010ddc44889c15ae2c3dc594e30dea41ae1f092ca83481ecb51611d763b63a8b3d8d97f887fdc4e216b41dab3b219d7c2df2f7b5d84f SHA512 8059583ae6ebc121cb853600d635382c9d85b6a98a71be0f7f71bfd780d4278804b89cdaa083233dcdb47ec64ebf00a32a57b84f5cd46d42c94e6a7ff74887a8
 EBUILD lyrebird-0.1.0.ebuild 1244 BLAKE2B f2e4d055be1e48a370ad6e4e9661e7879fbe776ecd758670392627438b35df2aa503032c4dbe3905cfd71cfdaefbca8a9af4469301bfd0d1b8bd953c360eed8d SHA512 a345ab35b49908b78986318400544409ae2872c9aa49df353434a17782aa29bd2ceda416b1e390b222227846f50e9fbc38e22c9660c608b6b1886a57a363530b
-EBUILD lyrebird-0.4.0.ebuild 1257 BLAKE2B deda68235352780256ddd4b5b70d375857bd4c8ee1bc0c0a89744bdc001dd30632f0ed424b4fc26c5a4dcd744d9f54c2db96687225780e230c28176efdabb436 SHA512 69e2c55c7ea897f303c0b2c7bb767996496b54891c40fffb8d37c1a439a0ffabbbcc6eded0a53636319582061d9d96381cd06840b1cd39cf7587778fde5c72d7
+EBUILD lyrebird-0.4.0.ebuild 1254 BLAKE2B de1748071d2856c7010c444ea0d798f6ac05a1f49ca478ce6d5b633884f199e703fe3478281805aabc5c6c35467b9c0973f0694b6cb37de8ff1950f237b523e9 SHA512 d26b1d40a2000abc603558ed7dda8f2c3c53c49f1980f1ff66412e9950cc1c202546872e51b3a89d4bbdb6530b26bc40e82d81f0b4927102e0070c07d143879f
+EBUILD lyrebird-0.5.0.ebuild 1257 BLAKE2B deda68235352780256ddd4b5b70d375857bd4c8ee1bc0c0a89744bdc001dd30632f0ed424b4fc26c5a4dcd744d9f54c2db96687225780e230c28176efdabb436 SHA512 69e2c55c7ea897f303c0b2c7bb767996496b54891c40fffb8d37c1a439a0ffabbbcc6eded0a53636319582061d9d96381cd06840b1cd39cf7587778fde5c72d7
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-proxy/lyrebird/lyrebird-0.4.0.ebuild b/net-proxy/lyrebird/lyrebird-0.4.0.ebuild
index 0313b779ac34..ae12f6ddf3c3 100644
--- a/net-proxy/lyrebird/lyrebird-0.4.0.ebuild
+++ b/net-proxy/lyrebird/lyrebird-0.4.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-${P}
 
 LICENSE="BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 arm ~riscv x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-obfs4proxy )"
diff --git a/net-proxy/lyrebird/lyrebird-0.5.0.ebuild b/net-proxy/lyrebird/lyrebird-0.5.0.ebuild
new file mode 100644
index 000000000000..0313b779ac34
--- /dev/null
+++ b/net-proxy/lyrebird/lyrebird-0.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4"
+HOMEPAGE="https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird"
+SRC_URI="https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/${PN}/-/archive/${P}/${PN}-${P}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+S="${WORKDIR}"/${PN}-${P}
+
+LICENSE="BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-obfs4proxy )"
+BDEPEND=">=dev-lang/go-1.21"
+
+DOCS=( README.md ChangeLog doc/obfs4-spec.txt )
+
+src_compile() {
+	ego build ./cmd/${PN}
+}
+
+src_install() {
+	dobin ${PN}
+	doman doc/${PN}.1
+}
+
+pkg_postinst() {
+	if [[ ! -z "${REPLACING_VERSIONS}" ]]; then
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 0.1.0; then
+				ewarn "Since version 0.1.0 the proxy executable is called '${PN}' rather than 'obfs4proxy'."
+				ewarn "Please update your Tor configuration accordingly."
+				ewarn
+				break
+			fi
+		done
+	fi
+}
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 6e15d802bc6e..a2e92cb37e24 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -4,7 +4,6 @@ AUX squid-6.2-gentoo.patch 2494 BLAKE2B 8115a9ad312c6dd639ab92b8673532e61341acf9
 AUX squid.confd-r2 707 BLAKE2B 9fce12f6c6d395448b1e70c95ef75418d1844e7409738df60bee7c1adab786ca7e504070eacdd2b6e30a35df8a7322cccdfb950e60bcde352d35d090d55c6be9 SHA512 37435f808b1dab1ca3ceecafd6cd9007c44e10d257f135ba6baf1a51b1e3408f2a76b71d85a08ce6dcb7f86b9841b7bfcd870b0d312a2365699290e28f72314a
 AUX squid.cron 143 BLAKE2B 17b1bccea20771a481a5b4745c9832a4b762132a500eaeb091349a59b870c14b680d8ea97e03bb7a0b2d67e1ca1d4ee1db31dc43b9dbf02be8953d15f214b033 SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749
 AUX squid.cron-r1 594 BLAKE2B 8c00bbfeb31428f3952f9af255f921cc652dd617a8ad4e3e319d0412f470eacaeab552df9f1b78adaa33172e0ba6220195633901770425e44e6453ca17399ced SHA512 93bfcb31db378bfcf1e38e9d6208334962e0fedc99b1b8586626650186d4815c48bcc4f1197123652130b277634d2dce8590358a9797c9eba36e867fc83a3696
-AUX squid.initd-r6 4513 BLAKE2B 46406790dcc86048cdf4d98e648d266733ebf671ccf4f5b7c23d2fd25d97b161d00e05ff0d749af810cc9d1ad1300efef5a43caf62ac534e026b75c099dfc1b4 SHA512 4205350ace938f7eda0b62c4aedc8af3f5a14b011fad76a8e6ad6138358f835592453ac168e58ff3dcb3fb0bbcffd9b97acf4ce2060e34a47c2b92946f86164e
 AUX squid.initd-r7 4473 BLAKE2B e5fd96a8bb6492c31c452791dce185fc4d6fa655f0c05d0b752ab83d7bfcbacd3df6dc26912d94489c691f43811d68362b2532ecf1d68128629f636c609942e0 SHA512 183d48913458d382665a2412f4065bcd7ed3c585a6bfe3e8cfe019899104c9c1184ca814891bfdf414f765bd903d9bb3f849b01ea46c015f499fdd9d6456689b
 AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55
 AUX squid.logrotate-r1 166 BLAKE2B 62bd821aabd7394e4644e19d2d243775154fca1c09776373d62bd56d1bbfbc3f4ec440ac17d44a29afbe0692e3b4ccb311ad5cd5790b18737ce15f2bfca5de31 SHA512 e26f661d07029c86a82e635c741252f1c5861764e5a695ab980750a238047d9fe74f80f63552f47d0a32960c74b5435d458f2f88d267c7b5950a27e62f0ecb19
diff --git a/net-proxy/squid/files/squid.initd-r6 b/net-proxy/squid/files/squid.initd-r6
deleted file mode 100644
index 775ccbaddbb1..000000000000
--- a/net-proxy/squid/files/squid.initd-r6
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-SQUID_SVCNAME=$( echo "${RC_SVCNAME}" | tr -cd '[a-zA-Z0-9]' )
-
-extra_started_commands="reload rotate"
-
-depend() {
-	use dns net
-}
-
-checkconfig() {
-	local CONFFILES="/etc/squid/${RC_SVCNAME}.conf /etc/squid/${RC_SVCNAME}.include /etc/squid/${RC_SVCNAME}.include.*"
-	if [ ! -f /etc/squid/${RC_SVCNAME}.conf ]; then
-		eerror "You need to create /etc/squid/${RC_SVCNAME}.conf first."
-		eerror "The main configuration file and all included file names should have the following format:"
-		eerror "${CONFFILES}"
-		eerror "An example can be found in /etc/squid/squid.conf.default"
-		return 1
-	fi
-
-	local PIDFILE=$(cat ${CONFFILES} 2>/dev/null 3>/dev/null | awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }')
-	[ -z ${PIDFILE} ] && PIDFILE=/run/squid.pid
-	if [ /run/${RC_SVCNAME}.pid != ${PIDFILE} ]; then
-		eerror "/etc/squid/${RC_SVCNAME}.conf must set pid_filename to"
-		eerror "   /run/${RC_SVCNAME}.pid"
-		eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
-		eerror "         in any other instance of squid."
-		eerror "Make sure the main configuration file and all included file names have the following format:"
-		eerror "${CONFFILES}"
-		return 1
-	fi
-
-	# Maximum file descriptors squid can open is determined by:
-	# a basic default of N=1024
-	#  ... altered by ./configure --with-filedescriptors=N
-	#  ... overridden on production by squid.conf max_filedescriptors (if,
-	#  and only if, setrlimit() RLIMIT_NOFILE is able to be built+used).
-	# Since we do not configure hard coded # of filedescriptors anymore,
-	# there is no need for ulimit calls in the init script.
-	# Use max_filedescriptors in squid.conf instead.
-
-	local CACHE_SWAP=$(cat ${CONFFILES} 2>/dev/null 3>/dev/null | awk '/^[ \t]*cache_dir[ \t]+/ { if ( $2 == "rock" ) printf "%s/rock ", $3; else if ( $2 == "coss" ) printf "%s/stripe ", $3; else printf "%s/00 ", $3; }')
-	[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
-
-	local x
-	for x in $CACHE_SWAP ; do
-		if [ ! -e $x ] ; then
-			ebegin "Initializing cache directory ${x%/*}"
-			local ORIG_UMASK=$(umask)
-			umask 027
-
-			if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
-				eend 1
-				return 1
-			fi
-
-			local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} 2>&1)"
-			if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
-				umask $ORIG_UMASK
-				eend 1
-				echo "$INIT_CACHE_RESPONSE"
-				return 1
-			fi
-
-			umask $ORIG_UMASK
-			eend 0
-			break
-		fi
-	done
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	checkpath -d -q -m 0750 -o squid:squid /run/${RC_SVCNAME}
-
-	# see https://wiki.squid-cache.org/MultipleInstances
-	ebegin "Starting ${RC_SVCNAME} (service name ${SQUID_SVCNAME}) with KRB5_KTNAME=\"${SQUID_KEYTAB}\" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
-	KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
-	eend $? && sleep 1
-}
-
-stop() {
-	ebegin "Stopping ${RC_SVCNAME} with /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
-	if /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} ; then
-		if [ "x${SQUID_FAST_SHUTDOWN}" = "xyes" ]; then
-			einfo "Attempting fast shutdown."
-			/usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
-		fi
-		# Now we have to wait until squid has _really_ stopped.
-		sleep 1
-		if [ -f /run/${RC_SVCNAME}.pid ] ; then
-			einfon "Waiting for squid to shutdown ."
-			cnt=0
-			while [ -f /run/${RC_SVCNAME}.pid ] ; do
-				cnt=$(expr $cnt + 1)
-				if [ $cnt -gt 60 ] ; then
-					# Waited 120 seconds now. Fail.
-					echo
-					eend 1 "Failed."
-					break
-				fi
-				sleep 2
-				printf "."
-			done
-			echo
-		fi
-	else
-		eerror "Squid shutdown failed, probably service is already down."
-	fi
-	eend 0
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${RC_SVCNAME} with /usr/sbin/squid -k reconfigure -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
-	/usr/sbin/squid -k reconfigure -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
-	eend $?
-}
-
-rotate() {
-	service_started ${RC_SVCNAME} || return 1
-	ebegin "Rotating ${RC_SVCNAME} logs with /usr/sbin/squid -k rotate -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
-	/usr/sbin/squid -k rotate -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
-	eend $?
-}