commit: 8b229644eb2db5b094321228ec2b2474922e53a5 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Fri Oct 7 08:24:06 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Oct 7 08:24:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b229644
sys-apps/tcp-wrappers: fix C99 decls Closes: https://bugs.gentoo.org/874930 Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-apps/tcp-wrappers/Manifest | 1 + .../files/tcp-wrappers-7.6-redhat-bug11881.patch | 35 ---------------------- .../tcp-wrappers-7.6.28-no-external-malloc.patch | 15 ---------- sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild | 9 +++--- 4 files changed, 5 insertions(+), 55 deletions(-) diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest index 59c7c65841de..d2a178c14286 100644 --- a/sys-apps/tcp-wrappers/Manifest +++ b/sys-apps/tcp-wrappers/Manifest @@ -1,2 +1,3 @@ +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 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
