Update sniff to 2.0.

Fixes pkg/12209 by Riccardo Veraldi <veraldi@cs.unibo.it>

Changes since 1.0:
  *  directly uses libpcap functions and includes a few bug fixes to the
     previous code.  A few subroutines have been complitely rewritten.

6 files changed, 29 insertions, 33 deletions

diff --git a/security/sniff/Makefile b/security/sniff/Makefile
index 48897a589d2..71f92e367b2 100644
--- a/security/sniff/Makefile
+++ b/security/sniff/Makefile
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2001/03/13 13:59:14 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/13 14:14:40 zuntum Exp $
 #
 
-DISTNAME=	sniff-1.0
+DISTNAME=	sniff-2.0
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/	\
-		ftp://ftp.pl.freebsd.org/pub/FreeBSD/ports/distfiles/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	zuntum@netbsd.org
 COMMENT=	Program to sniff logins and passwords
 
-HAS_CONFIGURE=	YES
-
-MAKE_ENV+=	CC="${CC}" PREFIX="${PREFIX}"
+MAKE_ENV+=	"CC=${CC}" "PREFIX=${PREFIX}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/sniff/files/md5 b/security/sniff/files/md5
index 7a7e3f6b823..29aa1d10c76 100644
--- a/security/sniff/files/md5
+++ b/security/sniff/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2001/03/13 13:13:41 zuntum Exp $
+$NetBSD: md5,v 1.2 2001/03/13 14:14:41 zuntum Exp $
 
-SHA1 (sniff-1.0.tar.gz) = f4eed7b8736fb0de489593cfec627a8fbbd94e72
+SHA1 (sniff-2.0.tar.gz) = 9e9ef76eaccaa6cbb3c23054a29a08dd9faed328
diff --git a/security/sniff/files/patch-sum b/security/sniff/files/patch-sum
index 80bc0c5ae8d..c2ff5f057d9 100644
--- a/security/sniff/files/patch-sum
+++ b/security/sniff/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2001/03/13 13:13:41 zuntum Exp $
+$NetBSD: patch-sum,v 1.2 2001/03/13 14:14:41 zuntum Exp $
 
-SHA1 (patch-aa) = 240deb505a5f7f5b6e4d4c6a2f1d6738cfcf3a3e
+SHA1 (patch-aa) = e9b9dd7ade75d67a4d202b3deddd04d4593afe46
diff --git a/security/sniff/patches/patch-aa b/security/sniff/patches/patch-aa
index 906e84a2621..ecee8da9458 100644
--- a/security/sniff/patches/patch-aa
+++ b/security/sniff/patches/patch-aa
@@ -1,29 +1,28 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/13 13:13:41 zuntum Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/13 14:14:41 zuntum Exp $
 
---- Makefile.in.orig	Thu Dec 10 16:05:13 1998
-+++ Makefile.in
-@@ -1,12 +1,9 @@
--
+--- Makefile.orig	Thu Feb 15 13:47:36 2001
++++ Makefile
+@@ -1,13 +1,10 @@
+ # Makefile for NetBSD
+ 
 -CC=gcc
-+# CC, CFLAGS and PREFIX are passed via environment, so wipe them from here
  RM=rm
  CP=cp
--PREFIX=/usr/local
+-PREFIX=/usr/pkg
  INSTALL_DIR=${PREFIX}/sbin
- INSTALL_MAN=${PREFIX}/man/man1
+ INSTALL_MAN=${PREFIX}/man
  
--CFLAGS   = -g
- OBJS  =  sniff.o clear.o ifOpen.o lookupDNShost.o printData.o printHeader.o readPacket.o readTCP.o sniffData.o
+-CFLAGS   = -O2
+ OBJS  =  sniff2.o clear.o ifOpen.o lookupDNShost.o printData.o printHeader.o readTCP.o sniffData.o
  
  
-@@ -16,8 +13,8 @@
- 	$(CC) $(CFLAGS) -o sniff $(OBJS)
+@@ -17,8 +14,8 @@
+ 	$(CC) $(CFLAGS) -o sniff2 $(OBJS) -lpcap
  
  install:
--	$(CP) sniff $(INSTALL_DIR)
--	$(CP) sniff.1 $(INSTALL_MAN)
-+	$(BSD_INSTALL_PROGRAM) sniff $(INSTALL_DIR)
-+	$(BSD_INSTALL_MAN) sniff.1 $(INSTALL_MAN)
- 
+-	$(CP) sniff2 $(INSTALL_DIR)
+-	$(CP) sniff2.1 $(INSTALL_MAN)/man1
++	$(BSD_INSTALL_PROGRAM) sniff2 $(INSTALL_DIR)
++	$(BSD_INSTALL_MAN) sniff2.1 $(INSTALL_MAN)/man1
  clean: 
- 	$(RM)  $(OBJS) sniff
+ 	$(RM)  $(OBJS) sniff2
diff --git a/security/sniff/pkg/DESCR b/security/sniff/pkg/DESCR
index 21c5da3a8fb..ba8c704e25e 100644
--- a/security/sniff/pkg/DESCR
+++ b/security/sniff/pkg/DESCR
@@ -1,3 +1,3 @@
 This program filters the tcpump raw packet data looking for logins and
 passwords on the most commonly used tcp ports (ftp telnet pop3 ...).
-It dumps sniffed data to a file named sniff.log
+It dumps sniffed data to a file named sniff2.log
diff --git a/security/sniff/pkg/PLIST b/security/sniff/pkg/PLIST
index 8fd6bb8e880..d51279c117d 100644
--- a/security/sniff/pkg/PLIST
+++ b/security/sniff/pkg/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/13 13:13:41 zuntum Exp $
-sbin/sniff
-man/man1/sniff.1
+@comment $NetBSD: PLIST,v 1.2 2001/03/13 14:14:41 zuntum Exp $
+sbin/sniff2
+man/man1/sniff2.1