gentoo auto-resync : 19:11:2024 - 03:03:00

8 files changed, 204 insertions, 2 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 232827711eff..7ceabc0a3ef5 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 64862249a073..0570a0fce008 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -5,6 +5,9 @@ AUX dante-1.4.0-osdep-format-macro.patch 517 BLAKE2B 8533e014592b1db76533d80a016
 AUX dante-1.4.0-socksify.patch 1203 BLAKE2B 568a8050c92e70cc4acddd9b6b3a55917104839a82160a7be38932724dae2bc0c2e419a3c9d472ef3f9814bb7557ab4b9dd23ca65a691e7a68dcb27b8bc2c7eb SHA512 ba118ede7b87b8c4c0973053827515762d1bd0aff846dcb17696d930228eb6e6d2fe199f47ff739420420a6d67a72187fe9d864ac74d4653f40a658278675a5a
 AUX dante-1.4.1-miniupnp14.patch 475 BLAKE2B 3cba7c7b50de78628d6e8d10de533c1d842675b25bbcc5be349278ed211757be4138bec93c2abb1de45f1ec294fa1a31652148d2fc877e869c58531dfd532bf7 SHA512 54d6e6128d925b7f7fbc3efda8f9a5fb5ef09e6eafc5dc1fd25b33e942376a3989df2c4d9b1f33d90741ac71f9986fcc956dbc81238130e2d3fd52d0366a9c91
 AUX dante-1.4.1-sigpwr-siginfo.patch 554 BLAKE2B 893a5504843f2a3a7606e5ed7a8562481efb11f1c31c5eba942aa602cdc666b1e6b2c16ee8f0eb9dd13b3bc85b04a5b5df33b311a4623baca557b6f9d8f77068 SHA512 86a69630ea74ccd642f9ed9672d2f13cc0cf9c5fb1871d53227ac022043cbfc385bdfa50fc698dbf3afd73e680083a69b5b60827401bf6325b3c993a8b143d81
+AUX dante-1.4.2-cflags.patch 1186 BLAKE2B 480a3f66a1b476efe78cbb8112436cd2362683b3d029ca3267e34ff93be54bc0c2647c5c0856c0cf0cebb9e39995956e043dc64195a940cc38e03a5df0fbfb28 SHA512 af83b08f929e6400ecca49ec161a0f361bbbecdca7221b837d0dd6d6762c8fe4abc71d0fbe46451cd5bc8d06cdf0a0d9c750d584563721ecbb7dc8f5a77138c8
+AUX dante-1.4.3-gai-symbol.patch 989 BLAKE2B bd78bc8c96030a1fabd4202097b2bfca803da804a3e52fbb93a6f2f002347a5d8acd6eea0d236cad2019c372df78835f08b141650096b388fb86d0734adc5b22 SHA512 7732edf00dfe687827d71377975197c393695675d65680cb729eeedf292e03f12df66ee1e4538a5ed50970d1402ff263e88e06f69f2adee54ed8902f9a1a13e3
+AUX dante-1.4.3-osdep-debug.patch 828 BLAKE2B 04b285f902adb6958c9c1fde3e42d5141322732ae7819541bcdec224b736bc895aad31dbb87082108b583f04f6bfb9e2f44a2b239a4aafb92ee9743481ee710c SHA512 c5b8d8617f50d13d3a7058f8fcc470e49e6994a7f2994a5f32fbc6470f624069357e56b590e2e6c54fcfa5f5b8ab9463bece47db2e1196c2711481c5e3767575
 AUX dante-sockd-conf 350 BLAKE2B 3293e1b92e48f805c40a996b9e3a264197b55d4628d153755287b795ea4ab19b43dd4781e9fe1fa5a34a26ca5799b0fb4e9b2db79b4ccbb4f82a13de1f9677f7 SHA512 c9dd0982dc6893fdb6160279531d431255bd97011b6351a09d28db6c0db15886ebb323f62afc960b621455a24940c8f4baed409b4bc3c791bd3f3fe6104b30bc
 AUX dante-sockd.service 167 BLAKE2B 924bc8feeb62b1e8f1271bccacd12e5624db0f326a8e71f470a8f0f487c11514deca0426f08194b3579f1a4a816aafe28072fa213dcb34dd82b3cccf9ac75149 SHA512 0acc71e1ab429d38c61db45dc5eb3c9ea58d822eefc83912ae9d569486eb281184f07183a40754eaf6e4f6f67c46a3683629734d6333767623d702f98bc720de
 AUX sockd.conf 7031 BLAKE2B 9ccc208a027538e5fdbfacb352c6072dd19e1106954d608cd17e661be256356ecf36b3170d48018ee6b2162694426434c17bf582b03413a7530c2f58646f0bc5 SHA512 a443ea203aefd3ed51b10c7140dde2fc64dfa31c2fb08539a45353ab77daea42c63b160c276f0ef9e4c683032260f93228af64db83ade7476ff6d353b63dec19
@@ -12,5 +15,8 @@ AUX sockd.conf-with-libwrap.patch 870 BLAKE2B 8c56ab479f99f6dff61882c01842ef0780
 AUX sockd.conf-with-pam.patch 295 BLAKE2B f41c2109e21878d2b473c6cffb4fe845d59ac0478f5196f7ccdc42baafd674e0960169e3a9dbc4fedb4a27cb7df8bd0dfc255595a72c39185c7ffb177fb53da8 SHA512 78728605362360650e6a20869744fc941782b75d149c0835542faaad931104cb32dda56de77a7b4f9a4fa683053139c551bcf77607a047fb1be68b6da9388630
 AUX socks.conf 4185 BLAKE2B cb41b40e858c83d06bd5e199c4fc991e8dda0ee64d48fd94e52d6ef836e79d6a6f5f50b6dd55074e92b6f96f20db65922f53869f08506100ae8b59b722643cdd SHA512 d15ea77e20ad750f10285a42c9c6305cbed48313dea205139d8cf59fda4a4640bdd5c5bd2c295b32e0015b774d463f9ad34fa5a22fb188ae921dba1a533553eb
 DIST dante-1.4.1.tar.gz 1284288 BLAKE2B 34c78007245339088d79e0b969b8f55d20b0ee59d89c1bf19510b563799ac3c54c6b8b5f37bfb64410d60e893beb0e2d1d79893c0264b7481aeb4cdab2037e90 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e
+DIST dante-1.4.3.tar.gz 1343935 BLAKE2B dc069fd99a0d4a606b1eb7ce5dabbb20be63a4b4b3b02ee5e7c6d9b5614ae89226559df9c0bdaa3bee803b04e452311ab016c9116d57f3f8f48205ec797c5475 SHA512 c19675b2dee931366caf4a0dd4f44045ae731cc2f986e5d2e4bf498925c7d93a92a32088234d4a9443424f6dfb0796a1fa3fdc7c47e5aa11612c29a101f47888
+DIST dante_1.4.3+dfsg-2.debian.tar.xz 42736 BLAKE2B 3e385eb4dee0278edfe72720139b19d4900b828372e6dc5b8361dbcf2ba76f0a0a5b523680068aa0c61fcbabac25ce413f23c96ab56c368ddda1ef8dd1fee528 SHA512 0acbb82eba1e37af0b485ac5b43cb06f5d699e5cac427a8c678fe8633a08ce5697ff936d3f1dd747cb2cc3c7ac7c713193ae07c1913e794f35fd55278c8fec16
 EBUILD dante-1.4.1-r6.ebuild 2780 BLAKE2B f0b1d5d30fd514fb996317a0ccfc36c31c2db2d78fe08a882ecd2331a8aa27ecbfed36db790d3f9f3f208eb33c0a899acb52c9a411c53d69f7abb8d262cd5901 SHA512 506a193e250f6c3331b626d3d79a700d113497aa511383521c2bfe1ede96d33c04f32e1081f667579c9d757450c070bd83cb9bbc9dc7db43db93862d3d11b214
+EBUILD dante-1.4.3.ebuild 3220 BLAKE2B 423abc93fdfade0ddbcc652c37f181793ace57c102bfb8396ea27475110cd738bceb3385b00ab65e8686360935e2a540b8cf2299ff3593958b3049e3c1e22dee SHA512 7ebd8c1d9c552bbb2f892ef10f0297fa12034f0b5d12796185c47950242482c6b6122d6769f12697f8305b48c46fe8a2ff06fa1d8d91798f09e09fadfaebf307
 MISC metadata.xml 213 BLAKE2B 8999188a1062bf7ec3ba841f532113bb39808fbdbfd3cba1107aec6c8796e897b1ade98d0ea8e92eb504f132a51aa46fb49b6ad1a04c5b389d333f054c2589b8 SHA512 7d3e51679dce13a213e18c54e9072c88a121abad190a83dd7d1ce224b075ac639e4a0d0d8a2b98ca8a59da3a1576629b021afb9fe48c180345e609605c6aef0e
diff --git a/net-proxy/dante/dante-1.4.3.ebuild b/net-proxy/dante/dante-1.4.3.ebuild
new file mode 100644
index 000000000000..10bfc9b77559
--- /dev/null
+++ b/net-proxy/dante/dante-1.4.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools systemd
+
+DESCRIPTION="A free socks4,5 and msproxy implementation"
+HOMEPAGE="https://www.inet.no/dante/"
+SRC_URI="https://www.inet.no/dante/files/${P}.tar.gz"
+
+PATCH_LEVEL="dfsg-2"
+[[ -n "${PATCH_LEVEL}" ]] && \
+	SRC_URI+=" mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}+${PATCH_LEVEL}.debian.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug kerberos pam selinux static-libs tcpd upnp"
+
+CDEPEND="
+	sys-apps/shadow
+	virtual/libcrypt:=
+	kerberos? ( virtual/krb5 )
+	pam? ( sys-libs/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	upnp? ( net-libs/miniupnpc:= )
+"
+DEPEND="${CDEPEND}
+	app-alternatives/yacc
+	app-alternatives/lex
+"
+RDEPEND="${CDEPEND}
+	acct-group/sockd
+	acct-user/sockd
+	selinux? ( sec-policy/selinux-dante )
+"
+
+DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-socksify.patch
+	"${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch
+	"${FILESDIR}"/${PN}-1.4.2-cflags.patch
+	#"${FILESDIR}"/${PN}-1.4.0-HAVE_SENDBUF_IOCTL.patch # included in debian series
+	#${FILESDIR}"/${PN}-1.4.1-sigpwr-siginfo.patch #517528 # included in debian series
+	#"${FILESDIR}"/${PN}-1.4.1-miniupnp14.patch #564680 # upstreamed
+	"${FILESDIR}"/${PN}-1.4.3-osdep-debug.patch
+	"${FILESDIR}"/${PN}-1.4.3-gai-symbol.patch
+)
+
+src_prepare() {
+	DEB_PATCHES=${S}/../debian/patches
+	PATCHES+=(
+		$( sed "s,^,${DEB_PATCHES}/," < "${DEB_PATCHES}"/series )
+	)
+	default
+
+	# 780039
+	sed -e 's/-all-dynamic//' -i dlib/Makefile.am dlib64/Makefile.am || die
+
+	sed -i \
+		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
+		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
+		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
+		|| die
+
+	sed -i \
+		-e 's:AM_CONFIG_HEADER\>:AC_CONFIG_HEADERS:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# hardcoded the libc name otherwise the scan on a amd64 multilib system
+	# ends up finding /usr/lib32/libc.so.5. That cascades and causes the
+	# preload/libdsocks to not be built.
+	econf -C \
+		--with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
+		--with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
+		--enable-preload \
+		--enable-clientdl \
+		--enable-serverdl \
+		--enable-drt-fallback \
+		--with-libc=libc.so.6 \
+		$(use_enable debug) \
+		$(use_with kerberos gssapi) \
+		$(use_with pam) \
+		$(use_with upnp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	# default configuration files
+	insinto /etc/socks
+	doins "${FILESDIR}"/sock?.conf
+	pushd "${ED}"/etc/socks > /dev/null
+	use pam && eapply -p0 "${FILESDIR}"/sockd.conf-with-pam.patch
+	use tcpd && eapply -p0 "${FILESDIR}"/sockd.conf-with-libwrap.patch
+	popd > /dev/null
+
+	# init script
+	newinitd "${FILESDIR}"/${PN}-1.3.2-sockd-init dante-sockd
+	newconfd "${FILESDIR}"/dante-sockd-conf dante-sockd
+
+	systemd_dounit "${FILESDIR}"/dante-sockd.service
+
+	# example configuration files
+	docinto examples
+	dodoc example/*.conf
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-proxy/dante/files/dante-1.4.2-cflags.patch b/net-proxy/dante/files/dante-1.4.2-cflags.patch
new file mode 100644
index 000000000000..84798de3a65f
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.2-cflags.patch
@@ -0,0 +1,32 @@
+The upstream code tries to remove -g from CFLAGS, but the logic also matches
+the -g in the middle of flags, like:
+-frecord-gcc-switches => -frecordcc-switches
+-ggdb3 => ggdb3
+Both of which cause GCC to fail horribly!
+
+Fix the grep & sed to only match standalone instances.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar dante-1.4.2.orig/compiler.m4 dante-1.4.2/compiler.m4
+--- dante-1.4.2.orig/compiler.m4	2013-10-24 13:20:23.000000000 -0700
++++ dante-1.4.2/compiler.m4	2014-01-05 15:18:03.544336373 -0800
+@@ -375,14 +375,14 @@
+ 	gcc)
+ 	    if test x"$aixldbug" != x; then
+ 	        #disable debug info
+-		if echo $CFLAGS | grep -- "-g " >/dev/null; then
+-		    CFLAGS="`echo $CFLAGS | sed -e 's/-g //g'`"
++		if echo $CFLAGS | grep -w -- "-g" >/dev/null; then
++		    CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`"
+ 		fi
+ 		CFLAGS="$CFLAGS${CFLAGS:+ }-g0"
+ 	    else
+ 		#use -ggdb also when not debugging
+-		if echo $CFLAGS | grep -- "-g " >/dev/null; then
+-		    CFLAGS="`echo $CFLAGS | sed -e 's/-g //g'`"
++		if echo $CFLAGS | grep -w -- "-g" >/dev/null; then
++		    CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`"
+ 		fi
+ 		CFLAGS="$CFLAGS${CFLAGS:+ }-ggdb"
+ 	    fi
diff --git a/net-proxy/dante/files/dante-1.4.3-gai-symbol.patch b/net-proxy/dante/files/dante-1.4.3-gai-symbol.patch
new file mode 100644
index 000000000000..5f0b0303de5b
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.3-gai-symbol.patch
@@ -0,0 +1,32 @@
+Dante's packaging design has some very pretty macro usage, but also fragile.
+
+The error & getaddrinfo error checking tries to expand a macro outside a
+string, leading to it expanding empty in some cases. Quoting the string makes
+it show up as expected.
+
+```
+checking getaddrinfo() error symbols... configure: error: in `/var/tmp/portage/net-proxy/dante-1.4.3/work/dante-1.4.3':
+configure: error: error: getaddrinfo() error value count too low
+See `config.log' for more details`
+```
+
+--- dante-1.4.3//acinclude.m4	2017-01-23 11:28:08.000000000 -0800
++++ dante-1.4.3//acinclude.m4	2024-11-17 19:51:39.398597593 -0800
+@@ -1110,7 +1114,7 @@
+        [AC_LANG_PROGRAM([[#include <errno.h>]],
+                         [[
+ #ifdef $3
+-errnoval: $3
++"errnoval: $3"
+ #else
+ #error "errno value $3 not defined"
+ #endif]])],
+@@ -1134,7 +1138,7 @@
+ #include <netdb.h>]],
+                         [[
+ #ifdef $3
+-gaierrval: $3
++"gaierrval: $3"
+ #else
+ #error "gai error value $3 not defined"
+ #endif]])],
diff --git a/net-proxy/dante/files/dante-1.4.3-osdep-debug.patch b/net-proxy/dante/files/dante-1.4.3-osdep-debug.patch
new file mode 100644
index 000000000000..f626f5b3ea9a
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.3-osdep-debug.patch
@@ -0,0 +1,16 @@
+--- dante-1.4.3.orig/osdep.m4	2017-01-18 06:11:20.000000000 -0800
++++ dante-1.4.3/osdep.m4	2024-11-17 16:05:24.798720697 -0800
+@@ -957,11 +957,11 @@
+ if test -s $ERRVALFILE; then
+     UNIQUEVALS=`sort $ERRVALFILE | uniq | wc -l | awk '{ print $1 }'`
+     if test $UNIQUEVALS -le 1; then
+-        AC_MSG_FAILURE([error: getaddrinfo() error value count too low])
++        AC_MSG_FAILURE([error: getaddrinfo() error value count too low; got $UNIQUEVALS from $ERRVALFILE])
+     fi
+     UNIQUESYMBOLS=`cat $ERRVALFILE | wc -l | awk '{ print $1 }'`
+     if test $UNIQUESYMBOLS -le 1; then
+-        AC_MSG_FAILURE([error: getaddrinfo() error symbol count too low])
++        AC_MSG_FAILURE([error: getaddrinfo() error symbol count too low; got $UNIQUESYMBOLS from $ERRVALFILE])
+     fi
+ 
+     if test $ERRNOCNT -ne $UNIQUESYMBOLS; then
diff --git a/net-proxy/wwwoffle/Manifest b/net-proxy/wwwoffle/Manifest
index a263aefaa7f3..23ad388eaac1 100644
--- a/net-proxy/wwwoffle/Manifest
+++ b/net-proxy/wwwoffle/Manifest
@@ -6,5 +6,5 @@ AUX wwwoffle.initd 426 BLAKE2B e92e7ad6fae5e25e1862664e0411a697be5d4440e3b6450ad
 DIST wwwoffle-2.9i.tgz 1113771 BLAKE2B 5acf6e14f362fe87d8f91599aaf113ce8ea5a178ed08eb21d4371d0edfc77a5c0a38e8e0053b51cf6426b0b701ba4fbbddfc84240161877a892aa2da303a5ecf SHA512 c9e9d67df9a0e40b584916857221a9a728f36a677cba28527f8c2febea1a23379d3b112d96723bf01ec1718a0897d8980715864ac7ef898b2585dd3f01d9a456
 DIST wwwoffle-2.9j.tgz 1110599 BLAKE2B cc12a1043c2047f8150883871e112007f9cd028ae961e3495332c4afc06342f0b85c44d0c08ce204907c7abbdb3660afe15d0d146dde39fc914942f9ec492a9d SHA512 03f3177fac563ecab33288d1c193d3e193ff1c07413151fc5db1b85e0111b10815d572bcc59d188145b2851e57be0327f7c9e7538361a36e1a9457aa0d028818
 EBUILD wwwoffle-2.9i-r2.ebuild 3314 BLAKE2B ce3cfe236260f3a7a0cf1d07f3c5d50948bdc51709c0b3a5159e877386d08478317fc11322673eaecaa65b567bc9164a9a6cf28c5fcdda5fed64fae531111beb SHA512 0d0dd9d53da04e5cf474c777ffbc1e8293114550aa69baeca33d31ffb5d6a9076771d354d480ba3ef078d0ec9bf5ae4993d68a0b2274837df2c1c9416c1c7d1a
-EBUILD wwwoffle-2.9j.ebuild 3449 BLAKE2B 460f38eb6c1ce17424153d213b035746976f140bf65ca584b80037c370b5bb4a1330aaf87c05b0430c9c14e45eea8a9ab1b5154516f82e643d8e672e73f1c0f8 SHA512 2172183dbb73b841bed070c041858a104b07b215ad6b7910f9bb84dd6f6a1a79e9a6858c16f7e9efb7a32ed1a9b8fe008ac59910724d3bae45595e972b703595
+EBUILD wwwoffle-2.9j.ebuild 3447 BLAKE2B ed8b75583b94cd3457e2c674c165d935a7213a6df10f66e8d935b7b37c177b7c63fca979ad6d60ca285f5114bdcddb9f04d35627c7e0aa9027b62fe3754aa31f SHA512 2df85fc48749035e7f18627ddfc0824e52857adcbf6e03ed4ed550e35342b1a9aba92a30a9da71ba4b87c35d27446edd78f1b57c6794e2f71aa58ec5a15b9bb9
 MISC metadata.xml 412 BLAKE2B d2fe946dff0566ff73b532b1148f7648366e8868fe5a22110acd19c8406654b4091e7824fbc80378252c3892e75219f6d1982ad921790eee8a86c561e110d941 SHA512 378be8267abb9de2d726f0f56c9d1b0d9a3a1ea8c3bd04dfc913e88a35ba4f239998a395ff4b9ec3366d8efd14f41fbbf667025a8b8c92b6c935207104acad32
diff --git a/net-proxy/wwwoffle/wwwoffle-2.9j.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9j.ebuild
index 5fb8fa4ada8f..64b0c131b852 100644
--- a/net-proxy/wwwoffle/wwwoffle-2.9j.ebuild
+++ b/net-proxy/wwwoffle/wwwoffle-2.9j.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.gedanken.org.uk/software/${PN}/download/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
 IUSE="gnutls ipv6 zlib"
 
 RDEPEND="