Wed Mar 7 18:56:52 2012 UTC ()
Fix build on SunOS.


(hans)
diff -r1.17 -r1.18 pkgsrc/net/tcpdpriv/Makefile
diff -r1.7 -r1.8 pkgsrc/net/tcpdpriv/distinfo
diff -r0 -r1.1 pkgsrc/net/tcpdpriv/patches/patch-Makefile
diff -r1.5 -r1.6 pkgsrc/net/tcpdpriv/patches/patch-aa
cvs diff -r1.17 -r1.18 pkgsrc/net/tcpdpriv/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tcpdpriv/Makefile 2011/03/17 22:07:50 1.17
+++ pkgsrc/net/tcpdpriv/Makefile 2012/03/07 18:56:51 1.18
@@ -1,21 +1,27 @@ @@ -1,21 +1,27 @@
1# $NetBSD: Makefile,v 1.17 2011/03/17 22:07:50 zafer Exp $ 1# $NetBSD: Makefile,v 1.18 2012/03/07 18:56:51 hans Exp $
2 2
3DISTNAME= tcpd-tools-0.8 3DISTNAME= tcpd-tools-0.8
4PKGNAME= tcpdpriv-0.8 4PKGNAME= tcpdpriv-0.8
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= # ftp://tracer.csl.sony.co.jp/pub/mawi/tools/ 6MASTER_SITES= # ftp://tracer.csl.sony.co.jp/pub/mawi/tools/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Anonymize tcpdump traces 9COMMENT= Anonymize tcpdump traces
10 10
11PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
12 12
 13CFLAGS.SunOS+= -DSVR4 -DIPPROTO_IPV4=IPPROTO_ENCAP -DIP_OFFMASK=0x1fff
 14CFLAGS.SunOS+= -DARPOP_REVREQUEST=REVARP_REQUEST -DARPOP_REVREPLY=REVARP_REPLY
 15CFLAGS.SunOS+= -Du_int64_t=uint64_t -Du_int32_t=uint32_t
 16CFLAGS.SunOS+= -Du_int16_t=uint16_t -Du_int8_t=uint8_t
 17
13WRKSRC= ${WRKDIR}/${DISTNAME}/wide-tcpdpriv 18WRKSRC= ${WRKDIR}/${DISTNAME}/wide-tcpdpriv
14 19
15INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 20INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
16 21
17do-install: 22do-install:
18 ${INSTALL_PROGRAM} ${WRKSRC}/tcpdpriv ${DESTDIR}${PREFIX}/bin 23 ${INSTALL_PROGRAM} ${WRKSRC}/tcpdpriv ${DESTDIR}${PREFIX}/bin
19 ${INSTALL_MAN} ${WRKSRC}/tcpdpriv.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 24 ${INSTALL_MAN} ${WRKSRC}/tcpdpriv.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
20 25
 26.include "../../net/libpcap/buildlink3.mk"
21.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/net/tcpdpriv/distinfo (expand / switch to unified diff)

--- pkgsrc/net/tcpdpriv/distinfo 2012/01/08 15:05:58 1.7
+++ pkgsrc/net/tcpdpriv/distinfo 2012/03/07 18:56:52 1.8
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.7 2012/01/08 15:05:58 shattered Exp $ 1$NetBSD: distinfo,v 1.8 2012/03/07 18:56:52 hans Exp $
2 2
3SHA1 (tcpd-tools-0.8.tar.gz) = fe2abe15bbf9062833af9bec3745c751a8aa06df 3SHA1 (tcpd-tools-0.8.tar.gz) = fe2abe15bbf9062833af9bec3745c751a8aa06df
4RMD160 (tcpd-tools-0.8.tar.gz) = 876842cbb37ca65d4b955718abd5ef5c14810dee 4RMD160 (tcpd-tools-0.8.tar.gz) = 876842cbb37ca65d4b955718abd5ef5c14810dee
5Size (tcpd-tools-0.8.tar.gz) = 468856 bytes 5Size (tcpd-tools-0.8.tar.gz) = 468856 bytes
6SHA1 (patch-aa) = 43f625fdca8fa89da88a9fc5f796455723b6ea7c 6SHA1 (patch-Makefile) = 96ac3e3a0167807606a0f764467da84dcc55d90d
 7SHA1 (patch-aa) = 0470590f1baf8748a62d7542b70630478aa806c7
7SHA1 (patch-ab) = 2c939882835b80d1fb11aa3bedc50eb80cefdf2e 8SHA1 (patch-ab) = 2c939882835b80d1fb11aa3bedc50eb80cefdf2e
File Added: pkgsrc/net/tcpdpriv/patches/patch-Makefile
$NetBSD: patch-Makefile,v 1.1 2012/03/07 18:56:52 hans Exp $

--- Makefile.orig	2000-03-02 07:54:28.000000000 +0100
+++ Makefile	2012-03-07 19:45:53.802691270 +0100
@@ -29,7 +29,7 @@ CC = gcc
 
 #have-SVR4#LIBSVR4 = -lsocket -lnsl
 
-CFLAGS	= -g ${INCLUDES} ${WARNINGS} ${SVR4} ${OSF1} -DWIDE
+CFLAGS	+= -g ${INCLUDES} ${WARNINGS} ${SVR4} ${OSF1} -DWIDE
 
 SOURCES = tcpdpriv.c tcpdutil.c tcpdpriv.1 tcpdpriv.vtml \
 				attack50.tex Makefile.in configure INSTALL
cvs diff -r1.5 -r1.6 pkgsrc/net/tcpdpriv/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/tcpdpriv/patches/patch-aa 2012/01/08 15:05:58 1.5
+++ pkgsrc/net/tcpdpriv/patches/patch-aa 2012/03/07 18:56:52 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.5 2012/01/08 15:05:58 shattered Exp $ 1$NetBSD: patch-aa,v 1.6 2012/03/07 18:56:52 hans Exp $
2 2
3--- tcpdpriv.c.orig 2000-04-18 07:59:19.000000000 +0000 3--- tcpdpriv.c.orig 2000-04-18 07:59:19.000000000 +0000
4+++ tcpdpriv.c 4+++ tcpdpriv.c
5@@ -65,7 +65,7 @@ 5@@ -65,7 +65,7 @@
6 #endif /* defined(SVR4) */ 6 #endif /* defined(SVR4) */
7 #include <sys/param.h> 7 #include <sys/param.h>
8 #include <sys/time.h> 8 #include <sys/time.h>
9-#if !defined(SVR4) 9-#if !defined(SVR4)
10+#if 0 10+#if 0
11 #include <sys/ucred.h> 11 #include <sys/ucred.h>
12 #endif /* !defined(SVR4) */ 12 #endif /* !defined(SVR4) */
13 #include <sys/mount.h> 13 #include <sys/mount.h>
14@@ -78,7 +78,7 @@ 14@@ -78,7 +78,7 @@
@@ -19,54 +19,58 @@ $NetBSD: patch-aa,v 1.5 2012/01/08 15:05 @@ -19,54 +19,58 @@ $NetBSD: patch-aa,v 1.5 2012/01/08 15:05
19+#if 0 19+#if 0
20 #include <sys/mbuf.h> 20 #include <sys/mbuf.h>
21 #endif /* !defined(SVR4) */ 21 #endif /* !defined(SVR4) */
22 #include <netinet/in_systm.h> 22 #include <netinet/in_systm.h>
23@@ -90,7 +90,7 @@ 23@@ -90,7 +90,7 @@
24 #include <arpa/nameser.h> 24 #include <arpa/nameser.h>
25 #endif 25 #endif
26  26
27-#if !defined(sun) 27-#if !defined(sun)
28+#if 0 28+#if 0
29 #include <net/slcompress.h> 29 #include <net/slcompress.h>
30 #if !defined(osf1) 30 #if !defined(osf1)
31 #include <net/slip.h> 31 #include <net/slip.h>
32@@ -111,6 +111,10 @@ 32@@ -111,6 +111,14 @@
33  33
34 #include <pcap.h> 34 #include <pcap.h>
35  35
 36+#if defined(__sun)
 37+#include <sys/sysmacros.h>
 38+#endif
 39+
36+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ 40+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
37+#define statfs statvfs 41+#define statfs statvfs
38+#endif 42+#endif
39+ 43+
40 /* 44 /*
41 * deal with systems in which bpf_int32 and bpf_u_int32 are not defined 45 * deal with systems in which bpf_int32 and bpf_u_int32 are not defined
42 */ 46 */
43@@ -2491,10 +2495,10 @@ dlt_hdrlen(int dlt) 47@@ -2491,10 +2499,10 @@ dlt_hdrlen(int dlt)
44 } 48 }
45 } 49 }
46  50
47+static void usage(char *cmd); 51+static void usage(char *cmd);
48 static void 52 static void
49 verify_and_print_args(char *cmd) 53 verify_and_print_args(char *cmd)
50 { 54 {
51- static void usage(char *cmd); 55- static void usage(char *cmd);
52  56
53 lookup_init(&addr_propagate); 57 lookup_init(&addr_propagate);
54  58
55@@ -2759,7 +2763,7 @@ usage(char *cmd) 59@@ -2759,7 +2767,7 @@ usage(char *cmd)
56 int 60 int
57 main(int argc, char *argv[], char *envp[]) 61 main(int argc, char *argv[], char *envp[])
58 { 62 {
59- void bpf_dump(FILE *output, struct bpf_program *, int); 63- void bpf_dump(FILE *output, struct bpf_program *, int);
60+ void my_bpf_dump(FILE *output, struct bpf_program *, int); 64+ void my_bpf_dump(FILE *output, struct bpf_program *, int);
61 char *copy_argv(register char **argv); 65 char *copy_argv(register char **argv);
62 char *read_infile(char *fname); 66 char *read_infile(char *fname);
63 char *rfile, *wfile; 67 char *rfile, *wfile;
64@@ -2903,7 +2907,7 @@ main(int argc, char *argv[], char *envp[ 68@@ -2903,7 +2911,7 @@ main(int argc, char *argv[], char *envp[
65  69
66 /* dump? */ 70 /* dump? */
67 if (dflag) { 71 if (dflag) {
68- bpf_dump(stderr, &fcode, dflag); 72- bpf_dump(stderr, &fcode, dflag);
69+ my_bpf_dump(stderr, &fcode, dflag); 73+ my_bpf_dump(stderr, &fcode, dflag);
70 exit(0); 74 exit(0);
71 } 75 }
72  76