Sat Apr 7 09:23:11 2012 UTC ()
* fixes detection of ncurses.h
* let to exactly use system libpcap (fixes build with newer system libpcap).

Bump PKGREVISION.


(obache)
diff -r1.32 -r1.33 pkgsrc/net/sniffit/Makefile
diff -r1.11 -r1.12 pkgsrc/net/sniffit/distinfo
diff -r1.4 -r1.5 pkgsrc/net/sniffit/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/net/sniffit/patches/patch-ad
diff -r0 -r1.1 pkgsrc/net/sniffit/patches/patch-sn__interface.h
diff -r1.1 -r1.2 pkgsrc/net/sniffit/patches/patch-sniffit_h
cvs diff -r1.32 -r1.33 pkgsrc/net/sniffit/Makefile (expand / switch to unified diff)

--- pkgsrc/net/sniffit/Makefile 2010/02/11 22:47:49 1.32
+++ pkgsrc/net/sniffit/Makefile 2012/04/07 09:23:11 1.33
@@ -1,28 +1,35 @@ @@ -1,28 +1,35 @@
1# $NetBSD: Makefile,v 1.32 2010/02/11 22:47:49 joerg Exp $ 1# $NetBSD: Makefile,v 1.33 2012/04/07 09:23:11 obache Exp $
2# 2#
3 3
4DISTNAME= sniffit.0.3.5 4DISTNAME= sniffit.0.3.5
5PKGNAME= sniffit-0.3.5 5PKGNAME= sniffit-0.3.5
6PKGREVISION= 2 6PKGREVISION= 3
7CATEGORIES= net security 7CATEGORIES= net security
8MASTER_SITES= http://reptile.rug.ac.be/~coder/sniffit/files/ 8MASTER_SITES= http://reptile.rug.ac.be/~coder/sniffit/files/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://reptile.rug.ac.be/~coder/sniffit/sniffit.html 11HOMEPAGE= http://reptile.rug.ac.be/~coder/sniffit/sniffit.html
12COMMENT= Packet sniffer program 12COMMENT= Packet sniffer program
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16NOT_FOR_PLATFORM= *-*-alpha # severe LP64 loss 16NOT_FOR_PLATFORM= *-*-alpha # severe LP64 loss
17 17
18GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
19BUILD_TARGET= 19BUILD_TARGET=
20INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin 20INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
21 21
 22CONFIGURE_ENV+= NCURSES_LOCATION=${BUILDLINK_DIR}/include/ncurses.h
 23
 24post-extract:
 25 ${RM} -rf ${WRKSRC}/libpcap-0.3
 26 ${RM} -f ${WRKSRC}/pcap.h
 27
22do-install: 28do-install:
23 ${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${DESTDIR}${PREFIX}/sbin/sniffit 29 ${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${DESTDIR}${PREFIX}/sbin/sniffit
24 ${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 30 ${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
25 ${INSTALL_MAN} ${WRKSRC}/sniffit.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 31 ${INSTALL_MAN} ${WRKSRC}/sniffit.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
26 32
27.include "../../devel/ncurses/buildlink3.mk" 33.include "../../devel/ncurses/buildlink3.mk"
 34.include "../../net/libpcap/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/net/sniffit/distinfo (expand / switch to unified diff)

--- pkgsrc/net/sniffit/distinfo 2012/03/31 08:31:06 1.11
+++ pkgsrc/net/sniffit/distinfo 2012/04/07 09:23:11 1.12
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.11 2012/03/31 08:31:06 dholland Exp $ 1$NetBSD: distinfo,v 1.12 2012/04/07 09:23:11 obache Exp $
2 2
3SHA1 (sniffit.0.3.5.tar.gz) = df9183fca2eec29a56bcfdc68a983c4e7d57bf9d 3SHA1 (sniffit.0.3.5.tar.gz) = df9183fca2eec29a56bcfdc68a983c4e7d57bf9d
4RMD160 (sniffit.0.3.5.tar.gz) = 9508f357c6fe74a9147a735fd0eb419b9a1124eb 4RMD160 (sniffit.0.3.5.tar.gz) = 9508f357c6fe74a9147a735fd0eb419b9a1124eb
5Size (sniffit.0.3.5.tar.gz) = 197255 bytes 5Size (sniffit.0.3.5.tar.gz) = 197255 bytes
6SHA1 (patch-ab) = c8a384acf35ff0e51c2851e8eec7ee36d53a09bd 6SHA1 (patch-ab) = 146c4d57cb94aa66c9fee9075e141e8b1c4c6b32
7SHA1 (patch-ac) = 05ab42b3499edd550de6f1bb667adce34e26a503 7SHA1 (patch-ac) = 05ab42b3499edd550de6f1bb667adce34e26a503
8SHA1 (patch-ad) = 302391b40bbfe6f218136778738572109be3ce6b 8SHA1 (patch-ad) = 9eadda884f4575f5e5facd66e3d5a39b65e686f7
9SHA1 (patch-ae) = c430e434309135189de7b3e61e4d0a1e63e50426 9SHA1 (patch-ae) = c430e434309135189de7b3e61e4d0a1e63e50426
10SHA1 (patch-ah) = 50959ea602f9c31bd71a966b1c4b1903db2711d5 10SHA1 (patch-ah) = 50959ea602f9c31bd71a966b1c4b1903db2711d5
11SHA1 (patch-ai) = d8e5641d1fd729feea93d3b0a8b4d24e12ce9954 11SHA1 (patch-ai) = d8e5641d1fd729feea93d3b0a8b4d24e12ce9954
12SHA1 (patch-aj) = db87dccf1c952e188aebb7bbb699c6257287c87d 12SHA1 (patch-aj) = db87dccf1c952e188aebb7bbb699c6257287c87d
13SHA1 (patch-ak) = 6909bb66b1ce6f9a4a78b548d00c41b1b0845d56 13SHA1 (patch-ak) = 6909bb66b1ce6f9a4a78b548d00c41b1b0845d56
14SHA1 (patch-sn__cfgfile_c) = ae761ad7ec853d86a5dc458e47271125e8b75555 14SHA1 (patch-sn__cfgfile_c) = ae761ad7ec853d86a5dc458e47271125e8b75555
15SHA1 (patch-sn__cfgfile_h) = 40dd73a556d0a48576baaa00b7ab8be5fbbf48eb 15SHA1 (patch-sn__cfgfile_h) = 40dd73a556d0a48576baaa00b7ab8be5fbbf48eb
 16SHA1 (patch-sn__interface.h) = eaf9368a981ce18b579c26db0c574c7ff91f9b53
16SHA1 (patch-sn__logfile_c) = 07248e3ebd524a4f4f10f1d9b6aee33c70c5457f 17SHA1 (patch-sn__logfile_c) = 07248e3ebd524a4f4f10f1d9b6aee33c70c5457f
17SHA1 (patch-sniffit_h) = 84166a2ab540a1ab9ab5b5940c9dbd57514fea24 18SHA1 (patch-sniffit_h) = 7ccc919e4a2de6a23d5b04c6242a80d336baeb46
cvs diff -r1.4 -r1.5 pkgsrc/net/sniffit/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/sniffit/patches/patch-ab 2006/01/25 17:30:55 1.4
+++ pkgsrc/net/sniffit/patches/patch-ab 2012/04/07 09:23:11 1.5
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1$NetBSD: patch-ab,v 1.4 2006/01/25 17:30:55 joerg Exp $ 1$NetBSD: patch-ab,v 1.5 2012/04/07 09:23:11 obache Exp $
2 2
3--- configure.orig 1997-04-18 09:33:57.000000000 +0000 3--- configure.orig 1997-04-18 09:33:57.000000000 +0000
4+++ configure 4+++ configure
 5@@ -538,7 +538,7 @@ ac_config_guess=$ac_aux_dir/config.guess
 6 ac_config_sub=$ac_aux_dir/config.sub
 7 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 8
 9-subdirs="libpcap-0.3"
 10+subdirs=
 11
 12
 13 # Extract the first word of "gcc", so it can be a program name with args.
5@@ -996,7 +996,7 @@ cat >> confdefs.h <<EOF 14@@ -996,7 +996,7 @@ cat >> confdefs.h <<EOF
6 EOF 15 EOF
7  16
8  17
9-if test $ac_cv_sizeof_unsigned_long_int -ne 4; then 18-if test $ac_cv_sizeof_unsigned_long_int -ne 4; then
10+if test $ac_cv_sizeof_unsigned_long_int -lt 4; then 19+if test $ac_cv_sizeof_unsigned_long_int -lt 4; then
11 echo "unisigned short is NOT 4 bytes... quiting" 20 echo "unisigned short is NOT 4 bytes... quiting"
12 exit 21 exit
13 fi 22 fi
14@@ -1296,7 +1296,7 @@ EOF 23@@ -1296,7 +1296,7 @@ EOF
15 OS_OPT= 24 OS_OPT=
16  25
17 ;; 26 ;;
cvs diff -r1.3 -r1.4 pkgsrc/net/sniffit/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/sniffit/patches/patch-ad 1999/07/25 00:36:32 1.3
+++ pkgsrc/net/sniffit/patches/patch-ad 2012/04/07 09:23:11 1.4
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1$NetBSD: patch-ad,v 1.3 1999/07/25 00:36:32 hubertf Exp $ 1$NetBSD: patch-ad,v 1.4 2012/04/07 09:23:11 obache Exp $
2 2
3--- Makefile.in.BAK Mon Mar 30 09:38:19 1998 3--- Makefile.in.orig 1997-04-18 09:33:57.000000000 +0000
4+++ Makefile.in Mon Mar 30 09:38:50 1998 4+++ Makefile.in
5@@ -11,9 +11,9 @@ 5@@ -11,17 +11,16 @@ LIBS = @LIBS@
6 DEFS = @DEFS@ 6 DEFS = @DEFS@
7 OS_OPT = @OS_OPT@ 7 OS_OPT = @OS_OPT@
8 OBJ_FLAG = -w -O2 -c 8 OBJ_FLAG = -w -O2 -c
9-OBJ_OPT = -I./libpcap-0.3 -L./libpcap-0.3 9-OBJ_OPT = -I./libpcap-0.3 -L./libpcap-0.3
10+OBJ_OPT =  10+OBJ_OPT =
11 EXE_FLAG = -w -O2 -o sniffit 11 EXE_FLAG = -w -O2 -o sniffit
12-EXE_OPT = -I./libpcap-0.3 -L./libpcap-0.3 -lpcap 12-EXE_OPT = -I./libpcap-0.3 -L./libpcap-0.3 -lpcap
13+EXE_OPT = -lpcap $(LDFLAGS) 13+EXE_OPT = -lpcap $(LDFLAGS)
14 EXE_OBJ = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \ 14 EXE_OBJ = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \
15 sn_logfile.o 15 sn_logfile.o
16 DEP_FILES = sn_config.h pcap.h sn_data.h sn_defines.h sn_plugins.h \ 16-DEP_FILES = sn_config.h pcap.h sn_data.h sn_defines.h sn_plugins.h \
17@@ -21,7 +21,6 @@ 17+DEP_FILES = sn_config.h sn_data.h sn_defines.h sn_plugins.h \
 18 sn_packets.o \
18 sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o 19 sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o
19  20
20 sniffit: $(SNIFFIT) $(DEP_FILES) 21 sniffit: $(SNIFFIT) $(DEP_FILES)
21- cd libpcap-0.3; make; cd .. 22- cd libpcap-0.3; make; cd ..
22 $(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT)  23 $(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT)
23 strip sniffit 24 strip sniffit
24  25
25@@ -44,11 +43,7 @@ 26@@ -44,11 +43,7 @@ sn_generation.o: sn_generation.h sn_gene
26  27
27 #Clean up everthing... 28 #Clean up everthing...
28 clean: 29 clean:
29- cd libpcap-0.3; make clean; rm -f config.cache; cd .. 30- cd libpcap-0.3; make clean; rm -f config.cache; cd ..
30 rm -f config.cache 31 rm -f config.cache
31 rm -f config.status 32 rm -f config.status
32 rm -f config.log 33 rm -f config.log
33- rm -f ./libpcap-0.3/config.cache 34- rm -f ./libpcap-0.3/config.cache
34- rm -f ./libpcap-0.3/config.status 35- rm -f ./libpcap-0.3/config.status
35- rm -f ./libpcap-0.3/config.log 36- rm -f ./libpcap-0.3/config.log
36 rm -f *.o sniffit 37 rm -f *.o sniffit
File Added: pkgsrc/net/sniffit/patches/patch-sn__interface.h
$NetBSD: patch-sn__interface.h,v 1.1 2012/04/07 09:23:11 obache Exp $

- make const declarations internally consistent

--- sn_interface.h.orig	1997-04-18 09:33:58.000000000 +0000
+++ sn_interface.h
@@ -29,7 +29,7 @@ void sig_blocking(char, int);
 void stop_logging (void);
 int check_mask (const struct packetheader *,const unsigned char *, char *, 
 					char *, struct unwrap *);
-pcap_handler interactive_packethandler( char *, const struct packetheader *,
+pcap_handler interactive_packethandler(unsigned char *, const struct packetheader *,
                  		        const unsigned char *);
 void stop_packet_info (void);
 void packet_info_handler (int);
cvs diff -r1.1 -r1.2 pkgsrc/net/sniffit/patches/patch-sniffit_h (expand / switch to unified diff)

--- pkgsrc/net/sniffit/patches/patch-sniffit_h 2012/03/31 08:31:06 1.1
+++ pkgsrc/net/sniffit/patches/patch-sniffit_h 2012/04/07 09:23:11 1.2
@@ -1,22 +1,29 @@ @@ -1,22 +1,29 @@
1$NetBSD: patch-sniffit_h,v 1.1 2012/03/31 08:31:06 dholland Exp $ 1$NetBSD: patch-sniffit_h,v 1.2 2012/04/07 09:23:11 obache Exp $
2 2
3- move strlower to sn_cfgfile.h to make it visible in the right places 3- move strlower to sn_cfgfile.h to make it visible in the right places
4- my_exit should be file-static 4- my_exit should be file-static
5- update const to match changes to sniffit.0.3.5.c 5- update const to match changes to sniffit.0.3.5.c
6 6
7--- sniffit.h~ 1997-04-18 09:33:58.000000000 +0000 7--- sniffit.h.orig 1997-04-18 09:33:58.000000000 +0000
8+++ sniffit.h 8+++ sniffit.h
9@@ -15,14 +15,12 @@ void print_iphead (struct IP_header *, c 9@@ -9,20 +9,18 @@ pcap_handler packethandler(unsigned char
 10 const unsigned char *);
 11 int check_mask (const struct packetheader *,const unsigned char *, char *,
 12 char *,struct unwrap *);
 13-pcap_handler interactive_packethandler( char *, const struct packetheader *,
 14+pcap_handler interactive_packethandler( unsigned char *, const struct packetheader *,
 15 const unsigned char *);
 16 void print_iphead (struct IP_header *, char);
10 unsigned long getaddrbyname(char *); 17 unsigned long getaddrbyname(char *);
11 void quit (char *); 18 void quit (char *);
12 void reset_all (void); 19 void reset_all (void);
13-char *strlower (char *); 20-char *strlower (char *);
14 struct file_info *add_dynam (char *, char, char, unsigned long, int); 21 struct file_info *add_dynam (char *, char, char, unsigned long, int);
15 void delete_dynam (char *, char, char);  22 void delete_dynam (char *, char, char);
16-void record_buf(struct file_info *, unsigned long, char *, int, int); 23-void record_buf(struct file_info *, unsigned long, char *, int, int);
17+void record_buf(struct file_info *, unsigned long, const char *, int, int); 24+void record_buf(struct file_info *, unsigned long, const char *, int, int);
18 void sb_shift(struct file_info *);  25 void sb_shift(struct file_info *);
19-void sbuf_update(struct file_info *, unsigned long, char *, int); 26-void sbuf_update(struct file_info *, unsigned long, char *, int);
20+void sbuf_update(struct file_info *, unsigned long, const char *, int); 27+void sbuf_update(struct file_info *, unsigned long, const char *, int);
21 struct file_info *search_dynam(char *, char); 28 struct file_info *search_dynam(char *, char);
22-void my_exit (void); 29-void my_exit (void);