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

9 files changed, 20 insertions, 144 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 403b580bda1a..04a437fbbbdd 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index dab7f70aacf5..0d32926c8740 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -18,6 +18,6 @@ DIST dropbear-2024.86.tar.bz2 2306244 BLAKE2B 988e2cc03c123685c93ab8b1148b1844ce
 DIST dropbear-2024.86.tar.bz2.asc 833 BLAKE2B 5fc35fb4135f099c2204972d3fc365b01b2622eeadf4cf6093496176e5a4010c1fbe36056036fe370e1a1ffb05d86293e212d935a3b4c5d8b0005eae09423edc SHA512 b7dbae281b21d5d1dfbb311f6a94a2c1acd3ab44a3293baffa885194d24721ec8067e907b414ebc0b5d77bb32c511fcd5c31008b6622b946e8d253621012836f
 EBUILD dropbear-2022.83-r1.ebuild 4433 BLAKE2B 6cd0edb8789dcabbfaaed58db535ee6bca645ea687eb2e2d5f15d0fd16b370cdd1075d99960315492182065219b11823101db489233b8ea26392f0c4e9e41776 SHA512 61ab7e9ea1856586e8e15e4089be296a2d2730fe236ea3d07ddf2652ec3cf123d07ec782d0d7bb51e96ef537c09b4421f83a6ef04fa5253e4536740aa66f3854
 EBUILD dropbear-2024.85-r1.ebuild 5062 BLAKE2B d6c63a168ef0e040794cca2cdbc4b77ad386bf34f3c6d3073d5d7fd30ebec8af213f709958e0832fc626e2c18bd38f5fcf1bca4b7573ffe28fa2c79555720af5 SHA512 033e4d740310b0ab6efd00ab1df08239058b613f31843aa679015755c25c75c8dfa248efe46ced583eb52fbe6f9c9d817936a9f4cbfb2f4de4e1ad6cfbd49ab3
-EBUILD dropbear-2024.85-r2.ebuild 5404 BLAKE2B bce5d3ac239a165f356ecaa525b46030c3f31094220c8b43ceeea219a445d2314ba19a4d289eaf25ae00c8a5a65970d74b75a588a391f2adecef45ac0db70e11 SHA512 75040e4392091ea25db242997d04a3b894807699c58ecc6d7909bb5b1fad289b9d83de399c1f8154d8df21ce27bb095e71569b2f4f7a0bc63e901cc8ec6f5331
+EBUILD dropbear-2024.85-r2.ebuild 5403 BLAKE2B 65dbe02b17c3712815fc35c7d9a586585effd447d1dccc4251fa312ec467649289096c809a0255bf1af967b937e8eefe85a12e3d27f5065822cb92924357425f SHA512 6a096bc2b06b8dfe34e907fa9dcd8e06cd0309c8c6397ebc8cbfa38bc2aca6d928a65c673815903db537dadf79b520e89e87644304239487ba4822e9d44d1ab1
 EBUILD dropbear-2024.86.ebuild 5558 BLAKE2B bab3a449dbdecc68138de6e0c40e0b1b4becdcfd9a805ce9cd2fcc42aef8970afb282147480b58f9eb11156dbfe09be02de7563238c2c53bd7ce52644145cd00 SHA512 b3a560c5f3d5edf7c63739940e058e9da37df3e5509bd38f0cc59977688b8007bed87773fa61d1fb27a90849ab27a46a6f7e0f9371b2776e4f6c4fa208fc3693
 MISC metadata.xml 1866 BLAKE2B 820902b27de934f6d7f0edc5d9f8c7bccf5c5f51d0e81ebd13fb53d6ba9e385c924d4fd0a191096fb191c253800227ff6b30f7bd44edfb532307e7076f39df8f SHA512 8e073a34877f230207ef391084b99014db9482aec680a1b292ac95e3bade426ecf362092337b7fcb19091f273085a06ae81cfd7d5e69a46a28067ae68f615cd4
diff --git a/net-misc/dropbear/dropbear-2024.85-r2.ebuild b/net-misc/dropbear/dropbear-2024.85-r2.ebuild
index 282d72502f91..0d668a45761a 100644
--- a/net-misc/dropbear/dropbear-2024.85-r2.ebuild
+++ b/net-misc/dropbear/dropbear-2024.85-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
 
 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index ab133d01aef5..5b01d2ad0b98 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -7,6 +7,6 @@ DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32
 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-20240905.ebuild 3344 BLAKE2B 492e3f7b37d147560822a51fc884d45eee616df40bd5eb65dc2c98670224d86b4b88d3ea9ca126bdab07ee7aa984e8a6d324816571d40651f9e29b5c68548793 SHA512 5595015702f4b471c01c8b5b45599baee738713c8eb3ec62e6a40e04fd2989a4785cc1dbe86c39f082378ae71b03af2f34eaf19d9bf2091c2c81033d96c4ab62
+EBUILD iputils-20240905.ebuild 3343 BLAKE2B 0fc779e54cbd68ffadeb36010ffd5b791b5b3098862d4a0fb7dd983cdb9f8afebce2a19f6986ac742d3284b22b4d9a3a4dc700c60f140f9ec44fac22ecfd2ff8 SHA512 c29ec9930d9207097c0109293124c6e1c8bd38022660950415a4d3683a96680937ed74e49c000d40bb027f925e142c1aeefca00e98a5a92278719f6e56461989
 EBUILD iputils-99999999.ebuild 3292 BLAKE2B 6ca538ec59f0d4d34a97a09c948cbb75e1d1ee64b5c8b0c8bcc6faf74a6170a6d7c2a2c734953c0ec7e785eb0c0df45e9579ee3d30aea2d95bcfd41283019759 SHA512 d11355689bb367b003e77acd89cda8b27f3734530f36a216350495f639f03b92d09c10ed73bfac4d565ed9ea524c16936b6465681af1bd763b001e9f692dd247
 MISC metadata.xml 1034 BLAKE2B a1d9c98f71961b483d73229a2fbb8b272b2c1693f89fbe6921f657949da45c87fe7408aa8ce39059ba6ce3e79bb4621e4d303ed2302ab3363c5492e174fc2149 SHA512 8df2ddb2ea153af627c8c353af03675e70028017987c83e4d70ee9f1a97ae79c4fdfc8eb5987efaf8daeeb0955ef04a65315fe6033e71e9cb32e8059294716fd
diff --git a/net-misc/iputils/iputils-20240905.ebuild b/net-misc/iputils/iputils-20240905.ebuild
index 0725ce5193a6..15ba4cd93dff 100644
--- a/net-misc/iputils/iputils-20240905.ebuild
+++ b/net-misc/iputils/iputils-20240905.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	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"
+	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"
diff --git a/net-misc/rwhoisd/Manifest b/net-misc/rwhoisd/Manifest
index 0ba855131f1f..966e2abecc96 100644
--- a/net-misc/rwhoisd/Manifest
+++ b/net-misc/rwhoisd/Manifest
@@ -1,10 +1,8 @@
 AUX rwhoisd 280 BLAKE2B 8d2e54026175bb53897e69a61abf83b5c7548acbe52555f6adbdc88a07f94a88e3486aea81dd2d3043a99b83b5bc7b4255014f3df2687d463ab60a86ef2a37b5 SHA512 cd278c6dd828d7f07c50147e5dedad7cf8c8e44926b4717fec442b91d891838b59f61dc2a51968df5b4b1dfe181958148a9a7f9e93e65fc815b69c6219dabd6d
-AUX rwhoisd-1.5.9.6-c99.patch 2689 BLAKE2B 466806c1715f9a14eb23ba442b0861e06a20751a1eab9ad2086d920ce7ee2d422d937424fe44a1b2e6c7cc3e8788573065fcf6eb89e5c34c9601ccc427f63b29 SHA512 08dddbd033df5f2ad0eed17f61e4cc3b2b6b08f75729273824b7318d50f2c03e9266f5850e97560ef5b4641f0c5ea45c131261f3dda539d96df0f57cff101ed8
-AUX rwhoisd-1.5.9.6-fix-direct-ar-call.patch 685 BLAKE2B 115db4bbfcc39474256c67c6b6035b97ecb76f3afb36514f5eb215078a8d7cdc0b58bbcf557d25bdcfdcf21c1f1e6708d375d49c2120d70ee3bddc4dfaf26045 SHA512 dfd6c6129f559a4f30dd8b18146340e7c2497990683b1b17e2b60e9886bdc256555b2c1d0f7670073c27ab22f3a8eb8d31d2ecb1356e053ed8bed4a70138ccfb
 AUX rwhoisd.conf 154 BLAKE2B 1f80fde2a8ed3066c4c5b5a3a17ad735a6bef56bb897cb41bbc7d3e314803a9e3b06dc957077b28b3590435b7a18a0827f3f4554247509ea21bc0d5048b08cf2 SHA512 882d93ddf72f6a909ab6a33a6f5026e35f52ae025a9e4653cc0449c4b0ab1b2fda5799e1b44b19c620eb98337270a7a1c1eb9cff66af49832adf9726f4713bb8
-DIST rwhoisd-1.5.9.6-fix-build-for-clang16.patch.xz 71604 BLAKE2B f528fdf51203210a9c3c268569f3b84d668e45a000d76bd52e3b4eb3f9ad0f317aeb46e26475ca4c79b768232be9116f2ae13feac4e888d40b8359a72c3cb30c SHA512 ed82d09f6ceecaa607b800906780d68e276d26eba480da1a0d7d4867fcf692a9cf6eca90b16066b2065a749f9a07b47bb55bd45a8976058fd63bc25a9040324e
 DIST rwhoisd-1.5.9.6-patches-1.tar.xz 75832 BLAKE2B 84834699a7565ce6c7c1d11f7c12e01b5e6054335ef21fed8a74fa68d43cf256789903e424350678eaa632c35be08d486a2a1e7f44b02b9956347ba4cd594579 SHA512 f576ebc46d5f03edd8197f676e53f454754661154ab000cd4a94fff6ca6f455fe4967219c6f59f3c90cc847883d3831ef3d9dc16425e316cdba5b138f6bda922
+DIST rwhoisd-1.5.9.6-patches-2.tar.xz 80256 BLAKE2B 787f24519c1555d67fc35f49517283b518b05b55446ca547ae330aee777f3fe9bcdc0d737309cabbeaa05368348fe5c79ddc557d11af2ee3121db777758ac119 SHA512 00bde4adc215edd88afc17b1953856450a217bfcc75978c6245c7083ede81c164980e30831432314edcf4afcfa5c8c459d0ecc2915a68372837fdaf2d9bdc36a
 DIST rwhoisd-1.5.9.6.tar.gz 491955 BLAKE2B 97587fc6a728cde58bc5049a9bf27ec1673ce7beb751aa0de7c787d08185b597e16a4920e89fa5aaabc6e7e1b5dfecedc50aaf55cbdbe7f85a43d6a125848cb9 SHA512 ab5674d9ed9f9c5fc00b2859b1336c766c546ca067ddf9d3863a0728c6d0eac11be3a9cd22dce8c25999ed8c8e5377e6da4aa1252e396d5b3c8e959794903c52
-EBUILD rwhoisd-1.5.9.6-r3.ebuild 1262 BLAKE2B ed176bd71c464d9f29b0ded1095f96c9d6675f66245e7c05cd902e062d88382aa054144a6cab1253d2df0f6bddd41e677d62ef2cd06d4de4f04cf5cc5062fb2f SHA512 eebfdca3195a26cbc6046cdc7420ad1f6aac6f5f42192509ec36991624b725e11abda72ae01fa3c9f3fd1b9988cb4f65395a932afa9fed6e08acb258aea685b3
 EBUILD rwhoisd-1.5.9.6_p1.ebuild 1098 BLAKE2B 64a5a6129f06780f66b203d6dbc7d43d1b8f6b2e5f58c45c38e9e51d061ba338e31f993e5cafdf384b541192c51dfed4c192857111ff6d9a1549b4b9f807affe SHA512 5972c3767b43015b628c3d1843cb4d1b4da0fde3030f31168a278c36d3d0b1cfb45309b66343f767d07c17f82be91b67efc1d6bfaac549b042a40379b3037bea
+EBUILD rwhoisd-1.5.9.6_p2.ebuild 1098 BLAKE2B 64a5a6129f06780f66b203d6dbc7d43d1b8f6b2e5f58c45c38e9e51d061ba338e31f993e5cafdf384b541192c51dfed4c192857111ff6d9a1549b4b9f807affe SHA512 5972c3767b43015b628c3d1843cb4d1b4da0fde3030f31168a278c36d3d0b1cfb45309b66343f767d07c17f82be91b67efc1d6bfaac549b042a40379b3037bea
 MISC metadata.xml 248 BLAKE2B c05b7c43d2b78bc6a55a9c89cecd347a257f27e7c6e1bdb20b20bef8301f5a7777bca32a4e77155f0fba7fe7c9127108aacf235332cb2f176f39f02f3e4227f6 SHA512 500fc7831f70375cea82d69fe01a97852fd78583dd7216549620ea581de3e36f6eab035949d35a9cc366fd163df6c8198f8673f070b992bec3d67d04bc0bf7d4
diff --git a/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-c99.patch b/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-c99.patch
deleted file mode 100644
index 8b207d0683ac..000000000000
--- a/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-c99.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-https://github.com/arineng/rwhoisd/pull/3/commits/285e84dddee471886d84da3ea3579facb9fe7e99
-
-From 285e84dddee471886d84da3ea3579facb9fe7e99 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 1 Dec 2023 13:32:08 +0100
-Subject: [PATCH] Fix a return value of signal handlers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 14 will error if a value returned from a function does not match
-a function prototype. This can be reproduced with -Wreturn-mismatch
-option and is a problem compilers where a signal handler should return
-void:
-
-    daemon.c: In function ‘sigchld_handler’:
-    daemon.c:108:10: error: ‘return’ with a value, in function returning void
-      108 |   return 0;
-      |          ^
-    daemon.c:92:1: note: declared here
-       92 | sigchld_handler(
-      | ^~~~~~~~~~~~~~~
-    daemon.c: In function ‘sighup_handler’:
-    daemon.c:117:10: error: ‘return’ with a value, in function returning void
-      117 |   return 0;
-      |          ^
-    daemon.c:112:1: note: declared here
-      112 | sighup_handler(
-      | ^~~~~~~~~~~~~~
-    daemon.c: In function ‘exit_handler’:
-    daemon.c:127:10: error: ‘return’ with a value, in function returning void
-      127 |   return 0;
-      |          ^
-
-This patch fixes it.
----
- rwhoisd/configure.ac    | 3 +++
- rwhoisd/server/daemon.c | 6 ++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 0b822ac..b1d659f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -114,6 +114,9 @@ AC_CHECK_FUNCS(getcwd gethostname socket strftime uname flock lockf \
- 	       setsid crypt memset memcpy usleep wait3 getaddrinfo vsnprintf)
- AC_REPLACE_FUNCS(strerror)
- 
-+AS_IF([test "${ac_cv_type_signal}" = "int"],
-+    AC_DEFINE([RETSIGTYPE_IS_INT], [1], [Define if RETSIGTYPE is int.])
-+    )
- 
- dnl Optional software.
- 
-diff --git a/server/daemon.c b/server/daemon.c
-index a5c638b..c943da9 100644
---- a/server/daemon.c
-+++ b/server/daemon.c
-@@ -105,7 +105,9 @@ sigchld_handler(
-   /* reset the signal handler -- some older systems remove the signal
-      handler upon use.  POSIX systems should not do this */
-   signal(SIGCHLD, (__sighandler_t)sigchld_handler);
-+#ifdef RETSIGTYPE_IS_INT
-   return 0;
-+#endif
- }
- 
- static RETSIGTYPE
-@@ -114,7 +116,9 @@ sighup_handler(
- {
-   hup_recvd = TRUE;
-   signal(SIGHUP, (__sighandler_t)sighup_handler);
-+#ifdef RETSIGTYPE_IS_INT
-   return 0;
-+#endif
- }
- 
- static RETSIGTYPE
-@@ -124,7 +128,9 @@ exit_handler(
-   log(L_LOG_NOTICE, UNKNOWN, "Exiting");
-   delpid();
-   exit(0);
-+#ifdef RETSIGTYPE_IS_INT
-   return 0;
-+#endif
- }
- 
- static void set_sighup (void)
-
diff --git a/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-fix-direct-ar-call.patch b/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-fix-direct-ar-call.patch
deleted file mode 100644
index c015559fc891..000000000000
--- a/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-fix-direct-ar-call.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Date: Wed, 1 Mar 2023 22:04:45 +0100
-Subject: [PATCH] fix direct ar call
-
-Prevent build to directly call ar and use a variable instead.
-
-Bug: https://bugs.gentoo.org/725194
-
-Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
-
---- a/common/Makefile.in
-+++ b/common/Makefile.in
-@@ -1,7 +1,7 @@
-
- # programs
- CC      = @CC@
--AR      = ar
-+AR      = @AR@
- RANLIB  = @RANLIB@
- SHELL   = /bin/sh
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,6 +4,8 @@ dnl This has been updated to use autoconf-2.52.
- AC_INIT
- AC_CONFIG_SRCDIR([common/attributes.c])
-
-+AC_CHECK_TOOL(AR, ar, false)
-+
- dnl Random substitution variables
- if test -f VERSION; then
- 	RWHOIS_VERSION=`cat VERSION`
---
-2.39.2
diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.6-r3.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.6_p2.ebuild
index 3a5b26274eb5..132a542b12ec 100644
--- a/net-misc/rwhoisd/rwhoisd-1.5.9.6-r3.ebuild
+++ b/net-misc/rwhoisd/rwhoisd-1.5.9.6_p2.ebuild
@@ -5,17 +5,26 @@ EAPI=8
 
 inherit autotools flag-o-matic
 
+MY_PV="${PV%%_p*}"
+MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="ARIN rwhois daemon"
 HOMEPAGE="https://projects.arin.net/rwhois/"
-SRC_URI="https://github.com/arineng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/rwhoisd-1.5.9.6-fix-build-for-clang16.patch.xz"
-S="${WORKDIR}/${P}/${PN}"
+SRC_URI="
+	https://github.com/arineng/${PN}/archive/${MY_PV}.tar.gz
+		-> ${MY_P}.tar.gz
+	https://dev.gentoo.org/~arkamar/distfiles/${MY_P}-patches-${PV##*_p}.tar.xz
+"
+S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="virtual/libcrypt:="
+DEPEND="
+	sys-apps/tcp-wrappers
+	virtual/libcrypt:=
+"
 RDEPEND="
 	${DEPEND}
 	acct-group/rwhoisd
@@ -26,12 +35,7 @@ BDEPEND="
 	app-alternatives/yacc
 "
 
-# upstream PR: https://github.com/arineng/rwhoisd/pull/2
-PATCHES=(
-	"${WORKDIR}/${P}-fix-build-for-clang16.patch"
-	"${FILESDIR}/${P}-fix-direct-ar-call.patch"
-	"${FILESDIR}/${P}-c99.patch"
-)
+PATCHES=( "${WORKDIR}"/patches )
 
 src_prepare() {
 	default
@@ -41,10 +45,6 @@ src_prepare() {
 src_compile() {
 	append-cflags -DNEW_STYLE_BIN_SORT -std=gnu89
 
-	emake -C common
-	emake -C regexp
-	emake -C mkdb
-
 	default
 }