Remove net/sniffit. The code isn't too pleasant, no privsep, hasn't

been touched in 8 years, upstream has disappeared, has a hardcoded nic list missing almost everything modern, and doesn't build on some arch. "it won't make me cry" ajacoutot@
2008-06-14 19:02:58 +00:00 · 2008-06-14 19:02:58 +00:00 · 3c31df21d2
commit 3c31df21d2
parent d5aea44e40
10 changed files with 1 additions and 224 deletions
--- a/net/Makefile
+++ b/net/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.528 2008/06/12 21:35:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.529 2008/06/14 19:02:58 sthen Exp $
 # $FreeBSD: Makefile,v 1.129 1997/11/20 13:47:40 itojun Exp $
 #

@ -371,7 +371,6 @@
     SUBDIR += sirc
     SUBDIR += slirp
     SUBDIR += smokeping
-     SUBDIR += sniffit
     SUBDIR += snort
     SUBDIR += snort,mysql
     SUBDIR += snort,postgresql
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@ -1,43 +0,0 @@
-# $OpenBSD: Makefile,v 1.17 2007/09/15 22:36:59 merdely Exp $
-# $FreeBSD: Makefile,v 1.1.1.1 1998/04/04 04:58:25 obrien Exp $
-
-.if ${MACHINE_ARCH} == "alpha"
-BROKEN=		alignment issues
-.endif
-
-COMMENT=	packet sniffer program; for educational use
-
-DISTNAME=	sniffit.0.3.7.beta
-PKGNAME=	sniffit-0.3.7b
-CATEGORIES=	net security
-MASTER_SITES=	http://www.tengu.be/files/
-MASTER_SITES0=	http://ftp.debian.org/debian/dists/stable/main/source/net/ \
-   		http://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/dists/stable/main/source/net/
-
-PATCHFILES=	sniffit_0.3.7.beta-6.1.diff.gz:0
-PATCH_DIST_STRIP= -p1
-
-HOMEPAGE=	http://reptile.rug.ac.be/~coder/sniffit/sniffit.html
-
-PERMIT_PACKAGE_CDROM=	no obvious license
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	no obvious license
-PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c curses pcap 
-
-MAKE_FLAGS=	OBJ_FLAG="-w ${CFLAGS} -c" EXE_FLAG="-w ${CFLAGS} -o sniffit"
-
-CONFIGURE_STYLE= gnu
-
-ALL_TARGET=
-
-NO_REGRESS=	Yes
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sniffit
-	${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/sniffit.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/README.FIRST ${PREFIX}/share/doc/sniffit
-
-.include <bsd.port.mk>
--- a/net/sniffit/distinfo
+++ b/net/sniffit/distinfo
@ -1,10 +0,0 @@
-MD5 (sniffit.0.3.7.beta.tar.gz) = JpfMGIeEgBmf5tseYRNNWg==
-MD5 (sniffit_0.3.7.beta-6.1.diff.gz) = jE9PWJY1y0JP4jDKmB2RUA==
-RMD160 (sniffit.0.3.7.beta.tar.gz) = n/azsqyjwnIi8/ta0Nha215Ew1Y=
-RMD160 (sniffit_0.3.7.beta-6.1.diff.gz) = ONN+XPPKkkwK0zQW7dJp4H7ZKYE=
-SHA1 (sniffit.0.3.7.beta.tar.gz) = +7iX1ensUXRKFV1LoJDfFE6d+vk=
-SHA1 (sniffit_0.3.7.beta-6.1.diff.gz) = MXC1XgD9b3Ac72Wp8HR+uHLB0NE=
-SHA256 (sniffit.0.3.7.beta.tar.gz) = eLUTe+Rb3/c4Ul3uNRkIrguKeeLZmeM7NCeKSn/AjKA=
-SHA256 (sniffit_0.3.7.beta-6.1.diff.gz) = KBcJvhM0+bB3goF+HlN0jqRpyczqJtAuVBn8qTQF/Ko=
-SIZE (sniffit.0.3.7.beta.tar.gz) = 212419
-SIZE (sniffit_0.3.7.beta-6.1.diff.gz) = 17742
--- a/net/sniffit/patches/patch-Makefile.in
+++ b/net/sniffit/patches/patch-Makefile.in
@ -1,19 +0,0 @@
-$OpenBSD: patch-Makefile.in,v 1.2 2002/09/11 05:49:59 pvalchev Exp $
--- Makefile.in.orig	Sun Aug 27 02:26:50 2000
-+++ Makefile.in	Sun Aug 27 02:36:46 2000
-@@ -8,12 +8,12 @@
- SNIFFIT    = sniffit.0.3.7.c
- CC         = @CC@
- LIBS       = @LIBS@
-DEFS	   = @DEFS@
-+DEFS	   = @DEFS@ -DHAVE_LIBNCURSES
- OS_OPT     = @OS_OPT@
- OBJ_FLAG   = -w -O2 -c
-OBJ_OPT    = -I./libpcap -L./libpcap
-+#OBJ_OPT    = -I./libpcap -L./libpcap
- EXE_FLAG   = -w -O2 -o sniffit
-EXE_OPT    = -I./libpcap -L./libpcap -lpcap
-+EXE_OPT    = -lpcap
- EXE_OBJ    = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \
-              sn_logfile.o sn_resolv.o
- DEP_FILES  = sn_config.h ./libpcap/pcap.h sn_data.h sn_defines.h sn_plugins.h \
--- a/net/sniffit/patches/patch-configure
+++ b/net/sniffit/patches/patch-configure
@ -1,71 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2002/09/11 05:49:59 pvalchev Exp $
--- configure.orig	Thu Jul 16 10:17:10 1998
-+++ configure	Mon Sep  9 09:40:40 2002
-@@ -714,14 +714,14 @@ fi
- 
- NCURSES_PATH=/usr/include:/usr/include/ncurses:/usr/include/curses:/usr/local/include:/usr/local/include/ncurses:/usr/local/include/curses:./:./ncurses.h
- ncurses_warn=0
-echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6
-echo "configure:719: checking for main in -lncurses" >&5
-ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6
-+echo "configure:719: checking for main in -lcurses" >&5
-+ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
-LIBS="-lncurses  $LIBS"
-+LIBS="-lcurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 727 "configure"
- #include "confdefs.h"
-@@ -745,13 +745,13 @@ LIBS="$ac_save_LIBS"
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
- 
-  LIBS="-lncurses $LIBS"
-+  LIBS="-lcurses $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -759,7 +759,7 @@ ncurses_warn=1
- fi
- 
- 
-for ac_prog in ncurses.h
-+for ac_prog in curses.h
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -1374,6 +1374,14 @@ EOF
- 	OS_OPT=
- 	
-         ;;
-+openbsd*)
-+	cat >> confdefs.h <<\EOF
-+#define OPENBSD 1
-+EOF
-+
-+	OS_OPT=
-+	
-+        ;;
- netbsd*)
- 	cat >> confdefs.h <<\EOF
- #define NETBSD 1
-@@ -1682,7 +1690,7 @@ if test "$no_recursion" != yes; then
-     esac
-   done
- 
-  for ac_config_dir in libpcap; do
-+  for ac_config_dir in ; do
- 
-     # Do not complain, so a configure script can configure whichever
-     # parts of a large source tree are present.
--- a/net/sniffit/patches/patch-sn_data.h
+++ b/net/sniffit/patches/patch-sn_data.h
@ -1,44 +0,0 @@
-$OpenBSD: patch-sn_data.h,v 1.6 2004/02/29 19:22:13 pvalchev Exp $
--- sn_data.h.orig	1998-07-16 10:17:10.000000000 -0600
-+++ sn_data.h	2004-02-29 12:20:46.000000000 -0700
-@@ -43,6 +43,40 @@ char *NETDEV[]={"ed"};		
- int HEADSIZE[]={14}; 
- #endif
- 
-+#ifdef OPENBSD
-+#if defined(__i386__) || defined(__amd64__)
-+#define NETDEV_NR     33
-+char *NETDEV[]={"ppp","cnw","dc","de","ec","ef","eg","el","ep","ex","fea","fpa","fx","ie","le","ne","ray","rl","sf","sis","sk","sm","ste","ti","tl","tx","vr","wb","we","wi","wx","xe","xl"};
-+int HEADSIZE[]={4,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14};
-+#elif defined(__sparc__)
-+#define NETDEV_NR     6
-+char *NETDEV[]={"ppp","be","hme","ie","le","qe"};
-+int HEADSIZE[]={4,14,14,14,14,14};
-+#elif defined(__m68k__)
-+#define NETDEV_NR    9
-+char *NETDEV[]={"ppp","ae","ed","es","le","mc","ne","qn","sn"};
-+int HEADSIZE[]={4,14,14,14,14,14,14,14,14};
-+#elif defined(__mips__)
-+#define NETDEV_NR     6
-+char *NETDEV[]={"ppp","ec","ep","le","ne","we"};
-+int HEADSIZE[]={4,14,14,14,14,14};
-+#elif defined(__powerpc__)
-+#define NETDEV_NR    5
-+char *NETDEV[]={"ppp","bm","de","fxp","gm"};
-+int HEADSIZE[]={4,14,14,14,14};
-+#elif defined(__alpha__)
-+#define NETDEV_NR 23
-+char *NETDEV[]={"ppp","dc","de","ne","fxp","fpa","bge","stge","rl","vr","gx","sis","en","tl","le","lmc","wb","sf","ste","ti","skc","sk","an"};
-+int HEADSIZE[]={4,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14};
-+#elif defined(__vax__)
-+#define NETDEV_NR    2
-+char *NETDEV[]={"le","ze"};
-+int HEADSIZE[]={14,14};
-+#else
-+#error Unknown network devices for this OpenBSD architecture.
-+#endif
-+#endif
-+
- #ifdef BSDI				/* ppp: 4 or 0 ? */
- /*
- #define NETDEV_NR      2
--- a/net/sniffit/patches/patch-sn_resolv.c
+++ b/net/sniffit/patches/patch-sn_resolv.c
@ -1,12 +0,0 @@
-$OpenBSD: patch-sn_resolv.c,v 1.2 2002/09/11 05:49:59 pvalchev Exp $
--- sn_resolv.c.orig	Sun Aug 27 02:47:58 2000
-+++ sn_resolv.c	Sun Aug 27 02:48:28 2000
-@@ -2,6 +2,8 @@
- /*  - getaddrbyname: Godmar Back / Shudoh Kazuyuki                       */
- 
- #include "sn_defines.h"
-+#include <sys/types.h>
-+#include <netinet/in.h>
- #include <netdb.h>
- #include <arpa/inet.h>
- 
--- a/net/sniffit/patches/patch-sn_structs_h
+++ b/net/sniffit/patches/patch-sn_structs_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-sn_structs_h,v 1.1 2004/01/04 23:21:31 espie Exp $
--- sn_structs.h.orig	2004-01-05 00:18:57.000000000 +0100
-+++ sn_structs.h	2004-01-05 00:19:09.000000000 +0100
-@@ -67,7 +67,7 @@ struct shared_logged_conn            /* 
- struct snif_mask                                         /* struct for mask */
-   {
-   _32_bit source_ip, destination_ip;
-  _32_bit short source_port, destination_port;
-+  _32_bit source_port, destination_port;
-   };
- 
- /* (packet generation) */
--- a/net/sniffit/pkg/DESCR
+++ b/net/sniffit/pkg/DESCR
@ -1,5 +0,0 @@
-Sniffit is a network sniffer for TCP/UDP/ICMP packets. 
-
-Sniffit produces very detailed technical details about the packets flowing
-through your network (SEQ, ACK, TTL, Window, ...) and also packet content
-in different formats (hex or plain text, ...)
--- a/net/sniffit/pkg/PLIST
+++ b/net/sniffit/pkg/PLIST
@ -1,6 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:17:46 espie Exp $
-@man man/man5/sniffit.5
-@man man/man8/sniffit.8
-sbin/sniffit
-share/doc/sniffit/
-share/doc/sniffit/README.FIRST