Mon Jan 30 16:13:21 2012 UTC ()
New files imported from IPFilter 5.1.1 need to be added.


(darrenr)
diff -r1.33 -r1.34 src/usr.sbin/ipf/ipftest/Makefile
diff -r1.9 -r1.10 src/usr.sbin/ipf/libipf/Makefile
cvs diff -r1.33 -r1.34 src/usr.sbin/ipf/ipftest/Attic/Makefile (switch to unified diff)

--- src/usr.sbin/ipf/ipftest/Attic/Makefile 2008/10/25 22:27:39 1.33
+++ src/usr.sbin/ipf/ipftest/Attic/Makefile 2012/01/30 16:13:21 1.34
@@ -1,105 +1,105 @@ @@ -1,105 +1,105 @@
1# $NetBSD: Makefile,v 1.33 2008/10/25 22:27:39 apb Exp $ 1# $NetBSD: Makefile,v 1.34 2012/01/30 16:13:21 darrenr Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= ipftest 5PROG= ipftest
6SRCS= ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \ 6SRCS= ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c ip_nat6.c \
7 ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \ 7 ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \
8 ip_pool.c ip_scan.c ip_sync.c \ 8 ip_dstlist.c ip_pool.c ip_sync.c \
9 ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \ 9 ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \
10 ipf_l.c ipnat_y.c ipnat_l.c md5.c radix.c bpf_filter.c 10 ipf_l.c ipnat_y.c ipnat_l.c md5.c radix_ipf.c bpf_filter.c
11MAN= ipftest.1 11MAN= ipftest.1
12 12
13CPPFLAGS+= -DIPFILTER_LOG -DIPFILTER_LOOKUP \ 13CPPFLAGS+= -DIPFILTER_LOG -DIPFILTER_LOOKUP \
14 -DIPFILTER_SCAN -DIPFILTER_SYNC -DIPFILTER_CKSUM \ 14 -DIPFILTER_SYNC -DIPFILTER_CKSUM \
15 -I. 15 -I.
16 16
17COPTS.radix.c= -Wno-error 17COPTS.radix.c= -Wno-error
18COPTS+= -fno-strict-aliasing 18COPTS+= -fno-strict-aliasing
19 19
20.PATH: ${NETBSDSRCDIR}/sys/dist/ipf/netinet 20.PATH: ${NETBSDSRCDIR}/sys/dist/ipf/netinet
21 21
22DPSRCS+= ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h 22DPSRCS+= ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
23 23
24CLEANFILES+= ipf_y.c ipf_y.h 24CLEANFILES+= ipf_y.c ipf_y.h
25CLEANFILES+= ipf_l.c ipf_l.h 25CLEANFILES+= ipf_l.c ipf_l.h
26CLEANFILES+= ipf.tab.c ipf.tab.h 26CLEANFILES+= ipf.tab.c ipf.tab.h
27CLEANFILES+= ipnat_y.c ipnat_y.h 27CLEANFILES+= ipnat_y.c ipnat_y.h
28CLEANFILES+= ipnat_l.c ipnat_l.h 28CLEANFILES+= ipnat_l.c ipnat_l.h
29CLEANFILES+= ipnat.tab.c ipnat.tab.h 29CLEANFILES+= ipnat.tab.c ipnat.tab.h
30CLEANFILES+= ippool_y.c ippool_y.h 30CLEANFILES+= ippool_y.c ippool_y.h
31CLEANFILES+= ippool_l.c ippool_l.h 31CLEANFILES+= ippool_l.c ippool_l.h
32CLEANFILES+= ippool.tab.c ippool.tab.h 32CLEANFILES+= ippool.tab.c ippool.tab.h
33 33
34ipnat_y.c: ipnat_y.y 34ipnat_y.c: ipnat_y.y
35 ${_MKTARGET_CREATE} 35 ${_MKTARGET_CREATE}
36 ${YACC} -b ipnat -d ${.ALLSRC} 36 ${YACC} -b ipnat -d ${.ALLSRC}
37 ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ 37 ${TOOL_SED} -e 's/yy/ipnat_yy/g' \
38 -e 's/y.tab.c/ipnat_y.c/' \ 38 -e 's/y.tab.c/ipnat_y.c/' \
39 -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \ 39 -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \
40 ipnat.tab.c > ${.TARGET} 40 ipnat.tab.c > ${.TARGET}
41 ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ 41 ${TOOL_SED} -e 's/yy/ipnat_yy/g' \
42 -e 's/y.tab.h/ipnat_y.h/' \ 42 -e 's/y.tab.h/ipnat_y.h/' \
43 ipnat.tab.h > ${.TARGET:.c=.h} 43 ipnat.tab.h > ${.TARGET:.c=.h}
44 44
45ipnat_y.h: ipnat_y.c 45ipnat_y.h: ipnat_y.c
46 46
47ipnat_l.c: lexer.c 47ipnat_l.c: lexer.c
48 ${_MKTARGET_CREATE} 48 ${_MKTARGET_CREATE}
49 ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ 49 ${TOOL_SED} -e 's/yy/ipnat_yy/g' \
50 -e 's/y.tab.h/ipnat_y.h/' \ 50 -e 's/y.tab.h/ipnat_y.h/' \
51 -e 's/lexer.h/ipnat_l.h/' \ 51 -e 's/lexer.h/ipnat_l.h/' \
52 ${.ALLSRC} > ${.TARGET} 52 ${.ALLSRC} > ${.TARGET}
53 53
54ipnat_l.h: lexer.h 54ipnat_l.h: lexer.h
55 ${_MKTARGET_CREATE} 55 ${_MKTARGET_CREATE}
56 ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ 56 ${TOOL_SED} -e 's/yy/ipnat_yy/g' \
57 ${.ALLSRC} > ${.TARGET} 57 ${.ALLSRC} > ${.TARGET}
58 58
59ippool_y.c: ippool_y.y 59ippool_y.c: ippool_y.y
60 ${_MKTARGET_CREATE} 60 ${_MKTARGET_CREATE}
61 ${YACC} -b ippool -d ${.ALLSRC} 61 ${YACC} -b ippool -d ${.ALLSRC}
62 ${TOOL_SED} -e 's/yy/ippool_yy/g' \ 62 ${TOOL_SED} -e 's/yy/ippool_yy/g' \
63 -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \ 63 -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
64 ippool.tab.c > ${.TARGET} 64 ippool.tab.c > ${.TARGET}
65 ${TOOL_SED} -e 's/yy/ippool_yy/g' \ 65 ${TOOL_SED} -e 's/yy/ippool_yy/g' \
66 ippool.tab.h > ${.TARGET:.c=.h} 66 ippool.tab.h > ${.TARGET:.c=.h}
67 67
68ippool_y.h: ippool_y.c 68ippool_y.h: ippool_y.c
69 69
70ippool_l.c: lexer.c 70ippool_l.c: lexer.c
71 ${_MKTARGET_CREATE} 71 ${_MKTARGET_CREATE}
72 ${TOOL_SED} -e 's/yy/ippool_yy/g' \ 72 ${TOOL_SED} -e 's/yy/ippool_yy/g' \
73 -e 's/y.tab.h/ippool_y.h/' \ 73 -e 's/y.tab.h/ippool_y.h/' \
74 -e 's/lexer.h/ippool_l.h/' \ 74 -e 's/lexer.h/ippool_l.h/' \
75 ${.ALLSRC} > ${.TARGET} 75 ${.ALLSRC} > ${.TARGET}
76 76
77ippool_l.h: lexer.h 77ippool_l.h: lexer.h
78 ${_MKTARGET_CREATE} 78 ${_MKTARGET_CREATE}
79 ${TOOL_SED} -e 's/yy/ippool_yy/g' \ 79 ${TOOL_SED} -e 's/yy/ippool_yy/g' \
80 ${.ALLSRC} > ${.TARGET} 80 ${.ALLSRC} > ${.TARGET}
81 81
82ipf_y.c: ipf_y.y 82ipf_y.c: ipf_y.y
83 ${_MKTARGET_CREATE} 83 ${_MKTARGET_CREATE}
84 ${YACC} -b ipf -d ${.ALLSRC} 84 ${YACC} -b ipf -d ${.ALLSRC}
85 ${TOOL_SED} -e 's/yy/ipf_yy/g' \ 85 ${TOOL_SED} -e 's/yy/ipf_yy/g' \
86 -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \ 86 -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
87 ipf.tab.c > ${.TARGET} 87 ipf.tab.c > ${.TARGET}
88 ${TOOL_SED} -e 's/yy/ipf_yy/g' \ 88 ${TOOL_SED} -e 's/yy/ipf_yy/g' \
89 ipf.tab.h > ${.TARGET:.c=.h} 89 ipf.tab.h > ${.TARGET:.c=.h}
90 90
91ipf_y.h: ipf_y.c 91ipf_y.h: ipf_y.c
92 92
93ipf_l.c: lexer.c 93ipf_l.c: lexer.c
94 ${_MKTARGET_CREATE} 94 ${_MKTARGET_CREATE}
95 ${TOOL_SED} -e 's/yy/ipf_yy/g' \ 95 ${TOOL_SED} -e 's/yy/ipf_yy/g' \
96 -e 's/y.tab.h/ipf_y.h/' \ 96 -e 's/y.tab.h/ipf_y.h/' \
97 -e 's/lexer.h/ipf_l.h/' \ 97 -e 's/lexer.h/ipf_l.h/' \
98 ${.ALLSRC} > ${.TARGET} 98 ${.ALLSRC} > ${.TARGET}
99 99
100ipf_l.h: lexer.h 100ipf_l.h: lexer.h
101 ${_MKTARGET_CREATE} 101 ${_MKTARGET_CREATE}
102 ${TOOL_SED} -e 's/yy/ipf_yy/g' \ 102 ${TOOL_SED} -e 's/yy/ipf_yy/g' \
103 ${.ALLSRC} > ${.TARGET} 103 ${.ALLSRC} > ${.TARGET}
104 104
105.include <bsd.prog.mk> 105.include <bsd.prog.mk>
cvs diff -r1.9 -r1.10 src/usr.sbin/ipf/libipf/Attic/Makefile (switch to unified diff)

--- src/usr.sbin/ipf/libipf/Attic/Makefile 2008/05/03 14:48:32 1.9
+++ src/usr.sbin/ipf/libipf/Attic/Makefile 2012/01/30 16:13:21 1.10
@@ -1,35 +1,147 @@ @@ -1,35 +1,147 @@
1# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:32 lukem Exp $ 1# $NetBSD: Makefile,v 1.10 2012/01/30 16:13:21 darrenr Exp $
2 2
3LIBISPRIVATE= yes 3LIBISPRIVATE= yes
4 4
5LIB= ipf 5LIB= ipf
6 6
7SRCS= addicmp.c addipopt.c alist_free.c alist_new.c bcopywrap.c \ 7SRCS= addicmp.c \
8 binprint.c buildopts.c checkrev.c count6bits.c count4bits.c \ 8 addipopt.c \
9 debug.c facpri.c flags.c fill6bits.c gethost.c \ 9 alist_free.c \
10 getifname.c getnattype.c getport.c getportproto.c \ 10 alist_new.c \
11 getproto.c getsumd.c hostname.c \ 11 allocmbt.c \
12 icmpcode.c initparse.c ionames.c \ 12 assigndefined.c \
13 ipoptsec.c ipf_dotuning.c ipft_ef.c ipft_hx.c ipft_pc.c \ 13 bcopywrap.c \
14 ipft_sn.c ipft_td.c ipft_tx.c kmem.c kmemcpywrap.c \ 14 binprint.c \
15 kvatoname.c load_file.c load_hash.c load_hashnode.c \ 15 buildopts.c \
16 load_http.c load_pool.c load_poolnode.c load_url.c \ 16 checkrev.c \
17 mutex_emul.c nametokva.c nat_setgroupmap.c ntomask.c \ 17 connecttcp.c \
18 optname.c optprint.c optprintv6.c optvalue.c portname.c \ 18 count4bits.c \
19 print_toif.c printactivenat.c printaps.c printbuf.c \ 19 count6bits.c \
20 printhash.c printhash_live.c printhashnode.c printip.c \ 20 debug.c \
21 printpool.c printpool_live.c \ 21 dupmbt.c \
22 printpoolnode.c printfr.c printfraginfo.c printhashdata.c \ 22 facpri.c \
 23 familyname.c \
 24 fill6bits.c \
 25 findword.c \
 26 flags.c \
 27 freembt.c \
 28 ftov.c \
 29 genmask.c \
 30 gethost.c \
 31 geticmptype.c \
 32 getifname.c \
 33 getnattype.c \
 34 getport.c \
 35 getportproto.c \
 36 getproto.c \
 37 getsumd.c \
 38 hostname.c \
 39 icmpcode.c \
 40 icmptypename.c \
 41 icmptypes.c \
 42 initparse.c \
 43 interror.c \
 44 ionames.c \
 45 ipferror.c \
 46 ipf_perror.c \
 47 ipf_dotuning.c \
 48 ipft_hx.c \
 49 ipft_pc.c \
 50 ipft_tx.c \
 51 ipoptsec.c \
 52 kmem.c \
 53 kmemcpywrap.c \
 54 kvatoname.c \
 55 load_file.c \
 56 load_dstlist.c \
 57 load_dstlistnode.c \
 58 load_hash.c \
 59 load_hashnode.c \
 60 load_http.c \
 61 load_pool.c \
 62 load_poolnode.c \
 63 load_url.c \
 64 msgdsize.c \
 65 mutex_emul.c \
 66 nametokva.c \
 67 nat_setgroupmap.c \
 68 ntomask.c \
 69 optname.c \
 70 optprint.c \
 71 optprintv6.c \
 72 optvalue.c \
 73 parsefields.c \
 74 parseipfexpr.c \
 75 parsewhoisline.c \
 76 poolio.c \
 77 portname.c \
 78 print_toif.c \
 79 printactiveaddr.c \
 80 printactivenat.c \
 81 printaddr.c \
 82 printaps.c \
 83 printbuf.c \
 84 printdstlist.o \
 85 printdstlistdata.o \
 86 printdstlistnode.o \
 87 printdstlistpolicy.o \
 88 printdstl_live.o \
 89 printfieldhdr.c \
 90 printfr.c \
 91 printfraginfo.c \
 92 printhash.c \
 93 printhashdata.c \
 94 printhashnode.c \
 95 printhash_live.c \
 96 printhost.c \
23 printhostmap.c \ 97 printhostmap.c \
24 printifname.c printhostmask.c printlog.c printmask.c \ 98 printhostmask.c \
25 printnat.c printpooldata.c printportcmp.c printpacket.c \ 99 printifname.c \
26 printpacket6.c printproto.c \ 100 printip.c \
27 printsbuf.c printstate.c printtqtable.c printtunable.c \ 101 printipfexpr.c \
28 remove_hash.c remove_hashnode.c remove_pool.c \ 102 printlog.c \
29 remove_poolnode.c resetlexer.c rwlock_emul.c tcpflags.c \ 103 printlookup.c \
30 tcp_flags.c var.c verbose.c v6ionames.c \ 104 printmask.c \
 105 printnat.c \
 106 printnataddr.c \
 107 printnatfield.c \
 108 printnatside.c \
 109 printpool.c \
 110 printpooldata.c \
 111 printpoolfield.c \
 112 printpoolnode.c \
 113 printpool_live.c \
 114 printproto.c \
 115 printportcmp.c \
 116 printpacket.c \
 117 printpacket6.c \
 118 printsbuf.c \
 119 printstate.c \
 120 printstatefields.c \
 121 printtcpflags.c \
 122 printtqtable.c \
 123 printtunable.c \
 124 printunit.c \
 125 remove_hash.c \
 126 remove_hashnode.c \
 127 remove_pool.c \
 128 remove_poolnode.c \
 129 resetlexer.c \
 130 rwlock_emul.c \
 131 save_execute.c \
 132 save_file.c \
 133 save_nothing.c \
 134 save_syslog.c \
 135 save_v1trap.c \
 136 save_v2trap.c \
 137 tcpflags.c \
 138 tcp_flags.c \
 139 var.c \
 140 verbose.c \
 141 vtof.c \
 142 v6ionames.c \
31 v6optvalue.c 143 v6optvalue.c
32 144
33CPPFLAGS.printstate.c= -Wno-error 145CPPFLAGS.printstate.c= -Wno-error
34 146
35.include <bsd.lib.mk> 147.include <bsd.lib.mk>