From owner-svn-src-projects@FreeBSD.ORG Wed Sep 11 18:16:24 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id ADD84CD8; Wed, 11 Sep 2013 18:16:24 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9747A2DAA; Wed, 11 Sep 2013 18:16:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8BIGORu036059; Wed, 11 Sep 2013 18:16:24 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8BIGKNt035948; Wed, 11 Sep 2013 18:16:20 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201309111816.r8BIGKNt035948@svn.freebsd.org> From: "Simon J. Gerraty" Date: Wed, 11 Sep 2013 18:16:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r255477 - in projects/bmake: . cddl/contrib/opensolaris/lib/libzpool/common cddl/contrib/opensolaris/lib/libzpool/common/sys contrib/bmake contrib/gcc/config/arm contrib/ipfilter contri... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 18:16:24 -0000 Author: sjg Date: Wed Sep 11 18:16:18 2013 New Revision: 255477 URL: http://svnweb.freebsd.org/changeset/base/255477 Log: Merge head Added: projects/bmake/contrib/ipfilter/BSD/upgrade - copied unchanged from r255476, head/contrib/ipfilter/BSD/upgrade projects/bmake/contrib/ipfilter/WhatsNew50.txt - copied unchanged from r255476, head/contrib/ipfilter/WhatsNew50.txt projects/bmake/contrib/ipfilter/arc4random.c - copied unchanged from r255476, head/contrib/ipfilter/arc4random.c projects/bmake/contrib/ipfilter/genmask.c - copied unchanged from r255476, head/contrib/ipfilter/genmask.c projects/bmake/contrib/ipfilter/ip_dstlist.c - copied unchanged from r255476, head/contrib/ipfilter/ip_dstlist.c projects/bmake/contrib/ipfilter/ip_dstlist.h - copied unchanged from r255476, head/contrib/ipfilter/ip_dstlist.h projects/bmake/contrib/ipfilter/ip_fil_compat.c - copied unchanged from r255476, head/contrib/ipfilter/ip_fil_compat.c projects/bmake/contrib/ipfilter/ipf_rb.h - copied unchanged from r255476, head/contrib/ipfilter/ipf_rb.h projects/bmake/contrib/ipfilter/lib/allocmbt.c - copied unchanged from r255476, head/contrib/ipfilter/lib/allocmbt.c projects/bmake/contrib/ipfilter/lib/assigndefined.c - copied unchanged from r255476, head/contrib/ipfilter/lib/assigndefined.c projects/bmake/contrib/ipfilter/lib/connecttcp.c - copied unchanged from r255476, head/contrib/ipfilter/lib/connecttcp.c projects/bmake/contrib/ipfilter/lib/dupmbt.c - copied unchanged from r255476, head/contrib/ipfilter/lib/dupmbt.c projects/bmake/contrib/ipfilter/lib/familyname.c - copied unchanged from r255476, head/contrib/ipfilter/lib/familyname.c projects/bmake/contrib/ipfilter/lib/findword.c - copied unchanged from r255476, head/contrib/ipfilter/lib/findword.c projects/bmake/contrib/ipfilter/lib/freembt.c - copied unchanged from r255476, head/contrib/ipfilter/lib/freembt.c projects/bmake/contrib/ipfilter/lib/ftov.c - copied unchanged from r255476, head/contrib/ipfilter/lib/ftov.c projects/bmake/contrib/ipfilter/lib/geticmptype.c - copied unchanged from r255476, head/contrib/ipfilter/lib/geticmptype.c projects/bmake/contrib/ipfilter/lib/icmptypename.c - copied unchanged from r255476, head/contrib/ipfilter/lib/icmptypename.c projects/bmake/contrib/ipfilter/lib/icmptypes.c - copied unchanged from r255476, head/contrib/ipfilter/lib/icmptypes.c projects/bmake/contrib/ipfilter/lib/interror.c - copied unchanged from r255476, head/contrib/ipfilter/lib/interror.c projects/bmake/contrib/ipfilter/lib/ipf_perror.c - copied unchanged from r255476, head/contrib/ipfilter/lib/ipf_perror.c projects/bmake/contrib/ipfilter/lib/load_dstlist.c - copied unchanged from r255476, head/contrib/ipfilter/lib/load_dstlist.c projects/bmake/contrib/ipfilter/lib/load_dstlistnode.c - copied unchanged from r255476, head/contrib/ipfilter/lib/load_dstlistnode.c projects/bmake/contrib/ipfilter/lib/mb_hexdump.c - copied unchanged from r255476, head/contrib/ipfilter/lib/mb_hexdump.c projects/bmake/contrib/ipfilter/lib/msgdsize.c - copied unchanged from r255476, head/contrib/ipfilter/lib/msgdsize.c projects/bmake/contrib/ipfilter/lib/parsefields.c - copied unchanged from r255476, head/contrib/ipfilter/lib/parsefields.c projects/bmake/contrib/ipfilter/lib/parseipfexpr.c - copied unchanged from r255476, head/contrib/ipfilter/lib/parseipfexpr.c projects/bmake/contrib/ipfilter/lib/parsewhoisline.c - copied unchanged from r255476, head/contrib/ipfilter/lib/parsewhoisline.c projects/bmake/contrib/ipfilter/lib/poolio.c - copied unchanged from r255476, head/contrib/ipfilter/lib/poolio.c projects/bmake/contrib/ipfilter/lib/prependmbt.c - copied unchanged from r255476, head/contrib/ipfilter/lib/prependmbt.c projects/bmake/contrib/ipfilter/lib/printactiveaddr.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printactiveaddr.c projects/bmake/contrib/ipfilter/lib/printaddr.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printaddr.c projects/bmake/contrib/ipfilter/lib/printdstl_live.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printdstl_live.c projects/bmake/contrib/ipfilter/lib/printdstlist.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printdstlist.c projects/bmake/contrib/ipfilter/lib/printdstlistdata.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printdstlistdata.c projects/bmake/contrib/ipfilter/lib/printdstlistnode.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printdstlistnode.c projects/bmake/contrib/ipfilter/lib/printdstlistpolicy.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printdstlistpolicy.c projects/bmake/contrib/ipfilter/lib/printfieldhdr.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printfieldhdr.c projects/bmake/contrib/ipfilter/lib/printhost.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printhost.c projects/bmake/contrib/ipfilter/lib/printipfexpr.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printipfexpr.c projects/bmake/contrib/ipfilter/lib/printiphdr.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printiphdr.c projects/bmake/contrib/ipfilter/lib/printlookup.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printlookup.c projects/bmake/contrib/ipfilter/lib/printnataddr.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printnataddr.c projects/bmake/contrib/ipfilter/lib/printnatfield.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printnatfield.c projects/bmake/contrib/ipfilter/lib/printnatside.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printnatside.c projects/bmake/contrib/ipfilter/lib/printpoolfield.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printpoolfield.c projects/bmake/contrib/ipfilter/lib/printstatefields.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printstatefields.c projects/bmake/contrib/ipfilter/lib/printtcpflags.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printtcpflags.c projects/bmake/contrib/ipfilter/lib/printunit.c - copied unchanged from r255476, head/contrib/ipfilter/lib/printunit.c projects/bmake/contrib/ipfilter/lib/save_execute.c - copied unchanged from r255476, head/contrib/ipfilter/lib/save_execute.c projects/bmake/contrib/ipfilter/lib/save_file.c - copied unchanged from r255476, head/contrib/ipfilter/lib/save_file.c projects/bmake/contrib/ipfilter/lib/save_nothing.c - copied unchanged from r255476, head/contrib/ipfilter/lib/save_nothing.c projects/bmake/contrib/ipfilter/lib/save_syslog.c - copied unchanged from r255476, head/contrib/ipfilter/lib/save_syslog.c projects/bmake/contrib/ipfilter/lib/save_v1trap.c - copied unchanged from r255476, head/contrib/ipfilter/lib/save_v1trap.c projects/bmake/contrib/ipfilter/lib/save_v2trap.c - copied unchanged from r255476, head/contrib/ipfilter/lib/save_v2trap.c projects/bmake/contrib/ipfilter/lib/vtof.c - copied unchanged from r255476, head/contrib/ipfilter/lib/vtof.c - copied unchanged from r255476, head/contrib/ipfilter/ml_ipl.c - copied unchanged from r255476, head/contrib/ipfilter/mlfk_ipl.c - copied unchanged from r255476, head/contrib/ipfilter/mli_ipl.c - copied unchanged from r255476, head/contrib/ipfilter/mln_ipl.c projects/bmake/contrib/ipfilter/mln_rule.c - copied unchanged from r255476, head/contrib/ipfilter/mln_rule.c projects/bmake/contrib/ipfilter/mlo_ipl.c - copied unchanged from r255476, head/contrib/ipfilter/mlo_ipl.c projects/bmake/contrib/ipfilter/mlo_rule.c - copied unchanged from r255476, head/contrib/ipfilter/mlo_rule.c - copied unchanged from r255476, head/contrib/ipfilter/mls_ipl.c projects/bmake/contrib/ipfilter/mls_rule.c - copied unchanged from r255476, head/contrib/ipfilter/mls_rule.c projects/bmake/contrib/ipfilter/mlso_rule.c - copied unchanged from r255476, head/contrib/ipfilter/mlso_rule.c projects/bmake/contrib/ipfilter/radix_ipf.c - copied unchanged from r255476, head/contrib/ipfilter/radix_ipf.c projects/bmake/contrib/ipfilter/sys/ - copied from r255476, head/contrib/ipfilter/sys/ projects/bmake/contrib/ipfilter/test/e4to6 - copied unchanged from r255476, head/contrib/ipfilter/test/e4to6 projects/bmake/contrib/ipfilter/test/expected/f21 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/f21 projects/bmake/contrib/ipfilter/test/expected/f22 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/f22 projects/bmake/contrib/ipfilter/test/expected/f25 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/f25 projects/bmake/contrib/ipfilter/test/expected/f26 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/f26 projects/bmake/contrib/ipfilter/test/expected/f27 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/f27 projects/bmake/contrib/ipfilter/test/expected/f28 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/f28 projects/bmake/contrib/ipfilter/test/expected/f29 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/f29 projects/bmake/contrib/ipfilter/test/expected/f30 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/f30 projects/bmake/contrib/ipfilter/test/expected/i22 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/i22 projects/bmake/contrib/ipfilter/test/expected/i23 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/i23 projects/bmake/contrib/ipfilter/test/expected/in100 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/in100 projects/bmake/contrib/ipfilter/test/expected/in101 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/in101 projects/bmake/contrib/ipfilter/test/expected/in102 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/in102 projects/bmake/contrib/ipfilter/test/expected/in7 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/in7 projects/bmake/contrib/ipfilter/test/expected/ip3 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/ip3 projects/bmake/contrib/ipfilter/test/expected/ipv6.4 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/ipv6.4 projects/bmake/contrib/ipfilter/test/expected/n100 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n100 projects/bmake/contrib/ipfilter/test/expected/n101 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n101 projects/bmake/contrib/ipfilter/test/expected/n102 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n102 projects/bmake/contrib/ipfilter/test/expected/n103 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n103 projects/bmake/contrib/ipfilter/test/expected/n104 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n104 projects/bmake/contrib/ipfilter/test/expected/n105 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n105 projects/bmake/contrib/ipfilter/test/expected/n106 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n106 projects/bmake/contrib/ipfilter/test/expected/n11_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n11_6 projects/bmake/contrib/ipfilter/test/expected/n12_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n12_6 projects/bmake/contrib/ipfilter/test/expected/n13_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n13_6 projects/bmake/contrib/ipfilter/test/expected/n14_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n14_6 projects/bmake/contrib/ipfilter/test/expected/n15 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n15 projects/bmake/contrib/ipfilter/test/expected/n15_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n15_6 projects/bmake/contrib/ipfilter/test/expected/n17 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n17 projects/bmake/contrib/ipfilter/test/expected/n18 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n18 projects/bmake/contrib/ipfilter/test/expected/n1_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n1_6 projects/bmake/contrib/ipfilter/test/expected/n200 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n200 projects/bmake/contrib/ipfilter/test/expected/n2_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n2_6 projects/bmake/contrib/ipfilter/test/expected/n4_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n4_6 projects/bmake/contrib/ipfilter/test/expected/n5_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n5_6 projects/bmake/contrib/ipfilter/test/expected/n6_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n6_6 projects/bmake/contrib/ipfilter/test/expected/n7_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n7_6 projects/bmake/contrib/ipfilter/test/expected/n8_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n8_6 projects/bmake/contrib/ipfilter/test/expected/n9_6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/n9_6 projects/bmake/contrib/ipfilter/test/expected/ni17 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/ni17 projects/bmake/contrib/ipfilter/test/expected/ni18 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/ni18 projects/bmake/contrib/ipfilter/test/expected/p10 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/p10 projects/bmake/contrib/ipfilter/test/expected/p11 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/p11 projects/bmake/contrib/ipfilter/test/expected/p12 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/p12 projects/bmake/contrib/ipfilter/test/expected/p13 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/p13 projects/bmake/contrib/ipfilter/test/expected/p4 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/p4 projects/bmake/contrib/ipfilter/test/expected/p6 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/p6 projects/bmake/contrib/ipfilter/test/expected/p7 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/p7 projects/bmake/contrib/ipfilter/test/expected/p9 - copied unchanged from r255476, head/contrib/ipfilter/test/expected/p9 projects/bmake/contrib/ipfilter/test/h4to6 - copied unchanged from r255476, head/contrib/ipfilter/test/h4to6 projects/bmake/contrib/ipfilter/test/i4to6 - copied unchanged from r255476, head/contrib/ipfilter/test/i4to6 projects/bmake/contrib/ipfilter/test/input/f21 - copied unchanged from r255476, head/contrib/ipfilter/test/input/f21 projects/bmake/contrib/ipfilter/test/input/f22 - copied unchanged from r255476, head/contrib/ipfilter/test/input/f22 projects/bmake/contrib/ipfilter/test/input/f25 - copied unchanged from r255476, head/contrib/ipfilter/test/input/f25 projects/bmake/contrib/ipfilter/test/input/f26 - copied unchanged from r255476, head/contrib/ipfilter/test/input/f26 projects/bmake/contrib/ipfilter/test/input/f27 - copied unchanged from r255476, head/contrib/ipfilter/test/input/f27 projects/bmake/contrib/ipfilter/test/input/f28 - copied unchanged from r255476, head/contrib/ipfilter/test/input/f28 projects/bmake/contrib/ipfilter/test/input/f29 - copied unchanged from r255476, head/contrib/ipfilter/test/input/f29 projects/bmake/contrib/ipfilter/test/input/f30 - copied unchanged from r255476, head/contrib/ipfilter/test/input/f30 projects/bmake/contrib/ipfilter/test/input/ipv6.4 - copied unchanged from r255476, head/contrib/ipfilter/test/input/ipv6.4 projects/bmake/contrib/ipfilter/test/input/n100 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n100 projects/bmake/contrib/ipfilter/test/input/n101 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n101 projects/bmake/contrib/ipfilter/test/input/n102 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n102 projects/bmake/contrib/ipfilter/test/input/n103 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n103 projects/bmake/contrib/ipfilter/test/input/n104 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n104 projects/bmake/contrib/ipfilter/test/input/n105 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n105 projects/bmake/contrib/ipfilter/test/input/n106 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n106 projects/bmake/contrib/ipfilter/test/input/n10_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n10_6 projects/bmake/contrib/ipfilter/test/input/n11_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n11_6 projects/bmake/contrib/ipfilter/test/input/n12_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n12_6 projects/bmake/contrib/ipfilter/test/input/n13_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n13_6 projects/bmake/contrib/ipfilter/test/input/n14_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n14_6 projects/bmake/contrib/ipfilter/test/input/n15 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n15 projects/bmake/contrib/ipfilter/test/input/n15_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n15_6 projects/bmake/contrib/ipfilter/test/input/n17 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n17 projects/bmake/contrib/ipfilter/test/input/n17_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n17_6 projects/bmake/contrib/ipfilter/test/input/n18 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n18 projects/bmake/contrib/ipfilter/test/input/n1_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n1_6 projects/bmake/contrib/ipfilter/test/input/n200 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n200 projects/bmake/contrib/ipfilter/test/input/n2_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n2_6 projects/bmake/contrib/ipfilter/test/input/n4_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n4_6 projects/bmake/contrib/ipfilter/test/input/n5_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n5_6 projects/bmake/contrib/ipfilter/test/input/n6_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n6_6 projects/bmake/contrib/ipfilter/test/input/n7_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n7_6 projects/bmake/contrib/ipfilter/test/input/n8_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n8_6 projects/bmake/contrib/ipfilter/test/input/n9_6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/n9_6 projects/bmake/contrib/ipfilter/test/input/ni18 - copied unchanged from r255476, head/contrib/ipfilter/test/input/ni18 projects/bmake/contrib/ipfilter/test/input/p10 - copied unchanged from r255476, head/contrib/ipfilter/test/input/p10 projects/bmake/contrib/ipfilter/test/input/p11 - copied unchanged from r255476, head/contrib/ipfilter/test/input/p11 projects/bmake/contrib/ipfilter/test/input/p12 - copied unchanged from r255476, head/contrib/ipfilter/test/input/p12 projects/bmake/contrib/ipfilter/test/input/p13 - copied unchanged from r255476, head/contrib/ipfilter/test/input/p13 projects/bmake/contrib/ipfilter/test/input/p4 - copied unchanged from r255476, head/contrib/ipfilter/test/input/p4 projects/bmake/contrib/ipfilter/test/input/p6 - copied unchanged from r255476, head/contrib/ipfilter/test/input/p6 projects/bmake/contrib/ipfilter/test/input/p7 - copied unchanged from r255476, head/contrib/ipfilter/test/input/p7 projects/bmake/contrib/ipfilter/test/input/p9 - copied unchanged from r255476, head/contrib/ipfilter/test/input/p9 projects/bmake/contrib/ipfilter/test/ipflib.sh - copied unchanged from r255476, head/contrib/ipfilter/test/ipflib.sh projects/bmake/contrib/ipfilter/test/regress/f21 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/f21 projects/bmake/contrib/ipfilter/test/regress/f22 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/f22 projects/bmake/contrib/ipfilter/test/regress/f25 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/f25 projects/bmake/contrib/ipfilter/test/regress/f26 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/f26 projects/bmake/contrib/ipfilter/test/regress/f27 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/f27 projects/bmake/contrib/ipfilter/test/regress/f28.ipf - copied unchanged from r255476, head/contrib/ipfilter/test/regress/f28.ipf projects/bmake/contrib/ipfilter/test/regress/f28.pool - copied unchanged from r255476, head/contrib/ipfilter/test/regress/f28.pool projects/bmake/contrib/ipfilter/test/regress/f29.ipf - copied unchanged from r255476, head/contrib/ipfilter/test/regress/f29.ipf projects/bmake/contrib/ipfilter/test/regress/f29.pool - copied unchanged from r255476, head/contrib/ipfilter/test/regress/f29.pool projects/bmake/contrib/ipfilter/test/regress/f30 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/f30 projects/bmake/contrib/ipfilter/test/regress/i22 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/i22 projects/bmake/contrib/ipfilter/test/regress/i23 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/i23 projects/bmake/contrib/ipfilter/test/regress/in100 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/in100 projects/bmake/contrib/ipfilter/test/regress/in101 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/in101 projects/bmake/contrib/ipfilter/test/regress/in102 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/in102 projects/bmake/contrib/ipfilter/test/regress/in7 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/in7 projects/bmake/contrib/ipfilter/test/regress/ip3 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/ip3 projects/bmake/contrib/ipfilter/test/regress/ipv6.4 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/ipv6.4 projects/bmake/contrib/ipfilter/test/regress/n100 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n100 projects/bmake/contrib/ipfilter/test/regress/n101 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n101 projects/bmake/contrib/ipfilter/test/regress/n102 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n102 projects/bmake/contrib/ipfilter/test/regress/n103 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n103 projects/bmake/contrib/ipfilter/test/regress/n104 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n104 projects/bmake/contrib/ipfilter/test/regress/n105 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n105 projects/bmake/contrib/ipfilter/test/regress/n106 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n106 projects/bmake/contrib/ipfilter/test/regress/n10_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n10_6 projects/bmake/contrib/ipfilter/test/regress/n11_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n11_6 projects/bmake/contrib/ipfilter/test/regress/n12_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n12_6 projects/bmake/contrib/ipfilter/test/regress/n13_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n13_6 projects/bmake/contrib/ipfilter/test/regress/n14_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n14_6 projects/bmake/contrib/ipfilter/test/regress/n15 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n15 projects/bmake/contrib/ipfilter/test/regress/n15_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n15_6 projects/bmake/contrib/ipfilter/test/regress/n16_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n16_6 projects/bmake/contrib/ipfilter/test/regress/n17 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n17 projects/bmake/contrib/ipfilter/test/regress/n17_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n17_6 projects/bmake/contrib/ipfilter/test/regress/n18 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n18 projects/bmake/contrib/ipfilter/test/regress/n1_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n1_6 projects/bmake/contrib/ipfilter/test/regress/n200 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n200 projects/bmake/contrib/ipfilter/test/regress/n2_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n2_6 projects/bmake/contrib/ipfilter/test/regress/n4_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n4_6 projects/bmake/contrib/ipfilter/test/regress/n5_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n5_6 projects/bmake/contrib/ipfilter/test/regress/n6_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n6_6 projects/bmake/contrib/ipfilter/test/regress/n7_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n7_6 projects/bmake/contrib/ipfilter/test/regress/n8_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n8_6 projects/bmake/contrib/ipfilter/test/regress/n9_6 - copied unchanged from r255476, head/contrib/ipfilter/test/regress/n9_6 projects/bmake/contrib/ipfilter/test/regress/ni17.ipf - copied unchanged from r255476, head/contrib/ipfilter/test/regress/ni17.ipf projects/bmake/contrib/ipfilter/test/regress/ni18.ipf - copied unchanged from r255476, head/contrib/ipfilter/test/regress/ni18.ipf projects/bmake/contrib/ipfilter/test/regress/ni18.nat - copied unchanged from r255476, head/contrib/ipfilter/test/regress/ni18.nat projects/bmake/contrib/ipfilter/test/regress/p10.nat - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p10.nat projects/bmake/contrib/ipfilter/test/regress/p10.pool - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p10.pool projects/bmake/contrib/ipfilter/test/regress/p11.nat - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p11.nat projects/bmake/contrib/ipfilter/test/regress/p11.pool - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p11.pool projects/bmake/contrib/ipfilter/test/regress/p12.nat - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p12.nat projects/bmake/contrib/ipfilter/test/regress/p12.pool - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p12.pool projects/bmake/contrib/ipfilter/test/regress/p13.ipf - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p13.ipf projects/bmake/contrib/ipfilter/test/regress/p13.pool - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p13.pool projects/bmake/contrib/ipfilter/test/regress/p4.nat - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p4.nat projects/bmake/contrib/ipfilter/test/regress/p4.pool - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p4.pool projects/bmake/contrib/ipfilter/test/regress/p6.ipf - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p6.ipf projects/bmake/contrib/ipfilter/test/regress/p6.pool - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p6.pool projects/bmake/contrib/ipfilter/test/regress/p6.whois - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p6.whois projects/bmake/contrib/ipfilter/test/regress/p7.nat - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p7.nat projects/bmake/contrib/ipfilter/test/regress/p7.pool - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p7.pool projects/bmake/contrib/ipfilter/test/regress/p9.nat - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p9.nat projects/bmake/contrib/ipfilter/test/regress/p9.pool - copied unchanged from r255476, head/contrib/ipfilter/test/regress/p9.pool projects/bmake/contrib/ipfilter/tools/ipfsyncd.c - copied unchanged from r255476, head/contrib/ipfilter/tools/ipfsyncd.c projects/bmake/contrib/ldns-host/ - copied from r255476, head/contrib/ldns-host/ projects/bmake/contrib/openpam/lib/libpam/ - copied from r255476, head/contrib/openpam/lib/libpam/ projects/bmake/contrib/openpam/m4/ - copied from r255476, head/contrib/openpam/m4/ projects/bmake/contrib/openpam/mkpkgng.in - copied unchanged from r255476, head/contrib/openpam/mkpkgng.in projects/bmake/contrib/openpam/t/t_file.c - copied unchanged from r255476, head/contrib/openpam/t/t_file.c projects/bmake/contrib/openpam/test-driver - copied unchanged from r255476, head/contrib/openpam/test-driver projects/bmake/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c - copied unchanged from r255476, head/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c projects/bmake/crypto/openssh/openbsd-compat/strnlen.c - copied unchanged from r255476, head/crypto/openssh/openbsd-compat/strnlen.c projects/bmake/crypto/openssh/sandbox-seccomp-filter.c - copied unchanged from r255476, head/crypto/openssh/sandbox-seccomp-filter.c projects/bmake/etc/libmap32.conf - copied unchanged from r255476, head/etc/libmap32.conf projects/bmake/lib/msun/src/imprecise.c - copied unchanged from r255476, head/lib/msun/src/imprecise.c projects/bmake/share/examples/kld/random_adaptor/ - copied from r255476, head/share/examples/kld/random_adaptor/ projects/bmake/sys/arm/broadcom/bcm2835/bcm2835_gpio.h - copied unchanged from r255476, head/sys/arm/broadcom/bcm2835/bcm2835_gpio.h projects/bmake/sys/contrib/ipfilter/netinet/ip_dns_pxy.c - copied unchanged from r255476, head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/ip_dstlist.c - copied unchanged from r255476, head/sys/contrib/ipfilter/netinet/ip_dstlist.c projects/bmake/sys/contrib/ipfilter/netinet/ip_dstlist.h - copied unchanged from r255476, head/sys/contrib/ipfilter/netinet/ip_dstlist.h projects/bmake/sys/contrib/ipfilter/netinet/ip_nat6.c - copied unchanged from r255476, head/sys/contrib/ipfilter/netinet/ip_nat6.c projects/bmake/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c - copied unchanged from r255476, head/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/ipf_rb.h - copied unchanged from r255476, head/sys/contrib/ipfilter/netinet/ipf_rb.h projects/bmake/sys/contrib/ipfilter/netinet/radix_ipf.c - copied unchanged from r255476, head/sys/contrib/ipfilter/netinet/radix_ipf.c projects/bmake/sys/contrib/ipfilter/netinet/radix_ipf.h - copied unchanged from r255476, head/sys/contrib/ipfilter/netinet/radix_ipf.h projects/bmake/sys/dev/random/pseudo_rng.c - copied unchanged from r255476, head/sys/dev/random/pseudo_rng.c projects/bmake/sys/dev/random/random_harvestq.c - copied unchanged from r255476, head/sys/dev/random/random_harvestq.c projects/bmake/sys/dev/random/random_harvestq.h - copied unchanged from r255476, head/sys/dev/random/random_harvestq.h projects/bmake/sys/mips/mips/bcopy.S - copied unchanged from r255476, head/sys/mips/mips/bcopy.S projects/bmake/tools/build/options/WITHOUT_GNUCXX - copied unchanged from r255476, head/tools/build/options/WITHOUT_GNUCXX projects/bmake/tools/build/options/WITH_GCC - copied unchanged from r255476, head/tools/build/options/WITH_GCC projects/bmake/tools/build/options/WITH_GNUCXX - copied unchanged from r255476, head/tools/build/options/WITH_GNUCXX projects/bmake/tools/regression/lib/libc/stdio/test-fopen.c - copied unchanged from r255476, head/tools/regression/lib/libc/stdio/test-fopen.c projects/bmake/tools/regression/lib/libc/stdio/test-fopen.t - copied unchanged from r255476, head/tools/regression/lib/libc/stdio/test-fopen.t projects/bmake/tools/regression/lib/libc/stdio/test-mkostemp.t - copied unchanged from r255476, head/tools/regression/lib/libc/stdio/test-mkostemp.t Directory Properties: projects/bmake/contrib/ipfilter/ml_ipl.c (props changed) projects/bmake/contrib/ipfilter/mlfk_ipl.c (props changed) projects/bmake/contrib/ipfilter/mli_ipl.c (props changed) projects/bmake/contrib/ipfilter/mln_ipl.c (props changed) projects/bmake/contrib/ipfilter/mls_ipl.c (props changed) Replaced: projects/bmake/contrib/openpam/lib/Makefile.am - copied unchanged from r255476, head/contrib/openpam/lib/Makefile.am projects/bmake/contrib/openpam/lib/Makefile.in - copied unchanged from r255476, head/contrib/openpam/lib/Makefile.in Deleted: projects/bmake/contrib/ipfilter/.cvsignore projects/bmake/contrib/ipfilter/BSD/.cvsignore projects/bmake/contrib/ipfilter/iplang/.cvsignore projects/bmake/contrib/ipfilter/ipsend/.cvsignore projects/bmake/contrib/ipfilter/ipsend/README projects/bmake/contrib/ipfilter/ipsend/hpux.c projects/bmake/contrib/ipfilter/ipsend/in_var.h projects/bmake/contrib/ipfilter/ipsend/ip_var.h projects/bmake/contrib/ipfilter/ipsend/tcpip.h projects/bmake/contrib/ipfilter/lib/ipft_ef.c projects/bmake/contrib/ipfilter/lib/ipft_sn.c projects/bmake/contrib/ipfilter/lib/ipft_td.c projects/bmake/contrib/ipfilter/net/.cvsignore projects/bmake/contrib/ipfilter/radix.c projects/bmake/contrib/ipfilter/rules/.cvsignore projects/bmake/contrib/ipfilter/samples/.cvsignore projects/bmake/contrib/ipfilter/test/.cvsignore projects/bmake/contrib/ipfilter/test/hextest projects/bmake/contrib/ipfilter/test/input/ipf6-1 projects/bmake/contrib/ipfilter/test/mhtest projects/bmake/contrib/openpam/FREEBSD-vendor projects/bmake/contrib/openpam/lib/openpam_borrow_cred.c projects/bmake/contrib/openpam/lib/openpam_check_owner_perms.c projects/bmake/contrib/openpam/lib/openpam_configure.c projects/bmake/contrib/openpam/lib/openpam_constants.c projects/bmake/contrib/openpam/lib/openpam_constants.h projects/bmake/contrib/openpam/lib/openpam_ctype.h projects/bmake/contrib/openpam/lib/openpam_debug.h projects/bmake/contrib/openpam/lib/openpam_dispatch.c projects/bmake/contrib/openpam/lib/openpam_dynamic.c projects/bmake/contrib/openpam/lib/openpam_features.c projects/bmake/contrib/openpam/lib/openpam_features.h projects/bmake/contrib/openpam/lib/openpam_findenv.c projects/bmake/contrib/openpam/lib/openpam_free_data.c projects/bmake/contrib/openpam/lib/openpam_free_envlist.c projects/bmake/contrib/openpam/lib/openpam_get_feature.c projects/bmake/contrib/openpam/lib/openpam_get_option.c projects/bmake/contrib/openpam/lib/openpam_impl.h projects/bmake/contrib/openpam/lib/openpam_load.c projects/bmake/contrib/openpam/lib/openpam_log.c projects/bmake/contrib/openpam/lib/openpam_nullconv.c projects/bmake/contrib/openpam/lib/openpam_readline.c projects/bmake/contrib/openpam/lib/openpam_readlinev.c projects/bmake/contrib/openpam/lib/openpam_readword.c projects/bmake/contrib/openpam/lib/openpam_restore_cred.c projects/bmake/contrib/openpam/lib/openpam_set_feature.c projects/bmake/contrib/openpam/lib/openpam_set_option.c projects/bmake/contrib/openpam/lib/openpam_static.c projects/bmake/contrib/openpam/lib/openpam_straddch.c projects/bmake/contrib/openpam/lib/openpam_strlcat.h projects/bmake/contrib/openpam/lib/openpam_strlcmp.h projects/bmake/contrib/openpam/lib/openpam_strlcpy.h projects/bmake/contrib/openpam/lib/openpam_subst.c projects/bmake/contrib/openpam/lib/openpam_ttyconv.c projects/bmake/contrib/openpam/lib/pam_acct_mgmt.c projects/bmake/contrib/openpam/lib/pam_authenticate.c projects/bmake/contrib/openpam/lib/pam_authenticate_secondary.c projects/bmake/contrib/openpam/lib/pam_chauthtok.c projects/bmake/contrib/openpam/lib/pam_close_session.c projects/bmake/contrib/openpam/lib/pam_end.c projects/bmake/contrib/openpam/lib/pam_error.c projects/bmake/contrib/openpam/lib/pam_get_authtok.c projects/bmake/contrib/openpam/lib/pam_get_data.c projects/bmake/contrib/openpam/lib/pam_get_item.c projects/bmake/contrib/openpam/lib/pam_get_mapped_authtok.c projects/bmake/contrib/openpam/lib/pam_get_mapped_username.c projects/bmake/contrib/openpam/lib/pam_get_user.c projects/bmake/contrib/openpam/lib/pam_getenv.c projects/bmake/contrib/openpam/lib/pam_getenvlist.c projects/bmake/contrib/openpam/lib/pam_info.c projects/bmake/contrib/openpam/lib/pam_open_session.c projects/bmake/contrib/openpam/lib/pam_prompt.c projects/bmake/contrib/openpam/lib/pam_putenv.c projects/bmake/contrib/openpam/lib/pam_set_data.c projects/bmake/contrib/openpam/lib/pam_set_item.c projects/bmake/contrib/openpam/lib/pam_set_mapped_authtok.c projects/bmake/contrib/openpam/lib/pam_set_mapped_username.c projects/bmake/contrib/openpam/lib/pam_setcred.c projects/bmake/contrib/openpam/lib/pam_setenv.c projects/bmake/contrib/openpam/lib/pam_sm_acct_mgmt.c projects/bmake/contrib/openpam/lib/pam_sm_authenticate.c projects/bmake/contrib/openpam/lib/pam_sm_authenticate_secondary.c projects/bmake/contrib/openpam/lib/pam_sm_chauthtok.c projects/bmake/contrib/openpam/lib/pam_sm_close_session.c projects/bmake/contrib/openpam/lib/pam_sm_get_mapped_authtok.c projects/bmake/contrib/openpam/lib/pam_sm_get_mapped_username.c projects/bmake/contrib/openpam/lib/pam_sm_open_session.c projects/bmake/contrib/openpam/lib/pam_sm_set_mapped_authtok.c projects/bmake/contrib/openpam/lib/pam_sm_set_mapped_username.c projects/bmake/contrib/openpam/lib/pam_sm_setcred.c projects/bmake/contrib/openpam/lib/pam_start.c projects/bmake/contrib/openpam/lib/pam_strerror.c projects/bmake/contrib/openpam/lib/pam_verror.c projects/bmake/contrib/openpam/lib/pam_vinfo.c projects/bmake/contrib/openpam/lib/pam_vprompt.c projects/bmake/sys/contrib/ipfilter/netinet/QNX_OCL.txt projects/bmake/sys/dev/random/probe.c Modified: projects/bmake/Makefile projects/bmake/Makefile.inc1 projects/bmake/ObsoleteFiles.inc projects/bmake/UPDATING projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/bmake/contrib/bmake/job.c projects/bmake/contrib/gcc/config/arm/ieee754-df.S projects/bmake/contrib/ipfilter/BNF projects/bmake/contrib/ipfilter/BSD/Makefile projects/bmake/contrib/ipfilter/BSD/Makefile.ipsend projects/bmake/contrib/ipfilter/BSD/ipfadm-rcd projects/bmake/contrib/ipfilter/BSD/kupgrade projects/bmake/contrib/ipfilter/FAQ.FreeBSD projects/bmake/contrib/ipfilter/FWTK/ftp-gw.diff projects/bmake/contrib/ipfilter/FWTK/fwtk_transparent.diff projects/bmake/contrib/ipfilter/FreeBSD-2.2/kinstall projects/bmake/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 projects/bmake/contrib/ipfilter/FreeBSD-3/kinstall projects/bmake/contrib/ipfilter/FreeBSD-4.0/kinstall projects/bmake/contrib/ipfilter/FreeBSD/kinstall projects/bmake/contrib/ipfilter/HISTORY projects/bmake/contrib/ipfilter/INSTALL.FreeBSD projects/bmake/contrib/ipfilter/Makefile projects/bmake/contrib/ipfilter/NAT.FreeBSD projects/bmake/contrib/ipfilter/etc/protocols projects/bmake/contrib/ipfilter/etc/services projects/bmake/contrib/ipfilter/ip_fil.c projects/bmake/contrib/ipfilter/ipf.h projects/bmake/contrib/ipfilter/iplang/Makefile projects/bmake/contrib/ipfilter/iplang/iplang.h projects/bmake/contrib/ipfilter/iplang/iplang.tst projects/bmake/contrib/ipfilter/iplang/iplang_l.l projects/bmake/contrib/ipfilter/iplang/iplang_y.y projects/bmake/contrib/ipfilter/ipmon.h projects/bmake/contrib/ipfilter/ipsd/Makefile projects/bmake/contrib/ipfilter/ipsd/ipsd.c projects/bmake/contrib/ipfilter/ipsd/ipsdr.c projects/bmake/contrib/ipfilter/ipsd/linux.h projects/bmake/contrib/ipfilter/ipsd/sbpf.c projects/bmake/contrib/ipfilter/ipsd/sdlpi.c projects/bmake/contrib/ipfilter/ipsd/slinux.c projects/bmake/contrib/ipfilter/ipsd/snit.c projects/bmake/contrib/ipfilter/ipsend/44arp.c projects/bmake/contrib/ipfilter/ipsend/Makefile projects/bmake/contrib/ipfilter/ipsend/arp.c projects/bmake/contrib/ipfilter/ipsend/dlcommon.c projects/bmake/contrib/ipfilter/ipsend/ip.c projects/bmake/contrib/ipfilter/ipsend/ipresend.c projects/bmake/contrib/ipfilter/ipsend/ipsend.5 projects/bmake/contrib/ipfilter/ipsend/ipsend.c projects/bmake/contrib/ipfilter/ipsend/ipsend.h projects/bmake/contrib/ipfilter/ipsend/ipsopt.c projects/bmake/contrib/ipfilter/ipsend/iptest.c projects/bmake/contrib/ipfilter/ipsend/iptests.c projects/bmake/contrib/ipfilter/ipsend/larp.c projects/bmake/contrib/ipfilter/ipsend/linux.h projects/bmake/contrib/ipfilter/ipsend/lsock.c projects/bmake/contrib/ipfilter/ipsend/resend.c projects/bmake/contrib/ipfilter/ipsend/sbpf.c projects/bmake/contrib/ipfilter/ipsend/sdlpi.c projects/bmake/contrib/ipfilter/ipsend/sirix.c projects/bmake/contrib/ipfilter/ipsend/slinux.c projects/bmake/contrib/ipfilter/ipsend/snit.c projects/bmake/contrib/ipfilter/ipsend/sock.c projects/bmake/contrib/ipfilter/ipt.h projects/bmake/contrib/ipfilter/kmem.h projects/bmake/contrib/ipfilter/l4check/Makefile projects/bmake/contrib/ipfilter/l4check/l4check.c projects/bmake/contrib/ipfilter/lib/Makefile projects/bmake/contrib/ipfilter/lib/addicmp.c projects/bmake/contrib/ipfilter/lib/addipopt.c projects/bmake/contrib/ipfilter/lib/alist_free.c projects/bmake/contrib/ipfilter/lib/alist_new.c projects/bmake/contrib/ipfilter/lib/bcopywrap.c projects/bmake/contrib/ipfilter/lib/binprint.c projects/bmake/contrib/ipfilter/lib/buildopts.c projects/bmake/contrib/ipfilter/lib/checkrev.c projects/bmake/contrib/ipfilter/lib/count4bits.c projects/bmake/contrib/ipfilter/lib/count6bits.c projects/bmake/contrib/ipfilter/lib/debug.c projects/bmake/contrib/ipfilter/lib/facpri.c projects/bmake/contrib/ipfilter/lib/facpri.h projects/bmake/contrib/ipfilter/lib/fill6bits.c projects/bmake/contrib/ipfilter/lib/flags.c projects/bmake/contrib/ipfilter/lib/gethost.c projects/bmake/contrib/ipfilter/lib/getifname.c projects/bmake/contrib/ipfilter/lib/getnattype.c projects/bmake/contrib/ipfilter/lib/getport.c projects/bmake/contrib/ipfilter/lib/getportproto.c projects/bmake/contrib/ipfilter/lib/getproto.c projects/bmake/contrib/ipfilter/lib/getsumd.c projects/bmake/contrib/ipfilter/lib/hostname.c projects/bmake/contrib/ipfilter/lib/icmpcode.c projects/bmake/contrib/ipfilter/lib/initparse.c projects/bmake/contrib/ipfilter/lib/ionames.c projects/bmake/contrib/ipfilter/lib/ipf_dotuning.c projects/bmake/contrib/ipfilter/lib/ipft_hx.c projects/bmake/contrib/ipfilter/lib/ipft_pc.c projects/bmake/contrib/ipfilter/lib/ipft_tx.c projects/bmake/contrib/ipfilter/lib/ipoptsec.c projects/bmake/contrib/ipfilter/lib/kmem.c projects/bmake/contrib/ipfilter/lib/kmem.h projects/bmake/contrib/ipfilter/lib/kmemcpywrap.c projects/bmake/contrib/ipfilter/lib/kvatoname.c projects/bmake/contrib/ipfilter/lib/load_file.c projects/bmake/contrib/ipfilter/lib/load_hash.c projects/bmake/contrib/ipfilter/lib/load_hashnode.c projects/bmake/contrib/ipfilter/lib/load_http.c projects/bmake/contrib/ipfilter/lib/load_pool.c projects/bmake/contrib/ipfilter/lib/load_poolnode.c projects/bmake/contrib/ipfilter/lib/load_url.c projects/bmake/contrib/ipfilter/lib/mutex_emul.c projects/bmake/contrib/ipfilter/lib/nametokva.c projects/bmake/contrib/ipfilter/lib/nat_setgroupmap.c projects/bmake/contrib/ipfilter/lib/ntomask.c projects/bmake/contrib/ipfilter/lib/optname.c projects/bmake/contrib/ipfilter/lib/optprint.c projects/bmake/contrib/ipfilter/lib/optprintv6.c projects/bmake/contrib/ipfilter/lib/optvalue.c projects/bmake/contrib/ipfilter/lib/portname.c projects/bmake/contrib/ipfilter/lib/print_toif.c projects/bmake/contrib/ipfilter/lib/printactivenat.c projects/bmake/contrib/ipfilter/lib/printaps.c projects/bmake/contrib/ipfilter/lib/printbuf.c projects/bmake/contrib/ipfilter/lib/printfr.c projects/bmake/contrib/ipfilter/lib/printfraginfo.c projects/bmake/contrib/ipfilter/lib/printhash.c projects/bmake/contrib/ipfilter/lib/printhash_live.c projects/bmake/contrib/ipfilter/lib/printhashdata.c projects/bmake/contrib/ipfilter/lib/printhashnode.c projects/bmake/contrib/ipfilter/lib/printhostmap.c projects/bmake/contrib/ipfilter/lib/printhostmask.c projects/bmake/contrib/ipfilter/lib/printifname.c projects/bmake/contrib/ipfilter/lib/printip.c projects/bmake/contrib/ipfilter/lib/printlog.c projects/bmake/contrib/ipfilter/lib/printmask.c projects/bmake/contrib/ipfilter/lib/printnat.c projects/bmake/contrib/ipfilter/lib/printpacket.c projects/bmake/contrib/ipfilter/lib/printpacket6.c projects/bmake/contrib/ipfilter/lib/printpool.c projects/bmake/contrib/ipfilter/lib/printpool_live.c projects/bmake/contrib/ipfilter/lib/printpooldata.c projects/bmake/contrib/ipfilter/lib/printpoolnode.c projects/bmake/contrib/ipfilter/lib/printportcmp.c projects/bmake/contrib/ipfilter/lib/printproto.c projects/bmake/contrib/ipfilter/lib/printsbuf.c projects/bmake/contrib/ipfilter/lib/printstate.c projects/bmake/contrib/ipfilter/lib/printtqtable.c projects/bmake/contrib/ipfilter/lib/printtunable.c projects/bmake/contrib/ipfilter/lib/remove_hash.c projects/bmake/contrib/ipfilter/lib/remove_hashnode.c projects/bmake/contrib/ipfilter/lib/remove_pool.c projects/bmake/contrib/ipfilter/lib/remove_poolnode.c projects/bmake/contrib/ipfilter/lib/resetlexer.c projects/bmake/contrib/ipfilter/lib/rwlock_emul.c projects/bmake/contrib/ipfilter/lib/tcpflags.c projects/bmake/contrib/ipfilter/lib/tcpoptnames.c projects/bmake/contrib/ipfilter/lib/v6ionames.c projects/bmake/contrib/ipfilter/lib/v6optvalue.c projects/bmake/contrib/ipfilter/lib/var.c projects/bmake/contrib/ipfilter/lib/verbose.c projects/bmake/contrib/ipfilter/man/Makefile projects/bmake/contrib/ipfilter/man/ipf.4 projects/bmake/contrib/ipfilter/man/ipf.5 projects/bmake/contrib/ipfilter/man/ipfilter.4 projects/bmake/contrib/ipfilter/man/ipfilter.4.mandoc projects/bmake/contrib/ipfilter/man/ipfstat.8 projects/bmake/contrib/ipfilter/man/ipftest.1 projects/bmake/contrib/ipfilter/man/ipmon.5 projects/bmake/contrib/ipfilter/man/ipnat.4 projects/bmake/contrib/ipfilter/man/ipnat.5 projects/bmake/contrib/ipfilter/man/ipnat.8 projects/bmake/contrib/ipfilter/man/ippool.5 projects/bmake/contrib/ipfilter/man/ippool.8 projects/bmake/contrib/ipfilter/md5.c projects/bmake/contrib/ipfilter/mkfilters projects/bmake/contrib/ipfilter/mlf_ipl.c projects/bmake/contrib/ipfilter/mlf_rule.c projects/bmake/contrib/ipfilter/mlfk_rule.c projects/bmake/contrib/ipfilter/mlh_rule.c (contents, props changed) projects/bmake/contrib/ipfilter/opts.h projects/bmake/contrib/ipfilter/pcap-ipf.h projects/bmake/contrib/ipfilter/perl/Ipfanaly.pl projects/bmake/contrib/ipfilter/perl/Isbgraph projects/bmake/contrib/ipfilter/perl/Services projects/bmake/contrib/ipfilter/perl/ipfmeta.pl projects/bmake/contrib/ipfilter/perl/logfilter.pl projects/bmake/contrib/ipfilter/radix_ipf.h projects/bmake/contrib/ipfilter/rules/BASIC_1.FW projects/bmake/contrib/ipfilter/rules/BASIC_2.FW projects/bmake/contrib/ipfilter/rules/firewall projects/bmake/contrib/ipfilter/rules/ipmon.conf projects/bmake/contrib/ipfilter/rules/server projects/bmake/contrib/ipfilter/samples/proxy.c projects/bmake/contrib/ipfilter/samples/relay.c projects/bmake/contrib/ipfilter/snoop.h projects/bmake/contrib/ipfilter/test/Makefile projects/bmake/contrib/ipfilter/test/bpftest projects/bmake/contrib/ipfilter/test/dotest projects/bmake/contrib/ipfilter/test/expected/f11 projects/bmake/contrib/ipfilter/test/expected/f13 projects/bmake/contrib/ipfilter/test/expected/f18 projects/bmake/contrib/ipfilter/test/expected/i1 projects/bmake/contrib/ipfilter/test/expected/i10 projects/bmake/contrib/ipfilter/test/expected/i11 projects/bmake/contrib/ipfilter/test/expected/i12 projects/bmake/contrib/ipfilter/test/expected/i14 projects/bmake/contrib/ipfilter/test/expected/i17 projects/bmake/contrib/ipfilter/test/expected/i18 projects/bmake/contrib/ipfilter/test/expected/i2 projects/bmake/contrib/ipfilter/test/expected/i20 projects/bmake/contrib/ipfilter/test/expected/i3 projects/bmake/contrib/ipfilter/test/expected/i4 projects/bmake/contrib/ipfilter/test/expected/i5 projects/bmake/contrib/ipfilter/test/expected/i6 projects/bmake/contrib/ipfilter/test/expected/i7 projects/bmake/contrib/ipfilter/test/expected/i8 projects/bmake/contrib/ipfilter/test/expected/i9 projects/bmake/contrib/ipfilter/test/expected/in1 projects/bmake/contrib/ipfilter/test/expected/in2 projects/bmake/contrib/ipfilter/test/expected/in3 projects/bmake/contrib/ipfilter/test/expected/in5 projects/bmake/contrib/ipfilter/test/expected/in6 projects/bmake/contrib/ipfilter/test/expected/ip1 projects/bmake/contrib/ipfilter/test/expected/ip2 projects/bmake/contrib/ipfilter/test/expected/ipv6.6 projects/bmake/contrib/ipfilter/test/expected/l1 projects/bmake/contrib/ipfilter/test/expected/l1.b projects/bmake/contrib/ipfilter/test/expected/n1 projects/bmake/contrib/ipfilter/test/expected/n10 projects/bmake/contrib/ipfilter/test/expected/n11 projects/bmake/contrib/ipfilter/test/expected/n12 projects/bmake/contrib/ipfilter/test/expected/n13 projects/bmake/contrib/ipfilter/test/expected/n14 projects/bmake/contrib/ipfilter/test/expected/n16 projects/bmake/contrib/ipfilter/test/expected/n2 projects/bmake/contrib/ipfilter/test/expected/n3 projects/bmake/contrib/ipfilter/test/expected/n4 projects/bmake/contrib/ipfilter/test/expected/n5 projects/bmake/contrib/ipfilter/test/expected/n6 projects/bmake/contrib/ipfilter/test/expected/n7 projects/bmake/contrib/ipfilter/test/expected/n8 projects/bmake/contrib/ipfilter/test/expected/n9 projects/bmake/contrib/ipfilter/test/expected/ni10 projects/bmake/contrib/ipfilter/test/expected/ni11 projects/bmake/contrib/ipfilter/test/expected/ni12 projects/bmake/contrib/ipfilter/test/expected/ni19 projects/bmake/contrib/ipfilter/test/expected/ni2 projects/bmake/contrib/ipfilter/test/expected/ni20 projects/bmake/contrib/ipfilter/test/expected/ni21 projects/bmake/contrib/ipfilter/test/expected/ni23 projects/bmake/contrib/ipfilter/test/expected/ni4 projects/bmake/contrib/ipfilter/test/expected/ni5 projects/bmake/contrib/ipfilter/test/expected/ni6 projects/bmake/contrib/ipfilter/test/expected/ni8 projects/bmake/contrib/ipfilter/test/expected/p1 projects/bmake/contrib/ipfilter/test/expected/p2 projects/bmake/contrib/ipfilter/test/expected/p3 projects/bmake/contrib/ipfilter/test/expected/p5 projects/bmake/contrib/ipfilter/test/input/f13 projects/bmake/contrib/ipfilter/test/input/f24 projects/bmake/contrib/ipfilter/test/input/ipv6.1 projects/bmake/contrib/ipfilter/test/input/ipv6.3 projects/bmake/contrib/ipfilter/test/input/ipv6.6 projects/bmake/contrib/ipfilter/test/input/n10 projects/bmake/contrib/ipfilter/test/input/n12 projects/bmake/contrib/ipfilter/test/input/n16 projects/bmake/contrib/ipfilter/test/input/n8 projects/bmake/contrib/ipfilter/test/input/n9 projects/bmake/contrib/ipfilter/test/input/ni1 projects/bmake/contrib/ipfilter/test/input/ni10 projects/bmake/contrib/ipfilter/test/input/ni11 projects/bmake/contrib/ipfilter/test/input/ni12 projects/bmake/contrib/ipfilter/test/input/ni13 projects/bmake/contrib/ipfilter/test/input/ni14 projects/bmake/contrib/ipfilter/test/input/ni15 projects/bmake/contrib/ipfilter/test/input/ni16 projects/bmake/contrib/ipfilter/test/input/ni19 projects/bmake/contrib/ipfilter/test/input/ni2 projects/bmake/contrib/ipfilter/test/input/ni20 projects/bmake/contrib/ipfilter/test/input/ni3 projects/bmake/contrib/ipfilter/test/input/ni4 projects/bmake/contrib/ipfilter/test/input/ni5 projects/bmake/contrib/ipfilter/test/input/ni7 projects/bmake/contrib/ipfilter/test/input/ni8 projects/bmake/contrib/ipfilter/test/input/ni9 projects/bmake/contrib/ipfilter/test/intest projects/bmake/contrib/ipfilter/test/iptest projects/bmake/contrib/ipfilter/test/itest projects/bmake/contrib/ipfilter/test/logtest projects/bmake/contrib/ipfilter/test/mtest projects/bmake/contrib/ipfilter/test/natipftest projects/bmake/contrib/ipfilter/test/nattest projects/bmake/contrib/ipfilter/test/ptest projects/bmake/contrib/ipfilter/test/regress/f13 projects/bmake/contrib/ipfilter/test/regress/i11 projects/bmake/contrib/ipfilter/test/regress/i12 projects/bmake/contrib/ipfilter/test/regress/i14 projects/bmake/contrib/ipfilter/test/regress/i17 projects/bmake/contrib/ipfilter/test/regress/i18 projects/bmake/contrib/ipfilter/test/regress/i2 projects/bmake/contrib/ipfilter/test/regress/i21 projects/bmake/contrib/ipfilter/test/regress/i7 projects/bmake/contrib/ipfilter/test/regress/i8 projects/bmake/contrib/ipfilter/test/regress/in2 projects/bmake/contrib/ipfilter/test/regress/ipv6.5 projects/bmake/contrib/ipfilter/test/regress/ipv6.6 projects/bmake/contrib/ipfilter/test/regress/ni13.nat projects/bmake/contrib/ipfilter/test/regress/ni14.nat projects/bmake/contrib/ipfilter/test/regress/p1.pool projects/bmake/contrib/ipfilter/test/regress/p3.ipf projects/bmake/contrib/ipfilter/test/test.format projects/bmake/contrib/ipfilter/test/vfycksum.pl projects/bmake/contrib/ipfilter/todo projects/bmake/contrib/ipfilter/tools/BNF.ipf projects/bmake/contrib/ipfilter/tools/Makefile projects/bmake/contrib/ipfilter/tools/ipf.c projects/bmake/contrib/ipfilter/tools/ipf_y.y projects/bmake/contrib/ipfilter/tools/ipfcomp.c projects/bmake/contrib/ipfilter/tools/ipfs.c projects/bmake/contrib/ipfilter/tools/ipfstat.c projects/bmake/contrib/ipfilter/tools/ipftest.c projects/bmake/contrib/ipfilter/tools/ipmon.c projects/bmake/contrib/ipfilter/tools/ipmon_y.y projects/bmake/contrib/ipfilter/tools/ipnat.c projects/bmake/contrib/ipfilter/tools/ipnat_y.y projects/bmake/contrib/ipfilter/tools/ippool.c projects/bmake/contrib/ipfilter/tools/ippool_y.y projects/bmake/contrib/ipfilter/tools/ipscan_y.y projects/bmake/contrib/ipfilter/tools/ipsyncm.c projects/bmake/contrib/ipfilter/tools/ipsyncs.c projects/bmake/contrib/ipfilter/tools/lex_var.h projects/bmake/contrib/ipfilter/tools/lexer.c projects/bmake/contrib/ipfilter/tools/lexer.h projects/bmake/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/bmake/contrib/llvm/tools/clang/lib/Driver/ToolChains.h projects/bmake/contrib/openpam/CREDITS projects/bmake/contrib/openpam/HISTORY projects/bmake/contrib/openpam/INSTALL projects/bmake/contrib/openpam/LICENSE projects/bmake/contrib/openpam/Makefile.am projects/bmake/contrib/openpam/Makefile.in projects/bmake/contrib/openpam/README projects/bmake/contrib/openpam/RELNOTES projects/bmake/contrib/openpam/TODO projects/bmake/contrib/openpam/aclocal.m4 projects/bmake/contrib/openpam/autogen.sh projects/bmake/contrib/openpam/bin/Makefile.am projects/bmake/contrib/openpam/bin/Makefile.in projects/bmake/contrib/openpam/bin/openpam_dump_policy/Makefile.am projects/bmake/contrib/openpam/bin/openpam_dump_policy/Makefile.in projects/bmake/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c projects/bmake/contrib/openpam/bin/pamtest/Makefile.am projects/bmake/contrib/openpam/bin/pamtest/Makefile.in projects/bmake/contrib/openpam/bin/pamtest/pamtest.1 projects/bmake/contrib/openpam/bin/pamtest/pamtest.c projects/bmake/contrib/openpam/bin/su/Makefile.am projects/bmake/contrib/openpam/bin/su/Makefile.in projects/bmake/contrib/openpam/bin/su/su.1 projects/bmake/contrib/openpam/bin/su/su.c projects/bmake/contrib/openpam/compile projects/bmake/contrib/openpam/config.guess projects/bmake/contrib/openpam/config.h.in projects/bmake/contrib/openpam/config.sub projects/bmake/contrib/openpam/configure projects/bmake/contrib/openpam/configure.ac projects/bmake/contrib/openpam/depcomp projects/bmake/contrib/openpam/doc/Makefile.am projects/bmake/contrib/openpam/doc/Makefile.in projects/bmake/contrib/openpam/doc/man/Makefile.am projects/bmake/contrib/openpam/doc/man/Makefile.in projects/bmake/contrib/openpam/doc/man/openpam.3 projects/bmake/contrib/openpam/doc/man/openpam.man projects/bmake/contrib/openpam/doc/man/openpam_borrow_cred.3 projects/bmake/contrib/openpam/doc/man/openpam_free_data.3 projects/bmake/contrib/openpam/doc/man/openpam_free_envlist.3 projects/bmake/contrib/openpam/doc/man/openpam_get_feature.3 projects/bmake/contrib/openpam/doc/man/openpam_get_option.3 projects/bmake/contrib/openpam/doc/man/openpam_log.3 projects/bmake/contrib/openpam/doc/man/openpam_nullconv.3 projects/bmake/contrib/openpam/doc/man/openpam_readline.3 projects/bmake/contrib/openpam/doc/man/openpam_readlinev.3 projects/bmake/contrib/openpam/doc/man/openpam_readword.3 projects/bmake/contrib/openpam/doc/man/openpam_restore_cred.3 projects/bmake/contrib/openpam/doc/man/openpam_set_feature.3 projects/bmake/contrib/openpam/doc/man/openpam_set_option.3 projects/bmake/contrib/openpam/doc/man/openpam_straddch.3 projects/bmake/contrib/openpam/doc/man/openpam_subst.3 projects/bmake/contrib/openpam/doc/man/openpam_ttyconv.3 projects/bmake/contrib/openpam/doc/man/pam.3 projects/bmake/contrib/openpam/doc/man/pam.conf.5 projects/bmake/contrib/openpam/doc/man/pam.man projects/bmake/contrib/openpam/doc/man/pam_acct_mgmt.3 projects/bmake/contrib/openpam/doc/man/pam_authenticate.3 projects/bmake/contrib/openpam/doc/man/pam_chauthtok.3 projects/bmake/contrib/openpam/doc/man/pam_close_session.3 projects/bmake/contrib/openpam/doc/man/pam_conv.3 projects/bmake/contrib/openpam/doc/man/pam_end.3 projects/bmake/contrib/openpam/doc/man/pam_error.3 projects/bmake/contrib/openpam/doc/man/pam_get_authtok.3 projects/bmake/contrib/openpam/doc/man/pam_get_data.3 projects/bmake/contrib/openpam/doc/man/pam_get_item.3 projects/bmake/contrib/openpam/doc/man/pam_get_user.3 projects/bmake/contrib/openpam/doc/man/pam_getenv.3 projects/bmake/contrib/openpam/doc/man/pam_getenvlist.3 projects/bmake/contrib/openpam/doc/man/pam_info.3 projects/bmake/contrib/openpam/doc/man/pam_open_session.3 projects/bmake/contrib/openpam/doc/man/pam_prompt.3 projects/bmake/contrib/openpam/doc/man/pam_putenv.3 projects/bmake/contrib/openpam/doc/man/pam_set_data.3 projects/bmake/contrib/openpam/doc/man/pam_set_item.3 projects/bmake/contrib/openpam/doc/man/pam_setcred.3 projects/bmake/contrib/openpam/doc/man/pam_setenv.3 projects/bmake/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 projects/bmake/contrib/openpam/doc/man/pam_sm_authenticate.3 projects/bmake/contrib/openpam/doc/man/pam_sm_chauthtok.3 projects/bmake/contrib/openpam/doc/man/pam_sm_close_session.3 projects/bmake/contrib/openpam/doc/man/pam_sm_open_session.3 projects/bmake/contrib/openpam/doc/man/pam_sm_setcred.3 projects/bmake/contrib/openpam/doc/man/pam_start.3 projects/bmake/contrib/openpam/doc/man/pam_strerror.3 projects/bmake/contrib/openpam/doc/man/pam_verror.3 projects/bmake/contrib/openpam/doc/man/pam_vinfo.3 projects/bmake/contrib/openpam/doc/man/pam_vprompt.3 projects/bmake/contrib/openpam/include/Makefile.am projects/bmake/contrib/openpam/include/Makefile.in projects/bmake/contrib/openpam/include/security/Makefile.am projects/bmake/contrib/openpam/include/security/Makefile.in projects/bmake/contrib/openpam/include/security/openpam.h projects/bmake/contrib/openpam/include/security/openpam_attr.h projects/bmake/contrib/openpam/include/security/openpam_version.h projects/bmake/contrib/openpam/include/security/pam_appl.h projects/bmake/contrib/openpam/include/security/pam_constants.h projects/bmake/contrib/openpam/include/security/pam_modules.h projects/bmake/contrib/openpam/include/security/pam_types.h projects/bmake/contrib/openpam/install-sh projects/bmake/contrib/openpam/misc/gendoc.pl projects/bmake/contrib/openpam/missing projects/bmake/contrib/openpam/modules/Makefile.am projects/bmake/contrib/openpam/modules/Makefile.in projects/bmake/contrib/openpam/modules/pam_deny/Makefile.am projects/bmake/contrib/openpam/modules/pam_deny/Makefile.in projects/bmake/contrib/openpam/modules/pam_deny/pam_deny.c projects/bmake/contrib/openpam/modules/pam_permit/Makefile.am projects/bmake/contrib/openpam/modules/pam_permit/Makefile.in projects/bmake/contrib/openpam/modules/pam_permit/pam_permit.c projects/bmake/contrib/openpam/modules/pam_unix/Makefile.am projects/bmake/contrib/openpam/modules/pam_unix/Makefile.in projects/bmake/contrib/openpam/modules/pam_unix/pam_unix.c projects/bmake/contrib/openpam/pamgdb.in projects/bmake/contrib/openpam/t/Makefile.am projects/bmake/contrib/openpam/t/Makefile.in projects/bmake/contrib/openpam/t/t.h projects/bmake/contrib/openpam/t/t_main.c projects/bmake/contrib/openpam/t/t_openpam_readlinev.c projects/bmake/contrib/openpam/t/t_openpam_readword.c projects/bmake/crypto/openssh/readconf.c projects/bmake/crypto/openssh/ssh_config projects/bmake/crypto/openssh/ssh_config.5 projects/bmake/etc/Makefile projects/bmake/etc/mtree/BSD.usr.dist projects/bmake/etc/rc.d/ipfilter projects/bmake/etc/rc.d/ipfs projects/bmake/etc/rc.d/ipmon projects/bmake/gnu/lib/Makefile projects/bmake/gnu/usr.bin/cc/Makefile projects/bmake/include/iconv.h projects/bmake/kerberos5/Makefile.inc projects/bmake/kerberos5/lib/libheimipcc/Makefile projects/bmake/kerberos5/lib/libheimipcs/Makefile projects/bmake/kerberos5/lib/libkrb5/Makefile projects/bmake/kerberos5/libexec/digest-service/Makefile projects/bmake/kerberos5/libexec/kcm/Makefile projects/bmake/lib/libc/arm/_fpmath.h projects/bmake/lib/libc/arm/arith.h projects/bmake/lib/libc/arm/softfloat/arm-gcc.h projects/bmake/lib/libc/iconv/citrus_iconv_local.h projects/bmake/lib/libc/net/getaddrinfo.c projects/bmake/lib/libc/net/if_nametoindex.c projects/bmake/lib/libc/net/name6.c projects/bmake/lib/libc/net/nscachedcli.c projects/bmake/lib/libc/resolv/res_send.c projects/bmake/lib/libc/stdio/flags.c projects/bmake/lib/libc/sys/mmap.2 projects/bmake/lib/libc/sys/sigaction.2 projects/bmake/lib/libc/sys/sigpending.2 projects/bmake/lib/libc/sys/sigreturn.2 projects/bmake/lib/libc/sys/sigwait.2 projects/bmake/lib/libc/sys/wait.2 projects/bmake/lib/libiconv_modules/Makefile.inc projects/bmake/lib/libldns/Makefile projects/bmake/lib/libpam/libpam/Makefile projects/bmake/lib/libpam/modules/pam_ssh/Makefile projects/bmake/lib/msun/Makefile projects/bmake/lib/msun/Symbol.map projects/bmake/lib/msun/src/math_private.h projects/bmake/release/picobsd/build/picobsd projects/bmake/sbin/camcontrol/camcontrol.8 projects/bmake/sbin/camcontrol/camcontrol.c projects/bmake/sbin/camcontrol/fwdownload.c projects/bmake/sbin/ipf/ipf/Makefile projects/bmake/sbin/ipf/ipftest/Makefile projects/bmake/sbin/ipf/libipf/Makefile projects/bmake/sbin/newfs_msdos/newfs_msdos.c projects/bmake/sbin/swapon/swapon.c projects/bmake/secure/lib/libssh/Makefile projects/bmake/secure/libexec/sftp-server/Makefile projects/bmake/secure/libexec/ssh-keysign/Makefile projects/bmake/secure/libexec/ssh-pkcs11-helper/Makefile projects/bmake/secure/usr.bin/scp/Makefile projects/bmake/secure/usr.bin/sftp/Makefile projects/bmake/secure/usr.bin/ssh-add/Makefile projects/bmake/secure/usr.bin/ssh-agent/Makefile projects/bmake/secure/usr.bin/ssh-keygen/Makefile projects/bmake/secure/usr.bin/ssh-keyscan/Makefile projects/bmake/secure/usr.bin/ssh/Makefile projects/bmake/secure/usr.sbin/sshd/Makefile projects/bmake/share/examples/kld/Makefile projects/bmake/share/man/man4/geom.4 projects/bmake/share/man/man4/ntb.4 projects/bmake/share/man/man5/src.conf.5 projects/bmake/share/mk/bsd.lib.mk projects/bmake/share/mk/bsd.libnames.mk projects/bmake/share/mk/bsd.own.mk projects/bmake/share/mk/bsd.prog.mk projects/bmake/sys/amd64/amd64/mp_machdep.c projects/bmake/sys/amd64/amd64/pmap.c projects/bmake/sys/amd64/amd64/vm_machdep.c projects/bmake/sys/amd64/conf/NOTES projects/bmake/sys/amd64/include/cpu.h projects/bmake/sys/amd64/include/cpufunc.h projects/bmake/sys/amd64/include/pcpu.h projects/bmake/sys/amd64/include/sf_buf.h projects/bmake/sys/amd64/include/vmm.h (contents, props changed) projects/bmake/sys/amd64/vmm/intel/vmx.c projects/bmake/sys/amd64/vmm/io/ppt.c projects/bmake/sys/amd64/vmm/io/ppt.h projects/bmake/sys/amd64/vmm/vmm.c projects/bmake/sys/amd64/vmm/vmm_msr.c projects/bmake/sys/amd64/vmm/x86.c projects/bmake/sys/amd64/vmm/x86.h projects/bmake/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/bmake/sys/arm/include/ieee.h projects/bmake/sys/arm/include/sf_buf.h projects/bmake/sys/cam/scsi/scsi_da.c projects/bmake/sys/cam/scsi/scsi_da.h projects/bmake/sys/cam/scsi/scsi_enc_ses.c projects/bmake/sys/cddl/compat/opensolaris/sys/kcondvar.h projects/bmake/sys/cddl/compat/opensolaris/sys/time.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/bmake/sys/cddl/dev/dtrace/dtrace_clone.c projects/bmake/sys/compat/freebsd32/freebsd32_misc.c projects/bmake/sys/compat/linux/linux_misc.c projects/bmake/sys/compat/svr4/imgact_svr4.c projects/bmake/sys/conf/files projects/bmake/sys/conf/files.mips projects/bmake/sys/contrib/ipfilter/netinet/fil.c projects/bmake/sys/contrib/ipfilter/netinet/ip_auth.c projects/bmake/sys/contrib/ipfilter/netinet/ip_auth.h projects/bmake/sys/contrib/ipfilter/netinet/ip_compat.h projects/bmake/sys/contrib/ipfilter/netinet/ip_fil.h projects/bmake/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/bmake/sys/contrib/ipfilter/netinet/ip_frag.c projects/bmake/sys/contrib/ipfilter/netinet/ip_frag.h projects/bmake/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/ip_htable.c projects/bmake/sys/contrib/ipfilter/netinet/ip_htable.h projects/bmake/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/ip_irc_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/ip_log.c projects/bmake/sys/contrib/ipfilter/netinet/ip_lookup.c projects/bmake/sys/contrib/ipfilter/netinet/ip_lookup.h projects/bmake/sys/contrib/ipfilter/netinet/ip_nat.c projects/bmake/sys/contrib/ipfilter/netinet/ip_nat.h projects/bmake/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/ip_pool.c projects/bmake/sys/contrib/ipfilter/netinet/ip_pool.h projects/bmake/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/ip_proxy.c projects/bmake/sys/contrib/ipfilter/netinet/ip_proxy.h projects/bmake/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c (contents, props changed) projects/bmake/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/ip_rules.c projects/bmake/sys/contrib/ipfilter/netinet/ip_scan.c projects/bmake/sys/contrib/ipfilter/netinet/ip_scan.h projects/bmake/sys/contrib/ipfilter/netinet/ip_state.c projects/bmake/sys/contrib/ipfilter/netinet/ip_state.h projects/bmake/sys/contrib/ipfilter/netinet/ip_sync.c projects/bmake/sys/contrib/ipfilter/netinet/ip_sync.h projects/bmake/sys/contrib/ipfilter/netinet/ipl.h projects/bmake/sys/contrib/ipfilter/netinet/mlfk_ipl.c projects/bmake/sys/dev/cpuctl/cpuctl.c projects/bmake/sys/dev/cxgbe/tom/t4_cpl_io.c projects/bmake/sys/dev/cxgbe/tom/t4_tom.c projects/bmake/sys/dev/cxgbe/tom/t4_tom.h projects/bmake/sys/dev/drm2/i915/i915_gem.c projects/bmake/sys/dev/firewire/fwdev.c projects/bmake/sys/dev/glxsb/glxsb.c projects/bmake/sys/dev/hifn/hifn7751.c projects/bmake/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/bmake/sys/dev/iicbus/if_ic.c projects/bmake/sys/dev/lmc/if_lmc.c projects/bmake/sys/dev/ntb/if_ntb/if_ntb.c projects/bmake/sys/dev/ntb/ntb_hw/ntb_hw.c projects/bmake/sys/dev/ntb/ntb_hw/ntb_hw.h projects/bmake/sys/dev/ntb/ntb_hw/ntb_regs.h projects/bmake/sys/dev/ofw/ofw_console.c projects/bmake/sys/dev/ppbus/if_plip.c projects/bmake/sys/dev/random/harvest.c projects/bmake/sys/dev/random/hash.c projects/bmake/sys/dev/random/hash.h projects/bmake/sys/dev/random/random_adaptors.c projects/bmake/sys/dev/random/random_adaptors.h projects/bmake/sys/dev/random/randomdev.c projects/bmake/sys/dev/random/randomdev_soft.c projects/bmake/sys/dev/random/randomdev_soft.h projects/bmake/sys/dev/random/yarrow.c projects/bmake/sys/dev/random/yarrow.h projects/bmake/sys/dev/rndtest/rndtest.c projects/bmake/sys/dev/safe/safe.c projects/bmake/sys/dev/ubsec/ubsec.c projects/bmake/sys/dev/usb/controller/xhci.c projects/bmake/sys/dev/usb/net/if_usie.c projects/bmake/sys/dev/usb/net/uhso.c projects/bmake/sys/dev/usb/storage/umass.c projects/bmake/sys/dev/vkbd/vkbd.c projects/bmake/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/bmake/sys/fs/ext2fs/ext2_htree.c projects/bmake/sys/fs/ext2fs/ext2_lookup.c projects/bmake/sys/fs/nullfs/null_vnops.c projects/bmake/sys/i386/conf/NOTES projects/bmake/sys/i386/i386/mp_machdep.c projects/bmake/sys/i386/i386/pmap.c projects/bmake/sys/i386/ibcs2/imgact_coff.c projects/bmake/sys/i386/include/cpu.h projects/bmake/sys/i386/include/pcpu.h projects/bmake/sys/i386/include/sf_buf.h projects/bmake/sys/i386/include/smp.h projects/bmake/sys/i386/linux/imgact_linux.c projects/bmake/sys/i386/xen/mp_machdep.c projects/bmake/sys/ia64/ia32/ia32_signal.c projects/bmake/sys/ia64/ia64/vm_machdep.c projects/bmake/sys/ia64/include/sf_buf.h projects/bmake/sys/kern/capabilities.conf projects/bmake/sys/kern/imgact_elf.c projects/bmake/sys/kern/imgact_gzip.c projects/bmake/sys/kern/init_main.c projects/bmake/sys/kern/kern_intr.c projects/bmake/sys/kern/kern_jail.c projects/bmake/sys/kern/link_elf.c projects/bmake/sys/kern/link_elf_obj.c projects/bmake/sys/kern/sched_ule.c projects/bmake/sys/kern/subr_capability.c projects/bmake/sys/kern/subr_prf.c projects/bmake/sys/kern/sys_pipe.c projects/bmake/sys/kern/sysv_shm.c projects/bmake/sys/kern/uipc_shm.c projects/bmake/sys/kern/uipc_syscalls.c projects/bmake/sys/kern/vfs_bio.c projects/bmake/sys/kern/vfs_mountroot.c projects/bmake/sys/mips/atheros/ar71xx_gpio.c projects/bmake/sys/mips/atheros/ar71xx_gpiovar.h projects/bmake/sys/mips/atheros/if_arge.c projects/bmake/sys/mips/cavium/octeon_rnd.c projects/bmake/sys/mips/include/sf_buf.h projects/bmake/sys/mips/mips/support.S projects/bmake/sys/mips/mips/vm_machdep.c projects/bmake/sys/mips/nlm/board.c projects/bmake/sys/mips/nlm/board.h projects/bmake/sys/mips/nlm/board_cpld.c projects/bmake/sys/mips/nlm/dev/net/nae.c projects/bmake/sys/mips/nlm/dev/net/xaui.c projects/bmake/sys/mips/nlm/dev/net/xlpge.c projects/bmake/sys/mips/nlm/dev/net/xlpge.h projects/bmake/sys/mips/nlm/hal/nae.h projects/bmake/sys/mips/nlm/hal/nlm_hal.c projects/bmake/sys/mips/nlm/hal/sys.h projects/bmake/sys/modules/ipfilter/Makefile projects/bmake/sys/modules/random/Makefile projects/bmake/sys/net/if.c projects/bmake/sys/net/if_ethersubr.c projects/bmake/sys/net/if_gif.c projects/bmake/sys/net/if_gre.c projects/bmake/sys/net/if_spppsubr.c projects/bmake/sys/net/if_tap.c projects/bmake/sys/net/if_tun.c projects/bmake/sys/net/netisr.c projects/bmake/sys/netgraph/ng_iface.c projects/bmake/sys/netinet/ip_carp.c projects/bmake/sys/netinet/sctp_indata.c projects/bmake/sys/netinet/sctp_output.c projects/bmake/sys/netinet6/in6.c projects/bmake/sys/netnatm/natm.c projects/bmake/sys/nlm/nlm_prot_impl.c projects/bmake/sys/powerpc/aim/mmu_oea64.c projects/bmake/sys/powerpc/aim/mmu_oea64.h projects/bmake/sys/powerpc/aim/nexus.c projects/bmake/sys/powerpc/aim/vm_machdep.c projects/bmake/sys/powerpc/include/frame.h projects/bmake/sys/powerpc/include/param.h projects/bmake/sys/powerpc/include/platform.h projects/bmake/sys/powerpc/include/pte.h projects/bmake/sys/powerpc/include/sf_buf.h projects/bmake/sys/powerpc/ofw/ofw_cpu.c projects/bmake/sys/powerpc/ofw/rtas.c projects/bmake/sys/powerpc/powermac/platform_powermac.c projects/bmake/sys/powerpc/powerpc/cpu.c projects/bmake/sys/powerpc/powerpc/intr_machdep.c projects/bmake/sys/powerpc/powerpc/mp_machdep.c projects/bmake/sys/powerpc/powerpc/platform.c projects/bmake/sys/powerpc/powerpc/platform_if.m projects/bmake/sys/rpc/clnt_dg.c projects/bmake/sys/security/audit/audit_pipe.c projects/bmake/sys/sparc64/include/sf_buf.h projects/bmake/sys/sparc64/sparc64/pmap.c projects/bmake/sys/sys/mman.h projects/bmake/sys/sys/param.h projects/bmake/sys/sys/random.h projects/bmake/sys/sys/sf_buf.h projects/bmake/sys/sys/systm.h projects/bmake/sys/vm/vm_init.c projects/bmake/sys/vm/vm_kern.c projects/bmake/sys/vm/vm_map.c projects/bmake/sys/vm/vm_map.h projects/bmake/sys/vm/vm_mmap.c projects/bmake/sys/vm/vm_object.c projects/bmake/sys/x86/xen/hvm.c projects/bmake/sys/x86/xen/xen_intr.c projects/bmake/sys/xen/xen_intr.h projects/bmake/tools/build/mk/OptionalObsoleteFiles.inc projects/bmake/tools/build/options/WITHOUT_GCC projects/bmake/tools/make_libdeps.sh projects/bmake/tools/regression/lib/libc/stdio/test-fmemopen.t projects/bmake/tools/regression/lib/libc/stdio/test-open_memstream.t projects/bmake/tools/regression/lib/libc/stdio/test-open_wmemstream.t projects/bmake/tools/regression/sockets/sendfile/sendfile.c projects/bmake/usr.bin/Makefile projects/bmake/usr.bin/bmake/Makefile projects/bmake/usr.bin/host/Makefile projects/bmake/usr.bin/kdump/mksubr projects/bmake/usr.bin/truss/syscalls.c projects/bmake/usr.sbin/bhyve/acpi.c projects/bmake/usr.sbin/bhyve/ioapic.c projects/bmake/usr.sbin/bsdconfig/examples/browse_packages.sh projects/bmake/usr.sbin/mergemaster/mergemaster.sh projects/bmake/usr.sbin/pkg/config.c projects/bmake/usr.sbin/pkg/elf_tables.h projects/bmake/usr.sbin/setfib/setfib.1 projects/bmake/usr.sbin/watch/watch.c Directory Properties: projects/bmake/ (props changed) projects/bmake/cddl/ (props changed) projects/bmake/cddl/contrib/opensolaris/ (props changed) projects/bmake/contrib/bmake/ (props changed) projects/bmake/contrib/gcc/ (props changed) projects/bmake/contrib/ipfilter/ (props changed) projects/bmake/contrib/ipfilter/test/expected/i19 (props changed) projects/bmake/contrib/llvm/ (props changed) projects/bmake/contrib/llvm/tools/clang/ (props changed) projects/bmake/contrib/openpam/ (props changed) projects/bmake/crypto/openssh/ (props changed) projects/bmake/gnu/lib/ (props changed) projects/bmake/lib/libc/ (props changed) projects/bmake/sbin/ (props changed) projects/bmake/share/man/man4/ (props changed) projects/bmake/sys/ (props changed) projects/bmake/sys/amd64/vmm/ (props changed) projects/bmake/sys/cddl/contrib/opensolaris/ (props changed) projects/bmake/sys/conf/ (props changed) projects/bmake/sys/contrib/ipfilter/ (props changed) projects/bmake/usr.sbin/bhyve/ (props changed) Modified: projects/bmake/Makefile ============================================================================== --- projects/bmake/Makefile Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/Makefile Wed Sep 11 18:16:18 2013 (r255477) @@ -505,4 +505,10 @@ buildLINT: # make sure things we run from here don't either WITHOUT_META_MODE= .export WITHOUT_META_MODE + +.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/bmake/Makefile.inc1 ============================================================================== --- projects/bmake/Makefile.inc1 Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/Makefile.inc1 Wed Sep 11 18:16:18 2013 (r255477) @@ -382,6 +382,7 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTR PATH=${TMPPATH} \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 \ + LIBPRIVATEDIR=/usr/lib32/private \ COMPILER_TYPE=${WMAKE_COMPILER_TYPE} LIB32WMAKEFLAGS+= \ CC="${XCC} ${LIB32FLAGS}" \ @@ -1469,8 +1470,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libzfs_core} \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ - ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} + ${_secure_lib_libcrypto} ${_lib_libldns} \ + ${_secure_lib_libssh} ${_secure_lib_libssl} .if ${MK_ATF} != "no" _lib_atf_libatf_c= lib/atf/libatf-c @@ -1506,9 +1507,16 @@ cddl/lib/libzfs_core__L: cddl/lib/libnvp _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L +.if ${MK_LDNS} != "no" +_lib_libldns= lib/libldns +lib/libldns__L: secure/lib/libcrypto__L +.endif .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L +.if ${MK_LDNS} != "no" +secure/lib/libssh__L: lib/libldns__L +.endif .if ${MK_KERBEROS_SUPPORT} != "no" secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ Modified: projects/bmake/ObsoleteFiles.inc ============================================================================== --- projects/bmake/ObsoleteFiles.inc Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/ObsoleteFiles.inc Wed Sep 11 18:16:18 2013 (r255477) @@ -38,6 +38,15 @@ # xargs -n1 | sort | uniq -d; # done +# 20130908: libssh becomes private +OLD_FILES+=usr/lib/libssh.a +OLD_FILES+=usr/lib/libssh.so +OLD_LIBS+=usr/lib/libssh.so.5 +OLD_FILES+=usr/lib/libssh_p.a +OLD_FILES+=usr/lib32/libssh.a +OLD_FILES+=usr/lib32/libssh.so +OLD_LIBS+=usr/lib32/libssh.so.5 +OLD_FILES+=usr/lib32/libssh_p.a # 20130903: gnupatch is no more OLD_FILES+=usr/bin/gnupatch OLD_FILES+=usr/share/man/man1/gnupatch.1.gz Modified: projects/bmake/UPDATING ============================================================================== --- projects/bmake/UPDATING Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/UPDATING Wed Sep 11 18:16:18 2013 (r255477) @@ -31,6 +31,12 @@ 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. @@ -45,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 advised: libc, libprocstat, dhclient, tcpdump, hastd, hastctl, kdump, procstat, rwho, rwhod, uniq. +20130903: + AES-NI intrinsic support has been added to gcc. The AES-NI module + has been updated to use this support. A new gcc is required to build + the aesni module on both i386 and amd64. + 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/bmake/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c ============================================================================== --- projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Wed Sep 11 18:16:18 2013 (r255477) @@ -349,6 +349,41 @@ top: return (1); } +/*ARGSUSED*/ +clock_t +cv_timedwait_hires(kcondvar_t *cv, kmutex_t *mp, hrtime_t tim, hrtime_t res, + int flag) +{ + int error; + timestruc_t ts; + hrtime_t delta; + + ASSERT(flag == 0); + +top: + delta = tim - gethrtime(); + if (delta <= 0) + return (-1); + + ts.tv_sec = delta / NANOSEC; + ts.tv_nsec = delta % NANOSEC; + + ASSERT(mutex_owner(mp) == curthread); + mp->m_owner = NULL; + error = pthread_cond_timedwait(cv, &mp->m_lock, &ts); + mp->m_owner = curthread; + + if (error == ETIMEDOUT) + return (-1); + + if (error == EINTR) + goto top; + + ASSERT(error == 0); + + return (1); +} + void cv_signal(kcondvar_t *cv) { Modified: projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h ============================================================================== --- projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Wed Sep 11 18:16:18 2013 (r255477) @@ -313,6 +313,8 @@ extern void cv_init(kcondvar_t *cv, char extern void cv_destroy(kcondvar_t *cv); extern void cv_wait(kcondvar_t *cv, kmutex_t *mp); extern clock_t cv_timedwait(kcondvar_t *cv, kmutex_t *mp, clock_t abstime); +extern clock_t cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim, + hrtime_t res, int flag); extern void cv_signal(kcondvar_t *cv); extern void cv_broadcast(kcondvar_t *cv); Modified: projects/bmake/contrib/bmake/job.c ============================================================================== --- projects/bmake/contrib/bmake/job.c Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/contrib/bmake/job.c Wed Sep 11 18:16:18 2013 (r255477) @@ -178,6 +178,14 @@ __RCSID("$NetBSD: job.c,v 1.176 2013/08/ */ #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- <&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 $@ @@ -307,16 +352,26 @@ ip_htable.o: $(TOP)/ip_htable.c $(TOP)/i $(TOP)/ip_lookup.h $(TOP)/ip_htable.h $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_htable.c -o $@ +ip_dstlist.o: $(TOP)/ip_dstlist.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ + $(TOP)/ip_lookup.h $(TOP)/ip_dstlist.h + $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_dstlist.c -o $@ + ip_lookup.o: $(TOP)/ip_lookup.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_pool.h $(TOP)/ip_htable.h $(TOP)/ip_lookup.h + $(TOP)/ip_pool.h $(TOP)/ip_htable.h $(TOP)/ip_lookup.h \ + $(TOP)/ip_dstlist.h $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_lookup.c -o $@ +radix_ipf.o: $(TOP)/md5.c $(TOP)/radix_ipf.h + $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/radix_ipf.c -o $@ + ip_trafcon.o: $(TOP)/ip_trafcon.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ $(TOP)/ip_trafcon.h $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_trafcon.c -o $@ vnode_if.h: $(VNODESHDIR)/vnode_if.src mkdir -p ../sys + mkdir -p ../rump/include/rump + mkdir -p ../rump/librump/rumpvfs if [ -f $(VNODESHDIR)/vnode_if.sh ] ; then \ sh $(VNODESHDIR)/vnode_if.sh $(VNODESHDIR)/vnode_if.src; \ fi @@ -325,10 +380,11 @@ vnode_if.h: $(VNODESHDIR)/vnode_if.src fi if [ -f ../sys/vnode_if.h ] ; then mv ../sys/vnode_if.h .; fi rmdir ../sys + rm -rf ../rump ml_ipl.o: vnode_if.h $(TOP)/$(MLD) $(TOP)/ipl.h -/bin/rm -f vnode_if.c - $(CC) -I. $(CFLAGS) $(DFLAGS) -c $(TOP)/$(ML) -o $@ + $(CC) -I. $(KCARGS) $(DFLAGS) -c $(TOP)/$(ML) -o $@ ip_rules.o: ip_rules.c $(TOP)/ip_rules.h $(CC) -I. $(CFLAGS) $(DFLAGS) $(COMPIPF) -c ip_rules.c -o $@ @@ -344,7 +400,7 @@ $(TOP)/ip_rules.h: ip_rules.c fi ip_rulesx.o: ip_rules.c $(TOP)/ip_rules.h - $(CC) -I. $(CFLAGS) $(DFLAGS) -DIPFILTER_COMPILED -c ip_rules.c -o $@ + $(CC) -I. $(KCARGS) $(DFLAGS) -DIPFILTER_COMPILED -c ip_rules.c -o $@ mlf_rule.o: $(TOP)/mlf_rule.c $(TOP)/ip_rules.h $(CC) -I. $(CFLAGS) $(DFLAGS) -c $(TOP)/mlf_rule.c -o $@ @@ -356,7 +412,7 @@ mlo_rule.o: $(TOP)/mlo_rule.c $(TOP)/ip_ $(CC) -I. $(CFLAGS) $(DFLAGS) -c $(TOP)/mlo_rule.c -o $@ mlfk_rule.o: $(TOP)/mlfk_rule.c $(TOP)/ip_rules.h - $(CC) -I. $(CFLAGS) $(DFLAGS) -c $(TOP)/mlfk_rule.c -o $@ + $(CC) -I. $(KCARGS) $(DFLAGS) -c $(TOP)/mlfk_rule.c -o $@ ipf_y.o: ipf_y.c ipf_y.h $(TOP)/ipf.h ipf_l.h $(TOP)/opts.h $(CC) $(CCARGS) $(IPFBPF) -c ipf_y.c -o $@ @@ -427,10 +483,11 @@ ippool_y.o: ippool_y.c ippool_y.h $(TOP) ippool_l.o: ippool_l.c ippool_y.h $(TOP)/ip_pool.h $(CC) $(CCARGS) -I. -c ippool_l.c -o $@ -ippool_y.c: $(TOOL)/ippool_y.y $(TOP)/ip_pool.h ippool_l.h +ippool_y.c: $(TOOL)/ippool_y.y $(TOP)/ip_pool.h ippool_l.h ippool_y.h (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) -ippool_y.h: ippool_y.c +ippool_y.h: $(TOOL)/ippool_y.y + (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) ippool_l.c: $(TOOL)/lexer.c $(TOP)/ip_pool.h (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) @@ -449,10 +506,10 @@ iptrafcon: $(IPTRAFCON) $(OBJ)/libipf.a .l.c: clean: - ${RM} -f ../ipf ../ipnat ../ipmon ../ippool ../ipftest + ${RM} -f ../ipf ../ipnat ../ipmon ../ippool ../ipftest ${RM} -f ../ipscan ../ipsyncm ../ipsyncs ${RM} -f *.core *.o *.a ipt ipfstat ipf ipfstat ipftest ipmon - ${RM} -f if_ipl ipnat ipfrule.ko* ipf.kld* ipfrule.kld* + ${RM} -f ipflkm ipnat ipfrule.ko* ipf.kld* ipfrule.kld* ${RM} -f vnode_if.h $(LKM) ioconf.h *.ko setdef1.c setdef0.c setdefs.h ${RM} -f ip_fil.c ipf_l.c ipf_y.c ipf_y.h ipf_l.h ${RM} -f ipscan ipscan_y.c ipscan_y.h ipscan_l.c ipscan_l.h @@ -481,8 +538,8 @@ install: /bin/cp $(TOP)/$$i /usr/include/netinet/; \ $(CHMOD) 444 /usr/include/netinet/$$i; \ done - -if [ -d /lkm -a -f if_ipl.o ] ; then \ - cp if_ipl.o /lkm; \ + -if [ -d /lkm -a -f ipflkm.o ] ; then \ + cp ipflkm.o /lkm; \ fi -if [ -d /modules -a -f ipf.ko ] ; then \ if [ -f /modules/ipl.ko ] ; then \ @@ -494,6 +551,7 @@ install: -if [ -d /modules -a -f ipfrule.ko ] ; then \ cp ipfrule.ko /modules; \ fi +.if ${MACHINE_ARCH} != amd64 -if [ -d /boot/kernel -a -f ipf.ko ] ; then \ if [ -f /boot/kernel/ipl.ko ] ; then \ cp ipf.ko /boot/kernel/ipl.ko; \ @@ -504,8 +562,29 @@ install: -if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \ cp ipfrule.ko /boot/kernel; \ fi - -if [ -d /usr/lkm -a -f if_ipl.o ] ; then \ - cp if_ipl.o /usr/lkm; \ +.else + -if [ -d /boot/kernel -a -f ipf.ko ] ; then \ + if [ -f /boot/kernel/ipl.ko ] ; then \ + objcopy --only-keep-debug ipf.ko + /boot/kernel/ipl.ko.symbols; \ + objcopy --strip-debug \ + --add-gnu-debuglink=ipl.ko.symbols \ + ipf.ko /boot/kernel/ipl.ko; \ + else \ + objcopy --only-keep-debug ipf.ko \ + /boot/kernel/ipf.ko.symbols; \ + objcopy --strip-debug \ + --add-gnu-debuglink=ipl.ko.symbols \ + ipf.ko /boot/kernel/ipf.ko; \ + fi \ + fi + -if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \ + objcopy --only-keep-debug ipfrule.ko /boot/kernel/ipfrule.ko.symbols; \ + objcopy --strip-debug --add-gnu-debuglink=ipfrule.ko.symbols ipfrule.ko /boot/kernel/ipfrule.ko; \ + fi +.endif + -if [ -d /usr/lkm -a -f ipflkm.o ] ; then \ + cp ipflkm.o /usr/lkm; \ fi -$(INSTALL) -cs -g wheel -m 755 -o root ipscan $(SBINDEST) (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) @@ -533,8 +612,8 @@ install: (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) coverage: - ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -k 1n -k 3n > report - sort -k 1n -k 3n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += ($$F[0]/100)*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,($$t/$$lc)*100;' >> report + ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -n > report + sort -n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += $$F[0]/100*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,$$t/$$lc*100;' >> report clean-coverage: /bin/rm -f *.gcov *.da Modified: projects/bmake/contrib/ipfilter/BSD/Makefile.ipsend ============================================================================== --- projects/bmake/contrib/ipfilter/BSD/Makefile.ipsend Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/contrib/ipfilter/BSD/Makefile.ipsend Wed Sep 11 18:16:18 2013 (r255477) @@ -1,5 +1,5 @@ # -# $Id: Makefile.ipsend,v 2.8 2002/05/22 16:15:36 darrenr Exp $ +# $Id$ # BINDEST=/usr/sbin @@ -23,7 +23,8 @@ MFLAGS="BINDEST=$(BINDEST)" "SBINDEST=$( "SOLARIS2=$(SOLARIS2)" "DEBUG=$(DEBUG)" "DCPU=$(CPU)" \ "CPUDIR=$(CPUDIR)" "LOOKUP=$(LOOKUP)" # -all build bsd-bpf : ipsend ipresend iptest +build: +all bsd-bpf : ipsend ipresend iptest iplang_y.o: $(TOP)/iplang/iplang_y.y (cd $(TOP)/iplang; $(MAKE) ../BSD/$(CPUDIR)/$@ $(MFLAGS) 'DESTDIR=../BSD/$(CPUDIR)' ) @@ -103,6 +104,6 @@ dlcommon.o: $(TOP)/ipsend/dlcommon.c sdlpi.o: $(TOP)/ipsend/sdlpi.c $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/sdlpi.c -o $@ -install: +install: -$(INSTALL) -cs -g wheel -m 755 -o root ipsend ipresend iptest $(BINDEST) Modified: projects/bmake/contrib/ipfilter/BSD/ipfadm-rcd ============================================================================== --- projects/bmake/contrib/ipfilter/BSD/ipfadm-rcd Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/contrib/ipfilter/BSD/ipfadm-rcd Wed Sep 11 18:16:18 2013 (r255477) @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2006 by Darren Reed. +# Copyright (C) 2012 by Darren Reed. # # See the IPFILTER.LICENCE file for details on licencing. # Modified: projects/bmake/contrib/ipfilter/BSD/kupgrade ============================================================================== --- projects/bmake/contrib/ipfilter/BSD/kupgrade Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/contrib/ipfilter/BSD/kupgrade Wed Sep 11 18:16:18 2013 (r255477) @@ -2,7 +2,7 @@ # PATH=/sbin:/usr/sbin:/bin:/usr/bin; export PATH argv0=`basename $0` - + os=`uname -s` rev=`uname -r` maj=`expr $rev : '\([0-9]*\)\.'` @@ -23,6 +23,7 @@ fi if [ -d /sys/dist/ipf ] ; then ipfdir=/sys/dist/ipf/netinet fi +mkdir -m 755 -p $ipfdir/../net confdir="$archdir/conf" if [ -f /dev/ipnat ] ; then major=`ls -l /dev/ipnat | sed -e 's/.* \([0-9]*\),.*/\1/'` @@ -30,7 +31,7 @@ if [ -f /dev/ipnat ] ; then else major=x fi - + if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then echo "Trying to build ip_rules.c and ip_rules.h" make ip_rules.c @@ -43,8 +44,9 @@ if [ ! -f ip_rules.c -o ! -f ip_rules.h fi fi -echo -n "Installing " -for j in auth frag nat proxy scan state sync pool htable lookup rules; do +echo -n "Installing into $ipfdir" +for j in auth frag nat proxy scan state sync pool dstlist htable lookup rules \ + dstlist; do for i in ip_$j.[ch]; do if [ -f "$i" ] ; then echo -n " $i" @@ -53,6 +55,12 @@ for j in auth frag nat proxy scan state fi done done +echo -n " net/radix_ipf.h" +cp radix_ipf.h $ipfdir +chmod 644 $ipfdir/radix_ipf.h +echo -n " radix_ipf.c -> $ipfdir/radix_ipf.c" +cp radix_ipf.c $ipfdir/radix_ipf.c +chmod 644 $ipfdir/radix_ipf.c case $os in SunOS) @@ -88,14 +96,16 @@ if [ -f $ipfdir/ip_fil.c ] ; then chmod 644 $ipfdir/ip_fil.c fi -for i in ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c; do +for i in ip_nat6.c ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c \ + ip_fil_compat.c ipf_rb.h; do echo -n " $i" cp $i $ipfdir chmod 644 $ipfdir/$i done echo "" echo -n "Installing into /usr/include/netinet" -for j in auth compat fil frag nat proxy scan state sync pool htable lookup; do +for j in auth compat fil frag nat proxy scan state sync pool htable dstlist \ + lookup; do i=ip_$j.h if [ -f "$i" ] ; then echo -n " $i" @@ -103,7 +113,7 @@ for j in auth compat fil frag nat proxy chmod 644 /usr/include/netinet/$i fi done -for j in ipl.h; do +for j in ipl.h ipf_rb.h; do if [ -f "$j" ] ; then echo -n " $j" cp $j /usr/include/netinet/$j @@ -157,15 +167,19 @@ if [ $os = FreeBSD -a -f /sys/conf/files mv files files.preipf4 cp -p files.preipf4 files fi - for i in htable pool lookup; do + for i in dstlist htable pool lookup; do grep ip_$i.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then echo "contrib/ipfilter/netinet/ip_$i.c optional ipfilter inet ipfilter_lookup" >> files fi done + grep ip_fil_compat.c files >/dev/null 2>&1 + if [ $? -ne 0 ] ; then + echo 'contrib/ipfilter/netinet/ip_fil_compat.c optional ipfilter inet ipfilter_compat' >> files + fi grep ip_sync.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then - echo 'contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet ipfilter_sync' >> files + echo 'contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet' >> files fi grep ip_scan.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then @@ -177,13 +191,19 @@ if [ $os = FreeBSD -a -f /sys/conf/files fi fi if [ $os = NetBSD -a -f /sys/conf/files ] ; then + if [ -f /sys/netinet/files.ipfilter ] ; then + if ! grep -q ip_fil_compat.c /sys/netinet/files.ipfilter; then + echo 'file dist/ipf/netinet/ip_fil_compat.c ipfilter & ipfilter_compat' >> /sys/netinet/files.ipfilter + echo 'defflag opt_ipfilter.h IPFILTER_COMPAT' >> /sys/netinet/files.ipfilter + fi + fi cd /sys/conf if [ ! -f files.preipf4 ] ; then mv files files.preipf4 cp -p files.preipf4 files fi if [ $fullrev -ge 010600 -a $fullrev -lt 020000 ] ; then - for i in htable pool lookup; do + for i in dstlist htable pool lookup; do grep ip_$i.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then echo "file netinet/ip_$i.c ipfilter & ipfilter_lookup" >> files @@ -191,7 +211,7 @@ if [ $os = NetBSD -a -f /sys/conf/files done grep ip_sync.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then - echo 'file netinet/ip_sync.c ipfilter & ipfilter_sync' >> files + echo 'file netinet/ip_sync.c ipfilter' >> files fi grep ip_scan.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then @@ -210,15 +230,18 @@ if [ $os = OpenBSD -a -f /sys/conf/files cp -p files.preipf4 files fi if [ $fullrev -ge 030400 ] ; then - for i in htable pool lookup; do + for i in dstlist htable pool lookup; do grep ip_$i.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then echo "file netinet/ip_$i.c ipfilter & ipfilter_lookup" >> files fi done - grep ip_sync.c files >/dev/null 2>&1 + grep ip_fil_compat.c files >/dev/null 2>&1 + if [ $? -ne 0 ] ; then + echo 'file netinet/ip_fil_compat.c ipfilter & ipfilter_compat' >> files + fi if [ $? -ne 0 ] ; then - echo 'file netinet/ip_sync.c ipfilter & ipfilter_sync' >> files + echo 'file netinet/ip_sync.c ipfilter' >> files fi grep ip_scan.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then @@ -241,7 +264,7 @@ cat | (cd /usr/src/sys/modules/ipfilter; KMOD= ipl SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \\ ! ip_log.c ip_fil.c fil.c - + .if !defined(NOINET6) CFLAGS+= -DUSE_INET6 .endif @@ -249,10 +272,10 @@ cat | (cd /usr/src/sys/modules/ipfilter; ! CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DPFIL_HOOKS --- 5,15 ---- KMOD= ipl - SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \\ -! ip_log.c ip_fil.c fil.c ip_lookup.c ip_pool.c ip_htable.c \\ -! ip_sync.c ip_scan.c ip_rules.c - + SRCS= mlfk_ipl.c ip_nat.c ip_nat6.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \\ +! ip_log.c ip_fil.c fil.c ip_lookup.c ip_pool.c ip_dstlist.c ip_htable.c \\ +! ip_sync.c ip_scan.c ip_rules.c ip_fil_compat.c + .if !defined(NOINET6) CFLAGS+= -DUSE_INET6 .endif @@ -261,4 +284,29 @@ cat | (cd /usr/src/sys/modules/ipfilter; ! -DIPFILTER_LOOKUP -DIPFILTER_COMPILED __EOF__ fi + +CONF=/sys/netinet/files.ipfilter +if [ -f $CONF -a $os = NetBSD ] ; then + for i in ip_nat6.c ip_dstlist.c radix_ipf.c; do + echo "Checking for $i in $CONF" + grep $i $CONF >/dev/null 2>&1 + if [ $? -ne 0 ] ; then + echo "Adding $i to $CONF" + sed -n -e /ip_nat.c/s/ip_nat.c/$i/p $CONF >> $CONF + fi + done +fi + +CONF=/sys/conf/files +if [ -f $CONF -a $os = FreeBSD ] ; then + for i in ip_nat6.c ip_dstlist.c radix_ipf.c; do + echo "Checking for $i in $CONF" + grep $i $CONF >/dev/null 2>&1 + if [ $? -ne 0 ] ; then + echo "Adding $i to $CONF" + sed -n -e /ip_nat.c/,/NORMAL/p $CONF | \ + sed -e s/ip_nat.c/$i/p >> $CONF + fi + done +fi exit 0 Copied: projects/bmake/contrib/ipfilter/BSD/upgrade (from r255476, head/contrib/ipfilter/BSD/upgrade) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/contrib/ipfilter/BSD/upgrade Wed Sep 11 18:16:18 2013 (r255477, copy of r255476, head/contrib/ipfilter/BSD/upgrade) @@ -0,0 +1,46 @@ +#!/bin/sh +# +PATH=/sbin:/usr/sbin:/bin:/usr/bin; export PATH +argv0=`basename $0` + +case `pwd` in +*BSD) + ;; +*) + cd BSD + ;; +esac +os=`uname -s` +rev=`uname -r` +maj=`expr $rev : '\([0-9]*\)\.'` +min=`expr $rev : '[0-9]*\.\([0-9]*\)'` +sub=`expr $rev : '[0-9]*\.[0-9]*\.\([0-9]*\)'` +plat=`uname -p` +objdir=${os}-${rev}-${plat} + +# try to bomb out fast if anything fails.... +set -e + +for i in ipf ipfstat ipmon ipnat ippool; do + if [ ! -f /sbin/${i}.dist -a -f /sbin/${i} ] ; then + mv /sbin/${i} /sbin/${i}.dist + cp -p /sbin/${i}.dist /sbin/${i} + cp ${objdir}/${i} /sbin/ + fi + if [ ! -f /usr/sbin/${i}.dist -a -f /usr/sbin/${i} ] ; then + mv /usr/sbin/${i} /usr/sbin/${i}.dist + cp -p /usr/sbin/${i}.dist /usr/sbin/${i} + cp ${objdir}/${i} /usr/sbin/ + fi +done +if [ -f /boot/kernel/ipl.ko ] ; then + if [ ! -f /boot/kernel/ipl.ko.dist ] ; then + mv /boot/kernel/ipl.ko /boot/kernel/ipl.ko.dist + cp -p /boot/kernel/ipl.ko.dist /boot/kernel/ipl.ko + fi + if [ ! -f /boot/kernel/ipl.ko.symbols.dist ] ; then + mv /boot/kernel/ipl.ko.symbols /boot/kernel/ipl.ko.symbols.dist + fi + cp ${objdir}/ipf.ko /boot/kernel/ipl.ko +fi +exit 0 Modified: projects/bmake/contrib/ipfilter/FAQ.FreeBSD ============================================================================== --- projects/bmake/contrib/ipfilter/FAQ.FreeBSD Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/contrib/ipfilter/FAQ.FreeBSD Wed Sep 11 18:16:18 2013 (r255477) @@ -1,4 +1,4 @@ -These are Instructions for Configuring A FreeBSD Box For NAT +These are Instructions for Configuring A FreeBSD Box For NAT After you have installed IP-Filter. You will need to change three files: @@ -54,7 +54,7 @@ fpx0 is the interface with the real inte /32 is the subnet mask 255.255.255.255, ie only use this ip address. -portmap tcp/udp 10000:65000 +portmap tcp/udp 10000:65000 tells it to use the ports to redirect the tcp/udp calls through @@ -67,7 +67,7 @@ reboots. In your /etc/rc.local put the line: -ipnat -f /etc/natrules +ipnat -f /etc/natrules To check and see if it is loaded, as root type ipnat -ls Modified: projects/bmake/contrib/ipfilter/FWTK/ftp-gw.diff ============================================================================== --- projects/bmake/contrib/ipfilter/FWTK/ftp-gw.diff Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/contrib/ipfilter/FWTK/ftp-gw.diff Wed Sep 11 18:16:18 2013 (r255477) @@ -4,7 +4,7 @@ *** 11,31 **** --- 11,41 ---- */ - static char RcsId[] = "$Header: /devel/CVS/IP-Filter/FWTK/ftp-gw.diff,v 2.1 1999/08/04 17:30:30 darrenr Exp $"; + static char RcsId[] = "$Header$"; + /* + * Patches for IP Filter NAT extensions written by Darren Reed, 7/7/96 Modified: projects/bmake/contrib/ipfilter/FWTK/fwtk_transparent.diff ============================================================================== --- projects/bmake/contrib/ipfilter/FWTK/fwtk_transparent.diff Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/contrib/ipfilter/FWTK/fwtk_transparent.diff Wed Sep 11 18:16:18 2013 (r255477) @@ -124,7 +124,7 @@ diff -cr ../TIS.orig/fwtk/Makefile.confi *************** *** 11,30 **** # - # RcsId: "$Header: /devel/CVS/IP-Filter/FWTK/fwtk_transparent.diff,v 2.2 2001/02/28 09:36:06 darrenr Exp $" + # RcsId: "$Header$" # Your C compiler (eg, "cc" or "gcc") @@ -145,7 +145,7 @@ diff -cr ../TIS.orig/fwtk/Makefile.confi -Dgethostbyaddr=res_gethostbyaddr -Dgetnetbyname=res_getnetbyname \ --- 11,34 ---- # - # RcsId: "$Header: /devel/CVS/IP-Filter/FWTK/fwtk_transparent.diff,v 2.2 2001/02/28 09:36:06 darrenr Exp $" + # RcsId: "$Header$" + # + # Path to sources of ip_filter (ip_nat.h required in lib/hnam.c) Modified: projects/bmake/contrib/ipfilter/FreeBSD-2.2/kinstall ============================================================================== --- projects/bmake/contrib/ipfilter/FreeBSD-2.2/kinstall Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/contrib/ipfilter/FreeBSD-2.2/kinstall Wed Sep 11 18:16:18 2013 (r255477) @@ -17,8 +17,8 @@ foreach i (ip_{auth,fil,frag,nat,pool,pr case *.h: /bin/cp $i /usr/include/netinet/$i chmod 644 /usr/include/netinet/$i - breaksw - endsw + breaksw + endsw end echo "" echo "Copying /usr/include/osreldate.h to /sys/sys" Modified: projects/bmake/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 ============================================================================== --- projects/bmake/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 Wed Sep 11 18:16:18 2013 (r255477) @@ -10,7 +10,7 @@ To build a kernel with the IP filter, fo 4. build a new kernel 5. install the new kernel - + 6. If not using DEVFS, create devices for IP Filter as follows: mknod /dev/ipl c 79 0 mknod /dev/ipnat c 79 1 @@ -18,7 +18,7 @@ To build a kernel with the IP filter, fo mknod /dev/ipauth c 79 3 mknod /dev/ipsync c 79 4 mknod /dev/ipscan c 79 5 - + 7. reboot Modified: projects/bmake/contrib/ipfilter/FreeBSD-3/kinstall ============================================================================== --- projects/bmake/contrib/ipfilter/FreeBSD-3/kinstall Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/contrib/ipfilter/FreeBSD-3/kinstall Wed Sep 11 18:16:18 2013 (r255477) @@ -18,8 +18,8 @@ foreach i (ip_fil.[ch] ip_nat.[ch] ip_fr case *.h: /bin/cp $i /usr/include/netinet/$i chmod 644 /usr/include/netinet/$i - breaksw - endsw + breaksw + endsw end echo "" echo "Linking /usr/include/osreldate.h to /sys/sys/osreldate.h" Modified: projects/bmake/contrib/ipfilter/FreeBSD-4.0/kinstall ============================================================================== --- projects/bmake/contrib/ipfilter/FreeBSD-4.0/kinstall Wed Sep 11 17:42:35 2013 (r255476) +++ projects/bmake/contrib/ipfilter/FreeBSD-4.0/kinstall Wed Sep 11 18:16:18 2013 (r255477) @@ -20,8 +20,8 @@ foreach i (ip_{auth,fil,nat,pool,proxy,s case *.h: /bin/cp $i /usr/include/netinet/$i chmod 644 /usr/include/netinet/$i *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***