gentoo resync : 09.07.2022

3 files changed, 132 insertions, 0 deletions

diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index 676829964867..a16cbf7aa863 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,5 +1,8 @@
 AUX sngrep-1.4.7-LDFLAGS.patch 290 BLAKE2B f15317a47b09dca8c0d28f2aa8c9bb96fdbb4f10cecfc0e5fb2f40d0cd98ad675471f793e46ff4092086b887c99bc7d6efea6d6170b3c7bb4d1db3e4032da5d3 SHA512 0c63147bcedab91a0b5a8c34b55a0c8ac11dfdd52f607b31658e8e8891963b87b8fdce8674f1eecf30829257006219c7ea42945fff5dce4502b62dcaf72505b3
 AUX sngrep-1.4.7-tinfo.patch 699 BLAKE2B 92943ef1b2b4b9bd0d0101667999ebbd7ef9dbfbfa4c2cc39a24f190e88482bbe6053813a8e32745565e3f61d3585207a540de823e715e4e0d1f013fd398ca0f SHA512 59276d306b6db2e5318f3b23c172b692b4f35884c7bf68f27a1a8636b2a5187dcdfbee58f11bee0a7de7afe068e0e1486d6a305d0b215a58627a041804452a4f
+AUX sngrep-1.5.0-bashisms.patch 2821 BLAKE2B d2f035182f8183870b16a4137f0abcc32776db01592a0432be8189be39ee0e5e627e01335766e2d656561e0ad5dc12be667b351ca551975678068d8cf7325765 SHA512 6c85cf1670b7b9f376e1409f833090bc5ba8aed705698dad5f82b782537804eac32f71a716a960c4ed042a3a81d4005acbd3cf1f0d171e00ce9c0094971be77d
 DIST sngrep-1.4.7.tar.gz 237978 BLAKE2B 30172748aeab2910e7fa13f35b447d7bd1688bb206576af6233c8c47405eb3fe93316cc72255169f19f3752e7fe3ada63c5c0bba0d9ab75706c1b0d3ac296474 SHA512 f414f9cc49b0c34cbbf5a77d285f12eb4091af3395953ed93dbe2f57d4ba3731d16c4b56c37e90744cf3784572975f485aed48cdd100898ffaee18e9a18943b1
+DIST sngrep-1.5.0.tar.gz 244965 BLAKE2B 85c8ddbbb5c81dfa886086543df9ccb6f4a297c95a23afddfcf1a359e4af19a1f37cd75136881aba07fd70c177737fa93440f04f97ed9ffd01afef3055971472 SHA512 20be55f80d029739b1db4c0ccbc028604019acd8ca45181eb9952759ced4f20549d991c2916c9d1c84c989ccb123cad44f545a9146471a79273c0a6053615fbe
 EBUILD sngrep-1.4.7-r1.ebuild 910 BLAKE2B d2a839a65c30f662def7cecf6c2dd3816a97d1affa8c23ac67f5ef04b881a4bda243ef7e9acaffcc6995015ab01b5a6f209dbfa743d594b0e13bf7ff54c15596 SHA512 000db85ac51346367bfe39630367839711aa31100e2725db8cca54f36b47e24ce136705d7a13d03d20ebbb81697c074a390df12540693f8b7f261fb90d1978d8
+EBUILD sngrep-1.5.0.ebuild 914 BLAKE2B 75b222192e6334bde5850937f11a8b3b8cdb2e0351c1bbcaea2179ffcede360902f4b10b094e3f641fda6104ebc6f80196ec3bce1f10539e09799a4bbfe4ba34 SHA512 b15fbf07226d7b5a3241c95a78539517f1dde107c8cce3e4cb9267db10f6dc1be9dd5fe42a059286e34fa5fb44d22e86b460ae3c4fc979e046d2bc20840c1037
 MISC metadata.xml 469 BLAKE2B f7089818921cdd0fd8e443e17928839dddea0efafba77fb6abc511aaffe66616c154dc9d8ad7422e0732334729980547aa514392f9d0467627d163c9cba15338 SHA512 42a9e042b858c16d34ba9a124f9d245134a1ed7f6593ae00736c0685c310eeac1d773aafbba529f153dbab5f766497bdc0bbdb2b8621f7feeb67af3eae9c2d63
diff --git a/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch b/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch
new file mode 100644
index 000000000000..ffcd38d2f7f3
--- /dev/null
+++ b/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch
@@ -0,0 +1,79 @@
+https://github.com/irontec/sngrep/pull/404
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,7 @@ AC_ARG_ENABLE([unicode],
+ 	[AC_SUBST(UNICODE, no)]
+ )
+ 
+-AS_IF([test "x$enable_unicode" == "xyes"], [
++AS_IF([test "x$enable_unicode" = "xyes"], [
+ 	# Ncurses with wide-character support
+ 	AC_DEFINE([WITH_UNICODE], [], [Compile With Unicode compatibility])
+ 
+@@ -123,7 +123,7 @@ AC_ARG_WITH([gnutls],
+     [AC_SUBST(WITH_GNUTLS, no)]
+ )
+ 
+-AS_IF([test "x$WITH_GNUTLS" == "xyes"], [
++AS_IF([test "x$WITH_GNUTLS" = "xyes"], [
+ 
+     m4_ifdef([PKG_CHECK_MODULES], [
+         PKG_CHECK_MODULES([LIBGNUTLS], [gnutls])
+@@ -160,8 +160,8 @@ AC_ARG_WITH([openssl],
+     [AC_SUBST(WITH_OPENSSL, no)]
+ )
+ 
+-AS_IF([test "x$WITH_OPENSSL" == "xyes"], [
+-	AS_IF([test "x$WITH_GNUTLS" == "xyes"], [
++AS_IF([test "x$WITH_OPENSSL" = "xyes"], [
++	AS_IF([test "x$WITH_GNUTLS" = "xyes"], [
+ 	    AC_MSG_ERROR([ GnuTLS and OpenSSL can not be enabled at the same time ])
+ 	], [])
+     m4_ifdef([PKG_CHECK_MODULES], [
+@@ -187,7 +187,7 @@ AC_ARG_WITH([pcre],
+     [AC_SUBST(WITH_PCRE, no)]
+ )
+ 
+-AS_IF([test "x$WITH_PCRE" == "xyes"], [
++AS_IF([test "x$WITH_PCRE" = "xyes"], [
+ 	AC_CHECK_HEADER([pcre.h], [], [
+ 	    AC_MSG_ERROR([ You need libpcre development files installed to compile with pcre support.])
+ 	])
+@@ -206,7 +206,7 @@ AC_ARG_ENABLE([ipv6],
+     [AC_SUBST(USE_IPV6, no)]
+ )
+ 
+-AS_IF([test "x$USE_IPV6" == "xyes"], [
++AS_IF([test "x$USE_IPV6" = "xyes"], [
+ 	AC_CHECK_HEADERS([netinet/in.h netinet/ip6.h], [], [
+ 	    AC_MSG_ERROR([ You dont seem to have ipv6 support (no ip6.h found).])
+ 	], [
+@@ -231,15 +231,15 @@ AC_ARG_ENABLE([eep],
+     [AC_SUBST(USE_EEP, no)]
+ )
+ 
+-AS_IF([test "x$USE_EEP" == "xyes"], [
++AS_IF([test "x$USE_EEP" = "xyes"], [
+ 	AC_DEFINE([USE_EEP],[],[Compile With EEP support])
+ ], [])
+ 
+ 
+ # Conditional Source inclusion 
+-AM_CONDITIONAL([WITH_GNUTLS], [test "x$WITH_GNUTLS" == "xyes"])
+-AM_CONDITIONAL([WITH_OPENSSL], [test "x$WITH_OPENSSL" == "xyes"])
+-AM_CONDITIONAL([USE_EEP], [test "x$USE_EEP" == "xyes"])
++AM_CONDITIONAL([WITH_GNUTLS], [test "x$WITH_GNUTLS" = "xyes"])
++AM_CONDITIONAL([WITH_OPENSSL], [test "x$WITH_OPENSSL" = "xyes"])
++AM_CONDITIONAL([USE_EEP], [test "x$USE_EEP" = "xyes"])
+ 
+ 
+ ######################################################################
+@@ -249,7 +249,7 @@ AC_ARG_ENABLE(logo,
+     [ enable_logo=$enableval],
+     [ enable_logo=yes])
+ 
+-AS_IF([test "x$enable_logo" == "xyes"], [
++AS_IF([test "x$enable_logo" = "xyes"], [
+     echo ''
+     echo ' ██╗██████╗  ██████╗ ███╗   ██╗████████╗███████╗ ██████╗'
+     echo ' ██║██╔══██╗██╔═══██╗████╗  ██║╚══██╔══╝██╔════╝██╔════╝'
diff --git a/net-analyzer/sngrep/sngrep-1.5.0.ebuild b/net-analyzer/sngrep/sngrep-1.5.0.ebuild
new file mode 100644
index 000000000000..af7e30fcebf6
--- /dev/null
+++ b/net-analyzer/sngrep/sngrep-1.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Ncurses SIP Messages flow viewer"
+HOMEPAGE="https://github.com/irontec/sngrep"
+SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eep gnutls pcre ssl unicode"
+
+# In next release, libpcre -> libpcre2
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:=[unicode(+)?]
+	ssl? (
+		!gnutls? ( dev-libs/openssl:= )
+		gnutls? ( net-libs/gnutls:= )
+	)
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-bashisms.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-ipv6
+
+		$(use_enable eep)
+		$(use_enable unicode)
+		$(use_with pcre)
+		$(use_with ssl $(usex gnutls gnutls openssl))
+	)
+
+	econf "${myeconfargs[@]}"
+}