svn commit: r255349 - in projects/camlock: . bin/sh contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests contrib/ipfilter contrib/ipfilter/BSD contrib/ipfilter/FWTK contrib/ipfilter/FreeBSD cont...
Alexander Motin
mav at FreeBSD.org
Sat Sep 7 07:36:19 UTC 2013
Author: mav
Date: Sat Sep 7 07:36:12 2013
New Revision: 255349
URL: http://svnweb.freebsd.org/changeset/base/255349
Log:
MFC @ r255348
Added:
projects/camlock/contrib/bmake/unit-tests/sunshcmd
- copied unchanged from r255348, head/contrib/bmake/unit-tests/sunshcmd
projects/camlock/contrib/ipfilter/BSD/upgrade
- copied unchanged from r255348, head/contrib/ipfilter/BSD/upgrade
projects/camlock/contrib/ipfilter/WhatsNew50.txt
- copied unchanged from r255348, head/contrib/ipfilter/WhatsNew50.txt
projects/camlock/contrib/ipfilter/arc4random.c
- copied unchanged from r255348, head/contrib/ipfilter/arc4random.c
projects/camlock/contrib/ipfilter/genmask.c
- copied unchanged from r255348, head/contrib/ipfilter/genmask.c
projects/camlock/contrib/ipfilter/ip_dstlist.c
- copied unchanged from r255348, head/contrib/ipfilter/ip_dstlist.c
projects/camlock/contrib/ipfilter/ip_dstlist.h
- copied unchanged from r255348, head/contrib/ipfilter/ip_dstlist.h
projects/camlock/contrib/ipfilter/ip_fil_compat.c
- copied unchanged from r255348, head/contrib/ipfilter/ip_fil_compat.c
projects/camlock/contrib/ipfilter/ipf_rb.h
- copied unchanged from r255348, head/contrib/ipfilter/ipf_rb.h
projects/camlock/contrib/ipfilter/lib/allocmbt.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/allocmbt.c
projects/camlock/contrib/ipfilter/lib/assigndefined.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/assigndefined.c
projects/camlock/contrib/ipfilter/lib/connecttcp.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/connecttcp.c
projects/camlock/contrib/ipfilter/lib/dupmbt.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/dupmbt.c
projects/camlock/contrib/ipfilter/lib/familyname.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/familyname.c
projects/camlock/contrib/ipfilter/lib/findword.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/findword.c
projects/camlock/contrib/ipfilter/lib/freembt.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/freembt.c
projects/camlock/contrib/ipfilter/lib/ftov.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/ftov.c
projects/camlock/contrib/ipfilter/lib/geticmptype.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/geticmptype.c
projects/camlock/contrib/ipfilter/lib/icmptypename.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/icmptypename.c
projects/camlock/contrib/ipfilter/lib/icmptypes.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/icmptypes.c
projects/camlock/contrib/ipfilter/lib/interror.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/interror.c
projects/camlock/contrib/ipfilter/lib/ipf_perror.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/ipf_perror.c
projects/camlock/contrib/ipfilter/lib/load_dstlist.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/load_dstlist.c
projects/camlock/contrib/ipfilter/lib/load_dstlistnode.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/load_dstlistnode.c
projects/camlock/contrib/ipfilter/lib/mb_hexdump.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/mb_hexdump.c
projects/camlock/contrib/ipfilter/lib/msgdsize.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/msgdsize.c
projects/camlock/contrib/ipfilter/lib/parsefields.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/parsefields.c
projects/camlock/contrib/ipfilter/lib/parseipfexpr.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/parseipfexpr.c
projects/camlock/contrib/ipfilter/lib/parsewhoisline.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/parsewhoisline.c
projects/camlock/contrib/ipfilter/lib/poolio.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/poolio.c
projects/camlock/contrib/ipfilter/lib/prependmbt.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/prependmbt.c
projects/camlock/contrib/ipfilter/lib/printactiveaddr.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printactiveaddr.c
projects/camlock/contrib/ipfilter/lib/printaddr.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printaddr.c
projects/camlock/contrib/ipfilter/lib/printdstl_live.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printdstl_live.c
projects/camlock/contrib/ipfilter/lib/printdstlist.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printdstlist.c
projects/camlock/contrib/ipfilter/lib/printdstlistdata.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printdstlistdata.c
projects/camlock/contrib/ipfilter/lib/printdstlistnode.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printdstlistnode.c
projects/camlock/contrib/ipfilter/lib/printdstlistpolicy.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printdstlistpolicy.c
projects/camlock/contrib/ipfilter/lib/printfieldhdr.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printfieldhdr.c
projects/camlock/contrib/ipfilter/lib/printhost.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printhost.c
projects/camlock/contrib/ipfilter/lib/printipfexpr.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printipfexpr.c
projects/camlock/contrib/ipfilter/lib/printiphdr.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printiphdr.c
projects/camlock/contrib/ipfilter/lib/printlookup.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printlookup.c
projects/camlock/contrib/ipfilter/lib/printnataddr.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printnataddr.c
projects/camlock/contrib/ipfilter/lib/printnatfield.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printnatfield.c
projects/camlock/contrib/ipfilter/lib/printnatside.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printnatside.c
projects/camlock/contrib/ipfilter/lib/printpoolfield.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printpoolfield.c
projects/camlock/contrib/ipfilter/lib/printstatefields.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printstatefields.c
projects/camlock/contrib/ipfilter/lib/printtcpflags.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printtcpflags.c
projects/camlock/contrib/ipfilter/lib/printunit.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/printunit.c
projects/camlock/contrib/ipfilter/lib/save_execute.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/save_execute.c
projects/camlock/contrib/ipfilter/lib/save_file.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/save_file.c
projects/camlock/contrib/ipfilter/lib/save_nothing.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/save_nothing.c
projects/camlock/contrib/ipfilter/lib/save_syslog.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/save_syslog.c
projects/camlock/contrib/ipfilter/lib/save_v1trap.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/save_v1trap.c
projects/camlock/contrib/ipfilter/lib/save_v2trap.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/save_v2trap.c
projects/camlock/contrib/ipfilter/lib/vtof.c
- copied unchanged from r255348, head/contrib/ipfilter/lib/vtof.c
- copied unchanged from r255348, head/contrib/ipfilter/ml_ipl.c
- copied unchanged from r255348, head/contrib/ipfilter/mlfk_ipl.c
- copied unchanged from r255348, head/contrib/ipfilter/mli_ipl.c
- copied unchanged from r255348, head/contrib/ipfilter/mln_ipl.c
projects/camlock/contrib/ipfilter/mln_rule.c
- copied unchanged from r255348, head/contrib/ipfilter/mln_rule.c
projects/camlock/contrib/ipfilter/mlo_ipl.c
- copied unchanged from r255348, head/contrib/ipfilter/mlo_ipl.c
projects/camlock/contrib/ipfilter/mlo_rule.c
- copied unchanged from r255348, head/contrib/ipfilter/mlo_rule.c
- copied unchanged from r255348, head/contrib/ipfilter/mls_ipl.c
projects/camlock/contrib/ipfilter/mls_rule.c
- copied unchanged from r255348, head/contrib/ipfilter/mls_rule.c
projects/camlock/contrib/ipfilter/mlso_rule.c
- copied unchanged from r255348, head/contrib/ipfilter/mlso_rule.c
projects/camlock/contrib/ipfilter/radix_ipf.c
- copied unchanged from r255348, head/contrib/ipfilter/radix_ipf.c
projects/camlock/contrib/ipfilter/sys/
- copied from r255348, head/contrib/ipfilter/sys/
projects/camlock/contrib/ipfilter/test/e4to6
- copied unchanged from r255348, head/contrib/ipfilter/test/e4to6
projects/camlock/contrib/ipfilter/test/expected/f21
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/f21
projects/camlock/contrib/ipfilter/test/expected/f22
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/f22
projects/camlock/contrib/ipfilter/test/expected/f25
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/f25
projects/camlock/contrib/ipfilter/test/expected/f26
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/f26
projects/camlock/contrib/ipfilter/test/expected/f27
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/f27
projects/camlock/contrib/ipfilter/test/expected/f28
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/f28
projects/camlock/contrib/ipfilter/test/expected/f29
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/f29
projects/camlock/contrib/ipfilter/test/expected/f30
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/f30
projects/camlock/contrib/ipfilter/test/expected/i22
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/i22
projects/camlock/contrib/ipfilter/test/expected/i23
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/i23
projects/camlock/contrib/ipfilter/test/expected/in100
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/in100
projects/camlock/contrib/ipfilter/test/expected/in101
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/in101
projects/camlock/contrib/ipfilter/test/expected/in102
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/in102
projects/camlock/contrib/ipfilter/test/expected/in7
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/in7
projects/camlock/contrib/ipfilter/test/expected/ip3
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/ip3
projects/camlock/contrib/ipfilter/test/expected/ipv6.4
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/ipv6.4
projects/camlock/contrib/ipfilter/test/expected/n100
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n100
projects/camlock/contrib/ipfilter/test/expected/n101
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n101
projects/camlock/contrib/ipfilter/test/expected/n102
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n102
projects/camlock/contrib/ipfilter/test/expected/n103
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n103
projects/camlock/contrib/ipfilter/test/expected/n104
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n104
projects/camlock/contrib/ipfilter/test/expected/n105
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n105
projects/camlock/contrib/ipfilter/test/expected/n106
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n106
projects/camlock/contrib/ipfilter/test/expected/n11_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n11_6
projects/camlock/contrib/ipfilter/test/expected/n12_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n12_6
projects/camlock/contrib/ipfilter/test/expected/n13_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n13_6
projects/camlock/contrib/ipfilter/test/expected/n14_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n14_6
projects/camlock/contrib/ipfilter/test/expected/n15
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n15
projects/camlock/contrib/ipfilter/test/expected/n15_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n15_6
projects/camlock/contrib/ipfilter/test/expected/n17
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n17
projects/camlock/contrib/ipfilter/test/expected/n18
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n18
projects/camlock/contrib/ipfilter/test/expected/n1_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n1_6
projects/camlock/contrib/ipfilter/test/expected/n200
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n200
projects/camlock/contrib/ipfilter/test/expected/n2_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n2_6
projects/camlock/contrib/ipfilter/test/expected/n4_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n4_6
projects/camlock/contrib/ipfilter/test/expected/n5_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n5_6
projects/camlock/contrib/ipfilter/test/expected/n6_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n6_6
projects/camlock/contrib/ipfilter/test/expected/n7_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n7_6
projects/camlock/contrib/ipfilter/test/expected/n8_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n8_6
projects/camlock/contrib/ipfilter/test/expected/n9_6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/n9_6
projects/camlock/contrib/ipfilter/test/expected/ni17
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/ni17
projects/camlock/contrib/ipfilter/test/expected/ni18
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/ni18
projects/camlock/contrib/ipfilter/test/expected/p10
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/p10
projects/camlock/contrib/ipfilter/test/expected/p11
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/p11
projects/camlock/contrib/ipfilter/test/expected/p12
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/p12
projects/camlock/contrib/ipfilter/test/expected/p13
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/p13
projects/camlock/contrib/ipfilter/test/expected/p4
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/p4
projects/camlock/contrib/ipfilter/test/expected/p6
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/p6
projects/camlock/contrib/ipfilter/test/expected/p7
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/p7
projects/camlock/contrib/ipfilter/test/expected/p9
- copied unchanged from r255348, head/contrib/ipfilter/test/expected/p9
projects/camlock/contrib/ipfilter/test/h4to6
- copied unchanged from r255348, head/contrib/ipfilter/test/h4to6
projects/camlock/contrib/ipfilter/test/i4to6
- copied unchanged from r255348, head/contrib/ipfilter/test/i4to6
projects/camlock/contrib/ipfilter/test/input/f21
- copied unchanged from r255348, head/contrib/ipfilter/test/input/f21
projects/camlock/contrib/ipfilter/test/input/f22
- copied unchanged from r255348, head/contrib/ipfilter/test/input/f22
projects/camlock/contrib/ipfilter/test/input/f25
- copied unchanged from r255348, head/contrib/ipfilter/test/input/f25
projects/camlock/contrib/ipfilter/test/input/f26
- copied unchanged from r255348, head/contrib/ipfilter/test/input/f26
projects/camlock/contrib/ipfilter/test/input/f27
- copied unchanged from r255348, head/contrib/ipfilter/test/input/f27
projects/camlock/contrib/ipfilter/test/input/f28
- copied unchanged from r255348, head/contrib/ipfilter/test/input/f28
projects/camlock/contrib/ipfilter/test/input/f29
- copied unchanged from r255348, head/contrib/ipfilter/test/input/f29
projects/camlock/contrib/ipfilter/test/input/f30
- copied unchanged from r255348, head/contrib/ipfilter/test/input/f30
projects/camlock/contrib/ipfilter/test/input/ipv6.4
- copied unchanged from r255348, head/contrib/ipfilter/test/input/ipv6.4
projects/camlock/contrib/ipfilter/test/input/n100
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n100
projects/camlock/contrib/ipfilter/test/input/n101
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n101
projects/camlock/contrib/ipfilter/test/input/n102
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n102
projects/camlock/contrib/ipfilter/test/input/n103
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n103
projects/camlock/contrib/ipfilter/test/input/n104
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n104
projects/camlock/contrib/ipfilter/test/input/n105
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n105
projects/camlock/contrib/ipfilter/test/input/n106
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n106
projects/camlock/contrib/ipfilter/test/input/n10_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n10_6
projects/camlock/contrib/ipfilter/test/input/n11_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n11_6
projects/camlock/contrib/ipfilter/test/input/n12_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n12_6
projects/camlock/contrib/ipfilter/test/input/n13_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n13_6
projects/camlock/contrib/ipfilter/test/input/n14_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n14_6
projects/camlock/contrib/ipfilter/test/input/n15
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n15
projects/camlock/contrib/ipfilter/test/input/n15_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n15_6
projects/camlock/contrib/ipfilter/test/input/n17
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n17
projects/camlock/contrib/ipfilter/test/input/n17_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n17_6
projects/camlock/contrib/ipfilter/test/input/n18
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n18
projects/camlock/contrib/ipfilter/test/input/n1_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n1_6
projects/camlock/contrib/ipfilter/test/input/n200
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n200
projects/camlock/contrib/ipfilter/test/input/n2_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n2_6
projects/camlock/contrib/ipfilter/test/input/n4_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n4_6
projects/camlock/contrib/ipfilter/test/input/n5_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n5_6
projects/camlock/contrib/ipfilter/test/input/n6_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n6_6
projects/camlock/contrib/ipfilter/test/input/n7_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n7_6
projects/camlock/contrib/ipfilter/test/input/n8_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n8_6
projects/camlock/contrib/ipfilter/test/input/n9_6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/n9_6
projects/camlock/contrib/ipfilter/test/input/ni18
- copied unchanged from r255348, head/contrib/ipfilter/test/input/ni18
projects/camlock/contrib/ipfilter/test/input/p10
- copied unchanged from r255348, head/contrib/ipfilter/test/input/p10
projects/camlock/contrib/ipfilter/test/input/p11
- copied unchanged from r255348, head/contrib/ipfilter/test/input/p11
projects/camlock/contrib/ipfilter/test/input/p12
- copied unchanged from r255348, head/contrib/ipfilter/test/input/p12
projects/camlock/contrib/ipfilter/test/input/p13
- copied unchanged from r255348, head/contrib/ipfilter/test/input/p13
projects/camlock/contrib/ipfilter/test/input/p4
- copied unchanged from r255348, head/contrib/ipfilter/test/input/p4
projects/camlock/contrib/ipfilter/test/input/p6
- copied unchanged from r255348, head/contrib/ipfilter/test/input/p6
projects/camlock/contrib/ipfilter/test/input/p7
- copied unchanged from r255348, head/contrib/ipfilter/test/input/p7
projects/camlock/contrib/ipfilter/test/input/p9
- copied unchanged from r255348, head/contrib/ipfilter/test/input/p9
projects/camlock/contrib/ipfilter/test/ipflib.sh
- copied unchanged from r255348, head/contrib/ipfilter/test/ipflib.sh
projects/camlock/contrib/ipfilter/test/regress/f21
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/f21
projects/camlock/contrib/ipfilter/test/regress/f22
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/f22
projects/camlock/contrib/ipfilter/test/regress/f25
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/f25
projects/camlock/contrib/ipfilter/test/regress/f26
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/f26
projects/camlock/contrib/ipfilter/test/regress/f27
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/f27
projects/camlock/contrib/ipfilter/test/regress/f28.ipf
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/f28.ipf
projects/camlock/contrib/ipfilter/test/regress/f28.pool
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/f28.pool
projects/camlock/contrib/ipfilter/test/regress/f29.ipf
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/f29.ipf
projects/camlock/contrib/ipfilter/test/regress/f29.pool
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/f29.pool
projects/camlock/contrib/ipfilter/test/regress/f30
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/f30
projects/camlock/contrib/ipfilter/test/regress/i22
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/i22
projects/camlock/contrib/ipfilter/test/regress/i23
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/i23
projects/camlock/contrib/ipfilter/test/regress/in100
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/in100
projects/camlock/contrib/ipfilter/test/regress/in101
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/in101
projects/camlock/contrib/ipfilter/test/regress/in102
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/in102
projects/camlock/contrib/ipfilter/test/regress/in7
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/in7
projects/camlock/contrib/ipfilter/test/regress/ip3
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/ip3
projects/camlock/contrib/ipfilter/test/regress/ipv6.4
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/ipv6.4
projects/camlock/contrib/ipfilter/test/regress/n100
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n100
projects/camlock/contrib/ipfilter/test/regress/n101
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n101
projects/camlock/contrib/ipfilter/test/regress/n102
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n102
projects/camlock/contrib/ipfilter/test/regress/n103
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n103
projects/camlock/contrib/ipfilter/test/regress/n104
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n104
projects/camlock/contrib/ipfilter/test/regress/n105
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n105
projects/camlock/contrib/ipfilter/test/regress/n106
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n106
projects/camlock/contrib/ipfilter/test/regress/n10_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n10_6
projects/camlock/contrib/ipfilter/test/regress/n11_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n11_6
projects/camlock/contrib/ipfilter/test/regress/n12_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n12_6
projects/camlock/contrib/ipfilter/test/regress/n13_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n13_6
projects/camlock/contrib/ipfilter/test/regress/n14_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n14_6
projects/camlock/contrib/ipfilter/test/regress/n15
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n15
projects/camlock/contrib/ipfilter/test/regress/n15_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n15_6
projects/camlock/contrib/ipfilter/test/regress/n16_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n16_6
projects/camlock/contrib/ipfilter/test/regress/n17
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n17
projects/camlock/contrib/ipfilter/test/regress/n17_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n17_6
projects/camlock/contrib/ipfilter/test/regress/n18
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n18
projects/camlock/contrib/ipfilter/test/regress/n1_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n1_6
projects/camlock/contrib/ipfilter/test/regress/n200
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n200
projects/camlock/contrib/ipfilter/test/regress/n2_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n2_6
projects/camlock/contrib/ipfilter/test/regress/n4_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n4_6
projects/camlock/contrib/ipfilter/test/regress/n5_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n5_6
projects/camlock/contrib/ipfilter/test/regress/n6_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n6_6
projects/camlock/contrib/ipfilter/test/regress/n7_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n7_6
projects/camlock/contrib/ipfilter/test/regress/n8_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n8_6
projects/camlock/contrib/ipfilter/test/regress/n9_6
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/n9_6
projects/camlock/contrib/ipfilter/test/regress/ni17.ipf
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/ni17.ipf
projects/camlock/contrib/ipfilter/test/regress/ni18.ipf
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/ni18.ipf
projects/camlock/contrib/ipfilter/test/regress/ni18.nat
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/ni18.nat
projects/camlock/contrib/ipfilter/test/regress/p10.nat
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p10.nat
projects/camlock/contrib/ipfilter/test/regress/p10.pool
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p10.pool
projects/camlock/contrib/ipfilter/test/regress/p11.nat
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p11.nat
projects/camlock/contrib/ipfilter/test/regress/p11.pool
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p11.pool
projects/camlock/contrib/ipfilter/test/regress/p12.nat
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p12.nat
projects/camlock/contrib/ipfilter/test/regress/p12.pool
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p12.pool
projects/camlock/contrib/ipfilter/test/regress/p13.ipf
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p13.ipf
projects/camlock/contrib/ipfilter/test/regress/p13.pool
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p13.pool
projects/camlock/contrib/ipfilter/test/regress/p4.nat
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p4.nat
projects/camlock/contrib/ipfilter/test/regress/p4.pool
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p4.pool
projects/camlock/contrib/ipfilter/test/regress/p6.ipf
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p6.ipf
projects/camlock/contrib/ipfilter/test/regress/p6.pool
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p6.pool
projects/camlock/contrib/ipfilter/test/regress/p6.whois
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p6.whois
projects/camlock/contrib/ipfilter/test/regress/p7.nat
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p7.nat
projects/camlock/contrib/ipfilter/test/regress/p7.pool
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p7.pool
projects/camlock/contrib/ipfilter/test/regress/p9.nat
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p9.nat
projects/camlock/contrib/ipfilter/test/regress/p9.pool
- copied unchanged from r255348, head/contrib/ipfilter/test/regress/p9.pool
projects/camlock/contrib/ipfilter/tools/ipfsyncd.c
- copied unchanged from r255348, head/contrib/ipfilter/tools/ipfsyncd.c
projects/camlock/lib/libc/capability/
- copied from r255348, head/lib/libc/capability/
projects/camlock/lib/msun/src/imprecise.c
- copied unchanged from r255348, head/lib/msun/src/imprecise.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_dns_pxy.c
- copied unchanged from r255348, head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_dstlist.c
- copied unchanged from r255348, head/sys/contrib/ipfilter/netinet/ip_dstlist.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_dstlist.h
- copied unchanged from r255348, head/sys/contrib/ipfilter/netinet/ip_dstlist.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_nat6.c
- copied unchanged from r255348, head/sys/contrib/ipfilter/netinet/ip_nat6.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c
- copied unchanged from r255348, head/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c
projects/camlock/sys/contrib/ipfilter/netinet/ipf_rb.h
- copied unchanged from r255348, head/sys/contrib/ipfilter/netinet/ipf_rb.h
projects/camlock/sys/contrib/ipfilter/netinet/radix_ipf.c
- copied unchanged from r255348, head/sys/contrib/ipfilter/netinet/radix_ipf.c
projects/camlock/sys/contrib/ipfilter/netinet/radix_ipf.h
- copied unchanged from r255348, head/sys/contrib/ipfilter/netinet/radix_ipf.h
projects/camlock/sys/kern/subr_capability.c
- copied unchanged from r255348, head/sys/kern/subr_capability.c
projects/camlock/sys/mips/conf/GXEMUL32
- copied unchanged from r255348, head/sys/mips/conf/GXEMUL32
projects/camlock/sys/sys/caprights.h
- copied unchanged from r255348, head/sys/sys/caprights.h
projects/camlock/tools/build/options/WITHOUT_GNUCXX
- copied unchanged from r255348, head/tools/build/options/WITHOUT_GNUCXX
projects/camlock/tools/build/options/WITH_GCC
- copied unchanged from r255348, head/tools/build/options/WITH_GCC
projects/camlock/tools/build/options/WITH_GNUCXX
- copied unchanged from r255348, head/tools/build/options/WITH_GNUCXX
projects/camlock/tools/regression/bin/sh/builtins/return8.0
- copied unchanged from r255348, head/tools/regression/bin/sh/builtins/return8.0
projects/camlock/tools/regression/lib/libc/stdio/test-fopen.c
- copied unchanged from r255348, head/tools/regression/lib/libc/stdio/test-fopen.c
projects/camlock/tools/regression/lib/libc/stdio/test-fopen.t
- copied unchanged from r255348, head/tools/regression/lib/libc/stdio/test-fopen.t
projects/camlock/tools/regression/lib/libc/stdio/test-mkostemp.t
- copied unchanged from r255348, head/tools/regression/lib/libc/stdio/test-mkostemp.t
Directory Properties:
projects/camlock/contrib/ipfilter/ml_ipl.c (props changed)
projects/camlock/contrib/ipfilter/mlfk_ipl.c (props changed)
projects/camlock/contrib/ipfilter/mli_ipl.c (props changed)
projects/camlock/contrib/ipfilter/mln_ipl.c (props changed)
projects/camlock/contrib/ipfilter/mls_ipl.c (props changed)
Deleted:
projects/camlock/contrib/ipfilter/.cvsignore
projects/camlock/contrib/ipfilter/BSD/.cvsignore
projects/camlock/contrib/ipfilter/iplang/.cvsignore
projects/camlock/contrib/ipfilter/ipsend/.cvsignore
projects/camlock/contrib/ipfilter/ipsend/README
projects/camlock/contrib/ipfilter/ipsend/hpux.c
projects/camlock/contrib/ipfilter/ipsend/in_var.h
projects/camlock/contrib/ipfilter/ipsend/ip_var.h
projects/camlock/contrib/ipfilter/ipsend/tcpip.h
projects/camlock/contrib/ipfilter/lib/ipft_ef.c
projects/camlock/contrib/ipfilter/lib/ipft_sn.c
projects/camlock/contrib/ipfilter/lib/ipft_td.c
projects/camlock/contrib/ipfilter/net/.cvsignore
projects/camlock/contrib/ipfilter/radix.c
projects/camlock/contrib/ipfilter/rules/.cvsignore
projects/camlock/contrib/ipfilter/samples/.cvsignore
projects/camlock/contrib/ipfilter/test/.cvsignore
projects/camlock/contrib/ipfilter/test/hextest
projects/camlock/contrib/ipfilter/test/input/ipf6-1
projects/camlock/contrib/ipfilter/test/mhtest
projects/camlock/sys/contrib/ipfilter/netinet/QNX_OCL.txt
Modified:
projects/camlock/Makefile
projects/camlock/UPDATING
projects/camlock/bin/sh/eval.c
projects/camlock/bin/sh/eval.h
projects/camlock/bin/sh/main.c
projects/camlock/bin/sh/sh.1
projects/camlock/contrib/bmake/ChangeLog
projects/camlock/contrib/bmake/FILES
projects/camlock/contrib/bmake/Makefile
projects/camlock/contrib/bmake/bmake.1
projects/camlock/contrib/bmake/bmake.cat1
projects/camlock/contrib/bmake/compat.c
projects/camlock/contrib/bmake/job.c
projects/camlock/contrib/bmake/main.c
projects/camlock/contrib/bmake/make.1
projects/camlock/contrib/bmake/make.h
projects/camlock/contrib/bmake/mk/ChangeLog
projects/camlock/contrib/bmake/mk/gendirdeps.mk
projects/camlock/contrib/bmake/mk/install-mk
projects/camlock/contrib/bmake/mk/libs.mk
projects/camlock/contrib/bmake/mk/progs.mk
projects/camlock/contrib/bmake/parse.c
projects/camlock/contrib/bmake/unit-tests/Makefile.in
projects/camlock/contrib/bmake/unit-tests/test.exp
projects/camlock/contrib/bmake/var.c
projects/camlock/contrib/ipfilter/BNF
projects/camlock/contrib/ipfilter/BSD/Makefile
projects/camlock/contrib/ipfilter/BSD/Makefile.ipsend
projects/camlock/contrib/ipfilter/BSD/ipfadm-rcd
projects/camlock/contrib/ipfilter/BSD/kupgrade
projects/camlock/contrib/ipfilter/FAQ.FreeBSD
projects/camlock/contrib/ipfilter/FWTK/ftp-gw.diff
projects/camlock/contrib/ipfilter/FWTK/fwtk_transparent.diff
projects/camlock/contrib/ipfilter/FreeBSD-2.2/kinstall
projects/camlock/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3
projects/camlock/contrib/ipfilter/FreeBSD-3/kinstall
projects/camlock/contrib/ipfilter/FreeBSD-4.0/kinstall
projects/camlock/contrib/ipfilter/FreeBSD/kinstall
projects/camlock/contrib/ipfilter/HISTORY
projects/camlock/contrib/ipfilter/INSTALL.FreeBSD
projects/camlock/contrib/ipfilter/Makefile
projects/camlock/contrib/ipfilter/NAT.FreeBSD
projects/camlock/contrib/ipfilter/etc/protocols
projects/camlock/contrib/ipfilter/etc/services
projects/camlock/contrib/ipfilter/ip_fil.c
projects/camlock/contrib/ipfilter/ipf.h
projects/camlock/contrib/ipfilter/iplang/Makefile
projects/camlock/contrib/ipfilter/iplang/iplang.h
projects/camlock/contrib/ipfilter/iplang/iplang.tst
projects/camlock/contrib/ipfilter/iplang/iplang_l.l
projects/camlock/contrib/ipfilter/iplang/iplang_y.y
projects/camlock/contrib/ipfilter/ipmon.h
projects/camlock/contrib/ipfilter/ipsd/Makefile
projects/camlock/contrib/ipfilter/ipsd/ipsd.c
projects/camlock/contrib/ipfilter/ipsd/ipsdr.c
projects/camlock/contrib/ipfilter/ipsd/linux.h
projects/camlock/contrib/ipfilter/ipsd/sbpf.c
projects/camlock/contrib/ipfilter/ipsd/sdlpi.c
projects/camlock/contrib/ipfilter/ipsd/slinux.c
projects/camlock/contrib/ipfilter/ipsd/snit.c
projects/camlock/contrib/ipfilter/ipsend/44arp.c
projects/camlock/contrib/ipfilter/ipsend/Makefile
projects/camlock/contrib/ipfilter/ipsend/arp.c
projects/camlock/contrib/ipfilter/ipsend/dlcommon.c
projects/camlock/contrib/ipfilter/ipsend/ip.c
projects/camlock/contrib/ipfilter/ipsend/ipresend.c
projects/camlock/contrib/ipfilter/ipsend/ipsend.5
projects/camlock/contrib/ipfilter/ipsend/ipsend.c
projects/camlock/contrib/ipfilter/ipsend/ipsend.h
projects/camlock/contrib/ipfilter/ipsend/ipsopt.c
projects/camlock/contrib/ipfilter/ipsend/iptest.c
projects/camlock/contrib/ipfilter/ipsend/iptests.c
projects/camlock/contrib/ipfilter/ipsend/larp.c
projects/camlock/contrib/ipfilter/ipsend/linux.h
projects/camlock/contrib/ipfilter/ipsend/lsock.c
projects/camlock/contrib/ipfilter/ipsend/resend.c
projects/camlock/contrib/ipfilter/ipsend/sbpf.c
projects/camlock/contrib/ipfilter/ipsend/sdlpi.c
projects/camlock/contrib/ipfilter/ipsend/sirix.c
projects/camlock/contrib/ipfilter/ipsend/slinux.c
projects/camlock/contrib/ipfilter/ipsend/snit.c
projects/camlock/contrib/ipfilter/ipsend/sock.c
projects/camlock/contrib/ipfilter/ipt.h
projects/camlock/contrib/ipfilter/kmem.h
projects/camlock/contrib/ipfilter/l4check/Makefile
projects/camlock/contrib/ipfilter/l4check/l4check.c
projects/camlock/contrib/ipfilter/lib/Makefile
projects/camlock/contrib/ipfilter/lib/addicmp.c
projects/camlock/contrib/ipfilter/lib/addipopt.c
projects/camlock/contrib/ipfilter/lib/alist_free.c
projects/camlock/contrib/ipfilter/lib/alist_new.c
projects/camlock/contrib/ipfilter/lib/bcopywrap.c
projects/camlock/contrib/ipfilter/lib/binprint.c
projects/camlock/contrib/ipfilter/lib/buildopts.c
projects/camlock/contrib/ipfilter/lib/checkrev.c
projects/camlock/contrib/ipfilter/lib/count4bits.c
projects/camlock/contrib/ipfilter/lib/count6bits.c
projects/camlock/contrib/ipfilter/lib/debug.c
projects/camlock/contrib/ipfilter/lib/facpri.c
projects/camlock/contrib/ipfilter/lib/facpri.h
projects/camlock/contrib/ipfilter/lib/fill6bits.c
projects/camlock/contrib/ipfilter/lib/flags.c
projects/camlock/contrib/ipfilter/lib/gethost.c
projects/camlock/contrib/ipfilter/lib/getifname.c
projects/camlock/contrib/ipfilter/lib/getnattype.c
projects/camlock/contrib/ipfilter/lib/getport.c
projects/camlock/contrib/ipfilter/lib/getportproto.c
projects/camlock/contrib/ipfilter/lib/getproto.c
projects/camlock/contrib/ipfilter/lib/getsumd.c
projects/camlock/contrib/ipfilter/lib/hostname.c
projects/camlock/contrib/ipfilter/lib/icmpcode.c
projects/camlock/contrib/ipfilter/lib/initparse.c
projects/camlock/contrib/ipfilter/lib/ionames.c
projects/camlock/contrib/ipfilter/lib/ipf_dotuning.c
projects/camlock/contrib/ipfilter/lib/ipft_hx.c
projects/camlock/contrib/ipfilter/lib/ipft_pc.c
projects/camlock/contrib/ipfilter/lib/ipft_tx.c
projects/camlock/contrib/ipfilter/lib/ipoptsec.c
projects/camlock/contrib/ipfilter/lib/kmem.c
projects/camlock/contrib/ipfilter/lib/kmem.h
projects/camlock/contrib/ipfilter/lib/kmemcpywrap.c
projects/camlock/contrib/ipfilter/lib/kvatoname.c
projects/camlock/contrib/ipfilter/lib/load_file.c
projects/camlock/contrib/ipfilter/lib/load_hash.c
projects/camlock/contrib/ipfilter/lib/load_hashnode.c
projects/camlock/contrib/ipfilter/lib/load_http.c
projects/camlock/contrib/ipfilter/lib/load_pool.c
projects/camlock/contrib/ipfilter/lib/load_poolnode.c
projects/camlock/contrib/ipfilter/lib/load_url.c
projects/camlock/contrib/ipfilter/lib/mutex_emul.c
projects/camlock/contrib/ipfilter/lib/nametokva.c
projects/camlock/contrib/ipfilter/lib/nat_setgroupmap.c
projects/camlock/contrib/ipfilter/lib/ntomask.c
projects/camlock/contrib/ipfilter/lib/optname.c
projects/camlock/contrib/ipfilter/lib/optprint.c
projects/camlock/contrib/ipfilter/lib/optprintv6.c
projects/camlock/contrib/ipfilter/lib/optvalue.c
projects/camlock/contrib/ipfilter/lib/portname.c
projects/camlock/contrib/ipfilter/lib/print_toif.c
projects/camlock/contrib/ipfilter/lib/printactivenat.c
projects/camlock/contrib/ipfilter/lib/printaps.c
projects/camlock/contrib/ipfilter/lib/printbuf.c
projects/camlock/contrib/ipfilter/lib/printfr.c
projects/camlock/contrib/ipfilter/lib/printfraginfo.c
projects/camlock/contrib/ipfilter/lib/printhash.c
projects/camlock/contrib/ipfilter/lib/printhash_live.c
projects/camlock/contrib/ipfilter/lib/printhashdata.c
projects/camlock/contrib/ipfilter/lib/printhashnode.c
projects/camlock/contrib/ipfilter/lib/printhostmap.c
projects/camlock/contrib/ipfilter/lib/printhostmask.c
projects/camlock/contrib/ipfilter/lib/printifname.c
projects/camlock/contrib/ipfilter/lib/printip.c
projects/camlock/contrib/ipfilter/lib/printlog.c
projects/camlock/contrib/ipfilter/lib/printmask.c
projects/camlock/contrib/ipfilter/lib/printnat.c
projects/camlock/contrib/ipfilter/lib/printpacket.c
projects/camlock/contrib/ipfilter/lib/printpacket6.c
projects/camlock/contrib/ipfilter/lib/printpool.c
projects/camlock/contrib/ipfilter/lib/printpool_live.c
projects/camlock/contrib/ipfilter/lib/printpooldata.c
projects/camlock/contrib/ipfilter/lib/printpoolnode.c
projects/camlock/contrib/ipfilter/lib/printportcmp.c
projects/camlock/contrib/ipfilter/lib/printproto.c
projects/camlock/contrib/ipfilter/lib/printsbuf.c
projects/camlock/contrib/ipfilter/lib/printstate.c
projects/camlock/contrib/ipfilter/lib/printtqtable.c
projects/camlock/contrib/ipfilter/lib/printtunable.c
projects/camlock/contrib/ipfilter/lib/remove_hash.c
projects/camlock/contrib/ipfilter/lib/remove_hashnode.c
projects/camlock/contrib/ipfilter/lib/remove_pool.c
projects/camlock/contrib/ipfilter/lib/remove_poolnode.c
projects/camlock/contrib/ipfilter/lib/resetlexer.c
projects/camlock/contrib/ipfilter/lib/rwlock_emul.c
projects/camlock/contrib/ipfilter/lib/tcpflags.c
projects/camlock/contrib/ipfilter/lib/tcpoptnames.c
projects/camlock/contrib/ipfilter/lib/v6ionames.c
projects/camlock/contrib/ipfilter/lib/v6optvalue.c
projects/camlock/contrib/ipfilter/lib/var.c
projects/camlock/contrib/ipfilter/lib/verbose.c
projects/camlock/contrib/ipfilter/man/Makefile
projects/camlock/contrib/ipfilter/man/ipf.4
projects/camlock/contrib/ipfilter/man/ipf.5
projects/camlock/contrib/ipfilter/man/ipfilter.4
projects/camlock/contrib/ipfilter/man/ipfilter.4.mandoc
projects/camlock/contrib/ipfilter/man/ipfstat.8
projects/camlock/contrib/ipfilter/man/ipftest.1
projects/camlock/contrib/ipfilter/man/ipmon.5
projects/camlock/contrib/ipfilter/man/ipnat.4
projects/camlock/contrib/ipfilter/man/ipnat.5
projects/camlock/contrib/ipfilter/man/ipnat.8
projects/camlock/contrib/ipfilter/man/ippool.5
projects/camlock/contrib/ipfilter/man/ippool.8
projects/camlock/contrib/ipfilter/md5.c
projects/camlock/contrib/ipfilter/mkfilters
projects/camlock/contrib/ipfilter/mlf_ipl.c
projects/camlock/contrib/ipfilter/mlf_rule.c
projects/camlock/contrib/ipfilter/mlfk_rule.c
projects/camlock/contrib/ipfilter/mlh_rule.c (contents, props changed)
projects/camlock/contrib/ipfilter/opts.h
projects/camlock/contrib/ipfilter/pcap-ipf.h
projects/camlock/contrib/ipfilter/perl/Ipfanaly.pl
projects/camlock/contrib/ipfilter/perl/Isbgraph
projects/camlock/contrib/ipfilter/perl/Services
projects/camlock/contrib/ipfilter/perl/ipfmeta.pl
projects/camlock/contrib/ipfilter/perl/logfilter.pl
projects/camlock/contrib/ipfilter/radix_ipf.h
projects/camlock/contrib/ipfilter/rules/BASIC_1.FW
projects/camlock/contrib/ipfilter/rules/BASIC_2.FW
projects/camlock/contrib/ipfilter/rules/firewall
projects/camlock/contrib/ipfilter/rules/ipmon.conf
projects/camlock/contrib/ipfilter/rules/server
projects/camlock/contrib/ipfilter/samples/proxy.c
projects/camlock/contrib/ipfilter/samples/relay.c
projects/camlock/contrib/ipfilter/snoop.h
projects/camlock/contrib/ipfilter/test/Makefile
projects/camlock/contrib/ipfilter/test/bpftest
projects/camlock/contrib/ipfilter/test/dotest
projects/camlock/contrib/ipfilter/test/expected/f11
projects/camlock/contrib/ipfilter/test/expected/f13
projects/camlock/contrib/ipfilter/test/expected/f18
projects/camlock/contrib/ipfilter/test/expected/i1
projects/camlock/contrib/ipfilter/test/expected/i10
projects/camlock/contrib/ipfilter/test/expected/i11
projects/camlock/contrib/ipfilter/test/expected/i12
projects/camlock/contrib/ipfilter/test/expected/i14
projects/camlock/contrib/ipfilter/test/expected/i17
projects/camlock/contrib/ipfilter/test/expected/i18
projects/camlock/contrib/ipfilter/test/expected/i2
projects/camlock/contrib/ipfilter/test/expected/i20
projects/camlock/contrib/ipfilter/test/expected/i3
projects/camlock/contrib/ipfilter/test/expected/i4
projects/camlock/contrib/ipfilter/test/expected/i5
projects/camlock/contrib/ipfilter/test/expected/i6
projects/camlock/contrib/ipfilter/test/expected/i7
projects/camlock/contrib/ipfilter/test/expected/i8
projects/camlock/contrib/ipfilter/test/expected/i9
projects/camlock/contrib/ipfilter/test/expected/in1
projects/camlock/contrib/ipfilter/test/expected/in2
projects/camlock/contrib/ipfilter/test/expected/in3
projects/camlock/contrib/ipfilter/test/expected/in5
projects/camlock/contrib/ipfilter/test/expected/in6
projects/camlock/contrib/ipfilter/test/expected/ip1
projects/camlock/contrib/ipfilter/test/expected/ip2
projects/camlock/contrib/ipfilter/test/expected/ipv6.6
projects/camlock/contrib/ipfilter/test/expected/l1
projects/camlock/contrib/ipfilter/test/expected/l1.b
projects/camlock/contrib/ipfilter/test/expected/n1
projects/camlock/contrib/ipfilter/test/expected/n10
projects/camlock/contrib/ipfilter/test/expected/n11
projects/camlock/contrib/ipfilter/test/expected/n12
projects/camlock/contrib/ipfilter/test/expected/n13
projects/camlock/contrib/ipfilter/test/expected/n14
projects/camlock/contrib/ipfilter/test/expected/n16
projects/camlock/contrib/ipfilter/test/expected/n2
projects/camlock/contrib/ipfilter/test/expected/n3
projects/camlock/contrib/ipfilter/test/expected/n4
projects/camlock/contrib/ipfilter/test/expected/n5
projects/camlock/contrib/ipfilter/test/expected/n6
projects/camlock/contrib/ipfilter/test/expected/n7
projects/camlock/contrib/ipfilter/test/expected/n8
projects/camlock/contrib/ipfilter/test/expected/n9
projects/camlock/contrib/ipfilter/test/expected/ni10
projects/camlock/contrib/ipfilter/test/expected/ni11
projects/camlock/contrib/ipfilter/test/expected/ni12
projects/camlock/contrib/ipfilter/test/expected/ni19
projects/camlock/contrib/ipfilter/test/expected/ni2
projects/camlock/contrib/ipfilter/test/expected/ni20
projects/camlock/contrib/ipfilter/test/expected/ni21
projects/camlock/contrib/ipfilter/test/expected/ni23
projects/camlock/contrib/ipfilter/test/expected/ni4
projects/camlock/contrib/ipfilter/test/expected/ni5
projects/camlock/contrib/ipfilter/test/expected/ni6
projects/camlock/contrib/ipfilter/test/expected/ni8
projects/camlock/contrib/ipfilter/test/expected/p1
projects/camlock/contrib/ipfilter/test/expected/p2
projects/camlock/contrib/ipfilter/test/expected/p3
projects/camlock/contrib/ipfilter/test/expected/p5
projects/camlock/contrib/ipfilter/test/input/f13
projects/camlock/contrib/ipfilter/test/input/f24
projects/camlock/contrib/ipfilter/test/input/ipv6.1
projects/camlock/contrib/ipfilter/test/input/ipv6.3
projects/camlock/contrib/ipfilter/test/input/ipv6.6
projects/camlock/contrib/ipfilter/test/input/n10
projects/camlock/contrib/ipfilter/test/input/n12
projects/camlock/contrib/ipfilter/test/input/n16
projects/camlock/contrib/ipfilter/test/input/n8
projects/camlock/contrib/ipfilter/test/input/n9
projects/camlock/contrib/ipfilter/test/input/ni1
projects/camlock/contrib/ipfilter/test/input/ni10
projects/camlock/contrib/ipfilter/test/input/ni11
projects/camlock/contrib/ipfilter/test/input/ni12
projects/camlock/contrib/ipfilter/test/input/ni13
projects/camlock/contrib/ipfilter/test/input/ni14
projects/camlock/contrib/ipfilter/test/input/ni15
projects/camlock/contrib/ipfilter/test/input/ni16
projects/camlock/contrib/ipfilter/test/input/ni19
projects/camlock/contrib/ipfilter/test/input/ni2
projects/camlock/contrib/ipfilter/test/input/ni20
projects/camlock/contrib/ipfilter/test/input/ni3
projects/camlock/contrib/ipfilter/test/input/ni4
projects/camlock/contrib/ipfilter/test/input/ni5
projects/camlock/contrib/ipfilter/test/input/ni7
projects/camlock/contrib/ipfilter/test/input/ni8
projects/camlock/contrib/ipfilter/test/input/ni9
projects/camlock/contrib/ipfilter/test/intest
projects/camlock/contrib/ipfilter/test/iptest
projects/camlock/contrib/ipfilter/test/itest
projects/camlock/contrib/ipfilter/test/logtest
projects/camlock/contrib/ipfilter/test/mtest
projects/camlock/contrib/ipfilter/test/natipftest
projects/camlock/contrib/ipfilter/test/nattest
projects/camlock/contrib/ipfilter/test/ptest
projects/camlock/contrib/ipfilter/test/regress/f13
projects/camlock/contrib/ipfilter/test/regress/i11
projects/camlock/contrib/ipfilter/test/regress/i12
projects/camlock/contrib/ipfilter/test/regress/i14
projects/camlock/contrib/ipfilter/test/regress/i17
projects/camlock/contrib/ipfilter/test/regress/i18
projects/camlock/contrib/ipfilter/test/regress/i2
projects/camlock/contrib/ipfilter/test/regress/i21
projects/camlock/contrib/ipfilter/test/regress/i7
projects/camlock/contrib/ipfilter/test/regress/i8
projects/camlock/contrib/ipfilter/test/regress/in2
projects/camlock/contrib/ipfilter/test/regress/ipv6.5
projects/camlock/contrib/ipfilter/test/regress/ipv6.6
projects/camlock/contrib/ipfilter/test/regress/ni13.nat
projects/camlock/contrib/ipfilter/test/regress/ni14.nat
projects/camlock/contrib/ipfilter/test/regress/p1.pool
projects/camlock/contrib/ipfilter/test/regress/p3.ipf
projects/camlock/contrib/ipfilter/test/test.format
projects/camlock/contrib/ipfilter/test/vfycksum.pl
projects/camlock/contrib/ipfilter/todo
projects/camlock/contrib/ipfilter/tools/BNF.ipf
projects/camlock/contrib/ipfilter/tools/Makefile
projects/camlock/contrib/ipfilter/tools/ipf.c
projects/camlock/contrib/ipfilter/tools/ipf_y.y
projects/camlock/contrib/ipfilter/tools/ipfcomp.c
projects/camlock/contrib/ipfilter/tools/ipfs.c
projects/camlock/contrib/ipfilter/tools/ipfstat.c
projects/camlock/contrib/ipfilter/tools/ipftest.c
projects/camlock/contrib/ipfilter/tools/ipmon.c
projects/camlock/contrib/ipfilter/tools/ipmon_y.y
projects/camlock/contrib/ipfilter/tools/ipnat.c
projects/camlock/contrib/ipfilter/tools/ipnat_y.y
projects/camlock/contrib/ipfilter/tools/ippool.c
projects/camlock/contrib/ipfilter/tools/ippool_y.y
projects/camlock/contrib/ipfilter/tools/ipscan_y.y
projects/camlock/contrib/ipfilter/tools/ipsyncm.c
projects/camlock/contrib/ipfilter/tools/ipsyncs.c
projects/camlock/contrib/ipfilter/tools/lex_var.h
projects/camlock/contrib/ipfilter/tools/lexer.c
projects/camlock/contrib/ipfilter/tools/lexer.h
projects/camlock/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
projects/camlock/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
projects/camlock/contrib/tcpdump/tcpdump.c
projects/camlock/etc/mtree/BSD.include.dist
projects/camlock/etc/mtree/BSD.var.dist
projects/camlock/gnu/lib/Makefile
projects/camlock/gnu/usr.bin/cc/Makefile
projects/camlock/include/iconv.h
projects/camlock/lib/libc++/Makefile
projects/camlock/lib/libc/Makefile
projects/camlock/lib/libc/iconv/citrus_iconv_local.h
projects/camlock/lib/libc/include/compat.h
projects/camlock/lib/libc/net/getaddrinfo.c
projects/camlock/lib/libc/net/if_nametoindex.c
projects/camlock/lib/libc/net/name6.c
projects/camlock/lib/libc/net/nscachedcli.c
projects/camlock/lib/libc/resolv/res_send.c
projects/camlock/lib/libc/stdio/flags.c
projects/camlock/lib/libc/sys/Symbol.map
projects/camlock/lib/libc/sys/sigaction.2
projects/camlock/lib/libc/sys/sigpending.2
projects/camlock/lib/libc/sys/sigreturn.2
projects/camlock/lib/libc/sys/sigwait.2
projects/camlock/lib/libiconv_modules/Makefile.inc
projects/camlock/lib/libprocstat/libprocstat.c
projects/camlock/lib/libprocstat/libprocstat.h
projects/camlock/lib/libusb/libusb20_ugen20.c
projects/camlock/lib/msun/Makefile
projects/camlock/lib/msun/Symbol.map
projects/camlock/release/picobsd/build/picobsd
projects/camlock/sbin/camcontrol/camcontrol.8
projects/camlock/sbin/camcontrol/camcontrol.c
projects/camlock/sbin/camcontrol/fwdownload.c
projects/camlock/sbin/dhclient/bpf.c
projects/camlock/sbin/dhclient/dhclient.c
projects/camlock/sbin/hastd/subr.c
projects/camlock/sbin/ipf/ipf/Makefile
projects/camlock/sbin/ipf/ipftest/Makefile
projects/camlock/sbin/ipf/libipf/Makefile
projects/camlock/sbin/newfs_msdos/newfs_msdos.c
projects/camlock/sbin/swapon/swapon.c
projects/camlock/share/man/man4/capsicum.4
projects/camlock/share/man/man4/netgraph.4
projects/camlock/share/man/man4/ntb.4
projects/camlock/share/man/man4/procdesc.4
projects/camlock/share/man/man5/src.conf.5
projects/camlock/share/man/man9/Makefile
projects/camlock/share/misc/committers-ports.dot
projects/camlock/share/misc/committers-src.dot
projects/camlock/share/mk/bsd.own.mk
projects/camlock/sys/amd64/amd64/apic_vector.S
projects/camlock/sys/amd64/amd64/genassym.c
projects/camlock/sys/amd64/amd64/mp_machdep.c
projects/camlock/sys/amd64/amd64/pmap.c
projects/camlock/sys/amd64/amd64/vm_machdep.c
projects/camlock/sys/amd64/conf/NOTES
projects/camlock/sys/amd64/include/cpu.h
projects/camlock/sys/amd64/include/cpufunc.h
projects/camlock/sys/amd64/include/pcpu.h
projects/camlock/sys/amd64/include/pmap.h
projects/camlock/sys/amd64/include/sf_buf.h
projects/camlock/sys/amd64/include/smp.h
projects/camlock/sys/amd64/linux32/linux32_machdep.c
projects/camlock/sys/amd64/vmm/intel/vmx.c
projects/camlock/sys/amd64/vmm/io/ppt.c
projects/camlock/sys/amd64/vmm/vmm_msr.c
projects/camlock/sys/amd64/vmm/x86.c
projects/camlock/sys/amd64/vmm/x86.h
projects/camlock/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
projects/camlock/sys/arm/include/sf_buf.h
projects/camlock/sys/bsm/audit_kevents.h
projects/camlock/sys/bsm/audit_record.h
projects/camlock/sys/cam/scsi/scsi_da.c
projects/camlock/sys/cam/scsi/scsi_da.h
projects/camlock/sys/cam/scsi/scsi_enc_ses.c
projects/camlock/sys/cddl/compat/opensolaris/sys/file.h
projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c
projects/camlock/sys/compat/freebsd32/freebsd32_capability.c
projects/camlock/sys/compat/freebsd32/freebsd32_ioctl.c
projects/camlock/sys/compat/freebsd32/freebsd32_misc.c
projects/camlock/sys/compat/freebsd32/freebsd32_proto.h
projects/camlock/sys/compat/freebsd32/freebsd32_syscall.h
projects/camlock/sys/compat/freebsd32/freebsd32_syscalls.c
projects/camlock/sys/compat/freebsd32/freebsd32_sysent.c
projects/camlock/sys/compat/freebsd32/freebsd32_systrace_args.c
projects/camlock/sys/compat/freebsd32/syscalls.master
projects/camlock/sys/compat/linux/linux_file.c
projects/camlock/sys/compat/linux/linux_ioctl.c
projects/camlock/sys/compat/linux/linux_socket.c
projects/camlock/sys/compat/svr4/svr4_fcntl.c
projects/camlock/sys/compat/svr4/svr4_filio.c
projects/camlock/sys/compat/svr4/svr4_ioctl.c
projects/camlock/sys/compat/svr4/svr4_misc.c
projects/camlock/sys/compat/svr4/svr4_stream.c
projects/camlock/sys/conf/files
projects/camlock/sys/conf/files.mips
projects/camlock/sys/conf/files.powerpc
projects/camlock/sys/contrib/ipfilter/netinet/fil.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_auth.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_auth.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_compat.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_fil.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed)
projects/camlock/sys/contrib/ipfilter/netinet/ip_frag.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_frag.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_htable.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_htable.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_irc_pxy.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_log.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_lookup.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_lookup.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_nat.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_nat.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_pool.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_pool.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_proxy.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_proxy.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c (contents, props changed)
projects/camlock/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_rules.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_scan.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_scan.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_state.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_state.h
projects/camlock/sys/contrib/ipfilter/netinet/ip_sync.c
projects/camlock/sys/contrib/ipfilter/netinet/ip_sync.h
projects/camlock/sys/contrib/ipfilter/netinet/ipl.h
projects/camlock/sys/contrib/ipfilter/netinet/mlfk_ipl.c
projects/camlock/sys/dev/aac/aac_linux.c
projects/camlock/sys/dev/aacraid/aacraid_linux.c
projects/camlock/sys/dev/amr/amr_linux.c
projects/camlock/sys/dev/atkbdc/psm.c
projects/camlock/sys/dev/cfi/cfi_bus_nexus.c
projects/camlock/sys/dev/cfi/cfi_core.c
projects/camlock/sys/dev/cfi/cfi_dev.c
projects/camlock/sys/dev/cfi/cfi_disk.c
projects/camlock/sys/dev/cfi/cfi_reg.h
projects/camlock/sys/dev/cfi/cfi_var.h
projects/camlock/sys/dev/filemon/filemon.c
projects/camlock/sys/dev/gpio/gpiobus.c
projects/camlock/sys/dev/gxemul/cons/gxemul_cons.c
projects/camlock/sys/dev/gxemul/disk/gxemul_disk.c
projects/camlock/sys/dev/gxemul/disk/gxemul_diskreg.h
projects/camlock/sys/dev/gxemul/ether/gxreg.h
projects/camlock/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
projects/camlock/sys/dev/hwpmc/hwpmc_logging.c
projects/camlock/sys/dev/hwpmc/hwpmc_powerpc.c
projects/camlock/sys/dev/ipmi/ipmi_linux.c
projects/camlock/sys/dev/iscsi_initiator/iscsi.c
projects/camlock/sys/dev/mfi/mfi_linux.c
projects/camlock/sys/dev/ntb/if_ntb/if_ntb.c
projects/camlock/sys/dev/ntb/ntb_hw/ntb_hw.c
projects/camlock/sys/dev/ntb/ntb_hw/ntb_hw.h
projects/camlock/sys/dev/ntb/ntb_hw/ntb_regs.h
projects/camlock/sys/dev/tdfx/tdfx_linux.c
projects/camlock/sys/dev/usb/controller/xhci.c
projects/camlock/sys/dev/usb/usbdevs
projects/camlock/sys/dev/usb/wlan/if_run.c
projects/camlock/sys/dev/xen/blkback/blkback.c
projects/camlock/sys/fs/ext2fs/ext2_htree.c
projects/camlock/sys/fs/ext2fs/ext2_lookup.c
projects/camlock/sys/fs/fdescfs/fdesc_vnops.c
projects/camlock/sys/fs/fuse/fuse_vfsops.c
projects/camlock/sys/fs/nfsclient/nfs_clkrpc.c
projects/camlock/sys/fs/nfsclient/nfs_clport.c
projects/camlock/sys/fs/nfsserver/nfs_nfsdport.c
projects/camlock/sys/geom/part/g_part_ldm.c
projects/camlock/sys/i386/conf/NOTES
projects/camlock/sys/i386/i386/mp_machdep.c
projects/camlock/sys/i386/ibcs2/ibcs2_fcntl.c
projects/camlock/sys/i386/ibcs2/ibcs2_ioctl.c
projects/camlock/sys/i386/ibcs2/ibcs2_misc.c
projects/camlock/sys/i386/include/cpu.h
projects/camlock/sys/i386/include/pcpu.h
projects/camlock/sys/i386/include/sf_buf.h
projects/camlock/sys/i386/include/smp.h
projects/camlock/sys/i386/linux/linux_machdep.c
projects/camlock/sys/i386/xen/mp_machdep.c
projects/camlock/sys/ia64/ia64/vm_machdep.c
projects/camlock/sys/ia64/include/sf_buf.h
projects/camlock/sys/kern/capabilities.conf
projects/camlock/sys/kern/init_sysent.c
projects/camlock/sys/kern/kern_descrip.c
projects/camlock/sys/kern/kern_event.c
projects/camlock/sys/kern/kern_exec.c
projects/camlock/sys/kern/kern_jail.c
projects/camlock/sys/kern/kern_ktrace.c
projects/camlock/sys/kern/kern_mbuf.c
projects/camlock/sys/kern/kern_sig.c
projects/camlock/sys/kern/subr_witness.c
projects/camlock/sys/kern/sys_capability.c
projects/camlock/sys/kern/sys_generic.c
projects/camlock/sys/kern/sys_procdesc.c
projects/camlock/sys/kern/syscalls.c
projects/camlock/sys/kern/syscalls.master
projects/camlock/sys/kern/systrace_args.c
projects/camlock/sys/kern/tty.c
projects/camlock/sys/kern/uipc_mqueue.c
projects/camlock/sys/kern/uipc_sem.c
projects/camlock/sys/kern/uipc_syscalls.c
projects/camlock/sys/kern/uipc_usrreq.c
projects/camlock/sys/kern/vfs_acl.c
projects/camlock/sys/kern/vfs_aio.c
projects/camlock/sys/kern/vfs_bio.c
projects/camlock/sys/kern/vfs_extattr.c
projects/camlock/sys/kern/vfs_lookup.c
projects/camlock/sys/kern/vfs_syscalls.c
projects/camlock/sys/mips/atheros/ar71xx_gpio.c
projects/camlock/sys/mips/atheros/ar71xx_gpiovar.h
projects/camlock/sys/mips/atheros/if_arge.c
projects/camlock/sys/mips/gxemul/mpreg.h
projects/camlock/sys/mips/include/sf_buf.h
projects/camlock/sys/mips/mips/vm_machdep.c
projects/camlock/sys/modules/ipfilter/Makefile
projects/camlock/sys/net/netisr.c
projects/camlock/sys/netgraph/netflow/ng_netflow.h
projects/camlock/sys/netinet/ip_mroute.c
projects/camlock/sys/netinet/sctp_indata.c
projects/camlock/sys/netinet6/ip6_mroute.c
projects/camlock/sys/netsmb/smb_dev.c
projects/camlock/sys/nfsserver/nfs_srvkrpc.c
projects/camlock/sys/nlm/nlm_prot_impl.c
projects/camlock/sys/ofed/include/linux/file.h
projects/camlock/sys/powerpc/aim/vm_machdep.c
projects/camlock/sys/powerpc/include/frame.h
projects/camlock/sys/powerpc/include/sf_buf.h
projects/camlock/sys/rpc/clnt_dg.c
projects/camlock/sys/security/audit/audit.h
projects/camlock/sys/security/audit/audit_arg.c
projects/camlock/sys/security/audit/audit_bsm.c
projects/camlock/sys/security/audit/audit_bsm_klib.c
projects/camlock/sys/security/audit/audit_private.h
projects/camlock/sys/security/audit/bsm_token.c
projects/camlock/sys/security/mac/mac_syscalls.c
projects/camlock/sys/sparc64/include/sf_buf.h
projects/camlock/sys/sys/_types.h
projects/camlock/sys/sys/capability.h
projects/camlock/sys/sys/file.h
projects/camlock/sys/sys/filedesc.h
projects/camlock/sys/sys/ktrace.h
projects/camlock/sys/sys/namei.h
projects/camlock/sys/sys/param.h
projects/camlock/sys/sys/procdesc.h
projects/camlock/sys/sys/sf_buf.h
projects/camlock/sys/sys/syscall.h
projects/camlock/sys/sys/syscall.mk
projects/camlock/sys/sys/sysproto.h
projects/camlock/sys/sys/types.h
projects/camlock/sys/sys/user.h
projects/camlock/sys/ufs/ffs/ffs_alloc.c
projects/camlock/sys/vm/vm_mmap.c
projects/camlock/sys/vm/vm_page.c
projects/camlock/sys/x86/xen/hvm.c
projects/camlock/sys/x86/xen/xen_intr.c
projects/camlock/sys/xen/xen_intr.h
projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc
projects/camlock/tools/build/options/WITHOUT_GCC
projects/camlock/tools/regression/lib/libc/stdio/test-fmemopen.t
projects/camlock/tools/regression/lib/libc/stdio/test-open_memstream.t
projects/camlock/tools/regression/lib/libc/stdio/test-open_wmemstream.t
projects/camlock/usr.bin/bmake/Makefile
projects/camlock/usr.bin/bmake/unit-tests/Makefile
projects/camlock/usr.bin/kdump/kdump.c
projects/camlock/usr.bin/kdump/mksubr
projects/camlock/usr.bin/patch/pch.c
projects/camlock/usr.bin/patch/util.c
projects/camlock/usr.bin/procstat/procstat_files.c
projects/camlock/usr.bin/rwho/rwho.c
projects/camlock/usr.bin/uniq/uniq.c
projects/camlock/usr.sbin/bhyve/ioapic.c
projects/camlock/usr.sbin/bsdconfig/examples/browse_packages.sh
projects/camlock/usr.sbin/rwhod/rwhod.c
projects/camlock/usr.sbin/watch/watch.c
Directory Properties:
projects/camlock/ (props changed)
projects/camlock/contrib/bmake/ (props changed)
projects/camlock/contrib/ipfilter/ (props changed)
projects/camlock/contrib/ipfilter/test/expected/i19 (props changed)
projects/camlock/contrib/llvm/ (props changed)
projects/camlock/contrib/llvm/tools/clang/ (props changed)
projects/camlock/contrib/tcpdump/ (props changed)
projects/camlock/gnu/lib/ (props changed)
projects/camlock/lib/libc/ (props changed)
projects/camlock/sbin/ (props changed)
projects/camlock/share/man/man4/ (props changed)
projects/camlock/sys/ (props changed)
projects/camlock/sys/amd64/vmm/ (props changed)
projects/camlock/sys/cddl/contrib/opensolaris/ (props changed)
projects/camlock/sys/conf/ (props changed)
projects/camlock/sys/contrib/ipfilter/ (props changed)
projects/camlock/usr.bin/procstat/ (props changed)
projects/camlock/usr.sbin/bhyve/ (props changed)
Modified: projects/camlock/Makefile
==============================================================================
--- projects/camlock/Makefile Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/Makefile Sat Sep 7 07:36:12 2013 (r255349)
@@ -498,3 +498,11 @@ universe_epilogue:
buildLINT:
${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT
+
+.if defined(.PARSEDIR)
+.if make(universe)
+# we do not want a failure of one branch abort all.
+MAKE_JOB_ERROR_TOKEN= no
+.export MAKE_JOB_ERROR_TOKEN
+.endif
+.endif
Modified: projects/camlock/UPDATING
==============================================================================
--- projects/camlock/UPDATING Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/UPDATING Sat Sep 7 07:36:12 2013 (r255349)
@@ -31,6 +31,26 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20130906:
+ The GNU Compiler Collection and C++ standard library (libstdc++)
+ are no longer built by default on platforms where clang is the system
+ compiler. You can enable them with the WITH_GCC and WITH_GNUCXX
+ options in src.conf.
+
+20130905:
+ The PROCDESC kernel option is now part of the GENERIC kernel
+ configuration and is required for the rwhod(8) to work.
+ If you are using custom kernel configuration, you should include
+ 'options PROCDESC'.
+
+20130905:
+ The API and ABI related to the Capsicum framework was modified
+ in backward incompatible way. The userland libraries and programs
+ have to be recompiled to work with the new kernel. This includes the
+ following libraries and programs, but the whole buildworld is
+ advised: libc, libprocstat, dhclient, tcpdump, hastd, hastctl,
+ kdump, procstat, rwho, rwhod, uniq.
+
20130827:
Thomas Dickey (vendor author thereof) reports that dialog(1) since
2011/10/18 has a bug in handling --hline. Testers and I noticed the
Modified: projects/camlock/bin/sh/eval.c
==============================================================================
--- projects/camlock/bin/sh/eval.c Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/bin/sh/eval.c Sat Sep 7 07:36:12 2013 (r255349)
@@ -324,7 +324,7 @@ skipping: if (evalskip == SKIPCONT &&
}
if (evalskip == SKIPBREAK && --skipcount <= 0)
evalskip = 0;
- if (evalskip == SKIPFUNC || evalskip == SKIPFILE)
+ if (evalskip == SKIPRETURN)
status = exitstatus;
break;
}
@@ -1068,7 +1068,7 @@ evalcommand(union node *cmd, int flags,
funcnest--;
popredir();
INTON;
- if (evalskip == SKIPFUNC) {
+ if (evalskip == SKIPRETURN) {
evalskip = 0;
skipcount = 0;
}
@@ -1305,14 +1305,8 @@ returncmd(int argc, char **argv)
{
int ret = argc > 1 ? number(argv[1]) : oexitstatus;
- if (funcnest) {
- evalskip = SKIPFUNC;
- skipcount = 1;
- } else {
- /* skip the rest of the file */
- evalskip = SKIPFILE;
- skipcount = 1;
- }
+ evalskip = SKIPRETURN;
+ skipcount = 1;
return ret;
}
Modified: projects/camlock/bin/sh/eval.h
==============================================================================
--- projects/camlock/bin/sh/eval.h Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/bin/sh/eval.h Sat Sep 7 07:36:12 2013 (r255349)
@@ -67,5 +67,4 @@ extern int skipcount;
/* reasons for skipping commands (see comment on breakcmd routine) */
#define SKIPBREAK 1
#define SKIPCONT 2
-#define SKIPFUNC 3
-#define SKIPFILE 4
+#define SKIPRETURN 3
Modified: projects/camlock/bin/sh/main.c
==============================================================================
--- projects/camlock/bin/sh/main.c Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/bin/sh/main.c Sat Sep 7 07:36:12 2013 (r255349)
@@ -231,7 +231,7 @@ cmdloop(int top)
popstackmark(&smark);
setstackmark(&smark);
if (evalskip != 0) {
- if (evalskip == SKIPFILE)
+ if (evalskip == SKIPRETURN)
evalskip = 0;
break;
}
Modified: projects/camlock/bin/sh/sh.1
==============================================================================
--- projects/camlock/bin/sh/sh.1 Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/bin/sh/sh.1 Sat Sep 7 07:36:12 2013 (r255349)
@@ -1145,8 +1145,10 @@ command is
.Pp
.D1 Ic return Op Ar exitstatus
.Pp
-It terminates the current executional scope, returning from the previous
-nested function, sourced script, or shell instance, in that order.
+It terminates the current executional scope, returning from the closest
+nested function or sourced script;
+if no function or sourced script is being executed,
+it exits the shell instance.
The
.Ic return
command is implemented as a special built-in command.
Modified: projects/camlock/contrib/bmake/ChangeLog
==============================================================================
--- projects/camlock/contrib/bmake/ChangeLog Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/ChangeLog Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,3 +1,24 @@
+2013-09-04 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * Makefile (MAKE_VERSION): 20130904
+ Merge with NetBSD make, pick up
+ o Add VAR_INTERNAL context, so that internal setting of
+ MAKEFILE does not override value set by makefiles.
+
+2013-09-02 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * Makefile (MAKE_VERSION): 20130902
+ Merge with NetBSD make, pick up
+ o CompatRunCommand: only apply shellErrFlag when errCheck is true
+
+2013-08-28 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * Makefile (MAKE_VERSION): 20130828
+ Merge with NetBSD make, pick up
+ o Fix VAR :sh = syntax from Will Andrews at freebsd.org
+ o Call Job_SetPrefix() from Job_Init() so makefiles have
+ opportunity to set .MAKE.JOB.PREFIX
+
2013-07-30 Simon J. Gerraty <sjg at bad.crufty.net>
* Makefile (MAKE_VERSION): 20130730
Modified: projects/camlock/contrib/bmake/FILES
==============================================================================
--- projects/camlock/contrib/bmake/FILES Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/FILES Sat Sep 7 07:36:12 2013 (r255349)
@@ -114,6 +114,7 @@ unit-tests/order
unit-tests/phony-end
unit-tests/posix
unit-tests/qequals
+unit-tests/sunshcmd
unit-tests/sysv
unit-tests/ternary
unit-tests/test.exp
Modified: projects/camlock/contrib/bmake/Makefile
==============================================================================
--- projects/camlock/contrib/bmake/Makefile Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/Makefile Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.17 2013/07/30 19:13:53 sjg Exp $
+# $Id: Makefile,v 1.20 2013/09/04 15:42:03 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20130730
+MAKE_VERSION= 20130904
PROG= bmake
Modified: projects/camlock/contrib/bmake/bmake.1
==============================================================================
--- projects/camlock/contrib/bmake/bmake.1 Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/bmake.1 Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.220 2013/07/30 19:09:57 sjg Exp $
+.\" $NetBSD: make.1,v 1.222 2013/08/11 09:53:49 apb Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)make.1 8.4 (Berkeley) 3/19/94
.\"
-.Dd July 30, 2013
+.Dd August 11, 2013
.Dt MAKE 1
.Os
.Sh NAME
@@ -1971,6 +1971,12 @@ If the source is the special
.Ic .DOTLAST
target, then the current working
directory is searched last.
+.It Ic .PATH. Ns Va suffix
+Like
+.Ic .PATH
+but applies only to files with a particular suffix.
+The suffix must have been previously declared with
+.Ic .SUFFIXES .
.It Ic .PHONY
Apply the
.Ic .PHONY
Modified: projects/camlock/contrib/bmake/bmake.cat1
==============================================================================
--- projects/camlock/contrib/bmake/bmake.cat1 Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/bmake.cat1 Sat Sep 7 07:36:12 2013 (r255349)
@@ -1257,6 +1257,10 @@ SSPPEECCIIAALL TTAARRGGEETT
source is the special ..DDOOTTLLAASSTT target, then the current working
directory is searched last.
+ ..PPAATTHH.._s_u_f_f_i_x
+ Like ..PPAATTHH but applies only to files with a particular suffix.
+ The suffix must have been previously declared with ..SSUUFFFFIIXXEESS.
+
..PPHHOONNYY Apply the ..PPHHOONNYY attribute to any specified sources.
..PPRREECCIIOOUUSS
@@ -1374,4 +1378,4 @@ BBUUGGSS
There is no way of escaping a space character in a filename.
-NetBSD 5.1 July 30, 2013 NetBSD 5.1
+NetBSD 5.1 August 11, 2013 NetBSD 5.1
Modified: projects/camlock/contrib/bmake/compat.c
==============================================================================
--- projects/camlock/contrib/bmake/compat.c Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/compat.c Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.92 2013/07/05 22:14:56 sjg Exp $ */
+/* $NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: compat.c,v 1.92 2013/07/05 22:14:56 sjg Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: compat.c,v 1.92 2013/07/05 22:14:56 sjg Exp $");
+__RCSID("$NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $");
#endif
#endif /* not lint */
#endif
Modified: projects/camlock/contrib/bmake/job.c
==============================================================================
--- projects/camlock/contrib/bmake/job.c Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/job.c Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $ */
+/* $NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $");
+__RCSID("$NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -178,6 +178,14 @@ __RCSID("$NetBSD: job.c,v 1.175 2013/07/
*/
#define MAKE_ALWAYS_PASS_JOB_QUEUE ".MAKE.ALWAYS_PASS_JOB_QUEUE"
static int Always_pass_job_queue = TRUE;
+/*
+ * FreeBSD: aborting entire parallel make isn't always
+ * desired. When doing tinderbox for example, failure of
+ * one architecture should not stop all.
+ * We still want to bail on interrupt though.
+ */
+#define MAKE_JOB_ERROR_TOKEN "MAKE_JOB_ERROR_TOKEN"
+static int Job_error_token = TRUE;
/*
* error handling variables
@@ -2237,6 +2245,9 @@ Job_Init(void)
Always_pass_job_queue = getBoolean(MAKE_ALWAYS_PASS_JOB_QUEUE,
Always_pass_job_queue);
+ Job_error_token = getBoolean(MAKE_JOB_ERROR_TOKEN, Job_error_token);
+
+
/*
* There is a non-zero chance that we already have children.
* eg after 'make -f- <<EOF'
@@ -2832,13 +2843,19 @@ JobTokenAdd(void)
{
char tok = JOB_TOKENS[aborting], tok1;
+ if (!Job_error_token && aborting == ABORT_ERROR) {
+ if (jobTokensRunning == 0)
+ return;
+ tok = '+'; /* no error token */
+ }
+
/* If we are depositing an error token flush everything else */
while (tok != '+' && read(tokenWaitJob.inPipe, &tok1, 1) == 1)
continue;
if (DEBUG(JOB))
fprintf(debug_file, "(%d) aborting %d, deposit token %c\n",
- getpid(), aborting, JOB_TOKENS[aborting]);
+ getpid(), aborting, tok);
while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && errno == EAGAIN)
continue;
}
Modified: projects/camlock/contrib/bmake/main.c
==============================================================================
--- projects/camlock/contrib/bmake/main.c Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/main.c Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $ */
+/* $NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -1414,7 +1414,7 @@ ReadMakefile(const void *p, const void *
if (!strcmp(fname, "-")) {
Parse_File(NULL /*stdin*/, -1);
- Var_Set("MAKEFILE", "", VAR_GLOBAL, 0);
+ Var_Set("MAKEFILE", "", VAR_INTERNAL, 0);
} else {
/* if we've chdir'd, rebuild the path name */
if (strcmp(curdir, objdir) && *fname != '/') {
@@ -1463,7 +1463,7 @@ ReadMakefile(const void *p, const void *
*/
found:
if (!doing_depend)
- Var_Set("MAKEFILE", fname, VAR_GLOBAL, 0);
+ Var_Set("MAKEFILE", fname, VAR_INTERNAL, 0);
Parse_File(fname, fd);
}
free(path);
Modified: projects/camlock/contrib/bmake/make.1
==============================================================================
--- projects/camlock/contrib/bmake/make.1 Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/make.1 Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.220 2013/07/30 19:09:57 sjg Exp $
+.\" $NetBSD: make.1,v 1.222 2013/08/11 09:53:49 apb Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)make.1 8.4 (Berkeley) 3/19/94
.\"
-.Dd July 30, 2013
+.Dd August 11, 2013
.Dt MAKE 1
.Os
.Sh NAME
@@ -1982,6 +1982,12 @@ If the source is the special
.Ic .DOTLAST
target, then the current working
directory is searched last.
+.It Ic .PATH. Ns Va suffix
+Like
+.Ic .PATH
+but applies only to files with a particular suffix.
+The suffix must have been previously declared with
+.Ic .SUFFIXES .
.It Ic .PHONY
Apply the
.Ic .PHONY
Modified: projects/camlock/contrib/bmake/make.h
==============================================================================
--- projects/camlock/contrib/bmake/make.h Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/make.h Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.91 2013/06/18 20:06:09 sjg Exp $ */
+/* $NetBSD: make.h,v 1.92 2013/09/04 15:38:26 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -404,6 +404,10 @@ extern Boolean varNoExportEnv; /* TRUE i
extern GNode *DEFAULT; /* .DEFAULT rule */
+extern GNode *VAR_INTERNAL; /* Variables defined internally by make
+ * which should not override those set by
+ * makefiles.
+ */
extern GNode *VAR_GLOBAL; /* Variables defined in a global context, e.g
* in the Makefile itself */
extern GNode *VAR_CMD; /* Variables defined on the command line */
Modified: projects/camlock/contrib/bmake/mk/ChangeLog
==============================================================================
--- projects/camlock/contrib/bmake/mk/ChangeLog Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/mk/ChangeLog Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,3 +1,14 @@
+2013-09-04 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * gendirdeps.mk (_objtops): fix typo also
+ while processing M2D_OBJROOTS to gather qualdir_list
+ qualify $ql with loop iterator to ensure correct results.
+
+2013-08-01 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * install-mk (MK_VERSION): 20130801
+ * libs.mk: update to match progs.mk
+
2013-07-26 Simon J. Gerraty <sjg at bad.crufty.net>
* install-mk (MK_VERSION): 20130726
Modified: projects/camlock/contrib/bmake/mk/gendirdeps.mk
==============================================================================
--- projects/camlock/contrib/bmake/mk/gendirdeps.mk Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/mk/gendirdeps.mk Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,4 +1,4 @@
-# $Id: gendirdeps.mk,v 1.22 2013/05/11 05:16:26 sjg Exp $
+# $Id: gendirdeps.mk,v 1.23 2013/09/04 17:49:20 sjg Exp $
# Copyright (c) 2010-2013, Juniper Networks, Inc.
# All rights reserved.
@@ -162,7 +162,7 @@ dir_list != cd ${_OBJDIR} && \
.warning Skipping ${_DEPENDFILE:S,${SRCTOP}/,,}
# we are not going to update anything
.else
-
+dpadd_dir_list=
.if !empty(DPADD)
_nonlibs := ${DPADD:T:Nlib*:N*include}
.if !empty(_nonlibs)
@@ -174,6 +174,7 @@ ddep_list += $f.dirdep
ddep_list += ${f:H}.dirdep
.else
dir_list += ${f:H:tA}
+dpadd_dir_list += ${f:H:tA}
.endif
.endfor
.if !empty(ddep_list)
@@ -197,7 +198,7 @@ dir_list += ${ddeps}
# so we add
# ${"${dir_list:M*bsd/sys/${MACHINE_ARCH}/include}":?bsd/include:}
# to GENDIRDEPS_DIR_LIST_XTRAS
-_objtops = ${OBJTOP} ${_OBJTOP} ${_obtop}
+_objtops = ${OBJTOP} ${_OBJTOP} ${_objtop}
_objtops := ${_objtops:O:u}
dirdep_list = \
${_objtops:@o@${dir_list:M$o*/*:C,$o[^/]*/,,}@} \
@@ -212,8 +213,11 @@ M2D_OBJROOTS := ${M2D_OBJROOTS:O:u:[-1..
skip_ql= ${SRCTOP}* ${_objtops:@o@$o*@}
.for o in ${M2D_OBJROOTS:${skip_ql:${M_ListToSkip}}}
# we need := so only skip_ql to this point applies
-ql := ${dir_list:${skip_ql:${M_ListToSkip}}:M$o*/*/*:C,$o([^/]+)/(.*),\2.\1,:S,.${HOST_TARGET},.host,}
-qualdir_list += ${ql}
+ql.$o := ${dir_list:${skip_ql:${M_ListToSkip}}:M$o*/*/*:C,$o([^/]+)/(.*),\2.\1,:S,.${HOST_TARGET},.host,}
+qualdir_list += ${ql.$o}
+.if ${DEBUG_GENDIRDEPS:Uno:@x@${RELDIR:M$x}@} != ""
+.info ${RELDIR}: o=$o ${ql.$o qualdir_list:L:@v@$v=${$v}@}
+.endif
skip_ql+= $o*
.endfor
@@ -241,6 +245,7 @@ DIRDEPS := ${DIRDEPS:${GENDIRDEPS_FILTER
.if ${DEBUG_GENDIRDEPS:Uno:@x@${RELDIR:M$x}@} != ""
.info ${RELDIR}: M2D_OBJROOTS=${M2D_OBJROOTS}
.info ${RELDIR}: dir_list='${dir_list}'
+.info ${RELDIR}: dpadd_dir_list='${dpadd_dir_list}'
.info ${RELDIR}: dirdep_list='${dirdep_list}'
.info ${RELDIR}: qualdir_list='${qualdir_list}'
.info ${RELDIR}: SKIP_GENDIRDEPS='${SKIP_GENDIRDEPS}'
Modified: projects/camlock/contrib/bmake/mk/install-mk
==============================================================================
--- projects/camlock/contrib/bmake/mk/install-mk Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/mk/install-mk Sat Sep 7 07:36:12 2013 (r255349)
@@ -55,7 +55,7 @@
# Simon J. Gerraty <sjg at crufty.net>
# RCSid:
-# $Id: install-mk,v 1.92 2013/07/27 05:37:37 sjg Exp $
+# $Id: install-mk,v 1.93 2013/08/02 18:28:47 sjg Exp $
#
# @(#) Copyright (c) 1994 Simon J. Gerraty
#
@@ -70,7 +70,7 @@
# sjg at crufty.net
#
-MK_VERSION=20130726
+MK_VERSION=20130801
OWNER=
GROUP=
MODE=444
Modified: projects/camlock/contrib/bmake/mk/libs.mk
==============================================================================
--- projects/camlock/contrib/bmake/mk/libs.mk Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/mk/libs.mk Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,4 +1,4 @@
-# $Id: libs.mk,v 1.2 2007/04/30 17:39:27 sjg Exp $
+# $Id: libs.mk,v 1.3 2013/08/02 18:28:48 sjg Exp $
#
# @(#) Copyright (c) 2006, Simon J. Gerraty
#
@@ -17,7 +17,15 @@
.if defined(LIBS)
+# In meta mode, we can capture dependenices for _one_ of the progs.
+# if makefile doesn't nominate one, we use the first.
+.ifndef UPDATE_DEPENDFILE_LIB
+UPDATE_DEPENDFILE_LIB = ${LIBS:[1]}
+.export UPDATE_DEPENDFILE_LIB
+.endif
+
.ifndef LIB
+# They may have asked us to build just one
.for t in ${LIBS:R:T:S,^lib,,}
.if make(lib$t)
LIB?= $t
@@ -28,14 +36,41 @@ lib$t: all
.if defined(LIB)
# just one of many
-.for v in DPADD SRCS CFLAGS ${LIB_VARS}
-$v += ${${v}_lib${LIB}}
+LIB_VARS += \
+ LIBDIR \
+ CFLAGS \
+ COPTS \
+ CPPFLAGS \
+ CXXFLAGS \
+ DPADD \
+ DPLIBS \
+ LDADD \
+ LDFLAGS \
+ MAN \
+ SRCS
+
+.for v in ${LIB_VARS:O:u}
+.if defined(${v}.${LIB}) || defined(${v}_${LIB})
+$v += ${${v}_${LIB}:U${${v}.${LIB}}}
+.endif
.endfor
+
+# for meta mode, there can be only one!
+.if ${LIB} == ${UPDATE_DEPENDFILE_LIB:Uno}
+UPDATE_DEPENDFILE ?= yes
+.endif
+UPDATE_DEPENDFILE ?= NO
+
# ensure that we don't clobber each other's dependencies
DEPENDFILE?= .depend.${LIB}
# lib.mk will do the rest
.else
all: ${LIBS:S,^lib,,:@t at lib$t.a@} .MAKE
+
+# We cannot capture dependencies for meta mode here
+UPDATE_DEPENDFILE = NO
+# nor can we safely run in parallel.
+.NOTPARALLEL:
.endif
.endif
@@ -43,12 +78,16 @@ all: ${LIBS:S,^lib,,:@t at lib$t.a@} .MAKE
.include <${.PARSEFILE:S,libs,lib,}>
.ifndef LIB
-.for t in ${LIBS:R:T:S,^lib,,}
-lib$t.a: ${SRCS} ${DPADD} ${SRCS_lib$t} ${DPADD_lib$t}
- (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$t)
+# tell libs.mk we might want to install things
+LIBS_TARGETS+= cleandepend cleandir cleanobj depend install
-clean: $t.clean
-$t.clean:
- (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$t ${@:E})
+.for b in ${LIBS:R:T:S,^lib,,}
+lib$b.a: ${SRCS} ${DPADD} ${SRCS_lib$b} ${DPADD_lib$b}
+ (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$b)
+
+.for t in ${LIBS_TARGETS:O:u}
+$b.$t: .PHONY .MAKE
+ (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$b ${@:E})
+.endfor
.endfor
.endif
Modified: projects/camlock/contrib/bmake/mk/progs.mk
==============================================================================
--- projects/camlock/contrib/bmake/mk/progs.mk Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/mk/progs.mk Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,4 +1,4 @@
-# $Id: progs.mk,v 1.12 2013/04/22 18:10:04 sjg Exp $
+# $Id: progs.mk,v 1.13 2013/08/02 18:28:48 sjg Exp $
#
# @(#) Copyright (c) 2006, Simon J. Gerraty
#
@@ -35,9 +35,21 @@ PROG ?= $t
.if defined(PROG)
# just one of many
-PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS
+PROG_VARS += \
+ BINDIR \
+ CFLAGS \
+ COPTS \
+ CPPFLAGS \
+ CXXFLAGS \
+ DPADD \
+ DPLIBS \
+ LDADD \
+ LDFLAGS \
+ MAN \
+ SRCS
+
.for v in ${PROG_VARS:O:u}
-.if defined(${v}.${PROG})
+.if defined(${v}.${PROG}) || defined(${v}_${PROG})
$v += ${${v}_${PROG}:U${${v}.${PROG}}}
.endif
.endfor
Modified: projects/camlock/contrib/bmake/parse.c
==============================================================================
--- projects/camlock/contrib/bmake/parse.c Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/parse.c Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.189 2013/06/18 19:31:27 sjg Exp $ */
+/* $NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.189 2013/06/18 19:31:27 sjg Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.189 2013/06/18 19:31:27 sjg Exp $");
+__RCSID("$NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -1751,6 +1751,12 @@ Parse_IsVar(char *line)
ch = *line++;
wasSpace = TRUE;
}
+#ifdef SUNSHCMD
+ if (ch == ':' && strncmp(line, "sh", 2) == 0) {
+ line += 2;
+ continue;
+ }
+#endif
if (ch == '=')
return TRUE;
if (*line == '=' && ISEQOPERATOR(ch))
Modified: projects/camlock/contrib/bmake/unit-tests/Makefile.in
==============================================================================
--- projects/camlock/contrib/bmake/unit-tests/Makefile.in Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/unit-tests/Makefile.in Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.43 2013/07/16 21:14:30 sjg Exp $
+# $Id: Makefile.in,v 1.44 2013/08/28 22:09:29 sjg Exp $
#
-# $NetBSD: Makefile,v 1.37 2013/07/16 19:59:28 sjg Exp $
+# $NetBSD: Makefile,v 1.38 2013/08/28 21:56:50 sjg Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -45,6 +45,7 @@ SUBFILES= \
phony-end \
posix \
qequals \
+ sunshcmd \
sysv \
ternary \
unexport \
Copied: projects/camlock/contrib/bmake/unit-tests/sunshcmd (from r255348, head/contrib/bmake/unit-tests/sunshcmd)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/camlock/contrib/bmake/unit-tests/sunshcmd Sat Sep 7 07:36:12 2013 (r255349, copy of r255348, head/contrib/bmake/unit-tests/sunshcmd)
@@ -0,0 +1,10 @@
+BYECMD = echo bye
+LATERCMD = echo later
+TEST1 :sh = echo hello
+TEST2 :sh = ${BYECMD}
+TEST3 = ${LATERCMD:sh}
+
+all:
+ @echo "TEST1=${TEST1}"
+ @echo "TEST2=${TEST2}"
+ @echo "TEST3=${TEST3}"
Modified: projects/camlock/contrib/bmake/unit-tests/test.exp
==============================================================================
--- projects/camlock/contrib/bmake/unit-tests/test.exp Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/unit-tests/test.exp Sat Sep 7 07:36:12 2013 (r255349)
@@ -349,6 +349,9 @@ Now we expect an error...
*** Error code 1 (continuing)
`all' not remade because of errors.
V.i386 ?= OK
+TEST1=hello
+TEST2=bye
+TEST3=later
FOOBAR =
FOOBAR = foobar fubar
fun
Modified: projects/camlock/contrib/bmake/var.c
==============================================================================
--- projects/camlock/contrib/bmake/var.c Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/bmake/var.c Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.183 2013/07/16 20:00:56 sjg Exp $ */
+/* $NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.183 2013/07/16 20:00:56 sjg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.183 2013/07/16 20:00:56 sjg Exp $");
+__RCSID("$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -187,6 +187,7 @@ static char varNoError[] = "";
* The four contexts are searched in the reverse order from which they are
* listed.
*/
+GNode *VAR_INTERNAL; /* variables from make itself */
GNode *VAR_GLOBAL; /* variables from the makefile */
GNode *VAR_CMD; /* variables defined on the command-line */
@@ -419,6 +420,10 @@ VarFind(const char *name, GNode *ctxt, i
(ctxt != VAR_GLOBAL))
{
var = Hash_FindEntry(&VAR_GLOBAL->context, name);
+ if ((var == NULL) && (ctxt != VAR_INTERNAL)) {
+ /* VAR_INTERNAL is subordinate to VAR_GLOBAL */
+ var = Hash_FindEntry(&VAR_INTERNAL->context, name);
+ }
}
if ((var == NULL) && (flags & FIND_ENV)) {
char *env;
@@ -440,6 +445,9 @@ VarFind(const char *name, GNode *ctxt, i
(ctxt != VAR_GLOBAL))
{
var = Hash_FindEntry(&VAR_GLOBAL->context, name);
+ if ((var == NULL) && (ctxt != VAR_INTERNAL)) {
+ var = Hash_FindEntry(&VAR_INTERNAL->context, name);
+ }
if (var == NULL) {
return NULL;
} else {
@@ -4182,6 +4190,7 @@ Var_GetHead(char *file)
void
Var_Init(void)
{
+ VAR_INTERNAL = Targ_NewGN("Internal");
VAR_GLOBAL = Targ_NewGN("Global");
VAR_CMD = Targ_NewGN("Command");
Modified: projects/camlock/contrib/ipfilter/BNF
==============================================================================
--- projects/camlock/contrib/ipfilter/BNF Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/ipfilter/BNF Sat Sep 7 07:36:12 2013 (r255349)
@@ -67,7 +67,7 @@ facility = "kern" | "user" | "mail" | "d
"audit" | "logalert" | "local0" | "local1" | "local2" |
"local3" | "local4" | "local5" | "local6" | "local7" .
priority = "emerg" | "alert" | "crit" | "err" | "warn" | "notice" |
- "info" | "debug" .
+ "info" | "debug" .
hexnumber = "0" "x" hexstring .
hexstring = hexdigit [ hexstring ] .
Modified: projects/camlock/contrib/ipfilter/BSD/Makefile
==============================================================================
--- projects/camlock/contrib/ipfilter/BSD/Makefile Sat Sep 7 07:26:51 2013 (r255348)
+++ projects/camlock/contrib/ipfilter/BSD/Makefile Sat Sep 7 07:36:12 2013 (r255349)
@@ -1,9 +1,8 @@
#
-# Copyright (C) 1993-1998 by Darren Reed.
+# Copyright (C) 2012 by Darren Reed.
#
# See the IPFILTER.LICENCE file for details on licencing.
#
-TOP=../..
BINDEST=/usr/sbin
SBINDEST=/sbin
MANDIR=/usr/share/man
@@ -17,13 +16,14 @@ CFLAGS=-g -I$(TOP)
#
DEVFS!=/usr/bin/lsvfs 2>&1 | sed -n 's/.*devfs.*/-DDEVFS/p'
CPU!=uname -m
-INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch
+COMPDIR!=/bin/ls -1tr /usr/src/sys/arch/${CPU}/compile | tail -1
+INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch -I/usr/src/sys/arch/${CPU}/compile/${COMPDIR}
DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) -fno-builtin
IPDEF=$(DEF) -DGATEWAY -DDIRECTED_BROADCAST
VNODESHDIR=/sys/kern
MLD=$(ML)
ML=mln_ipl.c
-LKM=if_ipl.o
+LKM=ipflkm.o
LKMR=ipfrule.o
DLKM=
OBJ=.
@@ -44,15 +44,15 @@ INSTALL=install
#
MODOBJS=ip_fil.o fil.o ml_ipl.o ip_nat.o ip_frag.o ip_state.o ip_proxy.o \
ip_auth.o ip_log.o ip_pool.o ip_htable.o ip_lookup.o ip_rules.o \
- ip_scan.o ip_sync.o
+ ip_scan.o ip_sync.o ip_nat6.o ip_dstlist.o radix_ipf.o
# ip_trafcon.o
DFLAGS=$(IPFLKM) $(IPFLOG) $(LOOKUP) $(SYNC) $(DEF) $(DLKM) $(IPFBPF)
-IPF=ipf.o ipfcomp.o ipf_y.o ipf_l.o bpf_filter_u.o
-IPT=ipftest.o fil_u.o ip_frag_u.o ip_state_u.o ip_nat_u.o \
+IPF=ipf.o ipfcomp.o ipf_y.o ipf_l.o
+IPT=ipftest.o fil_u.o ip_frag_u.o ip_state_u.o ip_nat_u.o ip_nat6_u.o \
ip_proxy_u.o ip_auth_u.o ip_htable_u.o ip_lookup_u.o ip_pool_u.o \
ip_scan_u.o ip_sync_u.o ip_rules_u.o ip_fil_u.o ip_log_u.o \
ippool_y.o ippool_l.o ipf_y.o ipf_l.o ipnat_y.o ipnat_l.o \
- md5_u.o radix_u.o bpf_filter_u.o
+ md5_u.o radix_ipf_u.o ip_dstlist_u.o
# ip_syn_u.o
#ip_trafcon_u.o
TOOL=$(TOP)/tools
@@ -60,9 +60,9 @@ IPNAT=ipnat.o ipnat_y.o ipnat_l.o
IPMON=ipmon.o ipmon_y.o ipmon_l.o
IPPOOL=ippool_y.o ippool_l.o kmem.o ippool.o
IPTRAFCON=iptrafcon.o
-PROXYLIST=$(TOP)/ip_ftp_pxy.c $(TOP)/ip_ipsec_pxy.c $(TOP)/ip_irc_pxy.c \
- $(TOP)/ip_netbios_pxy.c $(TOP)/ip_raudio_pxy.c $(TOP)/ip_rcmd_pxy.c \
- $(TOP)/ip_rpcb_pxy.c $(TOP)/ip_pptp_pxy.c
+PROXYLIST=$(TOP)/ip_dns_pxy.c $(TOP)/ip_ftp_pxy.c $(TOP)/ip_ipsec_pxy.c \
+ $(TOP)/ip_irc_pxy.c $(TOP)/ip_netbios_pxy.c $(TOP)/ip_raudio_pxy.c \
+ $(TOP)/ip_rcmd_pxy.c $(TOP)/ip_rpcb_pxy.c $(TOP)/ip_pptp_pxy.c
FILS=ipfstat.o
LIBSRC=$(TOP)/lib
RANLIB=ranlib
@@ -70,6 +70,11 @@ AROPTS=cq
HERE!=pwd
CCARGS=-I. $(DEBUG) $(CFLAGS) $(UFLAGS)
KCARGS=-I. $(DEBUG) $(CFLAGS)
+.if ${MACHINE_ARCH} == amd64
+KCARGS+=-mcmodel=kernel -mno-red-zone -fno-omit-frame-pointer \
+ -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow \
+ -msoft-float -fno-asynchronous-unwind-tables
+.endif
#
# Extra is option kernel things we always want in user space.
#
@@ -77,9 +82,11 @@ EXTRA=$(ALLOPTS)
include $(TOP)/lib/Makefile
-build all: machine $(OBJ)/libipf.a ipf ipfs ipfstat ipftest ipmon ipnat \
- ippool ipscan ipsyncm ipsyncs $(LKM) $(LKMR)
- -sh -c 'for i in ipf ipftest ipmon ippool ipnat ipscan ipsyncm ipsyncs; do /bin/rm -f $(TOP)/$$i; ln -s `pwd`/$$i $(TOP); done'
+build all: machine $(OBJ)/libipf.a tools $(LKM) $(LKMR)
+
+tools: ipf ipfs ipfstat ipftest ipmon ipnat ippool ipscan ipsyncm \
+ ipsyncs ipfsyncd
+ -sh -c 'for i in ipf ipftest ipmon ippool ipnat ipscan ipsyncm ipsyncs ipfsyncd; do /bin/rm -f $(TOP)/$$i; ln -s `pwd`/$$i $(TOP); done'
-/bin/rm -f ../tools ./tools
-ln -s ../tools .
-ln -s ../tools ..
@@ -122,12 +129,18 @@ ipsyncm: ipsyncm.o $(OBJ)/libipf.a
ipsyncs: ipsyncs.o $(OBJ)/libipf.a
$(CC) $(CCARGS) ipsyncs.o -o $@ $(LIBS)
+ipfsyncd: ipfsyncd.o $(OBJ)/libipf.a
+ $(CC) $(CCARGS) ipfsyncd.o -o $@ $(LIBS)
+
ipsyncm.o: $(TOOL)/ipsyncm.c $(TOP)/ip_sync.h
$(CC) $(CCARGS) -c $(TOOL)/ipsyncm.c -o $@
ipsyncs.o: $(TOOL)/ipsyncs.c $(TOP)/ip_sync.h
$(CC) $(CCARGS) -c $(TOOL)/ipsyncs.c -o $@
+ipfsyncd.o: $(TOOL)/ipfsyncd.c $(TOP)/ip_sync.h
+ $(CC) $(CCARGS) -c $(TOOL)/ipfsyncd.c -o $@
+
tests:
(cd test; make )
@@ -146,7 +159,7 @@ fil_u.o: $(TOP)/fil.c $(TOP)/ip_fil.h $(
fil.o: $(TOP)/fil.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h $(TOP)/ipl.h \
$(TOP)/ip_rules.h
- $(CC) $(KCARGS) $(POLICY) $(DFLAGS) $(IPFBPF) $(COMPIPF) \
+ $(CC) $(KCARGS) $(POLICY) $(DFLAGS) $(IPFBPF) $(COMPIPF) $(COMPATIPF) \
-c $(TOP)/fil.c -o $@
ipf.o: $(TOOL)/ipf.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/opts.h
@@ -163,7 +176,7 @@ ipnat.o: $(TOOL)/ipnat.c $(TOP)/ip_fil.h
$(TOP)/opts.h
$(CC) $(CCARGS) -c $(TOOL)/ipnat.c -o $@
-ipnat_y.o: ipnat_y.c ipnat_y.h ipnat_l.h
+ipnat_y.o: ipnat_y.c ipnat_y.h ipnat_l.h $(TOP)/ip_fil.h $(TOP)/ip_nat.h
$(CC) $(CCARGS) -c ipnat_y.c -o $@
ipnat_l.o: ipnat_l.c ipnat_y.h
@@ -183,6 +196,9 @@ ipnat_l.h: $(TOOL)/lexer.h
ip_nat_u.o: $(TOP)/ip_nat.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h
$(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_nat.c -o $@
+ip_nat6_u.o: $(TOP)/ip_nat6.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h
+ $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_nat6.c -o $@
+
ip_proxy_u.o: $(TOP)/ip_proxy.c $(TOP)/ip_proxy.h $(TOP)/ip_compat.h \
$(TOP)/ip_fil.h $(PROXYLIST) $(TOP)/ip_nat.h
$(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_proxy.c -o $@
@@ -222,8 +238,13 @@ ip_htable_u.o: $(TOP)/ip_htable.c $(TOP)
$(TOP)/ip_htable.h
$(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_htable.c -o $@
+ip_dstlist_u.o: $(TOP)/ip_dstlist.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \
+ $(TOP)/ip_dstlist.h
+ $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_dstlist.c -o $@
+
ip_lookup_u.o: $(TOP)/ip_lookup.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \
- $(TOP)/ip_lookup.h $(TOP)/ip_pool.h $(TOP)/ip_htable.h
+ $(TOP)/ip_lookup.h $(TOP)/ip_pool.h $(TOP)/ip_htable.h \
+ $(TOP)/ip_dstlist.h
$(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_lookup.c -o $@
ip_trafcon_u.o: $(TOP)/ip_trafcon.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \
@@ -236,19 +257,28 @@ ip_log_u.o: $(TOP)/ip_log.c $(TOP)/ip_fi
md5_u.o: $(TOP)/md5.c $(TOP)/md5.h
$(CC) $(CCARGS) $(EXTRA) -c $(TOP)/md5.c -o $@
-radix_u.o: $(TOP)/md5.c $(TOP)/radix_ipf.h
- $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/radix.c -o $@
+radix_ipf_u.o: $(TOP)/md5.c $(TOP)/radix_ipf.h
+ $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/radix_ipf.c -o $@
bpf_filter_u.o: $(TOP)/bpf_filter.c $(TOP)/pcap-ipf.h
$(CC) $(CCARGS) $(EXTRA) -c $(TOP)/bpf_filter.c -o $@
-if_ipl.o: $(MODOBJS)
+ipflkm.o: $(MODOBJS)
ld -r $(MODOBJS) -o $(LKM)
- ${RM} -f if_ipl
+ ${RM} -f ipflkm
ipfrule.ko.5: ip_rulesx.o $(MLR)
+.if ${MACHINE_ARCH} != amd64
ld -warn-common -r -d -o $(.TARGET:S/.ko/.kld/) ip_rulesx.o $(MLR)
- ld -Bshareable -d -warn-common -o $(LKMR:S/.5$//) $(.TARGET:S/.ko/.kld/)
+ ld -Bshareable -d -warn-common -o $(LKMR:S/.5$//) $(.TARGET:S/.ko/.kld/)
+.else
+ ld -warn-common -r -d -o $(.TARGET:S/.5$//) ip_rulesx.o $(MLR)
+ nm -g $(.TARGET:S/.5$//) | \
+ awk '/^[^[:space:]]+ [^AU] (.*)$$/ { print ($$2=="C" ? "-N" : "-L") $$3 }' | \
+ xargs -J% objcopy % $(.TARGET:S/.5$//)
+
+.endif
+
ipfrule.ko: ip_rulesx.o $(MLR)
gensetdefs ip_rulesx.o $(MLR)
$(CC) $(KCARGS) -c setdef0.c
@@ -256,10 +286,17 @@ ipfrule.ko: ip_rulesx.o $(MLR)
ld -Bshareable -o $@ setdef0.o ip_rulesx.o $(MLR) setdef1.o
ipf.ko.5 ipl.ko.5: $(MODOBJS)
+.if ${MACHINE_ARCH} != amd64
ld -warn-common -r -d -o $(.TARGET:S/.ko/.kld/) $(MODOBJS)
ld -Bshareable -d -warn-common -o $(LKM:S/.5$//) $(.TARGET:S/.ko/.kld/)
+.else
+ ld -warn-common -r -d -o $(.TARGET:S/.5$//) $(MODOBJS)
+ nm -g $(.TARGET:S/.5$//) | \
+ awk '/^[^[:space:]]+ [^AU] (.*)$$/ { print ($$2=="C" ? "-N" : "-L") $$3 }' | \
+ xargs -J% objcopy % $(.TARGET:S/.5$//)
+.endif
-ipf.ko ipl.ko: $(MODOBJS)
+ipf.ko ipl.ko: $(MODOBJS)
gensetdefs $(MODOBJS)
$(CC) $(KCARGS) -c setdef0.c
$(CC) $(KCARGS) -c setdef1.c
@@ -268,6 +305,9 @@ ipf.ko ipl.ko: $(MODOBJS)
ip_nat.o: $(TOP)/ip_nat.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h
$(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_nat.c -o $@
+ip_nat6.o: $(TOP)/ip_nat6.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h
+ $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_nat6.c -o $@
+
ip_frag.o: $(TOP)/ip_frag.c $(TOP)/ip_frag.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h
$(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_frag.c -o $@
@@ -290,6 +330,11 @@ ip_fil.c:
ip_fil.o: ip_fil.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h $(TOP)/ip_nat.h
$(CC) $(KCARGS) $(DFLAGS) $(COMPIPF) -c ip_fil.c -o $@
+ip_fil_compat.o: $(TOP)/ip_fil_compat.c $(TOP)/ipl.h $(TOP)/ip_fil.h \
+ $(TOP)/ip_compat.h $(TOP)/ip_nat.h $(TOP)/ip_state.h
+ $(CC) $(KCARGS) $(DFLAGS) $(COMPIPF) $(COMPATIPF) \
+ -c $(TOP)/ip_fil_compat.c -o $@
+
ip_log.o: $(TOP)/ip_log.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h
$(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_log.c -o $@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list