Date: Fri, 13 Sep 2013 02:28:45 +0000 (UTC) From: Neel Natu <neel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r255504 - in projects/bhyve_npt_pmap: . contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests contrib/tcpdump etc/mtree include lib/libc lib/libc/capability lib/libc/iconv lib/libc/in... Message-ID: <201309130228.r8D2SjvY006261@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: neel Date: Fri Sep 13 02:28:44 2013 New Revision: 255504 URL: http://svnweb.freebsd.org/changeset/base/255504 Log: IFC @255311 Added: projects/bhyve_npt_pmap/contrib/bmake/unit-tests/sunshcmd - copied unchanged from r255311, head/contrib/bmake/unit-tests/sunshcmd projects/bhyve_npt_pmap/lib/libc/capability/ - copied from r255311, head/lib/libc/capability/ projects/bhyve_npt_pmap/lib/msun/src/imprecise.c - copied unchanged from r255311, head/lib/msun/src/imprecise.c projects/bhyve_npt_pmap/sys/kern/subr_capability.c - copied unchanged from r255311, head/sys/kern/subr_capability.c projects/bhyve_npt_pmap/sys/sys/caprights.h - copied unchanged from r255311, head/sys/sys/caprights.h projects/bhyve_npt_pmap/tools/regression/lib/libc/stdio/test-fopen.c - copied unchanged from r255311, head/tools/regression/lib/libc/stdio/test-fopen.c projects/bhyve_npt_pmap/tools/regression/lib/libc/stdio/test-fopen.t - copied unchanged from r255311, head/tools/regression/lib/libc/stdio/test-fopen.t projects/bhyve_npt_pmap/tools/regression/lib/libc/stdio/test-mkostemp.t - copied unchanged from r255311, head/tools/regression/lib/libc/stdio/test-mkostemp.t Modified: projects/bhyve_npt_pmap/Makefile projects/bhyve_npt_pmap/UPDATING projects/bhyve_npt_pmap/contrib/bmake/ChangeLog projects/bhyve_npt_pmap/contrib/bmake/FILES projects/bhyve_npt_pmap/contrib/bmake/Makefile projects/bhyve_npt_pmap/contrib/bmake/bmake.1 projects/bhyve_npt_pmap/contrib/bmake/bmake.cat1 projects/bhyve_npt_pmap/contrib/bmake/compat.c projects/bhyve_npt_pmap/contrib/bmake/job.c projects/bhyve_npt_pmap/contrib/bmake/main.c projects/bhyve_npt_pmap/contrib/bmake/make.1 projects/bhyve_npt_pmap/contrib/bmake/make.h projects/bhyve_npt_pmap/contrib/bmake/mk/ChangeLog projects/bhyve_npt_pmap/contrib/bmake/mk/gendirdeps.mk projects/bhyve_npt_pmap/contrib/bmake/mk/install-mk projects/bhyve_npt_pmap/contrib/bmake/mk/libs.mk projects/bhyve_npt_pmap/contrib/bmake/mk/progs.mk projects/bhyve_npt_pmap/contrib/bmake/parse.c projects/bhyve_npt_pmap/contrib/bmake/unit-tests/Makefile.in projects/bhyve_npt_pmap/contrib/bmake/unit-tests/test.exp projects/bhyve_npt_pmap/contrib/bmake/var.c projects/bhyve_npt_pmap/contrib/tcpdump/tcpdump.c projects/bhyve_npt_pmap/etc/mtree/BSD.var.dist projects/bhyve_npt_pmap/include/iconv.h projects/bhyve_npt_pmap/lib/libc/Makefile projects/bhyve_npt_pmap/lib/libc/iconv/citrus_iconv_local.h projects/bhyve_npt_pmap/lib/libc/include/compat.h projects/bhyve_npt_pmap/lib/libc/stdio/flags.c projects/bhyve_npt_pmap/lib/libc/sys/Symbol.map projects/bhyve_npt_pmap/lib/libc/sys/sigaction.2 projects/bhyve_npt_pmap/lib/libc/sys/sigpending.2 projects/bhyve_npt_pmap/lib/libc/sys/sigreturn.2 projects/bhyve_npt_pmap/lib/libc/sys/sigwait.2 projects/bhyve_npt_pmap/lib/libiconv_modules/Makefile.inc projects/bhyve_npt_pmap/lib/libprocstat/libprocstat.c projects/bhyve_npt_pmap/lib/libprocstat/libprocstat.h projects/bhyve_npt_pmap/lib/libusb/libusb20_ugen20.c projects/bhyve_npt_pmap/lib/msun/Makefile projects/bhyve_npt_pmap/lib/msun/Symbol.map projects/bhyve_npt_pmap/sbin/camcontrol/camcontrol.8 projects/bhyve_npt_pmap/sbin/camcontrol/camcontrol.c projects/bhyve_npt_pmap/sbin/camcontrol/fwdownload.c projects/bhyve_npt_pmap/sbin/dhclient/bpf.c projects/bhyve_npt_pmap/sbin/dhclient/dhclient.c projects/bhyve_npt_pmap/sbin/hastd/subr.c projects/bhyve_npt_pmap/sbin/swapon/swapon.c projects/bhyve_npt_pmap/share/man/man4/capsicum.4 projects/bhyve_npt_pmap/share/man/man4/netgraph.4 projects/bhyve_npt_pmap/share/man/man4/ntb.4 projects/bhyve_npt_pmap/share/man/man4/procdesc.4 projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c projects/bhyve_npt_pmap/sys/amd64/amd64/vm_machdep.c projects/bhyve_npt_pmap/sys/amd64/include/sf_buf.h projects/bhyve_npt_pmap/sys/amd64/linux32/linux32_machdep.c projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_msr.c projects/bhyve_npt_pmap/sys/amd64/vmm/x86.c projects/bhyve_npt_pmap/sys/amd64/vmm/x86.h projects/bhyve_npt_pmap/sys/bsm/audit_kevents.h projects/bhyve_npt_pmap/sys/bsm/audit_record.h projects/bhyve_npt_pmap/sys/cam/scsi/scsi_da.c projects/bhyve_npt_pmap/sys/cam/scsi/scsi_da.h projects/bhyve_npt_pmap/sys/cam/scsi/scsi_enc_ses.c projects/bhyve_npt_pmap/sys/cddl/compat/opensolaris/sys/file.h projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_capability.c projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_ioctl.c projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_misc.c projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_proto.h projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_syscall.h projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_syscalls.c projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_sysent.c projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_systrace_args.c projects/bhyve_npt_pmap/sys/compat/freebsd32/syscalls.master projects/bhyve_npt_pmap/sys/compat/linux/linux_file.c projects/bhyve_npt_pmap/sys/compat/linux/linux_ioctl.c projects/bhyve_npt_pmap/sys/compat/linux/linux_socket.c projects/bhyve_npt_pmap/sys/compat/svr4/svr4_fcntl.c projects/bhyve_npt_pmap/sys/compat/svr4/svr4_filio.c projects/bhyve_npt_pmap/sys/compat/svr4/svr4_ioctl.c projects/bhyve_npt_pmap/sys/compat/svr4/svr4_misc.c projects/bhyve_npt_pmap/sys/compat/svr4/svr4_stream.c projects/bhyve_npt_pmap/sys/conf/files projects/bhyve_npt_pmap/sys/conf/files.mips projects/bhyve_npt_pmap/sys/conf/files.powerpc projects/bhyve_npt_pmap/sys/dev/aac/aac_linux.c projects/bhyve_npt_pmap/sys/dev/aacraid/aacraid_linux.c projects/bhyve_npt_pmap/sys/dev/amr/amr_linux.c projects/bhyve_npt_pmap/sys/dev/filemon/filemon.c projects/bhyve_npt_pmap/sys/dev/gpio/gpiobus.c projects/bhyve_npt_pmap/sys/dev/hwpmc/hwpmc_logging.c projects/bhyve_npt_pmap/sys/dev/hwpmc/hwpmc_powerpc.c projects/bhyve_npt_pmap/sys/dev/ipmi/ipmi_linux.c projects/bhyve_npt_pmap/sys/dev/iscsi_initiator/iscsi.c projects/bhyve_npt_pmap/sys/dev/mfi/mfi_linux.c projects/bhyve_npt_pmap/sys/dev/ntb/if_ntb/if_ntb.c projects/bhyve_npt_pmap/sys/dev/ntb/ntb_hw/ntb_hw.c projects/bhyve_npt_pmap/sys/dev/ntb/ntb_hw/ntb_hw.h projects/bhyve_npt_pmap/sys/dev/ntb/ntb_hw/ntb_regs.h projects/bhyve_npt_pmap/sys/dev/tdfx/tdfx_linux.c projects/bhyve_npt_pmap/sys/dev/usb/usbdevs projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_run.c projects/bhyve_npt_pmap/sys/dev/xen/blkback/blkback.c projects/bhyve_npt_pmap/sys/fs/fdescfs/fdesc_vnops.c projects/bhyve_npt_pmap/sys/fs/fuse/fuse_vfsops.c projects/bhyve_npt_pmap/sys/fs/nfsclient/nfs_clport.c projects/bhyve_npt_pmap/sys/fs/nfsserver/nfs_nfsdport.c projects/bhyve_npt_pmap/sys/geom/part/g_part_ldm.c projects/bhyve_npt_pmap/sys/i386/ibcs2/ibcs2_fcntl.c projects/bhyve_npt_pmap/sys/i386/ibcs2/ibcs2_ioctl.c projects/bhyve_npt_pmap/sys/i386/ibcs2/ibcs2_misc.c projects/bhyve_npt_pmap/sys/i386/linux/linux_machdep.c projects/bhyve_npt_pmap/sys/ia64/ia64/vm_machdep.c projects/bhyve_npt_pmap/sys/ia64/include/sf_buf.h projects/bhyve_npt_pmap/sys/kern/capabilities.conf projects/bhyve_npt_pmap/sys/kern/init_sysent.c projects/bhyve_npt_pmap/sys/kern/kern_descrip.c projects/bhyve_npt_pmap/sys/kern/kern_event.c projects/bhyve_npt_pmap/sys/kern/kern_exec.c projects/bhyve_npt_pmap/sys/kern/kern_ktrace.c projects/bhyve_npt_pmap/sys/kern/kern_mbuf.c projects/bhyve_npt_pmap/sys/kern/kern_sig.c projects/bhyve_npt_pmap/sys/kern/sys_capability.c projects/bhyve_npt_pmap/sys/kern/sys_generic.c projects/bhyve_npt_pmap/sys/kern/sys_procdesc.c projects/bhyve_npt_pmap/sys/kern/syscalls.c projects/bhyve_npt_pmap/sys/kern/syscalls.master projects/bhyve_npt_pmap/sys/kern/systrace_args.c projects/bhyve_npt_pmap/sys/kern/tty.c projects/bhyve_npt_pmap/sys/kern/uipc_mqueue.c projects/bhyve_npt_pmap/sys/kern/uipc_sem.c projects/bhyve_npt_pmap/sys/kern/uipc_syscalls.c projects/bhyve_npt_pmap/sys/kern/uipc_usrreq.c projects/bhyve_npt_pmap/sys/kern/vfs_acl.c projects/bhyve_npt_pmap/sys/kern/vfs_aio.c projects/bhyve_npt_pmap/sys/kern/vfs_bio.c projects/bhyve_npt_pmap/sys/kern/vfs_extattr.c projects/bhyve_npt_pmap/sys/kern/vfs_lookup.c projects/bhyve_npt_pmap/sys/kern/vfs_syscalls.c projects/bhyve_npt_pmap/sys/mips/atheros/if_arge.c projects/bhyve_npt_pmap/sys/mips/include/sf_buf.h projects/bhyve_npt_pmap/sys/mips/mips/vm_machdep.c projects/bhyve_npt_pmap/sys/netinet/ip_mroute.c projects/bhyve_npt_pmap/sys/netinet6/ip6_mroute.c projects/bhyve_npt_pmap/sys/netsmb/smb_dev.c projects/bhyve_npt_pmap/sys/nfsserver/nfs_srvkrpc.c projects/bhyve_npt_pmap/sys/ofed/include/linux/file.h projects/bhyve_npt_pmap/sys/powerpc/aim/vm_machdep.c projects/bhyve_npt_pmap/sys/powerpc/include/frame.h projects/bhyve_npt_pmap/sys/rpc/clnt_dg.c projects/bhyve_npt_pmap/sys/security/audit/audit.h projects/bhyve_npt_pmap/sys/security/audit/audit_arg.c projects/bhyve_npt_pmap/sys/security/audit/audit_bsm.c projects/bhyve_npt_pmap/sys/security/audit/audit_bsm_klib.c projects/bhyve_npt_pmap/sys/security/audit/audit_private.h projects/bhyve_npt_pmap/sys/security/audit/bsm_token.c projects/bhyve_npt_pmap/sys/security/mac/mac_syscalls.c projects/bhyve_npt_pmap/sys/sys/_types.h projects/bhyve_npt_pmap/sys/sys/capability.h projects/bhyve_npt_pmap/sys/sys/file.h projects/bhyve_npt_pmap/sys/sys/filedesc.h projects/bhyve_npt_pmap/sys/sys/ktrace.h projects/bhyve_npt_pmap/sys/sys/namei.h projects/bhyve_npt_pmap/sys/sys/param.h projects/bhyve_npt_pmap/sys/sys/procdesc.h projects/bhyve_npt_pmap/sys/sys/sf_buf.h projects/bhyve_npt_pmap/sys/sys/syscall.h projects/bhyve_npt_pmap/sys/sys/syscall.mk projects/bhyve_npt_pmap/sys/sys/sysproto.h projects/bhyve_npt_pmap/sys/sys/types.h projects/bhyve_npt_pmap/sys/sys/user.h projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_alloc.c projects/bhyve_npt_pmap/sys/vm/vm_mmap.c projects/bhyve_npt_pmap/sys/vm/vm_page.c projects/bhyve_npt_pmap/tools/regression/lib/libc/stdio/test-fmemopen.t projects/bhyve_npt_pmap/tools/regression/lib/libc/stdio/test-open_memstream.t projects/bhyve_npt_pmap/tools/regression/lib/libc/stdio/test-open_wmemstream.t projects/bhyve_npt_pmap/usr.bin/bmake/Makefile projects/bhyve_npt_pmap/usr.bin/bmake/unit-tests/Makefile projects/bhyve_npt_pmap/usr.bin/kdump/kdump.c projects/bhyve_npt_pmap/usr.bin/kdump/mksubr projects/bhyve_npt_pmap/usr.bin/patch/pch.c projects/bhyve_npt_pmap/usr.bin/patch/util.c projects/bhyve_npt_pmap/usr.bin/procstat/procstat_files.c projects/bhyve_npt_pmap/usr.bin/rwho/rwho.c projects/bhyve_npt_pmap/usr.bin/uniq/uniq.c projects/bhyve_npt_pmap/usr.sbin/bhyve/ioapic.c projects/bhyve_npt_pmap/usr.sbin/rwhod/rwhod.c projects/bhyve_npt_pmap/usr.sbin/watch/watch.c Directory Properties: projects/bhyve_npt_pmap/ (props changed) projects/bhyve_npt_pmap/contrib/bmake/ (props changed) projects/bhyve_npt_pmap/contrib/tcpdump/ (props changed) projects/bhyve_npt_pmap/lib/libc/ (props changed) projects/bhyve_npt_pmap/sbin/ (props changed) projects/bhyve_npt_pmap/share/man/man4/ (props changed) projects/bhyve_npt_pmap/sys/ (props changed) projects/bhyve_npt_pmap/sys/amd64/vmm/ (props changed) projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/ (props changed) projects/bhyve_npt_pmap/sys/conf/ (props changed) projects/bhyve_npt_pmap/usr.bin/procstat/ (props changed) projects/bhyve_npt_pmap/usr.sbin/bhyve/ (props changed) Modified: projects/bhyve_npt_pmap/Makefile ============================================================================== --- projects/bhyve_npt_pmap/Makefile Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/Makefile Fri Sep 13 02:28:44 2013 (r255504) @@ -498,3 +498,11 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT + +.if defined(.PARSEDIR) +.if make(universe) +# we do not want a failure of one branch abort all. +MAKE_JOB_ERROR_TOKEN= no +.export MAKE_JOB_ERROR_TOKEN +.endif +.endif Modified: projects/bhyve_npt_pmap/UPDATING ============================================================================== --- projects/bhyve_npt_pmap/UPDATING Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/UPDATING Fri Sep 13 02:28:44 2013 (r255504) @@ -31,6 +31,20 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130905: + The PROCDESC kernel option is now part of the GENERIC kernel + configuration and is required for the rwhod(8) to work. + If you are using custom kernel configuration, you should include + 'options PROCDESC'. + +20130905: + The API and ABI related to the Capsicum framework was modified + in backward incompatible way. The userland libraries and programs + have to be recompiled to work with the new kernel. This includes the + following libraries and programs, but the whole buildworld is + advised: libc, libprocstat, dhclient, tcpdump, hastd, hastctl, + kdump, procstat, rwho, rwhod, uniq. + 20130827: Thomas Dickey (vendor author thereof) reports that dialog(1) since 2011/10/18 has a bug in handling --hline. Testers and I noticed the Modified: projects/bhyve_npt_pmap/contrib/bmake/ChangeLog ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/ChangeLog Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/ChangeLog Fri Sep 13 02:28:44 2013 (r255504) @@ -1,3 +1,24 @@ +2013-09-04 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20130904 + Merge with NetBSD make, pick up + o Add VAR_INTERNAL context, so that internal setting of + MAKEFILE does not override value set by makefiles. + +2013-09-02 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20130902 + Merge with NetBSD make, pick up + o CompatRunCommand: only apply shellErrFlag when errCheck is true + +2013-08-28 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20130828 + Merge with NetBSD make, pick up + o Fix VAR :sh = syntax from Will Andrews at freebsd.org + o Call Job_SetPrefix() from Job_Init() so makefiles have + opportunity to set .MAKE.JOB.PREFIX + 2013-07-30 Simon J. Gerraty <sjg@bad.crufty.net> * Makefile (MAKE_VERSION): 20130730 Modified: projects/bhyve_npt_pmap/contrib/bmake/FILES ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/FILES Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/FILES Fri Sep 13 02:28:44 2013 (r255504) @@ -114,6 +114,7 @@ unit-tests/order unit-tests/phony-end unit-tests/posix unit-tests/qequals +unit-tests/sunshcmd unit-tests/sysv unit-tests/ternary unit-tests/test.exp Modified: projects/bhyve_npt_pmap/contrib/bmake/Makefile ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/Makefile Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/Makefile Fri Sep 13 02:28:44 2013 (r255504) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.17 2013/07/30 19:13:53 sjg Exp $ +# $Id: Makefile,v 1.20 2013/09/04 15:42:03 sjg Exp $ # Base version on src date -MAKE_VERSION= 20130730 +MAKE_VERSION= 20130904 PROG= bmake Modified: projects/bhyve_npt_pmap/contrib/bmake/bmake.1 ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/bmake.1 Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/bmake.1 Fri Sep 13 02:28:44 2013 (r255504) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.220 2013/07/30 19:09:57 sjg Exp $ +.\" $NetBSD: make.1,v 1.222 2013/08/11 09:53:49 apb Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd July 30, 2013 +.Dd August 11, 2013 .Dt MAKE 1 .Os .Sh NAME @@ -1971,6 +1971,12 @@ If the source is the special .Ic .DOTLAST target, then the current working directory is searched last. +.It Ic .PATH. Ns Va suffix +Like +.Ic .PATH +but applies only to files with a particular suffix. +The suffix must have been previously declared with +.Ic .SUFFIXES . .It Ic .PHONY Apply the .Ic .PHONY Modified: projects/bhyve_npt_pmap/contrib/bmake/bmake.cat1 ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/bmake.cat1 Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/bmake.cat1 Fri Sep 13 02:28:44 2013 (r255504) @@ -1257,6 +1257,10 @@ SSPPEECCIIAALL TTAARRGGEETT source is the special ..DDOOTTLLAASSTT target, then the current working directory is searched last. + ..PPAATTHH.._s_u_f_f_i_x + Like ..PPAATTHH but applies only to files with a particular suffix. + The suffix must have been previously declared with ..SSUUFFFFIIXXEESS. + ..PPHHOONNYY Apply the ..PPHHOONNYY attribute to any specified sources. ..PPRREECCIIOOUUSS @@ -1374,4 +1378,4 @@ BBUUGGSS There is no way of escaping a space character in a filename. -NetBSD 5.1 July 30, 2013 NetBSD 5.1 +NetBSD 5.1 August 11, 2013 NetBSD 5.1 Modified: projects/bhyve_npt_pmap/contrib/bmake/compat.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/compat.c Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/compat.c Fri Sep 13 02:28:44 2013 (r255504) @@ -1,4 +1,4 @@ -/* $NetBSD: compat.c,v 1.92 2013/07/05 22:14:56 sjg Exp $ */ +/* $NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: compat.c,v 1.92 2013/07/05 22:14:56 sjg Exp $"; +static char rcsid[] = "$NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: compat.c,v 1.92 2013/07/05 22:14:56 sjg Exp $"); +__RCSID("$NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $"); #endif #endif /* not lint */ #endif Modified: projects/bhyve_npt_pmap/contrib/bmake/job.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/job.c Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/job.c Fri Sep 13 02:28:44 2013 (r255504) @@ -1,4 +1,4 @@ -/* $NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $ */ +/* $NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $"; +static char rcsid[] = "$NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $"); +__RCSID("$NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -178,6 +178,14 @@ __RCSID("$NetBSD: job.c,v 1.175 2013/07/ */ #define MAKE_ALWAYS_PASS_JOB_QUEUE ".MAKE.ALWAYS_PASS_JOB_QUEUE" static int Always_pass_job_queue = TRUE; +/* + * FreeBSD: aborting entire parallel make isn't always + * desired. When doing tinderbox for example, failure of + * one architecture should not stop all. + * We still want to bail on interrupt though. + */ +#define MAKE_JOB_ERROR_TOKEN "MAKE_JOB_ERROR_TOKEN" +static int Job_error_token = TRUE; /* * error handling variables @@ -2237,6 +2245,9 @@ Job_Init(void) Always_pass_job_queue = getBoolean(MAKE_ALWAYS_PASS_JOB_QUEUE, Always_pass_job_queue); + Job_error_token = getBoolean(MAKE_JOB_ERROR_TOKEN, Job_error_token); + + /* * There is a non-zero chance that we already have children. * eg after 'make -f- <<EOF' @@ -2832,13 +2843,19 @@ JobTokenAdd(void) { char tok = JOB_TOKENS[aborting], tok1; + if (!Job_error_token && aborting == ABORT_ERROR) { + if (jobTokensRunning == 0) + return; + tok = '+'; /* no error token */ + } + /* If we are depositing an error token flush everything else */ while (tok != '+' && read(tokenWaitJob.inPipe, &tok1, 1) == 1) continue; if (DEBUG(JOB)) fprintf(debug_file, "(%d) aborting %d, deposit token %c\n", - getpid(), aborting, JOB_TOKENS[aborting]); + getpid(), aborting, tok); while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && errno == EAGAIN) continue; } Modified: projects/bhyve_npt_pmap/contrib/bmake/main.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/main.c Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/main.c Fri Sep 13 02:28:44 2013 (r255504) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $ */ +/* $NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19 #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $"); +__RCSID("$NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1414,7 +1414,7 @@ ReadMakefile(const void *p, const void * if (!strcmp(fname, "-")) { Parse_File(NULL /*stdin*/, -1); - Var_Set("MAKEFILE", "", VAR_GLOBAL, 0); + Var_Set("MAKEFILE", "", VAR_INTERNAL, 0); } else { /* if we've chdir'd, rebuild the path name */ if (strcmp(curdir, objdir) && *fname != '/') { @@ -1463,7 +1463,7 @@ ReadMakefile(const void *p, const void * */ found: if (!doing_depend) - Var_Set("MAKEFILE", fname, VAR_GLOBAL, 0); + Var_Set("MAKEFILE", fname, VAR_INTERNAL, 0); Parse_File(fname, fd); } free(path); Modified: projects/bhyve_npt_pmap/contrib/bmake/make.1 ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/make.1 Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/make.1 Fri Sep 13 02:28:44 2013 (r255504) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.220 2013/07/30 19:09:57 sjg Exp $ +.\" $NetBSD: make.1,v 1.222 2013/08/11 09:53:49 apb Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd July 30, 2013 +.Dd August 11, 2013 .Dt MAKE 1 .Os .Sh NAME @@ -1982,6 +1982,12 @@ If the source is the special .Ic .DOTLAST target, then the current working directory is searched last. +.It Ic .PATH. Ns Va suffix +Like +.Ic .PATH +but applies only to files with a particular suffix. +The suffix must have been previously declared with +.Ic .SUFFIXES . .It Ic .PHONY Apply the .Ic .PHONY Modified: projects/bhyve_npt_pmap/contrib/bmake/make.h ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/make.h Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/make.h Fri Sep 13 02:28:44 2013 (r255504) @@ -1,4 +1,4 @@ -/* $NetBSD: make.h,v 1.91 2013/06/18 20:06:09 sjg Exp $ */ +/* $NetBSD: make.h,v 1.92 2013/09/04 15:38:26 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -404,6 +404,10 @@ extern Boolean varNoExportEnv; /* TRUE i extern GNode *DEFAULT; /* .DEFAULT rule */ +extern GNode *VAR_INTERNAL; /* Variables defined internally by make + * which should not override those set by + * makefiles. + */ extern GNode *VAR_GLOBAL; /* Variables defined in a global context, e.g * in the Makefile itself */ extern GNode *VAR_CMD; /* Variables defined on the command line */ Modified: projects/bhyve_npt_pmap/contrib/bmake/mk/ChangeLog ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/mk/ChangeLog Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/mk/ChangeLog Fri Sep 13 02:28:44 2013 (r255504) @@ -1,3 +1,14 @@ +2013-09-04 Simon J. Gerraty <sjg@bad.crufty.net> + + * gendirdeps.mk (_objtops): fix typo also + while processing M2D_OBJROOTS to gather qualdir_list + qualify $ql with loop iterator to ensure correct results. + +2013-08-01 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20130801 + * libs.mk: update to match progs.mk + 2013-07-26 Simon J. Gerraty <sjg@bad.crufty.net> * install-mk (MK_VERSION): 20130726 Modified: projects/bhyve_npt_pmap/contrib/bmake/mk/gendirdeps.mk ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/mk/gendirdeps.mk Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/mk/gendirdeps.mk Fri Sep 13 02:28:44 2013 (r255504) @@ -1,4 +1,4 @@ -# $Id: gendirdeps.mk,v 1.22 2013/05/11 05:16:26 sjg Exp $ +# $Id: gendirdeps.mk,v 1.23 2013/09/04 17:49:20 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -162,7 +162,7 @@ dir_list != cd ${_OBJDIR} && \ .warning Skipping ${_DEPENDFILE:S,${SRCTOP}/,,} # we are not going to update anything .else - +dpadd_dir_list= .if !empty(DPADD) _nonlibs := ${DPADD:T:Nlib*:N*include} .if !empty(_nonlibs) @@ -174,6 +174,7 @@ ddep_list += $f.dirdep ddep_list += ${f:H}.dirdep .else dir_list += ${f:H:tA} +dpadd_dir_list += ${f:H:tA} .endif .endfor .if !empty(ddep_list) @@ -197,7 +198,7 @@ dir_list += ${ddeps} # so we add # ${"${dir_list:M*bsd/sys/${MACHINE_ARCH}/include}":?bsd/include:} # to GENDIRDEPS_DIR_LIST_XTRAS -_objtops = ${OBJTOP} ${_OBJTOP} ${_obtop} +_objtops = ${OBJTOP} ${_OBJTOP} ${_objtop} _objtops := ${_objtops:O:u} dirdep_list = \ ${_objtops:@o@${dir_list:M$o*/*:C,$o[^/]*/,,}@} \ @@ -212,8 +213,11 @@ M2D_OBJROOTS := ${M2D_OBJROOTS:O:u:[-1.. skip_ql= ${SRCTOP}* ${_objtops:@o@$o*@} .for o in ${M2D_OBJROOTS:${skip_ql:${M_ListToSkip}}} # we need := so only skip_ql to this point applies -ql := ${dir_list:${skip_ql:${M_ListToSkip}}:M$o*/*/*:C,$o([^/]+)/(.*),\2.\1,:S,.${HOST_TARGET},.host,} -qualdir_list += ${ql} +ql.$o := ${dir_list:${skip_ql:${M_ListToSkip}}:M$o*/*/*:C,$o([^/]+)/(.*),\2.\1,:S,.${HOST_TARGET},.host,} +qualdir_list += ${ql.$o} +.if ${DEBUG_GENDIRDEPS:Uno:@x@${RELDIR:M$x}@} != "" +.info ${RELDIR}: o=$o ${ql.$o qualdir_list:L:@v@$v=${$v}@} +.endif skip_ql+= $o* .endfor @@ -241,6 +245,7 @@ DIRDEPS := ${DIRDEPS:${GENDIRDEPS_FILTER .if ${DEBUG_GENDIRDEPS:Uno:@x@${RELDIR:M$x}@} != "" .info ${RELDIR}: M2D_OBJROOTS=${M2D_OBJROOTS} .info ${RELDIR}: dir_list='${dir_list}' +.info ${RELDIR}: dpadd_dir_list='${dpadd_dir_list}' .info ${RELDIR}: dirdep_list='${dirdep_list}' .info ${RELDIR}: qualdir_list='${qualdir_list}' .info ${RELDIR}: SKIP_GENDIRDEPS='${SKIP_GENDIRDEPS}' Modified: projects/bhyve_npt_pmap/contrib/bmake/mk/install-mk ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/mk/install-mk Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/mk/install-mk Fri Sep 13 02:28:44 2013 (r255504) @@ -55,7 +55,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: install-mk,v 1.92 2013/07/27 05:37:37 sjg Exp $ +# $Id: install-mk,v 1.93 2013/08/02 18:28:47 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -70,7 +70,7 @@ # sjg@crufty.net # -MK_VERSION=20130726 +MK_VERSION=20130801 OWNER= GROUP= MODE=444 Modified: projects/bhyve_npt_pmap/contrib/bmake/mk/libs.mk ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/mk/libs.mk Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/mk/libs.mk Fri Sep 13 02:28:44 2013 (r255504) @@ -1,4 +1,4 @@ -# $Id: libs.mk,v 1.2 2007/04/30 17:39:27 sjg Exp $ +# $Id: libs.mk,v 1.3 2013/08/02 18:28:48 sjg Exp $ # # @(#) Copyright (c) 2006, Simon J. Gerraty # @@ -17,7 +17,15 @@ .if defined(LIBS) +# In meta mode, we can capture dependenices for _one_ of the progs. +# if makefile doesn't nominate one, we use the first. +.ifndef UPDATE_DEPENDFILE_LIB +UPDATE_DEPENDFILE_LIB = ${LIBS:[1]} +.export UPDATE_DEPENDFILE_LIB +.endif + .ifndef LIB +# They may have asked us to build just one .for t in ${LIBS:R:T:S,^lib,,} .if make(lib$t) LIB?= $t @@ -28,14 +36,41 @@ lib$t: all .if defined(LIB) # just one of many -.for v in DPADD SRCS CFLAGS ${LIB_VARS} -$v += ${${v}_lib${LIB}} +LIB_VARS += \ + LIBDIR \ + CFLAGS \ + COPTS \ + CPPFLAGS \ + CXXFLAGS \ + DPADD \ + DPLIBS \ + LDADD \ + LDFLAGS \ + MAN \ + SRCS + +.for v in ${LIB_VARS:O:u} +.if defined(${v}.${LIB}) || defined(${v}_${LIB}) +$v += ${${v}_${LIB}:U${${v}.${LIB}}} +.endif .endfor + +# for meta mode, there can be only one! +.if ${LIB} == ${UPDATE_DEPENDFILE_LIB:Uno} +UPDATE_DEPENDFILE ?= yes +.endif +UPDATE_DEPENDFILE ?= NO + # ensure that we don't clobber each other's dependencies DEPENDFILE?= .depend.${LIB} # lib.mk will do the rest .else all: ${LIBS:S,^lib,,:@t@lib$t.a@} .MAKE + +# We cannot capture dependencies for meta mode here +UPDATE_DEPENDFILE = NO +# nor can we safely run in parallel. +.NOTPARALLEL: .endif .endif @@ -43,12 +78,16 @@ all: ${LIBS:S,^lib,,:@t@lib$t.a@} .MAKE .include <${.PARSEFILE:S,libs,lib,}> .ifndef LIB -.for t in ${LIBS:R:T:S,^lib,,} -lib$t.a: ${SRCS} ${DPADD} ${SRCS_lib$t} ${DPADD_lib$t} - (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$t) +# tell libs.mk we might want to install things +LIBS_TARGETS+= cleandepend cleandir cleanobj depend install -clean: $t.clean -$t.clean: - (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$t ${@:E}) +.for b in ${LIBS:R:T:S,^lib,,} +lib$b.a: ${SRCS} ${DPADD} ${SRCS_lib$b} ${DPADD_lib$b} + (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$b) + +.for t in ${LIBS_TARGETS:O:u} +$b.$t: .PHONY .MAKE + (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$b ${@:E}) +.endfor .endfor .endif Modified: projects/bhyve_npt_pmap/contrib/bmake/mk/progs.mk ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/mk/progs.mk Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/mk/progs.mk Fri Sep 13 02:28:44 2013 (r255504) @@ -1,4 +1,4 @@ -# $Id: progs.mk,v 1.12 2013/04/22 18:10:04 sjg Exp $ +# $Id: progs.mk,v 1.13 2013/08/02 18:28:48 sjg Exp $ # # @(#) Copyright (c) 2006, Simon J. Gerraty # @@ -35,9 +35,21 @@ PROG ?= $t .if defined(PROG) # just one of many -PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS +PROG_VARS += \ + BINDIR \ + CFLAGS \ + COPTS \ + CPPFLAGS \ + CXXFLAGS \ + DPADD \ + DPLIBS \ + LDADD \ + LDFLAGS \ + MAN \ + SRCS + .for v in ${PROG_VARS:O:u} -.if defined(${v}.${PROG}) +.if defined(${v}.${PROG}) || defined(${v}_${PROG}) $v += ${${v}_${PROG}:U${${v}.${PROG}}} .endif .endfor Modified: projects/bhyve_npt_pmap/contrib/bmake/parse.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/parse.c Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/parse.c Fri Sep 13 02:28:44 2013 (r255504) @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.189 2013/06/18 19:31:27 sjg Exp $ */ +/* $NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.189 2013/06/18 19:31:27 sjg Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.189 2013/06/18 19:31:27 sjg Exp $"); +__RCSID("$NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1751,6 +1751,12 @@ Parse_IsVar(char *line) ch = *line++; wasSpace = TRUE; } +#ifdef SUNSHCMD + if (ch == ':' && strncmp(line, "sh", 2) == 0) { + line += 2; + continue; + } +#endif if (ch == '=') return TRUE; if (*line == '=' && ISEQOPERATOR(ch)) Modified: projects/bhyve_npt_pmap/contrib/bmake/unit-tests/Makefile.in ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/unit-tests/Makefile.in Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/unit-tests/Makefile.in Fri Sep 13 02:28:44 2013 (r255504) @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.43 2013/07/16 21:14:30 sjg Exp $ +# $Id: Makefile.in,v 1.44 2013/08/28 22:09:29 sjg Exp $ # -# $NetBSD: Makefile,v 1.37 2013/07/16 19:59:28 sjg Exp $ +# $NetBSD: Makefile,v 1.38 2013/08/28 21:56:50 sjg Exp $ # # Unit tests for make(1) # The main targets are: @@ -45,6 +45,7 @@ SUBFILES= \ phony-end \ posix \ qequals \ + sunshcmd \ sysv \ ternary \ unexport \ Copied: projects/bhyve_npt_pmap/contrib/bmake/unit-tests/sunshcmd (from r255311, head/contrib/bmake/unit-tests/sunshcmd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bhyve_npt_pmap/contrib/bmake/unit-tests/sunshcmd Fri Sep 13 02:28:44 2013 (r255504, copy of r255311, head/contrib/bmake/unit-tests/sunshcmd) @@ -0,0 +1,10 @@ +BYECMD = echo bye +LATERCMD = echo later +TEST1 :sh = echo hello +TEST2 :sh = ${BYECMD} +TEST3 = ${LATERCMD:sh} + +all: + @echo "TEST1=${TEST1}" + @echo "TEST2=${TEST2}" + @echo "TEST3=${TEST3}" Modified: projects/bhyve_npt_pmap/contrib/bmake/unit-tests/test.exp ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/unit-tests/test.exp Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/unit-tests/test.exp Fri Sep 13 02:28:44 2013 (r255504) @@ -349,6 +349,9 @@ Now we expect an error... *** Error code 1 (continuing) `all' not remade because of errors. V.i386 ?= OK +TEST1=hello +TEST2=bye +TEST3=later FOOBAR = FOOBAR = foobar fubar fun Modified: projects/bhyve_npt_pmap/contrib/bmake/var.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/bmake/var.c Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/bmake/var.c Fri Sep 13 02:28:44 2013 (r255504) @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.183 2013/07/16 20:00:56 sjg Exp $ */ +/* $NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: var.c,v 1.183 2013/07/16 20:00:56 sjg Exp $"; +static char rcsid[] = "$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: var.c,v 1.183 2013/07/16 20:00:56 sjg Exp $"); +__RCSID("$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -187,6 +187,7 @@ static char varNoError[] = ""; * The four contexts are searched in the reverse order from which they are * listed. */ +GNode *VAR_INTERNAL; /* variables from make itself */ GNode *VAR_GLOBAL; /* variables from the makefile */ GNode *VAR_CMD; /* variables defined on the command-line */ @@ -419,6 +420,10 @@ VarFind(const char *name, GNode *ctxt, i (ctxt != VAR_GLOBAL)) { var = Hash_FindEntry(&VAR_GLOBAL->context, name); + if ((var == NULL) && (ctxt != VAR_INTERNAL)) { + /* VAR_INTERNAL is subordinate to VAR_GLOBAL */ + var = Hash_FindEntry(&VAR_INTERNAL->context, name); + } } if ((var == NULL) && (flags & FIND_ENV)) { char *env; @@ -440,6 +445,9 @@ VarFind(const char *name, GNode *ctxt, i (ctxt != VAR_GLOBAL)) { var = Hash_FindEntry(&VAR_GLOBAL->context, name); + if ((var == NULL) && (ctxt != VAR_INTERNAL)) { + var = Hash_FindEntry(&VAR_INTERNAL->context, name); + } if (var == NULL) { return NULL; } else { @@ -4182,6 +4190,7 @@ Var_GetHead(char *file) void Var_Init(void) { + VAR_INTERNAL = Targ_NewGN("Internal"); VAR_GLOBAL = Targ_NewGN("Global"); VAR_CMD = Targ_NewGN("Command"); Modified: projects/bhyve_npt_pmap/contrib/tcpdump/tcpdump.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/tcpdump/tcpdump.c Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/contrib/tcpdump/tcpdump.c Fri Sep 13 02:28:44 2013 (r255504) @@ -715,8 +715,9 @@ main(int argc, char **argv) int status; FILE *VFile; #ifdef __FreeBSD__ + cap_rights_t rights; int cansandbox; -#endif +#endif /* __FreeBSD__ */ #ifdef WIN32 if(wsockinit() != 0) return 1; @@ -1206,7 +1207,8 @@ main(int argc, char **argv) if (pd == NULL) error("%s", ebuf); #ifdef __FreeBSD__ - if (cap_rights_limit(fileno(pcap_file(pd)), CAP_READ) < 0 && + cap_rights_init(&rights, CAP_READ); + if (cap_rights_limit(fileno(pcap_file(pd)), &rights) < 0 && errno != ENOSYS) { error("unable to limit pcap descriptor"); } @@ -1484,8 +1486,9 @@ main(int argc, char **argv) if (RFileName == NULL && VFileName == NULL) { static const unsigned long cmds[] = { BIOCGSTATS }; - if (cap_rights_limit(pcap_fileno(pd), - CAP_IOCTL | CAP_READ) < 0 && errno != ENOSYS) { + cap_rights_init(&rights, CAP_IOCTL, CAP_READ); + if (cap_rights_limit(pcap_fileno(pd), &rights) < 0 && + errno != ENOSYS) { error("unable to limit pcap descriptor"); } if (cap_ioctls_limit(pcap_fileno(pd), cmds, @@ -1516,8 +1519,9 @@ main(int argc, char **argv) if (p == NULL) error("%s", pcap_geterr(pd)); #ifdef __FreeBSD__ - if (cap_rights_limit(fileno(pcap_dump_file(p)), - CAP_SEEK | CAP_WRITE) < 0 && errno != ENOSYS) { + cap_rights_init(&rights, CAP_SEEK, CAP_WRITE); + if (cap_rights_limit(fileno(pcap_dump_file(p)), &rights) < 0 && + errno != ENOSYS) { error("unable to limit dump descriptor"); } #endif @@ -1530,9 +1534,10 @@ main(int argc, char **argv) error("unable to open directory %s", dirname(WFileName)); } - if (cap_rights_limit(dumpinfo.dirfd, CAP_CREATE | - CAP_FCNTL | CAP_FTRUNCATE | CAP_LOOKUP | CAP_SEEK | - CAP_WRITE) < 0 && errno != ENOSYS) { + cap_rights_init(&rights, CAP_CREATE, CAP_FCNTL, + CAP_FTRUNCATE, CAP_LOOKUP, CAP_SEEK, CAP_WRITE); + if (cap_rights_limit(dumpinfo.dirfd, &rights) < 0 && + errno != ENOSYS) { error("unable to limit directory rights"); } #else /* !__FreeBSD__ */ @@ -1615,7 +1620,7 @@ main(int argc, char **argv) error("unable to enter the capability mode"); if (cap_sandboxed()) fprintf(stderr, "capability mode sandbox enabled\n"); -#endif +#endif /* __FreeBSD__ */ do { status = pcap_loop(pd, cnt, callback, pcap_userdata); @@ -1657,8 +1662,9 @@ main(int argc, char **argv) if (pd == NULL) error("%s", ebuf); #ifdef __FreeBSD__ + cap_rights_init(&rights, CAP_READ); if (cap_rights_limit(fileno(pcap_file(pd)), - CAP_READ) < 0 && errno != ENOSYS) { + &rights) < 0 && errno != ENOSYS) { error("unable to limit pcap descriptor"); } #endif @@ -1830,6 +1836,9 @@ static void dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) { struct dump_info *dump_info; +#ifdef __FreeBSD__ + cap_rights_t rights; +#endif ++packets_captured; @@ -1933,8 +1942,9 @@ dump_packet_and_trunc(u_char *user, cons if (dump_info->p == NULL) error("%s", pcap_geterr(pd)); #ifdef __FreeBSD__ + cap_rights_init(&rights, CAP_SEEK, CAP_WRITE); if (cap_rights_limit(fileno(pcap_dump_file(dump_info->p)), - CAP_SEEK | CAP_WRITE) < 0 && errno != ENOSYS) { + &rights) < 0 && errno != ENOSYS) { error("unable to limit dump descriptor"); } #endif @@ -1993,8 +2003,9 @@ dump_packet_and_trunc(u_char *user, cons if (dump_info->p == NULL) error("%s", pcap_geterr(pd)); #ifdef __FreeBSD__ + cap_rights_init(&rights, CAP_SEEK, CAP_WRITE); if (cap_rights_limit(fileno(pcap_dump_file(dump_info->p)), - CAP_SEEK | CAP_WRITE) < 0 && errno != ENOSYS) { + &rights) < 0 && errno != ENOSYS) { error("unable to limit dump descriptor"); } #endif Modified: projects/bhyve_npt_pmap/etc/mtree/BSD.var.dist ============================================================================== --- projects/bhyve_npt_pmap/etc/mtree/BSD.var.dist Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/etc/mtree/BSD.var.dist Fri Sep 13 02:28:44 2013 (r255504) @@ -23,6 +23,8 @@ remote uname=auditdistd gname=wheel mode=0700 .. .. + authpf uname=root gname=authpf mode=0770 + .. /set gname=wheel backups .. Modified: projects/bhyve_npt_pmap/include/iconv.h ============================================================================== --- projects/bhyve_npt_pmap/include/iconv.h Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/include/iconv.h Fri Sep 13 02:28:44 2013 (r255504) @@ -35,7 +35,6 @@ #include <sys/cdefs.h> #include <sys/types.h> -#include <stdbool.h> #include <wchar.h> #include <sys/cdefs.h> @@ -48,6 +47,13 @@ #define libiconv iconv #define libiconv_t iconv_t #endif +#ifdef __cplusplus +typedef bool __iconv_bool; +#elif __STDC_VERSION__ >= 199901L +typedef _Bool __iconv_bool; +#else +typedef int __iconv_bool; +#endif struct __tag_iconv_t; typedef struct __tag_iconv_t *iconv_t; @@ -61,7 +67,7 @@ int iconv_close(iconv_t); /* * non-portable interfaces for iconv */ -int __iconv_get_list(char ***, size_t *, bool); +int __iconv_get_list(char ***, size_t *, __iconv_bool); void __iconv_free_list(char **, size_t); size_t __iconv(iconv_t, const char **, size_t *, char **, size_t *, __uint32_t, size_t *); Modified: projects/bhyve_npt_pmap/lib/libc/Makefile ============================================================================== --- projects/bhyve_npt_pmap/lib/libc/Makefile Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/lib/libc/Makefile Fri Sep 13 02:28:44 2013 (r255504) @@ -100,6 +100,7 @@ NOASM= CFLAGS+= -DYP .include "${.CURDIR}/yp/Makefile.inc" .endif +.include "${.CURDIR}/capability/Makefile.inc" .if ${MK_HESIOD} != "no" CFLAGS+= -DHESIOD .endif Modified: projects/bhyve_npt_pmap/lib/libc/iconv/citrus_iconv_local.h ============================================================================== --- projects/bhyve_npt_pmap/lib/libc/iconv/citrus_iconv_local.h Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/lib/libc/iconv/citrus_iconv_local.h Fri Sep 13 02:28:44 2013 (r255504) @@ -31,6 +31,7 @@ #define _CITRUS_ICONV_LOCAL_H_ #include <iconv.h> +#include <stdbool.h> #define _CITRUS_ICONV_GETOPS_FUNC_BASE(_n_) \ int _n_(struct _citrus_iconv_ops *) Modified: projects/bhyve_npt_pmap/lib/libc/include/compat.h ============================================================================== --- projects/bhyve_npt_pmap/lib/libc/include/compat.h Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/lib/libc/include/compat.h Fri Sep 13 02:28:44 2013 (r255504) @@ -42,8 +42,6 @@ __sym_compat(__semctl, freebsd7___semctl __sym_compat(msgctl, freebsd7_msgctl, FBSD_1.0); __sym_compat(shmctl, freebsd7_shmctl, FBSD_1.0); -__sym_compat(cap_getrights, cap_rights_get, FBSD_1.2); - #undef __sym_compat #endif /* __LIBC_COMPAT_H__ */ Modified: projects/bhyve_npt_pmap/lib/libc/stdio/flags.c ============================================================================== --- projects/bhyve_npt_pmap/lib/libc/stdio/flags.c Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/lib/libc/stdio/flags.c Fri Sep 13 02:28:44 2013 (r255504) @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); int __sflags(const char *mode, int *optr) { - int ret, m, o; + int ret, m, o, known; switch (*mode++) { @@ -78,34 +78,35 @@ __sflags(const char *mode, int *optr) return (0); } - /* 'b' (binary) is ignored */ - if (*mode == 'b') - mode++; - - /* [rwa][b]\+ means read and write */ - if (*mode == '+') { - mode++; - ret = __SRW; - m = O_RDWR; - } - - /* 'b' (binary) can appear here, too -- and is ignored again */ - if (*mode == 'b') - mode++; - - /* 'x' means exclusive (fail if the file exists) */ - if (*mode == 'x') { - mode++; - if (m == O_RDONLY) { - errno = EINVAL; - return (0); + do { + known = 1; + switch (*mode++) { + case 'b': + /* 'b' (binary) is ignored */ + break; + case '+': + /* [rwa][b]\+ means read and write */ + ret = __SRW; + m = O_RDWR; + break; + case 'x': + /* 'x' means exclusive (fail if the file exists) */ + o |= O_EXCL; + break; + case 'e': + /* set close-on-exec */ + o |= O_CLOEXEC; + break; + default: + known = 0; + break; } - o |= O_EXCL; - } + } while (known); - /* set close-on-exec */ - if (*mode == 'e') - o |= O_CLOEXEC; + if ((o & O_EXCL) != 0 && m == O_RDONLY) { + errno = EINVAL; + return (0); + } *optr = m | o; return (ret); Modified: projects/bhyve_npt_pmap/lib/libc/sys/Symbol.map ============================================================================== --- projects/bhyve_npt_pmap/lib/libc/sys/Symbol.map Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/lib/libc/sys/Symbol.map Fri Sep 13 02:28:44 2013 (r255504) @@ -363,7 +363,6 @@ FBSD_1.1 { FBSD_1.2 { cap_enter; cap_getmode; - cap_new; getloginclass; pdfork; pdgetpid; @@ -385,7 +384,7 @@ FBSD_1.3 { cap_fcntls_limit; cap_ioctls_get; cap_ioctls_limit; - cap_rights_get; + __cap_rights_get; cap_rights_limit; cap_sandboxed; chflagsat; Modified: projects/bhyve_npt_pmap/lib/libc/sys/sigaction.2 ============================================================================== --- projects/bhyve_npt_pmap/lib/libc/sys/sigaction.2 Fri Sep 13 01:12:45 2013 (r255503) +++ projects/bhyve_npt_pmap/lib/libc/sys/sigaction.2 Fri Sep 13 02:28:44 2013 (r255504) @@ -28,7 +28,7 @@ .\" From: @(#)sigaction.2 8.2 (Berkeley) 4/3/94 .\" $FreeBSD$ .\" -.Dd June 8, 2013 +.Dd September 6, 2013 .Dt SIGACTION 2 .Os .Sh NAME @@ -55,7 +55,7 @@ struct sigaction { .Sh DESCRIPTION The system defines a set of signals that may be delivered to a process. Signal delivery resembles the occurrence of a hardware interrupt: -the signal is normally blocked from further occurrence, the current process +the signal is normally blocked from further occurrence, the current thread context is saved, and a new one is built. A process may specify a .Em handler @@ -64,13 +64,14 @@ to which a signal is delivered, or speci A process may also specify that a default action is to be taken by the system when a signal occurs. A signal may also be -.Em blocked , -in which case its delivery is postponed until it is +.Em blocked +for a thread, +in which case it will not be delivered to that thread until it is .Em unblocked . The action to be taken on delivery is determined at the time of delivery. Normally, signal handlers execute on the current stack -of the process. +of the thread. This may be changed, on a per-handler basis, *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309130228.r8D2SjvY006261>