gentoo auto-resync : 18:12:2022 - 09:41:22

8 files changed, 3 insertions, 220 deletions

diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index 39e45cca8f60..ce04655a0612 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,10 +1,3 @@
-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
 DIST sngrep-1.6.0.tar.gz 248091 BLAKE2B a08c50d87d43f49f24494a85b8f4d72f24a649050ab696cabd087a39bd64532a9e7ed137ccaacecddce8ef22c960fc43f5372c9b13817eae26dd06b711363e3b SHA512 bca3192e1aacf4152f566925fd075dfd957cbe87017c8258303c8689f1221ea082f337866db45cb5ada0629f7cc4b66ce73b74a911d230c63d10fefa19aaebe3
-EBUILD sngrep-1.4.7-r1.ebuild 910 BLAKE2B d2a839a65c30f662def7cecf6c2dd3816a97d1affa8c23ac67f5ef04b881a4bda243ef7e9acaffcc6995015ab01b5a6f209dbfa743d594b0e13bf7ff54c15596 SHA512 000db85ac51346367bfe39630367839711aa31100e2725db8cca54f36b47e24ce136705d7a13d03d20ebbb81697c074a390df12540693f8b7f261fb90d1978d8
-EBUILD sngrep-1.5.0.ebuild 914 BLAKE2B 75b222192e6334bde5850937f11a8b3b8cdb2e0351c1bbcaea2179ffcede360902f4b10b094e3f641fda6104ebc6f80196ec3bce1f10539e09799a4bbfe4ba34 SHA512 b15fbf07226d7b5a3241c95a78539517f1dde107c8cce3e4cb9267db10f6dc1be9dd5fe42a059286e34fa5fb44d22e86b460ae3c4fc979e046d2bc20840c1037
-EBUILD sngrep-1.6.0.ebuild 862 BLAKE2B 69fe6e51473583d23d77c092ff7b6fbf54de1cec53f0a619e3d2dce37da8667eb401bd0ee7a6b168bb395afe4ab16093ced8b4d52f1fd5d7c3600d4e90b87ce1 SHA512 b85d3e7a35a37a1bb4d0e2d1ddab6ddde6e3cafba8274992ac0be355ea0c336f02e590b52342e09c084edfcb5c80433a7662a9f1e5ac3331883920df515b8692
-MISC metadata.xml 560 BLAKE2B 9cb2c1875c153efdefe1dd06f5f6b3dd04aa90a5b07450bc47cd40002de94fd138d94c7132d9a634dd942a136252aa0439796722411d9c3709f8ee5c9019f2a0 SHA512 d5acc8af69c7483ec2c0870f7ff3586f6e46196aec0ed735647da79bc4a627427eae9b7baac9eb96abb2ae64093117b93c17a981656148f0a832286ea2ad53cd
+EBUILD sngrep-1.6.0-r1.ebuild 878 BLAKE2B e65118d52a01866a4cbb8484deac943bca129b80ead7335de22aa333bb1fa2a56c755cc9ab9253b27bec6c281d12541df999b6ce9743a493780d2ea9ec7c92af SHA512 2dc5e5ff66dd11633f6494e44431a7f1652c8bfae970351082e5556c213cf55779e577e235635806a164abdf65d6b6db68b688a062d0c899efe341a8cbce39e2
+MISC metadata.xml 468 BLAKE2B 7b8e43ef6cb3bd733bc3321a2f5436b43bd846def6ac09d648e09bfe412a2cbb8f2b8d26cdb2721a2e44c33a183c4ab1d60e5fc9f899d7b8bbc0beac4e19abf5 SHA512 f6614eac2fdb609c8bd4ca7f3719b672a300ea52f96906c5ca6de204c345dbc80b5ec9e673046c24031b96118d0c70168c290fcdfda0063e7bd4493e6f7e58ae
diff --git a/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch b/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch
deleted file mode 100644
index 3e63dc245dab..000000000000
--- a/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/sngrep.m4
-+++ b/m4/sngrep.m4
-@@ -44,7 +44,7 @@
-          LIBS="$sngrep_config_script $LIBS "
-          sngrep_script_success=yes
-       ], [])
--      LDFLAGS="$save_LDFLAGS"
-+      LDFLAGS="$sngrep_save_LDFLAGS"
-    fi
-    if test "x$sngrep_script_success" = xno; then
-       [$5]
diff --git a/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch b/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch
deleted file mode 100644
index 8a01eeb2560b..000000000000
--- a/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,6 +74,10 @@
- 	AC_CHECK_LIB([menuw], [new_item], [], [
- 	    AC_MSG_ERROR([ You need to have ncurses menuw library installed to compile sngrep.])
- 	])
-+
-+	AC_SEARCH_LIBS([keyname], [tinfow], [], [
-+	    AC_MSG_ERROR([ You need to have ncurses tinfow library installed to compile sngrep.])
-+	])
- 	], [
- 
- 	# Ncurses without wide-character support
-@@ -96,6 +100,10 @@
- 	AC_CHECK_LIB([menu], [new_item], [], [
- 	    AC_MSG_ERROR([ You need to have ncurses menu library installed to compile sngrep.])
- 	])
-+
-+	AC_SEARCH_LIBS([keyname], [tinfo], [], [
-+	    AC_MSG_ERROR([ You need to have ncurses tinfo library installed to compile sngrep.])
-+	])
- ])
- 
- ####
diff --git a/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch b/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch
deleted file mode 100644
index ffcd38d2f7f3..000000000000
--- a/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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/metadata.xml b/net-analyzer/sngrep/metadata.xml
index 2c8180a3d655..6891786f5ba3 100644
--- a/net-analyzer/sngrep/metadata.xml
+++ b/net-analyzer/sngrep/metadata.xml
@@ -7,7 +7,6 @@
 	<use>
 		<flag name="eep">Enable EEP packet send/receive support</flag>
 		<flag name="gnutls">Use <pkg>net-libs/gnutls</pkg> to parse captured TLS packets</flag>
-		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> to parse captured TLS packets</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">irontec/sngrep</remote-id>
diff --git a/net-analyzer/sngrep/sngrep-1.4.7-r1.ebuild b/net-analyzer/sngrep/sngrep-1.4.7-r1.ebuild
deleted file mode 100644
index 3af1d0702e40..000000000000
--- a/net-analyzer/sngrep/sngrep-1.4.7-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 ipv6 openssl pcre unicode"
-REQUIRED_USE="
-	gnutls? ( !openssl )
-"
-
-DEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:=[unicode(+)?]
-	openssl? ( dev-libs/openssl:0= )
-	gnutls? ( net-libs/gnutls )
-	pcre? ( dev-libs/libpcre )
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.7-tinfo.patch
-	"${FILESDIR}"/${PN}-1.4.7-LDFLAGS.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable eep) \
-		$(use_enable ipv6) \
-		$(use_enable unicode) \
-		$(use_with gnutls) \
-		$(use_with openssl) \
-		$(use_with pcre)
-}
diff --git a/net-analyzer/sngrep/sngrep-1.5.0.ebuild b/net-analyzer/sngrep/sngrep-1.5.0.ebuild
deleted file mode 100644
index af7e30fcebf6..000000000000
--- a/net-analyzer/sngrep/sngrep-1.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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[@]}"
-}
diff --git a/net-analyzer/sngrep/sngrep-1.6.0.ebuild b/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild
index aedd0cf3f8d1..89771013483f 100644
--- a/net-analyzer/sngrep/sngrep-1.6.0.ebuild
+++ b/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild
@@ -36,7 +36,7 @@ src_configure() {
 	local myeconfargs=(
 		--enable-ipv6
 		--enable-unicode
-
+		--without-pcre
 		$(use_enable eep)
 		$(use_with pcre pcre2)
 		$(use_with ssl $(usex gnutls gnutls openssl))