[gentoo-commits] repo/gentoo:master commit in: net-analyzer/packit/, net-analyzer/packit/files/

[Sam James]

commit:     349d5ffff39b4f54eec062cb77445db094462d26
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 14 07:15:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 14 07:23:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=349d5fff

net-analyzer/packit: fix autoreconf with newer automake

Closes: https://bugs.gentoo.org/816753
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../packit/files/packit-1.7-configure.patch        | 67 ++++++++++++++++++++++
 net-analyzer/packit/packit-1.7.ebuild              |  2 +
 2 files changed, 69 insertions(+)

diff --git a/net-analyzer/packit/files/packit-1.7-configure.patch b/net-analyzer/packit/files/packit-1.7-configure.patch
new file mode 100644
index 00000000000..0f87f0408d8
--- /dev/null
+++ b/net-analyzer/packit/files/packit-1.7-configure.patch
@@ -0,0 +1,67 @@
+https://github.com/resurrecting-open-source-projects/packit/pull/19
+https://bugs.gentoo.org/816753
+
+From 030cdc3f6ded1d206ca16dacc19aef181adba708 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@g.o>
+Date: Thu, 14 Oct 2021 08:11:24 +0100
+Subject: [PATCH 1/2] configure.ac: fix autoreconf with newer automake
+
+Newer automake forbids repeated calls to AM_INIT_AUTOMAKE.
+
+Bug: https://bugs.gentoo.org/816753
+Signed-off-by: Sam James <sam@g.o>
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,6 @@
+ AC_PREREQ([2.69])
+ AC_INIT([packit], [1.7], [https://github.com/resurrecting-open-source-projects/packit/issues])
+ AC_CONFIG_SRCDIR([src/main.c])
+-AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS(config.h)
+ AC_MSG_RESULT(beginning auto-configuration process for packit...)
+ AC_PREFIX_DEFAULT(/usr/local)
+
+From f62d3d40ff99ac39e7cbdea9991bec639a16d3a0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@g.o>
+Date: Thu, 14 Oct 2021 08:12:14 +0100
+Subject: [PATCH 2/2] configure.ac: don't ignore failure to find packages
+
+Signed-off-by: Sam James <sam@g.o>
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(libnet.h,, LIBNET="no")
+ if test "$LIBNET" = "no"; then
+     echo ""
+     echo "Error: Can't find libnet 1.1.0 or greater. Visit https://github.com/sam-github/libnet for the latest version."
+-    exit;
++    exit 1;
+ fi
+ 
+ AC_ARG_WITH(libpcap_includes,
+@@ -161,7 +161,7 @@ AC_CHECK_HEADERS(pcap.h,, LIBPCAP="no")
+ if test "$LIBNET" = "no"; then
+     echo ""
+     echo "Error: Can't find Libpcap. Visit https://github.com/the-tcpdump-group/libpcap for the latest version."
+-    exit;
++    exit 1;
+ fi
+ 
+ dnl Checks for library functions.
+@@ -181,7 +181,7 @@ AC_CHECK_LIB(net, libnet_build_ipv4,, LIBNET="no")
+ if test "$LIBNET" = "no"; then
+     echo ""
+     echo "Error: Can't find libnet 1.1.0 or greater. Visit https://github.com/sam-github/libnet for the latest version."
+-    exit;
++    exit 1;
+ fi
+ 
+ AC_ARG_WITH(libpcap_libraries,
+@@ -196,7 +196,7 @@ AC_CHECK_LIB(pcap, pcap_open_live,, LIBPCAP="no")
+ if test "$LIBPCAP" = "no"; then
+     echo ""
+     echo "Error: Can't find Libpcap. Visit https://github.com/the-tcpdump-group/libpcap for the latest version."
+-    exit;
++    exit 1;
+ else
+     AC_CHECK_LIB(pcap, pcap_setnonblock,, SETNONBLOCK="no")
+     if test "$SETNONBLOCK" = "no"; then

diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild
index 6f454fbc9ba..a1576a6b050 100644
--- a/net-analyzer/packit/packit-1.7.ebuild
+++ b/net-analyzer/packit/packit-1.7.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="network packet generator and capture tool"
@@ -19,6 +20,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0-noopt.patch
+	"${FILESDIR}"/${PN}-1.7-configure.patch
 )
 
 src_prepare() {