update to 20110113b, new release pointed out by Brian Keefer who has

also worked with upstream to get some of the problems addressed by
patches fixed in the distribution instead, thanks!
This commit is contained in:
sthen 2011-01-14 08:23:21 +00:00
parent 269b8ad2d1
commit 7270b75cb9
4 changed files with 10 additions and 50 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:32 espie Exp $
# $OpenBSD: Makefile,v 1.6 2011/01/14 08:23:21 sthen Exp $
COMMENT = pcap-based DNS query monitor
DISTNAME = dnstop-20090128
REVISION = 0
DISTNAME = dnstop-20110113b
WRKDIST = ${WRKDIR}/${DISTNAME:S/b//}
CATEGORIES = net
MAINTAINER = Stuart Henderson <sthen@openbsd.org>
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += c curses pcap
WANTLIB += c ncurses pcap
USE_GROFF = Yes
CONFIGURE_STYLE = gnu dest

View File

@ -1,5 +1,5 @@
MD5 (dnstop-20090128.tar.gz) = gnoNICCxV7klQR3TC2/v8w==
RMD160 (dnstop-20090128.tar.gz) = qplecWPcyFdeWQZbzE1tkoEqrOU=
SHA1 (dnstop-20090128.tar.gz) = F+rJipBl6LJeoTqmW2R8KwkIUPE=
SHA256 (dnstop-20090128.tar.gz) = 28MqbAcpHYFZb7cZSRiAu09jwxCr1UXJ7rusXNY0+2w=
SIZE (dnstop-20090128.tar.gz) = 68132
MD5 (dnstop-20110113b.tar.gz) = hIsyGfDyDyWKp/J/Jkk8zg==
RMD160 (dnstop-20110113b.tar.gz) = zM3XBmU1ZWECxrnFd8mFQHgVjwY=
SHA1 (dnstop-20110113b.tar.gz) = opx7L1cRQ84+aEQIwQGs8ceTpps=
SHA256 (dnstop-20110113b.tar.gz) = LcAgHJGZFyTftSNwScbASbhZ9jPkzpAGjnzWUUI8Ry8=
SIZE (dnstop-20110113b.tar.gz) = 71424

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2009/08/26 08:36:03 sthen Exp $
--- configure.orig Tue Aug 25 16:26:23 2009
+++ configure Tue Aug 25 16:27:28 2009
@@ -4815,6 +4815,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+#include <pcap.h>
typedef struct bpf_timeval ac__type_new_;
int
main ()

View File

@ -1,8 +1,4 @@
$OpenBSD: patch-dnstop_c,v 1.3 2010/10/14 07:29:44 sthen Exp $
ns_r_refused comes from /usr/include/arpa/nameser.h on systems using
bind 9-based resolvers; REFUSED is equivalent.
$OpenBSD: patch-dnstop_c,v 1.4 2011/01/14 08:23:21 sthen Exp $
--- dnstop.c.orig Wed Jan 28 20:40:06 2009
+++ dnstop.c Thu Oct 14 08:23:37 2010
@@ -45,6 +45,7 @@ static const char *Version = "20090128";
@ -13,28 +9,3 @@ bind 9-based resolvers; REFUSED is equivalent.
#include <net/if_ppp.h>
#define PPP_ADDRESS_VAL 0xff /* The address byte value */
#define PPP_CONTROL_VAL 0x03 /* The control byte value */
@@ -1630,7 +1631,7 @@ RFC1918PtrFilter(FilterData *fd)
int
RcodeRefusedFilter(FilterData *fd)
{
- return ns_r_refused == fd->rcode ? 1 : 0;
+ return REFUSED == fd->rcode ? 1 : 0;
}
void
@@ -1839,6 +1840,7 @@ main(int argc, char *argv[])
fprintf(stderr, "pcap_setfilter failed\n");
exit(1);
}
+#if 0 /* breaks reading from capture files on OpenBSD */
/*
* non-blocking call added for Mac OS X bugfix. Sent by Max Horn. ref
* http://www.tcpdump.org/lists/workers/2002/09/msg00033.html
@@ -1848,6 +1850,7 @@ main(int argc, char *argv[])
fprintf(stderr, "pcap_setnonblock failed: %s\n", errbuf);
exit(1);
}
+#endif
switch (pcap_datalink(pcap)) {
case DLT_EN10MB:
handle_datalink = handle_ether;