Update to 2.0.8

Patches from Matthias Drochner (thanks !)

Version 2.0.8:
-------------
More fingerprints, signature cleanup.
p0fping.c and diagnostic queries added.
Socket ownership fix when dropping privs.
Some -O signatures.

Version 2.0.7:
--------------
Added -0 mode for port 0 wildcards in queries.
Added -e option to make p0f work on some boxes.
HDLC support added.
New fingerprints, including Windows Vista betas.
[BUG] Fixed timezone in logs after chroot().
[BUG] Unlikely command-line overflow with VLANs fixed.

Version 2.0.6:
--------------
[BUG] Fixed pcap naming madness.
Support for Cygwin.
More signatures. Plenty of -A sigs from Ryan Kruse.
[BUG] Fix to a command-line parsing snafu with sprintf; shame on me ;-)
Timestamps in masquerade detection.
Write PID to /var/run/p0f.pid

5 files changed, 30 insertions, 41 deletions

diff --git a/security/p0f/Makefile b/security/p0f/Makefile
index fe9b211baa6..f5a7006646f 100644
--- a/security/p0f/Makefile
+++ b/security/p0f/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:10 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2007/03/05 20:31:51 adrianp Exp $
 #
 
-DISTNAME=	p0f-2.0.5
-PKGREVISION=	1
+DISTNAME=	p0f-2.0.8
 CATEGORIES=	security net
 MASTER_SITES=	http://lcamtuf.coredump.cx/p0f/
 EXTRACT_SUFX=	.tgz
diff --git a/security/p0f/distinfo b/security/p0f/distinfo
index 0b18a603941..e7f96e17410 100644
--- a/security/p0f/distinfo
+++ b/security/p0f/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.15 2005/12/08 19:14:47 joerg Exp $
+$NetBSD: distinfo,v 1.16 2007/03/05 20:31:53 adrianp Exp $
 
-SHA1 (p0f-2.0.5.tgz) = fb11a4138cad903072e3c8ef33316ac22b4ef8f4
-RMD160 (p0f-2.0.5.tgz) = 34ee678aa721ee38959419808ed798aa23228a16
-Size (p0f-2.0.5.tgz) = 130002 bytes
-SHA1 (patch-aa) = 849aa2aaddb33ab522c9c02a6a4965684a58f03e
-SHA1 (patch-ab) = 8069422ebd8f35b03f398a434c7ac26111d087b1
-SHA1 (patch-ad) = 8263ac810b25c14a41d57cd6227bf78af1604800
+SHA1 (p0f-2.0.8.tgz) = 7b4d5b2f24af4b5a299979134bc7f6d7b1eaf875
+RMD160 (p0f-2.0.8.tgz) = 87d5b30d2d5e156b9fdcb026160155f413ce13d3
+Size (p0f-2.0.8.tgz) = 136877 bytes
+SHA1 (patch-aa) = f55e4b15edf6c1de1a799d09a2930f1fb3ece56b
+SHA1 (patch-ad) = 378d9480c88d9a447684323c4a59f3c2f6f10d74
diff --git a/security/p0f/patches/patch-aa b/security/p0f/patches/patch-aa
index f23c54cf62e..c416d765d17 100644
--- a/security/p0f/patches/patch-aa
+++ b/security/p0f/patches/patch-aa
@@ -1,15 +1,18 @@
-$NetBSD: patch-aa,v 1.7 2004/08/14 10:09:15 adrianp Exp $
+$NetBSD: patch-aa,v 1.8 2007/03/05 20:31:53 adrianp Exp $
 
---- mk/NetBSD.orig	2003-09-28 23:40:07.000000000 +0200
-+++ mk/NetBSD	2003-11-03 12:27:53.000000000 +0100
-@@ -7,10 +7,8 @@
- # (C) Copyright 2000-2004 by Michal Zalewski <lcamtuf@coredump.cx>
+--- mk/NetBSD.orig	2006-03-16 08:43:17.000000000 +0100
++++ mk/NetBSD
+@@ -7,12 +7,9 @@
+ # (C) Copyright 2000-2006 by Michal Zalewski <lcamtuf@coredump.cx>
  #
  
 -CC      = gcc
- LIBS	= -lpcap -I/usr/include/pcap -I/usr/local/include/pcap
+ LIBS	= -lpcap
  STRIP   = strip
--CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops
+-CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops \
+-          -DUSE_BPF=\"${USE_BPF}\" \
+-	  -I/usr/include/pcap -I/usr/local/include/pcap -I/usr/local/include
++CFLAGS  += -DUSE_BPF=\"${USE_BPF}\"
  FILE	= p0f
  TOOLS   = test/sendack test/sendack2 test/sendsyn
  
diff --git a/security/p0f/patches/patch-ab b/security/p0f/patches/patch-ab
deleted file mode 100644
index 9a7d9efd9ac..00000000000
--- a/security/p0f/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/12/08 19:14:47 joerg Exp $
-
---- p0f.c.orig	2005-12-08 19:10:32.000000000 +0000
-+++ p0f.c
-@@ -36,7 +36,9 @@
- #include <pcap.h>
- #include <signal.h>
- 
-+#ifndef __DragonFly__
- #include <net/bpf.h>
-+#endif
- #include <time.h>
- #include <ctype.h>
- 
diff --git a/security/p0f/patches/patch-ad b/security/p0f/patches/patch-ad
index 24b8208c4ce..7fa0c5dcd21 100644
--- a/security/p0f/patches/patch-ad
+++ b/security/p0f/patches/patch-ad
@@ -1,19 +1,21 @@
-$NetBSD: patch-ad,v 1.4 2004/08/14 10:09:15 adrianp Exp $
+$NetBSD: patch-ad,v 1.5 2007/03/05 20:31:53 adrianp Exp $
 
---- mk/SunOS.orig	2003-10-01 23:20:31.000000000 +0200
-+++ mk/SunOS	2003-11-03 12:35:15.000000000 +0100
-@@ -5,11 +5,9 @@
- # (C) Copyright 2000-2004 by Michal Zalewski <lcamtuf@coredump.cx>
+--- mk/SunOS.orig	2006-03-09 20:21:39.000000000 +0100
++++ mk/SunOS
+@@ -5,13 +5,9 @@
+ # (C) Copyright 2000-2006 by Michal Zalewski <lcamtuf@coredump.cx>
  #
  
 -CC      = gcc
--LIBS    = -lpcap -I/opt/local/include -L/opt/local/lib \
--          -I/usr/local/include -L/usr/local/lib -lsocket -lnsl 
+-LIBS    = -lpcap -L/opt/local/lib \
+-          -L/usr/local/lib -lsocket -lnsl 
 -CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops \
--          -DBYTE_ORDER=1234 -DBIG_ENDIAN=1234
+-          -DBYTE_ORDER=1234 -DBIG_ENDIAN=1234 \
+-	  -DUSE_BPF=\"${USE_BPF}\" \
+-	  -I/opt/local/include  -I/usr/local/include
 +#CC      = gcc
-+LIBS    = $(LDFLAGS) -lpcap -lsocket -lnsl
-+CFLAGS += -DBYTE_ORDER=1234 -DBIG_ENDIAN=1234
++LIBS    = $(LDFLAGS) -lpcap -lsocket -lnsl 
++CFLAGS  = -DBYTE_ORDER=1234 -DBIG_ENDIAN=1234 -DUSE_BPF=\"${USE_BPF}\"
  FILE    = p0f
  TOOLS   = test/sendack test/sendack2 test/sendsyn