Update to 1.1nb1 - avoid possible format string crash with -i '...%s...'.

No known security issues as not installed set{u,g}id

5 files changed, 60 insertions, 44 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index fa5baa6201c..2df6d02c2a2 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2000/09/19 20:00:03 agc Exp $
+# $NetBSD: Makefile,v 1.13 2000/10/20 11:02:59 abs Exp $
 
-DISTNAME=		ntop-1.1
+DISTNAME=		ntop-1.1nb1
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.unipi.it/pub/local/ntop/source/
 EXTRACT_SUFX=		-src.tar.gz
diff --git a/net/ntop/files/patch-sum b/net/ntop/files/patch-sum
index b479500451d..38ba0da45d7 100644
--- a/net/ntop/files/patch-sum
+++ b/net/ntop/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/09/19 20:00:04 agc Exp $
+$NetBSD: patch-sum,v 1.3 2000/10/20 11:03:00 abs Exp $
 
-MD5 (patch-ag) = 8ca6a97f727834a4d342c389eddfe609
-MD5 (patch-ah) = d691d08783f950d970ddc19212c2fa8d
+MD5 (patch-aa) = bc35939bcacdbd55e8c5b6808b634cd3
+MD5 (patch-ab) = 5f341d4a6d156c744269a62d433d1471
diff --git a/net/ntop/patches/patch-ag b/net/ntop/patches/patch-aa
index 01ccba2a1c0..7753839abb1 100644
--- a/net/ntop/patches/patch-ag
+++ b/net/ntop/patches/patch-aa
@@ -1,12 +1,7 @@
-$NetBSD: patch-ag,v 1.2 2000/09/19 20:00:04 agc Exp $
-
-Make sure CPPFLAGS is propagated through to build stage
-
-Do not install the program setuid or setgid, to avoid
-unsafe practices - see http://www.securityfocus.com/advisories/2520
+$NetBSD: patch-aa,v 1.5 2000/10/20 11:03:38 abs Exp $
 
 --- Makefile.in.orig	Mon May  3 09:03:10 1999
-+++ Makefile.in	Tue Sep 19 11:39:18 2000
++++ Makefile.in
 @@ -54,7 +54,7 @@
  DEFS = @DEFS@
  
diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab
new file mode 100644
index 00000000000..ee2b6c1bbd7
--- /dev/null
+++ b/net/ntop/patches/patch-ab
@@ -0,0 +1,53 @@
+$NetBSD: patch-ab,v 1.8 2000/10/20 11:03:38 abs Exp $
+
+--- ntop.c.orig	Wed Apr 28 18:49:00 1999
++++ ntop.c
+@@ -254,7 +254,7 @@
+   initIPServices();
+ 
+ #ifndef WIN32
+-  while ((op = getopt(argc, argv, "df:F:hr:i:p:l:nw:m:")) != EOF)
++  while ((op = getopt(argc, argv, "df:F:hr:i:p:l:nm:")) != EOF)
+     switch (op) {
+ 
+ #ifndef WIN32
+@@ -324,6 +324,7 @@
+       numericFlag++;
+       break;
+ 
++#if 0
+     case 'w':
+       if(!isdigit(optarg[0])) {
+ 	printf("FATAL ERROR: flag -w expects a numeric argument.\n");
+@@ -332,6 +333,7 @@
+       webMode++;
+       webPort = atoi(optarg);
+       break;
++#endif
+ 
+     default:
+       usage(0);
+@@ -392,7 +394,7 @@
+ #ifndef WIN32
+   /* Determine the device name if not specified */
+   if (device == NULL && (device = pcap_lookupdev(ebuf)) == NULL) {
+-    printf(ebuf);
++    printf("%s", ebuf);
+     return(-1);
+   }
+ 
+@@ -426,12 +428,12 @@
+   }
+ 
+   if (pcapPtr == NULL) {
+-    printf(ebuf);
++    printf("%s", ebuf);
+     return(-1);
+   }
+ 
+   if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
+-    printf(ebuf);
++    printf("%s", ebuf);
+     return(-1);
+   }
+ #else /* WIN32 */
diff --git a/net/ntop/patches/patch-ah b/net/ntop/patches/patch-ah
deleted file mode 100644
index df63e54cab4..00000000000
--- a/net/ntop/patches/patch-ah
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2000/09/19 20:00:04 agc Exp $
-
-Disable unsafe -w option
-
---- ntop.c	2000/09/19 10:37:40	1.1
-+++ ntop.c	2000/09/19 10:38:08
-@@ -254,7 +254,7 @@
-   initIPServices();
- 
- #ifndef WIN32
--  while ((op = getopt(argc, argv, "df:F:hr:i:p:l:nw:m:")) != EOF)
-+  while ((op = getopt(argc, argv, "df:F:hr:i:p:l:nm:")) != EOF)
-     switch (op) {
- 
- #ifndef WIN32
-@@ -324,6 +324,7 @@
-       numericFlag++;
-       break;
- 
-+#if 0
-     case 'w':
-       if(!isdigit(optarg[0])) {
- 	printf("FATAL ERROR: flag -w expects a numeric argument.\n");
-@@ -332,6 +333,7 @@
-       webMode++;
-       webPort = atoi(optarg);
-       break;
-+#endif
- 
-     default:
-       usage(0);
-