Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/tcp-wrappers/, sys-apps/tcp-wrappers/files/
Date: Fri, 30 Aug 2019 22:34:16
Message-Id: 1567204420.e219ad8be80cbe165b40781c2841c4d6eeb07c90.whissi@gentoo
1 commit: e219ad8be80cbe165b40781c2841c4d6eeb07c90
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 30 22:32:49 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 30 22:33:40 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e219ad8b
7
8 sys-apps/tcp-wrappers: fix USE=-ipv6
9
10 Closes: https://bugs.gentoo.org/692416
11 Package-Manager: Portage-2.3.73, Repoman-2.3.17
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 .../files/tcp-wrappers-7.6.28-no-external-malloc.patch | 15 +++++++++++++++
15 sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild | 1 +
16 2 files changed, 16 insertions(+)
17
18 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
19 new file mode 100644
20 index 00000000000..eebd600aab2
21 --- /dev/null
22 +++ b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.28-no-external-malloc.patch
23 @@ -0,0 +1,15 @@
24 +We use malloc() from stdlib.h.
25 +
26 +--- a/scaffold.c
27 ++++ b/scaffold.c
28 +@@ -26,10 +26,6 @@ static char sccs_id[] = "@(#) scaffold.c 1.6 97/03/21 19:27:24";
29 + #define INADDR_NONE (-1) /* XXX should be 0xffffffff */
30 + #endif
31 +
32 +-#ifndef INET6
33 +-extern char *malloc();
34 +-#endif
35 +-
36 + /* Application-specific. */
37 +
38 + #include "tcpd.h"
39
40 diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
41 index 00e58c8c433..8e96239d916 100644
42 --- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
43 +++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
44 @@ -25,6 +25,7 @@ S=${WORKDIR}/${MY_P}
45 src_prepare() {
46 eapply $(sed -e 's:^:../debian/patches/:' ../debian/patches/series)
47 eapply "${FILESDIR}"/${PN}-7.6-redhat-bug11881.patch
48 + eapply "${FILESDIR}"/${PN}-7.6.28-no-external-malloc.patch
49
50 eapply_user