gentoo resync : 20.10.2021

3 files changed, 71 insertions, 1 deletions

diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index ae28a041ab63..5be4a990e976 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,5 +1,6 @@
 AUX packit-1.0-noopt.patch 214 BLAKE2B a0f981b13b21f9e6f37f87f69e36aa41c68c6c3fefc3337a7864d7e554315de555304c0f76227870a0b498d5301438038c175f66d908e5cd470407c79717fe40 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3
+AUX packit-1.7-configure.patch 2331 BLAKE2B 0d679c4361d9cc66bb15dcb4d8d6df86d6c4790919bc49f898ec9f489a6e7535db9d1887db30664c6119948701d048cbd0dfd3272be7ecab89fc04b5fb01d41b SHA512 dd82380b482e72fbbf8678cfc21e4117512b35e62946f9600f57710158f45152b61e712e487c07100fa2b5ce1a84f86af7c5092bcaba5bdea9308ea076119d41
 DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd
-EBUILD packit-1.7.ebuild 654 BLAKE2B ec4aa17e5bc33fa3279f9b04145ef3f58161b05375bfd12ad42c23a3f1b17a3109d8ce3e92ad3113e5b0207c998d26d285c4c98ef6b0ea910b6370ac3562f4ab SHA512 7da31bfabc6ab3147ad4e6a9f2e70b382091d1aca47a7e04e3080597c438611f3f6d8b20e782cff63acc66edf549e5b35eb1a2ba5db4b0f843ae379eb3795913
+EBUILD packit-1.7.ebuild 696 BLAKE2B 79f017339ebf1f13cbad3d3520700602667d85e1e56fb6018cf0f71ae75aa46618336ea23a578e7e4a600c469f08c5adc46b1f2068d18b0f30eaaa1a601025fb SHA512 00dc5a054a9ec939fab3ba7f5b01bdc665045b9ec5cbf2a2ec8ae9db78d51d9e45878eca34ffa8acf1cd0b245ef3b20f49a89d6184b1e375b9dd788f1c4dd464
 EBUILD packit-9999.ebuild 582 BLAKE2B a7015c50254810d82f6dcb12a2cdd05ca8893b39ef0de4d59acf8a54147b026821c23947228832d2303a128cea35c068f14b2da1cfa4e681fe2ee1647760baa4 SHA512 4d332811932801f9f330247ffc136b3c869d4c0788d7c1433be903cc3faf44916c0f219197e367cfe175829facd7bd988aab6307a5cbf9a27e034b607f44cb16
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
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 000000000000..0f87f0408d8e
--- /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@gentoo.org>
+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@gentoo.org>
+--- 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@gentoo.org>
+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@gentoo.org>
+--- 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 6f454fbc9ba2..a1576a6b050e 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() {