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

4 files changed, 16 insertions, 140 deletions

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
 }