gentoo resync : 07.08.2021

3 files changed, 89 insertions, 4 deletions

diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
index 8eda30ee1110..573dd4977aaa 100644
--- a/net-analyzer/nsat/Manifest
+++ b/net-analyzer/nsat/Manifest
@@ -1,4 +1,5 @@
 AUX nsat-1.5-amd64-compat.patch 1057 BLAKE2B 69b27007c793201c40ec99526000ff524c741cfefff65dbe49c5ddf05b5675daa3b67997abf17799982387c4425891fbc6afa762e778dc3b38fe6601ed41830c SHA512 e13248ff8ecbb7d659484d211959152cade74121a875f6141e512bbd8eb54495bfacd2acdc91334ab431e8c0f14c73f87297aa40fe98014f1d6c1f0ca04dd7f3
+AUX nsat-1.5-configure-dash.patch 2802 BLAKE2B 2a745404b301a5952146d6695e9f03432db9f03ed25b76ceb6afbd949da2029911d411ae54bd2bf140a21b5ed4355ac8d732c019a79181184a5174e0d05617c7 SHA512 dbbf452faf3577751d8fe3cc86ee70ac1971d210641455fa2f3093f3e57d002a28b4c9811ec78ebc30468a610ef14aec437e208a1aabbc49216da8cd2f055fb8
 AUX nsat-1.5-configure.patch 741 BLAKE2B 51904c7d4b64c1207fbe771ef28ebc72ff2cedbeb931723ba00592ce3a6c01051665dfd65f47ae0cc12ebecda34c60258a3833413b1ec272e02db07cb8e0dc28 SHA512 1134f09b9aa3d715d7c6ef93ee31ead345f3e761f8903a2e6de454b3182cb88811b5e1823b80feab8a87e6194672d0f6f0d00895569fbde23447bccec1a0c8f6
 AUX nsat-1.5-libtirpc.patch 977 BLAKE2B 4846aea97ef9ee6157e47531f306bd46cbc93ca380d47b347a5d6417814e219572ac7bb315d7e6f86453c88dca53a01980682698d8077e1e663f48960684db14 SHA512 509b6c0ecd545893ee49f810c54b11c5c8f527ce14acf92a282f9d993392ab1e40a807a5a4646eb7b62c80f7e21593f2996dc83d0636344ca4273209bdc551bc
 AUX nsat-1.5-lvalue-gcc4.patch 375 BLAKE2B afd39e903b900b7996ad650b1382f4e6a600bd38a04531c4dc7da1365cf635c4363677566d39242facd5a80bbca83474ff9be9fba0c9978944fa0cb8ac1a42d4 SHA512 4768bbc1e1e9ed2b4efe70ec55214827e2dfe59e9c838d8934fee43c886b386c5942e93d862c37f220bc5e019642b3d914e2fde175a2aeee4691c7933c1aa3b5
@@ -6,5 +7,5 @@ AUX nsat-1.5-misc.patch 2422 BLAKE2B 093cbcb9ec6201f6674a0d191db23fc462c9e6bcdf1
 AUX nsat-1.5-strip.patch 205 BLAKE2B ac4b4b54ff6f8cf1771f57497317040eb40be829c8bcbb03c2f063fcaa190419e74b8ff5481f8fab4332af223d9a8ba7526d793d084be1f1498d0046db820227 SHA512 3e8b312e704f08fbe86caea37a8491851474cb0b773a73f4b2995532086fefa85a5240f49084bb0e1195089bfbfa937e68c45c0908a2bb7f427775ccb4535e8e
 AUX nsat-1.5-va_list.patch 470 BLAKE2B 2ac6936d216b497ecbd47cc167f9f142fd6bf20f834b123ce6ace47d9fa999102f8606e856b55db4b03243c6a427931ee56092c5e0dbc8e9357b139f26e28892 SHA512 1963419110a34b826d27b5b34e22ae71906380bc8a2ce130d374c00ad91827fab3781e97aadf417613f042d195ee9e85e50b898befff82190c7e031276903baa
 DIST nsat-1.5.tgz 410603 BLAKE2B 083ac2879afae87d1282bb643d0988b2f858f9c934fe7a6e24407c0f5cf90ceba7be17aeeae8e7cb9d0f7a31cce171fed6382351ea8413b13d3e4343339f0c9c SHA512 1a5b8e88f7bcacdbe1144a719a2e446c0ea025ad4e5f8c79ccb939083308cd2c1b2c1f3d7ab3b791924d5855994cbc3fded95aa36df23c12fd76fc20341a87d0
-EBUILD nsat-1.5-r5.ebuild 1503 BLAKE2B 2bce733a813ea3f78db093ab937f232b44a8c8b28b102181c7bb3c2ea66113221a586cfc59a46065f402284335e3b6f748081141242d63d6e8f64a529526bfcd SHA512 004ad4e801b0fec631b2666925e90afbf0f03ec023f47d9e0942ebfe2d204efef64a966f98121b80c4db93dc603b154b704f18d5c9f0343856d6807abefdd4c9
+EBUILD nsat-1.5-r6.ebuild 1578 BLAKE2B 744ca4dbc0b2e8e92582d407deb0847d4d23abc8dd873d1f64c6554437b0e549aeb58fe93c699608406b3fa9ad0c619641b68e0b7ef14f8c77a924b1a3805822 SHA512 a33736564d9a97a0141cb463c42f820ff319e1831e30dfa4eddded09cbda1e56ffb947f4eea16b42f5f155988a3f5a1b5f26d080d0ee45f18d5f179d40e4abdb
 MISC metadata.xml 354 BLAKE2B 11fb6b027bd44e7d69a5fce125a5932c0ac66affaeed6a4b11d7bf21de87c2d480ed7eb640add9ffec5b3a8baf42e9d2361ac85f4a04d71ea7e374e5028a16a2 SHA512 a3a21d2657992bf6d01e9d184a19b4b25c56bc7125149847fad0118a9ceddddbbbdba00a31f57230efcb76491693ecf289770f2226a720cbc98b65a921c7ac11
diff --git a/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch b/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch
new file mode 100644
index 000000000000..af19ba293ddb
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch
@@ -0,0 +1,79 @@
+From eda78d802b11dd7c920cd8e0396ca064f34e2a8b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 5 Aug 2021 00:27:23 +0100
+Subject: [PATCH] Fix configure with non-bash (dash)
+
+---
+ configure.in | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 95c59da..b549092 100644
+--- a/configure.in
++++ b/configure.in
+@@ -10,7 +10,7 @@ AC_CONFIG_HEADER(src/libmix++/mix/lmconfig.h)
+ 
+ AC_PROG_CC
+ AC_MSG_CHECKING(accepted compiler flags)
+-if test $ac_cv_prog_gcc = yes; then
++if test x$ac_cv_prog_gcc = xyes; then
+     AC_MSG_RESULT(GNU CC/ANSI (good))
+ else
+     AC_MSG_RESULT(crappy :P)
+@@ -41,7 +41,7 @@ case "`${UNAME}`" in
+   AC_MSG_RESULT(found Linux. Ph33r.)
+   AC_DEFINE(HAVE_LINUX)
+   AC_DEFINE(MY_HDRINCL,3)
+-if test $LEETCC = yes; then
++if test x$LEETCC = xyes; then
+     CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DLINUX'
+ else
+     CCOPTS="${CFLAGS} -DLINUX"
+@@ -54,7 +54,7 @@ fi
+   AC_MSG_RESULT(found MAC OS X)
+   AC_DEFINE(HAVE_BSD)
+   AC_DEFINE(MY_HDRINCL,2)
+-if test $LEETCC = yes; then
++if test x$LEETCC = xyes; then
+    CCOPTS='-Wall -O -funroll-loops -ansi -fPIC -DBSD44 -DDARWIN'
+ else
+    CCOPTS='-DBSD44 -DOBSD'
+@@ -67,7 +67,7 @@ fi
+   AC_MSG_RESULT(found OpenBSD. Yay.)
+   AC_DEFINE(HAVE_BSD)
+   AC_DEFINE(MY_HDRINCL,2)
+-if test $LEETCC = yes; then
++if test x$LEETCC = xyes; then
+    CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44 -DOBSD'
+ else
+    CCOPTS='-DBSD44 -DOBSD'
+@@ -80,7 +80,7 @@ fi
+   AC_MSG_RESULT(found BSD. Yay.)
+   AC_DEFINE(HAVE_BSD)
+   AC_DEFINE(MY_HDRINCL,2)
+-if test $LEETCC = yes; then
++if test x$LEETCC = xyes; then
+     CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44'
+ else
+     CCOPTS='-DBSD44'
+@@ -95,7 +95,7 @@ fi
+   AC_DEFINE(MY_HDRINCL,2)
+   AC_CHECK_LIB(socket, socket, [ CLIB="$CLIB -lsocket " ], AC_MSG_ERROR(libsocket not found.))
+   AC_CHECK_LIB(nsl, gethostbyname, [ CLIB="$CLIB -lnsl " ], AC_MSG_ERROR(libnsl not found.))
+-if test $LEETCC = yes; then
++if test x$LEETCC = xyes; then
+     CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DSOLARIS'
+ else
+     CCOPTS='-DSOLARIS'
+@@ -169,7 +169,7 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS(fcntl.h unistd.h sys/select.h sys/time.h sys/types.h sys/socket.h stdarg.h std_args.h strings.h netdb.h netinet/in.h arpa/inet.h signal.h stdlib.h errno.h ctype.h sys/file.h sys/ioctl.h sys/signal.h sys/stream.h sys/dlpi.h sys/bufmod.h sys/stropts.h sys/param.h sys/termios.h sys/filio.h net/if.h netinet/in_systm.h netinet/ip.h netinet/ip_var.h netinet/ip_icmp.h sys/resource.h X11/Xlib.h)
+  
+ AC_C_BIGENDIAN
+- if test $ac_cv_c_bigendian = yes; then
++ if test x$ac_cv_c_bigendian = xyes; then
+   ENDIANESS1="#ifndef WORDS_BIGENDIAN"
+   ENDIANESS2="#define WORDS_BIGENDIAN	/* this is a big endian machine */"
+  else
+-- 
+2.32.0
+
diff --git a/net-analyzer/nsat/nsat-1.5-r5.ebuild b/net-analyzer/nsat/nsat-1.5-r6.ebuild
index 4e71eb08de62..0817289a2e6c 100644
--- a/net-analyzer/nsat/nsat-1.5-r5.ebuild
+++ b/net-analyzer/nsat/nsat-1.5-r6.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools toolchain-funcs
 
 DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
 HOMEPAGE="http://nsat.sourceforge.net/"
 SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +19,7 @@ RDEPEND="
 	dev-libs/libmix
 	net-libs/libnsl:0=
 	net-libs/libpcap
-	net-libs/libtirpc
+	net-libs/libtirpc:=
 	net-libs/rpcsvc-proto
 	X? (
 		dev-lang/tk:*
@@ -25,7 +27,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-configure.patch
 	"${FILESDIR}"/${P}-lvalue-gcc4.patch
@@ -34,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-va_list.patch
 	"${FILESDIR}"/${P}-libtirpc.patch
 	"${FILESDIR}"/${P}-amd64-compat.patch
+	"${FILESDIR}"/${P}-configure-dash.patch
 )
 
 src_prepare() {
@@ -48,6 +51,8 @@ src_prepare() {
 		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
 		src/lang.h || die
 
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }