gentoo auto-resync : 04:10:2024 - 04:27:17

8 files changed, 259 insertions, 12 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e7aad42ce9fe..ff5948810d15 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 13febeaa7998..29a2f325dc0b 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,9 +1,12 @@
+AUX iputils-20240905-man-pages.patch 1214 BLAKE2B 7d1ee8b8d4c4b71a14e59ba8676fafed70e4d10f0acdac95898615b639040f9a83a70da55e8b2e3b52aec418190bb4a3cbec62318598f3bcf41011f66aa28994 SHA512 8ec20c42b32bfc2435964ec479d258dd7ef1a4cba840e834c62cb3c65787be5a9ef17140fbdc39b9bafff167959303f6d1e2594a50768e3cb7f06c134897ca77
 DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
 DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f
 DIST iputils-20240117.tar.xz 445684 BLAKE2B 635943e12010aef8c1291b407bfbe284e0179391fca76197b77037ae1ffc219fa1d8e36abcea5fb7fff10d55ab40eed7c081e5d92b29f0916a4b4dd806945491 SHA512 c45822c5641f194dc07cba919c13a4b7a79d050bb53957a894ebb6ccc1f71bac1f26489e13d18ef1ce235982f5fa1824e677f95037a0f5cce6bcb94be4c2e2de
+DIST iputils-20240905.tar.xz 459008 BLAKE2B 62ee614292fbf487d93d711ecbc11719d10f4dcb995bfd0d613459b49792ae4c8f0032a401fbf583206665ac4c592e90c30da5c75811340cc881c06a20a05318 SHA512 6731e4fb8b8f89469de746c911fca6f1c7e924a21ca14ec25c40707707be3fe5a696272ba2d293207bc8c20f72a070d8e0a640fab9e5ea240a29a1f027807c1b
 DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee
 EBUILD iputils-20211215.ebuild 4674 BLAKE2B 3d816e73a68245abdfc5ad0029406f6a00ba2ece4791a3d34c0e445ea7006aac9549669462f73f9ae4f96df1163d811f017a1129068fd56b41ffceb363925d84 SHA512 6cd653bdd7c62d98dbbf44bcc0fda5bfa48490d9d4eb172614953f25b7eef9b5b550092a3e95d93b1cb34873b6b280a1b34f589305fb775ceeddba2b64656402
 EBUILD iputils-20221126-r1.ebuild 3179 BLAKE2B ac84585fb1d3b472c9cbeb98016373a42b432199a31a7f53289a19f71eace17c68545151e14b28cd82c2f757a579c057974c461462c1c3c32ebf5504b271dc72 SHA512 6f459295d5bd7a752a39918b561d365e40692453d1118739bbe7fd3cb32881e9903c9c096fdaec1dd845a3b51ff8b4c5583993ad31cd9bc5ffa5e947a1b1e369
 EBUILD iputils-20240117.ebuild 3179 BLAKE2B 9edc1bfe9ba88e04ea8c4bda90a932ed17188716d9d0131856508ca0ca1dda06c81ab560ef5f998aaa0cbcda7d6c9dc8926c5dc94a617e7a67b7f8cd1d9dccc1 SHA512 e171fe5221d3c0f96372fc93ebb55f4f57d4b2c30ead4367c11b8a2813a10a7edfc6affdf05335dc808a6fdcf73383a9b8d5b40b50550c3e12eb209cdac09279
-EBUILD iputils-99999999.ebuild 3187 BLAKE2B c2303350c057e275e84257fda06de1f63cc04a19955b190c9bd2b1983d3a4dde7056e5589bb83fd6c5f197232160735b441cb383267eae0e68c0fdf64082e88f SHA512 30c356baa95d65c4d05b0fdaae35fbd64e1b2d0e6d3bebacddd5b5518e312a262885ca5abf916f03177574fb2cff3af51401e355fd88a55e2a5a99c84526bf53
+EBUILD iputils-20240905.ebuild 3351 BLAKE2B dfd277ae7478b1282032c01bb782d1640f56d75ffbd514a20520b46ddbce2b8dffdfa3bc684999597ef3555805fd6795c0760ca1d198719b3f656d201028eacc SHA512 43382e466b9ec6a9fa470eb91f30bef517c0305dffcef454b5346d7cab1a38decb35a8cc5b3c3a1db6bff9d465f7103a37c20d46d93e227a57c12d82811893e2
+EBUILD iputils-99999999.ebuild 3292 BLAKE2B 6ca538ec59f0d4d34a97a09c948cbb75e1d1ee64b5c8b0c8bcc6faf74a6170a6d7c2a2c734953c0ec7e785eb0c0df45e9579ee3d30aea2d95bcfd41283019759 SHA512 d11355689bb367b003e77acd89cda8b27f3734530f36a216350495f639f03b92d09c10ed73bfac4d565ed9ea524c16936b6465681af1bd763b001e9f692dd247
 MISC metadata.xml 1034 BLAKE2B a1d9c98f71961b483d73229a2fbb8b272b2c1693f89fbe6921f657949da45c87fe7408aa8ce39059ba6ce3e79bb4621e4d303ed2302ab3363c5492e174fc2149 SHA512 8df2ddb2ea153af627c8c353af03675e70028017987c83e4d70ee9f1a97ae79c4fdfc8eb5987efaf8daeeb0955ef04a65315fe6033e71e9cb32e8059294716fd
diff --git a/net-misc/iputils/files/iputils-20240905-man-pages.patch b/net-misc/iputils/files/iputils-20240905-man-pages.patch
new file mode 100644
index 000000000000..0c2d174ec242
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20240905-man-pages.patch
@@ -0,0 +1,30 @@
+https://github.com/iputils/iputils/pull/556
+
+From 1e2a59a879859eb01ca8b34523f54b6acbb886cb Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@gentoo.org>
+Date: Wed, 18 Sep 2024 00:32:53 -0400
+Subject: [PATCH] meson: fix installation of prebuilt manpages in dist tarball
+
+page contains the name of the program we are building/installing a
+manual for. In the custom targets for building the manpages, we append
+.xml and .8 in turn -- we don't replace a ".xml" in the page name.
+
+As there is nothing to replace, we end up checking if e.g. "./arping"
+exists, and trying to install it as a manual if so -- rather than
+arping.8 as intended. Sync the logic so that this works.
+
+Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -28,8 +28,8 @@ if meson.version().version_compare('>=0.58.0')
+ 	out_html_pages = []
+ 	generated_docs_exist = true
+ 	foreach page : manpages
+-		man_page_name = page.replace('.xml', '.8')
+-		html_page_name = page.replace('.xml', '.html')
++		man_page_name = page + '.8'
++		html_page_name = page + '.html'
+ 		out_man_pages += man_page_name
+ 		out_html_pages += html_page_name
+ 		if not fs.exists(man_page_name) or not fs.exists(html_page_name)
+
diff --git a/net-misc/iputils/iputils-20240905.ebuild b/net-misc/iputils/iputils-20240905.ebuild
new file mode 100644
index 000000000000..9f4e50654ca8
--- /dev/null
+++ b/net-misc/iputils/iputils-20240905.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="de fr ja pt_BR tr uk zh_CN"
+
+inherit fcaps meson plocale systemd toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+# We install ping unconditionally so BSD is listed by itself
+# See LICENSE on each release, it summaries per-component
+LICENSE="
+	BSD
+	arping? ( GPL-2+ )
+	clockdiff? ( BSD )
+	tracepath? ( GPL-2+ )
+"
+SLOT="0"
+IUSE="+arping caps clockdiff doc idn nls test tracepath"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	caps? ( sys-libs/libcap )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( sys-apps/iproute2 )
+	nls? ( sys-devel/gettext )
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+="
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-ns-stylesheets
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20240905-man-pages.patch
+)
+
+src_prepare() {
+	default
+
+	plocale_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-DUSE_CAP=$(usex caps true false)
+		-DUSE_IDN=$(usex idn true false)
+		-DBUILD_ARPING=$(usex arping true false)
+		-DBUILD_CLOCKDIFF=$(usex clockdiff true false)
+		-DBUILD_PING=true
+		-DBUILD_TRACEPATH=$(usex tracepath true false)
+		-DNO_SETCAP_OR_SUID=true
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		-DUSE_GETTEXT=$(usex nls true false)
+		$(meson_use !test SKIP_TESTS)
+	)
+
+	if use doc || [[ ${PV} == 9999 ]] ; then
+		emesonargs+=(
+			-DBUILD_HTML_MANS=true
+			-DBUILD_MANS=true
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	tc-export CC
+
+	meson_src_compile
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]] ; then
+		einfo "Tests require root privileges. Skipping ..."
+		return
+	fi
+
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	FILECAPS=( cap_net_raw usr/bin/ping )
+	use arping && FILECAPS+=( usr/bin/arping )
+	use clockdiff && FILECAPS+=( usr/bin/clockdiff )
+
+	dosym ping /usr/bin/ping4
+	dosym ping /usr/bin/ping6
+
+	if use tracepath ; then
+		dosym tracepath /usr/bin/tracepath4
+		dosym tracepath /usr/bin/tracepath6
+		dosym tracepath.8 /usr/share/man/man8/tracepath4.8
+		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+	fi
+
+	if use doc ; then
+		mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+}
+
+pkg_preinst() {
+	local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
+	if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
+		HAD_TFTPD_VERSION=1
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
+		ewarn "This upstream version (>= 20211215) drops two tools:"
+		ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
+		ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
+		ewarn "Please install one of the listed alternatives if needed!"
+	fi
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 5f7265fcd16d..1b08f7678320 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,16 +40,21 @@ DEPEND="
 	virtual/os-headers
 "
 BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-ns-stylesheets
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
 	virtual/pkgconfig
 	test? ( sys-apps/iproute2 )
 	nls? ( sys-devel/gettext )
 "
 
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+="
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-ns-stylesheets
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	"
+fi
+
 src_prepare() {
 	default
 
@@ -68,10 +73,15 @@ src_configure() {
 		-Dsystemdunitdir=$(systemd_get_systemunitdir)
 		-DUSE_GETTEXT=$(usex nls true false)
 		$(meson_use !test SKIP_TESTS)
-		-DBUILD_HTML_MANS=$(usex doc true false)
-		-DBUILD_MANS=true
 	)
 
+	if use doc || [[ ${PV} == 9999 ]] ; then
+		emesonargs+=(
+			-DBUILD_HTML_MANS=true
+			-DBUILD_MANS=true
+		)
+	fi
+
 	meson_src_configure
 }
 
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index f44dd5c14485..87320d986a85 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,5 +1,7 @@
 DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad SHA512 3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651
 DIST socat-1.8.0.0.tar.bz2 564066 BLAKE2B b0b3e8c46f746b1aaff7390bbf9521cca8c421f3c20cd7a7f7d8ffd3d7b5e5e881e2477642f7d29247ee5a9d9edf6c8370a43c5f2757e456966b17e3ba08a58a SHA512 dd15c31204f2843ab473a30aa841e960e7c00ac7487e2265d69f9e8ea0afde3841d57cfcb99084f03935d7223da65cee27166837f2f9b3a20c834bc161af802b
+DIST socat-1.8.0.1.tar.bz2 579492 BLAKE2B 0af65b18dc6fec28e59d75048b1e1c4f442f134d87bc6a9b5ea7b3032a0c5519e0d042ae760d451006eacf368870a0a47465d9ec2d5f2fe8d41efcd639ef58c5 SHA512 ce8147df545f74d4b6e1d3d0dae2dcea58c4c7e6ccd1cb2eec68c29ead2c3a818e9851b30a5e5f1456d70463c31b13ab1c5b350293359419a583ed693a917231
 EBUILD socat-1.7.4.4-r1.ebuild 1209 BLAKE2B 4e63b10678302ef5ad6dee0af7f041806d4963b5d218e02e9a3c0035ae1c90eac0b34f5dc31ae965ed1bd337dc5e02f2bb62ec7131e02b389e0eb197694be04b SHA512 0cc2ef381c48ef9f8c2380ad7cd4e88c401bccc14709518e1ccf7e70758a878356dde18e039d39daf15f70da58006b32d005ae053a3e6718c11820bb51f11f41
-EBUILD socat-1.8.0.0.ebuild 1332 BLAKE2B d9d88383ea951f1897c9b5dd7b0a720f1a96b8c4f16a36148dbf3266392396260efd0f1580e40eba18685ba150bf749f93d5d795114573d65ca515bb9a810b83 SHA512 1ff18eef06272151c5de305558d98e7f6cb47f43559b5438865f9a0b411d1437c9cad966a4bc7cbfbfefdbe7ed3d4bc83444627eceee6597c062ea4ab4d4a6c0
+EBUILD socat-1.8.0.0.ebuild 1442 BLAKE2B 71f2c5a23e0c271f5014b198d1b97fe59322c9227e5f181d14df890d0c0df6dc2de8fc93dc98b1a796820ef85184cf53e8ccf12640af6051557c29cca4e3b416 SHA512 717df3531c0e054a1c6d6888d977468401b6c9501550f4bad48e28c60b80cde1f7949696220ad64f54d195ff41a8a62f879abbd39579054a9c6c6dd16bef50af
+EBUILD socat-1.8.0.1.ebuild 1297 BLAKE2B 4034c6cb05c705065152dd252dcfb1502f3dc67e5d2f54611f759062b07a3e1a0e295b7a8f06a73df8a7c7bbe5c29b263f69c7c73ec4cd5b71ede32265e9e72e SHA512 2b12d0418a2e5a88e26aeb0ef1add14250b2a75a92e3e8b9f3cef9560c55aab249d389ac3440f99df904478045ccdc2604f88c0eba22e6e916f9ca63df910ad0
 MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa
diff --git a/net-misc/socat/socat-1.8.0.0.ebuild b/net-misc/socat/socat-1.8.0.0.ebuild
index f256875f9b24..f840822a76f5 100644
--- a/net-misc/socat/socat-1.8.0.0.ebuild
+++ b/net-misc/socat/socat-1.8.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,9 @@ src_configure() {
 }
 
 src_test() {
-	edo ./test.sh -v --expect-fail 217,311,313,410,478,528
+	# Most tests are skipped because they need network access or a TTY
+	# 518 519 need extra permissions
+	edo ./test.sh -v --expect-fail 217,311,313,410,478,518,519,528
 }
 
 src_install() {
diff --git a/net-misc/socat/socat-1.8.0.1.ebuild b/net-misc/socat/socat-1.8.0.1.ebuild
new file mode 100644
index 000000000000..c95a08a93750
--- /dev/null
+++ b/net-misc/socat/socat-1.8.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="ipv6 readline ssl tcpd"
+
+DEPEND="
+	ssl? ( >=dev-libs/openssl-3:= )
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
+
+src_configure() {
+	# bug #293324
+	filter-flags '-Wno-error*'
+
+	tc-export AR
+
+	local myeconfargs=(
+		$(use_enable ssl openssl)
+		$(use_enable readline)
+		$(use_enable ipv6 ip6)
+		$(use_enable tcpd libwrap)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Most tests are skipped because they need network access or a TTY
+	# 518 519 need extra permissions
+	edo ./test.sh -v --expect-fail 217,311,313,410,478,518,519,528
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc doc/*.html doc/*.css
+}