[gentoo-commits] repo/gentoo:master commit in: net-dns/dnstop/files/, net-dns/dnstop/

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnstop/files/, net-dns/dnstop/

[Michael Weber]

commit:     0cfa6146a1621e772c3dbbc1a5be2573fb424518
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 16:11:29 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 16:11:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfa6146

net-dns/dnstop: fix net-libs/libpcap[ipv6] situation, drop USE=ipv6, use pkg-config for ncurses[tinfo] (thanks lorem_ipsum and b4b1 <AT> free.fr, bug 595184).

Package-Manager: portage-2.2.28

 ...0140915-r1.ebuild => dnstop-20140915-r2.ebuild} | 19 +++++++-------
 .../dnstop/files/dnstop-20140915-pkg-config.patch  | 29 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/net-dns/dnstop/dnstop-20140915-r1.ebuild b/net-dns/dnstop/dnstop-20140915-r2.ebuild
similarity index 71%
rename from net-dns/dnstop/dnstop-20140915-r1.ebuild
rename to net-dns/dnstop/dnstop-20140915-r2.ebuild
index cb7eeef..ba7c1cc 100644
--- a/net-dns/dnstop/dnstop-20140915-r1.ebuild
+++ b/net-dns/dnstop/dnstop-20140915-r2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils flag-o-matic
+inherit autotools
 
 DESCRIPTION="Displays various tables of DNS traffic on your network"
 HOMEPAGE="http://dnstop.measurement-factory.com/"
@@ -13,22 +13,21 @@ SRC_URI="http://dnstop.measurement-factory.com/src/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
-IUSE="ipv6"
+IUSE=""
 
 RDEPEND="sys-libs/ncurses:0
-	net-libs/libpcap[ipv6?]"
+	net-libs/libpcap[ipv6(+)]"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}"-pkg-config.patch )
+
 src_prepare() {
-	epatch_user
+	default
+	eautoreconf
 }
 
 src_configure() {
-	if has_version sys-libs/ncurses:0[tinfo] ; then
-		append-libs -ltinfo	#bug 595068
-	fi
-	econf \
-		$(use_enable ipv6)
+	econf --enable-ipv6
 }
 
 src_install() {

diff --git a/net-dns/dnstop/files/dnstop-20140915-pkg-config.patch b/net-dns/dnstop/files/dnstop-20140915-pkg-config.patch
new file mode 100644
index 00000000..5ee18e0
--- /dev/null
+++ b/net-dns/dnstop/files/dnstop-20140915-pkg-config.patch
@@ -0,0 +1,29 @@
+diff -Naur dnstop-20140915-orig/configure.ac dnstop-20140915/configure.ac
+--- dnstop-20140915-orig/configure.ac	2016-09-25 19:36:25.222387686 +0100
++++ dnstop-20140915/configure.ac	2016-09-25 19:32:01.489612302 +0100
+@@ -11,10 +11,7 @@
+ AC_PROG_INSTALL
+ 
+ # Checks for libraries.
+-AC_CHECK_LIB([ncurses], [initscr])
+-if test "$ac_cv_lib_ncurses_initscr" != "yes" ; then
+-AC_CHECK_LIB([curses], [initscr])
+-fi
++PKG_CHECK_MODULES([ncurses], [ncurses])
+ AC_CHECK_LIB([pcap], [pcap_open_live])
+ AC_CHECK_LIB([socket], [main])
+ AC_CHECK_LIB([nsl], [main])
+diff -Naur dnstop-20140915-orig/Makefile.in dnstop-20140915/Makefile.in
+--- dnstop-20140915-orig/Makefile.in	2016-09-25 19:36:25.221387679 +0100
++++ dnstop-20140915/Makefile.in	2016-09-25 19:37:39.333887436 +0100
+@@ -2,8 +2,8 @@
+ 
+ OPTFLAGS=@OPTFLAGS@
+ CC=@CC@
+-CFLAGS=@CFLAGS@ ${OPTFLAGS}
+-LIBS=@LIBS@
++CFLAGS=@CFLAGS@ @ncurses_CFLAGS@ ${OPTFLAGS}
++LIBS=@LIBS@ @ncurses_LIBS@
+ LDFLAGS=@LDFLAGS@
+ 
+ prefix=@prefix@

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnstop/files/, net-dns/dnstop/

[Ulrich Müller]

commit:     64a6be1aa26c3736e84f2956dd634a44dc2bb98b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Sep 28 17:33:07 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 11:21:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a6be1a

net-dns/dnstop: EAPI8 bump, update HOMEPAGE, SRC_URI, fix #717202

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>

Closes: https://bugs.gentoo.org/717202
Bug: https://bugs.gentoo.org/907753
[Paths in patch adjusted.]
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-dns/dnstop/dnstop-20140915-r3.ebuild           | 39 ++++++++++++++++++++++
 .../dnstop/files/dnstop-20140915-musl-fix.patch    | 16 +++++++++
 net-dns/dnstop/metadata.xml                        |  2 ++
 3 files changed, 57 insertions(+)

diff --git a/net-dns/dnstop/dnstop-20140915-r3.ebuild b/net-dns/dnstop/dnstop-20140915-r3.ebuild
new file mode 100644
index 000000000000..fd94f6164029
--- /dev/null
+++ b/net-dns/dnstop/dnstop-20140915-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Displays various tables of DNS traffic on your network"
+HOMEPAGE="https://github.com/measurement-factory/dnstop"
+SRC_URI="http://dns.measurement-factory.com/tools/dnstop/src/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+
+RDEPEND="sys-libs/ncurses:0
+	net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-pkg-config.patch
+	"${FILESDIR}/${P}"-musl-fix.patch
+	)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags -D_GNU_SOURCE
+	econf --enable-ipv6
+}
+
+src_install() {
+	dobin dnstop
+	doman dnstop.8
+	dodoc CHANGES
+}

diff --git a/net-dns/dnstop/files/dnstop-20140915-musl-fix.patch b/net-dns/dnstop/files/dnstop-20140915-musl-fix.patch
new file mode 100644
index 000000000000..ddd1687c469e
--- /dev/null
+++ b/net-dns/dnstop/files/dnstop-20140915-musl-fix.patch
@@ -0,0 +1,16 @@
+Fixes compilation with musl
+Patch by Natanael Copa
+https://gitlab.alpinelinux.org/alpine/aports/-/issues/2890
+https://bugs.gentoo.org/717202
+
+--- a/dnstop.c
++++ b/dnstop.c
+@@ -69,7 +69,7 @@
+ #define ETHERTYPE_IPV6 0x86DD
+ #endif
+ 
+-#if defined(__linux__) || defined(__GLIBC__) || defined(__GNU__)
++#if defined(__GLIBC__) || defined(__GNU__)
+ #define uh_dport dest
+ #define uh_sport source
+ #endif

diff --git a/net-dns/dnstop/metadata.xml b/net-dns/dnstop/metadata.xml
index 08133e9b29b5..806de5e7629e 100644
--- a/net-dns/dnstop/metadata.xml
+++ b/net-dns/dnstop/metadata.xml
@@ -5,5 +5,7 @@
   <upstream>
     <changelog>http://dns.measurement-factory.com/tools/dnstop/src/CHANGES</changelog>
     <doc>http://dns.measurement-factory.com/tools/dnstop/dnstop.8.html</doc>
+    <remote-id type="github">measurement-factory/dnstop</remote-id>
+    <bugs-to>https://github.com/measurement-factory/dnstop/issues</bugs-to>
   </upstream>
 </pkgmetadata>