From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- net-analyzer/sngrep/Manifest | 3 +- net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch | 11 ++++++ net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild | 43 --------------------- net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild | 44 ++++++++++++++++++++++ 4 files changed, 57 insertions(+), 44 deletions(-) create mode 100644 net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch delete mode 100644 net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild create mode 100644 net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild (limited to 'net-analyzer/sngrep') diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest index 16350abc01d8..8e6747b4ea55 100644 --- a/net-analyzer/sngrep/Manifest +++ b/net-analyzer/sngrep/Manifest @@ -1,4 +1,5 @@ AUX sngrep-1.4.5-tinfo.patch 237 BLAKE2B 2ba30ab0828f475e790175d8c3dcd25160ff691194ebb6b8e86380251863b40ef52bd942cdd65c694b84bae8de8d216244f9ab5fa75066e640b8427099a39342 SHA512 7c47e530caa1c44f8452a536925fd1133a1f0aad3822117e5ce2e1b7b03307a90423d70bb031639305b638d4c6732d980f3dbe617adc489fd0c2b438354f5ce6 +AUX sngrep-1.4.6-stdin.patch 405 BLAKE2B 206e735df529efe81c3d272e8ccd7c3e759301c6b9ff8f607e3a60c4fc6f06f1ad8c61259b7353d42c991cc28daeffc376c121fc26cf1f60a01ab0deb3828412 SHA512 60766958dc218ee258902ec9944070539c272f2db5dfba638647e2d8942a8160745c3c5f11dd64af34cf8d3f258207e94b325ec0370a47628ce7cf628edadf4c DIST sngrep-1.4.6.tar.gz 235721 BLAKE2B e01f2a1d83b9147b99196f7ff2e5562552b16badc2ca634e63b2e2f5955a5d0328c9fcdb841f42a950899511a81fffd8eb64169758dc319875e3052d4359de93 SHA512 25c67e26158b140bded775b217f313ad5a6268684f03d0b9875ddd423d7548b50fa9c358346330d3873984f456aefa9401c2b0fdd136dd95061e34da6530bcc3 -EBUILD sngrep-1.4.6-r1.ebuild 839 BLAKE2B 57e97e07fea3d167fc9d21939792f4bf6ad65f655377c380308e670f2aaaf6bf89e73d69df8eabd855bda8f11c2c04ccb3a171562bd0347467f131791fc63b06 SHA512 edc380a679fd905062de3391db825e6a0ba1d8ccddc1e2fbb5acac1390483ce3066692d91d5b1e728e5e6991345666433c573d5562d667c26deb0560ee8ef2ca +EBUILD sngrep-1.4.6-r2.ebuild 878 BLAKE2B 8ea141c0d63a12b4b72ff587088421eacd286ca5848c808a6963b6683095bb498e384d6aec376969714e83165e816192b1727858109ed3ddf64baa1764772530 SHA512 6dfbeeb8760c22d90c691e662a73ab4688b3c21a8bf5ad646335d59bfff4c5ca547dfeb4062484ab0d5707fdf4c477628e951e0e5e6dbc466eeec116bd963060 MISC metadata.xml 468 BLAKE2B c4ecbf2a09c6361f3cdd82c6c2280d1885565eb1a834be6093b3acbde6ecad83b49026524c68b067bee7f2764dbf4d3bc73e7e8fc5d13ac499a04001c97b1b30 SHA512 def85ed081107978cef4e8cad0ce80a0717c5c644494ebb907a9a616ad571f13e518019d6d51447f05f1a9545c739dd31874d888cb06ce91ecc224fb2c40e446 diff --git a/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch b/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch new file mode 100644 index 000000000000..b61025d25b6e --- /dev/null +++ b/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch @@ -0,0 +1,11 @@ +--- a/src/capture.c ++++ b/src/capture.c +@@ -191,7 +191,7 @@ + + // Reopen tty for ncurses after pcap have used stdin + if (!strncmp(infile, "/dev/stdin", 10)) { +- if (!(stdin = freopen("/dev/tty", "r", stdin))) { ++ if (!(fstdin = freopen("/dev/tty", "r", stdin))) { + fprintf(stderr, "Failed to reopen tty while using stdin for capture."); + return 1; + } diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild deleted file mode 100644 index f11852bc421e..000000000000 --- a/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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:0=[unicode?] - openssl? ( dev-libs/openssl:0= ) - gnutls? ( net-libs/gnutls ) -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.5-tinfo.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.4.6-r2.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild new file mode 100644 index 000000000000..011fb09336bd --- /dev/null +++ b/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +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:0=[unicode?] + openssl? ( dev-libs/openssl:0= ) + gnutls? ( net-libs/gnutls ) +" +RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-1.4.5-tinfo.patch + "${FILESDIR}"/${PN}-1.4.6-stdin.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) +} -- cgit v1.2.3