gentoo auto-resync : 07:10:2022 - 13:23:59

4 files changed, 6 insertions, 58 deletions

diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 23318e440096..204212ada3b8 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -1,7 +1,6 @@
 AUX hosts.allow.example 585 BLAKE2B 18a7786b0eb9d08b0536de6ef135189aa0527af34a9bfec378ceedf6b6479998f81bd40237bdb5ad09239f7221cdc076077c964a111f6eb651ce258496d1010f SHA512 63587dd4552b688dc5ed0adde3932e43e5287129315211498063f09e37c1f8beee0de60d7d4f69df7149bd500546a2fd59a6094d71f9c0be221426eae3cb869b
-AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
-AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
+DIST tcp-wrappers-7.6.31-patches.tar.xz 8040 BLAKE2B 03e08afaf52bd8e24161cae8f92cbbf47f6dbceae4accc900963c179ff8ee5ce290a973028fd43cc6bffa82714c8a269ba9d2499c3033226d025f4c644462286 SHA512 cee360016361dd69473e57d36ea87b720ef7f31d58472fb1b9efe752fb250c2c758e95d1ca747f8a613a16c60ab9fa991db65e983d678e285fc1372dbad114c9
 DIST tcp-wrappers_7.6.q-31.debian.tar.xz 36256 BLAKE2B 3ffd8b014c120f54b9231f375d3ec77a1894db8c48e56a57b52c5d796be42b78a1ddc35a45c816a05a1cbc603b88e3fe6131b4a562fb9d2169685031ecbf44d5 SHA512 de2bd7b081fca0f182def93795014332baf7b5edf339eaf81dff82772aea1dc866ccddccd5273e7dc49cf760953e164a66f1e5945cb54f2b8dab090c11712c33
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.31.ebuild 2571 BLAKE2B f3f94b2bc096577c2cef45de35bc31f3b6bc7ea953bd06f22cc779d4618e9e853c713a2cf3faca47aae066cbd836ca23be4ce4be7064ed5007cdf823bf832895 SHA512 aa502d0526276623d32ee101dc0c415fe23fba6574febe14c44a4153edf5845f9d20e1aaa0e3f89b153e6743f434f627e523fefe12dad6ef91e65cdb353dbdf4
+EBUILD tcp-wrappers-7.6.31.ebuild 2561 BLAKE2B a4057517ebac8279126a1bf82839714eeac099b9caf651d0d1f8bcf56772daf7a8f7f00a5efc24b28d82fc2f3f3dad64209899ab9fa5d2034d043e6669f41fe8 SHA512 7c5776367fdbbdf63cc6d71a558f5a20692cd4eec92a139d6800ec6e0edda99c2518505abe04c53dc662daf569a28e97bb1db90c8b65604d74a91bb4fe66c9a9
 MISC metadata.xml 441 BLAKE2B 4387da8847f321871fa326aa52ff72a22c3ef29abb3a1ba06a2bf89d4cb69ed464d05007ca9f647ba3ec4ea23454081e442b67402f4258e61687b7b2c354cb5b SHA512 95f6cd45971b1ef2c47bfc504a84072a0fc95418a5fd0b8a51cdef38359e556caa439b111d381897979c6f82871af343a3134270de21e9e2ffa6ae7cb7949883
diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-redhat-bug11881.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-redhat-bug11881.patch
deleted file mode 100644
index 4a6847621c57..000000000000
--- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-redhat-bug11881.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- tcp_wrappers_7.6/tcpd.c.bug11881
-+++ tcp_wrappers_7.6/tcpd.c
-@@ -60,10 +60,10 @@
-      */
- 
-     if (argv[0][0] == '/') {
--	strcpy(path, argv[0]);
-+	strncpy(path, argv[0], sizeof(path));
- 	argv[0] = strrchr(argv[0], '/') + 1;
-     } else {
--	sprintf(path, "%s/%s", REAL_DAEMON_DIR, argv[0]);
-+	snprintf(path, sizeof(path), "%s/%s", REAL_DAEMON_DIR, argv[0]);
-     }
- 
-     /*
---- tcp_wrappers_7.6/eval.c.bug11881
-+++ tcp_wrappers_7.6/eval.c
-@@ -111,7 +111,7 @@
- 	return (hostinfo);
- #endif
-     if (STR_NE(eval_user(request), unknown)) {
--	sprintf(both, "%s@%s", request->user, hostinfo);
-+	snprintf(both, sizeof(both), "%s@%s", request->user, hostinfo);
- 	return (both);
-     } else {
- 	return (hostinfo);
-@@ -128,7 +128,7 @@
-     char   *daemon = eval_daemon(request);
- 
-     if (STR_NE(host, unknown)) {
--	sprintf(both, "%s@%s", daemon, host);
-+	snprintf(both, sizeof(both), "%s@%s", daemon, host);
- 	return (both);
-     } else {
- 	return (daemon);
diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.28-no-external-malloc.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.28-no-external-malloc.patch
deleted file mode 100644
index eebd600aab24..000000000000
--- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.28-no-external-malloc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-We use malloc() from stdlib.h.
-
---- a/scaffold.c
-+++ b/scaffold.c
-@@ -26,10 +26,6 @@ static char sccs_id[] = "@(#) scaffold.c 1.6 97/03/21 19:27:24";
- #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
- #endif
- 
--#ifndef INET6
--extern char *malloc();
--#endif
--
- /* Application-specific. */
- 
- #include "tcpd.h"
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
index dc893cbfbf1b..d2bcdf1b8a3e 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
@@ -8,10 +8,12 @@ inherit flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
 MY_PV=$(ver_cut 1-2)
 DEB_PV=$(ver_cut 3)
 MY_P="${PN//-/_}_${MY_PV}"
+
 DESCRIPTION="TCP Wrappers"
 HOMEPAGE="http://ftp.porcupine.org/pub/security"
 SRC_URI="http://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.xz"
+	mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.xz
+	https://dev.gentoo.org/~soap/distfiles/${P}-patches.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="tcp_wrappers_license"
@@ -22,10 +24,7 @@ IUSE="ipv6 netgroups"
 RDEPEND="netgroups? ( net-libs/libnsl:= )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-7.6-redhat-bug11881.patch"
-	"${FILESDIR}/${PN}-7.6.28-no-external-malloc.patch"
-)
+PATCHES=( "${WORKDIR}"/gentoo-patches/ )
 
 src_prepare() {
 	# Apply Debian patchset except for the series file which just lists