commit: ddaabdfd0ab9f3872d3ea5ede70b9e7462579aed Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Dec 18 04:04:11 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Dec 18 04:04:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddaabdfd
net-analyzer/sngrep: drop 1.4.7-r1, 1.5.0 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/sngrep/Manifest | 2 - .../sngrep/files/sngrep-1.4.7-LDFLAGS.patch | 11 --- net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch | 24 ------- .../sngrep/files/sngrep-1.5.0-bashisms.patch | 79 ---------------------- net-analyzer/sngrep/metadata.xml | 1 - net-analyzer/sngrep/sngrep-1.4.7-r1.ebuild | 45 ------------ net-analyzer/sngrep/sngrep-1.5.0.ebuild | 50 -------------- 7 files changed, 212 deletions(-) diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest index 889a077f0371..8a4dffff00ae 100644 --- a/net-analyzer/sngrep/Manifest +++ b/net-analyzer/sngrep/Manifest @@ -1,3 +1 @@ -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 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[@]}" -}
