commit: e4ed427a245eaf0b0d1649cb7cf4bd927e37c706 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu May 11 03:14:56 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu May 11 03:15:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ed427a
net-misc/netstat-nat: fix modern C issues Closes: https://bugs.gentoo.org/875149 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/netstat-nat/files/netstat-nat-1.4.10-docdir.patch | 9 +++++++++ .../netstat-nat/files/netstat-nat-1.4.10-modern-c.patch | 13 +++++++++++++ ...tstat-nat-1.4.10.ebuild => netstat-nat-1.4.10-r1.ebuild} | 6 ++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/net-misc/netstat-nat/files/netstat-nat-1.4.10-docdir.patch b/net-misc/netstat-nat/files/netstat-nat-1.4.10-docdir.patch new file mode 100644 index 000000000000..9edd402621a1 --- /dev/null +++ b/net-misc/netstat-nat/files/netstat-nat-1.4.10-docdir.patch @@ -0,0 +1,9 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,5 @@ + bin_PROGRAMS = netstat-nat + netstat_nat_SOURCES = netstat-nat.c netstat-nat.h +-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) + doc_DATA = NEWS README ChangeLog AUTHORS + dist_man_MANS = netstat-nat.1 + EXTRA_DIST = netstat-nat.spec diff --git a/net-misc/netstat-nat/files/netstat-nat-1.4.10-modern-c.patch b/net-misc/netstat-nat/files/netstat-nat-1.4.10-modern-c.patch new file mode 100644 index 000000000000..c800e73b1474 --- /dev/null +++ b/net-misc/netstat-nat/files/netstat-nat-1.4.10-modern-c.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/875149 +--- a/netstat-nat.h ++++ b/netstat-nat.h +@@ -64,6 +64,9 @@ void ip_addresses_add(struct _ip_addresses **list, const char *dev, const char * + int ip_addresses_search(struct _ip_addresses *list, const char *ip); + void ip_addresses_free(struct _ip_addresses **list); + ++int string_search(char *string, char *search); ++int search_first_hit(char *search, char *line, char *ret); ++int search_sec_hit(char *search, char *line, char *ret); + + #define strcopy(dst, dst_size, src) \ + strncpy(dst, src, (dst_size - 1)); diff --git a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.10-r1.ebuild similarity index 78% rename from net-misc/netstat-nat/netstat-nat-1.4.10.ebuild rename to net-misc/netstat-nat/netstat-nat-1.4.10-r1.ebuild index 2d94fe2f5dfc..3650b7cef189 100644 --- a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild +++ b/net-misc/netstat-nat/netstat-nat-1.4.10-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -15,6 +15,8 @@ KEYWORDS="amd64 ~arm ppc sparc x86" PATCHES=( "${FILESDIR}"/${P}-install.patch + "${FILESDIR}"/${P}-modern-c.patch + "${FILESDIR}"/${P}-docdir.patch ) src_prepare() {
