diff options
author | sjg <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
commit | ff87b5d1477fd150ff715e5c3c2a205deb66804f (patch) | |
tree | a3620d99f472deaa7f019c4324bb8f4e38ac4272 /sbin/ipf | |
parent | 62bb1062226d3ce6a2350808256a25508978352d (diff) | |
parent | 4d92de31b23f33109e1fa7f0b1499ed6c3501ee1 (diff) | |
download | FreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.zip FreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.tar.gz |
Merge head
Diffstat (limited to 'sbin/ipf')
-rw-r--r-- | sbin/ipf/ipf/Makefile | 2 | ||||
-rw-r--r-- | sbin/ipf/ipftest/Makefile | 11 | ||||
-rw-r--r-- | sbin/ipf/libipf/Makefile | 47 |
3 files changed, 42 insertions, 18 deletions
diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile index 62a9b47..c3938c6 100644 --- a/sbin/ipf/ipf/Makefile +++ b/sbin/ipf/ipf/Makefile @@ -4,7 +4,7 @@ PROG= ipf SRCS= ${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c MAN= ipfilter.4 ipfilter.5 ipf.8 ipf.4 ipf.5 ipl.4 MLINKS= ipf.5 ipf.conf.5 ipf.5 ipf6.conf.5 -CFLAGS+= -I. -DIPFILTER_BPF +CFLAGS+= -I. -DIPFILTER_BPF -DHAS_SYS_MD5_H GENHDRS= ipf_l.h ipf_y.h DPSRCS+= ${GENHDRS} diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile index d089b2b..32b074c 100644 --- a/sbin/ipf/ipftest/Makefile +++ b/sbin/ipf/ipftest/Makefile @@ -2,15 +2,22 @@ PROG= ipftest SRCS= ${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \ + ip_nat6.c \ ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \ ip_pool.c ip_scan.c ip_sync.c ip_rules.c \ ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \ - ipf_l.c ipnat_y.c ipnat_l.c md5.c radix.c bpf_filter.c + ipf_l.c ipnat_y.c ipnat_l.c md5.c radix_ipf.c ip_dstlist.c MAN= ipftest.1 WARNS?= 0 CFLAGS+= -DIPFILTER_LOG -DIPFILTER_COMPILED -DIPFILTER_LOOKUP \ - -DIPFILTER_SCAN -DIPFILTER_SYNC -DIPFILTER_CKSUM -I. + -DIPFILTER_SYNC -DIPFILTER_CKSUM -DHAS_SYS_MD5_H -I. + +# XXX The original tarball does not define IPFILTER_SCAN when building this +# XXX and other modules. It is believed the reason is it fails to build. +# XXX It has been removed for now. +# XXX CFLAGS+= -DIPFILTER_SCAN + .PATH: ${.CURDIR}/../../../sys/contrib/ipfilter/netinet diff --git a/sbin/ipf/libipf/Makefile b/sbin/ipf/libipf/Makefile index 43428cc..077062f 100644 --- a/sbin/ipf/libipf/Makefile +++ b/sbin/ipf/libipf/Makefile @@ -3,26 +3,43 @@ LIB= ipf INTERNALLIB= -SRCS= addicmp.c addipopt.c alist_free.c alist_new.c bcopywrap.c \ - binprint.c buildopts.c checkrev.c count4bits.c count6bits.c \ - debug.c facpri.c fill6bits.c flags.c gethost.c getifname.c \ +SRCS= addicmp.c addipopt.c alist_free.c alist_new.c allocmbt.c \ + assigndefined.c bcopywrap.c \ + binprint.c buildopts.c checkrev.c connecttcp.c \ + count4bits.c count6bits.c \ + debug.c dupmbt.c \ + facpri.c familyname.c \ + fill6bits.c findword.c \ + flags.c freembt.c ftov.c \ + genmask.c \ + gethost.c getifname.c geticmptype.c \ getnattype.c getport.c getportproto.c getproto.c getsumd.c \ - hostname.c icmpcode.c initparse.c ionames.c \ - ipf_dotuning.c ipft_ef.c ipft_hx.c ipft_pc.c ipft_sn.c \ - ipft_td.c ipft_tx.c ipoptsec.c kmem.c kmemcpywrap.c \ - kvatoname.c load_file.c load_hash.c load_hashnode.c \ + hostname.c icmpcode.c icmptypename.c icmptypes.c \ + initparse.c interror.c ionames.c \ + ipf_dotuning.c ipf_perror.c ipft_hx.c ipft_pc.c \ + ipft_tx.c ipoptsec.c kmem.c kmemcpywrap.c \ + kvatoname.c load_dstlist.c load_dstlistnode.c load_file.c \ + load_hash.c load_hashnode.c \ load_http.c load_pool.c load_poolnode.c load_url.c \ + mb_hexdump.c msgdsize.c \ mutex_emul.c nametokva.c nat_setgroupmap.c ntomask.c \ - optname.c optprint.c optprintv6.c optvalue.c portname.c \ - print_toif.c printactivenat.c printaps.c printbuf.c \ + optname.c optprint.c optprintv6.c optvalue.c parsefields.c \ + parseipfexpr.c parsewhoisline.c poolio.c portname.c \ + prependmbt.c \ + print_toif.c printactiveaddr.c printactivenat.c printaddr.c \ + printaps.c printbuf.c printdstl_live.c printdstlist.c \ + printdstlistdata.c printdstlistnode.c printdstlistpolicy.c \ + printfieldhdr.c \ printfr.c printfraginfo.c printhash.c printhash_live.c \ - printhashdata.c printhashnode.c printhostmap.c \ - printhostmask.c printifname.c printip.c printlog.c \ - printmask.c printnat.c printpacket.c printpacket6.c \ - printpool.c printpool_live.c printpooldata.c printpoolnode.c \ - printportcmp.c printproto.c printsbuf.c printstate.c \ - printtqtable.c printtunable.c remove_hash.c remove_hashnode.c \ + printhashdata.c printhashnode.c printhost.c printhostmap.c \ + printhostmask.c printifname.c printip.c printipfexpr.c printiphdr.c printlog.c printlookup.c \ + printmask.c printnat.c printnataddr.c printnatfield.c printnatside.c printpacket.c printpacket6.c \ + printpool.c printpool_live.c printpooldata.c printpoolfield.c printpoolnode.c \ + printportcmp.c printproto.c printsbuf.c printstate.c printstatefields.c \ + printtcpflags.c \ + printtqtable.c printtunable.c printunit.c remove_hash.c remove_hashnode.c \ remove_pool.c remove_poolnode.c resetlexer.c rwlock_emul.c \ + save_execute.c save_file.c save_nothing.c save_syslog.c save_v1trap.c save_v2trap.c vtof.c \ tcp_flags.c tcpflags.c tcpoptnames.c v6ionames.c v6optvalue.c \ var.c verbose.c |