From owner-svn-src-user@freebsd.org Mon Dec 14 00:12:56 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E741EA147CB for ; Mon, 14 Dec 2015 00:12:56 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C5921FEC; Mon, 14 Dec 2015 00:12:56 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBE0CtfY038852; Mon, 14 Dec 2015 00:12:55 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBE0Csus038840; Mon, 14 Dec 2015 00:12:54 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512140012.tBE0Csus038840@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 14 Dec 2015 00:12:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292178 - in user/ngie/more-tests2: . contrib/elftoolchain/addr2line contrib/elftoolchain/common contrib/elftoolchain/elfcopy contrib/elftoolchain/libelf contrib/elftoolchain/readelf co... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2015 00:12:57 -0000 Author: ngie Date: Mon Dec 14 00:12:53 2015 New Revision: 292178 URL: https://svnweb.freebsd.org/changeset/base/292178 Log: MFhead @ r292177 Added: user/ngie/more-tests2/etc/etc.riscv/ - copied from r292177, head/etc/etc.riscv/ user/ngie/more-tests2/lib/csu/riscv/ - copied from r292177, head/lib/csu/riscv/ user/ngie/more-tests2/lib/libc/riscv/ - copied from r292177, head/lib/libc/riscv/ user/ngie/more-tests2/lib/libthr/arch/riscv/ - copied from r292177, head/lib/libthr/arch/riscv/ user/ngie/more-tests2/lib/msun/riscv/ - copied from r292177, head/lib/msun/riscv/ Modified: user/ngie/more-tests2/MAINTAINERS (contents, props changed) user/ngie/more-tests2/Makefile user/ngie/more-tests2/Makefile.inc1 user/ngie/more-tests2/UPDATING user/ngie/more-tests2/contrib/elftoolchain/addr2line/addr2line.1 user/ngie/more-tests2/contrib/elftoolchain/addr2line/addr2line.c user/ngie/more-tests2/contrib/elftoolchain/common/elfdefinitions.h user/ngie/more-tests2/contrib/elftoolchain/elfcopy/binary.c user/ngie/more-tests2/contrib/elftoolchain/elfcopy/elfcopy.1 user/ngie/more-tests2/contrib/elftoolchain/elfcopy/main.c user/ngie/more-tests2/contrib/elftoolchain/elfcopy/sections.c user/ngie/more-tests2/contrib/elftoolchain/elfcopy/segments.c user/ngie/more-tests2/contrib/elftoolchain/libelf/elf_data.c user/ngie/more-tests2/contrib/elftoolchain/readelf/readelf.c user/ngie/more-tests2/contrib/top/loadavg.h user/ngie/more-tests2/contrib/unbound/freebsd-configure.sh user/ngie/more-tests2/lib/libc/gen/exec.3 user/ngie/more-tests2/lib/libc/net/getaddrinfo.c user/ngie/more-tests2/lib/libc/regex/grot/Makefile user/ngie/more-tests2/sbin/geom/class/part/gpart.8 user/ngie/more-tests2/share/man/man4/mps.4 user/ngie/more-tests2/share/mk/bsd.cpu.mk user/ngie/more-tests2/share/mk/bsd.endian.mk user/ngie/more-tests2/share/mk/bsd.opts.mk user/ngie/more-tests2/share/mk/bsd.sys.mk user/ngie/more-tests2/share/mk/local.dirdeps.mk user/ngie/more-tests2/share/mk/local.meta.sys.mk user/ngie/more-tests2/share/mk/src.opts.mk user/ngie/more-tests2/share/mk/sys.mk user/ngie/more-tests2/sys/arm64/arm64/gic.c user/ngie/more-tests2/sys/arm64/arm64/gic.h user/ngie/more-tests2/sys/arm64/arm64/gic_fdt.c user/ngie/more-tests2/sys/arm64/arm64/gic_v3_its.c user/ngie/more-tests2/sys/arm64/arm64/gic_v3_var.h user/ngie/more-tests2/sys/arm64/arm64/intr_machdep.c user/ngie/more-tests2/sys/arm64/arm64/pic_if.m user/ngie/more-tests2/sys/arm64/cavium/thunder_pcie.c user/ngie/more-tests2/sys/arm64/cavium/thunder_pcie_common.c user/ngie/more-tests2/sys/arm64/cavium/thunder_pcie_pem.c user/ngie/more-tests2/sys/arm64/conf/GENERIC user/ngie/more-tests2/sys/arm64/include/intr.h user/ngie/more-tests2/sys/boot/common/part.c user/ngie/more-tests2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/ngie/more-tests2/sys/dev/aic/aic_pccard.c user/ngie/more-tests2/sys/dev/an/if_an_pccard.c user/ngie/more-tests2/sys/dev/ata/ata-card.c user/ngie/more-tests2/sys/dev/bwn/if_bwn.c user/ngie/more-tests2/sys/dev/cmx/cmx_pccard.c user/ngie/more-tests2/sys/dev/cs/if_cs_pccard.c user/ngie/more-tests2/sys/dev/ed/if_ed_isa.c user/ngie/more-tests2/sys/dev/ed/if_ed_pccard.c user/ngie/more-tests2/sys/dev/ed/if_ed_pci.c user/ngie/more-tests2/sys/dev/ep/if_ep_pccard.c user/ngie/more-tests2/sys/dev/ex/if_ex_pccard.c user/ngie/more-tests2/sys/dev/fdc/fdc_pccard.c user/ngie/more-tests2/sys/dev/fdt/simplebus.c user/ngie/more-tests2/sys/dev/fe/if_fe_pccard.c user/ngie/more-tests2/sys/dev/hwpmc/hwpmc_core.c user/ngie/more-tests2/sys/dev/md/md.c user/ngie/more-tests2/sys/dev/ncv/ncr53c500_pccard.c user/ngie/more-tests2/sys/dev/nsp/nsp_pccard.c user/ngie/more-tests2/sys/dev/nvd/nvd.c user/ngie/more-tests2/sys/dev/nvme/nvme.h user/ngie/more-tests2/sys/dev/nvme/nvme_ns.c user/ngie/more-tests2/sys/dev/nvme/nvme_sysctl.c user/ngie/more-tests2/sys/dev/ofw/ofw_bus_subr.c user/ngie/more-tests2/sys/dev/ofw/ofw_bus_subr.h user/ngie/more-tests2/sys/dev/ofw/ofw_iicbus.c user/ngie/more-tests2/sys/dev/otus/if_otus.c user/ngie/more-tests2/sys/dev/pccard/pccardvar.h user/ngie/more-tests2/sys/dev/ral/rt2560.c user/ngie/more-tests2/sys/dev/ral/rt2661.c user/ngie/more-tests2/sys/dev/ral/rt2860.c user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.c user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.h user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c user/ngie/more-tests2/sys/dev/sfxge/common/siena_impl.h user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c user/ngie/more-tests2/sys/dev/sfxge/sfxge.c user/ngie/more-tests2/sys/dev/sn/if_sn_pccard.c user/ngie/more-tests2/sys/dev/snc/if_snc_pccard.c user/ngie/more-tests2/sys/dev/sound/usb/uaudio.c user/ngie/more-tests2/sys/dev/stg/tmc18c30_pccard.c user/ngie/more-tests2/sys/dev/uart/uart_bus_pccard.c user/ngie/more-tests2/sys/dev/usb/input/atp.c user/ngie/more-tests2/sys/dev/usb/input/uep.c user/ngie/more-tests2/sys/dev/usb/input/uhid.c user/ngie/more-tests2/sys/dev/usb/input/ukbd.c user/ngie/more-tests2/sys/dev/usb/input/ums.c user/ngie/more-tests2/sys/dev/usb/input/wsp.c user/ngie/more-tests2/sys/dev/usb/misc/udbp.c user/ngie/more-tests2/sys/dev/usb/misc/ufm.c user/ngie/more-tests2/sys/dev/usb/misc/ugold.c user/ngie/more-tests2/sys/dev/usb/misc/uled.c user/ngie/more-tests2/sys/dev/usb/net/if_aue.c user/ngie/more-tests2/sys/dev/usb/net/if_axe.c user/ngie/more-tests2/sys/dev/usb/net/if_axge.c user/ngie/more-tests2/sys/dev/usb/net/if_cdce.c user/ngie/more-tests2/sys/dev/usb/net/if_cue.c user/ngie/more-tests2/sys/dev/usb/net/if_ipheth.c user/ngie/more-tests2/sys/dev/usb/net/if_kue.c user/ngie/more-tests2/sys/dev/usb/net/if_mos.c user/ngie/more-tests2/sys/dev/usb/net/if_rue.c user/ngie/more-tests2/sys/dev/usb/net/if_smsc.c user/ngie/more-tests2/sys/dev/usb/net/if_udav.c user/ngie/more-tests2/sys/dev/usb/net/if_urndis.c user/ngie/more-tests2/sys/dev/usb/net/if_usie.c user/ngie/more-tests2/sys/dev/usb/net/uhso.c user/ngie/more-tests2/sys/dev/usb/serial/u3g.c user/ngie/more-tests2/sys/dev/usb/serial/uark.c user/ngie/more-tests2/sys/dev/usb/serial/ubsa.c user/ngie/more-tests2/sys/dev/usb/serial/uchcom.c user/ngie/more-tests2/sys/dev/usb/serial/ucycom.c user/ngie/more-tests2/sys/dev/usb/serial/ufoma.c user/ngie/more-tests2/sys/dev/usb/serial/uftdi.c user/ngie/more-tests2/sys/dev/usb/serial/ugensa.c user/ngie/more-tests2/sys/dev/usb/serial/uipaq.c user/ngie/more-tests2/sys/dev/usb/serial/ulpt.c user/ngie/more-tests2/sys/dev/usb/serial/umcs.c user/ngie/more-tests2/sys/dev/usb/serial/umct.c user/ngie/more-tests2/sys/dev/usb/serial/umodem.c user/ngie/more-tests2/sys/dev/usb/serial/umoscom.c user/ngie/more-tests2/sys/dev/usb/serial/uplcom.c user/ngie/more-tests2/sys/dev/usb/serial/uslcom.c user/ngie/more-tests2/sys/dev/usb/serial/uvisor.c user/ngie/more-tests2/sys/dev/usb/serial/uvscom.c user/ngie/more-tests2/sys/dev/usb/storage/umass.c user/ngie/more-tests2/sys/dev/usb/storage/urio.c user/ngie/more-tests2/sys/dev/usb/usb_hub.c user/ngie/more-tests2/sys/dev/usb/usbdi.h user/ngie/more-tests2/sys/dev/usb/wlan/if_rsu.c user/ngie/more-tests2/sys/dev/usb/wlan/if_rum.c user/ngie/more-tests2/sys/dev/usb/wlan/if_run.c user/ngie/more-tests2/sys/dev/usb/wlan/if_uath.c user/ngie/more-tests2/sys/dev/usb/wlan/if_upgt.c user/ngie/more-tests2/sys/dev/usb/wlan/if_ural.c user/ngie/more-tests2/sys/dev/usb/wlan/if_urtw.c user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwn.c user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwnreg.h user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwnvar.h user/ngie/more-tests2/sys/dev/usb/wlan/if_zyd.c user/ngie/more-tests2/sys/dev/wi/if_wi_pccard.c user/ngie/more-tests2/sys/dev/wpi/if_wpi.c user/ngie/more-tests2/sys/dev/wpi/if_wpi_debug.h user/ngie/more-tests2/sys/dev/wtap/if_wtap_module.c user/ngie/more-tests2/sys/dev/wtap/if_wtapvar.h user/ngie/more-tests2/sys/dev/wtap/plugins/visibility.c user/ngie/more-tests2/sys/dev/xe/if_xe_pccard.c user/ngie/more-tests2/sys/geom/part/g_part_gpt.c user/ngie/more-tests2/sys/kern/kern_linker.c user/ngie/more-tests2/sys/kern/kern_malloc.c user/ngie/more-tests2/sys/kern/kern_racct.c user/ngie/more-tests2/sys/kern/kern_rctl.c user/ngie/more-tests2/sys/mips/include/cpuregs.h user/ngie/more-tests2/sys/net/if_llatbl.c user/ngie/more-tests2/sys/net/if_llatbl.h user/ngie/more-tests2/sys/net/route.c user/ngie/more-tests2/sys/net80211/ieee80211_phy.h user/ngie/more-tests2/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c user/ngie/more-tests2/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c user/ngie/more-tests2/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c user/ngie/more-tests2/sys/netinet/sctp_input.c user/ngie/more-tests2/sys/netinet/sctp_output.c user/ngie/more-tests2/sys/netinet/sctp_pcb.h user/ngie/more-tests2/sys/netinet/tcp_hostcache.c user/ngie/more-tests2/sys/netinet/tcp_hostcache.h user/ngie/more-tests2/sys/netinet/tcp_var.h user/ngie/more-tests2/sys/netinet6/in6.c user/ngie/more-tests2/sys/netinet6/nd6.c user/ngie/more-tests2/sys/netinet6/nd6_nbr.c user/ngie/more-tests2/sys/powerpc/booke/booke_machdep.c user/ngie/more-tests2/sys/powerpc/booke/trap_subr.S user/ngie/more-tests2/sys/powerpc/include/trap.h user/ngie/more-tests2/sys/powerpc/powerpc/trap.c user/ngie/more-tests2/sys/sys/module.h user/ngie/more-tests2/sys/vm/uma_core.c user/ngie/more-tests2/sys/vm/vm_page.c user/ngie/more-tests2/tools/bsdbox/Makefile.base user/ngie/more-tests2/tools/tools/nanobsd/defaults.sh user/ngie/more-tests2/tools/tools/nanobsd/embedded/common user/ngie/more-tests2/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg user/ngie/more-tests2/usr.bin/mkimg/mbr.c user/ngie/more-tests2/usr.bin/mkimg/scheme.c user/ngie/more-tests2/usr.bin/mkimg/scheme.h user/ngie/more-tests2/usr.bin/unzip/unzip.1 user/ngie/more-tests2/usr.bin/unzip/unzip.c user/ngie/more-tests2/usr.sbin/crunch/crunchide/exec_elf32.c user/ngie/more-tests2/usr.sbin/kldxref/kldxref.c user/ngie/more-tests2/usr.sbin/sesutil/Makefile user/ngie/more-tests2/usr.sbin/sesutil/eltsub.c user/ngie/more-tests2/usr.sbin/sesutil/eltsub.h user/ngie/more-tests2/usr.sbin/sesutil/sesutil.c Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/contrib/elftoolchain/ (props changed) user/ngie/more-tests2/contrib/top/ (props changed) user/ngie/more-tests2/contrib/unbound/ (props changed) user/ngie/more-tests2/lib/libc/ (props changed) user/ngie/more-tests2/sbin/ (props changed) user/ngie/more-tests2/share/ (props changed) user/ngie/more-tests2/share/man/man4/ (props changed) user/ngie/more-tests2/sys/ (props changed) user/ngie/more-tests2/sys/boot/ (props changed) user/ngie/more-tests2/sys/cddl/contrib/opensolaris/ (props changed) user/ngie/more-tests2/usr.bin/mkimg/ (props changed) Modified: user/ngie/more-tests2/MAINTAINERS ============================================================================== --- user/ngie/more-tests2/MAINTAINERS Sun Dec 13 22:11:37 2015 (r292177) +++ user/ngie/more-tests2/MAINTAINERS Mon Dec 14 00:12:53 2015 (r292178) @@ -26,57 +26,62 @@ sub-system. subsystem login notes ----------------------------- -opencrypto jmg Pre-commit review requested. Documentation Required. -kqueue jmg Pre-commit review requested. Documentation Required. -share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. +atf freebsd-testing,jmmv,ngie Pre-commit review requested. ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -openssl benl,jkim Pre-commit review requested. -release/release.sh gjb,re Pre-commit review and regression tests - requested. -sh(1) jilles Pre-commit review requested. This also applies - to kill(1), printf(1) and test(1) which are - compiled in as builtins. -isci(4) jimharris Pre-commit review requested. -nvme(4) jimharris Pre-commit review requested. -nvd(4) jimharris Pre-commit review requested. -nvmecontrol(8) jimharris Pre-commit review requested. -libfetch des Pre-commit review requested. -fetch des Pre-commit review requested. -libpam des Pre-commit review requested. -openssh des Pre-commit review requested. -pseudofs des Pre-commit review requested. -procfs des Pre-commit review requested. -linprocfs des Pre-commit review requested. +callout_*(9) rrs Pre-commit review requested -- becareful its tricksy code :o. contrib/compiler-rt dim Pre-commit review preferred. contrib/libc++ dim Pre-commit review preferred. contrib/libcxxrt dim Pre-commit review preferred. contrib/llvm dim Pre-commit review preferred. contrib/llvm/tools/lldb emaste Pre-commit review preferred. -atf freebsd-testing,jmmv,ngie Pre-commit review requested. contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. contrib/pjdfstest freebsd-testing,ngie,pjd Pre-commit review requested. +dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. +etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. +fetch des Pre-commit review requested. +isci(4) jimharris Pre-commit review requested. +iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +kqueue jmg Pre-commit review requested. Documentation Required. +libfetch des Pre-commit review requested. +libpam des Pre-commit review requested. +linprocfs des Pre-commit review requested. +lpr gad Pre-commit review requested, particularly for + lpd/recvjob.c and lpd/printjob.c. +nanobsd imp Pre-commit phabricator review requested. +net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +nis(8), yp(8) araujo Pre-commit review requested. +nvd(4) jimharris Pre-commit review requested. +nvme(4) jimharris Pre-commit review requested. +nvmecontrol(8) jimharris Pre-commit review requested. +opencrypto jmg Pre-commit review requested. Documentation Required. +openssh des Pre-commit review requested. +openssl benl,jkim Pre-commit review requested. +otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +pmcstudy(8) rrs Pre-commit review requested. +procfs des Pre-commit review requested. +pseudofs des Pre-commit review requested. +release/release.sh gjb,re Pre-commit review and regression tests + requested. +sctp rrs,tuexen Pre-commit review requested (changes need to be backported to github). +sendmail gshapiro Pre-commit review requested. +sh(1) jilles Pre-commit review requested. This also applies + to kill(1), printf(1) and test(1) which are + compiled in as builtins. +share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. share/mk/*.test.mk freebsd-testing,ngie (same list as share/mk too) Pre-commit review requested. -tests freebsd-testing,ngie Pre-commit review requested. -sys/dev/usb hselasky If in doubt, ask. -sys/dev/sound/usb hselasky If in doubt, ask. sys/compat/linuxkpi hselasky If in doubt, ask. sys/dev/e1000 erj Pre-commit phabricator review requested. sys/dev/ixgbe erj Pre-commit phabricator review requested. sys/dev/ixl erj Pre-commit phabricator review requested. +sys/dev/sound/usb hselasky If in doubt, ask. +sys/dev/usb hselasky If in doubt, ask. sys/netinet/ip_carp.c glebius Pre-commit review recommended. sys/netpfil/pf kp,glebius Pre-commit review recommended. -sctp rrs,tuexen Pre-commit review requested (changes need to be backported to github). -pmcstudy(8) rrs Pre-commit review requested. -callout_*(9) rrs Pre-commit review requested -- becareful its tricksy code :o. +tests freebsd-testing,ngie Pre-commit review requested. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. -lpr gad Pre-commit review requested, particularly for - lpd/recvjob.c and lpd/printjob.c. -nis(8), yp(8) araujo Pre-commit review requested. +vmm(4) neel,grehan Pre-commit review requested. ---- OLD ---- libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. @@ -102,11 +107,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -sendmail gshapiro Pre-commit review requested. -etc/mail gshapiro Pre-commit review requested. - Keep in sync with -STABLE. -etc/sendmail gshapiro Pre-commit review requested. - Keep in sync with -STABLE. nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. @@ -155,5 +155,4 @@ sbin/routed bms Pre-commit review; notif cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. -nanobsd imp Pre-commit review requested for coordination. -vmm(4) neel,grehan Pre-commit review requested. + Modified: user/ngie/more-tests2/Makefile ============================================================================== --- user/ngie/more-tests2/Makefile Sun Dec 13 22:11:37 2015 (r292177) +++ user/ngie/more-tests2/Makefile Mon Dec 14 00:12:53 2015 (r292178) @@ -180,7 +180,7 @@ _MAKE= PATH=${PATH} ${SUB_MAKE} -f Makef _TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} -_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/} +_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/} .endif .if defined(TARGET) && !defined(_TARGET) _TARGET=${TARGET} Modified: user/ngie/more-tests2/Makefile.inc1 ============================================================================== --- user/ngie/more-tests2/Makefile.inc1 Sun Dec 13 22:11:37 2015 (r292177) +++ user/ngie/more-tests2/Makefile.inc1 Mon Dec 14 00:12:53 2015 (r292178) @@ -172,7 +172,11 @@ VERSION= FreeBSD ${REVISION}-${BRANCH:C/ .export VERSION .endif -KNOWN_ARCHES?= aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm \ + i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips \ + mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc \ + riscv64/riscv sparc64 + .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else Modified: user/ngie/more-tests2/UPDATING ============================================================================== --- user/ngie/more-tests2/UPDATING Sun Dec 13 22:11:37 2015 (r292177) +++ user/ngie/more-tests2/UPDATING Mon Dec 14 00:12:53 2015 (r292178) @@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20151211: + The code to start recording plug and play data into the modules has + been committed. While the old tools will properly build a new kernel, + a number of warnings about "unknown metadata record 4" will be produced + for an older kldxref. To avoid such warnings, make sure to rebuild + the kernel toolchain (or world). Make sure that you have r292078 or + later when trying to build 292077 or later before rebuilding. + 20151207: Debug data files are now built by default with 'make buildworld' and installed with 'make installworld'. This facilitates debugging but Modified: user/ngie/more-tests2/contrib/elftoolchain/addr2line/addr2line.1 ============================================================================== --- user/ngie/more-tests2/contrib/elftoolchain/addr2line/addr2line.1 Sun Dec 13 22:11:37 2015 (r292177) +++ user/ngie/more-tests2/contrib/elftoolchain/addr2line/addr2line.1 Mon Dec 14 00:12:53 2015 (r292178) @@ -22,9 +22,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: addr2line.1 3195 2015-05-12 17:22:19Z emaste $ +.\" $Id: addr2line.1 3263 2015-11-30 04:25:54Z kaiwang27 $ .\" -.Dd July 25, 2010 +.Dd November 30, 2015 .Os .Dt ADDR2LINE 1 .Sh NAME @@ -32,10 +32,13 @@ .Nd translate program addresses to source file names and line numbers .Sh SYNOPSIS .Nm +.Op Fl a | Fl -addresses .Op Fl b Ar target | Fl -target Ns = Ns Ar target .Op Fl e Ar pathname | Fl -exe Ns = Ns Ar pathname .Op Fl f | Fl -functions +.Op Fl i | Fl -inlines .Op Fl j Ar sectionname | Fl -section Ns = Ns Ar sectionname +.Op Fl p | Fl -pretty-print .Op Fl s | Fl -basename .Op Fl C | Fl -demangle .Op Fl H | Fl -help @@ -69,6 +72,8 @@ The .Nm utility recognizes the following options: .Bl -tag -width indent +.It Fl a | Fl -addresses +Display the address prior to the line number information. .It Fl b Ar target | Fl -target Ns = Ns Ar target This option is recognized by .Nm @@ -84,11 +89,17 @@ will use the file .Dq Pa a.out . .It Fl f | Fl -functions Display function names in addition to file and line number information. +.It Fl i | Fl -inlines +If the address specified belongs to an inlined function, also display the line +number information for its caller, recursively until the first non-inlined +caller. .It Fl j Ar sectionname | Fl -section Ns = Ns Ar sectionname The values specified by arguments .Ar hexaddress are to be treated as offsets into the section named .Ar sectionname . +.It Fl p | -pretty-print +Display the line number information on one line, in human readable manner. .It Fl s | -basename Display only the base name for each file name. .It Fl C | Fl -demangle @@ -115,6 +126,18 @@ to program address .Ar hexaddress , followed by a line with the file name and line number. .Pp +If the +.Fl p +option was specified, +.Nm +will print line number information and function name on one line in +human readable manner. If the +.Fl i +option was also specified, +.Nm +will print the caller function information prefixed with +.Dq (inlined by) . +.Pp The .Nm utility prints the file name and line number using the format Modified: user/ngie/more-tests2/contrib/elftoolchain/addr2line/addr2line.c ============================================================================== --- user/ngie/more-tests2/contrib/elftoolchain/addr2line/addr2line.c Sun Dec 13 22:11:37 2015 (r292177) +++ user/ngie/more-tests2/contrib/elftoolchain/addr2line/addr2line.c Mon Dec 14 00:12:53 2015 (r292178) @@ -37,33 +37,64 @@ #include #include +#include "uthash.h" #include "_elftc.h" -ELFTC_VCSID("$Id: addr2line.c 3249 2015-10-04 08:11:30Z kaiwang27 $"); +ELFTC_VCSID("$Id: addr2line.c 3264 2015-11-30 05:38:14Z kaiwang27 $"); + +struct Func { + char *name; + Dwarf_Unsigned lopc; + Dwarf_Unsigned hipc; + Dwarf_Unsigned call_file; + Dwarf_Unsigned call_line; + Dwarf_Ranges *ranges; + Dwarf_Signed ranges_cnt; + struct Func *inlined_caller; + STAILQ_ENTRY(Func) next; +}; + +struct CU { + Dwarf_Off off; + Dwarf_Unsigned lopc; + Dwarf_Unsigned hipc; + char **srcfiles; + Dwarf_Signed nsrcfiles; + STAILQ_HEAD(, Func) funclist; + UT_hash_handle hh; +}; static struct option longopts[] = { + {"addresses", no_argument, NULL, 'a'}, {"target" , required_argument, NULL, 'b'}, {"demangle", no_argument, NULL, 'C'}, {"exe", required_argument, NULL, 'e'}, {"functions", no_argument, NULL, 'f'}, + {"inlines", no_argument, NULL, 'i'}, {"section", required_argument, NULL, 'j'}, + {"pretty-print", no_argument, NULL, 'p'}, {"basename", no_argument, NULL, 's'}, {"help", no_argument, NULL, 'H'}, {"version", no_argument, NULL, 'V'}, {NULL, 0, NULL, 0} }; -static int demangle, func, base; +static int demangle, func, base, inlines, print_addr, pretty_print; static char unknown[] = { '?', '?', '\0' }; static Dwarf_Addr section_base; +static struct CU *culist; #define USAGE_MESSAGE "\ Usage: %s [options] hexaddress...\n\ Map program addresses to source file names and line numbers.\n\n\ Options:\n\ + -a | --addresses Display address prior to line number info.\n\ -b TGT | --target=TGT (Accepted but ignored).\n\ -e EXE | --exe=EXE Use program \"EXE\" to translate addresses.\n\ -f | --functions Display function names.\n\ + -i | --inlines Display caller info for inlined functions.\n\ -j NAME | --section=NAME Values are offsets into section \"NAME\".\n\ + -p | --pretty-print Display line number info and function name\n\ + in human readable manner.\n\ -s | --basename Only show the base name for each file name.\n\ -C | --demangle Demangle C++ names.\n\ -H | --help Print a help message.\n\ @@ -122,71 +153,160 @@ handle_high_pc(Dwarf_Die die, Dwarf_Unsi return (DW_DLV_OK); } +static struct Func * +search_func(struct CU *cu, Dwarf_Unsigned addr) +{ + struct Func *f, *f0; + Dwarf_Unsigned lopc, hipc, addr_base; + int i; + + f0 = NULL; + + STAILQ_FOREACH(f, &cu->funclist, next) { + if (f->ranges != NULL) { + addr_base = 0; + for (i = 0; i < f->ranges_cnt; i++) { + if (f->ranges[i].dwr_type == DW_RANGES_END) + break; + if (f->ranges[i].dwr_type == + DW_RANGES_ADDRESS_SELECTION) { + addr_base = f->ranges[i].dwr_addr2; + continue; + } + + /* DW_RANGES_ENTRY */ + lopc = f->ranges[i].dwr_addr1 + addr_base; + hipc = f->ranges[i].dwr_addr2 + addr_base; + if (addr >= lopc && addr < hipc) { + if (f0 == NULL || + (lopc >= f0->lopc && + hipc <= f0->hipc)) { + f0 = f; + f0->lopc = lopc; + f0->hipc = hipc; + break; + } + } + } + } else if (addr >= f->lopc && addr < f->hipc) { + if (f0 == NULL || + (f->lopc >= f0->lopc && f->hipc <= f0->hipc)) + f0 = f; + } + } + + return (f0); +} + static void -search_func(Dwarf_Debug dbg, Dwarf_Die die, Dwarf_Addr addr, char **rlt_func) +collect_func(Dwarf_Debug dbg, Dwarf_Die die, struct Func *parent, struct CU *cu) { - Dwarf_Die ret_die, spec_die; + Dwarf_Die ret_die, abst_die, spec_die; Dwarf_Error de; Dwarf_Half tag; - Dwarf_Unsigned lopc, hipc; + Dwarf_Unsigned lopc, hipc, ranges_off; + Dwarf_Signed ranges_cnt; Dwarf_Off ref; - Dwarf_Attribute sub_at, spec_at; - char *func0; - const char *func1; - int ret; + Dwarf_Attribute abst_at, spec_at; + Dwarf_Ranges *ranges; + const char *funcname; + struct Func *f; + int found_ranges, ret; - if (*rlt_func != NULL) - goto done; + f = NULL; + abst_die = spec_die = NULL; if (dwarf_tag(die, &tag, &de)) { warnx("dwarf_tag: %s", dwarf_errmsg(de)); goto cont_search; } - if (tag == DW_TAG_subprogram) { + if (tag == DW_TAG_subprogram || tag == DW_TAG_entry_point || + tag == DW_TAG_inlined_subroutine) { + /* + * Function address range can be specified by either + * a DW_AT_ranges attribute which points to a range list or + * by a pair of DW_AT_low_pc and DW_AT_high_pc attributes. + */ + ranges = NULL; + ranges_cnt = 0; + found_ranges = 0; + if (dwarf_attrval_unsigned(die, DW_AT_ranges, &ranges_off, + &de) == DW_DLV_OK && + dwarf_get_ranges(dbg, (Dwarf_Off) ranges_off, &ranges, + &ranges_cnt, NULL, &de) == DW_DLV_OK) { + if (ranges != NULL && ranges_cnt > 0) { + found_ranges = 1; + goto get_func_name; + } + } + + /* + * Search for DW_AT_low_pc/DW_AT_high_pc if ranges pointer + * not found. + */ if (dwarf_attrval_unsigned(die, DW_AT_low_pc, &lopc, &de) || dwarf_attrval_unsigned(die, DW_AT_high_pc, &hipc, &de)) goto cont_search; if (handle_high_pc(die, lopc, &hipc) != DW_DLV_OK) goto cont_search; - if (addr < lopc || addr >= hipc) - goto cont_search; - /* Found it! */ + get_func_name: + /* + * Most common case the function name is stored in DW_AT_name + * attribute. + */ + if (dwarf_attrval_string(die, DW_AT_name, &funcname, &de) == + DW_DLV_OK) + goto add_func; - if ((*rlt_func = strdup(unknown)) == NULL) - err(EXIT_FAILURE, "strdup"); - ret = dwarf_attr(die, DW_AT_name, &sub_at, &de); - if (ret == DW_DLV_ERROR) - goto done; - if (ret == DW_DLV_OK) { - if (dwarf_formstring(sub_at, &func0, &de) == - DW_DLV_OK) { - free(*rlt_func); - if ((*rlt_func = strdup(func0)) == NULL) - err(EXIT_FAILURE, "strdup"); - } - goto done; - } + /* + * For inlined function, the actual name is probably in the DIE + * referenced by DW_AT_abstract_origin. (if present) + */ + if (dwarf_attr(die, DW_AT_abstract_origin, &abst_at, &de) == + DW_DLV_OK && + dwarf_global_formref(abst_at, &ref, &de) == DW_DLV_OK && + dwarf_offdie(dbg, ref, &abst_die, &de) == DW_DLV_OK && + dwarf_attrval_string(abst_die, DW_AT_name, &funcname, + &de) == DW_DLV_OK) + goto add_func; /* * If DW_AT_name is not present, but DW_AT_specification is * present, then probably the actual name is in the DIE * referenced by DW_AT_specification. */ - if (dwarf_attr(die, DW_AT_specification, &spec_at, &de)) - goto done; - if (dwarf_global_formref(spec_at, &ref, &de)) - goto done; - if (dwarf_offdie(dbg, ref, &spec_die, &de)) - goto done; - if (dwarf_attrval_string(spec_die, DW_AT_name, &func1, &de) == - DW_DLV_OK) { - free(*rlt_func); - if ((*rlt_func = strdup(func1)) == NULL) - err(EXIT_FAILURE, "strdup"); - } + if (dwarf_attr(die, DW_AT_specification, &spec_at, &de) == + DW_DLV_OK && + dwarf_global_formref(spec_at, &ref, &de) == DW_DLV_OK && + dwarf_offdie(dbg, ref, &spec_die, &de) == DW_DLV_OK && + dwarf_attrval_string(spec_die, DW_AT_name, &funcname, + &de) == DW_DLV_OK) + goto add_func; - goto done; + /* Skip if no name assoicated with this DIE. */ + goto cont_search; + + add_func: + if ((f = calloc(1, sizeof(*f))) == NULL) + err(EXIT_FAILURE, "calloc"); + if ((f->name = strdup(funcname)) == NULL) + err(EXIT_FAILURE, "strdup"); + if (found_ranges) { + f->ranges = ranges; + f->ranges_cnt = ranges_cnt; + } else { + f->lopc = lopc; + f->hipc = hipc; + } + if (tag == DW_TAG_inlined_subroutine) { + f->inlined_caller = parent; + dwarf_attrval_unsigned(die, DW_AT_call_file, + &f->call_file, &de); + dwarf_attrval_unsigned(die, DW_AT_call_line, + &f->call_line, &de); + } + STAILQ_INSERT_TAIL(&cu->funclist, f, next); } cont_search: @@ -194,23 +314,69 @@ cont_search: /* Search children. */ ret = dwarf_child(die, &ret_die, &de); if (ret == DW_DLV_ERROR) - errx(EXIT_FAILURE, "dwarf_child: %s", dwarf_errmsg(de)); - else if (ret == DW_DLV_OK) - search_func(dbg, ret_die, addr, rlt_func); + warnx("dwarf_child: %s", dwarf_errmsg(de)); + else if (ret == DW_DLV_OK) { + if (f != NULL) + collect_func(dbg, ret_die, f, cu); + else + collect_func(dbg, ret_die, parent, cu); + } /* Search sibling. */ ret = dwarf_siblingof(dbg, die, &ret_die, &de); if (ret == DW_DLV_ERROR) - errx(EXIT_FAILURE, "dwarf_siblingof: %s", dwarf_errmsg(de)); + warnx("dwarf_siblingof: %s", dwarf_errmsg(de)); else if (ret == DW_DLV_OK) - search_func(dbg, ret_die, addr, rlt_func); + collect_func(dbg, ret_die, parent, cu); -done: + /* Cleanup */ dwarf_dealloc(dbg, die, DW_DLA_DIE); + + if (abst_die != NULL) + dwarf_dealloc(dbg, abst_die, DW_DLA_DIE); + + if (spec_die != NULL) + dwarf_dealloc(dbg, spec_die, DW_DLA_DIE); +} + +static void +print_inlines(struct CU *cu, struct Func *f, Dwarf_Unsigned call_file, + Dwarf_Unsigned call_line) +{ + char demangled[1024]; + char *file; + + if (call_file > 0 && (Dwarf_Signed) call_file <= cu->nsrcfiles) + file = cu->srcfiles[call_file - 1]; + else + file = unknown; + + if (pretty_print) + printf(" (inlined by) "); + + if (func) { + if (demangle && !elftc_demangle(f->name, demangled, + sizeof(demangled), 0)) { + if (pretty_print) + printf("%s at ", demangled); + else + printf("%s\n", demangled); + } else { + if (pretty_print) + printf("%s at ", f->name); + else + printf("%s\n", f->name); + } + } + (void) printf("%s:%ju\n", base ? basename(file) : file, call_line); + + if (f->inlined_caller != NULL) + print_inlines(cu, f->inlined_caller, f->call_file, + f->call_line); } static void -translate(Dwarf_Debug dbg, const char* addrstr) +translate(Dwarf_Debug dbg, Elf *e, const char* addrstr) { Dwarf_Die die, ret_die; Dwarf_Line *lbuf; @@ -219,18 +385,20 @@ translate(Dwarf_Debug dbg, const char* a Dwarf_Unsigned lopc, hipc, addr, lineno, plineno; Dwarf_Signed lcount; Dwarf_Addr lineaddr, plineaddr; - char *funcname; + Dwarf_Off off; + struct CU *cu; + struct Func *f; + const char *funcname; char *file, *file0, *pfile; char demangled[1024]; - int i, ret; + int ec, i, ret; addr = strtoull(addrstr, NULL, 16); addr += section_base; lineno = 0; file = unknown; + cu = NULL; die = NULL; - lbuf = NULL; - lcount = 0; while ((ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL, NULL, &de)) == DW_DLV_OK) { @@ -253,59 +421,46 @@ translate(Dwarf_Debug dbg, const char* a warnx("could not find DW_TAG_compile_unit die"); goto next_cu; } - if (!dwarf_attrval_unsigned(die, DW_AT_low_pc, &lopc, &de) && - !dwarf_attrval_unsigned(die, DW_AT_high_pc, &hipc, &de)) { + if (dwarf_attrval_unsigned(die, DW_AT_low_pc, &lopc, &de) == + DW_DLV_OK) { + if (dwarf_attrval_unsigned(die, DW_AT_high_pc, &hipc, + &de) == DW_DLV_OK) { + /* + * Check if the address falls into the PC + * range of this CU. + */ + if (handle_high_pc(die, lopc, &hipc) != + DW_DLV_OK) + goto out; + } else { + /* Assume ~0ULL if DW_AT_high_pc not present */ + hipc = ~0ULL; + } + /* - * Check if the address falls into the PC range of - * this CU. + * Record the CU in the hash table for faster lookup + * later. */ - if (handle_high_pc(die, lopc, &hipc) != DW_DLV_OK) - goto next_cu; - if (addr < lopc || addr >= hipc) - goto next_cu; - } - - switch (dwarf_srclines(die, &lbuf, &lcount, &de)) { - case DW_DLV_OK: - break; - case DW_DLV_NO_ENTRY: - /* If a CU lacks debug info, just skip it. */ - goto next_cu; - default: - warnx("dwarf_srclines: %s", dwarf_errmsg(de)); - goto out; - } - - plineaddr = ~0ULL; - plineno = 0; - pfile = unknown; - for (i = 0; i < lcount; i++) { - if (dwarf_lineaddr(lbuf[i], &lineaddr, &de)) { - warnx("dwarf_lineaddr: %s", - dwarf_errmsg(de)); - goto out; - } - if (dwarf_lineno(lbuf[i], &lineno, &de)) { - warnx("dwarf_lineno: %s", + if (dwarf_dieoffset(die, &off, &de) != DW_DLV_OK) { + warnx("dwarf_dieoffset failed: %s", dwarf_errmsg(de)); goto out; } - if (dwarf_linesrc(lbuf[i], &file0, &de)) { - warnx("dwarf_linesrc: %s", - dwarf_errmsg(de)); - } else - file = file0; - if (addr == lineaddr) - goto out; - else if (addr < lineaddr && addr > plineaddr) { - lineno = plineno; - file = pfile; - goto out; + HASH_FIND(hh, culist, &off, sizeof(off), cu); + if (cu == NULL) { + if ((cu = calloc(1, sizeof(*cu))) == NULL) + err(EXIT_FAILURE, "calloc"); + cu->off = off; + cu->lopc = lopc; + cu->hipc = hipc; + STAILQ_INIT(&cu->funclist); + HASH_ADD(hh, culist, off, sizeof(off), cu); } - plineaddr = lineaddr; - plineno = lineno; - pfile = file; + + if (addr >= lopc && addr < hipc) + break; } + next_cu: if (die != NULL) { dwarf_dealloc(dbg, die, DW_DLA_DIE); @@ -313,27 +468,107 @@ translate(Dwarf_Debug dbg, const char* a } } + if (ret != DW_DLV_OK || die == NULL) + goto out; + + switch (dwarf_srclines(die, &lbuf, &lcount, &de)) { + case DW_DLV_OK: + break; + case DW_DLV_NO_ENTRY: + /* If a CU lacks debug info, just skip it. */ + goto out; + default: + warnx("dwarf_srclines: %s", dwarf_errmsg(de)); + goto out; + } + + plineaddr = ~0ULL; + plineno = 0; + pfile = unknown; + for (i = 0; i < lcount; i++) { + if (dwarf_lineaddr(lbuf[i], &lineaddr, &de)) { + warnx("dwarf_lineaddr: %s", dwarf_errmsg(de)); + goto out; + } + if (dwarf_lineno(lbuf[i], &lineno, &de)) { + warnx("dwarf_lineno: %s", dwarf_errmsg(de)); + goto out; + } + if (dwarf_linesrc(lbuf[i], &file0, &de)) { + warnx("dwarf_linesrc: %s", dwarf_errmsg(de)); + } else + file = file0; + if (addr == lineaddr) + goto out; + else if (addr < lineaddr && addr > plineaddr) { + lineno = plineno; + file = pfile; + goto out; + } + plineaddr = lineaddr; + plineno = lineno; + pfile = file; + } + out: + f = NULL; funcname = NULL; - if (ret == DW_DLV_OK && func) { - search_func(dbg, die, addr, &funcname); - die = NULL; + if (ret == DW_DLV_OK && (func || inlines) && cu != NULL) { + if (cu->srcfiles == NULL) + if (dwarf_srcfiles(die, &cu->srcfiles, &cu->nsrcfiles, + &de)) + warnx("dwarf_srcfiles: %s", dwarf_errmsg(de)); + if (STAILQ_EMPTY(&cu->funclist)) { + collect_func(dbg, die, NULL, cu); + die = NULL; + } + f = search_func(cu, addr); + if (f != NULL) + funcname = f->name; + } + + if (print_addr) { + if ((ec = gelf_getclass(e)) == ELFCLASSNONE) { + warnx("gelf_getclass failed: %s", elf_errmsg(-1)); + ec = ELFCLASS64; + } + if (ec == ELFCLASS32) { + if (pretty_print) + printf("0x%08jx: ", (uintmax_t) addr); + else + printf("0x%08jx\n", (uintmax_t) addr); + } else { + if (pretty_print) + printf("0x%016jx: ", (uintmax_t) addr); + else + printf("0x%016jx\n", (uintmax_t) addr); + } } if (func) { if (funcname == NULL) - if ((funcname = strdup(unknown)) == NULL) - err(EXIT_FAILURE, "strdup"); - if (demangle && - !elftc_demangle(funcname, demangled, sizeof(demangled), 0)) - printf("%s\n", demangled); - else - printf("%s\n", funcname); - free(funcname); + funcname = unknown; + if (demangle && !elftc_demangle(funcname, demangled, + sizeof(demangled), 0)) { + if (pretty_print) + printf("%s at ", demangled); + else + printf("%s\n", demangled); + } else { + if (pretty_print) + printf("%s at ", funcname); + else + printf("%s\n", funcname); + } } (void) printf("%s:%ju\n", base ? basename(file) : file, lineno); + if (ret == DW_DLV_OK && inlines && cu != NULL && + cu->srcfiles != NULL && f != NULL && f->inlined_caller != NULL) + print_inlines(cu, f->inlined_caller, f->call_file, + f->call_line); + if (die != NULL) dwarf_dealloc(dbg, die, DW_DLA_DIE); @@ -421,9 +656,12 @@ main(int argc, char **argv) exe = NULL; section = NULL; - while ((opt = getopt_long(argc, argv, "b:Ce:fj:sHV", longopts, NULL)) != - -1) { + while ((opt = getopt_long(argc, argv, "ab:Ce:fij:psHV", longopts, + NULL)) != -1) { switch (opt) { + case 'a': + print_addr = 1; + break; case 'b': /* ignored */ break; @@ -436,9 +674,15 @@ main(int argc, char **argv) case 'f': func = 1; break; + case 'i': + inlines = 1; + break; case 'j': section = optarg; break; + case 'p': + pretty_print = 1; + break; case 's': base = 1; break; @@ -473,10 +717,10 @@ main(int argc, char **argv) if (argc > 0) for (i = 0; i < argc; i++) - translate(dbg, argv[i]); + translate(dbg, e, argv[i]); else while (fgets(line, sizeof(line), stdin) != NULL) { - translate(dbg, line); + translate(dbg, e, line); fflush(stdout); } Modified: user/ngie/more-tests2/contrib/elftoolchain/common/elfdefinitions.h ============================================================================== --- user/ngie/more-tests2/contrib/elftoolchain/common/elfdefinitions.h Sun Dec 13 22:11:37 2015 (r292177) +++ user/ngie/more-tests2/contrib/elftoolchain/common/elfdefinitions.h Mon Dec 14 00:12:53 2015 (r292178) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: elfdefinitions.h 3247 2015-09-22 16:57:51Z emaste $ + * $Id: elfdefinitions.h 3253 2015-10-10 18:31:33Z kaiwang27 $ */ /* Modified: user/ngie/more-tests2/contrib/elftoolchain/elfcopy/binary.c ============================================================================== --- user/ngie/more-tests2/contrib/elftoolchain/elfcopy/binary.c Sun Dec 13 22:11:37 2015 (r292177) +++ user/ngie/more-tests2/contrib/elftoolchain/elfcopy/binary.c Mon Dec 14 00:12:53 2015 (r292178) @@ -35,17 +35,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: binary.c 3174 2015-03-27 17:13:41Z emaste $"); - -static int -basename_length(const char *filename) -{ - char *p; - - if ((p = strchr(filename, '.')) != NULL) - return (p - filename); - return (strlen(filename)); -} +ELFTC_VCSID("$Id: binary.c 3270 2015-12-11 18:48:56Z emaste $"); /* * Convert ELF object to `binary'. Sections with SHF_ALLOC flag set @@ -150,6 +140,7 @@ create_elf_from_binary(struct elfcopy *e GElf_Shdr sh; void *content; uint64_t off, data_start, data_end, data_size; + char *sym_basename, *p; /* Reset internal section list. */ if (!TAILQ_EMPTY(&ecp->v_sec)) @@ -220,9 +211,13 @@ create_elf_from_binary(struct elfcopy *e /* Count in .symtab and .strtab section headers. */ shtab->sz += gelf_fsize(ecp->eout, ELF_T_SHDR, 2, EV_CURRENT); + if ((sym_basename = strdup(ifn)) == NULL) + err(1, "strdup"); + p = sym_basename; + while ((p = strchr(p, '.')) != NULL) + *p++ = '_'; #define _GEN_SYMNAME(S) do { \ - snprintf(name, sizeof(name), "%s%.*s%s", "_binary_", \ - basename_length(ifn), ifn, S); \ + snprintf(name, sizeof(name), "%s%s%s", "_binary_", sym_basename, S); \ } while (0) /* @@ -244,6 +239,7 @@ create_elf_from_binary(struct elfcopy *e finalize_external_symtab(ecp); create_symtab_data(ecp); #undef _GEN_SYMNAME + free(sym_basename); /* * Write the underlying ehdr. Note that it should be called Modified: user/ngie/more-tests2/contrib/elftoolchain/elfcopy/elfcopy.1 ============================================================================== --- user/ngie/more-tests2/contrib/elftoolchain/elfcopy/elfcopy.1 Sun Dec 13 22:11:37 2015 (r292177) +++ user/ngie/more-tests2/contrib/elftoolchain/elfcopy/elfcopy.1 Mon Dec 14 00:12:53 2015 (r292178) @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $Id: elfcopy.1 3195 2015-05-12 17:22:19Z emaste $ +.\" $Id: elfcopy.1 3266 2015-12-07 15:38:26Z emaste $ .\" -.Dd March 27, 2015 +.Dd December 7, 2015 .Os .Dt ELFCOPY 1 .Sh NAME @@ -47,6 +47,7 @@ .Op Fl p | Fl -preserve-dates .Op Fl w | Fl -wildcard .Op Fl x | Fl -discard-all +.Op Fl -add-gnu-debuglink Ns = Ns Ar filename .Op Fl -add-section Ar sectionname Ns = Ns Ar filename .Oo .Fl -adjust-section-vma Ar section Ns {+|-|=} Ns Ar val | @@ -165,6 +166,10 @@ Mark the end of a character class. .El .It Fl x | Fl -discard-all Do not copy non-global symbols to the output. +.It Fl -add-gnu-debuglink Ns = Ns Ar filename +Create a .gnu_debuglink section in the output file that references the +debug data in +.Ar filename . .It Fl -add-section Ar sectionname Ns = Ns Ar filename Add a new section to the output file with name .Ar sectionname . Modified: user/ngie/more-tests2/contrib/elftoolchain/elfcopy/main.c ============================================================================== --- user/ngie/more-tests2/contrib/elftoolchain/elfcopy/main.c Sun Dec 13 22:11:37 2015 (r292177) +++ user/ngie/more-tests2/contrib/elftoolchain/elfcopy/main.c Mon Dec 14 00:12:53 2015 (r292178) @@ -39,7 +39,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: main.c 3216 2015-05-23 21:16:36Z kaiwang27 $"); +ELFTC_VCSID("$Id: main.c 3268 2015-12-07 20:30:55Z emaste $"); enum options { @@ -1375,11 +1375,13 @@ Usage: %s [options] infile [outfile]\n\ -w | --wildcard Use shell-style patterns to name symbols.\n\ -x | --discard-all Do not copy non-globals to the output.\n\ -I FORMAT | --input-target=FORMAT\n\ - (Accepted but ignored).\n\ + Specify object format for the input file.\n\ -K SYM | --keep-symbol=SYM Copy symbol SYM to the output.\n\ -L SYM | --localize-symbol=SYM\n\ Make symbol SYM local to the output file.\n\ -N SYM | --strip-symbol=SYM Do not copy symbol SYM to the output.\n\ + -O FORMAT | --output-target=FORMAT\n\ + Specify object format for the output file.\n\ -R NAME | --remove-section=NAME\n\ Remove the named section.\n\ -S | --strip-all Remove all symbol and relocation information\n\ Modified: user/ngie/more-tests2/contrib/elftoolchain/elfcopy/sections.c ============================================================================== --- user/ngie/more-tests2/contrib/elftoolchain/elfcopy/sections.c Sun Dec 13 22:11:37 2015 (r292177) +++ user/ngie/more-tests2/contrib/elftoolchain/elfcopy/sections.c Mon Dec 14 00:12:53 2015 (r292178) @@ -34,7 +34,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: sections.c 3225 2015-06-06 02:35:23Z kaiwang27 $"); +ELFTC_VCSID("$Id: sections.c 3272 2015-12-11 20:00:54Z kaiwang27 $"); static void add_gnu_debuglink(struct elfcopy *ecp); static uint32_t calc_crc32(const char *p, size_t len, uint32_t crc); @@ -457,11 +457,17 @@ create_scn(struct elfcopy *ecp) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Mon Dec 14 00:22:08 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03F50A3E180 for ; Mon, 14 Dec 2015 00:22:08 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 70707164F; Mon, 14 Dec 2015 00:22:07 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBE0M6hS041169; Mon, 14 Dec 2015 00:22:06 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBE0M3kK041142; Mon, 14 Dec 2015 00:22:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512140022.tBE0M3kK041142@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 14 Dec 2015 00:22:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292179 - in user/ngie/detangle-rc: . bin/freebsd-version bin/ls bin/ls/tests bin/sh/tests/parameters cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa cddl/contrib/opensolaris... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2015 00:22:08 -0000 Author: ngie Date: Mon Dec 14 00:22:03 2015 New Revision: 292179 URL: https://svnweb.freebsd.org/changeset/base/292179 Log: MFhead @ r292178 Added: user/ngie/detangle-rc/bin/sh/tests/parameters/positional9.0 - copied unchanged from r292178, head/bin/sh/tests/parameters/positional9.0 user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh - copied unchanged from r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out - copied unchanged from r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out user/ngie/detangle-rc/etc/etc.riscv/ - copied from r292178, head/etc/etc.riscv/ user/ngie/detangle-rc/lib/csu/riscv/ - copied from r292178, head/lib/csu/riscv/ user/ngie/detangle-rc/lib/libc/aarch64/sys/__vdso_gettc.c - copied unchanged from r292178, head/lib/libc/aarch64/sys/__vdso_gettc.c user/ngie/detangle-rc/lib/libc/arm/sys/__vdso_gettc.c - copied unchanged from r292178, head/lib/libc/arm/sys/__vdso_gettc.c user/ngie/detangle-rc/lib/libc/riscv/ - copied from r292178, head/lib/libc/riscv/ user/ngie/detangle-rc/lib/libthr/arch/riscv/ - copied from r292178, head/lib/libthr/arch/riscv/ user/ngie/detangle-rc/lib/msun/riscv/ - copied from r292178, head/lib/msun/riscv/ user/ngie/detangle-rc/share/man/man9/proc_rwmem.9 - copied unchanged from r292178, head/share/man/man9/proc_rwmem.9 user/ngie/detangle-rc/sys/dev/mlx5/eswitch_vacl.h - copied unchanged from r292178, head/sys/dev/mlx5/eswitch_vacl.h user/ngie/detangle-rc/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c - copied unchanged from r292178, head/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c user/ngie/detangle-rc/sys/netinet/in_fib.c - copied unchanged from r292178, head/sys/netinet/in_fib.c user/ngie/detangle-rc/sys/netinet/in_fib.h - copied unchanged from r292178, head/sys/netinet/in_fib.h user/ngie/detangle-rc/sys/netinet6/in6_fib.c - copied unchanged from r292178, head/sys/netinet6/in6_fib.c user/ngie/detangle-rc/sys/netinet6/in6_fib.h - copied unchanged from r292178, head/sys/netinet6/in6_fib.h user/ngie/detangle-rc/sys/x86/include/x86_smp.h - copied unchanged from r292178, head/sys/x86/include/x86_smp.h user/ngie/detangle-rc/sys/x86/include/x86_var.h - copied unchanged from r292178, head/sys/x86/include/x86_var.h Modified: user/ngie/detangle-rc/MAINTAINERS (contents, props changed) user/ngie/detangle-rc/Makefile user/ngie/detangle-rc/Makefile.inc1 user/ngie/detangle-rc/UPDATING user/ngie/detangle-rc/bin/freebsd-version/Makefile user/ngie/detangle-rc/bin/ls/print.c user/ngie/detangle-rc/bin/ls/tests/ls_tests.sh user/ngie/detangle-rc/bin/sh/tests/parameters/Makefile user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out user/ngie/detangle-rc/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/proc/Makefile user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile user/ngie/detangle-rc/contrib/bmake/ChangeLog user/ngie/detangle-rc/contrib/bmake/Makefile user/ngie/detangle-rc/contrib/bmake/boot-strap user/ngie/detangle-rc/contrib/bmake/cond.c user/ngie/detangle-rc/contrib/bmake/config.h.in user/ngie/detangle-rc/contrib/bmake/configure user/ngie/detangle-rc/contrib/bmake/configure.in user/ngie/detangle-rc/contrib/bmake/main.c user/ngie/detangle-rc/contrib/bmake/meta.c user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog user/ngie/detangle-rc/contrib/bmake/mk/host-target.mk user/ngie/detangle-rc/contrib/bmake/mk/init.mk user/ngie/detangle-rc/contrib/bmake/mk/install-mk user/ngie/detangle-rc/contrib/bmake/mk/lib.mk user/ngie/detangle-rc/contrib/bmake/mk/meta.autodep.mk user/ngie/detangle-rc/contrib/bmake/mk/meta.stage.mk user/ngie/detangle-rc/contrib/bmake/mk/meta.subdir.mk user/ngie/detangle-rc/contrib/bmake/mk/meta.sys.mk user/ngie/detangle-rc/contrib/bmake/mk/own.mk user/ngie/detangle-rc/contrib/bmake/mk/sys.mk user/ngie/detangle-rc/contrib/bmake/os.sh user/ngie/detangle-rc/contrib/bmake/parse.c user/ngie/detangle-rc/contrib/bmake/unit-tests/Makefile.in user/ngie/detangle-rc/contrib/bmake/unit-tests/cond2.mk user/ngie/detangle-rc/contrib/bmake/unit-tests/doterror.exp user/ngie/detangle-rc/contrib/bmake/unit-tests/modts.mk user/ngie/detangle-rc/contrib/bmake/var.c user/ngie/detangle-rc/contrib/elftoolchain/addr2line/addr2line.1 user/ngie/detangle-rc/contrib/elftoolchain/addr2line/addr2line.c user/ngie/detangle-rc/contrib/elftoolchain/common/elfdefinitions.h user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/binary.c user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/elfcopy.1 user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/main.c user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/sections.c user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/segments.c user/ngie/detangle-rc/contrib/elftoolchain/libelf/elf_data.c user/ngie/detangle-rc/contrib/elftoolchain/readelf/readelf.c user/ngie/detangle-rc/contrib/ofed/usr.bin/ibaddr/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/ibnetdiscover/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/ibping/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/ibportstate/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/ibroute/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/ibsendtrap/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/ibstat/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/ibsysstat/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/ibtracert/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/opensm/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/osmtest/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/perfquery/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/saquery/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/sminfo/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/smpdump/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/smpquery/Makefile user/ngie/detangle-rc/contrib/ofed/usr.bin/vendstat/Makefile user/ngie/detangle-rc/contrib/top/loadavg.h user/ngie/detangle-rc/contrib/unbound/freebsd-configure.sh user/ngie/detangle-rc/include/resolv.h user/ngie/detangle-rc/kerberos5/lib/libgssapi_krb5/Makefile.depend user/ngie/detangle-rc/kerberos5/lib/libgssapi_ntlm/Makefile.depend user/ngie/detangle-rc/kerberos5/lib/libhdb/Makefile.depend user/ngie/detangle-rc/kerberos5/lib/libheimntlm/Makefile.depend user/ngie/detangle-rc/kerberos5/lib/libkadm5clnt/Makefile.depend user/ngie/detangle-rc/kerberos5/lib/libkadm5srv/Makefile.depend user/ngie/detangle-rc/kerberos5/lib/libkafs5/Makefile.depend user/ngie/detangle-rc/kerberos5/lib/libkdc/Makefile.depend user/ngie/detangle-rc/lib/csu/aarch64/crt1.c user/ngie/detangle-rc/lib/csu/amd64/crt1.c user/ngie/detangle-rc/lib/csu/arm/crt1.c user/ngie/detangle-rc/lib/csu/i386/crt1_c.c user/ngie/detangle-rc/lib/csu/mips/crt1.c user/ngie/detangle-rc/lib/csu/powerpc/crt1.c user/ngie/detangle-rc/lib/csu/powerpc64/crt1.c user/ngie/detangle-rc/lib/csu/sparc64/crt1.c user/ngie/detangle-rc/lib/lib80211/Makefile.depend user/ngie/detangle-rc/lib/libc/aarch64/sys/Makefile.inc user/ngie/detangle-rc/lib/libc/arm/sys/Makefile.inc user/ngie/detangle-rc/lib/libc/gen/exec.3 user/ngie/detangle-rc/lib/libc/gen/getnetgrent.c user/ngie/detangle-rc/lib/libc/net/getaddrinfo.c user/ngie/detangle-rc/lib/libc/regex/grot/Makefile user/ngie/detangle-rc/lib/libc/rpc/svc_vc.c user/ngie/detangle-rc/lib/libc/stdio/open_memstream.c user/ngie/detangle-rc/lib/libc/stdio/open_wmemstream.c user/ngie/detangle-rc/lib/libc/tests/stdio/getdelim_test.c user/ngie/detangle-rc/lib/libc/tests/stdio/printbasic_test.c user/ngie/detangle-rc/lib/libc/tests/stdio/printfloat_test.c user/ngie/detangle-rc/lib/libopenbsd/Makefile user/ngie/detangle-rc/lib/libopenbsd/imsg.c user/ngie/detangle-rc/lib/libpam/modules/pam_krb5/Makefile.depend user/ngie/detangle-rc/lib/libpam/modules/pam_ksu/Makefile.depend user/ngie/detangle-rc/lib/libpam/modules/pam_ssh/Makefile user/ngie/detangle-rc/sbin/devd/devd.cc user/ngie/detangle-rc/sbin/geom/class/multipath/geom_multipath.c user/ngie/detangle-rc/sbin/geom/class/part/gpart.8 user/ngie/detangle-rc/sbin/newfs_msdos/mkfs_msdos.c user/ngie/detangle-rc/sbin/swapon/swapon.c user/ngie/detangle-rc/sbin/sysctl/sysctl.8 user/ngie/detangle-rc/sbin/sysctl/sysctl.c user/ngie/detangle-rc/secure/lib/libssh/Makefile user/ngie/detangle-rc/secure/libexec/sftp-server/Makefile user/ngie/detangle-rc/secure/libexec/ssh-keysign/Makefile user/ngie/detangle-rc/secure/libexec/ssh-pkcs11-helper/Makefile user/ngie/detangle-rc/secure/usr.bin/scp/Makefile user/ngie/detangle-rc/secure/usr.bin/sftp/Makefile user/ngie/detangle-rc/secure/usr.bin/ssh-add/Makefile user/ngie/detangle-rc/secure/usr.bin/ssh-agent/Makefile user/ngie/detangle-rc/secure/usr.bin/ssh-keygen/Makefile user/ngie/detangle-rc/secure/usr.bin/ssh-keyscan/Makefile user/ngie/detangle-rc/secure/usr.bin/ssh/Makefile user/ngie/detangle-rc/secure/usr.sbin/sshd/Makefile user/ngie/detangle-rc/share/examples/etc/make.conf user/ngie/detangle-rc/share/man/man4/ioat.4 user/ngie/detangle-rc/share/man/man4/isp.4 user/ngie/detangle-rc/share/man/man4/mps.4 user/ngie/detangle-rc/share/man/man5/src.conf.5 user/ngie/detangle-rc/share/man/man7/release.7 user/ngie/detangle-rc/share/man/man9/BUS_DESCRIBE_INTR.9 user/ngie/detangle-rc/share/man/man9/Makefile user/ngie/detangle-rc/share/man/man9/g_bio.9 user/ngie/detangle-rc/share/misc/bsd-family-tree user/ngie/detangle-rc/share/mk/bsd.compiler.mk user/ngie/detangle-rc/share/mk/bsd.cpu.mk user/ngie/detangle-rc/share/mk/bsd.dep.mk user/ngie/detangle-rc/share/mk/bsd.endian.mk user/ngie/detangle-rc/share/mk/bsd.lib.mk user/ngie/detangle-rc/share/mk/bsd.libnames.mk user/ngie/detangle-rc/share/mk/bsd.opts.mk user/ngie/detangle-rc/share/mk/bsd.sys.mk user/ngie/detangle-rc/share/mk/local.dirdeps.mk user/ngie/detangle-rc/share/mk/local.meta.sys.mk user/ngie/detangle-rc/share/mk/src.libnames.mk user/ngie/detangle-rc/share/mk/src.opts.mk user/ngie/detangle-rc/share/mk/sys.mk user/ngie/detangle-rc/sys/amd64/amd64/machdep.c user/ngie/detangle-rc/sys/amd64/amd64/pmap.c user/ngie/detangle-rc/sys/amd64/include/md_var.h user/ngie/detangle-rc/sys/amd64/include/smp.h user/ngie/detangle-rc/sys/arm/arm/elf_machdep.c user/ngie/detangle-rc/sys/arm/arm/generic_timer.c user/ngie/detangle-rc/sys/arm/arm/machdep.c user/ngie/detangle-rc/sys/arm/include/md_var.h user/ngie/detangle-rc/sys/arm/include/vdso.h user/ngie/detangle-rc/sys/arm/include/vmparam.h user/ngie/detangle-rc/sys/arm64/arm64/elf_machdep.c user/ngie/detangle-rc/sys/arm64/arm64/gic.c user/ngie/detangle-rc/sys/arm64/arm64/gic.h user/ngie/detangle-rc/sys/arm64/arm64/gic_fdt.c user/ngie/detangle-rc/sys/arm64/arm64/gic_v3_its.c user/ngie/detangle-rc/sys/arm64/arm64/gic_v3_var.h user/ngie/detangle-rc/sys/arm64/arm64/intr_machdep.c user/ngie/detangle-rc/sys/arm64/arm64/machdep.c user/ngie/detangle-rc/sys/arm64/arm64/pic_if.m user/ngie/detangle-rc/sys/arm64/cavium/thunder_pcie.c user/ngie/detangle-rc/sys/arm64/cavium/thunder_pcie_common.c user/ngie/detangle-rc/sys/arm64/cavium/thunder_pcie_pem.c user/ngie/detangle-rc/sys/arm64/conf/GENERIC user/ngie/detangle-rc/sys/arm64/include/intr.h user/ngie/detangle-rc/sys/arm64/include/md_var.h user/ngie/detangle-rc/sys/arm64/include/vdso.h user/ngie/detangle-rc/sys/arm64/include/vmparam.h user/ngie/detangle-rc/sys/boot/common/part.c user/ngie/detangle-rc/sys/boot/userboot/test/Makefile.depend user/ngie/detangle-rc/sys/cam/cam_ccb.h user/ngie/detangle-rc/sys/cam/cam_xpt.c user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c user/ngie/detangle-rc/sys/cddl/dev/dtrace/dtrace_ioctl.c user/ngie/detangle-rc/sys/conf/files user/ngie/detangle-rc/sys/conf/files.arm user/ngie/detangle-rc/sys/conf/files.arm64 user/ngie/detangle-rc/sys/dev/aic/aic_pccard.c user/ngie/detangle-rc/sys/dev/an/if_an_pccard.c user/ngie/detangle-rc/sys/dev/ata/ata-card.c user/ngie/detangle-rc/sys/dev/bwn/if_bwn.c user/ngie/detangle-rc/sys/dev/cmx/cmx_pccard.c user/ngie/detangle-rc/sys/dev/cs/if_cs_pccard.c user/ngie/detangle-rc/sys/dev/ed/if_ed_isa.c user/ngie/detangle-rc/sys/dev/ed/if_ed_pccard.c user/ngie/detangle-rc/sys/dev/ed/if_ed_pci.c user/ngie/detangle-rc/sys/dev/ep/if_ep_pccard.c user/ngie/detangle-rc/sys/dev/ex/if_ex_pccard.c user/ngie/detangle-rc/sys/dev/fdc/fdc_pccard.c user/ngie/detangle-rc/sys/dev/fdt/simplebus.c user/ngie/detangle-rc/sys/dev/fe/if_fe_pccard.c user/ngie/detangle-rc/sys/dev/hwpmc/hwpmc_core.c user/ngie/detangle-rc/sys/dev/hwpmc/hwpmc_logging.c user/ngie/detangle-rc/sys/dev/ioat/ioat.c user/ngie/detangle-rc/sys/dev/ioat/ioat.h user/ngie/detangle-rc/sys/dev/ioat/ioat_internal.h user/ngie/detangle-rc/sys/dev/ioat/ioat_test.c user/ngie/detangle-rc/sys/dev/ioat/ioat_test.h user/ngie/detangle-rc/sys/dev/iscsi/iscsi.c user/ngie/detangle-rc/sys/dev/isp/isp.c user/ngie/detangle-rc/sys/dev/isp/isp_pci.c user/ngie/detangle-rc/sys/dev/md/md.c user/ngie/detangle-rc/sys/dev/mlx5/device.h user/ngie/detangle-rc/sys/dev/mlx5/driver.h user/ngie/detangle-rc/sys/dev/mlx5/mlx5_core/mlx5_eq.c user/ngie/detangle-rc/sys/dev/mlx5/mlx5_core/mlx5_vport.c user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/en.h user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c user/ngie/detangle-rc/sys/dev/mlx5/vport.h user/ngie/detangle-rc/sys/dev/ncv/ncr53c500_pccard.c user/ngie/detangle-rc/sys/dev/nsp/nsp_pccard.c user/ngie/detangle-rc/sys/dev/nvd/nvd.c user/ngie/detangle-rc/sys/dev/nvme/nvme.h user/ngie/detangle-rc/sys/dev/nvme/nvme_ns.c user/ngie/detangle-rc/sys/dev/nvme/nvme_sysctl.c user/ngie/detangle-rc/sys/dev/ofw/ofw_bus_subr.c user/ngie/detangle-rc/sys/dev/ofw/ofw_bus_subr.h user/ngie/detangle-rc/sys/dev/ofw/ofw_iicbus.c user/ngie/detangle-rc/sys/dev/otus/if_otus.c user/ngie/detangle-rc/sys/dev/pccard/pccardvar.h user/ngie/detangle-rc/sys/dev/ral/rt2560.c user/ngie/detangle-rc/sys/dev/ral/rt2661.c user/ngie/detangle-rc/sys/dev/ral/rt2860.c user/ngie/detangle-rc/sys/dev/sfxge/common/efsys.h user/ngie/detangle-rc/sys/dev/sfxge/common/efx.h user/ngie/detangle-rc/sys/dev/sfxge/common/efx_check.h user/ngie/detangle-rc/sys/dev/sfxge/common/efx_crc32.c user/ngie/detangle-rc/sys/dev/sfxge/common/efx_impl.h user/ngie/detangle-rc/sys/dev/sfxge/common/efx_mcdi.c user/ngie/detangle-rc/sys/dev/sfxge/common/efx_mcdi.h user/ngie/detangle-rc/sys/dev/sfxge/common/efx_nvram.c user/ngie/detangle-rc/sys/dev/sfxge/common/efx_tx.c user/ngie/detangle-rc/sys/dev/sfxge/common/efx_types.h user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_ev.c user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_impl.h user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_mcdi.c user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_nic.c user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_nvram.c user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_tx.c user/ngie/detangle-rc/sys/dev/sfxge/common/siena_impl.h user/ngie/detangle-rc/sys/dev/sfxge/common/siena_mcdi.c user/ngie/detangle-rc/sys/dev/sfxge/common/siena_nic.c user/ngie/detangle-rc/sys/dev/sfxge/sfxge.c user/ngie/detangle-rc/sys/dev/sfxge/sfxge_tx.c user/ngie/detangle-rc/sys/dev/sn/if_sn_pccard.c user/ngie/detangle-rc/sys/dev/snc/if_snc_pccard.c user/ngie/detangle-rc/sys/dev/sound/usb/uaudio.c user/ngie/detangle-rc/sys/dev/stg/tmc18c30_pccard.c user/ngie/detangle-rc/sys/dev/uart/uart_bus_pccard.c user/ngie/detangle-rc/sys/dev/usb/input/atp.c user/ngie/detangle-rc/sys/dev/usb/input/uep.c user/ngie/detangle-rc/sys/dev/usb/input/uhid.c user/ngie/detangle-rc/sys/dev/usb/input/ukbd.c user/ngie/detangle-rc/sys/dev/usb/input/ums.c user/ngie/detangle-rc/sys/dev/usb/input/wsp.c user/ngie/detangle-rc/sys/dev/usb/misc/udbp.c user/ngie/detangle-rc/sys/dev/usb/misc/ufm.c user/ngie/detangle-rc/sys/dev/usb/misc/ugold.c user/ngie/detangle-rc/sys/dev/usb/misc/uled.c user/ngie/detangle-rc/sys/dev/usb/net/if_aue.c user/ngie/detangle-rc/sys/dev/usb/net/if_axe.c user/ngie/detangle-rc/sys/dev/usb/net/if_axge.c user/ngie/detangle-rc/sys/dev/usb/net/if_cdce.c user/ngie/detangle-rc/sys/dev/usb/net/if_cue.c user/ngie/detangle-rc/sys/dev/usb/net/if_ipheth.c user/ngie/detangle-rc/sys/dev/usb/net/if_kue.c user/ngie/detangle-rc/sys/dev/usb/net/if_mos.c user/ngie/detangle-rc/sys/dev/usb/net/if_rue.c user/ngie/detangle-rc/sys/dev/usb/net/if_smsc.c user/ngie/detangle-rc/sys/dev/usb/net/if_udav.c user/ngie/detangle-rc/sys/dev/usb/net/if_urndis.c user/ngie/detangle-rc/sys/dev/usb/net/if_usie.c user/ngie/detangle-rc/sys/dev/usb/net/uhso.c user/ngie/detangle-rc/sys/dev/usb/serial/u3g.c user/ngie/detangle-rc/sys/dev/usb/serial/uark.c user/ngie/detangle-rc/sys/dev/usb/serial/ubsa.c user/ngie/detangle-rc/sys/dev/usb/serial/uchcom.c user/ngie/detangle-rc/sys/dev/usb/serial/ucycom.c user/ngie/detangle-rc/sys/dev/usb/serial/ufoma.c user/ngie/detangle-rc/sys/dev/usb/serial/uftdi.c user/ngie/detangle-rc/sys/dev/usb/serial/ugensa.c user/ngie/detangle-rc/sys/dev/usb/serial/uipaq.c user/ngie/detangle-rc/sys/dev/usb/serial/ulpt.c user/ngie/detangle-rc/sys/dev/usb/serial/umcs.c user/ngie/detangle-rc/sys/dev/usb/serial/umct.c user/ngie/detangle-rc/sys/dev/usb/serial/umodem.c user/ngie/detangle-rc/sys/dev/usb/serial/umoscom.c user/ngie/detangle-rc/sys/dev/usb/serial/uplcom.c user/ngie/detangle-rc/sys/dev/usb/serial/uslcom.c user/ngie/detangle-rc/sys/dev/usb/serial/uvisor.c user/ngie/detangle-rc/sys/dev/usb/serial/uvscom.c user/ngie/detangle-rc/sys/dev/usb/storage/umass.c user/ngie/detangle-rc/sys/dev/usb/storage/urio.c user/ngie/detangle-rc/sys/dev/usb/usb_hub.c user/ngie/detangle-rc/sys/dev/usb/usbdi.h user/ngie/detangle-rc/sys/dev/usb/wlan/if_rsu.c user/ngie/detangle-rc/sys/dev/usb/wlan/if_rum.c user/ngie/detangle-rc/sys/dev/usb/wlan/if_run.c user/ngie/detangle-rc/sys/dev/usb/wlan/if_uath.c user/ngie/detangle-rc/sys/dev/usb/wlan/if_upgt.c user/ngie/detangle-rc/sys/dev/usb/wlan/if_ural.c user/ngie/detangle-rc/sys/dev/usb/wlan/if_urtw.c user/ngie/detangle-rc/sys/dev/usb/wlan/if_urtwn.c user/ngie/detangle-rc/sys/dev/usb/wlan/if_urtwnreg.h user/ngie/detangle-rc/sys/dev/usb/wlan/if_urtwnvar.h user/ngie/detangle-rc/sys/dev/usb/wlan/if_zyd.c user/ngie/detangle-rc/sys/dev/wi/if_wi_pccard.c user/ngie/detangle-rc/sys/dev/wpi/if_wpi.c user/ngie/detangle-rc/sys/dev/wpi/if_wpi_debug.h user/ngie/detangle-rc/sys/dev/wtap/if_wtap_module.c user/ngie/detangle-rc/sys/dev/wtap/if_wtapvar.h user/ngie/detangle-rc/sys/dev/wtap/plugins/visibility.c user/ngie/detangle-rc/sys/dev/xe/if_xe_pccard.c user/ngie/detangle-rc/sys/geom/part/g_part_gpt.c user/ngie/detangle-rc/sys/i386/i386/mp_machdep.c user/ngie/detangle-rc/sys/i386/i386/pmap.c user/ngie/detangle-rc/sys/i386/i386/sys_machdep.c user/ngie/detangle-rc/sys/i386/include/md_var.h user/ngie/detangle-rc/sys/i386/include/smp.h user/ngie/detangle-rc/sys/kern/imgact_elf.c user/ngie/detangle-rc/sys/kern/kern_linker.c user/ngie/detangle-rc/sys/kern/kern_malloc.c user/ngie/detangle-rc/sys/kern/kern_proc.c user/ngie/detangle-rc/sys/kern/kern_racct.c user/ngie/detangle-rc/sys/kern/kern_rctl.c user/ngie/detangle-rc/sys/kern/sys_process.c user/ngie/detangle-rc/sys/kern/vfs_bio.c user/ngie/detangle-rc/sys/mips/include/cpuregs.h user/ngie/detangle-rc/sys/mips/mips/pm_machdep.c user/ngie/detangle-rc/sys/modules/ahci/Makefile user/ngie/detangle-rc/sys/modules/cam/Makefile user/ngie/detangle-rc/sys/modules/mlx5/Makefile user/ngie/detangle-rc/sys/modules/mlx5en/Makefile user/ngie/detangle-rc/sys/net/if_llatbl.c user/ngie/detangle-rc/sys/net/if_llatbl.h user/ngie/detangle-rc/sys/net/route.c user/ngie/detangle-rc/sys/net/route.h user/ngie/detangle-rc/sys/net80211/ieee80211_phy.h user/ngie/detangle-rc/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c user/ngie/detangle-rc/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c user/ngie/detangle-rc/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c user/ngie/detangle-rc/sys/netinet/cc/cc_cubic.c user/ngie/detangle-rc/sys/netinet/cc/cc_newreno.c user/ngie/detangle-rc/sys/netinet/if_ether.c user/ngie/detangle-rc/sys/netinet/in_gif.c user/ngie/detangle-rc/sys/netinet/in_mcast.c user/ngie/detangle-rc/sys/netinet/ip_icmp.c user/ngie/detangle-rc/sys/netinet/ip_input.c user/ngie/detangle-rc/sys/netinet/ip_options.c user/ngie/detangle-rc/sys/netinet/ip_var.h user/ngie/detangle-rc/sys/netinet/sctp_input.c user/ngie/detangle-rc/sys/netinet/sctp_output.c user/ngie/detangle-rc/sys/netinet/sctp_pcb.c user/ngie/detangle-rc/sys/netinet/sctp_pcb.h user/ngie/detangle-rc/sys/netinet/sctp_usrreq.c user/ngie/detangle-rc/sys/netinet/sctputil.c user/ngie/detangle-rc/sys/netinet/sctputil.h user/ngie/detangle-rc/sys/netinet/tcp_hostcache.c user/ngie/detangle-rc/sys/netinet/tcp_hostcache.h user/ngie/detangle-rc/sys/netinet/tcp_input.c user/ngie/detangle-rc/sys/netinet/tcp_sack.c user/ngie/detangle-rc/sys/netinet/tcp_var.h user/ngie/detangle-rc/sys/netinet6/icmp6.c user/ngie/detangle-rc/sys/netinet6/in6.c user/ngie/detangle-rc/sys/netinet6/in6_gif.c user/ngie/detangle-rc/sys/netinet6/in6_mcast.c user/ngie/detangle-rc/sys/netinet6/in6_src.c user/ngie/detangle-rc/sys/netinet6/nd6.c user/ngie/detangle-rc/sys/netinet6/nd6_nbr.c user/ngie/detangle-rc/sys/netinet6/scope6.c user/ngie/detangle-rc/sys/netinet6/scope6_var.h user/ngie/detangle-rc/sys/netinet6/sctp6_usrreq.c user/ngie/detangle-rc/sys/netpfil/ipfw/ip_fw2.c user/ngie/detangle-rc/sys/powerpc/booke/booke_machdep.c user/ngie/detangle-rc/sys/powerpc/booke/trap_subr.S user/ngie/detangle-rc/sys/powerpc/include/trap.h user/ngie/detangle-rc/sys/powerpc/powerpc/trap.c user/ngie/detangle-rc/sys/sys/elf_common.h user/ngie/detangle-rc/sys/sys/module.h user/ngie/detangle-rc/sys/sys/ptrace.h user/ngie/detangle-rc/sys/ufs/ufs/ufs_vnops.c user/ngie/detangle-rc/sys/vm/uma_core.c user/ngie/detangle-rc/sys/vm/vm_fault.c user/ngie/detangle-rc/sys/vm/vm_page.c user/ngie/detangle-rc/targets/pseudo/gcc/Makefile.depend user/ngie/detangle-rc/targets/pseudo/universe/Makefile user/ngie/detangle-rc/tools/bsdbox/Makefile.base user/ngie/detangle-rc/tools/regression/mac/mac_portacl/misc.sh user/ngie/detangle-rc/tools/regression/tls/ttls2/ttls2.c user/ngie/detangle-rc/tools/regression/tls/ttls4/ttls4.c user/ngie/detangle-rc/tools/tools/ioat/ioatcontrol.8 user/ngie/detangle-rc/tools/tools/ioat/ioatcontrol.c user/ngie/detangle-rc/tools/tools/nanobsd/defaults.sh user/ngie/detangle-rc/tools/tools/nanobsd/embedded/README user/ngie/detangle-rc/tools/tools/nanobsd/embedded/beaglebone.cfg user/ngie/detangle-rc/tools/tools/nanobsd/embedded/common user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-amd64.cfg user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-i386.cfg user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-mips.cfg user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-mips64.cfg user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-powerpc.cfg user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-sparc64.cfg user/ngie/detangle-rc/tools/tools/nanobsd/embedded/rpi.cfg user/ngie/detangle-rc/tools/tools/nanobsd/embedded/rpi2.cfg user/ngie/detangle-rc/tools/tools/nanobsd/embedded/sam9260ek.cfg user/ngie/detangle-rc/tools/tools/nanobsd/embedded/sam9g20ek.cfg user/ngie/detangle-rc/tools/tools/nanobsd/mtree-dedup.awk user/ngie/detangle-rc/tools/tools/nanobsd/nanobsd.sh user/ngie/detangle-rc/usr.bin/bmake/Makefile user/ngie/detangle-rc/usr.bin/bmake/config.h user/ngie/detangle-rc/usr.bin/bmake/unit-tests/Makefile user/ngie/detangle-rc/usr.bin/clang/lldb/Makefile user/ngie/detangle-rc/usr.bin/clang/lldb/Makefile.depend user/ngie/detangle-rc/usr.bin/mkimg/mbr.c user/ngie/detangle-rc/usr.bin/mkimg/scheme.c user/ngie/detangle-rc/usr.bin/mkimg/scheme.h user/ngie/detangle-rc/usr.bin/unzip/unzip.1 user/ngie/detangle-rc/usr.bin/unzip/unzip.c user/ngie/detangle-rc/usr.bin/xo/tests/Makefile user/ngie/detangle-rc/usr.sbin/crunch/crunchide/exec_elf32.c user/ngie/detangle-rc/usr.sbin/iostat/iostat.c user/ngie/detangle-rc/usr.sbin/kldxref/kldxref.c user/ngie/detangle-rc/usr.sbin/ofwdump/Makefile.depend user/ngie/detangle-rc/usr.sbin/pmcstudy/pmcstudy.8 user/ngie/detangle-rc/usr.sbin/pmcstudy/pmcstudy.c user/ngie/detangle-rc/usr.sbin/sesutil/Makefile user/ngie/detangle-rc/usr.sbin/sesutil/eltsub.c user/ngie/detangle-rc/usr.sbin/sesutil/eltsub.h user/ngie/detangle-rc/usr.sbin/sesutil/sesutil.c Directory Properties: user/ngie/detangle-rc/ (props changed) user/ngie/detangle-rc/cddl/ (props changed) user/ngie/detangle-rc/cddl/contrib/opensolaris/ (props changed) user/ngie/detangle-rc/contrib/bmake/ (props changed) user/ngie/detangle-rc/contrib/elftoolchain/ (props changed) user/ngie/detangle-rc/contrib/top/ (props changed) user/ngie/detangle-rc/contrib/unbound/ (props changed) user/ngie/detangle-rc/include/ (props changed) user/ngie/detangle-rc/lib/libc/ (props changed) user/ngie/detangle-rc/sbin/ (props changed) user/ngie/detangle-rc/share/ (props changed) user/ngie/detangle-rc/share/man/man4/ (props changed) user/ngie/detangle-rc/sys/ (props changed) user/ngie/detangle-rc/sys/boot/ (props changed) user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/ (props changed) user/ngie/detangle-rc/sys/conf/ (props changed) user/ngie/detangle-rc/targets/ (props changed) user/ngie/detangle-rc/usr.bin/mkimg/ (props changed) Modified: user/ngie/detangle-rc/MAINTAINERS ============================================================================== --- user/ngie/detangle-rc/MAINTAINERS Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/MAINTAINERS Mon Dec 14 00:22:03 2015 (r292179) @@ -26,54 +26,62 @@ sub-system. subsystem login notes ----------------------------- -opencrypto jmg Pre-commit review requested. Documentation Required. -kqueue jmg Pre-commit review requested. Documentation Required. -share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. +atf freebsd-testing,jmmv,ngie Pre-commit review requested. ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -openssl benl,jkim Pre-commit review requested. -release/release.sh gjb,re Pre-commit review and regression tests - requested. -sh(1) jilles Pre-commit review requested. This also applies - to kill(1), printf(1) and test(1) which are - compiled in as builtins. -isci(4) jimharris Pre-commit review requested. -nvme(4) jimharris Pre-commit review requested. -nvd(4) jimharris Pre-commit review requested. -nvmecontrol(8) jimharris Pre-commit review requested. -libfetch des Pre-commit review requested. -fetch des Pre-commit review requested. -libpam des Pre-commit review requested. -openssh des Pre-commit review requested. -pseudofs des Pre-commit review requested. -procfs des Pre-commit review requested. -linprocfs des Pre-commit review requested. +callout_*(9) rrs Pre-commit review requested -- becareful its tricksy code :o. contrib/compiler-rt dim Pre-commit review preferred. contrib/libc++ dim Pre-commit review preferred. contrib/libcxxrt dim Pre-commit review preferred. contrib/llvm dim Pre-commit review preferred. contrib/llvm/tools/lldb emaste Pre-commit review preferred. -atf freebsd-testing,jmmv,ngie Pre-commit review requested. contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. contrib/pjdfstest freebsd-testing,ngie,pjd Pre-commit review requested. +dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. +etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. +fetch des Pre-commit review requested. +isci(4) jimharris Pre-commit review requested. +iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +kqueue jmg Pre-commit review requested. Documentation Required. +libfetch des Pre-commit review requested. +libpam des Pre-commit review requested. +linprocfs des Pre-commit review requested. +lpr gad Pre-commit review requested, particularly for + lpd/recvjob.c and lpd/printjob.c. +nanobsd imp Pre-commit phabricator review requested. +net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +nis(8), yp(8) araujo Pre-commit review requested. +nvd(4) jimharris Pre-commit review requested. +nvme(4) jimharris Pre-commit review requested. +nvmecontrol(8) jimharris Pre-commit review requested. +opencrypto jmg Pre-commit review requested. Documentation Required. +openssh des Pre-commit review requested. +openssl benl,jkim Pre-commit review requested. +otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +pmcstudy(8) rrs Pre-commit review requested. +procfs des Pre-commit review requested. +pseudofs des Pre-commit review requested. +release/release.sh gjb,re Pre-commit review and regression tests + requested. +sctp rrs,tuexen Pre-commit review requested (changes need to be backported to github). +sendmail gshapiro Pre-commit review requested. +sh(1) jilles Pre-commit review requested. This also applies + to kill(1), printf(1) and test(1) which are + compiled in as builtins. +share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. share/mk/*.test.mk freebsd-testing,ngie (same list as share/mk too) Pre-commit review requested. -tests freebsd-testing,ngie Pre-commit review requested. -sys/dev/usb hselasky If in doubt, ask. -sys/dev/sound/usb hselasky If in doubt, ask. sys/compat/linuxkpi hselasky If in doubt, ask. sys/dev/e1000 erj Pre-commit phabricator review requested. sys/dev/ixgbe erj Pre-commit phabricator review requested. sys/dev/ixl erj Pre-commit phabricator review requested. +sys/dev/sound/usb hselasky If in doubt, ask. +sys/dev/usb hselasky If in doubt, ask. sys/netinet/ip_carp.c glebius Pre-commit review recommended. sys/netpfil/pf kp,glebius Pre-commit review recommended. +tests freebsd-testing,ngie Pre-commit review requested. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. -lpr gad Pre-commit review requested, particularly for - lpd/recvjob.c and lpd/printjob.c. -nis(8), yp(8) araujo Pre-commit review requested. +vmm(4) neel,grehan Pre-commit review requested. ---- OLD ---- libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. @@ -99,11 +107,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -sendmail gshapiro Pre-commit review requested. -etc/mail gshapiro Pre-commit review requested. - Keep in sync with -STABLE. -etc/sendmail gshapiro Pre-commit review requested. - Keep in sync with -STABLE. nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. @@ -152,5 +155,4 @@ sbin/routed bms Pre-commit review; notif cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. -nanobsd imp Pre-commit review requested for coordination. -vmm(4) neel,grehan Pre-commit review requested. + Modified: user/ngie/detangle-rc/Makefile ============================================================================== --- user/ngie/detangle-rc/Makefile Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/Makefile Mon Dec 14 00:22:03 2015 (r292179) @@ -180,7 +180,7 @@ _MAKE= PATH=${PATH} ${SUB_MAKE} -f Makef _TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} -_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/} +_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/} .endif .if defined(TARGET) && !defined(_TARGET) _TARGET=${TARGET} Modified: user/ngie/detangle-rc/Makefile.inc1 ============================================================================== --- user/ngie/detangle-rc/Makefile.inc1 Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/Makefile.inc1 Mon Dec 14 00:22:03 2015 (r292179) @@ -163,7 +163,7 @@ OSRELDATE= 0 .endif # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION. -.if !defined(VERSION) +.if !defined(VERSION) && !make(showconfig) REVISION!= ${MAKE} -C ${SRCDIR}/release -V REVISION BRANCH!= ${MAKE} -C ${SRCDIR}/release -V BRANCH SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ @@ -172,7 +172,11 @@ VERSION= FreeBSD ${REVISION}-${BRANCH:C/ .export VERSION .endif -KNOWN_ARCHES?= aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm \ + i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips \ + mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc \ + riscv64/riscv sparc64 + .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -195,11 +199,14 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE} .else _TARGET_CPUTYPE=dummy .endif +# Skip for showconfig as it is just wasted time and may invoke auto.obj.mk. +.if !make(showconfig) _CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \ -f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE .if ${_CPUTYPE} != ${_TARGET_CPUTYPE} .error CPUTYPE global should be set with ?=. .endif +.endif .if make(buildworld) BUILD_ARCH!= uname -p .if ${MACHINE_ARCH} != ${BUILD_ARCH} @@ -666,7 +673,7 @@ everything: @echo "--------------------------------------------------------------" @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; _PARALLEL_SUBUDIR_OK=1 ${WMAKE} all + ${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all .if defined(LIB32TMP) build32: .PHONY @echo @@ -2008,14 +2015,14 @@ _prebuild_libs: ${_prebuild_libs:S/$/__L _generic_libs: ${_generic_libs:S/$/__L/} # Enable SUBDIR_PARALLEL when not calling 'make all', unless called from -# 'everything' with _PARALLEL_SUBUDIR_OK set. This is because it is unlikely +# 'everything' with _PARALLEL_SUBDIR_OK set. This is because it is unlikely # that running 'make all' from the top-level, especially with a SUBDIR_OVERRIDE # or LOCAL_DIRS set, will have a reliable build if SUBDIRs are built in # parallel. This is safe for the world stage of buildworld though since it has # already built libraries in a proper order and installed includes into # WORLDTMP. Special handling is done for SUBDIR ordering for 'install*' to # avoid trashing a system if it crashes mid-install. -.if !make(all) || defined(_PARALLEL_SUBUDIR_OK) +.if !make(all) || defined(_PARALLEL_SUBDIR_OK) SUBDIR_PARALLEL= .endif Modified: user/ngie/detangle-rc/UPDATING ============================================================================== --- user/ngie/detangle-rc/UPDATING Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/UPDATING Mon Dec 14 00:22:03 2015 (r292179) @@ -31,6 +31,21 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20151211: + The code to start recording plug and play data into the modules has + been committed. While the old tools will properly build a new kernel, + a number of warnings about "unknown metadata record 4" will be produced + for an older kldxref. To avoid such warnings, make sure to rebuild + the kernel toolchain (or world). Make sure that you have r292078 or + later when trying to build 292077 or later before rebuilding. + +20151207: + Debug data files are now built by default with 'make buildworld' and + installed with 'make installworld'. This facilitates debugging but + requires more disk space both during the build and for the installed + world. Debug files may be disabled by setting WITHOUT_DEBUG_FILES=yes + in src.conf(5). + 20151130: r291527 changed the internal interface between the nfsd.ko and nfscommon.ko modules. As such, they must both be upgraded to-gether. Modified: user/ngie/detangle-rc/bin/freebsd-version/Makefile ============================================================================== --- user/ngie/detangle-rc/bin/freebsd-version/Makefile Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/bin/freebsd-version/Makefile Mon Dec 14 00:22:03 2015 (r292179) @@ -2,7 +2,7 @@ SCRIPTS = freebsd-version MAN = freebsd-version.1 -CLEANFILES = freebsd-version.sh +CLEANFILES = freebsd-version freebsd-version.sh NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS} Modified: user/ngie/detangle-rc/bin/ls/print.c ============================================================================== --- user/ngie/detangle-rc/bin/ls/print.c Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/bin/ls/print.c Mon Dec 14 00:22:03 2015 (r292179) @@ -47,12 +47,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include #include #include +#include #ifdef COLORLS #include #include @@ -105,6 +107,9 @@ static struct { } colors[C_NUMCOLORS]; #endif +static size_t padding_for_month[12]; +static size_t month_max_size = 0; + void printscol(const DISPLAY *dp) { @@ -138,6 +143,70 @@ printname(const char *field, const char return rc; } +static const char * +get_abmon(int mon) +{ + + switch (mon) { + case 0: return (nl_langinfo(ABMON_1)); + case 1: return (nl_langinfo(ABMON_2)); + case 2: return (nl_langinfo(ABMON_3)); + case 3: return (nl_langinfo(ABMON_4)); + case 4: return (nl_langinfo(ABMON_5)); + case 5: return (nl_langinfo(ABMON_6)); + case 6: return (nl_langinfo(ABMON_7)); + case 7: return (nl_langinfo(ABMON_8)); + case 8: return (nl_langinfo(ABMON_9)); + case 9: return (nl_langinfo(ABMON_10)); + case 10: return (nl_langinfo(ABMON_11)); + case 11: return (nl_langinfo(ABMON_12)); + } + + /* should never happen */ + abort(); +} + +static size_t +mbswidth(const char *month) +{ + wchar_t wc; + size_t width, donelen, clen, w; + + width = donelen = 0; + while ((clen = mbrtowc(&wc, month + donelen, MB_LEN_MAX, NULL)) != 0) { + if (clen == (size_t)-1 || clen == (size_t)-2) + return (-1); + donelen += clen; + if ((w = wcwidth(wc)) == (size_t)-1) + return (-1); + width += w; + } + + return (width); +} + +static void +compute_abbreviated_month_size(void) +{ + int i; + size_t width; + size_t months_width[12]; + + for (i = 0; i < 12; i++) { + width = mbswidth(get_abmon(i)); + if (width == (size_t)-1) { + month_max_size = -1; + return; + } + months_width[i] = width; + if (width > month_max_size) + month_max_size = width; + } + + for (i = 0; i < 12; i++) + padding_for_month[i] = month_max_size - months_width[i]; +} + /* * print name in current style */ @@ -425,6 +494,31 @@ printdev(size_t width, dev_t dev) xo_emit("{:device/%#*jx} ", (u_int)width, (uintmax_t)dev); } +static size_t +ls_strftime(char *str, size_t len, const char *fmt, const struct tm *tm) +{ + char *posb, nfmt[BUFSIZ]; + const char *format = fmt; + size_t ret; + + if ((posb = strstr(fmt, "%b")) != NULL) { + if (month_max_size == 0) { + compute_abbreviated_month_size(); + } + if (month_max_size > 0) { + snprintf(nfmt, sizeof(nfmt), "%.*s%s%*s%s", + (int)(posb - fmt), fmt, + get_abmon(tm->tm_mon), + (int)padding_for_month[tm->tm_mon], + "", + posb + 2); + format = nfmt; + } + } + ret = strftime(str, len, format, tm); + return (ret); +} + static void printtime(const char *field, time_t ftime) { @@ -451,7 +545,7 @@ printtime(const char *field, time_t ftim else /* mmm dd yyyy || dd mmm yyyy */ format = d_first ? "%e %b %Y" : "%b %e %Y"; - strftime(longstring, sizeof(longstring), format, localtime(&ftime)); + ls_strftime(longstring, sizeof(longstring), format, localtime(&ftime)); snprintf(fmt, sizeof(fmt), "{d:%s/%%hs} ", field); xo_attr("value", "%ld", (long) ftime); Modified: user/ngie/detangle-rc/bin/ls/tests/ls_tests.sh ============================================================================== --- user/ngie/detangle-rc/bin/ls/tests/ls_tests.sh Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/bin/ls/tests/ls_tests.sh Mon Dec 14 00:22:03 2015 (r292179) @@ -170,8 +170,6 @@ B_flag_head() B_flag_body() { - atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136" - atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")" atf_check -e empty -o match:'y\\013z' -s exit:0 ls -B } @@ -467,8 +465,6 @@ b_flag_head() b_flag_body() { - atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136" - atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")" atf_check -e empty -o match:'y\\vz' -s exit:0 ls -b } @@ -747,8 +743,6 @@ q_flag_and_w_flag_head() q_flag_and_w_flag_body() { - atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136" - create_test_dir test_file="$(printf "y\01z")" Modified: user/ngie/detangle-rc/bin/sh/tests/parameters/Makefile ============================================================================== --- user/ngie/detangle-rc/bin/sh/tests/parameters/Makefile Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/bin/sh/tests/parameters/Makefile Mon Dec 14 00:22:03 2015 (r292179) @@ -21,6 +21,7 @@ FILES+= positional5.0 FILES+= positional6.0 FILES+= positional7.0 FILES+= positional8.0 +FILES+= positional9.0 FILES+= pwd1.0 FILES+= pwd2.0 Copied: user/ngie/detangle-rc/bin/sh/tests/parameters/positional9.0 (from r292178, head/bin/sh/tests/parameters/positional9.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/detangle-rc/bin/sh/tests/parameters/positional9.0 Mon Dec 14 00:22:03 2015 (r292179, copy of r292178, head/bin/sh/tests/parameters/positional9.0) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Although POSIX leaves the result of expanding ${#@} and ${#*} unspecified, +# make sure it is at least numeric. + +set -- bb cc ddd +set -f +lengths=${#*}${#@}"${#*}${#@}"$(echo ${#*}${#@}"${#*}${#@}") +IFS= +lengths=$lengths${#*}${#@}"${#*}${#@}"$(echo ${#*}${#@}"${#*}${#@}") +case $lengths in +*[!0-9]*) + printf 'bad: %s\n' "$lengths" + exit 3 ;; +????????????????*) ;; +*) + printf 'too short: %s\n' "$lengths" + exit 3 ;; +esac Modified: user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out ============================================================================== --- user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out Mon Dec 14 00:22:03 2015 (r292179) @@ -1,2 +1,3 @@ Sun, 25 Jan 2004 13:00:00 PST 2004 Jan 25 13:00:00 + Copied: user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh (from r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh Mon Dec 14 00:22:03 2015 (r292179, copy of r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh) @@ -0,0 +1,99 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2015, Joyent, Inc. All rights reserved. +# + +# +# This test assures that we can have the same provider name across multiple +# probe definitions, and that the result will be the union of those +# definitions. In particular, libusdt depends on this when (for example) +# node modules that create a provider are loaded multiple times due to +# being included by different modules. +# + +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 +DIR=/var/tmp/dtest.$$ + +mkdir $DIR +cd $DIR + +cat > test.c < + +void +main() +{ +EOF + +objs= + +for oogle in bagnoogle stalloogle cockoogle; do + cat > $oogle.c < + +void +$oogle() +{ + DTRACE_PROBE(doogle, $oogle); +} +EOF + + cat > $oogle.d <> test.c +done + +echo "}" >> test.c + +cc -o test test.c $objs + +if [ $? -ne 0 ]; then + print -u2 "failed to compile test.c" + exit 1 +fi + +$dtrace -n 'doogle$target:::{@[probename] = count()}' \ + -n 'END{printa("%-10s %@d\n", @)}' -x quiet -x aggsortkey -Zc ./test + +if [ $? -ne 0 ]; then + print -u2 "failed to execute test" + exit 1 +fi + +cd / +rm -rf $DIR +exit 0 Copied: user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out (from r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out Mon Dec 14 00:22:03 2015 (r292179, copy of r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out) @@ -0,0 +1,4 @@ +bagnoogle 1 +cockoogle 1 +stalloogle 1 + Modified: user/ngie/detangle-rc/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c ============================================================================== --- user/ngie/detangle-rc/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Mon Dec 14 00:22:03 2015 (r292179) @@ -571,12 +571,6 @@ dt_pid_usdt_mapping(void *data, const pr prsyminfo_t sip; dof_helper_t dh; GElf_Half e_type; -#ifdef __FreeBSD__ - dof_hdr_t hdr; - size_t sz; - uint64_t dofmax; - void *dof; -#endif const char *mname; const char *syms[] = { "___SUNW_dof", "__SUNW_dof" }; int i, fd = -1; @@ -606,61 +600,25 @@ dt_pid_usdt_mapping(void *data, const pr continue; } -#ifdef __FreeBSD__ + dh.dofhp_dof = sym.st_value; dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; - if (Pread(P, &hdr, sizeof (hdr), sym.st_value) != - sizeof (hdr)) { - dt_dprintf("read of DOF header failed\n"); - continue; - } - - sz = sizeof(dofmax); - if (sysctlbyname("kern.dtrace.dof_maxsize", &dofmax, &sz, - NULL, 0) != 0) { - dt_dprintf("failed to read dof_maxsize: %s\n", - strerror(errno)); - continue; - } - if (dofmax < hdr.dofh_loadsz) { - dt_dprintf("DOF load size exceeds maximum\n"); - continue; - } - - if ((dof = malloc(hdr.dofh_loadsz)) == NULL) - return (-1); - - if (Pread(P, dof, hdr.dofh_loadsz, sym.st_value) != - hdr.dofh_loadsz) { - free(dof); - dt_dprintf("read of DOF section failed\n"); - continue; - } - - dh.dofhp_dof = (uintptr_t)dof; - dh.dofhp_pid = proc_getpid(P); dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), sip.prs_lmid, mname); +#ifdef __FreeBSD__ + dh.dofhp_pid = proc_getpid(P); + if (fd == -1 && (fd = open("/dev/dtrace/helper", O_RDWR, 0)) < 0) { dt_dprintf("open of helper device failed: %s\n", strerror(errno)); - free(dof); return (-1); /* errno is set for us */ } if (ioctl(fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0) dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod); - - free(dof); #else - dh.dofhp_dof = sym.st_value; - dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; - - dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), - sip.prs_lmid, mname); - if (fd == -1 && (fd = pr_open(P, "/dev/dtrace/helper", O_RDWR, 0)) < 0) { dt_dprintf("pr_open of helper device failed: %s\n", Modified: user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/proc/Makefile ============================================================================== --- user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Mon Dec 14 00:22:03 2015 (r292179) @@ -24,6 +24,6 @@ CFILES= \ tst.sigwait.c \ -LIBADD.tst.sigwait.exe=rt +LIBADD.tst.sigwait.exe+= rt .include "../../dtrace.test.mk" Modified: user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile ============================================================================== --- user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile Mon Dec 14 00:22:03 2015 (r292179) @@ -46,6 +46,8 @@ TESTFILES= \ tst.onlyenabled.ksh \ tst.reap.ksh \ tst.reeval.ksh \ + tst.sameprovmulti.ksh \ + tst.sameprovmulti.ksh.out \ tst.static.ksh \ tst.static.ksh.out \ tst.static2.ksh \ Modified: user/ngie/detangle-rc/contrib/bmake/ChangeLog ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/ChangeLog Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/contrib/bmake/ChangeLog Mon Dec 14 00:22:03 2015 (r292179) @@ -1,3 +1,35 @@ +2015-12-01 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151201 + Merge with NetBSD make, pick up + o cond.c: CondCvtArg: avoid access beyond end of empty buffer. + o meta.c: meta_oodate: use lstat(2) for checking link target + in case it is a symlink. + o var.c: avoid calling brk_string and Var_Export1 with empty + strings. + +2015-11-26 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151126 + Merge with NetBSD make, pick up + o parse.c: ParseTrackInput don't access beyond + end of old value. + +2015-10-22 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151022 + + * Add support for BSD/OS which lacks inttypes.h + and really needs sys/param.h for sys/sysctl.h + also 'type' is not a shell builtin. + + * var.c: eliminate uint32_t and need for inttypes.h + + * main.c: PrintOnError flush stdout before run .ERROR + + * parse.c: cope with _SC_PAGESIZE not being defined. + + 2015-10-20 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151020 Modified: user/ngie/detangle-rc/contrib/bmake/Makefile ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/Makefile Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/contrib/bmake/Makefile Mon Dec 14 00:22:03 2015 (r292179) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.44 2015/10/20 21:41:40 sjg Exp $ +# $Id: Makefile,v 1.48 2015/12/02 00:36:42 sjg Exp $ # Base version on src date -MAKE_VERSION= 20151020 +MAKE_VERSION= 20151201 PROG= bmake Modified: user/ngie/detangle-rc/contrib/bmake/boot-strap ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/boot-strap Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/contrib/bmake/boot-strap Mon Dec 14 00:22:03 2015 (r292179) @@ -111,7 +111,7 @@ # Simon J. Gerraty # RCSid: -# $Id: boot-strap,v 1.45 2014/04/05 22:56:54 sjg Exp $ +# $Id: boot-strap,v 1.48 2015/10/25 05:20:48 sjg Exp $ # # @(#) Copyright (c) 2001 Simon J. Gerraty # @@ -395,8 +395,15 @@ Bmake() { ) } +# there is actually a shell where type is not a builtin +# if type is missing, which(1) had better exists! +if (type cat) > /dev/null 2>&1; then +which() { + type "$@" | sed 's,[()],,g;s,^[^/][^/]*,,;q' +} +fi # make sure test below uses the same diff that configure did -TOOL_DIFF=`type diff | sed 's,[()],,g;s,^[^/][^/]*,,;q'` +TOOL_DIFF=`which diff` export TOOL_DIFF op_configure() { Modified: user/ngie/detangle-rc/contrib/bmake/cond.c ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/cond.c Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/contrib/bmake/cond.c Mon Dec 14 00:22:03 2015 (r292179) @@ -1,4 +1,4 @@ -/* $NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 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: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $"; +static char rcsid[] = "$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $"); +__RCSID("$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -490,6 +490,10 @@ CondCvtArg(char *str, double *value) double d_val; errno = 0; + if (!*str) { + *value = (double)0; + return TRUE; + } l_val = strtoul(str, &eptr, str[1] == 'x' ? 16 : 10); ech = *eptr; if (ech == 0 && errno != ERANGE) { Modified: user/ngie/detangle-rc/contrib/bmake/config.h.in ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/config.h.in Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/contrib/bmake/config.h.in Mon Dec 14 00:22:03 2015 (r292179) @@ -59,6 +59,12 @@ /* Define to 1 if you have the `killpg' function. */ #undef HAVE_KILLPG +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBGEN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -158,6 +164,9 @@ */ #undef HAVE_SYS_NDIR_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SELECT_H @@ -304,6 +313,11 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +#undef _UINT32_T + /* C99 function name */ #undef __func__ @@ -319,5 +333,9 @@ /* Define to `unsigned int' if does not define. */ #undef size_t +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +#undef uint32_t + /* Define as `fork' if `vfork' does not work. */ #undef vfork Modified: user/ngie/detangle-rc/contrib/bmake/configure ============================================================================== Binary file (source and/or target). No diff available. Modified: user/ngie/detangle-rc/contrib/bmake/configure.in ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/configure.in Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/contrib/bmake/configure.in Mon Dec 14 00:22:03 2015 (r292179) @@ -1,11 +1,11 @@ dnl dnl RCSid: -dnl $Id: configure.in,v 1.54 2015/10/10 04:17:10 sjg Exp $ +dnl $Id: configure.in,v 1.56 2015/10/25 05:20:48 sjg Exp $ dnl dnl Process this file with autoconf to produce a configure script dnl AC_PREREQ(2.50) -AC_INIT([bmake], [20151009], [sjg@NetBSD.org]) +AC_INIT([bmake], [20151022], [sjg@NetBSD.org]) AC_CONFIG_HEADERS(config.h) dnl make srcdir absolute @@ -101,10 +101,19 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_DIRENT dnl Keep this list sorted +AC_CHECK_HEADERS(sys/param.h) +dnl On BSDi at least we really need sys/param.h for sys/sysctl.h +AC_CHECK_HEADERS([sys/sysctl.h], [], [], +[#ifdef HAVE_SYS_PARAM_H +# include +# endif +]) + AC_CHECK_HEADERS( \ ar.h \ err.h \ fcntl.h \ + libgen.h \ limits.h \ paths.h \ poll.h \ @@ -113,7 +122,6 @@ AC_CHECK_HEADERS( \ sys/mman.h \ sys/select.h \ sys/socket.h \ - sys/sysctl.h \ sys/time.h \ sys/uio.h \ unistd.h \ @@ -143,6 +151,7 @@ AC_C_CONST AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_SIZE_T +AC_TYPE_UINT32_T AC_DECL_SYS_SIGLIST AC_HEADER_TIME AC_STRUCT_TM Modified: user/ngie/detangle-rc/contrib/bmake/main.c ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/main.c Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/contrib/bmake/main.c Mon Dec 14 00:22:03 2015 (r292179) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $"; #else #include #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.234 2015/10/11 04:51:24 sjg Exp $"); +__RCSID("$NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1902,6 +1902,8 @@ PrintOnError(GNode *gn, const char *s) printf("%s", cp); free(cp); } + fflush(stdout); + /* * Finally, see if there is a .ERROR target, and run it if so. */ Modified: user/ngie/detangle-rc/contrib/bmake/meta.c ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/meta.c Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/contrib/bmake/meta.c Mon Dec 14 00:22:03 2015 (r292179) @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.40 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: meta.c,v 1.41 2015/11/30 23:37:56 sjg Exp $ */ /* * Implement 'meta' mode. @@ -38,7 +38,11 @@ #include #include #include +#ifdef HAVE_LIBGEN_H #include +#elif !defined(HAVE_DIRNAME) +char * dirname(char *); +#endif #include #if !defined(HAVE_CONFIG_H) || defined(HAVE_ERR_H) #include @@ -1183,7 +1187,8 @@ meta_oodate(GNode *gn, Boolean oodate) if ((strstr("tmp", p))) break; - if (stat(p, &fs) < 0) { + if ((link_src != NULL && lstat(p, &fs) < 0) || + (link_src == NULL && stat(p, &fs) < 0)) { Lst_AtEnd(missingFiles, bmake_strdup(p)); } break; Modified: user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog Mon Dec 14 00:22:03 2015 (r292179) @@ -1,3 +1,29 @@ +2015-11-14 Simon J. Gerraty + + * install-mk (MK_VERSION): 20151111 + + * meta.sys.mk: include sys.dependfile.mk + + * sys.mk (OPTIONS_DEFAULT_NO): use options.mk + to set MK_AUTO_OBJ and MK_DIRDEPS_BUILD + include local.sys.env.mk early + include local.sys.mk later + + * own.mk (OPTIONS_DEFAULT_NO): AUTO_OBJ etc moved to sys.mk + +2015-11-13 Simon J. Gerraty + + * meta.sys.mk (META_COOKIE_TOUCH): + add ${META_COOKIE_TOUCH} to the end of scripts to touch cookie + + * meta.stage.mk: stage_libs should ignore SYMLINKS. + +2015-10-23 Simon J. Gerraty + + * install-mk (MK_VERSION): 20151022 + + * sys.mk: BSD/OS does not have 'type' as a shell builtin. + 2015-10-20 Simon J. Gerraty * install-mk (MK_VERSION): 20151020 @@ -460,7 +486,7 @@ needed. * gendirdeps.mk: only produce unqualified deps if no .MAKE.DEPENDFILE_PREFERENCE ends in .${MACHINE} - * meta.subdir.mk: apply SUBDIREPS_FILTER + * meta.subdir.mk: apply SUBDIRDEPS_FILTER 2012-04-20 Simon J. Gerraty Modified: user/ngie/detangle-rc/contrib/bmake/mk/host-target.mk ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/mk/host-target.mk Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/contrib/bmake/mk/host-target.mk Mon Dec 14 00:22:03 2015 (r292179) @@ -1,5 +1,5 @@ # RCSid: -# $Id: host-target.mk,v 1.9 2015/09/10 18:42:57 sjg Exp $ +# $Id: host-target.mk,v 1.11 2015/10/25 00:07:20 sjg Exp $ # Host platform information; may be overridden .if !defined(_HOST_OSNAME) @@ -21,7 +21,7 @@ _HOST_ARCH := ${_HOST_MACHINE} .else _HOST_ARCH != uname -p 2> /dev/null || uname -m # uname -p may produce garbage on linux -.if ${_HOST_ARCH:[\#]} > 1 +.if ${_HOST_ARCH:[\#]} > 1 || ${_HOST_ARCH:Nunknown} == "" _HOST_ARCH := ${_HOST_MACHINE} .endif .endif @@ -33,10 +33,10 @@ HOST_MACHINE := ${_HOST_MACHINE} .endif HOST_OSMAJOR := ${_HOST_OSREL:C/[^0-9].*//} -HOST_OSTYPE := ${_HOST_OSNAME}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH} +HOST_OSTYPE := ${_HOST_OSNAME:S,/,,g}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH} HOST_OS := ${_HOST_OSNAME} host_os := ${_HOST_OSNAME:tl} -HOST_TARGET := ${host_os}${HOST_OSMAJOR}-${_HOST_ARCH} +HOST_TARGET := ${host_os:S,/,,g}${HOST_OSMAJOR}-${_HOST_ARCH} # tr is insanely non-portable, accommodate the lowest common denominator TR ?= tr Modified: user/ngie/detangle-rc/contrib/bmake/mk/init.mk ============================================================================== --- user/ngie/detangle-rc/contrib/bmake/mk/init.mk Mon Dec 14 00:12:53 2015 (r292178) +++ user/ngie/detangle-rc/contrib/bmake/mk/init.mk Mon Dec 14 00:22:03 2015 (r292179) @@ -1,4 +1,4 @@ -# $Id: init.mk,v 1.9 2013/07/18 05:46:24 sjg Exp $ +# $Id: init.mk,v 1.10 2015/12/07 04:28:31 sjg Exp $ # # @(#) Copyright (c) 2002, Simon J. Gerraty *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Mon Dec 14 13:26:23 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9DCD7A44AF2 for ; Mon, 14 Dec 2015 13:26:23 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 756C115D9; Mon, 14 Dec 2015 13:26:23 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBEDQMkT094582; Mon, 14 Dec 2015 13:26:22 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBEDQMF5094581; Mon, 14 Dec 2015 13:26:22 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201512141326.tBEDQMF5094581@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 14 Dec 2015 13:26:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292208 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2015 13:26:23 -0000 Author: pho Date: Mon Dec 14 13:26:22 2015 New Revision: 292208 URL: https://svnweb.freebsd.org/changeset/base/292208 Log: Added a regression test. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/md8.sh (contents, props changed) Added: user/pho/stress2/misc/md8.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/md8.sh Mon Dec 14 13:26:22 2015 (r292208) @@ -0,0 +1,126 @@ +#!/bin/sh + +# +# Copyright (c) 2015 EMC Corp. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# Test of unmapped unaligned i/o over the vnode-backed md(4) volume. +# "panic: vm_fault: fault on nofault entry, addr: fffffe07f302c000" seen. +# https://people.freebsd.org/~pho/stress/log/md8.txt +# Fixed in r292128. + +# Test scenario by kib@ + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ -d /usr/src/sys ] || exit 0 + +. ../default.cfg + +rm -f $diskimage +dir=`dirname $diskimage` +free=`df -k $dir | tail -1 | awk '{print $4}'` +[ $((free / 1024)) -lt 50 ] && echo "Not enough disk space." && exit + +odir=`pwd` +cd /tmp +sed '1,/^EOF/d' < $odir/$0 > md8.c +rm -f /tmp/md8 +mycc -o md8 -Wall -Wextra -g -O2 md8.c || exit 1 +rm -f md8.c + +cc -o /tmp/fstool $odir/../tools/fstool.c || exit 1 +cd $odir + +trap "rm -f $diskimage" EXIT INT +dd if=/dev/zero of=$diskimage bs=1m count=50 2>&1 | \ + egrep -v 'records|transferred' +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart +mdconfig -a -t vnode -f $diskimage -u $mdstart + +n=`sysctl -n hw.ncpu` +n=$((n + 1)) +(cd /usr/src; make -j $n buildkernel > /dev/null 2>&1) & +sleep 1 +/tmp/md8 /dev/md$mdstart +kill $! +wait + +mdconfig -d -u $mdstart +rm -rf /tmp/md8 +exit 0 +EOF +#include + +#include +#include +#include +#include +#include + +#define LOOPS 2000 + +void +test(char *path) +{ + int fd; + char data[MAXPHYS + 512] __aligned(PAGE_SIZE); + + if ((fd = open(path, O_RDONLY)) == -1) + err(1, "open(%s)", path); + if (read(fd, data + 512, MAXPHYS) != MAXPHYS) + err(1, "read"); + close(fd); + + if ((fd = open(path, O_WRONLY)) == -1) + err(1, "open(%s)", path); + if (write(fd, data + 512, MAXPHYS) != MAXPHYS) + err(1, "write"); + close(fd); + + if ((fd = open(path, O_RDONLY)) == -1) + err(1, "open(%s)", path); + if (read(fd, data + 512, MAXPHYS) != MAXPHYS) + err(1, "read"); + close(fd); +} + +int +main(int argc, char *argv[]) +{ + int i; + char *path; + + if (argc != 2) + errx(1, "Usage: %s ", argv[0]); + + path = argv[1]; + + for (i = 0; i < LOOPS; i++) + test(path); + + return (0); +} From owner-svn-src-user@freebsd.org Tue Dec 15 19:52:06 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 160B2A48F58 for ; Tue, 15 Dec 2015 19:52:06 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A99701E35; Tue, 15 Dec 2015 19:52:05 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBFJq48c066220; Tue, 15 Dec 2015 19:52:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBFJq310066203; Tue, 15 Dec 2015 19:52:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512151952.tBFJq310066203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 15 Dec 2015 19:52:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292286 - in user/ngie/more-tests2: . contrib/mdocml contrib/smbfs contrib/unbound contrib/unbound/compat contrib/unbound/daemon contrib/unbound/dns64 contrib/unbound/dnstap contrib/unb... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2015 19:52:06 -0000 Author: ngie Date: Tue Dec 15 19:52:02 2015 New Revision: 292286 URL: https://svnweb.freebsd.org/changeset/base/292286 Log: MFhead @ r292285 Added: user/ngie/more-tests2/contrib/unbound/.gitignore - copied unchanged from r292285, head/contrib/unbound/.gitignore user/ngie/more-tests2/contrib/unbound/compat/isblank.c - copied unchanged from r292285, head/contrib/unbound/compat/isblank.c user/ngie/more-tests2/lib/libsysdecode/ - copied from r292285, head/lib/libsysdecode/ Deleted: user/ngie/more-tests2/sys/arm/include/katelib.h user/ngie/more-tests2/usr.bin/kdump/utrace.c Modified: user/ngie/more-tests2/Makefile user/ngie/more-tests2/Makefile.inc1 user/ngie/more-tests2/contrib/mdocml/lib.in user/ngie/more-tests2/contrib/smbfs/README user/ngie/more-tests2/contrib/unbound/Makefile.in user/ngie/more-tests2/contrib/unbound/acx_nlnetlabs.m4 user/ngie/more-tests2/contrib/unbound/compat/arc4random.c user/ngie/more-tests2/contrib/unbound/compat/getentropy_linux.c user/ngie/more-tests2/contrib/unbound/compat/getentropy_solaris.c user/ngie/more-tests2/contrib/unbound/compat/reallocarray.c user/ngie/more-tests2/contrib/unbound/compat/sha512.c user/ngie/more-tests2/contrib/unbound/compat/snprintf.c user/ngie/more-tests2/contrib/unbound/config.h user/ngie/more-tests2/contrib/unbound/config.h.in user/ngie/more-tests2/contrib/unbound/configure user/ngie/more-tests2/contrib/unbound/configure.ac user/ngie/more-tests2/contrib/unbound/daemon/remote.c user/ngie/more-tests2/contrib/unbound/daemon/unbound.c user/ngie/more-tests2/contrib/unbound/daemon/worker.c user/ngie/more-tests2/contrib/unbound/dns64/dns64.c user/ngie/more-tests2/contrib/unbound/dnstap/dnstap.proto user/ngie/more-tests2/contrib/unbound/doc/Changelog user/ngie/more-tests2/contrib/unbound/doc/README user/ngie/more-tests2/contrib/unbound/doc/example.conf user/ngie/more-tests2/contrib/unbound/doc/example.conf.in user/ngie/more-tests2/contrib/unbound/doc/libunbound.3 user/ngie/more-tests2/contrib/unbound/doc/libunbound.3.in user/ngie/more-tests2/contrib/unbound/doc/unbound-anchor.8 user/ngie/more-tests2/contrib/unbound/doc/unbound-anchor.8.in user/ngie/more-tests2/contrib/unbound/doc/unbound-checkconf.8 user/ngie/more-tests2/contrib/unbound/doc/unbound-checkconf.8.in user/ngie/more-tests2/contrib/unbound/doc/unbound-control.8 user/ngie/more-tests2/contrib/unbound/doc/unbound-control.8.in user/ngie/more-tests2/contrib/unbound/doc/unbound-host.1 user/ngie/more-tests2/contrib/unbound/doc/unbound-host.1.in user/ngie/more-tests2/contrib/unbound/doc/unbound.8 user/ngie/more-tests2/contrib/unbound/doc/unbound.8.in user/ngie/more-tests2/contrib/unbound/doc/unbound.conf.5 user/ngie/more-tests2/contrib/unbound/doc/unbound.conf.5.in user/ngie/more-tests2/contrib/unbound/iterator/iter_scrub.c user/ngie/more-tests2/contrib/unbound/iterator/iter_utils.c user/ngie/more-tests2/contrib/unbound/iterator/iterator.c user/ngie/more-tests2/contrib/unbound/iterator/iterator.h user/ngie/more-tests2/contrib/unbound/libunbound/libunbound.c user/ngie/more-tests2/contrib/unbound/libunbound/python/Makefile user/ngie/more-tests2/contrib/unbound/libunbound/python/doc/install.rst user/ngie/more-tests2/contrib/unbound/libunbound/python/doc/modules/unbound.rst user/ngie/more-tests2/contrib/unbound/libunbound/python/examples/dnssec-valid.py user/ngie/more-tests2/contrib/unbound/libunbound/python/libunbound.i user/ngie/more-tests2/contrib/unbound/ltmain.sh user/ngie/more-tests2/contrib/unbound/services/cache/dns.c user/ngie/more-tests2/contrib/unbound/services/cache/rrset.c user/ngie/more-tests2/contrib/unbound/sldns/parseutil.h user/ngie/more-tests2/contrib/unbound/sldns/wire2str.c user/ngie/more-tests2/contrib/unbound/smallapp/unbound-anchor.c user/ngie/more-tests2/contrib/unbound/smallapp/unbound-checkconf.c user/ngie/more-tests2/contrib/unbound/smallapp/unbound-control-setup.sh user/ngie/more-tests2/contrib/unbound/smallapp/unbound-control-setup.sh.in user/ngie/more-tests2/contrib/unbound/smallapp/unbound-control.c user/ngie/more-tests2/contrib/unbound/util/config_file.c user/ngie/more-tests2/contrib/unbound/util/config_file.h user/ngie/more-tests2/contrib/unbound/util/configlexer.lex user/ngie/more-tests2/contrib/unbound/util/configparser.y user/ngie/more-tests2/contrib/unbound/util/iana_ports.inc user/ngie/more-tests2/contrib/unbound/util/locks.c user/ngie/more-tests2/contrib/unbound/util/net_help.c user/ngie/more-tests2/contrib/unbound/util/random.c user/ngie/more-tests2/contrib/unbound/util/rbtree.c user/ngie/more-tests2/contrib/unbound/util/rtt.h user/ngie/more-tests2/contrib/unbound/util/storage/lookup3.c user/ngie/more-tests2/contrib/unbound/util/tube.h user/ngie/more-tests2/contrib/unbound/util/winsock_event.h user/ngie/more-tests2/contrib/unbound/validator/autotrust.c user/ngie/more-tests2/contrib/unbound/validator/val_neg.c user/ngie/more-tests2/contrib/unbound/validator/val_neg.h user/ngie/more-tests2/contrib/unbound/validator/val_nsec.c user/ngie/more-tests2/contrib/unbound/validator/val_nsec.h user/ngie/more-tests2/contrib/unbound/validator/val_nsec3.c user/ngie/more-tests2/contrib/unbound/validator/val_nsec3.h user/ngie/more-tests2/contrib/unbound/validator/val_secalgo.c user/ngie/more-tests2/contrib/unbound/validator/val_secalgo.h user/ngie/more-tests2/contrib/unbound/validator/val_sigcrypt.c user/ngie/more-tests2/contrib/unbound/validator/val_utils.h user/ngie/more-tests2/contrib/unbound/validator/validator.c user/ngie/more-tests2/include/resolv.h user/ngie/more-tests2/lib/Makefile user/ngie/more-tests2/lib/lib80211/lib80211.3 user/ngie/more-tests2/lib/libc/resolv/res_init.c user/ngie/more-tests2/lib/libc/resolv/res_mkquery.c user/ngie/more-tests2/lib/libc/resolv/res_mkupdate.c user/ngie/more-tests2/lib/libc/resolv/res_private.h user/ngie/more-tests2/lib/libc/resolv/res_query.c user/ngie/more-tests2/lib/libc/resolv/res_send.c user/ngie/more-tests2/lib/libc/resolv/res_state.c user/ngie/more-tests2/lib/libc/sys/brk.2 user/ngie/more-tests2/lib/libc/sys/getgid.2 user/ngie/more-tests2/lib/libc/sys/getpid.2 user/ngie/more-tests2/lib/libc/sys/getuid.2 user/ngie/more-tests2/lib/libc/sys/read.2 user/ngie/more-tests2/lib/libc/sys/setuid.2 user/ngie/more-tests2/lib/libc/sys/utrace.2 user/ngie/more-tests2/lib/libc/sys/write.2 user/ngie/more-tests2/lib/libstand/Makefile user/ngie/more-tests2/sbin/reboot/reboot.8 user/ngie/more-tests2/sbin/reboot/reboot.c user/ngie/more-tests2/share/man/man4/aesni.4 user/ngie/more-tests2/share/man/man4/blackhole.4 user/ngie/more-tests2/share/man/man4/crypto.4 user/ngie/more-tests2/share/man/man4/dtrace_io.4 user/ngie/more-tests2/share/man/man4/dtrace_ip.4 user/ngie/more-tests2/share/man/man4/dtrace_tcp.4 user/ngie/more-tests2/share/man/man4/dtrace_udp.4 user/ngie/more-tests2/share/man/man4/ioat.4 user/ngie/more-tests2/share/man/man4/mlx5en.4 user/ngie/more-tests2/share/man/man4/netmap.4 user/ngie/more-tests2/share/man/man4/pass.4 user/ngie/more-tests2/share/man/man5/src.conf.5 user/ngie/more-tests2/share/mk/bsd.libnames.mk user/ngie/more-tests2/share/mk/bsd.snmpmod.mk user/ngie/more-tests2/share/mk/local.dirdeps.mk user/ngie/more-tests2/share/mk/src.libnames.mk user/ngie/more-tests2/sys/arm/allwinner/a10_mmc.c user/ngie/more-tests2/sys/arm/amlogic/aml8726/aml8726_mmc.c user/ngie/more-tests2/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c user/ngie/more-tests2/sys/arm/arm/pmap-v6-new.c user/ngie/more-tests2/sys/arm/arm/trap.c user/ngie/more-tests2/sys/arm/at91/at91_mci.c user/ngie/more-tests2/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c user/ngie/more-tests2/sys/arm/conf/NOTES user/ngie/more-tests2/sys/arm/freescale/imx/imx_sdhci.c user/ngie/more-tests2/sys/arm/include/cpufunc.h user/ngie/more-tests2/sys/arm/include/pmap-v6.h user/ngie/more-tests2/sys/arm/lpc/lpc_mmc.c user/ngie/more-tests2/sys/arm/ti/ti_sdhci.c user/ngie/more-tests2/sys/arm64/arm64/exception.S user/ngie/more-tests2/sys/arm64/arm64/gic.c user/ngie/more-tests2/sys/boot/uboot/common/main.c user/ngie/more-tests2/sys/conf/options user/ngie/more-tests2/sys/dev/atkbdc/psm.c user/ngie/more-tests2/sys/dev/etherswitch/arswitch/arswitch_9340.c user/ngie/more-tests2/sys/dev/hyperv/utilities/hv_kvp.c user/ngie/more-tests2/sys/dev/ioat/ioat.c user/ngie/more-tests2/sys/dev/ioat/ioat.h user/ngie/more-tests2/sys/dev/ioat/ioat_hw.h user/ngie/more-tests2/sys/dev/ioat/ioat_internal.h user/ngie/more-tests2/sys/dev/ioat/ioat_test.c user/ngie/more-tests2/sys/dev/ioat/ioat_test.h user/ngie/more-tests2/sys/dev/isp/isp_pci.c user/ngie/more-tests2/sys/dev/mmc/bridge.h user/ngie/more-tests2/sys/dev/mmc/host/dwmmc.c user/ngie/more-tests2/sys/dev/mmc/mmc.c user/ngie/more-tests2/sys/dev/mpr/mpr_sas_lsi.c user/ngie/more-tests2/sys/dev/mps/mps_sas_lsi.c user/ngie/more-tests2/sys/dev/pci/pci_host_generic.c user/ngie/more-tests2/sys/dev/sdhci/sdhci_fdt.c user/ngie/more-tests2/sys/dev/sdhci/sdhci_pci.c user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwn.c user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwnvar.h user/ngie/more-tests2/sys/kern/kern_jail.c user/ngie/more-tests2/sys/mips/atheros/apb.c user/ngie/more-tests2/sys/mips/atheros/if_arge.c user/ngie/more-tests2/sys/mips/atheros/qca953x_chip.c user/ngie/more-tests2/sys/net/if.c user/ngie/more-tests2/sys/net/if_lagg.c user/ngie/more-tests2/sys/net/if_lagg.h user/ngie/more-tests2/sys/net/if_var.h user/ngie/more-tests2/sys/netinet/if_ether.c user/ngie/more-tests2/sys/netinet/if_ether.h user/ngie/more-tests2/sys/netinet/in_var.h user/ngie/more-tests2/sys/netinet/ip_carp.c user/ngie/more-tests2/sys/netinet6/in6.c user/ngie/more-tests2/sys/netinet6/in6_var.h user/ngie/more-tests2/sys/netinet6/nd6.c user/ngie/more-tests2/sys/netinet6/nd6.h user/ngie/more-tests2/sys/netinet6/nd6_nbr.c user/ngie/more-tests2/sys/netpfil/ipfw/ip_dn_io.c user/ngie/more-tests2/sys/netpfil/ipfw/ip_dummynet.c user/ngie/more-tests2/sys/netpfil/ipfw/ip_fw2.c user/ngie/more-tests2/sys/powerpc/mpc85xx/fsl_sdhc.c user/ngie/more-tests2/sys/x86/x86/busdma_bounce.c user/ngie/more-tests2/tools/build/options/makeman user/ngie/more-tests2/tools/debugscripts/README user/ngie/more-tests2/tools/tools/ath/athratestats/Makefile user/ngie/more-tests2/tools/tools/ioat/ioatcontrol.8 user/ngie/more-tests2/tools/tools/ioat/ioatcontrol.c user/ngie/more-tests2/usr.bin/kdump/Makefile user/ngie/more-tests2/usr.bin/kdump/Makefile.depend user/ngie/more-tests2/usr.bin/kdump/kdump.c user/ngie/more-tests2/usr.bin/truss/Makefile user/ngie/more-tests2/usr.bin/truss/Makefile.depend.amd64 user/ngie/more-tests2/usr.bin/truss/syscalls.c user/ngie/more-tests2/usr.sbin/ctm/ctm/ctm.1 user/ngie/more-tests2/usr.sbin/sesutil/sesutil.c user/ngie/more-tests2/usr.sbin/ypldap/aldap.c user/ngie/more-tests2/usr.sbin/ypldap/ber.c user/ngie/more-tests2/usr.sbin/ypldap/ldapclient.c user/ngie/more-tests2/usr.sbin/ypldap/ypldap.c user/ngie/more-tests2/usr.sbin/ypldap/ypldap_dns.c Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/contrib/mdocml/ (props changed) user/ngie/more-tests2/contrib/unbound/ (props changed) user/ngie/more-tests2/include/ (props changed) user/ngie/more-tests2/lib/libc/ (props changed) user/ngie/more-tests2/sbin/ (props changed) user/ngie/more-tests2/share/ (props changed) user/ngie/more-tests2/share/man/man4/ (props changed) user/ngie/more-tests2/sys/ (props changed) user/ngie/more-tests2/sys/boot/ (props changed) user/ngie/more-tests2/sys/conf/ (props changed) user/ngie/more-tests2/sys/dev/hyperv/ (props changed) Modified: user/ngie/more-tests2/Makefile ============================================================================== --- user/ngie/more-tests2/Makefile Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/Makefile Tue Dec 15 19:52:02 2015 (r292286) @@ -57,8 +57,8 @@ # Makefile.inc1. The exceptions are universe, tinderbox and targets. # # If you want to build your system from source be sure that /usr/obj has -# at least 1GB of diskspace available. A complete 'universe' build requires -# about 15GB of space. +# at least 6GB of diskspace available. A complete 'universe' build requires +# about 100GB of space. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: Modified: user/ngie/more-tests2/Makefile.inc1 ============================================================================== --- user/ngie/more-tests2/Makefile.inc1 Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/Makefile.inc1 Tue Dec 15 19:52:02 2015 (r292286) @@ -146,7 +146,11 @@ CLEANDIR= cleandir LOCAL_TOOL_DIRS?= PACKAGEDIR?= ${DESTDIR}/${DISTDIR} +.if empty(SHELL:M*csh*) BUILDENV_SHELL?=${SHELL} +.else +BUILDENV_SHELL?=/bin/sh +.endif SVN?= /usr/local/bin/svn SVNFLAGS?= -r HEAD @@ -172,10 +176,24 @@ VERSION= FreeBSD ${REVISION}-${BRANCH:C/ .export VERSION .endif -KNOWN_ARCHES?= aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm \ - i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips \ - mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc \ - riscv64/riscv sparc64 +KNOWN_ARCHES?= aarch64/arm64 \ + amd64 \ + arm \ + armeb/arm \ + armv6/arm \ + armv6hf/arm \ + i386 \ + i386/pc98 \ + mips \ + mipsel/mips \ + mips64el/mips \ + mips64/mips \ + mipsn32el/mips \ + mipsn32/mips \ + powerpc \ + powerpc64/powerpc \ + riscv64/riscv \ + sparc64 .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} Modified: user/ngie/more-tests2/contrib/mdocml/lib.in ============================================================================== --- user/ngie/more-tests2/contrib/mdocml/lib.in Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/mdocml/lib.in Tue Dec 15 19:52:02 2015 (r292286) @@ -24,6 +24,7 @@ * Be sure to escape strings. */ +LINE("lib80211", "802.11 Wireless Network Management Library (lib80211, \\-l80211)") LINE("libarchive", "Streaming Archive Library (libarchive, \\-larchive)") LINE("libarm", "ARM Architecture Library (libarm, \\-larm)") LINE("libarm32", "ARM32 Architecture Library (libarm32, \\-larm32)") @@ -110,6 +111,7 @@ LINE("libsdp", "Bluetooth Service Disco LINE("libssp", "Buffer Overflow Protection Library (libssp, \\-lssp)") LINE("libstdthreads", "C11 Threads Library (libstdthreads, \\-lstdthreads)") LINE("libSystem", "System Library (libSystem, \\-lSystem)") +LINE("libsysdecode", "System Argument Decoding Library (libsysdecode, \\-lsysdecode)") LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") LINE("libtermcap", "Termcap Access Library (libtermcap, \\-ltermcap)") Modified: user/ngie/more-tests2/contrib/smbfs/README ============================================================================== --- user/ngie/more-tests2/contrib/smbfs/README Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/smbfs/README Tue Dec 15 19:52:02 2015 (r292286) @@ -15,7 +15,7 @@ It is a complete, kernel side implementa Darwin maintained in the Darwin's tree. - I'm would be very grateful for any feedback, bug reports etc. + I would be very grateful for any feedback, bug reports etc. Supported SMB servers: Samba @@ -23,14 +23,14 @@ It is a complete, kernel side implementa IBM LanManager NetApp - An updated versions of this package can be retrieved from ftp server: + An updated version of this package can be retrieved from ftp server: ftp://ftp.butya.kz/pub/smbfs/smbfs.tar.gz - Perfomance + Performance ========== - There is some perfomance benchmarks over 10Mbit network: + These are some performance benchmarks over a 10Mbit network: Win95 machine as server: IOZONE: auto-test mode Copied: user/ngie/more-tests2/contrib/unbound/.gitignore (from r292285, head/contrib/unbound/.gitignore) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/contrib/unbound/.gitignore Tue Dec 15 19:52:02 2015 (r292286, copy of r292285, head/contrib/unbound/.gitignore) @@ -0,0 +1,38 @@ +*.lo +*.o +/.libs/ +/Makefile +/autom4te.cache/ +/config.h +/config.log +/config.status +/dnstap/dnstap_config.h +/doc/example.conf +/doc/libunbound.3 +/doc/unbound-anchor.8 +/doc/unbound-checkconf.8 +/doc/unbound-control.8 +/doc/unbound-host.1 +/doc/unbound.8 +/doc/unbound.conf.5 +/libtool +/libunbound.la +/smallapp/unbound-control-setup.sh +/unbound +/unbound-anchor +/unbound-checkconf +/unbound-control +/unbound-control-setup +/unbound-host +/unbound.h +/asynclook +/delayer +/lock-verify +/memstats +/perf +/petal +/pktview +/streamtcp +/testbound +/unittest + Modified: user/ngie/more-tests2/contrib/unbound/Makefile.in ============================================================================== --- user/ngie/more-tests2/contrib/unbound/Makefile.in Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/unbound/Makefile.in Tue Dec 15 19:52:02 2015 (r292286) @@ -38,6 +38,7 @@ UNBOUND_VERSION_MINOR=@UNBOUND_VERSION_M UNBOUND_VERSION_MICRO=@UNBOUND_VERSION_MICRO@ ALLTARGET=@ALLTARGET@ INSTALLTARGET=@INSTALLTARGET@ +SSLLIB=@SSLLIB@ # _unbound.la if pyunbound enabled. PYUNBOUND_TARGET=@PYUNBOUND_TARGET@ @@ -132,7 +133,7 @@ compat/memcmp.c compat/memmove.c compat/ compat/strlcpy.c compat/strptime.c compat/getentropy_linux.c \ compat/getentropy_osx.c compat/getentropy_solaris.c compat/getentropy_win.c \ compat/explicit_bzero.c compat/arc4random.c compat/arc4random_uniform.c \ -compat/arc4_lock.c compat/sha512.c compat/reallocarray.c +compat/arc4_lock.c compat/sha512.c compat/reallocarray.c compat/isblank.c COMPAT_OBJ=$(LIBOBJS:.o=.lo) COMPAT_OBJ_WITHOUT_CTIME=$(LIBOBJ_WITHOUT_CTIME:.o=.lo) COMPAT_OBJ_WITHOUT_CTIMEARC4=$(LIBOBJ_WITHOUT_CTIMEARC4:.o=.lo) @@ -295,22 +296,22 @@ longtest: tests lib: libunbound.la unbound.h libunbound.la: $(LIBUNBOUND_OBJ_LINK) - $(LINK_LIB) $(UBSYMS) -o $@ $(LIBUNBOUND_OBJ_LINK) -rpath $(libdir) -lssl $(LIBS) + $(LINK_LIB) $(UBSYMS) -o $@ $(LIBUNBOUND_OBJ_LINK) -rpath $(libdir) $(SSLLIB) $(LIBS) unbound$(EXEEXT): $(DAEMON_OBJ_LINK) libunbound.la - $(LINK) -o $@ $(DAEMON_OBJ_LINK) $(EXTRALINK) -lssl $(LIBS) + $(LINK) -o $@ $(DAEMON_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS) unbound-checkconf$(EXEEXT): $(CHECKCONF_OBJ_LINK) libunbound.la - $(LINK) -o $@ $(CHECKCONF_OBJ_LINK) $(EXTRALINK) -lssl $(LIBS) + $(LINK) -o $@ $(CHECKCONF_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS) unbound-control$(EXEEXT): $(CONTROL_OBJ_LINK) libunbound.la - $(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) -lssl $(LIBS) + $(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS) unbound-host$(EXEEXT): $(HOST_OBJ_LINK) libunbound.la $(LINK) -o $@ $(HOST_OBJ_LINK) -L. -L.libs -lunbound $(LIBS) unbound-anchor$(EXEEXT): $(UBANCHOR_OBJ_LINK) libunbound.la - $(LINK) -o $@ $(UBANCHOR_OBJ_LINK) -L. -L.libs -lunbound -lexpat -lssl $(LIBS) + $(LINK) -o $@ $(UBANCHOR_OBJ_LINK) -L. -L.libs -lunbound -lexpat $(SSLLIB) $(LIBS) unbound-service-install$(EXEEXT): $(SVCINST_OBJ_LINK) $(LINK) -o $@ $(SVCINST_OBJ_LINK) $(LIBS) @@ -322,37 +323,37 @@ anchor-update$(EXEEXT): $(ANCHORUPD_OBJ $(LINK) -o $@ $(ANCHORUPD_OBJ_LINK) -L. -L.libs -lunbound $(LIBS) unittest$(EXEEXT): $(UNITTEST_OBJ_LINK) - $(LINK) -o $@ $(UNITTEST_OBJ_LINK) -lssl $(LIBS) + $(LINK) -o $@ $(UNITTEST_OBJ_LINK) $(SSLLIB) $(LIBS) testbound$(EXEEXT): $(TESTBOUND_OBJ_LINK) - $(LINK) -o $@ $(TESTBOUND_OBJ_LINK) -lssl $(LIBS) + $(LINK) -o $@ $(TESTBOUND_OBJ_LINK) $(SSLLIB) $(LIBS) lock-verify$(EXEEXT): $(LOCKVERIFY_OBJ_LINK) - $(LINK) -o $@ $(LOCKVERIFY_OBJ_LINK) -lssl $(LIBS) + $(LINK) -o $@ $(LOCKVERIFY_OBJ_LINK) $(SSLLIB) $(LIBS) petal$(EXEEXT): $(PETAL_OBJ_LINK) - $(LINK) -o $@ $(PETAL_OBJ_LINK) -lssl $(LIBS) + $(LINK) -o $@ $(PETAL_OBJ_LINK) $(SSLLIB) $(LIBS) pktview$(EXEEXT): $(PKTVIEW_OBJ_LINK) - $(LINK) -o $@ $(PKTVIEW_OBJ_LINK) -lssl $(LIBS) + $(LINK) -o $@ $(PKTVIEW_OBJ_LINK) $(SSLLIB) $(LIBS) memstats$(EXEEXT): $(MEMSTATS_OBJ_LINK) - $(LINK) -o $@ $(MEMSTATS_OBJ_LINK) -lssl $(LIBS) + $(LINK) -o $@ $(MEMSTATS_OBJ_LINK) $(SSLLIB) $(LIBS) asynclook$(EXEEXT): $(ASYNCLOOK_OBJ_LINK) libunbound.la $(LINK) -o $@ $(ASYNCLOOK_OBJ_LINK) $(LIBS) -L. -L.libs -lunbound streamtcp$(EXEEXT): $(STREAMTCP_OBJ_LINK) - $(LINK) -o $@ $(STREAMTCP_OBJ_LINK) -lssl $(LIBS) + $(LINK) -o $@ $(STREAMTCP_OBJ_LINK) $(SSLLIB) $(LIBS) perf$(EXEEXT): $(PERF_OBJ_LINK) - $(LINK) -o $@ $(PERF_OBJ_LINK) -lssl $(LIBS) + $(LINK) -o $@ $(PERF_OBJ_LINK) $(SSLLIB) $(LIBS) delayer$(EXEEXT): $(DELAYER_OBJ_LINK) - $(LINK) -o $@ $(DELAYER_OBJ_LINK) -lssl $(LIBS) + $(LINK) -o $@ $(DELAYER_OBJ_LINK) $(SSLLIB) $(LIBS) signit$(EXEEXT): testcode/signit.c - $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ testcode/signit.c $(LDFLAGS) -lldns -lssl $(LIBS) + $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ testcode/signit.c $(LDFLAGS) -lldns $(SSLLIB) $(LIBS) unbound.h: $(srcdir)/libunbound/unbound.h sed -e 's/@''UNBOUND_VERSION_MAJOR@/$(UNBOUND_VERSION_MAJOR)/' -e 's/@''UNBOUND_VERSION_MINOR@/$(UNBOUND_VERSION_MINOR)/' -e 's/@''UNBOUND_VERSION_MICRO@/$(UNBOUND_VERSION_MICRO)/' < $(srcdir)/libunbound/unbound.h > $@ @@ -644,7 +645,7 @@ iterator.lo iterator.o: $(srcdir)/iterat $(srcdir)/util/rtt.h $(srcdir)/util/netevent.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \ $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/util/config_file.h $(srcdir)/util/random.h \ - $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h iter_delegpt.lo iter_delegpt.o: $(srcdir)/iterator/iter_delegpt.c config.h $(srcdir)/iterator/iter_delegpt.h \ $(srcdir)/util/log.h $(srcdir)/services/cache/dns.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/regional.h \ @@ -727,8 +728,7 @@ outside_network.lo outside_network.o: $( $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h \ $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h \ $(srcdir)/util/module.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/dnstap/dnstap.h \ - + $(srcdir)/sldns/sbuffer.h $(srcdir)/dnstap/dnstap.h alloc.lo alloc.o: $(srcdir)/util/alloc.c config.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/util/regional.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ @@ -776,14 +776,12 @@ netevent.lo netevent.o: $(srcdir)/util/n $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/dnstap/dnstap.h \ - $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h + $(srcdir)/dnstap/dnstap.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h net_help.lo net_help.o: $(srcdir)/util/net_help.c config.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \ $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/module.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/regional.h $(srcdir)/sldns/parseutil.h \ - $(srcdir)/sldns/wire2str.h \ - + $(srcdir)/sldns/wire2str.h random.lo random.o: $(srcdir)/util/random.c config.h $(srcdir)/util/random.h $(srcdir)/util/log.h rbtree.lo rbtree.o: $(srcdir)/util/rbtree.c config.h $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \ $(srcdir)/util/netevent.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ @@ -818,8 +816,7 @@ autotrust.lo autotrust.o: $(srcdir)/vali $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/random.h \ $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h $(srcdir)/services/modstack.h \ $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/validator/val_kcache.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/keyraw.h \ - + $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/keyraw.h val_anchor.lo val_anchor.o: $(srcdir)/validator/val_anchor.c config.h $(srcdir)/validator/val_anchor.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_sigcrypt.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/validator/autotrust.h \ @@ -844,18 +841,16 @@ val_kcache.lo val_kcache.o: $(srcdir)/va val_kentry.lo val_kentry.o: $(srcdir)/validator/val_kentry.c config.h $(srcdir)/validator/val_kentry.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \ - -val_neg.lo val_neg.o: $(srcdir)/validator/val_neg.c config.h \ - $(srcdir)/validator/val_neg.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/rbtree.h \ - $(srcdir)/validator/val_nsec.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_utils.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h \ - $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/dns.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h -val_nsec3.lo val_nsec3.o: $(srcdir)/validator/val_nsec3.c config.h \ - $(srcdir)/validator/val_nsec3.h $(srcdir)/util/rbtree.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/validator.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h +val_neg.lo val_neg.o: $(srcdir)/validator/val_neg.c config.h $(srcdir)/validator/val_neg.h $(srcdir)/util/locks.h \ + $(srcdir)/util/log.h $(srcdir)/util/rbtree.h $(srcdir)/validator/val_nsec.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_utils.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/config_file.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/services/cache/dns.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h +val_nsec3.lo val_nsec3.o: $(srcdir)/validator/val_nsec3.c config.h $(srcdir)/validator/val_nsec3.h \ + $(srcdir)/util/rbtree.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_secalgo.h $(srcdir)/validator/validator.h \ $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_kentry.h \ $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/regional.h \ @@ -867,17 +862,15 @@ val_nsec.lo val_nsec.o: $(srcdir)/valida $(srcdir)/sldns/rrdef.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h val_secalgo.lo val_secalgo.o: $(srcdir)/validator/val_secalgo.c config.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_secalgo.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \ - $(srcdir)/sldns/sbuffer.h \ - + $(srcdir)/validator/val_nsec3.h $(srcdir)/util/rbtree.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \ + $(srcdir)/sldns/sbuffer.h val_sigcrypt.lo val_sigcrypt.o: $(srcdir)/validator/val_sigcrypt.c config.h \ $(srcdir)/validator/val_sigcrypt.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_secalgo.h $(srcdir)/validator/validator.h \ $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h $(srcdir)/util/data/dname.h $(srcdir)/util/rbtree.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/sldns/keyraw.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h \ - + $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/sldns/keyraw.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h val_utils.lo val_utils.o: $(srcdir)/validator/val_utils.c config.h $(srcdir)/validator/val_utils.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/validator/validator.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ @@ -895,11 +888,6 @@ dns64.lo dns64.o: $(srcdir)/dns64/dns64. $(srcdir)/services/modstack.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h checklocks.lo checklocks.o: $(srcdir)/testcode/checklocks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/testcode/checklocks.h -dnstap.lo dnstap.o: $(srcdir)/dnstap/dnstap.c config.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnstap/dnstap.h \ - $(srcdir)/dnstap/dnstap.pb-c.h -dnstap.pb-c.lo dnstap.pb-c.o: $(srcdir)/dnstap/dnstap.pb-c.c $(srcdir)/dnstap/dnstap.pb-c.h unitanchor.lo unitanchor.o: $(srcdir)/testcode/unitanchor.c config.h $(srcdir)/util/log.h $(srcdir)/util/data/dname.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/testcode/unitmain.h \ $(srcdir)/validator/val_anchor.h $(srcdir)/util/rbtree.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h @@ -908,8 +896,7 @@ unitdname.lo unitdname.o: $(srcdir)/test $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h unitlruhash.lo unitlruhash.o: $(srcdir)/testcode/unitlruhash.c config.h $(srcdir)/testcode/unitmain.h \ $(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/storage/slabhash.h -unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \ +unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \ $(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \ $(srcdir)/util/config_file.h $(srcdir)/util/rtt.h $(srcdir)/services/cache/infra.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ @@ -947,38 +934,35 @@ unitldns.lo unitldns.o: $(srcdir)/testco acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/regional.h $(srcdir)/util/log.h \ $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h -cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h \ - $(srcdir)/daemon/cachedump.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h \ +cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h $(srcdir)/daemon/cachedump.h \ + $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ + $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/dns.h \ + $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h \ + $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h \ + $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h \ + $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \ + $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h +daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h \ + $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ + $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/netevent.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ - $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ - $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \ - $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h \ - $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/sldns/wire2str.h \ - $(srcdir)/sldns/str2wire.h -daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h \ - $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ - $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/netevent.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \ - $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \ - $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ + $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/config_file.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/storage/slabhash.h \ $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \ $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h $(srcdir)/util/random.h $(srcdir)/util/tube.h \ $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h -remote.lo remote.o: $(srcdir)/daemon/remote.c config.h \ - $(srcdir)/daemon/remote.h \ - $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ - $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \ +remote.lo remote.o: $(srcdir)/daemon/remote.c config.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h \ + $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \ + $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \ + $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \ $(srcdir)/services/modstack.h $(srcdir)/daemon/cachedump.h $(srcdir)/util/config_file.h \ $(srcdir)/util/net_help.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ @@ -1002,35 +986,33 @@ stats.lo stats.o: $(srcdir)/daemon/stats $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h unbound.lo unbound.o: $(srcdir)/daemon/unbound.c config.h $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h \ $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ - $(srcdir)/daemon/remote.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ - $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/net_help.h $(srcdir)/util/mini_event.h \ - $(srcdir)/util/rbtree.h + $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/fptr_wlist.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ $(srcdir)/util/random.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \ - $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \ - $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h \ - $(srcdir)/services/listen_dnsport.h $(srcdir)/services/outside_network.h \ - $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \ - $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h $(srcdir)/services/mesh.h $(srcdir)/services/localzone.h \ + $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/config_file.h $(srcdir)/util/regional.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/services/outside_network.h $(srcdir)/services/outbound_list.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ + $(srcdir)/services/cache/dns.h $(srcdir)/services/mesh.h $(srcdir)/services/localzone.h \ $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/validator/autotrust.h \ $(srcdir)/validator/val_anchor.h $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound.h \ $(srcdir)/libunbound/libworker.h testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h $(srcdir)/testcode/testpkts.h \ $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h \ - $(srcdir)/daemon/remote.h \ - $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c $(srcdir)/util/log.h \ - $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ + $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c \ + $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ @@ -1046,12 +1028,12 @@ worker.lo worker.o: $(srcdir)/daemon/wor $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \ - $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \ - $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h \ - $(srcdir)/services/listen_dnsport.h $(srcdir)/services/outside_network.h \ - $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \ - $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h $(srcdir)/services/mesh.h $(srcdir)/services/localzone.h \ + $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/config_file.h $(srcdir)/util/regional.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/services/outside_network.h $(srcdir)/services/outbound_list.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ + $(srcdir)/services/cache/dns.h $(srcdir)/services/mesh.h $(srcdir)/services/localzone.h \ $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/validator/autotrust.h \ $(srcdir)/validator/val_anchor.h $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound.h \ @@ -1059,14 +1041,13 @@ worker.lo worker.o: $(srcdir)/daemon/wor acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/regional.h $(srcdir)/util/log.h \ $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h -daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h \ - $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ - $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/netevent.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \ - $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \ - $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ +daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h \ + $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ + $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/netevent.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ + $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/config_file.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/storage/slabhash.h \ $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \ $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h $(srcdir)/util/random.h $(srcdir)/util/tube.h \ @@ -1141,19 +1122,18 @@ libunbound.lo libunbound.o: $(srcdir)/li $(srcdir)/util/random.h $(srcdir)/util/net_help.h $(srcdir)/util/tube.h $(srcdir)/services/localzone.h \ $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h \ $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/sldns/sbuffer.h -libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h \ - $(srcdir)/libunbound/libworker.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h \ - $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/worker.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/services/outside_network.h \ - $(srcdir)/util/netevent.h $(srcdir)/services/mesh.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/services/localzone.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/outbound_list.h $(srcdir)/util/fptr_wlist.h \ - $(srcdir)/util/tube.h $(srcdir)/util/regional.h $(srcdir)/util/random.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/storage/lookup3.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/data/msgencode.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/sldns/str2wire.h +libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h $(srcdir)/libunbound/libworker.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \ + $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/libunbound/unbound-event.h $(srcdir)/services/outside_network.h $(srcdir)/util/netevent.h \ + $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/services/localzone.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/services/outbound_list.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/regional.h \ + $(srcdir)/util/random.h $(srcdir)/util/config_file.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h $(srcdir)/iterator/iter_fwd.h \ + $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h $(srcdir)/sldns/str2wire.h unbound-host.lo unbound-host.o: $(srcdir)/smallapp/unbound-host.c config.h $(srcdir)/libunbound/unbound.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h asynclook.lo asynclook.o: $(srcdir)/testcode/asynclook.c config.h $(srcdir)/libunbound/unbound.h \ @@ -1164,21 +1144,18 @@ streamtcp.lo streamtcp.o: $(srcdir)/test $(srcdir)/util/net_help.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/dname.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h \ - + $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h perf.lo perf.o: $(srcdir)/testcode/perf.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \ $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h delayer.lo delayer.o: $(srcdir)/testcode/delayer.c config.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \ $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h -unbound-control.lo unbound-control.o: $(srcdir)/smallapp/unbound-control.c config.h \ - $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h +unbound-control.lo unbound-control.o: $(srcdir)/smallapp/unbound-control.c config.h $(srcdir)/util/log.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h unbound-anchor.lo unbound-anchor.o: $(srcdir)/smallapp/unbound-anchor.c config.h $(srcdir)/libunbound/unbound.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.h \ - -petal.lo petal.o: $(srcdir)/testcode/petal.c config.h \ - + $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.h +petal.lo petal.o: $(srcdir)/testcode/petal.c config.h pythonmod_utils.lo pythonmod_utils.o: $(srcdir)/pythonmod/pythonmod_utils.c config.h $(srcdir)/util/module.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ @@ -1191,8 +1168,7 @@ win_svc.lo win_svc.o: $(srcdir)/winrc/wi $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/netevent.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \ - $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/winsock_event.h + $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/util/winsock_event.h w_inst.lo w_inst.o: $(srcdir)/winrc/w_inst.c config.h $(srcdir)/winrc/w_inst.h $(srcdir)/winrc/win_svc.h unbound-service-install.lo unbound-service-install.o: $(srcdir)/winrc/unbound-service-install.c config.h \ $(srcdir)/winrc/w_inst.h @@ -1200,14 +1176,11 @@ unbound-service-remove.lo unbound-servic $(srcdir)/winrc/w_inst.h anchor-update.lo anchor-update.o: $(srcdir)/winrc/anchor-update.c config.h $(srcdir)/libunbound/unbound.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/wire2str.h -keyraw.lo keyraw.o: $(srcdir)/sldns/keyraw.c config.h $(srcdir)/sldns/keyraw.h \ - $(srcdir)/sldns/rrdef.h \ - +keyraw.lo keyraw.o: $(srcdir)/sldns/keyraw.c config.h $(srcdir)/sldns/keyraw.h $(srcdir)/sldns/rrdef.h sbuffer.lo sbuffer.o: $(srcdir)/sldns/sbuffer.c config.h $(srcdir)/sldns/sbuffer.h wire2str.lo wire2str.o: $(srcdir)/sldns/wire2str.c config.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/sldns/keyraw.h \ - + $(srcdir)/sldns/keyraw.h parse.lo parse.o: $(srcdir)/sldns/parse.c config.h $(srcdir)/sldns/parse.h $(srcdir)/sldns/parseutil.h \ $(srcdir)/sldns/sbuffer.h parseutil.lo parseutil.o: $(srcdir)/sldns/parseutil.c config.h $(srcdir)/sldns/parseutil.h @@ -1227,8 +1200,7 @@ snprintf.lo snprintf.o: $(srcdir)/compat strlcat.lo strlcat.o: $(srcdir)/compat/strlcat.c config.h strlcpy.lo strlcpy.o: $(srcdir)/compat/strlcpy.c config.h strptime.lo strptime.o: $(srcdir)/compat/strptime.c config.h -getentropy_linux.lo getentropy_linux.o: $(srcdir)/compat/getentropy_linux.c config.h \ - +getentropy_linux.lo getentropy_linux.o: $(srcdir)/compat/getentropy_linux.c config.h getentropy_osx.lo getentropy_osx.o: $(srcdir)/compat/getentropy_osx.c config.h getentropy_solaris.lo getentropy_solaris.o: $(srcdir)/compat/getentropy_solaris.c config.h getentropy_win.lo getentropy_win.o: $(srcdir)/compat/getentropy_win.c @@ -1238,3 +1210,4 @@ arc4random_uniform.lo arc4random_uniform arc4_lock.lo arc4_lock.o: $(srcdir)/compat/arc4_lock.c config.h $(srcdir)/util/locks.h sha512.lo sha512.o: $(srcdir)/compat/sha512.c config.h reallocarray.lo reallocarray.o: $(srcdir)/compat/reallocarray.c config.h +isblank.lo isblank.o: $(srcdir)/compat/isblank.c config.h Modified: user/ngie/more-tests2/contrib/unbound/acx_nlnetlabs.m4 ============================================================================== --- user/ngie/more-tests2/contrib/unbound/acx_nlnetlabs.m4 Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/unbound/acx_nlnetlabs.m4 Tue Dec 15 19:52:02 2015 (r292286) @@ -2,7 +2,9 @@ # Copyright 2009, Wouter Wijngaards, NLnet Labs. # BSD licensed. # -# Version 28 +# Version 30 +# 2015-11-18 spelling check fix. +# 2015-11-05 ACX_SSL_CHECKS no longer adds -ldl needlessly. # 2015-08-28 ACX_CHECK_PIE and ACX_CHECK_RELRO_NOW added. # 2015-03-17 AHX_CONFIG_REALLOCARRAY added # 2013-09-19 FLTO help text improved. @@ -24,7 +26,7 @@ # 2010-07-02 Add check for ss_family (for minix). # 2010-04-26 Fix to use CPPFLAGS for CHECK_COMPILER_FLAGS. # 2010-03-01 Fix RPATH using CONFIG_COMMANDS to run at the very end. -# 2010-02-18 WITH_SSL outputs the LIBSSL_LDFLAGS, LIBS, CPPFLAGS seperate, -ldl +# 2010-02-18 WITH_SSL outputs the LIBSSL_LDFLAGS, LIBS, CPPFLAGS separate, -ldl # 2010-02-01 added ACX_CHECK_MEMCMP_SIGNED, AHX_MEMCMP_BROKEN # 2010-01-20 added AHX_COONFIG_STRLCAT # 2009-07-14 U_CHAR detection improved for windows crosscompile. @@ -715,12 +717,6 @@ AC_DEFUN([ACX_SSL_CHECKS], [ fi AC_SUBST(HAVE_SSL) AC_SUBST(RUNTIME_PATH) - # openssl engine functionality needs dlopen(). - BAKLIBS="$LIBS" - AC_SEARCH_LIBS([dlopen], [dl]) - if test "$LIBS" != "$BAKLIBS"; then - LIBSSL_LIBS="$LIBSSL_LIBS -ldl" - fi fi AC_CHECK_HEADERS([openssl/ssl.h],,, [AC_INCLUDES_DEFAULT]) AC_CHECK_HEADERS([openssl/err.h],,, [AC_INCLUDES_DEFAULT]) Modified: user/ngie/more-tests2/contrib/unbound/compat/arc4random.c ============================================================================== --- user/ngie/more-tests2/contrib/unbound/compat/arc4random.c Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/unbound/compat/arc4random.c Tue Dec 15 19:52:02 2015 (r292286) @@ -26,7 +26,9 @@ #include #include #include +#ifdef HAVE_STDINT_H #include +#endif #include #include #include Modified: user/ngie/more-tests2/contrib/unbound/compat/getentropy_linux.c ============================================================================== --- user/ngie/more-tests2/contrib/unbound/compat/getentropy_linux.c Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/unbound/compat/getentropy_linux.c Tue Dec 15 19:52:02 2015 (r292286) @@ -46,7 +46,12 @@ #include #include #include + +#if defined(HAVE_SSL) #include +#elif defined(HAVE_NETTLE) +#include +#endif #include #include @@ -67,9 +72,21 @@ HD(b); \ } while (0) +#if defined(HAVE_SSL) +#define CRYPTO_SHA512_CTX SHA512_CTX +#define CRYPTO_SHA512_INIT(x) SHA512_Init(x) +#define CRYPTO_SHA512_FINAL(r, c) SHA512_Final(r, c) #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) #define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*))) +#elif defined(HAVE_NETTLE) +#define CRYPTO_SHA512_CTX struct sha512_ctx +#define CRYPTO_SHA512_INIT(x) sha512_init(x) +#define CRYPTO_SHA512_FINAL(r, c) sha512_digest(c, SHA512_DIGEST_SIZE, r) +#define HR(x, l) (sha512_update(&ctx, (l), (uint8_t *)(x))) +#define HD(x) (sha512_update(&ctx, sizeof (x), (uint8_t *)&(x))) +#define HF(x) (sha512_update(&ctx, sizeof (void*), (uint8_t *)&(x))) +#endif int getentropy(void *buf, size_t len); @@ -122,7 +139,7 @@ getentropy(void *buf, size_t len) * Try to use sysctl CTL_KERN, KERN_RANDOM, RANDOM_UUID. * sysctl is a failsafe API, so it guarantees a result. This * should work inside a chroot, or when file descriptors are - * exhuasted. + * exhausted. * * However this can fail if the Linux kernel removes support * for sysctl. Starting in 2007, there have been efforts to @@ -337,7 +354,7 @@ getentropy_fallback(void *buf, size_t le struct rusage ru; sigset_t sigset; struct stat st; - SHA512_CTX ctx; + CRYPTO_SHA512_CTX ctx; static pid_t lastpid; pid_t pid; size_t i, ii, m; @@ -354,7 +371,7 @@ getentropy_fallback(void *buf, size_t le } for (i = 0; i < len; ) { int j; - SHA512_Init(&ctx); + CRYPTO_SHA512_INIT(&ctx); for (j = 0; j < repeat; j++) { HX((e = gettimeofday(&tv, NULL)) == -1, tv); if (e != -1) { @@ -526,7 +543,7 @@ getentropy_fallback(void *buf, size_t le # endif #endif /* HAVE_GETAUXVAL */ - SHA512_Final(results, &ctx); + CRYPTO_SHA512_FINAL(results, &ctx); memcpy((char*)buf + i, results, min(sizeof(results), len - i)); i += min(sizeof(results), len - i); } Modified: user/ngie/more-tests2/contrib/unbound/compat/getentropy_solaris.c ============================================================================== --- user/ngie/more-tests2/contrib/unbound/compat/getentropy_solaris.c Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/unbound/compat/getentropy_solaris.c Tue Dec 15 19:52:02 2015 (r292286) @@ -30,7 +30,9 @@ #include #include #include +#ifdef HAVE_STDINT_H #include +#endif #include #include #include @@ -39,10 +41,14 @@ #include #include #include +#ifdef HAVE_SYS_SHA2_H #include #define SHA512_Init SHA512Init #define SHA512_Update SHA512Update #define SHA512_Final SHA512Final +#else +#include "openssl/sha.h" +#endif #include #include Copied: user/ngie/more-tests2/contrib/unbound/compat/isblank.c (from r292285, head/contrib/unbound/compat/isblank.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/contrib/unbound/compat/isblank.c Tue Dec 15 19:52:02 2015 (r292286, copy of r292285, head/contrib/unbound/compat/isblank.c) @@ -0,0 +1,45 @@ +/* isblank - compatibility implementation of isblank + * + * Copyright (c) 2015, NLnet Labs. All rights reserved. + * + * This software is open source. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * Neither the name of the NLNET LABS nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" + +/* return true for a blank character: space or tab */ +int isblank(int c); + +/* implementation of isblank. unsigned char is the argument */ +int +isblank(int c) +{ + return (c==' ' || c=='\t'); +} Modified: user/ngie/more-tests2/contrib/unbound/compat/reallocarray.c ============================================================================== --- user/ngie/more-tests2/contrib/unbound/compat/reallocarray.c Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/unbound/compat/reallocarray.c Tue Dec 15 19:52:02 2015 (r292286) @@ -18,7 +18,10 @@ #include "config.h" #include #include +#ifdef HAVE_STDINT_H #include +#endif +#include #include /* Modified: user/ngie/more-tests2/contrib/unbound/compat/sha512.c ============================================================================== --- user/ngie/more-tests2/contrib/unbound/compat/sha512.c Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/unbound/compat/sha512.c Tue Dec 15 19:52:02 2015 (r292286) @@ -70,7 +70,7 @@ unsigned char *SHA512(void *data, unsign * Please make sure that your system defines BYTE_ORDER. If your * architecture is little-endian, make sure it also defines * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are - * equivilent. + * equivalent. * * If your system does not define the above, then you can do so by * hand like this: Modified: user/ngie/more-tests2/contrib/unbound/compat/snprintf.c ============================================================================== --- user/ngie/more-tests2/contrib/unbound/compat/snprintf.c Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/unbound/compat/snprintf.c Tue Dec 15 19:52:02 2015 (r292286) @@ -42,6 +42,7 @@ #ifdef HAVE_STDINT_H #include #endif +#include /* for test */ /* #define SNPRINTF_TEST 1 */ @@ -428,7 +429,7 @@ print_num_llp(char** at, size_t* left, i char buf[PRINT_DEC_BUFSZ]; int negative = 0; int zero = (value == 0); -#if defined(UINTPTR_MAX) && defined(UINT32_MAX) && (UINTPTR_MAX == UINT32_MAX) +#if defined(SIZE_MAX) && defined(UINT32_MAX) && (UINT32_MAX == SIZE_MAX || INT32_MAX == SIZE_MAX) /* avoid warning about upcast on 32bit systems */ unsigned long long llvalue = (unsigned long)value; #else Modified: user/ngie/more-tests2/contrib/unbound/config.h ============================================================================== --- user/ngie/more-tests2/contrib/unbound/config.h Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/unbound/config.h Tue Dec 15 19:52:02 2015 (r292286) @@ -85,7 +85,7 @@ /* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to 0 if you don't. */ -#define HAVE_DECL_SSL_CTX_SET_ECDH_AUTO 0 +#define HAVE_DECL_SSL_CTX_SET_ECDH_AUTO 1 /* Define to 1 if you have the declaration of `strlcat', and to 0 if you don't. */ @@ -95,6 +95,10 @@ don't. */ /* #undef HAVE_DECL_STRLCPY */ +/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if + you don't. */ +#define HAVE_DECL_XML_STOPPARSER 1 + /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -152,6 +156,9 @@ /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #define HAVE_FSEEKO 1 +/* Define to 1 if you have the `fsync' function. */ +#define HAVE_FSYNC 1 + /* Whether getaddrinfo is available */ #define HAVE_GETADDRINFO 1 @@ -206,6 +213,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_IPHLPAPI_H */ +/* Define to 1 if you have the `isblank' function. */ +#define HAVE_ISBLANK 1 + /* Define to 1 if you have the `kill' function. */ #define HAVE_KILL 1 @@ -233,6 +243,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_NETINET_IN_H 1 +/* Use libnettle for crypto */ +/* #undef HAVE_NETTLE */ + /* Use libnss for crypto */ /* #undef HAVE_NSS */ @@ -497,7 +510,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.5.5" +#define PACKAGE_STRING "unbound 1.5.7" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -506,7 +519,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.5.5" +#define PACKAGE_VERSION "1.5.7" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -525,7 +538,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,5,5,0 +#define RSRC_PACKAGE_VERSION 1,5,7,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" @@ -536,6 +549,9 @@ /* The size of `time_t', as computed by sizeof. */ #define SIZEOF_TIME_T 8 +/* define if (v)snprintf does not return length needed, (but length used) */ +/* #undef SNPRINTF_RET_BROKEN */ + /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -570,7 +586,7 @@ /* #undef USE_ECDSA_EVP_WORKAROUND */ /* Define this to enable GOST support. */ -/* #undef USE_GOST */ +#define USE_GOST 1 /* Define if you want to use internal select based events */ #define USE_MINI_EVENT 1 @@ -849,15 +865,13 @@ #define MAXHOSTNAMELEN 256 #endif - -#ifndef HAVE_SNPRINTF +#if !defined(HAVE_SNPRINTF) || defined(SNPRINTF_RET_BROKEN) #define snprintf snprintf_unbound #define vsnprintf vsnprintf_unbound #include int snprintf (char *str, size_t count, const char *fmt, ...); int vsnprintf (char *str, size_t count, const char *fmt, va_list arg); -#endif /* HAVE_SNPRINTF */ - +#endif /* HAVE_SNPRINTF or SNPRINTF_RET_BROKEN */ #ifndef HAVE_INET_PTON #define inet_pton inet_pton_unbound @@ -953,6 +967,11 @@ int memcmp(const void *x, const void *y, char *ctime_r(const time_t *timep, char *buf); #endif +#ifndef HAVE_ISBLANK +#define isblank unbound_isblank +int isblank(int c); +#endif + #if !defined(HAVE_STRPTIME) || !defined(STRPTIME_WORKS) #define strptime unbound_strptime struct tm; Modified: user/ngie/more-tests2/contrib/unbound/config.h.in ============================================================================== --- user/ngie/more-tests2/contrib/unbound/config.h.in Tue Dec 15 19:23:07 2015 (r292285) +++ user/ngie/more-tests2/contrib/unbound/config.h.in Tue Dec 15 19:52:02 2015 (r292286) @@ -94,6 +94,10 @@ don't. */ #undef HAVE_DECL_STRLCPY +/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if + you don't. */ +#undef HAVE_DECL_XML_STOPPARSER + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H @@ -151,6 +155,9 @@ /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #undef HAVE_FSEEKO +/* Define to 1 if you have the `fsync' function. */ +#undef HAVE_FSYNC + /* Whether getaddrinfo is available */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Thu Dec 17 01:13:11 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD996A49806 for ; Thu, 17 Dec 2015 01:13:11 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3101B110C; Thu, 17 Dec 2015 01:13:11 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBH1DACi049623; Thu, 17 Dec 2015 01:13:10 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBH1D749049593; Thu, 17 Dec 2015 01:13:07 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201512170113.tBH1D749049593@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 17 Dec 2015 01:13:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292390 - in user/alc/PQ_LAUNDRY: . bin/sh contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests contrib/elftoolchain/addr2line contrib/elftoolchain/common contrib/elftoolchain/elfcop... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2015 01:13:11 -0000 Author: markj Date: Thu Dec 17 01:13:06 2015 New Revision: 292390 URL: https://svnweb.freebsd.org/changeset/base/292390 Log: MFH r292389 Added: user/alc/PQ_LAUNDRY/contrib/unbound/.gitignore - copied unchanged from r292389, head/contrib/unbound/.gitignore user/alc/PQ_LAUNDRY/contrib/unbound/compat/isblank.c - copied unchanged from r292389, head/contrib/unbound/compat/isblank.c user/alc/PQ_LAUNDRY/etc/etc.riscv/ - copied from r292389, head/etc/etc.riscv/ user/alc/PQ_LAUNDRY/lib/csu/riscv/ - copied from r292389, head/lib/csu/riscv/ user/alc/PQ_LAUNDRY/lib/libc/riscv/ - copied from r292389, head/lib/libc/riscv/ user/alc/PQ_LAUNDRY/lib/libc/tests/nss/ - copied from r292389, head/lib/libc/tests/nss/ user/alc/PQ_LAUNDRY/lib/libc/tests/resolv/ - copied from r292389, head/lib/libc/tests/resolv/ user/alc/PQ_LAUNDRY/lib/libsysdecode/ - copied from r292389, head/lib/libsysdecode/ user/alc/PQ_LAUNDRY/lib/libthr/arch/riscv/ - copied from r292389, head/lib/libthr/arch/riscv/ user/alc/PQ_LAUNDRY/lib/msun/riscv/ - copied from r292389, head/lib/msun/riscv/ user/alc/PQ_LAUNDRY/lib/msun/tests/cexp_test.c - copied unchanged from r292389, head/lib/msun/tests/cexp_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/conj_test.c - copied unchanged from r292389, head/lib/msun/tests/conj_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/csqrt_test.c - copied unchanged from r292389, head/lib/msun/tests/csqrt_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/fenv_test.c - copied unchanged from r292389, head/lib/msun/tests/fenv_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/fmaxmin_test.c - copied unchanged from r292389, head/lib/msun/tests/fmaxmin_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/ilogb_test.c - copied unchanged from r292389, head/lib/msun/tests/ilogb_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/invctrig_test.c - copied unchanged from r292389, head/lib/msun/tests/invctrig_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/logarithm_test.c - copied unchanged from r292389, head/lib/msun/tests/logarithm_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/lrint_test.c - copied unchanged from r292389, head/lib/msun/tests/lrint_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/nan_test.c - copied unchanged from r292389, head/lib/msun/tests/nan_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/nearbyint_test.c - copied unchanged from r292389, head/lib/msun/tests/nearbyint_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/next_test.c - copied unchanged from r292389, head/lib/msun/tests/next_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/rem_test.c - copied unchanged from r292389, head/lib/msun/tests/rem_test.c user/alc/PQ_LAUNDRY/lib/msun/tests/trig_test.c - copied unchanged from r292389, head/lib/msun/tests/trig_test.c user/alc/PQ_LAUNDRY/share/man/man9/proc_rwmem.9 - copied unchanged from r292389, head/share/man/man9/proc_rwmem.9 user/alc/PQ_LAUNDRY/sys/modules/tcp/ - copied from r292389, head/sys/modules/tcp/ user/alc/PQ_LAUNDRY/sys/netinet/in_fib.c - copied unchanged from r292389, head/sys/netinet/in_fib.c user/alc/PQ_LAUNDRY/sys/netinet/in_fib.h - copied unchanged from r292389, head/sys/netinet/in_fib.h user/alc/PQ_LAUNDRY/sys/netinet/tcp_stacks/ - copied from r292389, head/sys/netinet/tcp_stacks/ user/alc/PQ_LAUNDRY/sys/netinet6/in6_fib.c - copied unchanged from r292389, head/sys/netinet6/in6_fib.c user/alc/PQ_LAUNDRY/sys/netinet6/in6_fib.h - copied unchanged from r292389, head/sys/netinet6/in6_fib.h Deleted: user/alc/PQ_LAUNDRY/sys/arm/include/katelib.h user/alc/PQ_LAUNDRY/tools/regression/lib/libc/nss/ user/alc/PQ_LAUNDRY/tools/regression/lib/libc/resolv/ user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-cexp.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-cexp.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-conj.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-conj.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-csqrt.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-csqrt.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-fenv.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-fenv.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-fmaxmin.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-fmaxmin.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-ilogb.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-ilogb.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-invctrig.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-logarithm.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-logarithm.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-lrint.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-lrint.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-nan.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-nan.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-nearbyint.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-nearbyint.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-next.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-next.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-rem.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-rem.t user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-trig.c user/alc/PQ_LAUNDRY/tools/regression/lib/msun/test-trig.t user/alc/PQ_LAUNDRY/usr.bin/kdump/utrace.c Modified: user/alc/PQ_LAUNDRY/MAINTAINERS (contents, props changed) user/alc/PQ_LAUNDRY/Makefile user/alc/PQ_LAUNDRY/Makefile.inc1 user/alc/PQ_LAUNDRY/UPDATING user/alc/PQ_LAUNDRY/bin/sh/var.c user/alc/PQ_LAUNDRY/contrib/bmake/ChangeLog user/alc/PQ_LAUNDRY/contrib/bmake/Makefile user/alc/PQ_LAUNDRY/contrib/bmake/boot-strap user/alc/PQ_LAUNDRY/contrib/bmake/cond.c user/alc/PQ_LAUNDRY/contrib/bmake/config.h.in user/alc/PQ_LAUNDRY/contrib/bmake/configure user/alc/PQ_LAUNDRY/contrib/bmake/configure.in user/alc/PQ_LAUNDRY/contrib/bmake/main.c user/alc/PQ_LAUNDRY/contrib/bmake/meta.c user/alc/PQ_LAUNDRY/contrib/bmake/mk/ChangeLog user/alc/PQ_LAUNDRY/contrib/bmake/mk/host-target.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/init.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/install-mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/lib.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.autodep.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.stage.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.subdir.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.sys.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/own.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys.mk user/alc/PQ_LAUNDRY/contrib/bmake/os.sh user/alc/PQ_LAUNDRY/contrib/bmake/parse.c user/alc/PQ_LAUNDRY/contrib/bmake/unit-tests/Makefile.in user/alc/PQ_LAUNDRY/contrib/bmake/unit-tests/cond2.mk user/alc/PQ_LAUNDRY/contrib/bmake/unit-tests/doterror.exp user/alc/PQ_LAUNDRY/contrib/bmake/unit-tests/modts.mk user/alc/PQ_LAUNDRY/contrib/bmake/var.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/addr2line/addr2line.1 user/alc/PQ_LAUNDRY/contrib/elftoolchain/addr2line/addr2line.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/common/elfdefinitions.h user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/binary.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/elfcopy.1 user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/main.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/sections.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/segments.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelf/elf_data.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/readelf/readelf.c user/alc/PQ_LAUNDRY/contrib/llvm/tools/lldb/docs/lldb.1 user/alc/PQ_LAUNDRY/contrib/mdocml/lib.in user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/ibaddr/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/ibnetdiscover/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/ibping/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/ibportstate/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/ibroute/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/ibsendtrap/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/ibstat/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/ibsysstat/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/ibtracert/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/opensm/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/osmtest/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/perfquery/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/saquery/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/sminfo/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/smpdump/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/smpquery/Makefile user/alc/PQ_LAUNDRY/contrib/ofed/usr.bin/vendstat/Makefile user/alc/PQ_LAUNDRY/contrib/smbfs/README user/alc/PQ_LAUNDRY/contrib/top/loadavg.h user/alc/PQ_LAUNDRY/contrib/unbound/Makefile.in user/alc/PQ_LAUNDRY/contrib/unbound/acx_nlnetlabs.m4 user/alc/PQ_LAUNDRY/contrib/unbound/compat/arc4random.c user/alc/PQ_LAUNDRY/contrib/unbound/compat/getentropy_linux.c user/alc/PQ_LAUNDRY/contrib/unbound/compat/getentropy_solaris.c user/alc/PQ_LAUNDRY/contrib/unbound/compat/reallocarray.c user/alc/PQ_LAUNDRY/contrib/unbound/compat/sha512.c user/alc/PQ_LAUNDRY/contrib/unbound/compat/snprintf.c user/alc/PQ_LAUNDRY/contrib/unbound/config.h user/alc/PQ_LAUNDRY/contrib/unbound/config.h.in user/alc/PQ_LAUNDRY/contrib/unbound/configure user/alc/PQ_LAUNDRY/contrib/unbound/configure.ac user/alc/PQ_LAUNDRY/contrib/unbound/daemon/remote.c user/alc/PQ_LAUNDRY/contrib/unbound/daemon/unbound.c user/alc/PQ_LAUNDRY/contrib/unbound/daemon/worker.c user/alc/PQ_LAUNDRY/contrib/unbound/dns64/dns64.c user/alc/PQ_LAUNDRY/contrib/unbound/dnstap/dnstap.proto user/alc/PQ_LAUNDRY/contrib/unbound/doc/Changelog user/alc/PQ_LAUNDRY/contrib/unbound/doc/README user/alc/PQ_LAUNDRY/contrib/unbound/doc/example.conf user/alc/PQ_LAUNDRY/contrib/unbound/doc/example.conf.in user/alc/PQ_LAUNDRY/contrib/unbound/doc/libunbound.3 user/alc/PQ_LAUNDRY/contrib/unbound/doc/libunbound.3.in user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound-anchor.8 user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound-anchor.8.in user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound-checkconf.8 user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound-checkconf.8.in user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound-control.8 user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound-control.8.in user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound-host.1 user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound-host.1.in user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound.8 user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound.8.in user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound.conf.5 user/alc/PQ_LAUNDRY/contrib/unbound/doc/unbound.conf.5.in user/alc/PQ_LAUNDRY/contrib/unbound/freebsd-configure.sh user/alc/PQ_LAUNDRY/contrib/unbound/iterator/iter_scrub.c user/alc/PQ_LAUNDRY/contrib/unbound/iterator/iter_utils.c user/alc/PQ_LAUNDRY/contrib/unbound/iterator/iterator.c user/alc/PQ_LAUNDRY/contrib/unbound/iterator/iterator.h user/alc/PQ_LAUNDRY/contrib/unbound/libunbound/libunbound.c user/alc/PQ_LAUNDRY/contrib/unbound/libunbound/python/Makefile user/alc/PQ_LAUNDRY/contrib/unbound/libunbound/python/doc/install.rst user/alc/PQ_LAUNDRY/contrib/unbound/libunbound/python/doc/modules/unbound.rst user/alc/PQ_LAUNDRY/contrib/unbound/libunbound/python/examples/dnssec-valid.py user/alc/PQ_LAUNDRY/contrib/unbound/libunbound/python/libunbound.i user/alc/PQ_LAUNDRY/contrib/unbound/ltmain.sh user/alc/PQ_LAUNDRY/contrib/unbound/services/cache/dns.c user/alc/PQ_LAUNDRY/contrib/unbound/services/cache/rrset.c user/alc/PQ_LAUNDRY/contrib/unbound/sldns/parseutil.h user/alc/PQ_LAUNDRY/contrib/unbound/sldns/wire2str.c user/alc/PQ_LAUNDRY/contrib/unbound/smallapp/unbound-anchor.c user/alc/PQ_LAUNDRY/contrib/unbound/smallapp/unbound-checkconf.c user/alc/PQ_LAUNDRY/contrib/unbound/smallapp/unbound-control-setup.sh user/alc/PQ_LAUNDRY/contrib/unbound/smallapp/unbound-control-setup.sh.in user/alc/PQ_LAUNDRY/contrib/unbound/smallapp/unbound-control.c user/alc/PQ_LAUNDRY/contrib/unbound/util/config_file.c user/alc/PQ_LAUNDRY/contrib/unbound/util/config_file.h user/alc/PQ_LAUNDRY/contrib/unbound/util/configlexer.lex user/alc/PQ_LAUNDRY/contrib/unbound/util/configparser.y user/alc/PQ_LAUNDRY/contrib/unbound/util/iana_ports.inc user/alc/PQ_LAUNDRY/contrib/unbound/util/locks.c user/alc/PQ_LAUNDRY/contrib/unbound/util/net_help.c user/alc/PQ_LAUNDRY/contrib/unbound/util/random.c user/alc/PQ_LAUNDRY/contrib/unbound/util/rbtree.c user/alc/PQ_LAUNDRY/contrib/unbound/util/rtt.h user/alc/PQ_LAUNDRY/contrib/unbound/util/storage/lookup3.c user/alc/PQ_LAUNDRY/contrib/unbound/util/tube.h user/alc/PQ_LAUNDRY/contrib/unbound/util/winsock_event.h user/alc/PQ_LAUNDRY/contrib/unbound/validator/autotrust.c user/alc/PQ_LAUNDRY/contrib/unbound/validator/val_neg.c user/alc/PQ_LAUNDRY/contrib/unbound/validator/val_neg.h user/alc/PQ_LAUNDRY/contrib/unbound/validator/val_nsec.c user/alc/PQ_LAUNDRY/contrib/unbound/validator/val_nsec.h user/alc/PQ_LAUNDRY/contrib/unbound/validator/val_nsec3.c user/alc/PQ_LAUNDRY/contrib/unbound/validator/val_nsec3.h user/alc/PQ_LAUNDRY/contrib/unbound/validator/val_secalgo.c user/alc/PQ_LAUNDRY/contrib/unbound/validator/val_secalgo.h user/alc/PQ_LAUNDRY/contrib/unbound/validator/val_sigcrypt.c user/alc/PQ_LAUNDRY/contrib/unbound/validator/val_utils.h user/alc/PQ_LAUNDRY/contrib/unbound/validator/validator.c user/alc/PQ_LAUNDRY/etc/mtree/BSD.tests.dist user/alc/PQ_LAUNDRY/etc/periodic/daily/800.scrub-zfs user/alc/PQ_LAUNDRY/include/resolv.h user/alc/PQ_LAUNDRY/kerberos5/lib/libgssapi_krb5/Makefile.depend user/alc/PQ_LAUNDRY/kerberos5/lib/libgssapi_ntlm/Makefile.depend user/alc/PQ_LAUNDRY/kerberos5/lib/libhdb/Makefile.depend user/alc/PQ_LAUNDRY/kerberos5/lib/libheimntlm/Makefile.depend user/alc/PQ_LAUNDRY/kerberos5/lib/libkadm5clnt/Makefile.depend user/alc/PQ_LAUNDRY/kerberos5/lib/libkadm5srv/Makefile.depend user/alc/PQ_LAUNDRY/kerberos5/lib/libkafs5/Makefile.depend user/alc/PQ_LAUNDRY/kerberos5/lib/libkdc/Makefile.depend user/alc/PQ_LAUNDRY/lib/Makefile user/alc/PQ_LAUNDRY/lib/csu/aarch64/crt1.c user/alc/PQ_LAUNDRY/lib/csu/amd64/crt1.c user/alc/PQ_LAUNDRY/lib/csu/arm/crt1.c user/alc/PQ_LAUNDRY/lib/csu/i386/crt1_c.c user/alc/PQ_LAUNDRY/lib/csu/mips/crt1.c user/alc/PQ_LAUNDRY/lib/csu/powerpc/crt1.c user/alc/PQ_LAUNDRY/lib/csu/powerpc64/crt1.c user/alc/PQ_LAUNDRY/lib/csu/sparc64/crt1.c user/alc/PQ_LAUNDRY/lib/lib80211/Makefile.depend user/alc/PQ_LAUNDRY/lib/lib80211/lib80211.3 user/alc/PQ_LAUNDRY/lib/libc/gen/exec.3 user/alc/PQ_LAUNDRY/lib/libc/gen/getnetgrent.c user/alc/PQ_LAUNDRY/lib/libc/net/getaddrinfo.c user/alc/PQ_LAUNDRY/lib/libc/regex/grot/Makefile user/alc/PQ_LAUNDRY/lib/libc/resolv/res_init.c user/alc/PQ_LAUNDRY/lib/libc/resolv/res_mkquery.c user/alc/PQ_LAUNDRY/lib/libc/resolv/res_mkupdate.c user/alc/PQ_LAUNDRY/lib/libc/resolv/res_private.h user/alc/PQ_LAUNDRY/lib/libc/resolv/res_query.c user/alc/PQ_LAUNDRY/lib/libc/resolv/res_send.c user/alc/PQ_LAUNDRY/lib/libc/resolv/res_state.c user/alc/PQ_LAUNDRY/lib/libc/rpc/svc_vc.c user/alc/PQ_LAUNDRY/lib/libc/stdio/open_memstream.c user/alc/PQ_LAUNDRY/lib/libc/stdio/open_wmemstream.c user/alc/PQ_LAUNDRY/lib/libc/sys/brk.2 user/alc/PQ_LAUNDRY/lib/libc/sys/getgid.2 user/alc/PQ_LAUNDRY/lib/libc/sys/getpid.2 user/alc/PQ_LAUNDRY/lib/libc/sys/getuid.2 user/alc/PQ_LAUNDRY/lib/libc/sys/read.2 user/alc/PQ_LAUNDRY/lib/libc/sys/setuid.2 user/alc/PQ_LAUNDRY/lib/libc/sys/utrace.2 user/alc/PQ_LAUNDRY/lib/libc/sys/write.2 user/alc/PQ_LAUNDRY/lib/libc/tests/Makefile user/alc/PQ_LAUNDRY/lib/libc/tests/stdio/getdelim_test.c user/alc/PQ_LAUNDRY/lib/libc/tests/stdio/printbasic_test.c user/alc/PQ_LAUNDRY/lib/libc/tests/stdio/printfloat_test.c user/alc/PQ_LAUNDRY/lib/libfetch/http.c user/alc/PQ_LAUNDRY/lib/libopenbsd/Makefile user/alc/PQ_LAUNDRY/lib/libopenbsd/imsg.c user/alc/PQ_LAUNDRY/lib/libpam/modules/pam_krb5/Makefile.depend user/alc/PQ_LAUNDRY/lib/libpam/modules/pam_ksu/Makefile.depend user/alc/PQ_LAUNDRY/lib/libstand/Makefile user/alc/PQ_LAUNDRY/lib/libstand/tftp.c user/alc/PQ_LAUNDRY/lib/msun/tests/Makefile user/alc/PQ_LAUNDRY/sbin/devd/devd.cc user/alc/PQ_LAUNDRY/sbin/geom/class/multipath/geom_multipath.c user/alc/PQ_LAUNDRY/sbin/geom/class/part/gpart.8 user/alc/PQ_LAUNDRY/sbin/reboot/reboot.8 user/alc/PQ_LAUNDRY/sbin/reboot/reboot.c user/alc/PQ_LAUNDRY/sbin/swapon/swapon.c user/alc/PQ_LAUNDRY/sbin/sysctl/sysctl.8 user/alc/PQ_LAUNDRY/sbin/sysctl/sysctl.c user/alc/PQ_LAUNDRY/secure/lib/libcrypto/engines/Makefile user/alc/PQ_LAUNDRY/share/man/man4/aesni.4 user/alc/PQ_LAUNDRY/share/man/man4/blackhole.4 user/alc/PQ_LAUNDRY/share/man/man4/crypto.4 user/alc/PQ_LAUNDRY/share/man/man4/dtrace_io.4 user/alc/PQ_LAUNDRY/share/man/man4/dtrace_ip.4 user/alc/PQ_LAUNDRY/share/man/man4/dtrace_tcp.4 user/alc/PQ_LAUNDRY/share/man/man4/dtrace_udp.4 user/alc/PQ_LAUNDRY/share/man/man4/ioat.4 user/alc/PQ_LAUNDRY/share/man/man4/isp.4 user/alc/PQ_LAUNDRY/share/man/man4/mlx5en.4 user/alc/PQ_LAUNDRY/share/man/man4/mps.4 user/alc/PQ_LAUNDRY/share/man/man4/netmap.4 user/alc/PQ_LAUNDRY/share/man/man4/pass.4 user/alc/PQ_LAUNDRY/share/man/man5/src.conf.5 user/alc/PQ_LAUNDRY/share/man/man9/BUS_DESCRIBE_INTR.9 user/alc/PQ_LAUNDRY/share/man/man9/VOP_GETPAGES.9 user/alc/PQ_LAUNDRY/share/misc/bsd-family-tree user/alc/PQ_LAUNDRY/share/mk/bsd.compiler.mk user/alc/PQ_LAUNDRY/share/mk/bsd.cpu.mk user/alc/PQ_LAUNDRY/share/mk/bsd.endian.mk user/alc/PQ_LAUNDRY/share/mk/bsd.libnames.mk user/alc/PQ_LAUNDRY/share/mk/bsd.opts.mk user/alc/PQ_LAUNDRY/share/mk/bsd.snmpmod.mk user/alc/PQ_LAUNDRY/share/mk/bsd.sys.mk user/alc/PQ_LAUNDRY/share/mk/local.dirdeps.mk user/alc/PQ_LAUNDRY/share/mk/local.meta.sys.mk user/alc/PQ_LAUNDRY/share/mk/src.libnames.mk user/alc/PQ_LAUNDRY/share/mk/src.opts.mk user/alc/PQ_LAUNDRY/share/mk/sys.mk user/alc/PQ_LAUNDRY/sys/arm/allwinner/a10_mmc.c user/alc/PQ_LAUNDRY/sys/arm/amlogic/aml8726/aml8726_mmc.c user/alc/PQ_LAUNDRY/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c user/alc/PQ_LAUNDRY/sys/arm/arm/pmap-v6-new.c user/alc/PQ_LAUNDRY/sys/arm/arm/trap.c user/alc/PQ_LAUNDRY/sys/arm/at91/at91_mci.c user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c user/alc/PQ_LAUNDRY/sys/arm/conf/NOTES user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/imx_sdhci.c user/alc/PQ_LAUNDRY/sys/arm/include/cpufunc.h user/alc/PQ_LAUNDRY/sys/arm/include/pmap-v6.h user/alc/PQ_LAUNDRY/sys/arm/lpc/lpc_mmc.c user/alc/PQ_LAUNDRY/sys/arm/ti/ti_sdhci.c user/alc/PQ_LAUNDRY/sys/arm64/arm64/exception.S user/alc/PQ_LAUNDRY/sys/arm64/arm64/gic.c user/alc/PQ_LAUNDRY/sys/arm64/arm64/gic.h user/alc/PQ_LAUNDRY/sys/arm64/arm64/gic_fdt.c user/alc/PQ_LAUNDRY/sys/arm64/arm64/gic_v3_its.c user/alc/PQ_LAUNDRY/sys/arm64/arm64/gic_v3_var.h user/alc/PQ_LAUNDRY/sys/arm64/arm64/intr_machdep.c user/alc/PQ_LAUNDRY/sys/arm64/arm64/pic_if.m user/alc/PQ_LAUNDRY/sys/arm64/cavium/thunder_pcie.c user/alc/PQ_LAUNDRY/sys/arm64/cavium/thunder_pcie_common.c user/alc/PQ_LAUNDRY/sys/arm64/cavium/thunder_pcie_pem.c user/alc/PQ_LAUNDRY/sys/arm64/conf/GENERIC user/alc/PQ_LAUNDRY/sys/arm64/include/intr.h user/alc/PQ_LAUNDRY/sys/boot/common/part.c user/alc/PQ_LAUNDRY/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c user/alc/PQ_LAUNDRY/sys/boot/efi/loader/arch/arm/exec.c user/alc/PQ_LAUNDRY/sys/boot/efi/loader/arch/arm64/exec.c user/alc/PQ_LAUNDRY/sys/boot/efi/loader/bootinfo.c user/alc/PQ_LAUNDRY/sys/boot/efi/loader/loader_efi.h user/alc/PQ_LAUNDRY/sys/boot/i386/libi386/libi386.h user/alc/PQ_LAUNDRY/sys/boot/i386/libi386/pxe.c user/alc/PQ_LAUNDRY/sys/boot/i386/loader/main.c user/alc/PQ_LAUNDRY/sys/boot/uboot/common/main.c user/alc/PQ_LAUNDRY/sys/boot/userboot/test/Makefile.depend user/alc/PQ_LAUNDRY/sys/cam/ctl/ctl.c user/alc/PQ_LAUNDRY/sys/cam/ctl/ctl_backend_block.c user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/alc/PQ_LAUNDRY/sys/cddl/dev/dtrace/dtrace_cddl.h user/alc/PQ_LAUNDRY/sys/cddl/dev/systrace/systrace.c user/alc/PQ_LAUNDRY/sys/compat/linux/linux_dtrace.h user/alc/PQ_LAUNDRY/sys/conf/files user/alc/PQ_LAUNDRY/sys/conf/kmod.mk user/alc/PQ_LAUNDRY/sys/conf/options user/alc/PQ_LAUNDRY/sys/dev/aic/aic_pccard.c user/alc/PQ_LAUNDRY/sys/dev/an/if_an_pccard.c user/alc/PQ_LAUNDRY/sys/dev/ata/ata-card.c user/alc/PQ_LAUNDRY/sys/dev/atkbdc/psm.c user/alc/PQ_LAUNDRY/sys/dev/bwn/if_bwn.c user/alc/PQ_LAUNDRY/sys/dev/cmx/cmx_pccard.c user/alc/PQ_LAUNDRY/sys/dev/cs/if_cs_pccard.c user/alc/PQ_LAUNDRY/sys/dev/drm2/i915/i915_gem.c user/alc/PQ_LAUNDRY/sys/dev/drm2/ttm/ttm_tt.c user/alc/PQ_LAUNDRY/sys/dev/ed/if_ed_isa.c user/alc/PQ_LAUNDRY/sys/dev/ed/if_ed_pccard.c user/alc/PQ_LAUNDRY/sys/dev/ed/if_ed_pci.c user/alc/PQ_LAUNDRY/sys/dev/ep/if_ep_pccard.c user/alc/PQ_LAUNDRY/sys/dev/etherswitch/arswitch/arswitch_9340.c user/alc/PQ_LAUNDRY/sys/dev/ex/if_ex_pccard.c user/alc/PQ_LAUNDRY/sys/dev/fdc/fdc_pccard.c user/alc/PQ_LAUNDRY/sys/dev/fdt/simplebus.c user/alc/PQ_LAUNDRY/sys/dev/fe/if_fe_pccard.c user/alc/PQ_LAUNDRY/sys/dev/hwpmc/hwpmc_core.c user/alc/PQ_LAUNDRY/sys/dev/hwpmc/hwpmc_logging.c user/alc/PQ_LAUNDRY/sys/dev/hyperv/utilities/hv_kvp.c user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat.c user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat.h user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat_hw.h user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat_internal.h user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat_test.c user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat_test.h user/alc/PQ_LAUNDRY/sys/dev/isp/isp.c user/alc/PQ_LAUNDRY/sys/dev/isp/isp_pci.c user/alc/PQ_LAUNDRY/sys/dev/md/md.c user/alc/PQ_LAUNDRY/sys/dev/mmc/bridge.h user/alc/PQ_LAUNDRY/sys/dev/mmc/host/dwmmc.c user/alc/PQ_LAUNDRY/sys/dev/mmc/mmc.c user/alc/PQ_LAUNDRY/sys/dev/mpr/mpr_sas_lsi.c user/alc/PQ_LAUNDRY/sys/dev/mps/mps_sas_lsi.c user/alc/PQ_LAUNDRY/sys/dev/ncv/ncr53c500_pccard.c user/alc/PQ_LAUNDRY/sys/dev/nsp/nsp_pccard.c user/alc/PQ_LAUNDRY/sys/dev/nvd/nvd.c user/alc/PQ_LAUNDRY/sys/dev/nvme/nvme.h user/alc/PQ_LAUNDRY/sys/dev/nvme/nvme_ns.c user/alc/PQ_LAUNDRY/sys/dev/nvme/nvme_sysctl.c user/alc/PQ_LAUNDRY/sys/dev/ofw/ofw_bus_subr.c user/alc/PQ_LAUNDRY/sys/dev/ofw/ofw_bus_subr.h user/alc/PQ_LAUNDRY/sys/dev/ofw/ofw_iicbus.c user/alc/PQ_LAUNDRY/sys/dev/otus/if_otus.c user/alc/PQ_LAUNDRY/sys/dev/pccard/pccardvar.h user/alc/PQ_LAUNDRY/sys/dev/pci/pci_host_generic.c user/alc/PQ_LAUNDRY/sys/dev/ral/rt2560.c user/alc/PQ_LAUNDRY/sys/dev/ral/rt2661.c user/alc/PQ_LAUNDRY/sys/dev/ral/rt2860.c user/alc/PQ_LAUNDRY/sys/dev/sdhci/sdhci_fdt.c user/alc/PQ_LAUNDRY/sys/dev/sdhci/sdhci_pci.c user/alc/PQ_LAUNDRY/sys/dev/sfxge/common/efx.h user/alc/PQ_LAUNDRY/sys/dev/sfxge/common/efx_impl.h user/alc/PQ_LAUNDRY/sys/dev/sfxge/common/efx_mcdi.c user/alc/PQ_LAUNDRY/sys/dev/sfxge/common/efx_mcdi.h user/alc/PQ_LAUNDRY/sys/dev/sfxge/common/efx_types.h user/alc/PQ_LAUNDRY/sys/dev/sfxge/common/hunt_ev.c user/alc/PQ_LAUNDRY/sys/dev/sfxge/common/hunt_impl.h user/alc/PQ_LAUNDRY/sys/dev/sfxge/common/hunt_mcdi.c user/alc/PQ_LAUNDRY/sys/dev/sfxge/common/siena_impl.h user/alc/PQ_LAUNDRY/sys/dev/sfxge/common/siena_mcdi.c user/alc/PQ_LAUNDRY/sys/dev/sfxge/sfxge.c user/alc/PQ_LAUNDRY/sys/dev/sn/if_sn_pccard.c user/alc/PQ_LAUNDRY/sys/dev/snc/if_snc_pccard.c user/alc/PQ_LAUNDRY/sys/dev/sound/usb/uaudio.c user/alc/PQ_LAUNDRY/sys/dev/stg/tmc18c30_pccard.c user/alc/PQ_LAUNDRY/sys/dev/uart/uart_bus_pccard.c user/alc/PQ_LAUNDRY/sys/dev/usb/input/atp.c user/alc/PQ_LAUNDRY/sys/dev/usb/input/uep.c user/alc/PQ_LAUNDRY/sys/dev/usb/input/uhid.c user/alc/PQ_LAUNDRY/sys/dev/usb/input/ukbd.c user/alc/PQ_LAUNDRY/sys/dev/usb/input/ums.c user/alc/PQ_LAUNDRY/sys/dev/usb/input/wsp.c user/alc/PQ_LAUNDRY/sys/dev/usb/misc/udbp.c user/alc/PQ_LAUNDRY/sys/dev/usb/misc/ufm.c user/alc/PQ_LAUNDRY/sys/dev/usb/misc/ugold.c user/alc/PQ_LAUNDRY/sys/dev/usb/misc/uled.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_aue.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_axe.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_axge.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_cdce.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_cue.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_ipheth.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_kue.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_mos.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_rue.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_smsc.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_udav.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_urndis.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_usie.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/uhso.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/u3g.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uark.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/ubsa.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uchcom.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/ucycom.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/ufoma.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uftdi.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/ugensa.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uipaq.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/ulpt.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/umcs.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/umct.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/umodem.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/umoscom.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uplcom.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uslcom.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uvisor.c user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uvscom.c user/alc/PQ_LAUNDRY/sys/dev/usb/storage/umass.c user/alc/PQ_LAUNDRY/sys/dev/usb/storage/urio.c user/alc/PQ_LAUNDRY/sys/dev/usb/usb_hub.c user/alc/PQ_LAUNDRY/sys/dev/usb/usbdi.h user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_rsu.c user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_rum.c user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_run.c user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_uath.c user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_upgt.c user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_ural.c user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_urtw.c user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_urtwn.c user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_urtwnreg.h user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_urtwnvar.h user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_zyd.c user/alc/PQ_LAUNDRY/sys/dev/wi/if_wi_pccard.c user/alc/PQ_LAUNDRY/sys/dev/wpi/if_wpi.c user/alc/PQ_LAUNDRY/sys/dev/wpi/if_wpi_debug.h user/alc/PQ_LAUNDRY/sys/dev/wtap/if_wtap_module.c user/alc/PQ_LAUNDRY/sys/dev/wtap/if_wtapvar.h user/alc/PQ_LAUNDRY/sys/dev/wtap/plugins/visibility.c user/alc/PQ_LAUNDRY/sys/dev/xe/if_xe_pccard.c user/alc/PQ_LAUNDRY/sys/fs/fuse/fuse_vnops.c user/alc/PQ_LAUNDRY/sys/fs/nfsclient/nfs_clbio.c user/alc/PQ_LAUNDRY/sys/fs/smbfs/smbfs_io.c user/alc/PQ_LAUNDRY/sys/fs/tmpfs/tmpfs_subr.c user/alc/PQ_LAUNDRY/sys/geom/multipath/g_multipath.c user/alc/PQ_LAUNDRY/sys/geom/part/g_part_gpt.c user/alc/PQ_LAUNDRY/sys/kern/kern_exec.c user/alc/PQ_LAUNDRY/sys/kern/kern_exit.c user/alc/PQ_LAUNDRY/sys/kern/kern_fork.c user/alc/PQ_LAUNDRY/sys/kern/kern_jail.c user/alc/PQ_LAUNDRY/sys/kern/kern_linker.c user/alc/PQ_LAUNDRY/sys/kern/kern_malloc.c user/alc/PQ_LAUNDRY/sys/kern/kern_proc.c user/alc/PQ_LAUNDRY/sys/kern/kern_racct.c user/alc/PQ_LAUNDRY/sys/kern/kern_rctl.c user/alc/PQ_LAUNDRY/sys/kern/kern_sig.c user/alc/PQ_LAUNDRY/sys/kern/kern_timeout.c user/alc/PQ_LAUNDRY/sys/kern/subr_syscall.c user/alc/PQ_LAUNDRY/sys/kern/uipc_shm.c user/alc/PQ_LAUNDRY/sys/kern/uipc_syscalls.c user/alc/PQ_LAUNDRY/sys/kern/vfs_bio.c user/alc/PQ_LAUNDRY/sys/kern/vfs_cache.c user/alc/PQ_LAUNDRY/sys/kern/vfs_default.c user/alc/PQ_LAUNDRY/sys/kern/vfs_subr.c user/alc/PQ_LAUNDRY/sys/kern/vnode_if.src user/alc/PQ_LAUNDRY/sys/mips/atheros/apb.c user/alc/PQ_LAUNDRY/sys/mips/atheros/if_arge.c user/alc/PQ_LAUNDRY/sys/mips/atheros/qca953x_chip.c user/alc/PQ_LAUNDRY/sys/mips/include/cpuregs.h user/alc/PQ_LAUNDRY/sys/modules/Makefile user/alc/PQ_LAUNDRY/sys/modules/ahci/Makefile user/alc/PQ_LAUNDRY/sys/modules/cam/Makefile user/alc/PQ_LAUNDRY/sys/net/if.c user/alc/PQ_LAUNDRY/sys/net/if_lagg.c user/alc/PQ_LAUNDRY/sys/net/if_lagg.h user/alc/PQ_LAUNDRY/sys/net/if_llatbl.c user/alc/PQ_LAUNDRY/sys/net/if_llatbl.h user/alc/PQ_LAUNDRY/sys/net/if_stf.c user/alc/PQ_LAUNDRY/sys/net/if_var.h user/alc/PQ_LAUNDRY/sys/net/route.c user/alc/PQ_LAUNDRY/sys/net/route.h user/alc/PQ_LAUNDRY/sys/net80211/ieee80211_phy.h user/alc/PQ_LAUNDRY/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c user/alc/PQ_LAUNDRY/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c user/alc/PQ_LAUNDRY/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c user/alc/PQ_LAUNDRY/sys/netinet/cc/cc_cubic.c user/alc/PQ_LAUNDRY/sys/netinet/cc/cc_newreno.c user/alc/PQ_LAUNDRY/sys/netinet/if_ether.c user/alc/PQ_LAUNDRY/sys/netinet/if_ether.h user/alc/PQ_LAUNDRY/sys/netinet/in_gif.c user/alc/PQ_LAUNDRY/sys/netinet/in_kdtrace.c user/alc/PQ_LAUNDRY/sys/netinet/in_kdtrace.h user/alc/PQ_LAUNDRY/sys/netinet/in_mcast.c user/alc/PQ_LAUNDRY/sys/netinet/in_var.h user/alc/PQ_LAUNDRY/sys/netinet/ip_carp.c user/alc/PQ_LAUNDRY/sys/netinet/ip_icmp.c user/alc/PQ_LAUNDRY/sys/netinet/ip_input.c user/alc/PQ_LAUNDRY/sys/netinet/ip_options.c user/alc/PQ_LAUNDRY/sys/netinet/ip_var.h user/alc/PQ_LAUNDRY/sys/netinet/sctp_cc_functions.c user/alc/PQ_LAUNDRY/sys/netinet/sctp_input.c user/alc/PQ_LAUNDRY/sys/netinet/sctp_output.c user/alc/PQ_LAUNDRY/sys/netinet/sctp_pcb.h user/alc/PQ_LAUNDRY/sys/netinet/tcp.h user/alc/PQ_LAUNDRY/sys/netinet/tcp_hostcache.c user/alc/PQ_LAUNDRY/sys/netinet/tcp_hostcache.h user/alc/PQ_LAUNDRY/sys/netinet/tcp_input.c user/alc/PQ_LAUNDRY/sys/netinet/tcp_sack.c user/alc/PQ_LAUNDRY/sys/netinet/tcp_subr.c user/alc/PQ_LAUNDRY/sys/netinet/tcp_syncache.c user/alc/PQ_LAUNDRY/sys/netinet/tcp_timer.c user/alc/PQ_LAUNDRY/sys/netinet/tcp_usrreq.c user/alc/PQ_LAUNDRY/sys/netinet/tcp_var.h user/alc/PQ_LAUNDRY/sys/netinet/toecore.c user/alc/PQ_LAUNDRY/sys/netinet6/icmp6.c user/alc/PQ_LAUNDRY/sys/netinet6/in6.c user/alc/PQ_LAUNDRY/sys/netinet6/in6_gif.c user/alc/PQ_LAUNDRY/sys/netinet6/in6_mcast.c user/alc/PQ_LAUNDRY/sys/netinet6/in6_src.c user/alc/PQ_LAUNDRY/sys/netinet6/in6_var.h user/alc/PQ_LAUNDRY/sys/netinet6/nd6.c user/alc/PQ_LAUNDRY/sys/netinet6/nd6.h user/alc/PQ_LAUNDRY/sys/netinet6/nd6_nbr.c user/alc/PQ_LAUNDRY/sys/netinet6/scope6.c user/alc/PQ_LAUNDRY/sys/netinet6/scope6_var.h user/alc/PQ_LAUNDRY/sys/netpfil/ipfw/ip_dn_io.c user/alc/PQ_LAUNDRY/sys/netpfil/ipfw/ip_dummynet.c user/alc/PQ_LAUNDRY/sys/netpfil/ipfw/ip_fw2.c user/alc/PQ_LAUNDRY/sys/powerpc/booke/booke_machdep.c user/alc/PQ_LAUNDRY/sys/powerpc/booke/trap_subr.S user/alc/PQ_LAUNDRY/sys/powerpc/include/trap.h user/alc/PQ_LAUNDRY/sys/powerpc/mpc85xx/fsl_sdhc.c user/alc/PQ_LAUNDRY/sys/powerpc/powerpc/trap.c user/alc/PQ_LAUNDRY/sys/security/mac/mac_framework.c user/alc/PQ_LAUNDRY/sys/security/mac/mac_internal.h user/alc/PQ_LAUNDRY/sys/sys/buf.h user/alc/PQ_LAUNDRY/sys/sys/module.h user/alc/PQ_LAUNDRY/sys/sys/sysent.h user/alc/PQ_LAUNDRY/sys/sys/vnode.h user/alc/PQ_LAUNDRY/sys/vm/default_pager.c user/alc/PQ_LAUNDRY/sys/vm/device_pager.c user/alc/PQ_LAUNDRY/sys/vm/phys_pager.c user/alc/PQ_LAUNDRY/sys/vm/sg_pager.c user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c user/alc/PQ_LAUNDRY/sys/vm/uma_core.c user/alc/PQ_LAUNDRY/sys/vm/vm_fault.c user/alc/PQ_LAUNDRY/sys/vm/vm_glue.c user/alc/PQ_LAUNDRY/sys/vm/vm_object.c user/alc/PQ_LAUNDRY/sys/vm/vm_object.h user/alc/PQ_LAUNDRY/sys/vm/vm_page.c user/alc/PQ_LAUNDRY/sys/vm/vm_page.h user/alc/PQ_LAUNDRY/sys/vm/vm_pager.c user/alc/PQ_LAUNDRY/sys/vm/vm_pager.h user/alc/PQ_LAUNDRY/sys/vm/vnode_pager.c user/alc/PQ_LAUNDRY/sys/vm/vnode_pager.h user/alc/PQ_LAUNDRY/sys/x86/x86/busdma_bounce.c user/alc/PQ_LAUNDRY/targets/pseudo/universe/Makefile user/alc/PQ_LAUNDRY/tests/freebsd_test_suite/macros.h user/alc/PQ_LAUNDRY/tools/bsdbox/Makefile.base user/alc/PQ_LAUNDRY/tools/build/mk/OptionalObsoleteFiles.inc user/alc/PQ_LAUNDRY/tools/build/options/makeman user/alc/PQ_LAUNDRY/tools/debugscripts/README user/alc/PQ_LAUNDRY/tools/regression/lib/msun/Makefile user/alc/PQ_LAUNDRY/tools/regression/mac/mac_portacl/misc.sh user/alc/PQ_LAUNDRY/tools/regression/tls/ttls2/ttls2.c user/alc/PQ_LAUNDRY/tools/regression/tls/ttls4/ttls4.c user/alc/PQ_LAUNDRY/tools/tools/ath/athratestats/Makefile user/alc/PQ_LAUNDRY/tools/tools/ioat/ioatcontrol.8 user/alc/PQ_LAUNDRY/tools/tools/ioat/ioatcontrol.c user/alc/PQ_LAUNDRY/tools/tools/nanobsd/defaults.sh user/alc/PQ_LAUNDRY/tools/tools/nanobsd/embedded/common user/alc/PQ_LAUNDRY/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg user/alc/PQ_LAUNDRY/usr.bin/bmake/Makefile user/alc/PQ_LAUNDRY/usr.bin/bmake/config.h user/alc/PQ_LAUNDRY/usr.bin/bmake/unit-tests/Makefile user/alc/PQ_LAUNDRY/usr.bin/clang/lldb/Makefile user/alc/PQ_LAUNDRY/usr.bin/clang/lldb/Makefile.depend user/alc/PQ_LAUNDRY/usr.bin/kdump/Makefile user/alc/PQ_LAUNDRY/usr.bin/kdump/Makefile.depend user/alc/PQ_LAUNDRY/usr.bin/kdump/kdump.c user/alc/PQ_LAUNDRY/usr.bin/mkimg/mbr.c user/alc/PQ_LAUNDRY/usr.bin/mkimg/scheme.c user/alc/PQ_LAUNDRY/usr.bin/mkimg/scheme.h user/alc/PQ_LAUNDRY/usr.bin/truss/Makefile user/alc/PQ_LAUNDRY/usr.bin/truss/Makefile.depend.amd64 user/alc/PQ_LAUNDRY/usr.bin/truss/syscalls.c user/alc/PQ_LAUNDRY/usr.bin/unzip/unzip.1 user/alc/PQ_LAUNDRY/usr.bin/unzip/unzip.c user/alc/PQ_LAUNDRY/usr.sbin/Makefile.arm user/alc/PQ_LAUNDRY/usr.sbin/crunch/crunchide/exec_elf32.c user/alc/PQ_LAUNDRY/usr.sbin/ctm/ctm/ctm.1 user/alc/PQ_LAUNDRY/usr.sbin/iostat/iostat.c user/alc/PQ_LAUNDRY/usr.sbin/kldxref/kldxref.c user/alc/PQ_LAUNDRY/usr.sbin/ndp/ndp.c user/alc/PQ_LAUNDRY/usr.sbin/ofwdump/Makefile.depend user/alc/PQ_LAUNDRY/usr.sbin/pmcstudy/pmcstudy.8 user/alc/PQ_LAUNDRY/usr.sbin/pmcstudy/pmcstudy.c user/alc/PQ_LAUNDRY/usr.sbin/sesutil/Makefile user/alc/PQ_LAUNDRY/usr.sbin/sesutil/eltsub.c user/alc/PQ_LAUNDRY/usr.sbin/sesutil/eltsub.h user/alc/PQ_LAUNDRY/usr.sbin/sesutil/sesutil.c user/alc/PQ_LAUNDRY/usr.sbin/ypldap/aldap.c user/alc/PQ_LAUNDRY/usr.sbin/ypldap/ber.c user/alc/PQ_LAUNDRY/usr.sbin/ypldap/ldapclient.c user/alc/PQ_LAUNDRY/usr.sbin/ypldap/ypldap.c user/alc/PQ_LAUNDRY/usr.sbin/ypldap/ypldap_dns.c Directory Properties: user/alc/PQ_LAUNDRY/ (props changed) user/alc/PQ_LAUNDRY/contrib/bmake/ (props changed) user/alc/PQ_LAUNDRY/contrib/elftoolchain/ (props changed) user/alc/PQ_LAUNDRY/contrib/llvm/ (props changed) user/alc/PQ_LAUNDRY/contrib/llvm/tools/lldb/ (props changed) user/alc/PQ_LAUNDRY/contrib/mdocml/ (props changed) user/alc/PQ_LAUNDRY/contrib/top/ (props changed) user/alc/PQ_LAUNDRY/contrib/unbound/ (props changed) user/alc/PQ_LAUNDRY/include/ (props changed) user/alc/PQ_LAUNDRY/lib/libc/ (props changed) user/alc/PQ_LAUNDRY/sbin/ (props changed) user/alc/PQ_LAUNDRY/share/ (props changed) user/alc/PQ_LAUNDRY/share/man/man4/ (props changed) user/alc/PQ_LAUNDRY/sys/ (props changed) user/alc/PQ_LAUNDRY/sys/boot/ (props changed) user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/ (props changed) user/alc/PQ_LAUNDRY/sys/conf/ (props changed) user/alc/PQ_LAUNDRY/sys/dev/hyperv/ (props changed) user/alc/PQ_LAUNDRY/targets/ (props changed) user/alc/PQ_LAUNDRY/usr.bin/mkimg/ (props changed) Modified: user/alc/PQ_LAUNDRY/MAINTAINERS ============================================================================== --- user/alc/PQ_LAUNDRY/MAINTAINERS Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/MAINTAINERS Thu Dec 17 01:13:06 2015 (r292390) @@ -26,54 +26,67 @@ sub-system. subsystem login notes ----------------------------- -opencrypto jmg Pre-commit review requested. Documentation Required. -kqueue jmg Pre-commit review requested. Documentation Required. -share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. +atf freebsd-testing,jmmv,ngie Pre-commit review requested. ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -openssl benl,jkim Pre-commit review requested. -release/release.sh gjb,re Pre-commit review and regression tests - requested. -sh(1) jilles Pre-commit review requested. This also applies - to kill(1), printf(1) and test(1) which are - compiled in as builtins. -isci(4) jimharris Pre-commit review requested. -nvme(4) jimharris Pre-commit review requested. -nvd(4) jimharris Pre-commit review requested. -nvmecontrol(8) jimharris Pre-commit review requested. -libfetch des Pre-commit review requested. -fetch des Pre-commit review requested. -libpam des Pre-commit review requested. -openssh des Pre-commit review requested. -pseudofs des Pre-commit review requested. -procfs des Pre-commit review requested. -linprocfs des Pre-commit review requested. +callout_*(9) rrs Pre-commit review requested -- becareful its tricksy code :o. contrib/compiler-rt dim Pre-commit review preferred. contrib/libc++ dim Pre-commit review preferred. contrib/libcxxrt dim Pre-commit review preferred. contrib/llvm dim Pre-commit review preferred. contrib/llvm/tools/lldb emaste Pre-commit review preferred. -atf freebsd-testing,jmmv,ngie Pre-commit review requested. contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. contrib/pjdfstest freebsd-testing,ngie,pjd Pre-commit review requested. +dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +*env(3) secteam Due to the problematic security history of this + code, please have patches reviewed by secteam. +etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. +etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. +fetch des Pre-commit review requested. +geli pjd Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/). +isci(4) jimharris Pre-commit review requested. +iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +kqueue jmg Pre-commit review requested. Documentation Required. +libfetch des Pre-commit review requested. +libpam des Pre-commit review requested. +linprocfs des Pre-commit review requested. +lpr gad Pre-commit review requested, particularly for + lpd/recvjob.c and lpd/printjob.c. +nanobsd imp Pre-commit phabricator review requested. +net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. +nis(8), yp(8) araujo Pre-commit review requested. +nvd(4) jimharris Pre-commit review requested. +nvme(4) jimharris Pre-commit review requested. +nvmecontrol(8) jimharris Pre-commit review requested. +opencrypto jmg Pre-commit review requested. Documentation Required. +openssh des Pre-commit review requested. +openssl benl,jkim Pre-commit review requested. +otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +pci bus imp,jhb Pre-commit review requested. +pmcstudy(8) rrs Pre-commit review requested. +procfs des Pre-commit review requested. +pseudofs des Pre-commit review requested. +release/release.sh gjb,re Pre-commit review and regression tests + requested. +sctp rrs,tuexen Pre-commit review requested (changes need to be backported to github). +sendmail gshapiro Pre-commit review requested. +sh(1) jilles Pre-commit review requested. This also applies + to kill(1), printf(1) and test(1) which are + compiled in as builtins. +share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. share/mk/*.test.mk freebsd-testing,ngie (same list as share/mk too) Pre-commit review requested. -tests freebsd-testing,ngie Pre-commit review requested. -sys/dev/usb hselasky If in doubt, ask. -sys/dev/sound/usb hselasky If in doubt, ask. sys/compat/linuxkpi hselasky If in doubt, ask. sys/dev/e1000 erj Pre-commit phabricator review requested. sys/dev/ixgbe erj Pre-commit phabricator review requested. sys/dev/ixl erj Pre-commit phabricator review requested. +sys/dev/sound/usb hselasky If in doubt, ask. +sys/dev/usb hselasky If in doubt, ask. sys/netinet/ip_carp.c glebius Pre-commit review recommended. sys/netpfil/pf kp,glebius Pre-commit review recommended. +tests freebsd-testing,ngie Pre-commit review requested. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. -lpr gad Pre-commit review requested, particularly for - lpd/recvjob.c and lpd/printjob.c. -nis(8), yp(8) araujo Pre-commit review requested. +vmm(4) neel,grehan Pre-commit review requested. ---- OLD ---- libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. @@ -84,7 +97,6 @@ contrib/openbsm rwatson Pre-commit revie sys/security/audit rwatson Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. -pci bus imp,jhb Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -99,11 +111,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -sendmail gshapiro Pre-commit review requested. -etc/mail gshapiro Pre-commit review requested. - Keep in sync with -STABLE. -etc/sendmail gshapiro Pre-commit review requested. - Keep in sync with -STABLE. nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. @@ -119,7 +126,6 @@ file obrien Insists to keep file blocke contrib/bzip2 obrien Pre-commit review required. geom freebsd-geom@FreeBSD.org geom_concat pjd Pre-commit review preferred. -geom_eli pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. geom_label pjd Pre-commit review preferred. geom_mirror pjd Pre-commit review preferred. @@ -130,7 +136,6 @@ geom_stripe pjd Pre-commit review prefer geom_zero pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. zfs freebsd-fs@FreeBSD.org -nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. @@ -140,8 +145,6 @@ lib/libbluetooth emax Pre-commit review lib/libsdp emax Pre-commit review preferred. usr.bin/bluetooth emax Pre-commit review preferred. usr.sbin/bluetooth emax Pre-commit review preferred. -*env(3) secteam Due to the problematic security history of this - code, please have patches reviewed by secteam. share/zoneinfo edwin Heads-up appreciated, since our data is coming from a third party source. usr.sbin/zic edwin Heads-up appreciated, since this code is @@ -152,5 +155,4 @@ sbin/routed bms Pre-commit review; notif cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. -nanobsd imp Pre-commit review requested for coordination. -vmm(4) neel,grehan Pre-commit review requested. + Modified: user/alc/PQ_LAUNDRY/Makefile ============================================================================== --- user/alc/PQ_LAUNDRY/Makefile Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/Makefile Thu Dec 17 01:13:06 2015 (r292390) @@ -57,8 +57,8 @@ # Makefile.inc1. The exceptions are universe, tinderbox and targets. # # If you want to build your system from source be sure that /usr/obj has -# at least 1GB of diskspace available. A complete 'universe' build requires -# about 15GB of space. +# at least 6GB of diskspace available. A complete 'universe' build requires +# about 100GB of space. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: @@ -180,7 +180,7 @@ _MAKE= PATH=${PATH} ${SUB_MAKE} -f Makef _TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} -_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/} +_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/} .endif .if defined(TARGET) && !defined(_TARGET) _TARGET=${TARGET} Modified: user/alc/PQ_LAUNDRY/Makefile.inc1 ============================================================================== --- user/alc/PQ_LAUNDRY/Makefile.inc1 Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/Makefile.inc1 Thu Dec 17 01:13:06 2015 (r292390) @@ -146,7 +146,11 @@ CLEANDIR= cleandir LOCAL_TOOL_DIRS?= PACKAGEDIR?= ${DESTDIR}/${DISTDIR} +.if empty(SHELL:M*csh*) BUILDENV_SHELL?=${SHELL} +.else +BUILDENV_SHELL?=/bin/sh +.endif SVN?= /usr/local/bin/svn SVNFLAGS?= -r HEAD @@ -163,7 +167,7 @@ OSRELDATE= 0 .endif # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION. -.if !defined(VERSION) +.if !defined(VERSION) && !make(showconfig) REVISION!= ${MAKE} -C ${SRCDIR}/release -V REVISION BRANCH!= ${MAKE} -C ${SRCDIR}/release -V BRANCH SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ @@ -172,7 +176,25 @@ VERSION= FreeBSD ${REVISION}-${BRANCH:C/ .export VERSION .endif -KNOWN_ARCHES?= aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= aarch64/arm64 \ + amd64 \ + arm \ + armeb/arm \ + armv6/arm \ + armv6hf/arm \ + i386 \ + i386/pc98 \ + mips \ + mipsel/mips \ + mips64el/mips \ + mips64/mips \ + mipsn32el/mips \ + mipsn32/mips \ + powerpc \ + powerpc64/powerpc \ + riscv64/riscv \ + sparc64 + .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -195,11 +217,14 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE} .else _TARGET_CPUTYPE=dummy .endif +# Skip for showconfig as it is just wasted time and may invoke auto.obj.mk. +.if !make(showconfig) _CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \ -f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE .if ${_CPUTYPE} != ${_TARGET_CPUTYPE} .error CPUTYPE global should be set with ?=. .endif +.endif .if make(buildworld) BUILD_ARCH!= uname -p .if ${MACHINE_ARCH} != ${BUILD_ARCH} Modified: user/alc/PQ_LAUNDRY/UPDATING ============================================================================== --- user/alc/PQ_LAUNDRY/UPDATING Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/UPDATING Thu Dec 17 01:13:06 2015 (r292390) @@ -31,6 +31,20 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20151216: + The tftp loader (pxeboot) now uses the option root-path directive. As a + consequence it no longer looks for a pxeboot.4th file on the tftp + server. Instead it uses the regular /boot infrastructure as with the + other loaders. + +20151211: + The code to start recording plug and play data into the modules has + been committed. While the old tools will properly build a new kernel, + a number of warnings about "unknown metadata record 4" will be produced + for an older kldxref. To avoid such warnings, make sure to rebuild + the kernel toolchain (or world). Make sure that you have r292078 or + later when trying to build 292077 or later before rebuilding. + 20151207: Debug data files are now built by default with 'make buildworld' and installed with 'make installworld'. This facilitates debugging but Modified: user/alc/PQ_LAUNDRY/bin/sh/var.c ============================================================================== --- user/alc/PQ_LAUNDRY/bin/sh/var.c Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/bin/sh/var.c Thu Dec 17 01:13:06 2015 (r292390) @@ -330,7 +330,7 @@ setvareq(char *s, int flags) if (vp->flags & VREADONLY) { if ((flags & (VTEXTFIXED|VSTACK)) == 0) ckfree(s); - error("%.*s: is read only", vp->name_len, s); + error("%.*s: is read only", vp->name_len, vp->text); } if (flags & VNOSET) { if ((flags & (VTEXTFIXED|VSTACK)) == 0) Modified: user/alc/PQ_LAUNDRY/contrib/bmake/ChangeLog ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/ChangeLog Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/ChangeLog Thu Dec 17 01:13:06 2015 (r292390) @@ -1,3 +1,35 @@ +2015-12-01 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151201 + Merge with NetBSD make, pick up + o cond.c: CondCvtArg: avoid access beyond end of empty buffer. + o meta.c: meta_oodate: use lstat(2) for checking link target + in case it is a symlink. + o var.c: avoid calling brk_string and Var_Export1 with empty + strings. + +2015-11-26 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151126 + Merge with NetBSD make, pick up + o parse.c: ParseTrackInput don't access beyond + end of old value. + +2015-10-22 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151022 + + * Add support for BSD/OS which lacks inttypes.h + and really needs sys/param.h for sys/sysctl.h + also 'type' is not a shell builtin. + + * var.c: eliminate uint32_t and need for inttypes.h + + * main.c: PrintOnError flush stdout before run .ERROR + + * parse.c: cope with _SC_PAGESIZE not being defined. + + 2015-10-20 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151020 Modified: user/alc/PQ_LAUNDRY/contrib/bmake/Makefile ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/Makefile Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/Makefile Thu Dec 17 01:13:06 2015 (r292390) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.44 2015/10/20 21:41:40 sjg Exp $ +# $Id: Makefile,v 1.48 2015/12/02 00:36:42 sjg Exp $ # Base version on src date -MAKE_VERSION= 20151020 +MAKE_VERSION= 20151201 PROG= bmake Modified: user/alc/PQ_LAUNDRY/contrib/bmake/boot-strap ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/boot-strap Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/boot-strap Thu Dec 17 01:13:06 2015 (r292390) @@ -111,7 +111,7 @@ # Simon J. Gerraty # RCSid: -# $Id: boot-strap,v 1.45 2014/04/05 22:56:54 sjg Exp $ +# $Id: boot-strap,v 1.48 2015/10/25 05:20:48 sjg Exp $ # # @(#) Copyright (c) 2001 Simon J. Gerraty # @@ -395,8 +395,15 @@ Bmake() { ) } +# there is actually a shell where type is not a builtin +# if type is missing, which(1) had better exists! +if (type cat) > /dev/null 2>&1; then +which() { + type "$@" | sed 's,[()],,g;s,^[^/][^/]*,,;q' +} +fi # make sure test below uses the same diff that configure did -TOOL_DIFF=`type diff | sed 's,[()],,g;s,^[^/][^/]*,,;q'` +TOOL_DIFF=`which diff` export TOOL_DIFF op_configure() { Modified: user/alc/PQ_LAUNDRY/contrib/bmake/cond.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/cond.c Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/cond.c Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -/* $NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 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: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $"; +static char rcsid[] = "$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $"); +__RCSID("$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -490,6 +490,10 @@ CondCvtArg(char *str, double *value) double d_val; errno = 0; + if (!*str) { + *value = (double)0; + return TRUE; + } l_val = strtoul(str, &eptr, str[1] == 'x' ? 16 : 10); ech = *eptr; if (ech == 0 && errno != ERANGE) { Modified: user/alc/PQ_LAUNDRY/contrib/bmake/config.h.in ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/config.h.in Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/config.h.in Thu Dec 17 01:13:06 2015 (r292390) @@ -59,6 +59,12 @@ /* Define to 1 if you have the `killpg' function. */ #undef HAVE_KILLPG +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBGEN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -158,6 +164,9 @@ */ #undef HAVE_SYS_NDIR_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SELECT_H @@ -304,6 +313,11 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +#undef _UINT32_T + /* C99 function name */ #undef __func__ @@ -319,5 +333,9 @@ /* Define to `unsigned int' if does not define. */ #undef size_t +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +#undef uint32_t + /* Define as `fork' if `vfork' does not work. */ #undef vfork Modified: user/alc/PQ_LAUNDRY/contrib/bmake/configure ============================================================================== Binary file (source and/or target). No diff available. Modified: user/alc/PQ_LAUNDRY/contrib/bmake/configure.in ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/configure.in Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/configure.in Thu Dec 17 01:13:06 2015 (r292390) @@ -1,11 +1,11 @@ dnl dnl RCSid: -dnl $Id: configure.in,v 1.54 2015/10/10 04:17:10 sjg Exp $ +dnl $Id: configure.in,v 1.56 2015/10/25 05:20:48 sjg Exp $ dnl dnl Process this file with autoconf to produce a configure script dnl AC_PREREQ(2.50) -AC_INIT([bmake], [20151009], [sjg@NetBSD.org]) +AC_INIT([bmake], [20151022], [sjg@NetBSD.org]) AC_CONFIG_HEADERS(config.h) dnl make srcdir absolute @@ -101,10 +101,19 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_DIRENT dnl Keep this list sorted +AC_CHECK_HEADERS(sys/param.h) +dnl On BSDi at least we really need sys/param.h for sys/sysctl.h +AC_CHECK_HEADERS([sys/sysctl.h], [], [], +[#ifdef HAVE_SYS_PARAM_H +# include +# endif +]) + AC_CHECK_HEADERS( \ ar.h \ err.h \ fcntl.h \ + libgen.h \ limits.h \ paths.h \ poll.h \ @@ -113,7 +122,6 @@ AC_CHECK_HEADERS( \ sys/mman.h \ sys/select.h \ sys/socket.h \ - sys/sysctl.h \ sys/time.h \ sys/uio.h \ unistd.h \ @@ -143,6 +151,7 @@ AC_C_CONST AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_SIZE_T +AC_TYPE_UINT32_T AC_DECL_SYS_SIGLIST AC_HEADER_TIME AC_STRUCT_TM Modified: user/alc/PQ_LAUNDRY/contrib/bmake/main.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/main.c Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/main.c Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $"; #else #include #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.234 2015/10/11 04:51:24 sjg Exp $"); +__RCSID("$NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1902,6 +1902,8 @@ PrintOnError(GNode *gn, const char *s) printf("%s", cp); free(cp); } + fflush(stdout); + /* * Finally, see if there is a .ERROR target, and run it if so. */ Modified: user/alc/PQ_LAUNDRY/contrib/bmake/meta.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/meta.c Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/meta.c Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.40 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: meta.c,v 1.41 2015/11/30 23:37:56 sjg Exp $ */ /* * Implement 'meta' mode. @@ -38,7 +38,11 @@ #include #include #include +#ifdef HAVE_LIBGEN_H #include +#elif !defined(HAVE_DIRNAME) +char * dirname(char *); +#endif #include #if !defined(HAVE_CONFIG_H) || defined(HAVE_ERR_H) #include @@ -1183,7 +1187,8 @@ meta_oodate(GNode *gn, Boolean oodate) if ((strstr("tmp", p))) break; - if (stat(p, &fs) < 0) { + if ((link_src != NULL && lstat(p, &fs) < 0) || + (link_src == NULL && stat(p, &fs) < 0)) { Lst_AtEnd(missingFiles, bmake_strdup(p)); } break; Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/ChangeLog ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/ChangeLog Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/ChangeLog Thu Dec 17 01:13:06 2015 (r292390) @@ -1,3 +1,29 @@ +2015-11-14 Simon J. Gerraty + + * install-mk (MK_VERSION): 20151111 + + * meta.sys.mk: include sys.dependfile.mk + + * sys.mk (OPTIONS_DEFAULT_NO): use options.mk + to set MK_AUTO_OBJ and MK_DIRDEPS_BUILD + include local.sys.env.mk early + include local.sys.mk later + + * own.mk (OPTIONS_DEFAULT_NO): AUTO_OBJ etc moved to sys.mk + +2015-11-13 Simon J. Gerraty + + * meta.sys.mk (META_COOKIE_TOUCH): + add ${META_COOKIE_TOUCH} to the end of scripts to touch cookie + + * meta.stage.mk: stage_libs should ignore SYMLINKS. + +2015-10-23 Simon J. Gerraty + + * install-mk (MK_VERSION): 20151022 + + * sys.mk: BSD/OS does not have 'type' as a shell builtin. + 2015-10-20 Simon J. Gerraty * install-mk (MK_VERSION): 20151020 @@ -460,7 +486,7 @@ needed. * gendirdeps.mk: only produce unqualified deps if no .MAKE.DEPENDFILE_PREFERENCE ends in .${MACHINE} - * meta.subdir.mk: apply SUBDIREPS_FILTER + * meta.subdir.mk: apply SUBDIRDEPS_FILTER 2012-04-20 Simon J. Gerraty Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/host-target.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/host-target.mk Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/host-target.mk Thu Dec 17 01:13:06 2015 (r292390) @@ -1,5 +1,5 @@ # RCSid: -# $Id: host-target.mk,v 1.9 2015/09/10 18:42:57 sjg Exp $ +# $Id: host-target.mk,v 1.11 2015/10/25 00:07:20 sjg Exp $ # Host platform information; may be overridden .if !defined(_HOST_OSNAME) @@ -21,7 +21,7 @@ _HOST_ARCH := ${_HOST_MACHINE} .else _HOST_ARCH != uname -p 2> /dev/null || uname -m # uname -p may produce garbage on linux -.if ${_HOST_ARCH:[\#]} > 1 +.if ${_HOST_ARCH:[\#]} > 1 || ${_HOST_ARCH:Nunknown} == "" _HOST_ARCH := ${_HOST_MACHINE} .endif .endif @@ -33,10 +33,10 @@ HOST_MACHINE := ${_HOST_MACHINE} .endif HOST_OSMAJOR := ${_HOST_OSREL:C/[^0-9].*//} -HOST_OSTYPE := ${_HOST_OSNAME}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH} +HOST_OSTYPE := ${_HOST_OSNAME:S,/,,g}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH} HOST_OS := ${_HOST_OSNAME} host_os := ${_HOST_OSNAME:tl} -HOST_TARGET := ${host_os}${HOST_OSMAJOR}-${_HOST_ARCH} +HOST_TARGET := ${host_os:S,/,,g}${HOST_OSMAJOR}-${_HOST_ARCH} # tr is insanely non-portable, accommodate the lowest common denominator TR ?= tr Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/init.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/init.mk Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/init.mk Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -# $Id: init.mk,v 1.9 2013/07/18 05:46:24 sjg Exp $ +# $Id: init.mk,v 1.10 2015/12/07 04:28:31 sjg Exp $ # # @(#) Copyright (c) 2002, Simon J. Gerraty # @@ -47,4 +47,8 @@ PROFFLAGS?= -DGPROF -DPROF _SKIP_BUILD = not building at level 0 .endif +.if !empty(_SKIP_BUILD) +all: .PHONY +.warning ${_SKIP_BUILD} +.endif .endif Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/install-mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/install-mk Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/install-mk Thu Dec 17 01:13:06 2015 (r292390) @@ -55,7 +55,7 @@ # Simon J. Gerraty # RCSid: -# $Id: install-mk,v 1.115 2015/10/20 22:04:53 sjg Exp $ +# $Id: install-mk,v 1.117 2015/11/14 18:09:57 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -70,7 +70,7 @@ # sjg@crufty.net # -MK_VERSION=20151020 +MK_VERSION=20151111 OWNER= GROUP= MODE=444 Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/lib.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/lib.mk Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/lib.mk Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -# $Id: lib.mk,v 1.51 2014/05/23 01:30:36 sjg Exp $ +# $Id: lib.mk,v 1.52 2015/11/14 18:09:57 sjg Exp $ .if !target(__${.PARSEFILE}__) __${.PARSEFILE}__: @@ -254,7 +254,7 @@ DLLIB ?= -ldl # is a waste of time, this tells meta.autodep.mk to just pick one # (typically .So) # yes, 42 is a random number. -.if ${MK_META_MODE} == "yes" && ${SRCS:Uno:[\#]} > 42 +.if ${MK_DIRDEPS_BUILD} == "yes" && ${SRCS:Uno:[\#]} > 42 OPTIMIZE_OBJECT_META_FILES ?= yes .endif Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.autodep.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.autodep.mk Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.autodep.mk Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -# $Id: meta.autodep.mk,v 1.37 2015/06/16 06:29:17 sjg Exp $ +# $Id: meta.autodep.mk,v 1.39 2015/12/07 04:35:32 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty @@ -50,6 +50,9 @@ UPDATE_DEPENDFILE = NO .endif _CURDIR ?= ${.CURDIR} +_OBJDIR ?= ${.OBJDIR} +_OBJTOP ?= ${OBJTOP} +_OBJROOT ?= ${OBJROOT:U${_OBJTOP}} _DEPENDFILE := ${_CURDIR}/${.MAKE.DEPENDFILE:T} .if ${.MAKE.LEVEL} == 0 @@ -190,7 +193,7 @@ gendirdeps: ${_DEPENDFILE} # anything which matches ${_OBJROOT}* but not ${_OBJTOP}* # needs to be qualified in DIRDEPS # The pseudo machine "host" is used for HOST_TARGET -DIRDEPS = \ +DIRDEPS += \ ${DPADD:M${_OBJTOP}*:H:C,${_OBJTOP}[^/]*/,,:N.:O:u} \ ${DPADD:M${_OBJROOT}*:N${_OBJTOP}*:H:S,${_OBJROOT},,:C,^([^/]+)/(.*),\2.\1,:S,${HOST_TARGET}$,host,:N.*:O:u} Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.stage.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.stage.mk Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.stage.mk Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -# $Id: meta.stage.mk,v 1.40 2015/10/04 17:36:54 sjg Exp $ +# $Id: meta.stage.mk,v 1.41 2015/11/13 17:34:04 sjg Exp $ # # @(#) Copyright (c) 2011, Simon J. Gerraty # @@ -155,7 +155,7 @@ stage_libs: .dirdep @${STAGE_LINKS_SCRIPT}; StageLinks -s ${STAGE_LIBDIR:${STAGE_DIR_FILTER}} \ ${SHLIB_LINKS:@t@${STAGE_LIBS:T:M$t.*} $t@} .elif !empty(SHLIB_LINK) && !empty(SHLIB_NAME) - @${STAGE_LINKS_SCRIPT}; StageLinks -s ${STAGE_LIBDIR:${STAGE_DIR_FILTER}} ${SHLIB_NAME} ${SHLIB_LINK} ${SYMLINKS:T} + @${STAGE_LINKS_SCRIPT}; StageLinks -s ${STAGE_LIBDIR:${STAGE_DIR_FILTER}} ${SHLIB_NAME} ${SHLIB_LINK} .endif .endif @touch $@ Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.subdir.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.subdir.mk Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.subdir.mk Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -# $Id: meta.subdir.mk,v 1.10 2012/07/03 05:26:46 sjg Exp $ +# $Id: meta.subdir.mk,v 1.11 2015/11/24 22:26:51 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty @@ -62,7 +62,7 @@ _subdeps != cd ${.CURDIR} && \ DIRDEPS = .else # clean up if needed -DIRDEPS := ${DIRDEPS:S,^./,,:S,/./,/,g:${SUBDIREPS_FILTER:Uu}} +DIRDEPS := ${DIRDEPS:S,^./,,:S,/./,/,g:${SUBDIRDEPS_FILTER:Uu}} .endif # we just dealt with it, if we leave it defined, # dirdeps.mk will compute some interesting combinations. Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.sys.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.sys.mk Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.sys.mk Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -# $Id: meta.sys.mk,v 1.22 2015/06/16 06:31:05 sjg Exp $ +# $Id: meta.sys.mk,v 1.26 2015/11/14 21:16:13 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty @@ -51,17 +51,6 @@ META_MODE += silent=yes .endif .endif -# make defaults .MAKE.DEPENDFILE to .depend -# that won't work for us. -.if ${.MAKE.DEPENDFILE} == ".depend" -.undef .MAKE.DEPENDFILE -.endif - -# if you don't cross build for multiple MACHINEs concurrently, then -# .MAKE.DEPENDFILE = Makefile.depend -# probably makes sense - you can set that in local.sys.mk -.MAKE.DEPENDFILE ?= Makefile.depend.${MACHINE} - # we use the pseudo machine "host" for the build host. # this should be taken care of before we get here .if ${OBJTOP:Ua} == ${HOST_OBJTOP:Ub} @@ -109,10 +98,27 @@ _metaError: .NOMETA .NOTMAIN .endif +META_COOKIE_TOUCH= +# some targets need to be .PHONY in non-meta mode +META_NOPHONY= .PHONY # Are we, after all, in meta mode? .if ${.MAKE.MODE:Mmeta*} != "" MKDEP_MK = meta.autodep.mk +.if ${.MAKE.MAKEFILES:M*sys.dependfile.mk} == "" +# this does all the smarts of setting .MAKE.DEPENDFILE +.-include +# check if we got anything sane +.if ${.MAKE.DEPENDFILE} == ".depend" +.undef .MAKE.DEPENDFILE +.endif +.MAKE.DEPENDFILE ?= Makefile.depend +.endif + +# we can afford to use cookies to prevent some targets +# re-running needlessly +META_COOKIE_TOUCH= touch ${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET}} +META_NOPHONY= .if ${UPDATE_DEPENDFILE:Uyes:tl} != "no" .if ${.MAKEFLAGS:Uno:M-k} != "" # make this more obvious Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/own.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/own.mk Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/own.mk Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -# $Id: own.mk,v 1.29 2015/09/08 06:15:31 sjg Exp $ +# $Id: own.mk,v 1.30 2015/11/14 18:09:57 sjg Exp $ .if !target(__${.PARSEFILE}__) __${.PARSEFILE}__: @@ -89,12 +89,10 @@ OPTIONS_DEFAULT_NO+= DPADD_MK # process options OPTIONS_DEFAULT_NO+= \ - AUTO_OBJ \ INSTALL_AS_USER \ GPROF \ LIBTOOL \ LINT \ - META_MODE \ OPTIONS_DEFAULT_YES+= \ ARCHIVE \ Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys.mk Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys.mk Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -# $Id: sys.mk,v 1.36 2014/05/11 00:30:19 sjg Exp $ +# $Id: sys.mk,v 1.41 2015/11/14 20:20:34 sjg Exp $ # # @(#) Copyright (c) 2003-2009, Simon J. Gerraty # @@ -75,8 +75,12 @@ M_L_TARGETS = ${M_ListToMatch:S,V,_TARGE M_ListToSkip= O:u:ts::S,:,:N,g:S,^,N, # type should be a builtin in any sh since about 1980, +# but sadly there are exceptions! +.if ${.MAKE.OS:Unknown:NBSD/OS} == "" +_type_sh = which +.endif # AUTOCONF := ${autoconf:L:${M_whence}} -M_type = @x@(type $$x 2> /dev/null); echo;@:sh:[0]:N* found*:[@]:C,[()],,g +M_type = @x@(${_type_sh:Utype} $$x) 2> /dev/null; echo;@:sh:[0]:N* found*:[@]:C,[()],,g M_whence = ${M_type}:M/*:[1] # convert a path to a valid shell variable @@ -102,6 +106,9 @@ _TARGETS := ${.TARGETS} # we need HOST_TARGET etc below. .include +# early customizations +.-include + # find the OS specifics .if defined(SYS_OS_MK) .include <${SYS_OS_MK}> @@ -126,11 +133,30 @@ SYS_OS_MK := ${_sys_mk} .export SYS_OS_MK .endif -# allow customization without editing. -.-include +# some options we need to know early +OPTIONS_DEFAULT_NO += \ + DIRDEPS_BUILD \ + DIRDEPS_CACHE \ + META_MODE + +OPTIONS_DEFAULT_DEPENDENT += \ + AUTO_OBJ/DIRDEPS_BUILD \ + STAGING/DIRDEPS_BUILD \ + +.-include "options.mk" + +.if ${MK_DIRDEPS_BUILD:Uno} == "yes" +MK_META_MODE = yes +.-include +.elif ${MK_META_MODE:Uno} == "yes" +.MAKE.MODE = meta verbose +.endif +# make sure we have a harmless value +.MAKE.MODE ?= normal # if you want objdirs make them automatic -.if ${MKOBJDIRS:Uno} == "auto" +# and do it early before we compute .PATH +.if ${MK_AUTO_OBJ:Uno} == "yes" || ${MKOBJDIRS:Uno} == "auto" .include .endif @@ -178,17 +204,8 @@ Mkdirs= Mkdirs() { \ .cc.cpp-out: @${COMPILE.cc:N-c} -E ${.IMPSRC} | grep -v '^[ ]*$$' -# we don't include own.mk but user can expect -DWITH_META_MODE to work -.if defined(WITHOUT_META_MODE) -USE_META= no -.elif defined(WITH_META_MODE) -USE_META= yes -.endif -.if ${USE_META:Uno} == "yes" -.-include -.endif -# make sure we have a harmless value -.MAKE.MODE ?= normal +# late customizations +.-include # if .CURDIR is matched by any entry in DEBUG_MAKE_DIRS we # will apply DEBUG_MAKE_FLAGS, now. Modified: user/alc/PQ_LAUNDRY/contrib/bmake/os.sh ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/os.sh Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/os.sh Thu Dec 17 01:13:06 2015 (r292390) @@ -17,7 +17,7 @@ # Simon J. Gerraty # RCSid: -# $Id: os.sh,v 1.47 2015/09/10 05:53:10 sjg Exp $ +# $Id: os.sh,v 1.49 2015/10/25 00:05:40 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -44,7 +44,7 @@ MACHINE_ARCH=`uname -p 2>/dev/null || ec # there is at least one case of `uname -p` outputting # a bunch of usless drivel case "$MACHINE_ARCH" in -*[!A-Za-z0-9_-]*) MACHINE_ARCH="$MACHINE";; +unknown|*[!A-Za-z0-9_-]*) MACHINE_ARCH="$MACHINE";; esac # we need this here, and it is not always available... @@ -213,7 +213,7 @@ LN=${LN:-ln} TR=${TR:-tr} # Some people like have /share/$HOST_TARGET/bin etc. -HOST_TARGET=`echo ${OS}${OSMAJOR}-$HOST_ARCH | toLower` +HOST_TARGET=`echo ${OS}${OSMAJOR}-$HOST_ARCH | tr -d / | toLower` export HOST_TARGET case `echo -n .` in -n*) N=; C="\c";; *) N=-n; C=;; esac Modified: user/alc/PQ_LAUNDRY/contrib/bmake/parse.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/parse.c Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/parse.c Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.205 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: parse.c,v 1.206 2015/11/26 00:23:04 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.205 2015/10/11 04:51:24 sjg Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.206 2015/11/26 00:23:04 sjg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.205 2015/10/11 04:51:24 sjg Exp $"); +__RCSID("$NetBSD: parse.c,v 1.206 2015/11/26 00:23:04 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -508,7 +508,11 @@ loadfile(const char *path, int fd) #ifdef HAVE_MMAP if (load_getsize(fd, &lf->len) == SUCCESS) { /* found a size, try mmap */ +#ifdef _SC_PAGESIZE pagesize = sysconf(_SC_PAGESIZE); +#else + pagesize = 0; +#endif if (pagesize <= 0) { pagesize = 0x1000; } Modified: user/alc/PQ_LAUNDRY/contrib/bmake/unit-tests/Makefile.in ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/unit-tests/Makefile.in Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/unit-tests/Makefile.in Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.47 2015/05/05 21:58:06 sjg Exp $ +# $Id: Makefile.in,v 1.48 2015/12/07 04:06:29 sjg Exp $ # # $NetBSD: Makefile,v 1.52 2015/05/05 21:51:09 sjg Exp $ # @@ -128,7 +128,7 @@ SED_CMDS.varshell = -e 's,^[a-z]*sh: ,,' test: ${OUTFILES} .PHONY @failed= ; \ for test in ${TESTNAMES}; do \ - ${TOOL_DIFF} -u ${UNIT_TESTS}/$${test}.exp $${test}.out \ + ${TOOL_DIFF} ${DIFF_FLAGS} ${UNIT_TESTS}/$${test}.exp $${test}.out \ || failed="$${failed}$${failed:+ }$${test}" ; \ done ; \ if [ -n "$${failed}" ]; then \ Modified: user/alc/PQ_LAUNDRY/contrib/bmake/unit-tests/cond2.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/unit-tests/cond2.mk Thu Dec 17 00:02:53 2015 (r292389) +++ user/alc/PQ_LAUNDRY/contrib/bmake/unit-tests/cond2.mk Thu Dec 17 01:13:06 2015 (r292390) @@ -1,4 +1,4 @@ -# $Id: cond2.mk,v 1.1.1.1 2015/05/05 21:53:13 sjg Exp $ +# $Id: cond2.mk,v 1.1.1.2 2015/12/02 00:34:27 sjg Exp $ TEST_UNAME_S= NetBSD @@ -21,5 +21,9 @@ Y!= echo TEST_NOT_SET is empty or not de Y= oops .endif +.if defined(.NDEF) && ${.NDEF} > 0 +Z= yes +.endif + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Thu Dec 17 01:16:34 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C46B7A4996B for ; Thu, 17 Dec 2015 01:16:34 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A9CE12A5; Thu, 17 Dec 2015 01:16:34 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBH1GXuJ049752; Thu, 17 Dec 2015 01:16:33 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBH1GXgn049751; Thu, 17 Dec 2015 01:16:33 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201512170116.tBH1GXgn049751@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 17 Dec 2015 01:16:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292391 - user/alc/PQ_LAUNDRY/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2015 01:16:34 -0000 Author: markj Date: Thu Dec 17 01:16:33 2015 New Revision: 292391 URL: https://svnweb.freebsd.org/changeset/base/292391 Log: - Add some constants for the pagedaemon thread sleep intervals, and use them when computing the laundering target. - Add a comment explaining the laundry target computation. Reviewed by: alc Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Thu Dec 17 01:13:06 2015 (r292390) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Thu Dec 17 01:16:33 2015 (r292391) @@ -155,6 +155,11 @@ static struct kproc_desc vm_kp = { SYSINIT(vmdaemon, SI_SUB_KTHREAD_VM, SI_ORDER_FIRST, kproc_start, &vm_kp); #endif +/* Sleep intervals for pagedaemon threads, in subdivisions of one second. */ +#define VM_LAUNDER_INTERVAL 10 +#define VM_INACT_SCAN_INTERVAL 2 + +#define VM_LAUNDER_RATE (VM_LAUNDER_INTERVAL / VM_INACT_SCAN_INTERVAL) int vm_pages_needed; /* Event on which pageout daemon sleeps */ int vm_pageout_deficit; /* Estimated number of pages deficit */ @@ -1042,13 +1047,19 @@ vm_pageout_launder1(struct vm_domain *vm boolean_t pageout_ok, queues_locked; /* - * XXX + * Compute the number of pages we want to move from the laundry queue to + * the inactive queue. If there is no shortage of clean, inactive + * pages, we allow laundering to proceed at a trickle to ensure that + * dirty pages will eventually be reused. Otherwise, the inactive queue + * target is scaled by the ratio of the sleep intervals of the laundry + * queue and inactive queue worker threads. */ launder = vm_cnt.v_inactive_target - vm_cnt.v_inactive_count + vm_paging_target() + vm_pageout_deficit; if (launder < 0) - launder = 5; - launder /= 5; + launder = 1; + else + launder /= VM_LAUNDER_RATE; vnodes_skipped = 0; @@ -1223,7 +1234,8 @@ vm_pageout_laundry_worker(void *arg) * The pageout laundry worker is never done, so loop forever. */ for (;;) { - tsleep(&vm_cnt.v_laundry_count, PVM, "laundr", hz / 10); + tsleep(&vm_cnt.v_laundry_count, PVM, "laundr", + hz / VM_LAUNDER_INTERVAL); vm_pageout_launder1(domain); } } @@ -1872,7 +1884,7 @@ vm_pageout_worker(void *arg) if (domain->vmd_pass > 0) msleep(&vm_pages_needed, &vm_page_queue_free_mtx, PVM, "psleep", - hz / 2); + hz / VM_INACT_SCAN_INTERVAL); } else { /* * Good enough, sleep until required to refresh From owner-svn-src-user@freebsd.org Thu Dec 17 01:31:29 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23541A4A28D for ; Thu, 17 Dec 2015 01:31:29 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 91B831BDF; Thu, 17 Dec 2015 01:31:28 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBH1VQiV055057; Thu, 17 Dec 2015 01:31:26 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBH1VQB2055056; Thu, 17 Dec 2015 01:31:26 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201512170131.tBH1VQB2055056@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 17 Dec 2015 01:31:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292392 - user/alc/PQ_LAUNDRY/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2015 01:31:29 -0000 Author: markj Date: Thu Dec 17 01:31:26 2015 New Revision: 292392 URL: https://svnweb.freebsd.org/changeset/base/292392 Log: Weigh dirty and clean pages differently when scanning the active queue. During a page shortage, clean pages can be reclaimed much more quickly than dirty pages and thus provide more immediate utility to the system. Dirty pages must first be laundered and therefore cannot contribute towards the shortfall until after some I/O completes. This change modifies the active queue scan to have clean pages count more heavily towards a shortage than dirty pages. The inactive queue target is also scaled accordingly so that we scan for dirty pages more aggressively than clean pages, causing the laundry thread to start working sooner than it would otherwise, and improving its ability to cluster pages. The weight is set by the vm.act_scan_laundry_weight sysctl; clean and dirty pages are given an equal weight by setting this sysctl to 1. Reviewed by: alc Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Thu Dec 17 01:16:33 2015 (r292391) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Thu Dec 17 01:31:26 2015 (r292392) @@ -226,6 +226,11 @@ SYSCTL_INT(_vm, OID_AUTO, pageout_oom_se CTLFLAG_RW, &vm_pageout_oom_seq, 0, "back-to-back calls to oom detector to start OOM"); +static int act_scan_laundry_weight = 3; +SYSCTL_INT(_vm, OID_AUTO, act_scan_laundry_weight, + CTLFLAG_RW, &act_scan_laundry_weight, 0, + "weight given to clean vs. dirty pages in active queue scans"); + #define VM_PAGEOUT_PAGE_COUNT 16 int vm_pageout_page_count = VM_PAGEOUT_PAGE_COUNT; @@ -1494,10 +1499,19 @@ drop_page: /* * Compute the number of pages we want to try to move from the * active queue to either the inactive or laundry queue. + * + * When scanning active pages, we make clean pages count more heavily + * towards the page shortage than dirty pages. This is because dirty + * pages must be laundered before they can be reused and thus have less + * utility when attempting to quickly alleviate a shortage. However, + * this weighting also causes the scan to deactivate dirty pages more + * more aggressively, improving the effectiveness of clustering and + * ensuring that they can eventually be reused. */ page_shortage = vm_cnt.v_inactive_target - (vm_cnt.v_inactive_count + - vm_cnt.v_laundry_count) + vm_paging_target() + deficit + - addl_page_shortage; + vm_cnt.v_laundry_count / act_scan_laundry_weight) + + vm_paging_target() + deficit + addl_page_shortage; + page_shortage *= act_scan_laundry_weight; pq = &vmd->vmd_pagequeues[PQ_ACTIVE]; vm_pagequeue_lock(pq); @@ -1578,7 +1592,7 @@ drop_page: m->act_count -= min(m->act_count, ACT_DECLINE); /* - * Move this page to the tail of the active or inactive + * Move this page to the tail of the active, inactive or laundry * queue depending on usage. */ if (m->act_count == 0) { @@ -1588,11 +1602,13 @@ drop_page: if (m->object->ref_count != 0) vm_page_test_dirty(m); #endif - if (m->dirty == 0) + if (m->dirty == 0) { vm_page_deactivate(m); - else + page_shortage -= act_scan_laundry_weight; + } else { vm_page_launder(m); - page_shortage--; + page_shortage--; + } } else vm_page_requeue_locked(m); vm_page_unlock(m); From owner-svn-src-user@freebsd.org Thu Dec 17 01:33:47 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1F70A4A483 for ; Thu, 17 Dec 2015 01:33:46 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1E8B1DB8; Thu, 17 Dec 2015 01:33:46 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBH1Xj93055489; Thu, 17 Dec 2015 01:33:45 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBH1XjKO055488; Thu, 17 Dec 2015 01:33:45 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201512170133.tBH1XjKO055488@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 17 Dec 2015 01:33:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292393 - user/alc/PQ_LAUNDRY/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2015 01:33:47 -0000 Author: markj Date: Thu Dec 17 01:33:45 2015 New Revision: 292393 URL: https://svnweb.freebsd.org/changeset/base/292393 Log: Use an sx lock rather than a hand-rolled lock to serialize swapon/swapoff. Modified: user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Modified: user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Thu Dec 17 01:31:26 2015 (r292392) +++ user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Thu Dec 17 01:33:45 2015 (r292393) @@ -147,12 +147,12 @@ struct swblock { }; static MALLOC_DEFINE(M_VMPGDATA, "vm_pgdata", "swap pager private data"); +static struct sx sw_conf_sx; static struct mtx sw_dev_mtx; static TAILQ_HEAD(, swdevt) swtailq = TAILQ_HEAD_INITIALIZER(swtailq); static struct swdevt *swdevhd; /* Allocate from here next */ static int nswapdev; /* Number of swap devices */ int swap_pager_avail; -static int swdev_syscall_active = 0; /* serialize swap(on|off) */ static vm_ooffset_t swap_total; SYSCTL_QUAD(_vm, OID_AUTO, swap_total, CTLFLAG_RD, &swap_total, 0, @@ -487,6 +487,7 @@ swap_pager_init(void) TAILQ_INIT(&swap_pager_object_list[i]); mtx_init(&sw_alloc_mtx, "swap_pager list", NULL, MTX_DEF); mtx_init(&sw_dev_mtx, "swapdev", NULL, MTX_DEF); + sx_init(&sw_conf_sx, "swapconf"); /* * Device Stripe, in PAGE_SIZE'd blocks @@ -2004,9 +2005,7 @@ sys_swapon(struct thread *td, struct swa return (error); mtx_lock(&Giant); - while (swdev_syscall_active) - tsleep(&swdev_syscall_active, PUSER - 1, "swpon", 0); - swdev_syscall_active = 1; + sx_xlock(&sw_conf_sx); /* * Swap metadata may not fit in the KVM if we have physical @@ -2041,8 +2040,7 @@ sys_swapon(struct thread *td, struct swa if (error) vrele(vp); done: - swdev_syscall_active = 0; - wakeup_one(&swdev_syscall_active); + sx_xunlock(&sw_conf_sx); mtx_unlock(&Giant); return (error); } @@ -2174,9 +2172,7 @@ sys_swapoff(struct thread *td, struct sw return (error); mtx_lock(&Giant); - while (swdev_syscall_active) - tsleep(&swdev_syscall_active, PUSER - 1, "swpoff", 0); - swdev_syscall_active = 1; + sx_xlock(&sw_conf_sx); NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->name, td); @@ -2198,8 +2194,7 @@ sys_swapoff(struct thread *td, struct sw } error = swapoff_one(sp, td->td_ucred); done: - swdev_syscall_active = 0; - wakeup_one(&swdev_syscall_active); + sx_xunlock(&sw_conf_sx); mtx_unlock(&Giant); return (error); } @@ -2213,6 +2208,7 @@ swapoff_one(struct swdevt *sp, struct uc #endif mtx_assert(&Giant, MA_OWNED); + sx_assert(&sw_conf_sx, SA_XLOCKED); #ifdef MAC (void) vn_lock(sp->sw_vp, LK_EXCLUSIVE | LK_RETRY); error = mac_system_check_swapoff(cred, sp->sw_vp); @@ -2275,10 +2271,7 @@ swapoff_all(void) int error; mtx_lock(&Giant); - while (swdev_syscall_active) - tsleep(&swdev_syscall_active, PUSER - 1, "swpoff", 0); - swdev_syscall_active = 1; - + sx_xlock(&sw_conf_sx); mtx_lock(&sw_dev_mtx); TAILQ_FOREACH_SAFE(sp, &swtailq, sw_list, spt) { mtx_unlock(&sw_dev_mtx); @@ -2296,9 +2289,7 @@ swapoff_all(void) mtx_lock(&sw_dev_mtx); } mtx_unlock(&sw_dev_mtx); - - swdev_syscall_active = 0; - wakeup_one(&swdev_syscall_active); + sx_xunlock(&sw_conf_sx); mtx_unlock(&Giant); } From owner-svn-src-user@freebsd.org Thu Dec 17 06:55:28 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A26ABA493A3 for ; Thu, 17 Dec 2015 06:55:28 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 55989174D; Thu, 17 Dec 2015 06:55:28 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBH6tRnZ047383; Thu, 17 Dec 2015 06:55:27 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBH6tQFF047368; Thu, 17 Dec 2015 06:55:26 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512170655.tBH6tQFF047368@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 17 Dec 2015 06:55:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292397 - in user/ngie/more-tests2: . bin/sh contrib/llvm/tools/lldb/docs etc/mtree etc/periodic/daily lib/libc/tests lib/libc/tests/nss lib/libc/tests/resolv lib/libfetch lib/libstand ... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2015 06:55:28 -0000 Author: ngie Date: Thu Dec 17 06:55:25 2015 New Revision: 292397 URL: https://svnweb.freebsd.org/changeset/base/292397 Log: MFhead @ r292396 Added: user/ngie/more-tests2/lib/libc/tests/nss/ - copied from r292396, head/lib/libc/tests/nss/ user/ngie/more-tests2/lib/libc/tests/resolv/ - copied from r292396, head/lib/libc/tests/resolv/ user/ngie/more-tests2/lib/msun/tests/cexp_test.c - copied unchanged from r292396, head/lib/msun/tests/cexp_test.c user/ngie/more-tests2/lib/msun/tests/conj_test.c - copied unchanged from r292396, head/lib/msun/tests/conj_test.c user/ngie/more-tests2/lib/msun/tests/csqrt_test.c - copied unchanged from r292396, head/lib/msun/tests/csqrt_test.c user/ngie/more-tests2/lib/msun/tests/fenv_test.c - copied unchanged from r292396, head/lib/msun/tests/fenv_test.c user/ngie/more-tests2/lib/msun/tests/fmaxmin_test.c - copied unchanged from r292396, head/lib/msun/tests/fmaxmin_test.c user/ngie/more-tests2/lib/msun/tests/ilogb_test.c - copied unchanged from r292396, head/lib/msun/tests/ilogb_test.c user/ngie/more-tests2/lib/msun/tests/invctrig_test.c - copied unchanged from r292396, head/lib/msun/tests/invctrig_test.c user/ngie/more-tests2/lib/msun/tests/logarithm_test.c - copied unchanged from r292396, head/lib/msun/tests/logarithm_test.c user/ngie/more-tests2/lib/msun/tests/lrint_test.c - copied unchanged from r292396, head/lib/msun/tests/lrint_test.c user/ngie/more-tests2/lib/msun/tests/nan_test.c - copied unchanged from r292396, head/lib/msun/tests/nan_test.c user/ngie/more-tests2/lib/msun/tests/nearbyint_test.c - copied unchanged from r292396, head/lib/msun/tests/nearbyint_test.c user/ngie/more-tests2/lib/msun/tests/next_test.c - copied unchanged from r292396, head/lib/msun/tests/next_test.c user/ngie/more-tests2/lib/msun/tests/rem_test.c - copied unchanged from r292396, head/lib/msun/tests/rem_test.c user/ngie/more-tests2/lib/msun/tests/trig_test.c - copied unchanged from r292396, head/lib/msun/tests/trig_test.c user/ngie/more-tests2/sys/modules/tcp/ - copied from r292396, head/sys/modules/tcp/ user/ngie/more-tests2/sys/netinet/tcp_stacks/ - copied from r292396, head/sys/netinet/tcp_stacks/ Deleted: user/ngie/more-tests2/tools/regression/lib/libc/nss/ user/ngie/more-tests2/tools/regression/lib/libc/resolv/ user/ngie/more-tests2/tools/regression/lib/msun/test-cexp.c user/ngie/more-tests2/tools/regression/lib/msun/test-cexp.t user/ngie/more-tests2/tools/regression/lib/msun/test-conj.c user/ngie/more-tests2/tools/regression/lib/msun/test-conj.t user/ngie/more-tests2/tools/regression/lib/msun/test-csqrt.c user/ngie/more-tests2/tools/regression/lib/msun/test-csqrt.t user/ngie/more-tests2/tools/regression/lib/msun/test-fenv.c user/ngie/more-tests2/tools/regression/lib/msun/test-fenv.t user/ngie/more-tests2/tools/regression/lib/msun/test-fmaxmin.c user/ngie/more-tests2/tools/regression/lib/msun/test-fmaxmin.t user/ngie/more-tests2/tools/regression/lib/msun/test-ilogb.c user/ngie/more-tests2/tools/regression/lib/msun/test-ilogb.t user/ngie/more-tests2/tools/regression/lib/msun/test-invctrig.c user/ngie/more-tests2/tools/regression/lib/msun/test-logarithm.c user/ngie/more-tests2/tools/regression/lib/msun/test-logarithm.t user/ngie/more-tests2/tools/regression/lib/msun/test-lrint.c user/ngie/more-tests2/tools/regression/lib/msun/test-lrint.t user/ngie/more-tests2/tools/regression/lib/msun/test-nan.c user/ngie/more-tests2/tools/regression/lib/msun/test-nan.t user/ngie/more-tests2/tools/regression/lib/msun/test-nearbyint.c user/ngie/more-tests2/tools/regression/lib/msun/test-nearbyint.t user/ngie/more-tests2/tools/regression/lib/msun/test-next.c user/ngie/more-tests2/tools/regression/lib/msun/test-next.t user/ngie/more-tests2/tools/regression/lib/msun/test-rem.c user/ngie/more-tests2/tools/regression/lib/msun/test-rem.t user/ngie/more-tests2/tools/regression/lib/msun/test-trig.c user/ngie/more-tests2/tools/regression/lib/msun/test-trig.t Modified: user/ngie/more-tests2/MAINTAINERS (contents, props changed) user/ngie/more-tests2/UPDATING user/ngie/more-tests2/bin/sh/var.c user/ngie/more-tests2/contrib/llvm/tools/lldb/docs/lldb.1 user/ngie/more-tests2/etc/mtree/BSD.tests.dist user/ngie/more-tests2/etc/periodic/daily/800.scrub-zfs user/ngie/more-tests2/lib/libc/tests/Makefile user/ngie/more-tests2/lib/libfetch/http.c user/ngie/more-tests2/lib/libstand/tftp.c user/ngie/more-tests2/lib/msun/tests/Makefile user/ngie/more-tests2/secure/lib/libcrypto/engines/Makefile user/ngie/more-tests2/share/man/man9/VOP_GETPAGES.9 user/ngie/more-tests2/share/mk/src.opts.mk user/ngie/more-tests2/sys/arm/arm/pmap-v6-new.c user/ngie/more-tests2/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c user/ngie/more-tests2/sys/boot/efi/loader/arch/arm/exec.c user/ngie/more-tests2/sys/boot/efi/loader/arch/arm64/exec.c user/ngie/more-tests2/sys/boot/efi/loader/bootinfo.c user/ngie/more-tests2/sys/boot/efi/loader/loader_efi.h user/ngie/more-tests2/sys/boot/i386/libi386/libi386.h user/ngie/more-tests2/sys/boot/i386/libi386/pxe.c user/ngie/more-tests2/sys/boot/i386/loader/main.c user/ngie/more-tests2/sys/cam/ctl/ctl.c user/ngie/more-tests2/sys/cam/ctl/ctl_backend_block.c user/ngie/more-tests2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/ngie/more-tests2/sys/cddl/dev/dtrace/dtrace_cddl.h user/ngie/more-tests2/sys/cddl/dev/systrace/systrace.c user/ngie/more-tests2/sys/compat/linux/linux_dtrace.h user/ngie/more-tests2/sys/conf/kmod.mk user/ngie/more-tests2/sys/dev/drm2/i915/i915_gem.c user/ngie/more-tests2/sys/dev/drm2/ttm/ttm_tt.c user/ngie/more-tests2/sys/dev/md/md.c user/ngie/more-tests2/sys/dev/usb/serial/uftdi.c user/ngie/more-tests2/sys/fs/fuse/fuse_vnops.c user/ngie/more-tests2/sys/fs/nfsclient/nfs_clbio.c user/ngie/more-tests2/sys/fs/smbfs/smbfs_io.c user/ngie/more-tests2/sys/fs/tmpfs/tmpfs_subr.c user/ngie/more-tests2/sys/geom/multipath/g_multipath.c user/ngie/more-tests2/sys/kern/kern_exec.c user/ngie/more-tests2/sys/kern/kern_exit.c user/ngie/more-tests2/sys/kern/kern_fork.c user/ngie/more-tests2/sys/kern/kern_proc.c user/ngie/more-tests2/sys/kern/kern_racct.c user/ngie/more-tests2/sys/kern/kern_sig.c user/ngie/more-tests2/sys/kern/kern_timeout.c user/ngie/more-tests2/sys/kern/subr_syscall.c user/ngie/more-tests2/sys/kern/uipc_shm.c user/ngie/more-tests2/sys/kern/uipc_syscalls.c user/ngie/more-tests2/sys/kern/vfs_bio.c user/ngie/more-tests2/sys/kern/vfs_cache.c user/ngie/more-tests2/sys/kern/vfs_default.c user/ngie/more-tests2/sys/kern/vfs_subr.c user/ngie/more-tests2/sys/kern/vnode_if.src user/ngie/more-tests2/sys/modules/Makefile user/ngie/more-tests2/sys/net/if_stf.c user/ngie/more-tests2/sys/net/route.h user/ngie/more-tests2/sys/netinet/if_ether.c user/ngie/more-tests2/sys/netinet/in_kdtrace.c user/ngie/more-tests2/sys/netinet/in_kdtrace.h user/ngie/more-tests2/sys/netinet/ip_carp.c user/ngie/more-tests2/sys/netinet/sctp_cc_functions.c user/ngie/more-tests2/sys/netinet/tcp.h user/ngie/more-tests2/sys/netinet/tcp_input.c user/ngie/more-tests2/sys/netinet/tcp_sack.c user/ngie/more-tests2/sys/netinet/tcp_subr.c user/ngie/more-tests2/sys/netinet/tcp_syncache.c user/ngie/more-tests2/sys/netinet/tcp_timer.c user/ngie/more-tests2/sys/netinet/tcp_usrreq.c user/ngie/more-tests2/sys/netinet/tcp_var.h user/ngie/more-tests2/sys/netinet/toecore.c user/ngie/more-tests2/sys/netinet6/in6.c user/ngie/more-tests2/sys/netinet6/nd6.c user/ngie/more-tests2/sys/netinet6/nd6_nbr.c user/ngie/more-tests2/sys/security/mac/mac_framework.c user/ngie/more-tests2/sys/security/mac/mac_internal.h user/ngie/more-tests2/sys/sys/buf.h user/ngie/more-tests2/sys/sys/sysent.h user/ngie/more-tests2/sys/sys/vnode.h user/ngie/more-tests2/sys/vm/default_pager.c user/ngie/more-tests2/sys/vm/device_pager.c user/ngie/more-tests2/sys/vm/phys_pager.c user/ngie/more-tests2/sys/vm/sg_pager.c user/ngie/more-tests2/sys/vm/swap_pager.c user/ngie/more-tests2/sys/vm/vm_fault.c user/ngie/more-tests2/sys/vm/vm_glue.c user/ngie/more-tests2/sys/vm/vm_object.c user/ngie/more-tests2/sys/vm/vm_object.h user/ngie/more-tests2/sys/vm/vm_page.c user/ngie/more-tests2/sys/vm/vm_page.h user/ngie/more-tests2/sys/vm/vm_pager.c user/ngie/more-tests2/sys/vm/vm_pager.h user/ngie/more-tests2/sys/vm/vnode_pager.c user/ngie/more-tests2/sys/vm/vnode_pager.h user/ngie/more-tests2/tests/freebsd_test_suite/macros.h user/ngie/more-tests2/tools/build/mk/OptionalObsoleteFiles.inc user/ngie/more-tests2/tools/regression/lib/msun/Makefile user/ngie/more-tests2/usr.bin/netstat/ipsec.c user/ngie/more-tests2/usr.bin/netstat/main.c user/ngie/more-tests2/usr.sbin/Makefile.arm user/ngie/more-tests2/usr.sbin/ndp/ndp.c Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/contrib/llvm/ (props changed) user/ngie/more-tests2/contrib/llvm/tools/lldb/ (props changed) user/ngie/more-tests2/lib/libc/ (props changed) user/ngie/more-tests2/share/ (props changed) user/ngie/more-tests2/sys/ (props changed) user/ngie/more-tests2/sys/boot/ (props changed) user/ngie/more-tests2/sys/cddl/contrib/opensolaris/ (props changed) user/ngie/more-tests2/sys/conf/ (props changed) Modified: user/ngie/more-tests2/MAINTAINERS ============================================================================== --- user/ngie/more-tests2/MAINTAINERS Thu Dec 17 06:35:31 2015 (r292396) +++ user/ngie/more-tests2/MAINTAINERS Thu Dec 17 06:55:25 2015 (r292397) @@ -37,9 +37,12 @@ contrib/llvm/tools/lldb emaste Pre-commi contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. contrib/pjdfstest freebsd-testing,ngie,pjd Pre-commit review requested. dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +*env(3) secteam Due to the problematic security history of this + code, please have patches reviewed by secteam. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. fetch des Pre-commit review requested. +geli pjd Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/). isci(4) jimharris Pre-commit review requested. iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org @@ -51,6 +54,7 @@ lpr gad Pre-commit review requested, pa lpd/recvjob.c and lpd/printjob.c. nanobsd imp Pre-commit phabricator review requested. net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. nis(8), yp(8) araujo Pre-commit review requested. nvd(4) jimharris Pre-commit review requested. nvme(4) jimharris Pre-commit review requested. @@ -59,6 +63,7 @@ opencrypto jmg Pre-commit review request openssh des Pre-commit review requested. openssl benl,jkim Pre-commit review requested. otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +pci bus imp,jhb Pre-commit review requested. pmcstudy(8) rrs Pre-commit review requested. procfs des Pre-commit review requested. pseudofs des Pre-commit review requested. @@ -92,7 +97,6 @@ contrib/openbsm rwatson Pre-commit revie sys/security/audit rwatson Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. -pci bus imp,jhb Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -122,7 +126,6 @@ file obrien Insists to keep file blocke contrib/bzip2 obrien Pre-commit review required. geom freebsd-geom@FreeBSD.org geom_concat pjd Pre-commit review preferred. -geom_eli pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. geom_label pjd Pre-commit review preferred. geom_mirror pjd Pre-commit review preferred. @@ -133,7 +136,6 @@ geom_stripe pjd Pre-commit review prefer geom_zero pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. zfs freebsd-fs@FreeBSD.org -nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. @@ -143,8 +145,6 @@ lib/libbluetooth emax Pre-commit review lib/libsdp emax Pre-commit review preferred. usr.bin/bluetooth emax Pre-commit review preferred. usr.sbin/bluetooth emax Pre-commit review preferred. -*env(3) secteam Due to the problematic security history of this - code, please have patches reviewed by secteam. share/zoneinfo edwin Heads-up appreciated, since our data is coming from a third party source. usr.sbin/zic edwin Heads-up appreciated, since this code is Modified: user/ngie/more-tests2/UPDATING ============================================================================== --- user/ngie/more-tests2/UPDATING Thu Dec 17 06:35:31 2015 (r292396) +++ user/ngie/more-tests2/UPDATING Thu Dec 17 06:55:25 2015 (r292397) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20151216: + The tftp loader (pxeboot) now uses the option root-path directive. As a + consequence it no longer looks for a pxeboot.4th file on the tftp + server. Instead it uses the regular /boot infrastructure as with the + other loaders. + 20151211: The code to start recording plug and play data into the modules has been committed. While the old tools will properly build a new kernel, Modified: user/ngie/more-tests2/bin/sh/var.c ============================================================================== --- user/ngie/more-tests2/bin/sh/var.c Thu Dec 17 06:35:31 2015 (r292396) +++ user/ngie/more-tests2/bin/sh/var.c Thu Dec 17 06:55:25 2015 (r292397) @@ -330,7 +330,7 @@ setvareq(char *s, int flags) if (vp->flags & VREADONLY) { if ((flags & (VTEXTFIXED|VSTACK)) == 0) ckfree(s); - error("%.*s: is read only", vp->name_len, s); + error("%.*s: is read only", vp->name_len, vp->text); } if (flags & VNOSET) { if ((flags & (VTEXTFIXED|VSTACK)) == 0) Modified: user/ngie/more-tests2/contrib/llvm/tools/lldb/docs/lldb.1 ============================================================================== --- user/ngie/more-tests2/contrib/llvm/tools/lldb/docs/lldb.1 Thu Dec 17 06:35:31 2015 (r292396) +++ user/ngie/more-tests2/contrib/llvm/tools/lldb/docs/lldb.1 Thu Dec 17 06:55:25 2015 (r292397) @@ -1,4 +1,4 @@ -.Dd June 7, 2012 \" DATE +.Dd December 16, 2015 \" DATE .Dt LLDB 1 \" Program name and manual section number .Os .Sh NAME \" Section Header - required - don't modify @@ -8,6 +8,7 @@ .Nm lldb .Op Fl hvdexw .Op Fl a Ar arch +.Op Fl c Ar core-file .Op Fl l Ar script-language .Op Fl s Ar lldb-commands .Op Fl n Ar process-name @@ -52,6 +53,8 @@ to it as early in the process-launch as Specifies a currently running process that .Nm should attach to. +.It Fl c, -core Ar core-file +Specifies the core file to examine. .It Fl l, -script-language Ar language Tells the debugger to use the specified scripting language for user-defined scripts, rather than the default. Valid scripting Modified: user/ngie/more-tests2/etc/mtree/BSD.tests.dist ============================================================================== --- user/ngie/more-tests2/etc/mtree/BSD.tests.dist Thu Dec 17 06:35:31 2015 (r292396) +++ user/ngie/more-tests2/etc/mtree/BSD.tests.dist Thu Dec 17 06:55:25 2015 (r292397) @@ -271,10 +271,14 @@ .. .. .. + nss + .. regex data .. .. + resolv + .. rpc .. ssp Modified: user/ngie/more-tests2/etc/periodic/daily/800.scrub-zfs ============================================================================== --- user/ngie/more-tests2/etc/periodic/daily/800.scrub-zfs Thu Dec 17 06:35:31 2015 (r292396) +++ user/ngie/more-tests2/etc/periodic/daily/800.scrub-zfs Thu Dec 17 06:55:25 2015 (r292397) @@ -43,6 +43,10 @@ case "$daily_scrub_zfs_enable" in rc=3 echo "Skipping faulted pool: ${pool}" continue ;; + *UNAVAIL*) + rc=4 + echo "Skipping unavailable pool: ${pool}" + continue ;; esac # determine how many days shall be between scrubs Modified: user/ngie/more-tests2/lib/libc/tests/Makefile ============================================================================== --- user/ngie/more-tests2/lib/libc/tests/Makefile Thu Dec 17 06:35:31 2015 (r292396) +++ user/ngie/more-tests2/lib/libc/tests/Makefile Thu Dec 17 06:55:25 2015 (r292397) @@ -10,7 +10,9 @@ TESTS_SUBDIRS+= gen TESTS_SUBDIRS+= hash TESTS_SUBDIRS+= inet TESTS_SUBDIRS+= net +TESTS_SUBDIRS+= nss TESTS_SUBDIRS+= regex +TESTS_SUBDIRS+= resolv TESTS_SUBDIRS+= rpc TESTS_SUBDIRS+= stdio TESTS_SUBDIRS+= stdlib Modified: user/ngie/more-tests2/lib/libfetch/http.c ============================================================================== --- user/ngie/more-tests2/lib/libfetch/http.c Thu Dec 17 06:35:31 2015 (r292396) +++ user/ngie/more-tests2/lib/libfetch/http.c Thu Dec 17 06:55:25 2015 (r292397) @@ -130,8 +130,8 @@ struct httpio int chunked; /* chunked mode */ char *buf; /* chunk buffer */ size_t bufsize; /* size of chunk buffer */ - ssize_t buflen; /* amount of data currently in buffer */ - int bufpos; /* current read offset in buffer */ + size_t buflen; /* amount of data currently in buffer */ + size_t bufpos; /* current read offset in buffer */ int eof; /* end-of-file flag */ int error; /* error flag */ size_t chunksize; /* remaining size of current chunk */ @@ -215,6 +215,7 @@ http_fillbuf(struct httpio *io, size_t l if (io->eof) return (0); + /* not chunked: just fetch the requested amount */ if (io->chunked == 0) { if (http_growbuf(io, len) == -1) return (-1); @@ -227,6 +228,7 @@ http_fillbuf(struct httpio *io, size_t l return (io->buflen); } + /* chunked, but we ran out: get the next chunk header */ if (io->chunksize == 0) { switch (http_new_chunk(io)) { case -1: @@ -238,6 +240,7 @@ http_fillbuf(struct httpio *io, size_t l } } + /* fetch the requested amount, but no more than the current chunk */ if (len > io->chunksize) len = io->chunksize; if (http_growbuf(io, len) == -1) @@ -246,8 +249,9 @@ http_fillbuf(struct httpio *io, size_t l io->error = errno; return (-1); } + io->bufpos = 0; io->buflen = nbytes; - io->chunksize -= io->buflen; + io->chunksize -= nbytes; if (io->chunksize == 0) { if (fetch_read(io->conn, &ch, 1) != 1 || ch != '\r' || @@ -255,8 +259,6 @@ http_fillbuf(struct httpio *io, size_t l return (-1); } - io->bufpos = 0; - return (io->buflen); } Modified: user/ngie/more-tests2/lib/libstand/tftp.c ============================================================================== --- user/ngie/more-tests2/lib/libstand/tftp.c Thu Dec 17 06:35:31 2015 (r292396) +++ user/ngie/more-tests2/lib/libstand/tftp.c Thu Dec 17 06:55:25 2015 (r292397) @@ -399,6 +399,8 @@ tftp_open(const char *path, struct open_ struct tftp_handle *tftpfile; struct iodesc *io; int res; + size_t pathsize; + const char *extraslash; if (strcmp(f->f_dev->dv_name, "net") != 0) { #ifdef __i386__ @@ -424,10 +426,22 @@ tftp_open(const char *path, struct open_ io->destip = servip; tftpfile->off = 0; - tftpfile->path = strdup(path); + pathsize = (strlen(rootpath) + 1 + strlen(path) + 1) * sizeof(char); + tftpfile->path = malloc(pathsize); if (tftpfile->path == NULL) { - free(tftpfile); - return(ENOMEM); + free(tftpfile); + return(ENOMEM); + } + if (rootpath[strlen(rootpath) - 1] == '/' || path[0] == '/') + extraslash = ""; + else + extraslash = "/"; + res = snprintf(tftpfile->path, pathsize, "%s%s%s", + rootpath, extraslash, path); + if (res < 0 || res > pathsize) { + free(tftpfile->path); + free(tftpfile); + return(ENOMEM); } res = tftp_makereq(tftpfile); Modified: user/ngie/more-tests2/lib/msun/tests/Makefile ============================================================================== --- user/ngie/more-tests2/lib/msun/tests/Makefile Thu Dec 17 06:35:31 2015 (r292396) +++ user/ngie/more-tests2/lib/msun/tests/Makefile Thu Dec 17 06:55:25 2015 (r292397) @@ -36,11 +36,34 @@ NETBSD_ATF_TESTS_C+= sqrt_test NETBSD_ATF_TESTS_C+= tan_test NETBSD_ATF_TESTS_C+= tanh_test +TAP_TESTS_C+= cexp_test +TAP_TESTS_C+= conj_test +TAP_TESTS_C+= csqrt_test +TAP_TESTS_C+= fenv_test +TAP_TESTS_C+= fmaxmin_test +TAP_TESTS_C+= ilogb_test +TAP_TESTS_C+= invctrig_test +TAP_TESTS_C+= logarithm_test +TAP_TESTS_C+= lrint_test +TAP_TESTS_C+= nan_test +TAP_TESTS_C+= nearbyint_test +TAP_TESTS_C+= next_test +TAP_TESTS_C+= rem_test +TAP_TESTS_C+= trig_test + +.for t in ${TAP_TESTS_C} +CFLAGS.$t+= -O0 +CFLAGS.$t+= -I${SRCTOP}/tools/regression/lib/msun +.endfor + CSTD= c99 -LIBADD+= m #COPTS+= -Wfloat-equal +IGNORE_PRAGMA= + +LIBADD+= m + # Copied from lib/msun/Makefile .if ${MACHINE_CPUARCH} == "i386" ARCH_SUBDIR= i387 Copied: user/ngie/more-tests2/lib/msun/tests/cexp_test.c (from r292396, head/lib/msun/tests/cexp_test.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/lib/msun/tests/cexp_test.c Thu Dec 17 06:55:25 2015 (r292397, copy of r292396, head/lib/msun/tests/cexp_test.c) @@ -0,0 +1,322 @@ +/*- + * Copyright (c) 2008-2011 David Schultz + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Tests for corner cases in cexp*(). + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +#include +#include +#include +#include +#include +#include + +#include "test-utils.h" + +#pragma STDC FENV_ACCESS ON +#pragma STDC CX_LIMITED_RANGE OFF + +/* + * Test that a function returns the correct value and sets the + * exception flags correctly. The exceptmask specifies which + * exceptions we should check. We need to be lenient for several + * reasons, but mainly because on some architectures it's impossible + * to raise FE_OVERFLOW without raising FE_INEXACT. In some cases, + * whether cexp() raises an invalid exception is unspecified. + * + * These are macros instead of functions so that assert provides more + * meaningful error messages. + * + * XXX The volatile here is to avoid gcc's bogus constant folding and work + * around the lack of support for the FENV_ACCESS pragma. + */ +#define test(func, z, result, exceptmask, excepts, checksign) do { \ + volatile long double complex _d = z; \ + assert(feclearexcept(FE_ALL_EXCEPT) == 0); \ + assert(cfpequal_cs((func)(_d), (result), (checksign))); \ + assert(((void)(func), fetestexcept(exceptmask) == (excepts))); \ +} while (0) + +/* Test within a given tolerance. */ +#define test_tol(func, z, result, tol) do { \ + volatile long double complex _d = z; \ + assert(cfpequal_tol((func)(_d), (result), (tol), \ + FPE_ABS_ZERO | CS_BOTH)); \ +} while (0) + +/* Test all the functions that compute cexp(x). */ +#define testall(x, result, exceptmask, excepts, checksign) do { \ + test(cexp, x, result, exceptmask, excepts, checksign); \ + test(cexpf, x, result, exceptmask, excepts, checksign); \ +} while (0) + +/* + * Test all the functions that compute cexp(x), within a given tolerance. + * The tolerance is specified in ulps. + */ +#define testall_tol(x, result, tol) do { \ + test_tol(cexp, x, result, tol * DBL_ULP()); \ + test_tol(cexpf, x, result, tol * FLT_ULP()); \ +} while (0) + +/* Various finite non-zero numbers to test. */ +static const float finites[] = +{ -42.0e20, -1.0, -1.0e-10, -0.0, 0.0, 1.0e-10, 1.0, 42.0e20 }; + + +/* Tests for 0 */ +void +test_zero(void) +{ + + /* cexp(0) = 1, no exceptions raised */ + testall(0.0, 1.0, ALL_STD_EXCEPT, 0, 1); + testall(-0.0, 1.0, ALL_STD_EXCEPT, 0, 1); + testall(CMPLXL(0.0, -0.0), CMPLXL(1.0, -0.0), ALL_STD_EXCEPT, 0, 1); + testall(CMPLXL(-0.0, -0.0), CMPLXL(1.0, -0.0), ALL_STD_EXCEPT, 0, 1); +} + +/* + * Tests for NaN. The signs of the results are indeterminate unless the + * imaginary part is 0. + */ +void +test_nan() +{ + int i; + + /* cexp(x + NaNi) = NaN + NaNi and optionally raises invalid */ + /* cexp(NaN + yi) = NaN + NaNi and optionally raises invalid (|y|>0) */ + for (i = 0; i < nitems(finites); i++) { + printf("# Run %d..\n", i); + testall(CMPLXL(finites[i], NAN), CMPLXL(NAN, NAN), + ALL_STD_EXCEPT & ~FE_INVALID, 0, 0); + if (finites[i] == 0.0) + continue; + /* XXX FE_INEXACT shouldn't be raised here */ + testall(CMPLXL(NAN, finites[i]), CMPLXL(NAN, NAN), + ALL_STD_EXCEPT & ~(FE_INVALID | FE_INEXACT), 0, 0); + } + + /* cexp(NaN +- 0i) = NaN +- 0i */ + testall(CMPLXL(NAN, 0.0), CMPLXL(NAN, 0.0), ALL_STD_EXCEPT, 0, 1); + testall(CMPLXL(NAN, -0.0), CMPLXL(NAN, -0.0), ALL_STD_EXCEPT, 0, 1); + + /* cexp(inf + NaN i) = inf + nan i */ + testall(CMPLXL(INFINITY, NAN), CMPLXL(INFINITY, NAN), + ALL_STD_EXCEPT, 0, 0); + /* cexp(-inf + NaN i) = 0 */ + testall(CMPLXL(-INFINITY, NAN), CMPLXL(0.0, 0.0), + ALL_STD_EXCEPT, 0, 0); + /* cexp(NaN + NaN i) = NaN + NaN i */ + testall(CMPLXL(NAN, NAN), CMPLXL(NAN, NAN), + ALL_STD_EXCEPT, 0, 0); +} + +void +test_inf(void) +{ + int i; + + /* cexp(x + inf i) = NaN + NaNi and raises invalid */ + for (i = 0; i < nitems(finites); i++) { + printf("# Run %d..\n", i); + testall(CMPLXL(finites[i], INFINITY), CMPLXL(NAN, NAN), + ALL_STD_EXCEPT, FE_INVALID, 1); + } + /* cexp(-inf + yi) = 0 * (cos(y) + sin(y)i) */ + /* XXX shouldn't raise an inexact exception */ + testall(CMPLXL(-INFINITY, M_PI_4), CMPLXL(0.0, 0.0), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + testall(CMPLXL(-INFINITY, 3 * M_PI_4), CMPLXL(-0.0, 0.0), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + testall(CMPLXL(-INFINITY, 5 * M_PI_4), CMPLXL(-0.0, -0.0), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + testall(CMPLXL(-INFINITY, 7 * M_PI_4), CMPLXL(0.0, -0.0), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + testall(CMPLXL(-INFINITY, 0.0), CMPLXL(0.0, 0.0), + ALL_STD_EXCEPT, 0, 1); + testall(CMPLXL(-INFINITY, -0.0), CMPLXL(0.0, -0.0), + ALL_STD_EXCEPT, 0, 1); + /* cexp(inf + yi) = inf * (cos(y) + sin(y)i) (except y=0) */ + /* XXX shouldn't raise an inexact exception */ + testall(CMPLXL(INFINITY, M_PI_4), CMPLXL(INFINITY, INFINITY), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + testall(CMPLXL(INFINITY, 3 * M_PI_4), CMPLXL(-INFINITY, INFINITY), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + testall(CMPLXL(INFINITY, 5 * M_PI_4), CMPLXL(-INFINITY, -INFINITY), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + testall(CMPLXL(INFINITY, 7 * M_PI_4), CMPLXL(INFINITY, -INFINITY), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + /* cexp(inf + 0i) = inf + 0i */ + testall(CMPLXL(INFINITY, 0.0), CMPLXL(INFINITY, 0.0), + ALL_STD_EXCEPT, 0, 1); + testall(CMPLXL(INFINITY, -0.0), CMPLXL(INFINITY, -0.0), + ALL_STD_EXCEPT, 0, 1); +} + +void +test_reals(void) +{ + int i; + + for (i = 0; i < nitems(finites); i++) { + /* XXX could check exceptions more meticulously */ + printf("# Run %d..\n", i); + test(cexp, CMPLXL(finites[i], 0.0), + CMPLXL(exp(finites[i]), 0.0), + FE_INVALID | FE_DIVBYZERO, 0, 1); + test(cexp, CMPLXL(finites[i], -0.0), + CMPLXL(exp(finites[i]), -0.0), + FE_INVALID | FE_DIVBYZERO, 0, 1); + test(cexpf, CMPLXL(finites[i], 0.0), + CMPLXL(expf(finites[i]), 0.0), + FE_INVALID | FE_DIVBYZERO, 0, 1); + test(cexpf, CMPLXL(finites[i], -0.0), + CMPLXL(expf(finites[i]), -0.0), + FE_INVALID | FE_DIVBYZERO, 0, 1); + } +} + +void +test_imaginaries(void) +{ + int i; + + for (i = 0; i < nitems(finites); i++) { + printf("# Run %d..\n", i); + test(cexp, CMPLXL(0.0, finites[i]), + CMPLXL(cos(finites[i]), sin(finites[i])), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + test(cexp, CMPLXL(-0.0, finites[i]), + CMPLXL(cos(finites[i]), sin(finites[i])), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + test(cexpf, CMPLXL(0.0, finites[i]), + CMPLXL(cosf(finites[i]), sinf(finites[i])), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + test(cexpf, CMPLXL(-0.0, finites[i]), + CMPLXL(cosf(finites[i]), sinf(finites[i])), + ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1); + } +} + +void +test_small(void) +{ + static const double tests[] = { + /* csqrt(a + bI) = x + yI */ + /* a b x y */ + 1.0, M_PI_4, M_SQRT2 * 0.5 * M_E, M_SQRT2 * 0.5 * M_E, + -1.0, M_PI_4, M_SQRT2 * 0.5 / M_E, M_SQRT2 * 0.5 / M_E, + 2.0, M_PI_2, 0.0, M_E * M_E, + M_LN2, M_PI, -2.0, 0.0, + }; + double a, b; + double x, y; + int i; + + for (i = 0; i < nitems(tests); i += 4) { + printf("# Run %d..\n", i); + a = tests[i]; + b = tests[i + 1]; + x = tests[i + 2]; + y = tests[i + 3]; + test_tol(cexp, CMPLXL(a, b), CMPLXL(x, y), 3 * DBL_ULP()); + + /* float doesn't have enough precision to pass these tests */ + if (x == 0 || y == 0) + continue; + test_tol(cexpf, CMPLXL(a, b), CMPLXL(x, y), 1 * FLT_ULP()); + } +} + +/* Test inputs with a real part r that would overflow exp(r). */ +void +test_large(void) +{ + + test_tol(cexp, CMPLXL(709.79, 0x1p-1074), + CMPLXL(INFINITY, 8.94674309915433533273e-16), DBL_ULP()); + test_tol(cexp, CMPLXL(1000, 0x1p-1074), + CMPLXL(INFINITY, 9.73344457300016401328e+110), DBL_ULP()); + test_tol(cexp, CMPLXL(1400, 0x1p-1074), + CMPLXL(INFINITY, 5.08228858149196559681e+284), DBL_ULP()); + test_tol(cexp, CMPLXL(900, 0x1.23456789abcdep-1020), + CMPLXL(INFINITY, 7.42156649354218408074e+83), DBL_ULP()); + test_tol(cexp, CMPLXL(1300, 0x1.23456789abcdep-1020), + CMPLXL(INFINITY, 3.87514844965996756704e+257), DBL_ULP()); + + test_tol(cexpf, CMPLXL(88.73, 0x1p-149), + CMPLXL(INFINITY, 4.80265603e-07), 2 * FLT_ULP()); + test_tol(cexpf, CMPLXL(90, 0x1p-149), + CMPLXL(INFINITY, 1.7101492622e-06f), 2 * FLT_ULP()); + test_tol(cexpf, CMPLXL(192, 0x1p-149), + CMPLXL(INFINITY, 3.396809344e+38f), 2 * FLT_ULP()); + test_tol(cexpf, CMPLXL(120, 0x1.234568p-120), + CMPLXL(INFINITY, 1.1163382522e+16f), 2 * FLT_ULP()); + test_tol(cexpf, CMPLXL(170, 0x1.234568p-120), + CMPLXL(INFINITY, 5.7878851079e+37f), 2 * FLT_ULP()); +} + +int +main(int argc, char *argv[]) +{ + + printf("1..7\n"); + + test_zero(); + printf("ok 1 - cexp zero\n"); + + test_nan(); + printf("ok 2 - cexp nan\n"); + + test_inf(); + printf("ok 3 - cexp inf\n"); + +#if defined(__i386__) + printf("not ok 4 - cexp reals # TODO: PR # 191676 fails assertion on i386\n"); +#else + test_reals(); + printf("ok 4 - cexp reals\n"); +#endif + + test_imaginaries(); + printf("ok 5 - cexp imaginaries\n"); + + test_small(); + printf("ok 6 - cexp small\n"); + + test_large(); + printf("ok 7 - cexp large\n"); + + return (0); +} Copied: user/ngie/more-tests2/lib/msun/tests/conj_test.c (from r292396, head/lib/msun/tests/conj_test.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/lib/msun/tests/conj_test.c Thu Dec 17 06:55:25 2015 (r292397, copy of r292396, head/lib/msun/tests/conj_test.c) @@ -0,0 +1,139 @@ +/*- + * Copyright (c) 2008 David Schultz + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Tests for conj{,f,l}() + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include + +#include "test-utils.h" + +#pragma STDC CX_LIMITED_RANGE OFF + +/* Make sure gcc doesn't use builtin versions of these or honor __pure2. */ +static float complex (*libconjf)(float complex) = conjf; +static double complex (*libconj)(double complex) = conj; +static long double complex (*libconjl)(long double complex) = conjl; +static float (*libcrealf)(float complex) = crealf; +static double (*libcreal)(double complex) = creal; +static long double (*libcreall)(long double complex) = creall; +static float (*libcimagf)(float complex) = cimagf; +static double (*libcimag)(double complex) = cimag; +static long double (*libcimagl)(long double complex) = cimagl; + +static const double tests[] = { + /* a + bI */ + 0.0, 0.0, + 0.0, 1.0, + 1.0, 0.0, + -1.0, 0.0, + 1.0, -0.0, + 0.0, -1.0, + 2.0, 4.0, + 0.0, INFINITY, + 0.0, -INFINITY, + INFINITY, 0.0, + NAN, 1.0, + 1.0, NAN, + NAN, NAN, + -INFINITY, INFINITY, +}; + +int +main(int argc, char *argv[]) +{ + static const int ntests = sizeof(tests) / sizeof(tests[0]) / 2; + complex float in; + complex long double expected; + int i; + + printf("1..%d\n", ntests * 3); + + for (i = 0; i < ntests; i++) { + __real__ expected = __real__ in = tests[2 * i]; + __imag__ in = tests[2 * i + 1]; + __imag__ expected = -cimag(in); + + assert(fpequal(libcrealf(in), __real__ in)); + assert(fpequal(libcreal(in), __real__ in)); + assert(fpequal(libcreall(in), __real__ in)); + assert(fpequal(libcimagf(in), __imag__ in)); + assert(fpequal(libcimag(in), __imag__ in)); + assert(fpequal(libcimagl(in), __imag__ in)); + + feclearexcept(FE_ALL_EXCEPT); + if (!cfpequal(libconjf(in), expected)) { + printf("not ok %d\t# conjf(%#.2g + %#.2gI): " + "wrong value\n", + 3 * i + 1, creal(in), cimag(in)); + } else if (fetestexcept(FE_ALL_EXCEPT)) { + printf("not ok %d\t# conjf(%#.2g + %#.2gI): " + "threw an exception\n", + 3 * i + 1, creal(in), cimag(in)); + } else { + printf("ok %d\t\t# conjf(%#.2g + %#.2gI)\n", + 3 * i + 1, creal(in), cimag(in)); + } + + feclearexcept(FE_ALL_EXCEPT); + if (!cfpequal(libconj(in), expected)) { + printf("not ok %d\t# conj(%#.2g + %#.2gI): " + "wrong value\n", + 3 * i + 2, creal(in), cimag(in)); + } else if (fetestexcept(FE_ALL_EXCEPT)) { + printf("not ok %d\t# conj(%#.2g + %#.2gI): " + "threw an exception\n", + 3 * i + 2, creal(in), cimag(in)); + } else { + printf("ok %d\t\t# conj(%#.2g + %#.2gI)\n", + 3 * i + 2, creal(in), cimag(in)); + } + + feclearexcept(FE_ALL_EXCEPT); + if (!cfpequal(libconjl(in), expected)) { + printf("not ok %d\t# conjl(%#.2g + %#.2gI): " + "wrong value\n", + 3 * i + 3, creal(in), cimag(in)); + } else if (fetestexcept(FE_ALL_EXCEPT)) { + printf("not ok %d\t# conjl(%#.2g + %#.2gI): " + "threw an exception\n", + 3 * i + 3, creal(in), cimag(in)); + } else { + printf("ok %d\t\t# conjl(%#.2g + %#.2gI)\n", + 3 * i + 3, creal(in), cimag(in)); + } + } + + return (0); +} Copied: user/ngie/more-tests2/lib/msun/tests/csqrt_test.c (from r292396, head/lib/msun/tests/csqrt_test.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/lib/msun/tests/csqrt_test.c Thu Dec 17 06:55:25 2015 (r292397, copy of r292396, head/lib/msun/tests/csqrt_test.c) @@ -0,0 +1,295 @@ +/*- + * Copyright (c) 2007 David Schultz + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Tests for csqrt{,f}() + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +#include +#include +#include +#include +#include + +#include "test-utils.h" + +/* + * This is a test hook that can point to csqrtl(), _csqrt(), or to _csqrtf(). + * The latter two convert to float or double, respectively, and test csqrtf() + * and csqrt() with the same arguments. + */ +long double complex (*t_csqrt)(long double complex); + +static long double complex +_csqrtf(long double complex d) +{ + + return (csqrtf((float complex)d)); +} + +static long double complex +_csqrt(long double complex d) +{ + + return (csqrt((double complex)d)); +} + +#pragma STDC CX_LIMITED_RANGE OFF + +/* + * Compare d1 and d2 using special rules: NaN == NaN and +0 != -0. + * Fail an assertion if they differ. + */ +static void +assert_equal(long double complex d1, long double complex d2) +{ + + assert(cfpequal(d1, d2)); +} + +/* + * Test csqrt for some finite arguments where the answer is exact. + * (We do not test if it produces correctly rounded answers when the + * result is inexact, nor do we check whether it throws spurious + * exceptions.) + */ +static void +test_finite() +{ + static const double tests[] = { + /* csqrt(a + bI) = x + yI */ + /* a b x y */ + 0, 8, 2, 2, + 0, -8, 2, -2, + 4, 0, 2, 0, + -4, 0, 0, 2, + 3, 4, 2, 1, + 3, -4, 2, -1, + -3, 4, 1, 2, + -3, -4, 1, -2, + 5, 12, 3, 2, + 7, 24, 4, 3, + 9, 40, 5, 4, + 11, 60, 6, 5, + 13, 84, 7, 6, + 33, 56, 7, 4, + 39, 80, 8, 5, + 65, 72, 9, 4, + 987, 9916, 74, 67, + 5289, 6640, 83, 40, + 460766389075.0, 16762287900.0, 678910, 12345 + }; + /* + * We also test some multiples of the above arguments. This + * array defines which multiples we use. Note that these have + * to be small enough to not cause overflow for float precision + * with all of the constants in the above table. + */ + static const double mults[] = { + 1, + 2, + 3, + 13, + 16, + 0x1.p30, + 0x1.p-30, + }; + + double a, b; + double x, y; + int i, j; + + for (i = 0; i < nitems(tests); i += 4) { + for (j = 0; j < nitems(mults); j++) { + a = tests[i] * mults[j] * mults[j]; + b = tests[i + 1] * mults[j] * mults[j]; + x = tests[i + 2] * mults[j]; + y = tests[i + 3] * mults[j]; + assert(t_csqrt(CMPLXL(a, b)) == CMPLXL(x, y)); + } + } + +} + +/* + * Test the handling of +/- 0. + */ +static void +test_zeros() +{ + + assert_equal(t_csqrt(CMPLXL(0.0, 0.0)), CMPLXL(0.0, 0.0)); + assert_equal(t_csqrt(CMPLXL(-0.0, 0.0)), CMPLXL(0.0, 0.0)); + assert_equal(t_csqrt(CMPLXL(0.0, -0.0)), CMPLXL(0.0, -0.0)); + assert_equal(t_csqrt(CMPLXL(-0.0, -0.0)), CMPLXL(0.0, -0.0)); +} + +/* + * Test the handling of infinities when the other argument is not NaN. + */ +static void +test_infinities() +{ + static const double vals[] = { + 0.0, + -0.0, + 42.0, + -42.0, + INFINITY, + -INFINITY, + }; + + int i; + + for (i = 0; i < nitems(vals); i++) { + if (isfinite(vals[i])) { + assert_equal(t_csqrt(CMPLXL(-INFINITY, vals[i])), + CMPLXL(0.0, copysignl(INFINITY, vals[i]))); + assert_equal(t_csqrt(CMPLXL(INFINITY, vals[i])), + CMPLXL(INFINITY, copysignl(0.0, vals[i]))); + } + assert_equal(t_csqrt(CMPLXL(vals[i], INFINITY)), + CMPLXL(INFINITY, INFINITY)); + assert_equal(t_csqrt(CMPLXL(vals[i], -INFINITY)), + CMPLXL(INFINITY, -INFINITY)); + } +} + +/* + * Test the handling of NaNs. + */ +static void +test_nans() +{ + + assert(creall(t_csqrt(CMPLXL(INFINITY, NAN))) == INFINITY); + assert(isnan(cimagl(t_csqrt(CMPLXL(INFINITY, NAN))))); + + assert(isnan(creall(t_csqrt(CMPLXL(-INFINITY, NAN))))); + assert(isinf(cimagl(t_csqrt(CMPLXL(-INFINITY, NAN))))); + + assert_equal(t_csqrt(CMPLXL(NAN, INFINITY)), + CMPLXL(INFINITY, INFINITY)); + assert_equal(t_csqrt(CMPLXL(NAN, -INFINITY)), + CMPLXL(INFINITY, -INFINITY)); + + assert_equal(t_csqrt(CMPLXL(0.0, NAN)), CMPLXL(NAN, NAN)); + assert_equal(t_csqrt(CMPLXL(-0.0, NAN)), CMPLXL(NAN, NAN)); + assert_equal(t_csqrt(CMPLXL(42.0, NAN)), CMPLXL(NAN, NAN)); + assert_equal(t_csqrt(CMPLXL(-42.0, NAN)), CMPLXL(NAN, NAN)); + assert_equal(t_csqrt(CMPLXL(NAN, 0.0)), CMPLXL(NAN, NAN)); + assert_equal(t_csqrt(CMPLXL(NAN, -0.0)), CMPLXL(NAN, NAN)); + assert_equal(t_csqrt(CMPLXL(NAN, 42.0)), CMPLXL(NAN, NAN)); + assert_equal(t_csqrt(CMPLXL(NAN, -42.0)), CMPLXL(NAN, NAN)); + assert_equal(t_csqrt(CMPLXL(NAN, NAN)), CMPLXL(NAN, NAN)); +} + +/* + * Test whether csqrt(a + bi) works for inputs that are large enough to + * cause overflow in hypot(a, b) + a. In this case we are using + * csqrt(115 + 252*I) == 14 + 9*I + * scaled up to near MAX_EXP. + */ +static void +test_overflow(int maxexp) +{ + long double a, b; + long double complex result; + + a = ldexpl(115 * 0x1p-8, maxexp); + b = ldexpl(252 * 0x1p-8, maxexp); + result = t_csqrt(CMPLXL(a, b)); + assert(creall(result) == ldexpl(14 * 0x1p-4, maxexp / 2)); + assert(cimagl(result) == ldexpl(9 * 0x1p-4, maxexp / 2)); +} + +int +main(int argc, char *argv[]) +{ + + printf("1..15\n"); + + /* Test csqrt() */ + t_csqrt = _csqrt; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Thu Dec 17 07:01:49 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D0E87A497CE for ; Thu, 17 Dec 2015 07:01:49 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5596B1AD2; Thu, 17 Dec 2015 07:01:49 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBH71m9L048029; Thu, 17 Dec 2015 07:01:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBH71kSO047699; Thu, 17 Dec 2015 07:01:46 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512170701.tBH71kSO047699@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 17 Dec 2015 07:01:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292398 - in user/ngie/make_check: . bin/freebsd-version bin/ls bin/ls/tests bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa cddl/contrib/opensolaris/cmd/dtrace/test/t... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2015 07:01:49 -0000 Author: ngie Date: Thu Dec 17 07:01:45 2015 New Revision: 292398 URL: https://svnweb.freebsd.org/changeset/base/292398 Log: MFhead @ r292397 Added: user/ngie/make_check/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh - copied unchanged from r292397, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh user/ngie/make_check/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out - copied unchanged from r292397, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out user/ngie/make_check/contrib/unbound/.gitignore - copied unchanged from r292397, head/contrib/unbound/.gitignore user/ngie/make_check/contrib/unbound/compat/isblank.c - copied unchanged from r292397, head/contrib/unbound/compat/isblank.c user/ngie/make_check/etc/etc.riscv/ - copied from r292397, head/etc/etc.riscv/ user/ngie/make_check/lib/csu/riscv/ - copied from r292397, head/lib/csu/riscv/ user/ngie/make_check/lib/libc/aarch64/sys/__vdso_gettc.c - copied unchanged from r292397, head/lib/libc/aarch64/sys/__vdso_gettc.c user/ngie/make_check/lib/libc/arm/sys/__vdso_gettc.c - copied unchanged from r292397, head/lib/libc/arm/sys/__vdso_gettc.c user/ngie/make_check/lib/libc/riscv/ - copied from r292397, head/lib/libc/riscv/ user/ngie/make_check/lib/libc/tests/nss/ - copied from r292397, head/lib/libc/tests/nss/ user/ngie/make_check/lib/libc/tests/resolv/ - copied from r292397, head/lib/libc/tests/resolv/ user/ngie/make_check/lib/libsysdecode/ - copied from r292397, head/lib/libsysdecode/ user/ngie/make_check/lib/libthr/arch/riscv/ - copied from r292397, head/lib/libthr/arch/riscv/ user/ngie/make_check/lib/msun/riscv/ - copied from r292397, head/lib/msun/riscv/ user/ngie/make_check/lib/msun/tests/cexp_test.c - copied unchanged from r292397, head/lib/msun/tests/cexp_test.c user/ngie/make_check/lib/msun/tests/conj_test.c - copied unchanged from r292397, head/lib/msun/tests/conj_test.c user/ngie/make_check/lib/msun/tests/csqrt_test.c - copied unchanged from r292397, head/lib/msun/tests/csqrt_test.c user/ngie/make_check/lib/msun/tests/fenv_test.c - copied unchanged from r292397, head/lib/msun/tests/fenv_test.c user/ngie/make_check/lib/msun/tests/fmaxmin_test.c - copied unchanged from r292397, head/lib/msun/tests/fmaxmin_test.c user/ngie/make_check/lib/msun/tests/ilogb_test.c - copied unchanged from r292397, head/lib/msun/tests/ilogb_test.c user/ngie/make_check/lib/msun/tests/invctrig_test.c - copied unchanged from r292397, head/lib/msun/tests/invctrig_test.c user/ngie/make_check/lib/msun/tests/logarithm_test.c - copied unchanged from r292397, head/lib/msun/tests/logarithm_test.c user/ngie/make_check/lib/msun/tests/lrint_test.c - copied unchanged from r292397, head/lib/msun/tests/lrint_test.c user/ngie/make_check/lib/msun/tests/nan_test.c - copied unchanged from r292397, head/lib/msun/tests/nan_test.c user/ngie/make_check/lib/msun/tests/nearbyint_test.c - copied unchanged from r292397, head/lib/msun/tests/nearbyint_test.c user/ngie/make_check/lib/msun/tests/next_test.c - copied unchanged from r292397, head/lib/msun/tests/next_test.c user/ngie/make_check/lib/msun/tests/rem_test.c - copied unchanged from r292397, head/lib/msun/tests/rem_test.c user/ngie/make_check/lib/msun/tests/trig_test.c - copied unchanged from r292397, head/lib/msun/tests/trig_test.c user/ngie/make_check/share/man/man9/proc_rwmem.9 - copied unchanged from r292397, head/share/man/man9/proc_rwmem.9 user/ngie/make_check/sys/dev/mlx5/eswitch_vacl.h - copied unchanged from r292397, head/sys/dev/mlx5/eswitch_vacl.h user/ngie/make_check/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c - copied unchanged from r292397, head/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c user/ngie/make_check/sys/modules/tcp/ - copied from r292397, head/sys/modules/tcp/ user/ngie/make_check/sys/netinet/in_fib.c - copied unchanged from r292397, head/sys/netinet/in_fib.c user/ngie/make_check/sys/netinet/in_fib.h - copied unchanged from r292397, head/sys/netinet/in_fib.h user/ngie/make_check/sys/netinet/tcp_stacks/ - copied from r292397, head/sys/netinet/tcp_stacks/ user/ngie/make_check/sys/netinet6/in6_fib.c - copied unchanged from r292397, head/sys/netinet6/in6_fib.c user/ngie/make_check/sys/netinet6/in6_fib.h - copied unchanged from r292397, head/sys/netinet6/in6_fib.h user/ngie/make_check/sys/x86/include/x86_smp.h - copied unchanged from r292397, head/sys/x86/include/x86_smp.h user/ngie/make_check/sys/x86/include/x86_var.h - copied unchanged from r292397, head/sys/x86/include/x86_var.h Deleted: user/ngie/make_check/sys/arm/include/katelib.h user/ngie/make_check/tools/regression/lib/libc/nss/ user/ngie/make_check/tools/regression/lib/libc/resolv/ user/ngie/make_check/tools/regression/lib/msun/test-cexp.c user/ngie/make_check/tools/regression/lib/msun/test-cexp.t user/ngie/make_check/tools/regression/lib/msun/test-conj.c user/ngie/make_check/tools/regression/lib/msun/test-conj.t user/ngie/make_check/tools/regression/lib/msun/test-csqrt.c user/ngie/make_check/tools/regression/lib/msun/test-csqrt.t user/ngie/make_check/tools/regression/lib/msun/test-fenv.c user/ngie/make_check/tools/regression/lib/msun/test-fenv.t user/ngie/make_check/tools/regression/lib/msun/test-fmaxmin.c user/ngie/make_check/tools/regression/lib/msun/test-fmaxmin.t user/ngie/make_check/tools/regression/lib/msun/test-ilogb.c user/ngie/make_check/tools/regression/lib/msun/test-ilogb.t user/ngie/make_check/tools/regression/lib/msun/test-invctrig.c user/ngie/make_check/tools/regression/lib/msun/test-logarithm.c user/ngie/make_check/tools/regression/lib/msun/test-logarithm.t user/ngie/make_check/tools/regression/lib/msun/test-lrint.c user/ngie/make_check/tools/regression/lib/msun/test-lrint.t user/ngie/make_check/tools/regression/lib/msun/test-nan.c user/ngie/make_check/tools/regression/lib/msun/test-nan.t user/ngie/make_check/tools/regression/lib/msun/test-nearbyint.c user/ngie/make_check/tools/regression/lib/msun/test-nearbyint.t user/ngie/make_check/tools/regression/lib/msun/test-next.c user/ngie/make_check/tools/regression/lib/msun/test-next.t user/ngie/make_check/tools/regression/lib/msun/test-rem.c user/ngie/make_check/tools/regression/lib/msun/test-rem.t user/ngie/make_check/tools/regression/lib/msun/test-trig.c user/ngie/make_check/tools/regression/lib/msun/test-trig.t user/ngie/make_check/usr.bin/kdump/utrace.c Modified: user/ngie/make_check/MAINTAINERS (contents, props changed) user/ngie/make_check/Makefile user/ngie/make_check/Makefile.inc1 user/ngie/make_check/UPDATING user/ngie/make_check/bin/freebsd-version/Makefile user/ngie/make_check/bin/ls/print.c user/ngie/make_check/bin/ls/tests/ls_tests.sh user/ngie/make_check/bin/sh/var.c user/ngie/make_check/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out user/ngie/make_check/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c user/ngie/make_check/cddl/usr.sbin/dtrace/tests/common/proc/Makefile user/ngie/make_check/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile user/ngie/make_check/contrib/bmake/ChangeLog user/ngie/make_check/contrib/bmake/Makefile user/ngie/make_check/contrib/bmake/boot-strap user/ngie/make_check/contrib/bmake/cond.c user/ngie/make_check/contrib/bmake/config.h.in user/ngie/make_check/contrib/bmake/configure user/ngie/make_check/contrib/bmake/configure.in user/ngie/make_check/contrib/bmake/main.c user/ngie/make_check/contrib/bmake/meta.c user/ngie/make_check/contrib/bmake/mk/ChangeLog user/ngie/make_check/contrib/bmake/mk/host-target.mk user/ngie/make_check/contrib/bmake/mk/init.mk user/ngie/make_check/contrib/bmake/mk/install-mk user/ngie/make_check/contrib/bmake/mk/lib.mk user/ngie/make_check/contrib/bmake/mk/meta.autodep.mk user/ngie/make_check/contrib/bmake/mk/meta.stage.mk user/ngie/make_check/contrib/bmake/mk/meta.subdir.mk user/ngie/make_check/contrib/bmake/mk/meta.sys.mk user/ngie/make_check/contrib/bmake/mk/own.mk user/ngie/make_check/contrib/bmake/mk/sys.mk user/ngie/make_check/contrib/bmake/os.sh user/ngie/make_check/contrib/bmake/parse.c user/ngie/make_check/contrib/bmake/unit-tests/Makefile.in user/ngie/make_check/contrib/bmake/unit-tests/cond2.mk user/ngie/make_check/contrib/bmake/unit-tests/doterror.exp user/ngie/make_check/contrib/bmake/unit-tests/modts.mk user/ngie/make_check/contrib/bmake/var.c user/ngie/make_check/contrib/elftoolchain/addr2line/addr2line.1 user/ngie/make_check/contrib/elftoolchain/addr2line/addr2line.c user/ngie/make_check/contrib/elftoolchain/common/elfdefinitions.h user/ngie/make_check/contrib/elftoolchain/elfcopy/binary.c user/ngie/make_check/contrib/elftoolchain/elfcopy/elfcopy.1 user/ngie/make_check/contrib/elftoolchain/elfcopy/main.c user/ngie/make_check/contrib/elftoolchain/elfcopy/sections.c user/ngie/make_check/contrib/elftoolchain/elfcopy/segments.c user/ngie/make_check/contrib/elftoolchain/libelf/elf_data.c user/ngie/make_check/contrib/elftoolchain/readelf/readelf.c user/ngie/make_check/contrib/llvm/tools/lldb/docs/lldb.1 user/ngie/make_check/contrib/mdocml/lib.in user/ngie/make_check/contrib/ofed/usr.bin/ibaddr/Makefile user/ngie/make_check/contrib/ofed/usr.bin/ibnetdiscover/Makefile user/ngie/make_check/contrib/ofed/usr.bin/ibping/Makefile user/ngie/make_check/contrib/ofed/usr.bin/ibportstate/Makefile user/ngie/make_check/contrib/ofed/usr.bin/ibroute/Makefile user/ngie/make_check/contrib/ofed/usr.bin/ibsendtrap/Makefile user/ngie/make_check/contrib/ofed/usr.bin/ibstat/Makefile user/ngie/make_check/contrib/ofed/usr.bin/ibsysstat/Makefile user/ngie/make_check/contrib/ofed/usr.bin/ibtracert/Makefile user/ngie/make_check/contrib/ofed/usr.bin/opensm/Makefile user/ngie/make_check/contrib/ofed/usr.bin/osmtest/Makefile user/ngie/make_check/contrib/ofed/usr.bin/perfquery/Makefile user/ngie/make_check/contrib/ofed/usr.bin/saquery/Makefile user/ngie/make_check/contrib/ofed/usr.bin/sminfo/Makefile user/ngie/make_check/contrib/ofed/usr.bin/smpdump/Makefile user/ngie/make_check/contrib/ofed/usr.bin/smpquery/Makefile user/ngie/make_check/contrib/ofed/usr.bin/vendstat/Makefile user/ngie/make_check/contrib/smbfs/README user/ngie/make_check/contrib/top/loadavg.h user/ngie/make_check/contrib/unbound/Makefile.in user/ngie/make_check/contrib/unbound/acx_nlnetlabs.m4 user/ngie/make_check/contrib/unbound/compat/arc4random.c user/ngie/make_check/contrib/unbound/compat/getentropy_linux.c user/ngie/make_check/contrib/unbound/compat/getentropy_solaris.c user/ngie/make_check/contrib/unbound/compat/reallocarray.c user/ngie/make_check/contrib/unbound/compat/sha512.c user/ngie/make_check/contrib/unbound/compat/snprintf.c user/ngie/make_check/contrib/unbound/config.h user/ngie/make_check/contrib/unbound/config.h.in user/ngie/make_check/contrib/unbound/configure user/ngie/make_check/contrib/unbound/configure.ac user/ngie/make_check/contrib/unbound/daemon/remote.c user/ngie/make_check/contrib/unbound/daemon/unbound.c user/ngie/make_check/contrib/unbound/daemon/worker.c user/ngie/make_check/contrib/unbound/dns64/dns64.c user/ngie/make_check/contrib/unbound/dnstap/dnstap.proto user/ngie/make_check/contrib/unbound/doc/Changelog user/ngie/make_check/contrib/unbound/doc/README user/ngie/make_check/contrib/unbound/doc/example.conf user/ngie/make_check/contrib/unbound/doc/example.conf.in user/ngie/make_check/contrib/unbound/doc/libunbound.3 user/ngie/make_check/contrib/unbound/doc/libunbound.3.in user/ngie/make_check/contrib/unbound/doc/unbound-anchor.8 user/ngie/make_check/contrib/unbound/doc/unbound-anchor.8.in user/ngie/make_check/contrib/unbound/doc/unbound-checkconf.8 user/ngie/make_check/contrib/unbound/doc/unbound-checkconf.8.in user/ngie/make_check/contrib/unbound/doc/unbound-control.8 user/ngie/make_check/contrib/unbound/doc/unbound-control.8.in user/ngie/make_check/contrib/unbound/doc/unbound-host.1 user/ngie/make_check/contrib/unbound/doc/unbound-host.1.in user/ngie/make_check/contrib/unbound/doc/unbound.8 user/ngie/make_check/contrib/unbound/doc/unbound.8.in user/ngie/make_check/contrib/unbound/doc/unbound.conf.5 user/ngie/make_check/contrib/unbound/doc/unbound.conf.5.in user/ngie/make_check/contrib/unbound/freebsd-configure.sh user/ngie/make_check/contrib/unbound/iterator/iter_scrub.c user/ngie/make_check/contrib/unbound/iterator/iter_utils.c user/ngie/make_check/contrib/unbound/iterator/iterator.c user/ngie/make_check/contrib/unbound/iterator/iterator.h user/ngie/make_check/contrib/unbound/libunbound/libunbound.c user/ngie/make_check/contrib/unbound/libunbound/python/Makefile user/ngie/make_check/contrib/unbound/libunbound/python/doc/install.rst user/ngie/make_check/contrib/unbound/libunbound/python/doc/modules/unbound.rst user/ngie/make_check/contrib/unbound/libunbound/python/examples/dnssec-valid.py user/ngie/make_check/contrib/unbound/libunbound/python/libunbound.i user/ngie/make_check/contrib/unbound/ltmain.sh user/ngie/make_check/contrib/unbound/services/cache/dns.c user/ngie/make_check/contrib/unbound/services/cache/rrset.c user/ngie/make_check/contrib/unbound/sldns/parseutil.h user/ngie/make_check/contrib/unbound/sldns/wire2str.c user/ngie/make_check/contrib/unbound/smallapp/unbound-anchor.c user/ngie/make_check/contrib/unbound/smallapp/unbound-checkconf.c user/ngie/make_check/contrib/unbound/smallapp/unbound-control-setup.sh user/ngie/make_check/contrib/unbound/smallapp/unbound-control-setup.sh.in user/ngie/make_check/contrib/unbound/smallapp/unbound-control.c user/ngie/make_check/contrib/unbound/util/config_file.c user/ngie/make_check/contrib/unbound/util/config_file.h user/ngie/make_check/contrib/unbound/util/configlexer.lex user/ngie/make_check/contrib/unbound/util/configparser.y user/ngie/make_check/contrib/unbound/util/iana_ports.inc user/ngie/make_check/contrib/unbound/util/locks.c user/ngie/make_check/contrib/unbound/util/net_help.c user/ngie/make_check/contrib/unbound/util/random.c user/ngie/make_check/contrib/unbound/util/rbtree.c user/ngie/make_check/contrib/unbound/util/rtt.h user/ngie/make_check/contrib/unbound/util/storage/lookup3.c user/ngie/make_check/contrib/unbound/util/tube.h user/ngie/make_check/contrib/unbound/util/winsock_event.h user/ngie/make_check/contrib/unbound/validator/autotrust.c user/ngie/make_check/contrib/unbound/validator/val_neg.c user/ngie/make_check/contrib/unbound/validator/val_neg.h user/ngie/make_check/contrib/unbound/validator/val_nsec.c user/ngie/make_check/contrib/unbound/validator/val_nsec.h user/ngie/make_check/contrib/unbound/validator/val_nsec3.c user/ngie/make_check/contrib/unbound/validator/val_nsec3.h user/ngie/make_check/contrib/unbound/validator/val_secalgo.c user/ngie/make_check/contrib/unbound/validator/val_secalgo.h user/ngie/make_check/contrib/unbound/validator/val_sigcrypt.c user/ngie/make_check/contrib/unbound/validator/val_utils.h user/ngie/make_check/contrib/unbound/validator/validator.c user/ngie/make_check/etc/mtree/BSD.tests.dist user/ngie/make_check/etc/periodic/daily/800.scrub-zfs user/ngie/make_check/include/resolv.h user/ngie/make_check/kerberos5/lib/libgssapi_krb5/Makefile.depend user/ngie/make_check/kerberos5/lib/libgssapi_ntlm/Makefile.depend user/ngie/make_check/kerberos5/lib/libhdb/Makefile.depend user/ngie/make_check/kerberos5/lib/libheimntlm/Makefile.depend user/ngie/make_check/kerberos5/lib/libkadm5clnt/Makefile.depend user/ngie/make_check/kerberos5/lib/libkadm5srv/Makefile.depend user/ngie/make_check/kerberos5/lib/libkafs5/Makefile.depend user/ngie/make_check/kerberos5/lib/libkdc/Makefile.depend user/ngie/make_check/lib/Makefile user/ngie/make_check/lib/csu/aarch64/crt1.c user/ngie/make_check/lib/csu/amd64/crt1.c user/ngie/make_check/lib/csu/arm/crt1.c user/ngie/make_check/lib/csu/i386/crt1_c.c user/ngie/make_check/lib/csu/mips/crt1.c user/ngie/make_check/lib/csu/powerpc/crt1.c user/ngie/make_check/lib/csu/powerpc64/crt1.c user/ngie/make_check/lib/csu/sparc64/crt1.c user/ngie/make_check/lib/lib80211/Makefile.depend user/ngie/make_check/lib/lib80211/lib80211.3 user/ngie/make_check/lib/libc/aarch64/sys/Makefile.inc user/ngie/make_check/lib/libc/arm/sys/Makefile.inc user/ngie/make_check/lib/libc/gen/exec.3 user/ngie/make_check/lib/libc/gen/getnetgrent.c user/ngie/make_check/lib/libc/net/getaddrinfo.c user/ngie/make_check/lib/libc/regex/grot/Makefile user/ngie/make_check/lib/libc/resolv/res_init.c user/ngie/make_check/lib/libc/resolv/res_mkquery.c user/ngie/make_check/lib/libc/resolv/res_mkupdate.c user/ngie/make_check/lib/libc/resolv/res_private.h user/ngie/make_check/lib/libc/resolv/res_query.c user/ngie/make_check/lib/libc/resolv/res_send.c user/ngie/make_check/lib/libc/resolv/res_state.c user/ngie/make_check/lib/libc/rpc/svc_vc.c user/ngie/make_check/lib/libc/stdio/open_memstream.c user/ngie/make_check/lib/libc/stdio/open_wmemstream.c user/ngie/make_check/lib/libc/sys/brk.2 user/ngie/make_check/lib/libc/sys/getgid.2 user/ngie/make_check/lib/libc/sys/getpid.2 user/ngie/make_check/lib/libc/sys/getuid.2 user/ngie/make_check/lib/libc/sys/read.2 user/ngie/make_check/lib/libc/sys/setuid.2 user/ngie/make_check/lib/libc/sys/utrace.2 user/ngie/make_check/lib/libc/sys/write.2 user/ngie/make_check/lib/libc/tests/Makefile user/ngie/make_check/lib/libc/tests/stdio/getdelim_test.c user/ngie/make_check/lib/libc/tests/stdio/printbasic_test.c user/ngie/make_check/lib/libc/tests/stdio/printfloat_test.c user/ngie/make_check/lib/libfetch/http.c user/ngie/make_check/lib/libopenbsd/Makefile user/ngie/make_check/lib/libopenbsd/imsg.c user/ngie/make_check/lib/libpam/modules/pam_krb5/Makefile.depend user/ngie/make_check/lib/libpam/modules/pam_ksu/Makefile.depend user/ngie/make_check/lib/libpam/modules/pam_ssh/Makefile user/ngie/make_check/lib/libstand/Makefile user/ngie/make_check/lib/libstand/tftp.c user/ngie/make_check/lib/msun/tests/Makefile user/ngie/make_check/sbin/devd/devd.cc user/ngie/make_check/sbin/geom/class/multipath/geom_multipath.c user/ngie/make_check/sbin/geom/class/part/gpart.8 user/ngie/make_check/sbin/reboot/reboot.8 user/ngie/make_check/sbin/reboot/reboot.c user/ngie/make_check/sbin/swapon/swapon.c user/ngie/make_check/sbin/sysctl/sysctl.8 user/ngie/make_check/sbin/sysctl/sysctl.c user/ngie/make_check/secure/lib/libcrypto/engines/Makefile user/ngie/make_check/secure/lib/libssh/Makefile user/ngie/make_check/secure/libexec/sftp-server/Makefile user/ngie/make_check/secure/libexec/ssh-keysign/Makefile user/ngie/make_check/secure/libexec/ssh-pkcs11-helper/Makefile user/ngie/make_check/secure/usr.bin/scp/Makefile user/ngie/make_check/secure/usr.bin/sftp/Makefile user/ngie/make_check/secure/usr.bin/ssh-add/Makefile user/ngie/make_check/secure/usr.bin/ssh-agent/Makefile user/ngie/make_check/secure/usr.bin/ssh-keygen/Makefile user/ngie/make_check/secure/usr.bin/ssh-keyscan/Makefile user/ngie/make_check/secure/usr.bin/ssh/Makefile user/ngie/make_check/secure/usr.sbin/sshd/Makefile user/ngie/make_check/share/examples/etc/make.conf user/ngie/make_check/share/man/man4/aesni.4 user/ngie/make_check/share/man/man4/blackhole.4 user/ngie/make_check/share/man/man4/crypto.4 user/ngie/make_check/share/man/man4/dtrace_io.4 user/ngie/make_check/share/man/man4/dtrace_ip.4 user/ngie/make_check/share/man/man4/dtrace_tcp.4 user/ngie/make_check/share/man/man4/dtrace_udp.4 user/ngie/make_check/share/man/man4/ioat.4 user/ngie/make_check/share/man/man4/isp.4 user/ngie/make_check/share/man/man4/mlx5en.4 user/ngie/make_check/share/man/man4/mps.4 user/ngie/make_check/share/man/man4/netmap.4 user/ngie/make_check/share/man/man4/pass.4 user/ngie/make_check/share/man/man5/src.conf.5 user/ngie/make_check/share/man/man7/release.7 user/ngie/make_check/share/man/man9/BUS_DESCRIBE_INTR.9 user/ngie/make_check/share/man/man9/Makefile user/ngie/make_check/share/man/man9/VOP_GETPAGES.9 user/ngie/make_check/share/man/man9/g_bio.9 user/ngie/make_check/share/misc/bsd-family-tree user/ngie/make_check/share/mk/bsd.compiler.mk user/ngie/make_check/share/mk/bsd.cpu.mk user/ngie/make_check/share/mk/bsd.dep.mk user/ngie/make_check/share/mk/bsd.endian.mk user/ngie/make_check/share/mk/bsd.lib.mk user/ngie/make_check/share/mk/bsd.libnames.mk user/ngie/make_check/share/mk/bsd.opts.mk user/ngie/make_check/share/mk/bsd.snmpmod.mk user/ngie/make_check/share/mk/bsd.sys.mk user/ngie/make_check/share/mk/local.dirdeps.mk user/ngie/make_check/share/mk/local.meta.sys.mk user/ngie/make_check/share/mk/src.libnames.mk user/ngie/make_check/share/mk/src.opts.mk user/ngie/make_check/share/mk/sys.mk user/ngie/make_check/sys/amd64/amd64/machdep.c user/ngie/make_check/sys/amd64/include/md_var.h user/ngie/make_check/sys/amd64/include/smp.h user/ngie/make_check/sys/arm/allwinner/a10_mmc.c user/ngie/make_check/sys/arm/amlogic/aml8726/aml8726_mmc.c user/ngie/make_check/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c user/ngie/make_check/sys/arm/arm/elf_machdep.c user/ngie/make_check/sys/arm/arm/generic_timer.c user/ngie/make_check/sys/arm/arm/machdep.c user/ngie/make_check/sys/arm/arm/pmap-v6-new.c user/ngie/make_check/sys/arm/arm/trap.c user/ngie/make_check/sys/arm/at91/at91_mci.c user/ngie/make_check/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c user/ngie/make_check/sys/arm/conf/NOTES user/ngie/make_check/sys/arm/freescale/imx/imx_sdhci.c user/ngie/make_check/sys/arm/include/cpufunc.h user/ngie/make_check/sys/arm/include/md_var.h user/ngie/make_check/sys/arm/include/pmap-v6.h user/ngie/make_check/sys/arm/include/vdso.h user/ngie/make_check/sys/arm/include/vmparam.h user/ngie/make_check/sys/arm/lpc/lpc_mmc.c user/ngie/make_check/sys/arm/ti/ti_sdhci.c user/ngie/make_check/sys/arm64/arm64/elf_machdep.c user/ngie/make_check/sys/arm64/arm64/exception.S user/ngie/make_check/sys/arm64/arm64/gic.c user/ngie/make_check/sys/arm64/arm64/gic.h user/ngie/make_check/sys/arm64/arm64/gic_fdt.c user/ngie/make_check/sys/arm64/arm64/gic_v3_its.c user/ngie/make_check/sys/arm64/arm64/gic_v3_var.h user/ngie/make_check/sys/arm64/arm64/intr_machdep.c user/ngie/make_check/sys/arm64/arm64/machdep.c user/ngie/make_check/sys/arm64/arm64/pic_if.m user/ngie/make_check/sys/arm64/cavium/thunder_pcie.c user/ngie/make_check/sys/arm64/cavium/thunder_pcie_common.c user/ngie/make_check/sys/arm64/cavium/thunder_pcie_pem.c user/ngie/make_check/sys/arm64/conf/GENERIC user/ngie/make_check/sys/arm64/include/intr.h user/ngie/make_check/sys/arm64/include/md_var.h user/ngie/make_check/sys/arm64/include/vdso.h user/ngie/make_check/sys/arm64/include/vmparam.h user/ngie/make_check/sys/boot/common/part.c user/ngie/make_check/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c user/ngie/make_check/sys/boot/efi/loader/arch/arm/exec.c user/ngie/make_check/sys/boot/efi/loader/arch/arm64/exec.c user/ngie/make_check/sys/boot/efi/loader/bootinfo.c user/ngie/make_check/sys/boot/efi/loader/loader_efi.h user/ngie/make_check/sys/boot/i386/libi386/libi386.h user/ngie/make_check/sys/boot/i386/libi386/pxe.c user/ngie/make_check/sys/boot/i386/loader/main.c user/ngie/make_check/sys/boot/uboot/common/main.c user/ngie/make_check/sys/boot/userboot/test/Makefile.depend user/ngie/make_check/sys/cam/cam_ccb.h user/ngie/make_check/sys/cam/cam_xpt.c user/ngie/make_check/sys/cam/ctl/ctl.c user/ngie/make_check/sys/cam/ctl/ctl_backend_block.c user/ngie/make_check/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/ngie/make_check/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c user/ngie/make_check/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/ngie/make_check/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/ngie/make_check/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/ngie/make_check/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c user/ngie/make_check/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c user/ngie/make_check/sys/cddl/dev/dtrace/dtrace_cddl.h user/ngie/make_check/sys/cddl/dev/dtrace/dtrace_ioctl.c user/ngie/make_check/sys/cddl/dev/systrace/systrace.c user/ngie/make_check/sys/compat/linux/linux_dtrace.h user/ngie/make_check/sys/conf/files user/ngie/make_check/sys/conf/files.arm user/ngie/make_check/sys/conf/files.arm64 user/ngie/make_check/sys/conf/kmod.mk user/ngie/make_check/sys/conf/options user/ngie/make_check/sys/dev/aic/aic_pccard.c user/ngie/make_check/sys/dev/an/if_an_pccard.c user/ngie/make_check/sys/dev/ata/ata-card.c user/ngie/make_check/sys/dev/atkbdc/psm.c user/ngie/make_check/sys/dev/bwn/if_bwn.c user/ngie/make_check/sys/dev/cmx/cmx_pccard.c user/ngie/make_check/sys/dev/cs/if_cs_pccard.c user/ngie/make_check/sys/dev/drm2/i915/i915_gem.c user/ngie/make_check/sys/dev/drm2/ttm/ttm_tt.c user/ngie/make_check/sys/dev/ed/if_ed_isa.c user/ngie/make_check/sys/dev/ed/if_ed_pccard.c user/ngie/make_check/sys/dev/ed/if_ed_pci.c user/ngie/make_check/sys/dev/ep/if_ep_pccard.c user/ngie/make_check/sys/dev/etherswitch/arswitch/arswitch_9340.c user/ngie/make_check/sys/dev/ex/if_ex_pccard.c user/ngie/make_check/sys/dev/fdc/fdc_pccard.c user/ngie/make_check/sys/dev/fdt/simplebus.c user/ngie/make_check/sys/dev/fe/if_fe_pccard.c user/ngie/make_check/sys/dev/hwpmc/hwpmc_core.c user/ngie/make_check/sys/dev/hwpmc/hwpmc_logging.c user/ngie/make_check/sys/dev/hyperv/utilities/hv_kvp.c user/ngie/make_check/sys/dev/ioat/ioat.c user/ngie/make_check/sys/dev/ioat/ioat.h user/ngie/make_check/sys/dev/ioat/ioat_hw.h user/ngie/make_check/sys/dev/ioat/ioat_internal.h user/ngie/make_check/sys/dev/ioat/ioat_test.c user/ngie/make_check/sys/dev/ioat/ioat_test.h user/ngie/make_check/sys/dev/iscsi/iscsi.c user/ngie/make_check/sys/dev/isp/isp.c user/ngie/make_check/sys/dev/isp/isp_pci.c user/ngie/make_check/sys/dev/md/md.c user/ngie/make_check/sys/dev/mlx5/device.h user/ngie/make_check/sys/dev/mlx5/driver.h user/ngie/make_check/sys/dev/mlx5/mlx5_core/mlx5_eq.c user/ngie/make_check/sys/dev/mlx5/mlx5_core/mlx5_vport.c user/ngie/make_check/sys/dev/mlx5/mlx5_en/en.h user/ngie/make_check/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c user/ngie/make_check/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/ngie/make_check/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c user/ngie/make_check/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c user/ngie/make_check/sys/dev/mlx5/vport.h user/ngie/make_check/sys/dev/mmc/bridge.h user/ngie/make_check/sys/dev/mmc/host/dwmmc.c user/ngie/make_check/sys/dev/mmc/mmc.c user/ngie/make_check/sys/dev/mpr/mpr_sas_lsi.c user/ngie/make_check/sys/dev/mps/mps_sas_lsi.c user/ngie/make_check/sys/dev/ncv/ncr53c500_pccard.c user/ngie/make_check/sys/dev/nsp/nsp_pccard.c user/ngie/make_check/sys/dev/nvd/nvd.c user/ngie/make_check/sys/dev/nvme/nvme.h user/ngie/make_check/sys/dev/nvme/nvme_ns.c user/ngie/make_check/sys/dev/nvme/nvme_sysctl.c user/ngie/make_check/sys/dev/ofw/ofw_bus_subr.c user/ngie/make_check/sys/dev/ofw/ofw_bus_subr.h user/ngie/make_check/sys/dev/ofw/ofw_iicbus.c user/ngie/make_check/sys/dev/otus/if_otus.c user/ngie/make_check/sys/dev/pccard/pccardvar.h user/ngie/make_check/sys/dev/pci/pci_host_generic.c user/ngie/make_check/sys/dev/ral/rt2560.c user/ngie/make_check/sys/dev/ral/rt2661.c user/ngie/make_check/sys/dev/ral/rt2860.c user/ngie/make_check/sys/dev/sdhci/sdhci_fdt.c user/ngie/make_check/sys/dev/sdhci/sdhci_pci.c user/ngie/make_check/sys/dev/sfxge/common/efsys.h user/ngie/make_check/sys/dev/sfxge/common/efx.h user/ngie/make_check/sys/dev/sfxge/common/efx_check.h user/ngie/make_check/sys/dev/sfxge/common/efx_crc32.c user/ngie/make_check/sys/dev/sfxge/common/efx_impl.h user/ngie/make_check/sys/dev/sfxge/common/efx_mcdi.c user/ngie/make_check/sys/dev/sfxge/common/efx_mcdi.h user/ngie/make_check/sys/dev/sfxge/common/efx_nvram.c user/ngie/make_check/sys/dev/sfxge/common/efx_tx.c user/ngie/make_check/sys/dev/sfxge/common/efx_types.h user/ngie/make_check/sys/dev/sfxge/common/hunt_ev.c user/ngie/make_check/sys/dev/sfxge/common/hunt_impl.h user/ngie/make_check/sys/dev/sfxge/common/hunt_mcdi.c user/ngie/make_check/sys/dev/sfxge/common/hunt_nic.c user/ngie/make_check/sys/dev/sfxge/common/hunt_nvram.c user/ngie/make_check/sys/dev/sfxge/common/hunt_tx.c user/ngie/make_check/sys/dev/sfxge/common/siena_impl.h user/ngie/make_check/sys/dev/sfxge/common/siena_mcdi.c user/ngie/make_check/sys/dev/sfxge/common/siena_nic.c user/ngie/make_check/sys/dev/sfxge/sfxge.c user/ngie/make_check/sys/dev/sfxge/sfxge_tx.c user/ngie/make_check/sys/dev/sn/if_sn_pccard.c user/ngie/make_check/sys/dev/snc/if_snc_pccard.c user/ngie/make_check/sys/dev/sound/usb/uaudio.c user/ngie/make_check/sys/dev/stg/tmc18c30_pccard.c user/ngie/make_check/sys/dev/uart/uart_bus_pccard.c user/ngie/make_check/sys/dev/usb/input/atp.c user/ngie/make_check/sys/dev/usb/input/uep.c user/ngie/make_check/sys/dev/usb/input/uhid.c user/ngie/make_check/sys/dev/usb/input/ukbd.c user/ngie/make_check/sys/dev/usb/input/ums.c user/ngie/make_check/sys/dev/usb/input/wsp.c user/ngie/make_check/sys/dev/usb/misc/udbp.c user/ngie/make_check/sys/dev/usb/misc/ufm.c user/ngie/make_check/sys/dev/usb/misc/ugold.c user/ngie/make_check/sys/dev/usb/misc/uled.c user/ngie/make_check/sys/dev/usb/net/if_aue.c user/ngie/make_check/sys/dev/usb/net/if_axe.c user/ngie/make_check/sys/dev/usb/net/if_axge.c user/ngie/make_check/sys/dev/usb/net/if_cdce.c user/ngie/make_check/sys/dev/usb/net/if_cue.c user/ngie/make_check/sys/dev/usb/net/if_ipheth.c user/ngie/make_check/sys/dev/usb/net/if_kue.c user/ngie/make_check/sys/dev/usb/net/if_mos.c user/ngie/make_check/sys/dev/usb/net/if_rue.c user/ngie/make_check/sys/dev/usb/net/if_smsc.c user/ngie/make_check/sys/dev/usb/net/if_udav.c user/ngie/make_check/sys/dev/usb/net/if_urndis.c user/ngie/make_check/sys/dev/usb/net/if_usie.c user/ngie/make_check/sys/dev/usb/net/uhso.c user/ngie/make_check/sys/dev/usb/serial/u3g.c user/ngie/make_check/sys/dev/usb/serial/uark.c user/ngie/make_check/sys/dev/usb/serial/ubsa.c user/ngie/make_check/sys/dev/usb/serial/uchcom.c user/ngie/make_check/sys/dev/usb/serial/ucycom.c user/ngie/make_check/sys/dev/usb/serial/ufoma.c user/ngie/make_check/sys/dev/usb/serial/uftdi.c user/ngie/make_check/sys/dev/usb/serial/ugensa.c user/ngie/make_check/sys/dev/usb/serial/uipaq.c user/ngie/make_check/sys/dev/usb/serial/ulpt.c user/ngie/make_check/sys/dev/usb/serial/umcs.c user/ngie/make_check/sys/dev/usb/serial/umct.c user/ngie/make_check/sys/dev/usb/serial/umodem.c user/ngie/make_check/sys/dev/usb/serial/umoscom.c user/ngie/make_check/sys/dev/usb/serial/uplcom.c user/ngie/make_check/sys/dev/usb/serial/uslcom.c user/ngie/make_check/sys/dev/usb/serial/uvisor.c user/ngie/make_check/sys/dev/usb/serial/uvscom.c user/ngie/make_check/sys/dev/usb/storage/umass.c user/ngie/make_check/sys/dev/usb/storage/urio.c user/ngie/make_check/sys/dev/usb/usb_hub.c user/ngie/make_check/sys/dev/usb/usbdi.h user/ngie/make_check/sys/dev/usb/wlan/if_rsu.c user/ngie/make_check/sys/dev/usb/wlan/if_rum.c user/ngie/make_check/sys/dev/usb/wlan/if_run.c user/ngie/make_check/sys/dev/usb/wlan/if_uath.c user/ngie/make_check/sys/dev/usb/wlan/if_upgt.c user/ngie/make_check/sys/dev/usb/wlan/if_ural.c user/ngie/make_check/sys/dev/usb/wlan/if_urtw.c user/ngie/make_check/sys/dev/usb/wlan/if_urtwn.c user/ngie/make_check/sys/dev/usb/wlan/if_urtwnreg.h user/ngie/make_check/sys/dev/usb/wlan/if_urtwnvar.h user/ngie/make_check/sys/dev/usb/wlan/if_zyd.c user/ngie/make_check/sys/dev/wi/if_wi_pccard.c user/ngie/make_check/sys/dev/wpi/if_wpi.c user/ngie/make_check/sys/dev/wpi/if_wpi_debug.h user/ngie/make_check/sys/dev/wtap/if_wtap_module.c user/ngie/make_check/sys/dev/wtap/if_wtapvar.h user/ngie/make_check/sys/dev/wtap/plugins/visibility.c user/ngie/make_check/sys/dev/xe/if_xe_pccard.c user/ngie/make_check/sys/fs/fuse/fuse_vnops.c user/ngie/make_check/sys/fs/nfsclient/nfs_clbio.c user/ngie/make_check/sys/fs/smbfs/smbfs_io.c user/ngie/make_check/sys/fs/tmpfs/tmpfs_subr.c user/ngie/make_check/sys/geom/multipath/g_multipath.c user/ngie/make_check/sys/geom/part/g_part_gpt.c user/ngie/make_check/sys/i386/i386/mp_machdep.c user/ngie/make_check/sys/i386/i386/sys_machdep.c user/ngie/make_check/sys/i386/include/md_var.h user/ngie/make_check/sys/i386/include/smp.h user/ngie/make_check/sys/kern/imgact_elf.c user/ngie/make_check/sys/kern/kern_exec.c user/ngie/make_check/sys/kern/kern_exit.c user/ngie/make_check/sys/kern/kern_fork.c user/ngie/make_check/sys/kern/kern_jail.c user/ngie/make_check/sys/kern/kern_linker.c user/ngie/make_check/sys/kern/kern_malloc.c user/ngie/make_check/sys/kern/kern_proc.c user/ngie/make_check/sys/kern/kern_racct.c user/ngie/make_check/sys/kern/kern_rctl.c user/ngie/make_check/sys/kern/kern_sig.c user/ngie/make_check/sys/kern/kern_timeout.c user/ngie/make_check/sys/kern/subr_syscall.c user/ngie/make_check/sys/kern/sys_process.c user/ngie/make_check/sys/kern/uipc_shm.c user/ngie/make_check/sys/kern/uipc_syscalls.c user/ngie/make_check/sys/kern/vfs_bio.c user/ngie/make_check/sys/kern/vfs_cache.c user/ngie/make_check/sys/kern/vfs_default.c user/ngie/make_check/sys/kern/vfs_subr.c user/ngie/make_check/sys/kern/vnode_if.src user/ngie/make_check/sys/mips/atheros/apb.c user/ngie/make_check/sys/mips/atheros/if_arge.c user/ngie/make_check/sys/mips/atheros/qca953x_chip.c user/ngie/make_check/sys/mips/include/cpuregs.h user/ngie/make_check/sys/mips/mips/pm_machdep.c user/ngie/make_check/sys/modules/Makefile user/ngie/make_check/sys/modules/ahci/Makefile user/ngie/make_check/sys/modules/cam/Makefile user/ngie/make_check/sys/modules/mlx5/Makefile user/ngie/make_check/sys/modules/mlx5en/Makefile user/ngie/make_check/sys/net/if.c user/ngie/make_check/sys/net/if_lagg.c user/ngie/make_check/sys/net/if_lagg.h user/ngie/make_check/sys/net/if_llatbl.c user/ngie/make_check/sys/net/if_llatbl.h user/ngie/make_check/sys/net/if_stf.c user/ngie/make_check/sys/net/if_var.h user/ngie/make_check/sys/net/route.c user/ngie/make_check/sys/net/route.h user/ngie/make_check/sys/net80211/ieee80211_phy.h user/ngie/make_check/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c user/ngie/make_check/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c user/ngie/make_check/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c user/ngie/make_check/sys/netinet/cc/cc_cubic.c user/ngie/make_check/sys/netinet/cc/cc_newreno.c user/ngie/make_check/sys/netinet/if_ether.c user/ngie/make_check/sys/netinet/if_ether.h user/ngie/make_check/sys/netinet/in_gif.c user/ngie/make_check/sys/netinet/in_kdtrace.c user/ngie/make_check/sys/netinet/in_kdtrace.h user/ngie/make_check/sys/netinet/in_mcast.c user/ngie/make_check/sys/netinet/in_var.h user/ngie/make_check/sys/netinet/ip_carp.c user/ngie/make_check/sys/netinet/ip_icmp.c user/ngie/make_check/sys/netinet/ip_input.c user/ngie/make_check/sys/netinet/ip_options.c user/ngie/make_check/sys/netinet/ip_var.h user/ngie/make_check/sys/netinet/sctp_cc_functions.c user/ngie/make_check/sys/netinet/sctp_input.c user/ngie/make_check/sys/netinet/sctp_output.c user/ngie/make_check/sys/netinet/sctp_pcb.h user/ngie/make_check/sys/netinet/tcp.h user/ngie/make_check/sys/netinet/tcp_hostcache.c user/ngie/make_check/sys/netinet/tcp_hostcache.h user/ngie/make_check/sys/netinet/tcp_input.c user/ngie/make_check/sys/netinet/tcp_sack.c user/ngie/make_check/sys/netinet/tcp_subr.c user/ngie/make_check/sys/netinet/tcp_syncache.c user/ngie/make_check/sys/netinet/tcp_timer.c user/ngie/make_check/sys/netinet/tcp_usrreq.c user/ngie/make_check/sys/netinet/tcp_var.h user/ngie/make_check/sys/netinet/toecore.c user/ngie/make_check/sys/netinet6/icmp6.c user/ngie/make_check/sys/netinet6/in6.c user/ngie/make_check/sys/netinet6/in6_gif.c user/ngie/make_check/sys/netinet6/in6_mcast.c user/ngie/make_check/sys/netinet6/in6_src.c user/ngie/make_check/sys/netinet6/in6_var.h user/ngie/make_check/sys/netinet6/nd6.c user/ngie/make_check/sys/netinet6/nd6.h user/ngie/make_check/sys/netinet6/nd6_nbr.c user/ngie/make_check/sys/netinet6/scope6.c user/ngie/make_check/sys/netinet6/scope6_var.h user/ngie/make_check/sys/netpfil/ipfw/ip_dn_io.c user/ngie/make_check/sys/netpfil/ipfw/ip_dummynet.c user/ngie/make_check/sys/netpfil/ipfw/ip_fw2.c user/ngie/make_check/sys/powerpc/booke/booke_machdep.c user/ngie/make_check/sys/powerpc/booke/trap_subr.S user/ngie/make_check/sys/powerpc/include/trap.h user/ngie/make_check/sys/powerpc/mpc85xx/fsl_sdhc.c user/ngie/make_check/sys/powerpc/powerpc/trap.c user/ngie/make_check/sys/security/mac/mac_framework.c user/ngie/make_check/sys/security/mac/mac_internal.h user/ngie/make_check/sys/sys/buf.h user/ngie/make_check/sys/sys/module.h user/ngie/make_check/sys/sys/ptrace.h user/ngie/make_check/sys/sys/sysent.h user/ngie/make_check/sys/sys/vnode.h user/ngie/make_check/sys/ufs/ufs/ufs_vnops.c user/ngie/make_check/sys/vm/default_pager.c user/ngie/make_check/sys/vm/device_pager.c user/ngie/make_check/sys/vm/phys_pager.c user/ngie/make_check/sys/vm/sg_pager.c user/ngie/make_check/sys/vm/swap_pager.c user/ngie/make_check/sys/vm/uma_core.c user/ngie/make_check/sys/vm/vm_fault.c user/ngie/make_check/sys/vm/vm_glue.c user/ngie/make_check/sys/vm/vm_object.c user/ngie/make_check/sys/vm/vm_object.h user/ngie/make_check/sys/vm/vm_page.c user/ngie/make_check/sys/vm/vm_page.h user/ngie/make_check/sys/vm/vm_pager.c user/ngie/make_check/sys/vm/vm_pager.h user/ngie/make_check/sys/vm/vnode_pager.c user/ngie/make_check/sys/vm/vnode_pager.h user/ngie/make_check/sys/x86/x86/busdma_bounce.c user/ngie/make_check/targets/pseudo/gcc/Makefile.depend user/ngie/make_check/targets/pseudo/universe/Makefile user/ngie/make_check/tests/freebsd_test_suite/macros.h user/ngie/make_check/tools/bsdbox/Makefile.base user/ngie/make_check/tools/build/mk/OptionalObsoleteFiles.inc user/ngie/make_check/tools/build/options/makeman user/ngie/make_check/tools/debugscripts/README user/ngie/make_check/tools/regression/lib/msun/Makefile user/ngie/make_check/tools/regression/mac/mac_portacl/misc.sh user/ngie/make_check/tools/regression/tls/ttls2/ttls2.c user/ngie/make_check/tools/regression/tls/ttls4/ttls4.c user/ngie/make_check/tools/tools/ath/athratestats/Makefile user/ngie/make_check/tools/tools/ioat/ioatcontrol.8 user/ngie/make_check/tools/tools/ioat/ioatcontrol.c user/ngie/make_check/tools/tools/nanobsd/defaults.sh user/ngie/make_check/tools/tools/nanobsd/embedded/README user/ngie/make_check/tools/tools/nanobsd/embedded/beaglebone.cfg user/ngie/make_check/tools/tools/nanobsd/embedded/common user/ngie/make_check/tools/tools/nanobsd/embedded/qemu-amd64.cfg user/ngie/make_check/tools/tools/nanobsd/embedded/qemu-i386.cfg user/ngie/make_check/tools/tools/nanobsd/embedded/qemu-mips.cfg user/ngie/make_check/tools/tools/nanobsd/embedded/qemu-mips64.cfg user/ngie/make_check/tools/tools/nanobsd/embedded/qemu-powerpc.cfg user/ngie/make_check/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg user/ngie/make_check/tools/tools/nanobsd/embedded/qemu-sparc64.cfg user/ngie/make_check/tools/tools/nanobsd/embedded/rpi.cfg user/ngie/make_check/tools/tools/nanobsd/embedded/rpi2.cfg user/ngie/make_check/tools/tools/nanobsd/embedded/sam9260ek.cfg user/ngie/make_check/tools/tools/nanobsd/embedded/sam9g20ek.cfg user/ngie/make_check/tools/tools/nanobsd/mtree-dedup.awk user/ngie/make_check/tools/tools/nanobsd/nanobsd.sh user/ngie/make_check/usr.bin/bmake/Makefile user/ngie/make_check/usr.bin/bmake/config.h user/ngie/make_check/usr.bin/bmake/unit-tests/Makefile user/ngie/make_check/usr.bin/clang/lldb/Makefile user/ngie/make_check/usr.bin/clang/lldb/Makefile.depend user/ngie/make_check/usr.bin/kdump/Makefile user/ngie/make_check/usr.bin/kdump/Makefile.depend user/ngie/make_check/usr.bin/kdump/kdump.c user/ngie/make_check/usr.bin/mkimg/mbr.c user/ngie/make_check/usr.bin/mkimg/scheme.c user/ngie/make_check/usr.bin/mkimg/scheme.h user/ngie/make_check/usr.bin/netstat/ipsec.c user/ngie/make_check/usr.bin/netstat/main.c user/ngie/make_check/usr.bin/truss/Makefile user/ngie/make_check/usr.bin/truss/Makefile.depend.amd64 user/ngie/make_check/usr.bin/truss/syscalls.c user/ngie/make_check/usr.bin/unzip/unzip.1 user/ngie/make_check/usr.bin/unzip/unzip.c user/ngie/make_check/usr.bin/xo/tests/Makefile user/ngie/make_check/usr.sbin/Makefile.arm user/ngie/make_check/usr.sbin/crunch/crunchide/exec_elf32.c user/ngie/make_check/usr.sbin/ctm/ctm/ctm.1 user/ngie/make_check/usr.sbin/iostat/iostat.c user/ngie/make_check/usr.sbin/kldxref/kldxref.c user/ngie/make_check/usr.sbin/ndp/ndp.c user/ngie/make_check/usr.sbin/ofwdump/Makefile.depend user/ngie/make_check/usr.sbin/pmcstudy/pmcstudy.8 user/ngie/make_check/usr.sbin/pmcstudy/pmcstudy.c user/ngie/make_check/usr.sbin/sesutil/Makefile user/ngie/make_check/usr.sbin/sesutil/eltsub.c user/ngie/make_check/usr.sbin/sesutil/eltsub.h user/ngie/make_check/usr.sbin/sesutil/sesutil.c user/ngie/make_check/usr.sbin/ypldap/aldap.c user/ngie/make_check/usr.sbin/ypldap/ber.c user/ngie/make_check/usr.sbin/ypldap/ldapclient.c user/ngie/make_check/usr.sbin/ypldap/ypldap.c user/ngie/make_check/usr.sbin/ypldap/ypldap_dns.c Directory Properties: user/ngie/make_check/ (props changed) user/ngie/make_check/cddl/ (props changed) user/ngie/make_check/cddl/contrib/opensolaris/ (props changed) user/ngie/make_check/contrib/bmake/ (props changed) user/ngie/make_check/contrib/elftoolchain/ (props changed) user/ngie/make_check/contrib/llvm/ (props changed) user/ngie/make_check/contrib/llvm/tools/lldb/ (props changed) user/ngie/make_check/contrib/mdocml/ (props changed) user/ngie/make_check/contrib/top/ (props changed) user/ngie/make_check/contrib/unbound/ (props changed) user/ngie/make_check/include/ (props changed) user/ngie/make_check/lib/libc/ (props changed) user/ngie/make_check/sbin/ (props changed) user/ngie/make_check/share/ (props changed) user/ngie/make_check/share/man/man4/ (props changed) user/ngie/make_check/sys/ (props changed) user/ngie/make_check/sys/boot/ (props changed) user/ngie/make_check/sys/cddl/contrib/opensolaris/ (props changed) user/ngie/make_check/sys/conf/ (props changed) user/ngie/make_check/sys/dev/hyperv/ (props changed) user/ngie/make_check/targets/ (props changed) user/ngie/make_check/usr.bin/mkimg/ (props changed) Modified: user/ngie/make_check/MAINTAINERS ============================================================================== --- user/ngie/make_check/MAINTAINERS Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/MAINTAINERS Thu Dec 17 07:01:45 2015 (r292398) @@ -26,54 +26,67 @@ sub-system. subsystem login notes ----------------------------- -opencrypto jmg Pre-commit review requested. Documentation Required. -kqueue jmg Pre-commit review requested. Documentation Required. -share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. +atf freebsd-testing,jmmv,ngie Pre-commit review requested. ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -openssl benl,jkim Pre-commit review requested. -release/release.sh gjb,re Pre-commit review and regression tests - requested. -sh(1) jilles Pre-commit review requested. This also applies - to kill(1), printf(1) and test(1) which are - compiled in as builtins. -isci(4) jimharris Pre-commit review requested. -nvme(4) jimharris Pre-commit review requested. -nvd(4) jimharris Pre-commit review requested. -nvmecontrol(8) jimharris Pre-commit review requested. -libfetch des Pre-commit review requested. -fetch des Pre-commit review requested. -libpam des Pre-commit review requested. -openssh des Pre-commit review requested. -pseudofs des Pre-commit review requested. -procfs des Pre-commit review requested. -linprocfs des Pre-commit review requested. +callout_*(9) rrs Pre-commit review requested -- becareful its tricksy code :o. contrib/compiler-rt dim Pre-commit review preferred. contrib/libc++ dim Pre-commit review preferred. contrib/libcxxrt dim Pre-commit review preferred. contrib/llvm dim Pre-commit review preferred. contrib/llvm/tools/lldb emaste Pre-commit review preferred. -atf freebsd-testing,jmmv,ngie Pre-commit review requested. contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. contrib/pjdfstest freebsd-testing,ngie,pjd Pre-commit review requested. +dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +*env(3) secteam Due to the problematic security history of this + code, please have patches reviewed by secteam. +etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. +etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. +fetch des Pre-commit review requested. +geli pjd Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/). +isci(4) jimharris Pre-commit review requested. +iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +kqueue jmg Pre-commit review requested. Documentation Required. +libfetch des Pre-commit review requested. +libpam des Pre-commit review requested. +linprocfs des Pre-commit review requested. +lpr gad Pre-commit review requested, particularly for + lpd/recvjob.c and lpd/printjob.c. +nanobsd imp Pre-commit phabricator review requested. +net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. +nis(8), yp(8) araujo Pre-commit review requested. +nvd(4) jimharris Pre-commit review requested. +nvme(4) jimharris Pre-commit review requested. +nvmecontrol(8) jimharris Pre-commit review requested. +opencrypto jmg Pre-commit review requested. Documentation Required. +openssh des Pre-commit review requested. +openssl benl,jkim Pre-commit review requested. +otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +pci bus imp,jhb Pre-commit review requested. +pmcstudy(8) rrs Pre-commit review requested. +procfs des Pre-commit review requested. +pseudofs des Pre-commit review requested. +release/release.sh gjb,re Pre-commit review and regression tests + requested. +sctp rrs,tuexen Pre-commit review requested (changes need to be backported to github). +sendmail gshapiro Pre-commit review requested. +sh(1) jilles Pre-commit review requested. This also applies + to kill(1), printf(1) and test(1) which are + compiled in as builtins. +share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. share/mk/*.test.mk freebsd-testing,ngie (same list as share/mk too) Pre-commit review requested. -tests freebsd-testing,ngie Pre-commit review requested. -sys/dev/usb hselasky If in doubt, ask. -sys/dev/sound/usb hselasky If in doubt, ask. sys/compat/linuxkpi hselasky If in doubt, ask. sys/dev/e1000 erj Pre-commit phabricator review requested. sys/dev/ixgbe erj Pre-commit phabricator review requested. sys/dev/ixl erj Pre-commit phabricator review requested. +sys/dev/sound/usb hselasky If in doubt, ask. +sys/dev/usb hselasky If in doubt, ask. sys/netinet/ip_carp.c glebius Pre-commit review recommended. sys/netpfil/pf kp,glebius Pre-commit review recommended. +tests freebsd-testing,ngie Pre-commit review requested. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. -lpr gad Pre-commit review requested, particularly for - lpd/recvjob.c and lpd/printjob.c. -nis(8), yp(8) araujo Pre-commit review requested. +vmm(4) neel,grehan Pre-commit review requested. ---- OLD ---- libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. @@ -84,7 +97,6 @@ contrib/openbsm rwatson Pre-commit revie sys/security/audit rwatson Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. -pci bus imp,jhb Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -99,11 +111,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -sendmail gshapiro Pre-commit review requested. -etc/mail gshapiro Pre-commit review requested. - Keep in sync with -STABLE. -etc/sendmail gshapiro Pre-commit review requested. - Keep in sync with -STABLE. nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. @@ -119,7 +126,6 @@ file obrien Insists to keep file blocke contrib/bzip2 obrien Pre-commit review required. geom freebsd-geom@FreeBSD.org geom_concat pjd Pre-commit review preferred. -geom_eli pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. geom_label pjd Pre-commit review preferred. geom_mirror pjd Pre-commit review preferred. @@ -130,7 +136,6 @@ geom_stripe pjd Pre-commit review prefer geom_zero pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. zfs freebsd-fs@FreeBSD.org -nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. @@ -140,8 +145,6 @@ lib/libbluetooth emax Pre-commit review lib/libsdp emax Pre-commit review preferred. usr.bin/bluetooth emax Pre-commit review preferred. usr.sbin/bluetooth emax Pre-commit review preferred. -*env(3) secteam Due to the problematic security history of this - code, please have patches reviewed by secteam. share/zoneinfo edwin Heads-up appreciated, since our data is coming from a third party source. usr.sbin/zic edwin Heads-up appreciated, since this code is @@ -152,5 +155,4 @@ sbin/routed bms Pre-commit review; notif cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. -nanobsd imp Pre-commit review requested for coordination. -vmm(4) neel,grehan Pre-commit review requested. + Modified: user/ngie/make_check/Makefile ============================================================================== --- user/ngie/make_check/Makefile Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/Makefile Thu Dec 17 07:01:45 2015 (r292398) @@ -58,8 +58,8 @@ # Makefile.inc1. The exceptions are universe, tinderbox and targets. # # If you want to build your system from source be sure that /usr/obj has -# at least 1GB of diskspace available. A complete 'universe' build requires -# about 15GB of space. +# at least 6GB of diskspace available. A complete 'universe' build requires +# about 100GB of space. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: @@ -181,7 +181,7 @@ _MAKE= PATH=${PATH} ${SUB_MAKE} -f Makef _TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} -_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/} +_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/} .endif .if defined(TARGET) && !defined(_TARGET) _TARGET=${TARGET} Modified: user/ngie/make_check/Makefile.inc1 ============================================================================== --- user/ngie/make_check/Makefile.inc1 Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/Makefile.inc1 Thu Dec 17 07:01:45 2015 (r292398) @@ -147,7 +147,11 @@ CLEANDIR= cleandir LOCAL_TOOL_DIRS?= PACKAGEDIR?= ${DESTDIR}/${DISTDIR} +.if empty(SHELL:M*csh*) BUILDENV_SHELL?=${SHELL} +.else +BUILDENV_SHELL?=/bin/sh +.endif SVN?= /usr/local/bin/svn SVNFLAGS?= -r HEAD @@ -164,7 +168,7 @@ OSRELDATE= 0 .endif # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION. -.if !defined(VERSION) +.if !defined(VERSION) && !make(showconfig) REVISION!= ${MAKE} -C ${SRCDIR}/release -V REVISION BRANCH!= ${MAKE} -C ${SRCDIR}/release -V BRANCH SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ @@ -173,7 +177,25 @@ VERSION= FreeBSD ${REVISION}-${BRANCH:C/ .export VERSION .endif -KNOWN_ARCHES?= aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= aarch64/arm64 \ + amd64 \ + arm \ + armeb/arm \ + armv6/arm \ + armv6hf/arm \ + i386 \ + i386/pc98 \ + mips \ + mipsel/mips \ + mips64el/mips \ + mips64/mips \ + mipsn32el/mips \ + mipsn32/mips \ + powerpc \ + powerpc64/powerpc \ + riscv64/riscv \ + sparc64 + .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -196,11 +218,14 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE} .else _TARGET_CPUTYPE=dummy .endif +# Skip for showconfig as it is just wasted time and may invoke auto.obj.mk. +.if !make(showconfig) _CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \ -f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE .if ${_CPUTYPE} != ${_TARGET_CPUTYPE} .error CPUTYPE global should be set with ?=. .endif +.endif .if make(buildworld) BUILD_ARCH!= uname -p .if ${MACHINE_ARCH} != ${BUILD_ARCH} @@ -667,7 +692,7 @@ everything: @echo "--------------------------------------------------------------" @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; _PARALLEL_SUBUDIR_OK=1 ${WMAKE} all + ${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all .if defined(LIB32TMP) build32: .PHONY @echo @@ -2023,14 +2048,14 @@ _prebuild_libs: ${_prebuild_libs:S/$/__L _generic_libs: ${_generic_libs:S/$/__L/} # Enable SUBDIR_PARALLEL when not calling 'make all', unless called from -# 'everything' with _PARALLEL_SUBUDIR_OK set. This is because it is unlikely +# 'everything' with _PARALLEL_SUBDIR_OK set. This is because it is unlikely # that running 'make all' from the top-level, especially with a SUBDIR_OVERRIDE # or LOCAL_DIRS set, will have a reliable build if SUBDIRs are built in # parallel. This is safe for the world stage of buildworld though since it has # already built libraries in a proper order and installed includes into # WORLDTMP. Special handling is done for SUBDIR ordering for 'install*' to # avoid trashing a system if it crashes mid-install. -.if !make(all) || defined(_PARALLEL_SUBUDIR_OK) +.if !make(all) || defined(_PARALLEL_SUBDIR_OK) SUBDIR_PARALLEL= .endif Modified: user/ngie/make_check/UPDATING ============================================================================== --- user/ngie/make_check/UPDATING Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/UPDATING Thu Dec 17 07:01:45 2015 (r292398) @@ -31,6 +31,27 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20151216: + The tftp loader (pxeboot) now uses the option root-path directive. As a + consequence it no longer looks for a pxeboot.4th file on the tftp + server. Instead it uses the regular /boot infrastructure as with the + other loaders. + +20151211: + The code to start recording plug and play data into the modules has + been committed. While the old tools will properly build a new kernel, + a number of warnings about "unknown metadata record 4" will be produced + for an older kldxref. To avoid such warnings, make sure to rebuild + the kernel toolchain (or world). Make sure that you have r292078 or + later when trying to build 292077 or later before rebuilding. + +20151207: + Debug data files are now built by default with 'make buildworld' and + installed with 'make installworld'. This facilitates debugging but + requires more disk space both during the build and for the installed + world. Debug files may be disabled by setting WITHOUT_DEBUG_FILES=yes + in src.conf(5). + 20151130: r291527 changed the internal interface between the nfsd.ko and nfscommon.ko modules. As such, they must both be upgraded to-gether. Modified: user/ngie/make_check/bin/freebsd-version/Makefile ============================================================================== --- user/ngie/make_check/bin/freebsd-version/Makefile Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/bin/freebsd-version/Makefile Thu Dec 17 07:01:45 2015 (r292398) @@ -2,7 +2,7 @@ SCRIPTS = freebsd-version MAN = freebsd-version.1 -CLEANFILES = freebsd-version.sh +CLEANFILES = freebsd-version freebsd-version.sh NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS} Modified: user/ngie/make_check/bin/ls/print.c ============================================================================== --- user/ngie/make_check/bin/ls/print.c Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/bin/ls/print.c Thu Dec 17 07:01:45 2015 (r292398) @@ -47,12 +47,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include #include #include +#include #ifdef COLORLS #include #include @@ -105,6 +107,9 @@ static struct { } colors[C_NUMCOLORS]; #endif +static size_t padding_for_month[12]; +static size_t month_max_size = 0; + void printscol(const DISPLAY *dp) { @@ -138,6 +143,70 @@ printname(const char *field, const char return rc; } +static const char * +get_abmon(int mon) +{ + + switch (mon) { + case 0: return (nl_langinfo(ABMON_1)); + case 1: return (nl_langinfo(ABMON_2)); + case 2: return (nl_langinfo(ABMON_3)); + case 3: return (nl_langinfo(ABMON_4)); + case 4: return (nl_langinfo(ABMON_5)); + case 5: return (nl_langinfo(ABMON_6)); + case 6: return (nl_langinfo(ABMON_7)); + case 7: return (nl_langinfo(ABMON_8)); + case 8: return (nl_langinfo(ABMON_9)); + case 9: return (nl_langinfo(ABMON_10)); + case 10: return (nl_langinfo(ABMON_11)); + case 11: return (nl_langinfo(ABMON_12)); + } + + /* should never happen */ + abort(); +} + +static size_t +mbswidth(const char *month) +{ + wchar_t wc; + size_t width, donelen, clen, w; + + width = donelen = 0; + while ((clen = mbrtowc(&wc, month + donelen, MB_LEN_MAX, NULL)) != 0) { + if (clen == (size_t)-1 || clen == (size_t)-2) + return (-1); + donelen += clen; + if ((w = wcwidth(wc)) == (size_t)-1) + return (-1); + width += w; + } + + return (width); +} + +static void +compute_abbreviated_month_size(void) +{ + int i; + size_t width; + size_t months_width[12]; + + for (i = 0; i < 12; i++) { + width = mbswidth(get_abmon(i)); + if (width == (size_t)-1) { + month_max_size = -1; + return; + } + months_width[i] = width; + if (width > month_max_size) + month_max_size = width; + } + + for (i = 0; i < 12; i++) + padding_for_month[i] = month_max_size - months_width[i]; +} + /* * print name in current style */ @@ -425,6 +494,31 @@ printdev(size_t width, dev_t dev) xo_emit("{:device/%#*jx} ", (u_int)width, (uintmax_t)dev); } +static size_t +ls_strftime(char *str, size_t len, const char *fmt, const struct tm *tm) +{ + char *posb, nfmt[BUFSIZ]; + const char *format = fmt; + size_t ret; + + if ((posb = strstr(fmt, "%b")) != NULL) { + if (month_max_size == 0) { + compute_abbreviated_month_size(); + } + if (month_max_size > 0) { + snprintf(nfmt, sizeof(nfmt), "%.*s%s%*s%s", + (int)(posb - fmt), fmt, + get_abmon(tm->tm_mon), + (int)padding_for_month[tm->tm_mon], + "", + posb + 2); + format = nfmt; + } + } + ret = strftime(str, len, format, tm); + return (ret); +} + static void printtime(const char *field, time_t ftime) { @@ -451,7 +545,7 @@ printtime(const char *field, time_t ftim else /* mmm dd yyyy || dd mmm yyyy */ format = d_first ? "%e %b %Y" : "%b %e %Y"; - strftime(longstring, sizeof(longstring), format, localtime(&ftime)); + ls_strftime(longstring, sizeof(longstring), format, localtime(&ftime)); snprintf(fmt, sizeof(fmt), "{d:%s/%%hs} ", field); xo_attr("value", "%ld", (long) ftime); Modified: user/ngie/make_check/bin/ls/tests/ls_tests.sh ============================================================================== --- user/ngie/make_check/bin/ls/tests/ls_tests.sh Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/bin/ls/tests/ls_tests.sh Thu Dec 17 07:01:45 2015 (r292398) @@ -170,8 +170,6 @@ B_flag_head() B_flag_body() { - atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136" - atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")" atf_check -e empty -o match:'y\\013z' -s exit:0 ls -B } @@ -467,8 +465,6 @@ b_flag_head() b_flag_body() { - atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136" - atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")" atf_check -e empty -o match:'y\\vz' -s exit:0 ls -b } @@ -747,8 +743,6 @@ q_flag_and_w_flag_head() q_flag_and_w_flag_body() { - atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136" - create_test_dir test_file="$(printf "y\01z")" Modified: user/ngie/make_check/bin/sh/var.c ============================================================================== --- user/ngie/make_check/bin/sh/var.c Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/bin/sh/var.c Thu Dec 17 07:01:45 2015 (r292398) @@ -330,7 +330,7 @@ setvareq(char *s, int flags) if (vp->flags & VREADONLY) { if ((flags & (VTEXTFIXED|VSTACK)) == 0) ckfree(s); - error("%.*s: is read only", vp->name_len, s); + error("%.*s: is read only", vp->name_len, vp->text); } if (flags & VNOSET) { if ((flags & (VTEXTFIXED|VSTACK)) == 0) Modified: user/ngie/make_check/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out ============================================================================== --- user/ngie/make_check/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out Thu Dec 17 07:01:45 2015 (r292398) @@ -1,2 +1,3 @@ Sun, 25 Jan 2004 13:00:00 PST 2004 Jan 25 13:00:00 + Copied: user/ngie/make_check/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh (from r292397, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/make_check/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh Thu Dec 17 07:01:45 2015 (r292398, copy of r292397, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh) @@ -0,0 +1,99 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2015, Joyent, Inc. All rights reserved. +# + +# +# This test assures that we can have the same provider name across multiple +# probe definitions, and that the result will be the union of those +# definitions. In particular, libusdt depends on this when (for example) +# node modules that create a provider are loaded multiple times due to +# being included by different modules. +# + +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 +DIR=/var/tmp/dtest.$$ + +mkdir $DIR +cd $DIR + +cat > test.c < + +void +main() +{ +EOF + +objs= + +for oogle in bagnoogle stalloogle cockoogle; do + cat > $oogle.c < + +void +$oogle() +{ + DTRACE_PROBE(doogle, $oogle); +} +EOF + + cat > $oogle.d <> test.c +done + +echo "}" >> test.c + +cc -o test test.c $objs + +if [ $? -ne 0 ]; then + print -u2 "failed to compile test.c" + exit 1 +fi + +$dtrace -n 'doogle$target:::{@[probename] = count()}' \ + -n 'END{printa("%-10s %@d\n", @)}' -x quiet -x aggsortkey -Zc ./test + +if [ $? -ne 0 ]; then + print -u2 "failed to execute test" + exit 1 +fi + +cd / +rm -rf $DIR +exit 0 Copied: user/ngie/make_check/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out (from r292397, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/make_check/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out Thu Dec 17 07:01:45 2015 (r292398, copy of r292397, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out) @@ -0,0 +1,4 @@ +bagnoogle 1 +cockoogle 1 +stalloogle 1 + Modified: user/ngie/make_check/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c ============================================================================== --- user/ngie/make_check/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Thu Dec 17 07:01:45 2015 (r292398) @@ -571,12 +571,6 @@ dt_pid_usdt_mapping(void *data, const pr prsyminfo_t sip; dof_helper_t dh; GElf_Half e_type; -#ifdef __FreeBSD__ - dof_hdr_t hdr; - size_t sz; - uint64_t dofmax; - void *dof; -#endif const char *mname; const char *syms[] = { "___SUNW_dof", "__SUNW_dof" }; int i, fd = -1; @@ -606,61 +600,25 @@ dt_pid_usdt_mapping(void *data, const pr continue; } -#ifdef __FreeBSD__ + dh.dofhp_dof = sym.st_value; dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; - if (Pread(P, &hdr, sizeof (hdr), sym.st_value) != - sizeof (hdr)) { - dt_dprintf("read of DOF header failed\n"); - continue; - } - - sz = sizeof(dofmax); - if (sysctlbyname("kern.dtrace.dof_maxsize", &dofmax, &sz, - NULL, 0) != 0) { - dt_dprintf("failed to read dof_maxsize: %s\n", - strerror(errno)); - continue; - } - if (dofmax < hdr.dofh_loadsz) { - dt_dprintf("DOF load size exceeds maximum\n"); - continue; - } - - if ((dof = malloc(hdr.dofh_loadsz)) == NULL) - return (-1); - - if (Pread(P, dof, hdr.dofh_loadsz, sym.st_value) != - hdr.dofh_loadsz) { - free(dof); - dt_dprintf("read of DOF section failed\n"); - continue; - } - - dh.dofhp_dof = (uintptr_t)dof; - dh.dofhp_pid = proc_getpid(P); dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), sip.prs_lmid, mname); +#ifdef __FreeBSD__ + dh.dofhp_pid = proc_getpid(P); + if (fd == -1 && (fd = open("/dev/dtrace/helper", O_RDWR, 0)) < 0) { dt_dprintf("open of helper device failed: %s\n", strerror(errno)); - free(dof); return (-1); /* errno is set for us */ } if (ioctl(fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0) dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod); - - free(dof); #else - dh.dofhp_dof = sym.st_value; - dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; - - dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), - sip.prs_lmid, mname); - if (fd == -1 && (fd = pr_open(P, "/dev/dtrace/helper", O_RDWR, 0)) < 0) { dt_dprintf("pr_open of helper device failed: %s\n", Modified: user/ngie/make_check/cddl/usr.sbin/dtrace/tests/common/proc/Makefile ============================================================================== --- user/ngie/make_check/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Thu Dec 17 07:01:45 2015 (r292398) @@ -24,6 +24,6 @@ CFILES= \ tst.sigwait.c \ -LIBADD.tst.sigwait.exe=rt +LIBADD.tst.sigwait.exe+= rt .include "../../dtrace.test.mk" Modified: user/ngie/make_check/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile ============================================================================== --- user/ngie/make_check/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile Thu Dec 17 07:01:45 2015 (r292398) @@ -46,6 +46,8 @@ TESTFILES= \ tst.onlyenabled.ksh \ tst.reap.ksh \ tst.reeval.ksh \ + tst.sameprovmulti.ksh \ + tst.sameprovmulti.ksh.out \ tst.static.ksh \ tst.static.ksh.out \ tst.static2.ksh \ Modified: user/ngie/make_check/contrib/bmake/ChangeLog ============================================================================== --- user/ngie/make_check/contrib/bmake/ChangeLog Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/contrib/bmake/ChangeLog Thu Dec 17 07:01:45 2015 (r292398) @@ -1,3 +1,35 @@ +2015-12-01 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151201 + Merge with NetBSD make, pick up + o cond.c: CondCvtArg: avoid access beyond end of empty buffer. + o meta.c: meta_oodate: use lstat(2) for checking link target + in case it is a symlink. + o var.c: avoid calling brk_string and Var_Export1 with empty + strings. + +2015-11-26 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151126 + Merge with NetBSD make, pick up + o parse.c: ParseTrackInput don't access beyond + end of old value. + +2015-10-22 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151022 + + * Add support for BSD/OS which lacks inttypes.h + and really needs sys/param.h for sys/sysctl.h + also 'type' is not a shell builtin. + + * var.c: eliminate uint32_t and need for inttypes.h + + * main.c: PrintOnError flush stdout before run .ERROR + + * parse.c: cope with _SC_PAGESIZE not being defined. + + 2015-10-20 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151020 Modified: user/ngie/make_check/contrib/bmake/Makefile ============================================================================== --- user/ngie/make_check/contrib/bmake/Makefile Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/contrib/bmake/Makefile Thu Dec 17 07:01:45 2015 (r292398) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.44 2015/10/20 21:41:40 sjg Exp $ +# $Id: Makefile,v 1.48 2015/12/02 00:36:42 sjg Exp $ # Base version on src date -MAKE_VERSION= 20151020 +MAKE_VERSION= 20151201 PROG= bmake Modified: user/ngie/make_check/contrib/bmake/boot-strap ============================================================================== --- user/ngie/make_check/contrib/bmake/boot-strap Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/contrib/bmake/boot-strap Thu Dec 17 07:01:45 2015 (r292398) @@ -111,7 +111,7 @@ # Simon J. Gerraty # RCSid: -# $Id: boot-strap,v 1.45 2014/04/05 22:56:54 sjg Exp $ +# $Id: boot-strap,v 1.48 2015/10/25 05:20:48 sjg Exp $ # # @(#) Copyright (c) 2001 Simon J. Gerraty # @@ -395,8 +395,15 @@ Bmake() { ) } +# there is actually a shell where type is not a builtin +# if type is missing, which(1) had better exists! +if (type cat) > /dev/null 2>&1; then +which() { + type "$@" | sed 's,[()],,g;s,^[^/][^/]*,,;q' +} +fi # make sure test below uses the same diff that configure did -TOOL_DIFF=`type diff | sed 's,[()],,g;s,^[^/][^/]*,,;q'` +TOOL_DIFF=`which diff` export TOOL_DIFF op_configure() { Modified: user/ngie/make_check/contrib/bmake/cond.c ============================================================================== --- user/ngie/make_check/contrib/bmake/cond.c Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/contrib/bmake/cond.c Thu Dec 17 07:01:45 2015 (r292398) @@ -1,4 +1,4 @@ -/* $NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 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: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $"; +static char rcsid[] = "$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $"); +__RCSID("$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -490,6 +490,10 @@ CondCvtArg(char *str, double *value) double d_val; errno = 0; + if (!*str) { + *value = (double)0; + return TRUE; + } l_val = strtoul(str, &eptr, str[1] == 'x' ? 16 : 10); ech = *eptr; if (ech == 0 && errno != ERANGE) { Modified: user/ngie/make_check/contrib/bmake/config.h.in ============================================================================== --- user/ngie/make_check/contrib/bmake/config.h.in Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/contrib/bmake/config.h.in Thu Dec 17 07:01:45 2015 (r292398) @@ -59,6 +59,12 @@ /* Define to 1 if you have the `killpg' function. */ #undef HAVE_KILLPG +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBGEN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -158,6 +164,9 @@ */ #undef HAVE_SYS_NDIR_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SELECT_H @@ -304,6 +313,11 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +#undef _UINT32_T + /* C99 function name */ #undef __func__ @@ -319,5 +333,9 @@ /* Define to `unsigned int' if does not define. */ #undef size_t +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +#undef uint32_t + /* Define as `fork' if `vfork' does not work. */ #undef vfork Modified: user/ngie/make_check/contrib/bmake/configure ============================================================================== Binary file (source and/or target). No diff available. Modified: user/ngie/make_check/contrib/bmake/configure.in ============================================================================== --- user/ngie/make_check/contrib/bmake/configure.in Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/contrib/bmake/configure.in Thu Dec 17 07:01:45 2015 (r292398) @@ -1,11 +1,11 @@ dnl dnl RCSid: -dnl $Id: configure.in,v 1.54 2015/10/10 04:17:10 sjg Exp $ +dnl $Id: configure.in,v 1.56 2015/10/25 05:20:48 sjg Exp $ dnl dnl Process this file with autoconf to produce a configure script dnl AC_PREREQ(2.50) -AC_INIT([bmake], [20151009], [sjg@NetBSD.org]) +AC_INIT([bmake], [20151022], [sjg@NetBSD.org]) AC_CONFIG_HEADERS(config.h) dnl make srcdir absolute @@ -101,10 +101,19 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_DIRENT dnl Keep this list sorted +AC_CHECK_HEADERS(sys/param.h) +dnl On BSDi at least we really need sys/param.h for sys/sysctl.h +AC_CHECK_HEADERS([sys/sysctl.h], [], [], +[#ifdef HAVE_SYS_PARAM_H +# include +# endif +]) + AC_CHECK_HEADERS( \ ar.h \ err.h \ fcntl.h \ + libgen.h \ limits.h \ paths.h \ poll.h \ @@ -113,7 +122,6 @@ AC_CHECK_HEADERS( \ sys/mman.h \ sys/select.h \ sys/socket.h \ - sys/sysctl.h \ sys/time.h \ sys/uio.h \ unistd.h \ @@ -143,6 +151,7 @@ AC_C_CONST AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_SIZE_T +AC_TYPE_UINT32_T AC_DECL_SYS_SIGLIST AC_HEADER_TIME AC_STRUCT_TM Modified: user/ngie/make_check/contrib/bmake/main.c ============================================================================== --- user/ngie/make_check/contrib/bmake/main.c Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/contrib/bmake/main.c Thu Dec 17 07:01:45 2015 (r292398) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $"; #else #include #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.234 2015/10/11 04:51:24 sjg Exp $"); +__RCSID("$NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1902,6 +1902,8 @@ PrintOnError(GNode *gn, const char *s) printf("%s", cp); free(cp); } + fflush(stdout); + /* * Finally, see if there is a .ERROR target, and run it if so. */ Modified: user/ngie/make_check/contrib/bmake/meta.c ============================================================================== --- user/ngie/make_check/contrib/bmake/meta.c Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/contrib/bmake/meta.c Thu Dec 17 07:01:45 2015 (r292398) @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.40 2015/10/11 04:51:24 sjg Exp $ */ +/* $NetBSD: meta.c,v 1.41 2015/11/30 23:37:56 sjg Exp $ */ /* * Implement 'meta' mode. @@ -38,7 +38,11 @@ #include #include #include +#ifdef HAVE_LIBGEN_H #include +#elif !defined(HAVE_DIRNAME) +char * dirname(char *); +#endif #include #if !defined(HAVE_CONFIG_H) || defined(HAVE_ERR_H) #include @@ -1183,7 +1187,8 @@ meta_oodate(GNode *gn, Boolean oodate) if ((strstr("tmp", p))) break; - if (stat(p, &fs) < 0) { + if ((link_src != NULL && lstat(p, &fs) < 0) || + (link_src == NULL && stat(p, &fs) < 0)) { Lst_AtEnd(missingFiles, bmake_strdup(p)); } break; Modified: user/ngie/make_check/contrib/bmake/mk/ChangeLog ============================================================================== --- user/ngie/make_check/contrib/bmake/mk/ChangeLog Thu Dec 17 06:55:25 2015 (r292397) +++ user/ngie/make_check/contrib/bmake/mk/ChangeLog Thu Dec 17 07:01:45 2015 (r292398) @@ -1,3 +1,29 @@ +2015-11-14 Simon J. Gerraty + + * install-mk (MK_VERSION): 20151111 + + * meta.sys.mk: include sys.dependfile.mk + + * sys.mk (OPTIONS_DEFAULT_NO): use options.mk + to set MK_AUTO_OBJ and MK_DIRDEPS_BUILD + include local.sys.env.mk early + include local.sys.mk later + + * own.mk (OPTIONS_DEFAULT_NO): AUTO_OBJ etc moved to sys.mk + +2015-11-13 Simon J. Gerraty + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Thu Dec 17 12:33:44 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9638CA4968B for ; Thu, 17 Dec 2015 12:33:44 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5637C1FED; Thu, 17 Dec 2015 12:33:44 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHCXh6w045977; Thu, 17 Dec 2015 12:33:43 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHCXhMH045976; Thu, 17 Dec 2015 12:33:43 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201512171233.tBHCXhMH045976@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Thu, 17 Dec 2015 12:33:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292400 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2015 12:33:44 -0000 Author: pho Date: Thu Dec 17 12:33:43 2015 New Revision: 292400 URL: https://svnweb.freebsd.org/changeset/base/292400 Log: Added a regression test. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/posix_fadvise2.sh (contents, props changed) Added: user/pho/stress2/misc/posix_fadvise2.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/posix_fadvise2.sh Thu Dec 17 12:33:43 2015 (r292400) @@ -0,0 +1,79 @@ +#!/bin/sh + +# +# Copyright (c) 2015 EMC Corp. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# Looping thread seen: +# https://people.freebsd.org/~pho/stress/log/kostik850.txt +# Fixed by r292326. + +. ../default.cfg + +here=`pwd` +cd /tmp +sed '1,/^EOF/d' < $here/$0 > posix_fadvise2.c +mycc -o posix_fadvise2 -Wall -Wextra -O2 posix_fadvise2.c || exit 1 +rm -f posix_fadvise2.c + +/tmp/posix_fadvise2 + +rm -f /tmp/posix_fadvise2 /tmp/posix_fadvise2 +exit +EOF +#include + +#include +#include +#include +#include +#include + +char *file[2] = { + "/usr/libexec/sendmail/sendmail", + "/tmp/posix_fadvise2"}; + +int +main(void) +{ + int fd, i, r; + + for (i = 0; i < 2; i++) { + fprintf(stderr, "Testing with %s.\n", file[i]); + if ((fd = open(file[i], O_RDONLY)) == -1) + err(1, "open(%s)", file[i]); + +/* Arguments from syscall4.sh test as seen in kostik850.txt */ + if ((r = posix_fadvise(fd, 0x1e9cda7a9ada8319, + 0x1e9d1deee0401abd, POSIX_FADV_DONTNEED)) != 0) + errc(1, r, "posix_fadvise(%s)", file[i]); + + close(fd); + } + + return(0); +} From owner-svn-src-user@freebsd.org Thu Dec 17 12:35:42 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2AC64A49784 for ; Thu, 17 Dec 2015 12:35:42 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED729115B; Thu, 17 Dec 2015 12:35:41 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHCZfNL046086; Thu, 17 Dec 2015 12:35:41 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHCZflY046085; Thu, 17 Dec 2015 12:35:41 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201512171235.tBHCZflY046085@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Thu, 17 Dec 2015 12:35:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292401 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2015 12:35:42 -0000 Author: pho Date: Thu Dec 17 12:35:40 2015 New Revision: 292401 URL: https://svnweb.freebsd.org/changeset/base/292401 Log: Fix excessive runtime seen with 64 GB RAM. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/forkbomb.sh Modified: user/pho/stress2/misc/forkbomb.sh ============================================================================== --- user/pho/stress2/misc/forkbomb.sh Thu Dec 17 12:33:43 2015 (r292400) +++ user/pho/stress2/misc/forkbomb.sh Thu Dec 17 12:35:40 2015 (r292401) @@ -66,7 +66,7 @@ while mount | grep "on $mntpoint " | gre done mdconfig -d -u $mdstart rm -rf /tmp/forkbomb -exit $r +exit EOF #include @@ -87,7 +87,7 @@ volatile u_int *share; #define R1 0 #define R2 1 -#define MXFAIL 10000 +#define MXFAIL 100 #define PARALLEL 200 void @@ -128,8 +128,7 @@ main(void) } while (share[R2] < MXFAIL) - usleep(10000); - sleep(10); + sleep(1); return (0); } From owner-svn-src-user@freebsd.org Fri Dec 18 19:30:05 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1E5EA4BA5B for ; Fri, 18 Dec 2015 19:30:05 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75FF51031; Fri, 18 Dec 2015 19:30:05 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBIJU45j096989; Fri, 18 Dec 2015 19:30:04 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBIJTwfm096906; Fri, 18 Dec 2015 19:29:58 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201512181929.tBIJTwfm096906@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Fri, 18 Dec 2015 19:29:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292449 - in user/alc/PQ_LAUNDRY: contrib/openbsm contrib/openbsm/bin contrib/openbsm/bin/audit contrib/openbsm/bin/auditd contrib/openbsm/bin/auditdistd contrib/openbsm/bin/auditfilter... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2015 19:30:05 -0000 Author: alc Date: Fri Dec 18 19:29:58 2015 New Revision: 292449 URL: https://svnweb.freebsd.org/changeset/base/292449 Log: MFhead r292448 Added: user/alc/PQ_LAUNDRY/contrib/openbsm/.travis.yml - copied unchanged from r292448, head/contrib/openbsm/.travis.yml user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_notify.3 - copied unchanged from r292448, head/contrib/openbsm/libbsm/au_notify.3 user/alc/PQ_LAUNDRY/sys/arm/arm/machdep_intr.c - copied unchanged from r292448, head/sys/arm/arm/machdep_intr.c user/alc/PQ_LAUNDRY/sys/geom/sched/gs_delay.c - copied unchanged from r292448, head/sys/geom/sched/gs_delay.c user/alc/PQ_LAUNDRY/sys/kern/pic_if.m - copied unchanged from r292448, head/sys/kern/pic_if.m user/alc/PQ_LAUNDRY/sys/kern/subr_intr.c - copied unchanged from r292448, head/sys/kern/subr_intr.c user/alc/PQ_LAUNDRY/sys/modules/geom/geom_sched/gsched_delay/ - copied from r292448, head/sys/modules/geom/geom_sched/gsched_delay/ user/alc/PQ_LAUNDRY/sys/riscv/ - copied from r292448, head/sys/riscv/ Deleted: user/alc/PQ_LAUNDRY/sys/arm/arm/intrng.c user/alc/PQ_LAUNDRY/sys/arm/arm/pic_if.m Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/INSTALL user/alc/PQ_LAUNDRY/contrib/openbsm/LICENSE user/alc/PQ_LAUNDRY/contrib/openbsm/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/Makefile.in user/alc/PQ_LAUNDRY/contrib/openbsm/NEWS user/alc/PQ_LAUNDRY/contrib/openbsm/README user/alc/PQ_LAUNDRY/contrib/openbsm/TODO user/alc/PQ_LAUNDRY/contrib/openbsm/VERSION user/alc/PQ_LAUNDRY/contrib/openbsm/autogen.sh user/alc/PQ_LAUNDRY/contrib/openbsm/bin/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/audit.8 user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/audit.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/audit_triggers.defs user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/audit_warn.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.8 user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_control.defs user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_darwin.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_fbsd.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.8 user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/faccessat.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/fstatat.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/openat.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/parse.y user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/pjdlog.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/pjdlog.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_common.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_impl.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_socketpair.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_tcp.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_tls.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_uds.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/receiver.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/renameat.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sandbox.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sandbox.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sender.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sigtimedwait.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/strndup.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/subr.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/subr.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/synch.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/token.l user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/trail.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/trail.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/unlinkat.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.8 user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditreduce/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditreduce/auditreduce.1 user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditreduce/auditreduce.c user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditreduce/auditreduce.h user/alc/PQ_LAUNDRY/contrib/openbsm/bin/praudit/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/bin/praudit/praudit.1 user/alc/PQ_LAUNDRY/contrib/openbsm/bin/praudit/praudit.c user/alc/PQ_LAUNDRY/contrib/openbsm/bsm/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/bsm/audit_filter.h user/alc/PQ_LAUNDRY/contrib/openbsm/bsm/audit_uevents.h user/alc/PQ_LAUNDRY/contrib/openbsm/bsm/auditd_lib.h user/alc/PQ_LAUNDRY/contrib/openbsm/bsm/libbsm.h user/alc/PQ_LAUNDRY/contrib/openbsm/compat/clock_gettime.h user/alc/PQ_LAUNDRY/contrib/openbsm/compat/closefrom.h user/alc/PQ_LAUNDRY/contrib/openbsm/compat/compat.h user/alc/PQ_LAUNDRY/contrib/openbsm/compat/endian.h user/alc/PQ_LAUNDRY/contrib/openbsm/compat/endian_enc.h user/alc/PQ_LAUNDRY/contrib/openbsm/compat/flopen.h user/alc/PQ_LAUNDRY/contrib/openbsm/compat/pidfile.h user/alc/PQ_LAUNDRY/contrib/openbsm/compat/queue.h user/alc/PQ_LAUNDRY/contrib/openbsm/compat/strlcat.h user/alc/PQ_LAUNDRY/contrib/openbsm/compat/strlcpy.h user/alc/PQ_LAUNDRY/contrib/openbsm/config/config.h user/alc/PQ_LAUNDRY/contrib/openbsm/configure user/alc/PQ_LAUNDRY/contrib/openbsm/configure.ac user/alc/PQ_LAUNDRY/contrib/openbsm/etc/audit_class user/alc/PQ_LAUNDRY/contrib/openbsm/etc/audit_control user/alc/PQ_LAUNDRY/contrib/openbsm/etc/audit_event user/alc/PQ_LAUNDRY/contrib/openbsm/etc/audit_filter user/alc/PQ_LAUNDRY/contrib/openbsm/etc/audit_user user/alc/PQ_LAUNDRY/contrib/openbsm/etc/audit_warn user/alc/PQ_LAUNDRY/contrib/openbsm/libauditd/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/libauditd/auditd_lib.c user/alc/PQ_LAUNDRY/contrib/openbsm/libauditd/libauditd.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/Makefile.in user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_class.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_control.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_domain.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_errno.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_event.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_fcntl_cmd.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_free_token.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_io.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_mask.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_open.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_socket_type.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_token.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/au_user.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/audit_submit.3 user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_audit.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_class.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_control.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_domain.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_errno.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_event.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_fcntl.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_flags.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_io.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_mask.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_notify.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_socket_type.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_token.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_user.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/bsm_wrappers.c user/alc/PQ_LAUNDRY/contrib/openbsm/libbsm/libbsm.3 user/alc/PQ_LAUNDRY/contrib/openbsm/man/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/man/Makefile.in user/alc/PQ_LAUNDRY/contrib/openbsm/man/audit.2 user/alc/PQ_LAUNDRY/contrib/openbsm/man/audit.log.5 user/alc/PQ_LAUNDRY/contrib/openbsm/man/audit_class.5 user/alc/PQ_LAUNDRY/contrib/openbsm/man/audit_control.5 user/alc/PQ_LAUNDRY/contrib/openbsm/man/audit_event.5 user/alc/PQ_LAUNDRY/contrib/openbsm/man/audit_user.5 user/alc/PQ_LAUNDRY/contrib/openbsm/man/audit_warn.5 user/alc/PQ_LAUNDRY/contrib/openbsm/man/auditctl.2 user/alc/PQ_LAUNDRY/contrib/openbsm/man/auditon.2 user/alc/PQ_LAUNDRY/contrib/openbsm/man/getaudit.2 user/alc/PQ_LAUNDRY/contrib/openbsm/man/getauid.2 user/alc/PQ_LAUNDRY/contrib/openbsm/man/setaudit.2 user/alc/PQ_LAUNDRY/contrib/openbsm/man/setauid.2 user/alc/PQ_LAUNDRY/contrib/openbsm/modules/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/modules/auditfilter_noop/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c user/alc/PQ_LAUNDRY/contrib/openbsm/sys/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/sys/bsm/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/sys/bsm/audit.h user/alc/PQ_LAUNDRY/contrib/openbsm/sys/bsm/audit_domain.h user/alc/PQ_LAUNDRY/contrib/openbsm/sys/bsm/audit_errno.h user/alc/PQ_LAUNDRY/contrib/openbsm/sys/bsm/audit_fcntl.h user/alc/PQ_LAUNDRY/contrib/openbsm/sys/bsm/audit_internal.h user/alc/PQ_LAUNDRY/contrib/openbsm/sys/bsm/audit_kevents.h user/alc/PQ_LAUNDRY/contrib/openbsm/sys/bsm/audit_record.h user/alc/PQ_LAUNDRY/contrib/openbsm/sys/bsm/audit_socket_type.h user/alc/PQ_LAUNDRY/contrib/openbsm/test/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/test/bsm/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/test/bsm/generate.c user/alc/PQ_LAUNDRY/contrib/openbsm/tools/Makefile.am user/alc/PQ_LAUNDRY/contrib/openbsm/tools/audump.c user/alc/PQ_LAUNDRY/crypto/openssh/digest-libc.c user/alc/PQ_LAUNDRY/include/netdb.h user/alc/PQ_LAUNDRY/lib/libbsm/Makefile user/alc/PQ_LAUNDRY/lib/libc/net/getaddrinfo.3 user/alc/PQ_LAUNDRY/lib/libc/net/getaddrinfo.c user/alc/PQ_LAUNDRY/libexec/rtld-elf/rtld.c user/alc/PQ_LAUNDRY/share/man/man4/ioat.4 user/alc/PQ_LAUNDRY/sys/arm/allwinner/a20/a20_mp.c user/alc/PQ_LAUNDRY/sys/arm/altera/socfpga/socfpga_mp.c user/alc/PQ_LAUNDRY/sys/arm/amlogic/aml8726/aml8726_mp.c user/alc/PQ_LAUNDRY/sys/arm/annapurna/alpine/alpine_machdep_mp.c user/alc/PQ_LAUNDRY/sys/arm/arm/exception.S user/alc/PQ_LAUNDRY/sys/arm/arm/gic.c user/alc/PQ_LAUNDRY/sys/arm/arm/intr.c user/alc/PQ_LAUNDRY/sys/arm/arm/mp_machdep.c user/alc/PQ_LAUNDRY/sys/arm/arm/nexus.c user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/imx6_mp.c user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/imx_gpio.c user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/imx_sdhci.c user/alc/PQ_LAUNDRY/sys/arm/include/intr.h user/alc/PQ_LAUNDRY/sys/arm/include/smp.h user/alc/PQ_LAUNDRY/sys/arm/qemu/virt_mp.c user/alc/PQ_LAUNDRY/sys/arm/rockchip/rk30xx_mp.c user/alc/PQ_LAUNDRY/sys/arm/samsung/exynos/exynos5_mp.c user/alc/PQ_LAUNDRY/sys/arm/ti/aintc.c user/alc/PQ_LAUNDRY/sys/arm/ti/omap4/omap4_mp.c user/alc/PQ_LAUNDRY/sys/arm/xilinx/zy7_mp.c user/alc/PQ_LAUNDRY/sys/arm64/include/ofw_machdep.h user/alc/PQ_LAUNDRY/sys/boot/efi/loader/bootinfo.c user/alc/PQ_LAUNDRY/sys/conf/files.arm user/alc/PQ_LAUNDRY/sys/dev/drm2/i915/intel_iic.c user/alc/PQ_LAUNDRY/sys/dev/if_ndis/if_ndis_pci.c user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat.c user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat.h user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat_hw.h user/alc/PQ_LAUNDRY/sys/dev/mmc/mmc.c user/alc/PQ_LAUNDRY/sys/dev/nand/nand_cdev.c user/alc/PQ_LAUNDRY/sys/dev/nand/nand_geom.c user/alc/PQ_LAUNDRY/sys/dev/ofw/ofw_bus_subr.c user/alc/PQ_LAUNDRY/sys/dev/ofw/ofw_bus_subr.h user/alc/PQ_LAUNDRY/sys/kern/kern_proc.c user/alc/PQ_LAUNDRY/sys/modules/geom/geom_sched/Makefile user/alc/PQ_LAUNDRY/sys/net/if.c user/alc/PQ_LAUNDRY/sys/net/if_lagg.c user/alc/PQ_LAUNDRY/sys/net/if_lagg.h user/alc/PQ_LAUNDRY/sys/net/if_var.h user/alc/PQ_LAUNDRY/sys/netinet/if_ether.c user/alc/PQ_LAUNDRY/sys/netinet/if_ether.h user/alc/PQ_LAUNDRY/sys/netinet/in_var.h user/alc/PQ_LAUNDRY/sys/netinet/ip_carp.c user/alc/PQ_LAUNDRY/sys/netinet6/in6.c user/alc/PQ_LAUNDRY/sys/netinet6/in6_var.h user/alc/PQ_LAUNDRY/sys/netinet6/nd6.c user/alc/PQ_LAUNDRY/sys/netinet6/nd6.h user/alc/PQ_LAUNDRY/sys/netinet6/nd6_nbr.c user/alc/PQ_LAUNDRY/sys/powerpc/conf/GENERIC64 user/alc/PQ_LAUNDRY/sys/sys/linker.h user/alc/PQ_LAUNDRY/sys/sys/proc.h user/alc/PQ_LAUNDRY/sys/vm/device_pager.c user/alc/PQ_LAUNDRY/sys/vm/sg_pager.c user/alc/PQ_LAUNDRY/sys/vm/vm_page.h user/alc/PQ_LAUNDRY/usr.bin/calendar/calendars/calendar.freebsd user/alc/PQ_LAUNDRY/usr.bin/netstat/ipsec.c user/alc/PQ_LAUNDRY/usr.bin/netstat/main.c user/alc/PQ_LAUNDRY/usr.sbin/boot0cfg/boot0cfg.c user/alc/PQ_LAUNDRY/usr.sbin/ypserv/Makefile.yp Directory Properties: user/alc/PQ_LAUNDRY/ (props changed) user/alc/PQ_LAUNDRY/contrib/openbsm/ (props changed) user/alc/PQ_LAUNDRY/crypto/openssh/ (props changed) user/alc/PQ_LAUNDRY/include/ (props changed) user/alc/PQ_LAUNDRY/lib/libc/ (props changed) user/alc/PQ_LAUNDRY/share/ (props changed) user/alc/PQ_LAUNDRY/share/man/man4/ (props changed) user/alc/PQ_LAUNDRY/sys/ (props changed) user/alc/PQ_LAUNDRY/sys/boot/ (props changed) user/alc/PQ_LAUNDRY/sys/conf/ (props changed) user/alc/PQ_LAUNDRY/usr.bin/calendar/ (props changed) Copied: user/alc/PQ_LAUNDRY/contrib/openbsm/.travis.yml (from r292448, head/contrib/openbsm/.travis.yml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/.travis.yml Fri Dec 18 19:29:58 2015 (r292449, copy of r292448, head/contrib/openbsm/.travis.yml) @@ -0,0 +1,18 @@ +language: c + +compiler: + - clang + - gcc + +os: + - linux + - osx + +before_install: + - if [ $TRAVIS_OS_NAME == "linux" ]; then + sudo apt-get -qq update; + sudo apt-get -qq install byacc flex; + elif [ $TRAVIS_OS_NAME == "osx" ]; then + brew update; + brew install byacc flex; + fi Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/INSTALL ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/INSTALL Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/INSTALL Fri Dec 18 19:29:58 2015 (r292449) @@ -3,7 +3,7 @@ OpenBSM Build and Installation Instructi OpenBSM is currently built using autoconf and automake, which should allow for building on a range of operating systems, including FreeBSD, Mac OS X, and Linux. Some components are built only if appropriate kernel audit -suppport is found. Typical builds will be performed using: +support is found. Typical builds will be performed using: ./configure make @@ -31,7 +31,7 @@ not configurable. You may wish to specify that the OpenBSM components not be installed in the base system, rather in a specific directory. This may be done using the --prefix argument to configure. If installing to a specific directory, -remember to update your library path so that running tools from that +remember to update your library path so that when running tools from that directory the correct libbsm is used: ./configure --prefix=/home/rwatson/openbsm Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/LICENSE ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/LICENSE Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/LICENSE Fri Dec 18 19:29:58 2015 (r292449) @@ -34,5 +34,3 @@ as a whole: The TrustedBSD Project would appreciate the contribution of fixes and enhancements under an identical license in order to avoid potentially confusing license proliferation. - -$P4: //depot/projects/trustedbsd/openbsm/LICENSE#6 $ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/Makefile.am ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/Makefile.am Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/Makefile.am Fri Dec 18 19:29:58 2015 (r292449) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#5 $ -## - SUBDIRS = \ bsm Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/Makefile.in ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/Makefile.in Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/Makefile.in Fri Dec 18 19:29:58 2015 (r292449) @@ -59,9 +59,9 @@ DIST_COMMON = README $(am__configure_dep $(top_srcdir)/config/config.sub \ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ $(top_srcdir)/config/missing $(top_srcdir)/configure INSTALL \ - NEWS TODO config/config.guess config/config.sub config/depcomp \ - config/install-sh config/ltmain.sh config/missing \ - config/ylwrap + NEWS TODO config/compile config/config.guess config/config.sub \ + config/depcomp config/install-sh config/ltmain.sh \ + config/missing config/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/NEWS ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/NEWS Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/NEWS Fri Dec 18 19:29:58 2015 (r292449) @@ -1,5 +1,16 @@ OpenBSM Version History +OpenBSM 1.2 alpha 4 + +- Fix praudit to emit correct XML. +- Fix auditdistd bugs related to IPv6 support, locking, and a kqueue-related + descriptor leak. +- Add audit event definitions for Capsicum-related syscalls, as well as + AUE_BINDAT and AUE_CONNECTAT. +- Manpage symlinks for all libbsm functions are installed again after the + move to autotools in OpenBSM 1.0 Alpha 5. +- A variety of minor documentation cleanups. + OpenBSM 1.2 alpha 3 - Various minor tweaks to the auditdistd build to make it fit the FreeBSD @@ -494,5 +505,3 @@ OpenBSM 1.0 alpha 1 - auditd(8), audit(8) added to the OpenBSM distribution. auditd extended to support reloading of kernel event table. - Allow comments in /etc/security configuration files. - -$P4: //depot/projects/trustedbsd/openbsm/NEWS#55 $ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/README ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/README Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/README Fri Dec 18 19:29:58 2015 (r292449) @@ -1,4 +1,4 @@ -OpenBSM 1.2a2 +OpenBSM Introduction @@ -10,7 +10,7 @@ of several organizations. OpenBSM includes several command line tools, including auditreduce(8) and praudit(8) for reducing and printing audit trails, as well as the libbsm(3) library to manage configuration files, generate audit records, and parse and -print audit trils. +print audit trails. Coupled with a kernel audit implementation, OpenBSM can be used to maintain system audit streams, and is a foundation for a full audit-enabled system. @@ -64,5 +64,3 @@ Information on OpenBSM may be found on t Information on TrustedBSD may be found on the TrustedBSD home page: http://www.TrustedBSD.org/ - -$P4: //depot/projects/trustedbsd/openbsm/README#41 $ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/TODO ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/TODO Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/TODO Fri Dec 18 19:29:58 2015 (r292449) @@ -7,8 +7,6 @@ OpenBSM TODO - Document contents of libbsm "public" data structures in libbsm man pages. - The audit.log.5 man page is incomplete, as it does not describe all token types. -- With the move to autoconf/automake, man page symlinks are no longer - installed. This needs to be fixed. - It might be desirable to be able to provide EOPNOTSUPP system call stubs on systems that don't have the necessary audit system calls; that would allow the full libbsm and tool set to build, just not run. @@ -23,5 +21,3 @@ OpenBSM TODO not available on the local OS platform. - Support for client certificates in auditdistd, to include certificate chain validation. - -$P4: //depot/projects/trustedbsd/openbsm/TODO#14 $ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/VERSION ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/VERSION Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/VERSION Fri Dec 18 19:29:58 2015 (r292449) @@ -1 +1 @@ -OPENBSM_1_2_alpha3 +OPENBSM_1_2_alpha4 Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/autogen.sh ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/autogen.sh Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/autogen.sh Fri Dec 18 19:29:58 2015 (r292449) @@ -1,7 +1,4 @@ #!/bin/sh -# -# $P4: //depot/projects/trustedbsd/openbsm/autogen.sh#2 $ -# libtoolize --copy --force aclocal Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/Makefile.am ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/Makefile.am Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/Makefile.am Fri Dec 18 19:29:58 2015 (r292449) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#4 $ -## - SUBDIRS = \ auditdistd \ auditfilterd \ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/Makefile.am ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/Makefile.am Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/Makefile.am Fri Dec 18 19:29:58 2015 (r292449) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#7 $ -## - if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) else Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/audit.8 ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/audit.8 Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/audit.8 Fri Dec 18 19:29:58 2015 (r292449) @@ -25,9 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#16 $ -.\" -.Dd January 29, 2009 +.Dd July 25, 2015 .Dt AUDIT 8 .Os .Sh NAME @@ -88,7 +86,7 @@ Audit policy file used to configure the .Xr audit 4 , .Xr audit_control 5 , .Xr auditd 8 , -.Xr launchd 8 +.Xr launchd 8 (Mac OS X) .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/audit.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/audit.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/audit/audit.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#15 $ */ /* * Program to trigger the audit daemon with a message that is either: Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/Makefile.am ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/Makefile.am Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/Makefile.am Fri Dec 18 19:29:58 2015 (r292449) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#6 $ -## - if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) else Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/audit_triggers.defs ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/audit_triggers.defs Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/audit_triggers.defs Fri Dec 18 19:29:58 2015 (r292449) @@ -1,5 +1 @@ -/* - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_triggers.defs#1 $ - */ - #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/audit_warn.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/audit_warn.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/audit_warn.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#11 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.8 ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.8 Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.8 Fri Dec 18 19:29:58 2015 (r292449) @@ -25,9 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#19 $ -.\" -.Dd December 11, 2008 +.Dd July 25, 2015 .Dt AUDITD 8 .Os .Sh NAME @@ -123,7 +121,7 @@ and are no longer available as arguments .Xr audit_warn 5 , .Xr audit 8 , .Xr auditdistd 8 , -.Xr launchd 8 +.Xr launchd 8 (Mac OS X) .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#50 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#13 $ */ #ifndef _AUDITD_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_control.defs ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_control.defs Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_control.defs Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_control.defs#2 $ */ /* Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_darwin.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_darwin.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_darwin.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#5 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_fbsd.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_fbsd.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditd/auditd_fbsd.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#4 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/Makefile.am ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/Makefile.am Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/Makefile.am Fri Dec 18 19:29:58 2015 (r292449) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/Makefile.am#1 $ -## - if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) else Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.8 ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.8 Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.8 Fri Dec 18 19:29:58 2015 (r292449) @@ -41,7 +41,7 @@ .Sh DESCRIPTION The .Nm -daemon is responsible for distributing audit trail files over TCP/IP network in +daemon is responsible for distributing audit trail files over a TCP/IP network in a secure and reliable way. .Pp The @@ -49,7 +49,7 @@ The daemon can be started with the following command line arguments: .Bl -tag -width ".Fl P Ar pidfile" .It Fl c Ar config -Specify alternative location of the configuration file. +Specify an alternative location of the configuration file. The default location is .Pa /etc/security/auditdistd.conf . Note: the configuration file may contain passwords. @@ -74,7 +74,7 @@ usage message. Start in a launchd-friendly mode, ie. do not use .Xr daemon 3 . .It Fl P Ar pidfile -Specify alternative location of a file where main process PID will be +Specify an alternative location of a file where main process PID will be stored. The default location is .Pa /var/run/auditdistd.pid . Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#3 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 Fri Dec 18 19:29:58 2015 (r292449) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 22, 2011 +.Dd July 1, 2015 .Dt AUDITDISTD.CONF 5 .Os .Sh NAME @@ -37,19 +37,21 @@ daemon. .Sh DESCRIPTION Note: the configuration file may contain passwords. -Care should be taken to configure proper permissions on this file -.Li ( eg. 0600 ) . +Care should be taken to configure proper permissions for this file +.Li ( e.g., 0600 ) . .Pp -Every line starting with # is treated as comment and ignored. +Every line starting with +.Li # +gets treated as a comment and is ignored. .Sh CONFIGURATION FILE SYNTAX -General syntax of the +The general syntax of the .Nm -file is following: -.Bd -literal -offset +file is as follows: +.Bd -literal ## Global section. # Our name. -# The default is first part of the hostname. +# The default is the first part of the hostname. name "" # Connection timeout. @@ -71,11 +73,11 @@ sender { # The default is /var/audit/dist. directory "" .\" -.\" # Checksum algorithm for data send over the wire. +.\" # Checksum algorithm for data sent over the wire. .\" # The default is none. .\" checksum "" .\" -.\" # Compression algorithm for data send over the wire. +.\" # Compression algorithm for data sent over the wire. .\" # The default is none. .\" compression "" @@ -86,7 +88,7 @@ sender { # Optional. source "" - # Address of auditdistd receiver. + # Address of the auditdistd receiver. # No default. Obligatory. remote "" @@ -95,7 +97,7 @@ sender { directory "" # Fingerprint of the receiver's public key when using TLS - # for connection. + # for connections. # Example fingerprint: # SHA256=8F:0A:FC:8A:3D:09:80:AF:D9:AA:38:CC:8A:86:53:E6:8F:B6:1C:55:30:14:D7:F9:AA:8B:3E:73:CD:F5:76:2B fingerprint "" @@ -103,37 +105,37 @@ sender { # Password used to authenticate in front of the receiver. password "" .\" -.\" # Checksum algorithm for data send over the wire. +.\" # Checksum algorithm for data sent over the wire. .\" # The default is none. .\" checksum "" .\" -.\" # Compression algorithm for data send over the wire. +.\" # Compression algorithm for data sent over the wire. .\" # The default is none. .\" compression "" } - # Currently local audit trail files can be send only to one remote + # Currently local audit trail files can be sent only to one remote # auditdistd receiver, but this can change in the future. } receiver { ## Receiver section. - # Address to listen on. Multiple listen addresses might be specified. + # Address to listen on. Multiple listen addresses may be specified. # The defaults are "tcp4://0.0.0.0:7878" and "tcp6://[::]:7878". listen "" # Base directory. - # If directory in host section is no absolute, it will be concatenated - # with this base directory. + # If the directory in the host section is not absolute, it will be + # concatenated with this base directory. # The default is "/var/audit/remote". directory "" - # Path to receiver's certificate file. + # Path to the receiver's certificate file. # The default is "/etc/security/auditdistd.cert.pem". certfile "" - # Path to receiver's private key file. + # Path to the receiver's private key file. # The default is "/etc/security/auditdistd.key.pem". keyfile "" @@ -158,7 +160,7 @@ receiver { .Ed .Pp Most of the various available configuration parameters are optional. -If parameter is not defined in the particular section, it will be +If a parameter is not defined in the particular section, it will be inherited from the parent section if possible. For example, if the .Ic source @@ -172,14 +174,14 @@ In case the section does not define the .Ic source parameter at all, the default value will be used. -.Sh CONFIGURATION FILE DESCRIPTION +.Sh CONFIGURATION OPTION DESCRIPTION The following statements are available: .Bl -tag -width ".Ic xxxx" .It Ic name Aq name .Pp This host's name. -It is send to the receiver, so it can properly recognize us if there are -more than one sender coming from the same IP address. +It is sent to the receiver, so it can properly recognize us if there are +multiple senders coming from the same IP address. .It Ic timeout Aq seconds .Pp Connection timeout in seconds. @@ -198,17 +200,17 @@ The default value is Local address to bind to before connecting to the remote .Nm auditdistd daemon. -Format is the same as for the +The format is the same as for the .Ic listen statement. .It Ic directory Aq path .Pp -Directory where to look for audit trail files in case of sender mode or -directory where to store received audit trail files. +The directory where to look for audit trail files in case of sender mode, or +the directory where to store received audit trail files. The provided path has to be an absolute path. -The only exception is when directory is provided in the +The only exception is when the directory is provided in the .Ic receiver -section, then path provided in the +section; then the path provided in the .Ic host subsections can be relative to the directory in the .Ic receiver @@ -229,13 +231,13 @@ subsections in the .Ic receiver section where .Aq name -is host's name. +is the host's name. .\".It Ic checksum Aq algorithm .\".Pp .\"Checksum algorithm should be one of the following: .\".Bl -tag -width ".Ic sha256" .\".It Ic none -.\"No checksum will be calculated for the data being send over the network. +.\"No checksum will be calculated for the data being sent over the network. .\"This is the default setting. .\".It Ic crc32 .\"CRC32 checksum will be calculated. @@ -247,30 +249,30 @@ is host's name. .\"Compression algorithm should be one of the following: .\".Bl -tag -width ".Ic none" .\".It Ic none -.\"Data send over the network will not be compressed. +.\"Data sent over the network will not be compressed. .\"This is the default setting. .\".It Ic lzf .\"The .\".Nm LZF .\"algorithm by .\".An Marc Alexander Lehmann -.\"will be used to compress the data send over the network. +.\"will be used to compress the data sent over the network. .\".Nm LZF -.\"is very fast, general purpose compression algorithm. +.\"is a very fast, general purpose compression algorithm. .\".El .It Ic remote Aq addr .Pp Address of the remote .Nm auditdistd daemon. -Format is the same as for the +The format is the same as for the .Ic listen statement. -When operating in the +When operating in .Ic sender mode this address will be used to connect to the .Ic receiver . -When operating in the +When operating in .Ic receiver mode only connections from this address will be accepted. .It Ic listen Aq addr @@ -296,21 +298,22 @@ By default listens on .Pa tcp4://0.0.0.0:7878 and -.Pa tcp6://[::]:7878 -if kernel supports IPv4 and IPv6 respectively. +.Pa tcp6://[::]:7878 , +if the kernel supports IPv4 and IPv6 respectively. .It Ic keyfile Aq path .Pp -Path to a file that contains private key for TLS communication. +Path to a file that contains the private key for TLS communication. .It Ic certfile Aq path .Pp -Path to a file that contains certificate for TLS communication. +Path to a file that contains the certificate for TLS communication. .It Ic fingerprint Aq algo=hash .Pp -Finger print of the receiver's public key. -Currently only SHA256 algorithm is supported. -Certificate public key's fingerprint ready to be pasted into auditdistd +Fingerprint of the receiver's public key. +Currently only the SHA256 algorithm is supported. +The certificate public key's fingerprint ready to be pasted into the +.Nm auditdistd configuration file can be obtained by running: -.Bd -literal -offset +.Bd -literal # openssl x509 -in /etc/security/auditdistd.cert.pem -noout -fingerprint -sha256 | awk -F '[ =]' '{printf("%s=%s\\n", $1, $3)}' .Ed .It Ic password Aq password @@ -352,10 +355,10 @@ receiver { .Ed .Sh SEE ALSO .Xr audit 4 , -.Xr auditdistd 8 . +.Xr auditdistd 8 .Sh AUTHORS The .Nm auditdistd -was developed by +daemon was developed by .An Pawel Jakub Dawidek Aq pawel@dawidek.net under sponsorship of the FreeBSD Foundation. Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/auditdistd.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.h#2 $ */ #ifndef _AUDITDISTD_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/faccessat.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/faccessat.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/faccessat.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/faccessat.h#1 $ */ #ifndef _FACCESSAT_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/fstatat.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/fstatat.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/fstatat.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/fstatat.h#1 $ */ #ifndef _FSTATAT_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/openat.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/openat.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/openat.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/openat.h#1 $ */ #ifndef _OPENAT_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/parse.y ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/parse.y Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/parse.y Fri Dec 18 19:29:58 2015 (r292449) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#5 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/pjdlog.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/pjdlog.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/pjdlog.c Fri Dec 18 19:29:58 2015 (r292449) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/pjdlog.c#1 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/pjdlog.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/pjdlog.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/pjdlog.h Fri Dec 18 19:29:58 2015 (r292449) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/pjdlog.h#1 $ */ #ifndef _PJDLOG_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto.c#1 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto.h#1 $ */ #ifndef _PROTO_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_common.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_common.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_common.c Fri Dec 18 19:29:58 2015 (r292449) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_common.c#1 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_impl.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_impl.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_impl.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_impl.h#1 $ */ #ifndef _PROTO_IMPL_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_socketpair.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_socketpair.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_socketpair.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_socketpair.c#1 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_tcp.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_tcp.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_tcp.c Fri Dec 18 19:29:58 2015 (r292449) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#2 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_tls.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_tls.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_tls.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#2 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_uds.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_uds.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/proto_uds.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#2 $ */ /* UDS - UNIX Domain Socket */ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/receiver.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/receiver.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/receiver.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#3 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/renameat.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/renameat.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/renameat.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/renameat.h#1 $ */ #ifndef _RENAMEAT_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sandbox.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sandbox.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sandbox.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#3 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sandbox.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sandbox.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sandbox.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.h#1 $ */ #ifndef _SANDBOX_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sender.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sender.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sender.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#3 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sigtimedwait.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sigtimedwait.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/sigtimedwait.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sigtimedwait.h#2 $ */ #ifndef _SIGTIMEDWAIT_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/strndup.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/strndup.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/strndup.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/strndup.h#1 $ */ #ifndef _STRNDUP_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/subr.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/subr.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/subr.c Fri Dec 18 19:29:58 2015 (r292449) @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#3 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/subr.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/subr.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/subr.h Fri Dec 18 19:29:58 2015 (r292449) @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.h#1 $ */ #ifndef _AUDITDISTD_SUBR_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/synch.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/synch.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/synch.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#3 $ */ #ifndef _SYNCH_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/token.l ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/token.l Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/token.l Fri Dec 18 19:29:58 2015 (r292449) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#2 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/trail.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/trail.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/trail.c Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#3 $ */ #include Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/trail.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/trail.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/trail.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.h#1 $ */ #ifndef _AUDITDISTD_TRAIL_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/unlinkat.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/unlinkat.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditdistd/unlinkat.h Fri Dec 18 19:29:58 2015 (r292449) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/unlinkat.h#1 $ */ #ifndef _UNLINKAT_H_ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/Makefile.am ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/Makefile.am Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/Makefile.am Fri Dec 18 19:29:58 2015 (r292449) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#4 $ -## - if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) else Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.8 ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.8 Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.8 Fri Dec 18 19:29:58 2015 (r292449) @@ -23,8 +23,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#6 $ -.\" .Dd October 3, 2006 .Dt AUDITFILTERD 8 .Os Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.c Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.c Fri Dec 18 19:29:58 2015 (r292449) @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#13 $ */ /* @@ -131,7 +129,7 @@ present_rawrecord(struct timespec *ts, u } /* - * Parse the BSM into a set of tokens, which will be pased to registered + * Parse the BSM into a set of tokens, which will be passed to registered * and interested filters. */ #define MAX_TOKENS 128 /* Maximum tokens we handle per record. */ Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.h Fri Dec 18 18:36:29 2015 (r292448) +++ user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd.h Fri Dec 18 19:29:58 2015 (r292449) @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#5 $ */ #define AUDITFILTERD_CONFFILE "/etc/security/audit_filter" Modified: user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c Fri Dec 18 18:36:29 2015 (r292448) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Fri Dec 18 20:58:40 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 17A28A4B102 for ; Fri, 18 Dec 2015 20:58:40 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD37C1481; Fri, 18 Dec 2015 20:58:39 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBIKwcce023324; Fri, 18 Dec 2015 20:58:38 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBIKwcd8023313; Fri, 18 Dec 2015 20:58:38 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201512182058.tBIKwcd8023313@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Fri, 18 Dec 2015 20:58:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292451 - in user/alc/PQ_LAUNDRY/sys: dev/drm2/ttm mips/include mips/mips vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2015 20:58:40 -0000 Author: alc Date: Fri Dec 18 20:58:37 2015 New Revision: 292451 URL: https://svnweb.freebsd.org/changeset/base/292451 Log: Introduce a new mechanism for relocating pages to a different physical address and use this mechanism when: 1. kmem_alloc_{attr,contig}() can't suitable free pages in the buddy allocator's free page lists. This replaces the long-standing approach of laundering inactive and active pages, converting them into PG_CACHED pages, until there are sufficient cache/free pages to satisfy the allocation request. 2. on a 32-bit MIPS processor there are no free pages within the limited coverage of the direct map region. Make vm_phys_alloc_contig() a little smarter (and more efficient in some cases). Specifically, use vm_phys_segs[] to avoid scanning free pages lists that can't possibly contain suitable pages. Note: vm_page_cache(), et al. are now dead code on this branch. Reviewed by: kib, markj Glanced at: jhb Discussed with: jeff Sponsored by: EMC / Isilon Storage Division Differential Revision: https://reviews.freebsd.org/D4444 Modified: user/alc/PQ_LAUNDRY/sys/dev/drm2/ttm/ttm_bo.c user/alc/PQ_LAUNDRY/sys/dev/drm2/ttm/ttm_page_alloc.c user/alc/PQ_LAUNDRY/sys/mips/include/pmap.h user/alc/PQ_LAUNDRY/sys/mips/mips/pmap.c user/alc/PQ_LAUNDRY/sys/mips/mips/uma_machdep.c user/alc/PQ_LAUNDRY/sys/vm/vm_kern.c user/alc/PQ_LAUNDRY/sys/vm/vm_page.c user/alc/PQ_LAUNDRY/sys/vm/vm_page.h user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.h user/alc/PQ_LAUNDRY/sys/vm/vm_phys.c user/alc/PQ_LAUNDRY/sys/vm/vm_phys.h user/alc/PQ_LAUNDRY/sys/vm/vm_reserv.c user/alc/PQ_LAUNDRY/sys/vm/vm_reserv.h Modified: user/alc/PQ_LAUNDRY/sys/dev/drm2/ttm/ttm_bo.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/dev/drm2/ttm/ttm_bo.c Fri Dec 18 19:58:34 2015 (r292450) +++ user/alc/PQ_LAUNDRY/sys/dev/drm2/ttm/ttm_bo.c Fri Dec 18 20:58:37 2015 (r292451) @@ -1488,21 +1488,21 @@ int ttm_bo_global_init(struct drm_global struct ttm_bo_global_ref *bo_ref = container_of(ref, struct ttm_bo_global_ref, ref); struct ttm_bo_global *glob = ref->object; - int ret; + int req, ret; int tries; sx_init(&glob->device_list_mutex, "ttmdlm"); mtx_init(&glob->lru_lock, "ttmlru", NULL, MTX_DEF); glob->mem_glob = bo_ref->mem_glob; + req = VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ; tries = 0; retry: - glob->dummy_read_page = vm_page_alloc_contig(NULL, 0, - VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ, + glob->dummy_read_page = vm_page_alloc_contig(NULL, 0, req, 1, 0, VM_MAX_ADDRESS, PAGE_SIZE, 0, VM_MEMATTR_UNCACHEABLE); if (unlikely(glob->dummy_read_page == NULL)) { - if (tries < 1) { - vm_pageout_grow_cache(tries, 0, VM_MAX_ADDRESS); + if (tries < 1 && vm_page_reclaim_contig(req, 1, + 0, VM_MAX_ADDRESS, PAGE_SIZE, 0)) { tries++; goto retry; } Modified: user/alc/PQ_LAUNDRY/sys/dev/drm2/ttm/ttm_page_alloc.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/dev/drm2/ttm/ttm_page_alloc.c Fri Dec 18 19:58:34 2015 (r292450) +++ user/alc/PQ_LAUNDRY/sys/dev/drm2/ttm/ttm_page_alloc.c Fri Dec 18 20:58:37 2015 (r292451) @@ -166,13 +166,9 @@ ttm_vm_page_alloc_dma32(int req, vm_mema PAGE_SIZE, 0, memattr); if (p != NULL || tries > 2) return (p); - - /* - * Before growing the cache see if this is just a normal - * memory shortage. - */ - VM_WAIT; - vm_pageout_grow_cache(tries, 0, 0xffffffff); + if (!vm_page_reclaim_contig(req, 1, 0, 0xffffffff, + PAGE_SIZE, 0)) + VM_WAIT; } } Modified: user/alc/PQ_LAUNDRY/sys/mips/include/pmap.h ============================================================================== --- user/alc/PQ_LAUNDRY/sys/mips/include/pmap.h Fri Dec 18 19:58:34 2015 (r292450) +++ user/alc/PQ_LAUNDRY/sys/mips/include/pmap.h Fri Dec 18 20:58:37 2015 (r292451) @@ -178,7 +178,6 @@ void *pmap_kenter_temporary(vm_paddr_t p void pmap_kenter_temporary_free(vm_paddr_t pa); void pmap_flush_pvcache(vm_page_t m); int pmap_emulate_modified(pmap_t pmap, vm_offset_t va); -void pmap_grow_direct_page_cache(void); void pmap_page_set_memattr(vm_page_t, vm_memattr_t); #endif /* _KERNEL */ Modified: user/alc/PQ_LAUNDRY/sys/mips/mips/pmap.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/mips/mips/pmap.c Fri Dec 18 19:58:34 2015 (r292450) +++ user/alc/PQ_LAUNDRY/sys/mips/mips/pmap.c Fri Dec 18 20:58:37 2015 (r292451) @@ -166,6 +166,7 @@ static pv_entry_t pmap_pvh_remove(struct static vm_page_t pmap_alloc_direct_page(unsigned int index, int req); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); +static void pmap_grow_direct_page(int req); static int pmap_remove_pte(struct pmap *pmap, pt_entry_t *ptq, vm_offset_t va, pd_entry_t pde); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); @@ -1040,14 +1041,16 @@ pmap_pinit0(pmap_t pmap) bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } -void -pmap_grow_direct_page_cache() +static void +pmap_grow_direct_page(int req) { #ifdef __mips_n64 VM_WAIT; #else - vm_pageout_grow_cache(3, 0, MIPS_KSEG0_LARGEST_PHYS); + if (!vm_page_reclaim_contig(req, 1, 0, MIPS_KSEG0_LARGEST_PHYS, + PAGE_SIZE, 0)) + VM_WAIT; #endif } @@ -1077,13 +1080,15 @@ pmap_pinit(pmap_t pmap) { vm_offset_t ptdva; vm_page_t ptdpg; - int i; + int i, req_class; /* * allocate the page directory page */ - while ((ptdpg = pmap_alloc_direct_page(NUSERPGTBLS, VM_ALLOC_NORMAL)) == NULL) - pmap_grow_direct_page_cache(); + req_class = VM_ALLOC_NORMAL; + while ((ptdpg = pmap_alloc_direct_page(NUSERPGTBLS, req_class)) == + NULL) + pmap_grow_direct_page(req_class); ptdva = MIPS_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(ptdpg)); pmap->pm_segtab = (pd_entry_t *)ptdva; @@ -1107,15 +1112,17 @@ _pmap_allocpte(pmap_t pmap, unsigned pte { vm_offset_t pageva; vm_page_t m; + int req_class; /* * Find or fabricate a new pagetable page */ - if ((m = pmap_alloc_direct_page(ptepindex, VM_ALLOC_NORMAL)) == NULL) { + req_class = VM_ALLOC_NORMAL; + if ((m = pmap_alloc_direct_page(ptepindex, req_class)) == NULL) { if ((flags & PMAP_ENTER_NOSLEEP) == 0) { PMAP_UNLOCK(pmap); rw_wunlock(&pvh_global_lock); - pmap_grow_direct_page_cache(); + pmap_grow_direct_page(req_class); rw_wlock(&pvh_global_lock); PMAP_LOCK(pmap); } @@ -1241,9 +1248,10 @@ pmap_growkernel(vm_offset_t addr) vm_page_t nkpg; pd_entry_t *pde, *pdpe; pt_entry_t *pte; - int i; + int i, req_class; mtx_assert(&kernel_map->system_mtx, MA_OWNED); + req_class = VM_ALLOC_INTERRUPT; addr = roundup2(addr, NBSEG); if (addr - 1 >= kernel_map->max_offset) addr = kernel_map->max_offset; @@ -1252,7 +1260,7 @@ pmap_growkernel(vm_offset_t addr) #ifdef __mips_n64 if (*pdpe == 0) { /* new intermediate page table entry */ - nkpg = pmap_alloc_direct_page(nkpt, VM_ALLOC_INTERRUPT); + nkpg = pmap_alloc_direct_page(nkpt, req_class); if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); *pdpe = (pd_entry_t)MIPS_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(nkpg)); @@ -1272,8 +1280,13 @@ pmap_growkernel(vm_offset_t addr) /* * This index is bogus, but out of the way */ - nkpg = pmap_alloc_direct_page(nkpt, VM_ALLOC_INTERRUPT); - if (!nkpg) + nkpg = pmap_alloc_direct_page(nkpt, req_class); +#ifndef __mips_n64 + if (nkpg == NULL && vm_page_reclaim_contig(req_class, 1, + 0, MIPS_KSEG0_LARGEST_PHYS, PAGE_SIZE, 0)) + nkpg = pmap_alloc_direct_page(nkpt, req_class); +#endif + if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); nkpt++; *pde = (pd_entry_t)MIPS_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(nkpg)); Modified: user/alc/PQ_LAUNDRY/sys/mips/mips/uma_machdep.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/mips/mips/uma_machdep.c Fri Dec 18 19:58:34 2015 (r292450) +++ user/alc/PQ_LAUNDRY/sys/mips/mips/uma_machdep.c Fri Dec 18 20:58:37 2015 (r292451) @@ -53,11 +53,16 @@ uma_small_alloc(uma_zone_t zone, vm_size for (;;) { m = vm_page_alloc_freelist(VM_FREELIST_DIRECT, pflags); +#ifndef __mips_n64 + if (m == NULL && vm_page_reclaim_contig(pflags, 1, + 0, MIPS_KSEG0_LARGEST_PHYS, PAGE_SIZE, 0)) + continue; +#endif if (m == NULL) { if (wait & M_NOWAIT) return (NULL); else - pmap_grow_direct_page_cache(); + VM_WAIT; } else break; } Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_kern.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/vm_kern.c Fri Dec 18 19:58:34 2015 (r292450) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_kern.c Fri Dec 18 20:58:37 2015 (r292451) @@ -181,7 +181,10 @@ retry: if (m == NULL) { VM_OBJECT_WUNLOCK(object); if (tries < ((flags & M_NOWAIT) != 0 ? 1 : 3)) { - vm_pageout_grow_cache(tries, low, high); + if (!vm_page_reclaim_contig(pflags, 1, + low, high, PAGE_SIZE, 0) && + (flags & M_WAITOK) != 0) + VM_WAIT; VM_OBJECT_WLOCK(object); tries++; goto retry; @@ -217,6 +220,7 @@ kmem_alloc_contig(struct vmem *vmem, vm_ vm_offset_t addr, tmp; vm_ooffset_t offset; vm_page_t end_m, m; + u_long npages; int pflags, tries; size = round_page(size); @@ -224,15 +228,18 @@ kmem_alloc_contig(struct vmem *vmem, vm_ return (0); offset = addr - VM_MIN_KERNEL_ADDRESS; pflags = malloc2vm_flags(flags) | VM_ALLOC_NOBUSY | VM_ALLOC_WIRED; + npages = atop(size); VM_OBJECT_WLOCK(object); tries = 0; retry: m = vm_page_alloc_contig(object, OFF_TO_IDX(offset), pflags, - atop(size), low, high, alignment, boundary, memattr); + npages, low, high, alignment, boundary, memattr); if (m == NULL) { VM_OBJECT_WUNLOCK(object); if (tries < ((flags & M_NOWAIT) != 0 ? 1 : 3)) { - vm_pageout_grow_cache(tries, low, high); + if (!vm_page_reclaim_contig(pflags, npages, low, high, + alignment, boundary) && (flags & M_WAITOK) != 0) + VM_WAIT; VM_OBJECT_WLOCK(object); tries++; goto retry; @@ -240,7 +247,7 @@ retry: vmem_free(vmem, addr, size); return (0); } - end_m = m + atop(size); + end_m = m + npages; tmp = addr; for (; m < end_m; m++) { if ((flags & M_ZERO) && (m->flags & PG_ZERO) == 0) Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_page.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/vm_page.c Fri Dec 18 19:58:34 2015 (r292450) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_page.c Fri Dec 18 20:58:37 2015 (r292451) @@ -158,11 +158,14 @@ static struct vnode *vm_page_alloc_init( static void vm_page_cache_turn_free(vm_page_t m); static void vm_page_clear_dirty_mask(vm_page_t m, vm_page_bits_t pagebits); static void vm_page_enqueue(uint8_t queue, vm_page_t m); +static void vm_page_free_wakeup(void); static void vm_page_init_fakepg(void *dummy); static int vm_page_insert_after(vm_page_t m, vm_object_t object, vm_pindex_t pindex, vm_page_t mpred); static void vm_page_insert_radixdone(vm_page_t m, vm_object_t object, vm_page_t mpred); +static int vm_page_reclaim_run(int req_class, u_long npages, vm_page_t m_run, + vm_paddr_t high); SYSINIT(vm_page, SI_SUB_VM, SI_ORDER_SECOND, vm_page_init_fakepg, NULL); @@ -2097,6 +2100,592 @@ vm_page_alloc_freelist(int flind, int re return (m); } +#define VPSC_ANY 0 /* No restrictions. */ +#define VPSC_NORESERV 1 /* Skip reservations; implies VPSC_NOSUPER. */ +#define VPSC_NOSUPER 2 /* Skip superpages. */ + +/* + * vm_page_scan_contig: + * + * Scan vm_page_array[] between the specified entries "m_start" and + * "m_end" for a run of contiguous physical pages that satisfy the + * specified conditions, and return the lowest page in the run. The + * specified "alignment" determines the alignment of the lowest physical + * page in the run. If the specified "boundary" is non-zero, then the + * run of physical pages cannot span a physical address that is a + * multiple of "boundary". + * + * "m_end" is never dereferenced, so it need not point to a vm_page + * structure within vm_page_array[]. + * + * "npages" must be greater than zero. "m_start" and "m_end" must not + * span a hole (or discontiguity) in the physical address space. Both + * "alignment" and "boundary" must be a power of two. + */ +vm_page_t +vm_page_scan_contig(u_long npages, vm_page_t m_start, vm_page_t m_end, + u_long alignment, vm_paddr_t boundary, int options) +{ + struct mtx *m_mtx, *new_mtx; + vm_object_t object; + vm_paddr_t pa; + vm_page_t m, m_run; +#if VM_NRESERVLEVEL > 0 + int level; +#endif + int m_inc, order, run_ext, run_len; + + KASSERT(npages > 0, ("npages is 0")); + KASSERT(powerof2(alignment), ("alignment is not a power of 2")); + KASSERT(powerof2(boundary), ("boundary is not a power of 2")); + m_run = NULL; + run_len = 0; + m_mtx = NULL; + for (m = m_start; m < m_end && run_len < npages; m += m_inc) { + KASSERT((m->flags & (PG_FICTITIOUS | PG_MARKER)) == 0, + ("page %p is PG_FICTITIOUS or PG_MARKER", m)); + + /* + * If the current page would be the start of a run, check its + * physical address against the end, alignment, and boundary + * conditions. If it doesn't satisfy these conditions, either + * terminate the scan or advance to the next page that + * satisfies the failed condition. + */ + if (run_len == 0) { + KASSERT(m_run == NULL, ("m_run != NULL")); + if (m + npages > m_end) + break; + pa = VM_PAGE_TO_PHYS(m); + if ((pa & (alignment - 1)) != 0) { + m_inc = atop(roundup2(pa, alignment) - pa); + continue; + } + if (((pa ^ (pa + ptoa(npages) - 1)) & ~(boundary - + 1)) != 0) { + m_inc = atop(roundup2(pa, boundary) - pa); + continue; + } + } else + KASSERT(m_run != NULL, ("m_run == NULL")); + + /* + * Avoid releasing and reacquiring the same page lock. + */ + new_mtx = vm_page_lockptr(m); + if (m_mtx != new_mtx) { + if (m_mtx != NULL) + mtx_unlock(m_mtx); + m_mtx = new_mtx; + mtx_lock(m_mtx); + } + m_inc = 1; +retry: + if (m->wire_count != 0 || m->hold_count != 0) + run_ext = 0; +#if VM_NRESERVLEVEL > 0 + else if ((level = vm_reserv_level(m)) >= 0 && + (options & VPSC_NORESERV) != 0) { + run_ext = 0; + /* Advance to the end of the reservation. */ + pa = VM_PAGE_TO_PHYS(m); + m_inc = atop(roundup2(pa + 1, vm_reserv_size(level)) - + pa); + } +#endif + else if ((object = m->object) != NULL) { + /* + * The page is considered eligible for relocation if + * and only if it could be laundered or reclaimed by + * the page daemon. + */ + if (!VM_OBJECT_TRYRLOCK(object)) { + mtx_unlock(m_mtx); + VM_OBJECT_RLOCK(object); + mtx_lock(m_mtx); + if (m->object != object) { + /* + * The page may have been freed. + */ + VM_OBJECT_RUNLOCK(object); + goto retry; + } else if (m->wire_count != 0 || + m->hold_count != 0) { + run_ext = 0; + goto unlock; + } + } + KASSERT((m->flags & PG_UNHOLDFREE) == 0, + ("page %p is PG_UNHOLDFREE", m)); + /* Don't care: PG_NODUMP, PG_WINATCFLS, PG_ZERO. */ + if (object->type != OBJT_DEFAULT && + object->type != OBJT_SWAP && + object->type != OBJT_VNODE) + run_ext = 0; + else if ((m->flags & PG_CACHED) != 0 || + m != vm_page_lookup(object, m->pindex)) { + /* + * The page is cached or recently converted + * from cached to free. + */ +#if VM_NRESERVLEVEL > 0 + if (level >= 0) { + /* + * The page is reserved. Extend the + * current run by one page. + */ + run_ext = 1; + } else +#endif + if ((order = m->order) < VM_NFREEORDER) { + /* + * The page is enqueued in the + * physical memory allocator's cache/ + * free page queues. Moreover, it is + * the first page in a power-of-two- + * sized run of contiguous cache/free + * pages. Add these pages to the end + * of the current run, and jump + * ahead. + */ + run_ext = 1 << order; + m_inc = 1 << order; + } else + run_ext = 0; +#if VM_NRESERVLEVEL > 0 + } else if ((options & VPSC_NOSUPER) != 0 && + (level = vm_reserv_level_iffullpop(m)) >= 0) { + run_ext = 0; + /* Advance to the end of the superpage. */ + pa = VM_PAGE_TO_PHYS(m); + m_inc = atop(roundup2(pa + 1, + vm_reserv_size(level)) - pa); +#endif + } else if (object->memattr == VM_MEMATTR_DEFAULT && + m->queue != PQ_NONE && !vm_page_busied(m)) { + /* + * The page is allocated but eligible for + * relocation. Extend the current run by one + * page. + */ + KASSERT(pmap_page_get_memattr(m) == + VM_MEMATTR_DEFAULT, + ("page %p has an unexpected memattr", m)); + KASSERT((m->oflags & (VPO_SWAPINPROG | + VPO_SWAPSLEEP | VPO_UNMANAGED)) == 0, + ("page %p has unexpected oflags", m)); + /* Don't care: VPO_NOSYNC. */ + run_ext = 1; + } else + run_ext = 0; +unlock: + VM_OBJECT_RUNLOCK(object); +#if VM_NRESERVLEVEL > 0 + } else if (level >= 0) { + /* + * The page is reserved but not yet allocated. In + * other words, it is still cached or free. Extend + * the current run by one page. + */ + run_ext = 1; +#endif + } else if ((order = m->order) < VM_NFREEORDER) { + /* + * The page is enqueued in the physical memory + * allocator's cache/free page queues. Moreover, it + * is the first page in a power-of-two-sized run of + * contiguous cache/free pages. Add these pages to + * the end of the current run, and jump ahead. + */ + run_ext = 1 << order; + m_inc = 1 << order; + } else { + /* + * Skip the page for one of the following reasons: (1) + * It is enqueued in the physical memory allocator's + * cache/free page queues. However, it is not the + * first page in a run of contiguous cache/free pages. + * (This case rarely occurs because the scan is + * performed in ascending order.) (2) It is not + * reserved, and it is transitioning from free to + * allocated. (Conversely, the transition from + * allocated to free for managed pages is blocked by + * the page lock.) (3) It is allocated but not + * contained by an object and not wired, e.g., + * allocated by Xen's balloon driver. + */ + run_ext = 0; + } + + /* + * Extend or reset the current run of pages. + */ + if (run_ext > 0) { + if (run_len == 0) + m_run = m; + run_len += run_ext; + } else { + if (run_len > 0) { + m_run = NULL; + run_len = 0; + } + } + } + if (m_mtx != NULL) + mtx_unlock(m_mtx); + if (run_len >= npages) + return (m_run); + return (NULL); +} + +/* + * vm_page_reclaim_run: + * + * Try to relocate each of the allocated virtual pages within the + * specified run of physical pages to a new physical address. Free the + * physical pages underlying the relocated virtual pages. A virtual page + * is relocatable if and only if it could be laundered or reclaimed by + * the page daemon. Whenever possible, a virtual page is relocated to a + * physical address above "high". + * + * Returns 0 if every physical page within the run was already free or + * just freed by a successful relocation. Otherwise, returns a non-zero + * value indicating why the last attempt to relocate a virtual page was + * unsuccessful. + * + * "req_class" must be an allocation class. + */ +static int +vm_page_reclaim_run(int req_class, u_long npages, vm_page_t m_run, + vm_paddr_t high) +{ + struct mtx *m_mtx, *new_mtx; + struct spglist free; + vm_object_t object; + vm_paddr_t pa; + vm_page_t m, m_end, m_new; + int error, order, req; + + KASSERT((req_class & VM_ALLOC_CLASS_MASK) == req_class, + ("req_class is not an allocation class")); + SLIST_INIT(&free); + error = 0; + m = m_run; + m_end = m_run + npages; + m_mtx = NULL; + for (; error == 0 && m < m_end; m++) { + KASSERT((m->flags & (PG_FICTITIOUS | PG_MARKER)) == 0, + ("page %p is PG_FICTITIOUS or PG_MARKER", m)); + + /* + * Avoid releasing and reacquiring the same page lock. + */ + new_mtx = vm_page_lockptr(m); + if (m_mtx != new_mtx) { + if (m_mtx != NULL) + mtx_unlock(m_mtx); + m_mtx = new_mtx; + mtx_lock(m_mtx); + } +retry: + if (m->wire_count != 0 || m->hold_count != 0) + error = EBUSY; + else if ((object = m->object) != NULL) { + /* + * The page is relocated if and only if it could be + * laundered or reclaimed by the page daemon. + */ + if (!VM_OBJECT_TRYWLOCK(object)) { + mtx_unlock(m_mtx); + VM_OBJECT_WLOCK(object); + mtx_lock(m_mtx); + if (m->object != object) { + /* + * The page may have been freed. + */ + VM_OBJECT_WUNLOCK(object); + goto retry; + } else if (m->wire_count != 0 || + m->hold_count != 0) { + error = EBUSY; + goto unlock; + } + } + KASSERT((m->flags & PG_UNHOLDFREE) == 0, + ("page %p is PG_UNHOLDFREE", m)); + /* Don't care: PG_NODUMP, PG_WINATCFLS, PG_ZERO. */ + if (object->type != OBJT_DEFAULT && + object->type != OBJT_SWAP && + object->type != OBJT_VNODE) + error = EINVAL; + else if ((m->flags & PG_CACHED) != 0 || + m != vm_page_lookup(object, m->pindex)) { + /* + * The page is cached or recently converted + * from cached to free. + */ + VM_OBJECT_WUNLOCK(object); + goto cached; + } else if (object->memattr != VM_MEMATTR_DEFAULT) + error = EINVAL; + else if (m->queue != PQ_NONE && !vm_page_busied(m)) { + KASSERT(pmap_page_get_memattr(m) == + VM_MEMATTR_DEFAULT, + ("page %p has an unexpected memattr", m)); + KASSERT((m->oflags & (VPO_SWAPINPROG | + VPO_SWAPSLEEP | VPO_UNMANAGED)) == 0, + ("page %p has unexpected oflags", m)); + /* Don't care: VPO_NOSYNC. */ + if (m->valid != 0) { + /* + * First, try to allocate a new page + * that is above "high". Failing + * that, try to allocate a new page + * that is below "m_run". Allocate + * the new page between the end of + * "m_run" and "high" only as a last + * resort. + */ + req = req_class | VM_ALLOC_NOOBJ; + if ((m->flags & PG_NODUMP) != 0) + req |= VM_ALLOC_NODUMP; + if (trunc_page(high) != + ~(vm_paddr_t)PAGE_MASK) { + m_new = vm_page_alloc_contig( + NULL, 0, req, 1, + round_page(high), + ~(vm_paddr_t)0, + PAGE_SIZE, 0, + VM_MEMATTR_DEFAULT); + } else + m_new = NULL; + if (m_new == NULL) { + pa = VM_PAGE_TO_PHYS(m_run); + m_new = vm_page_alloc_contig( + NULL, 0, req, 1, + 0, pa - 1, PAGE_SIZE, 0, + VM_MEMATTR_DEFAULT); + } + if (m_new == NULL) { + pa += ptoa(npages); + m_new = vm_page_alloc_contig( + NULL, 0, req, 1, + pa, high, PAGE_SIZE, 0, + VM_MEMATTR_DEFAULT); + } + if (m_new == NULL) { + error = ENOMEM; + goto unlock; + } + KASSERT(m_new->wire_count == 0, + ("page %p is wired", m)); + + /* + * Replace "m" with the new page. For + * vm_page_replace(), "m" must be busy + * and dequeued. Finally, change "m" + * as if vm_page_free() was called. + */ + if (object->ref_count != 0) + pmap_remove_all(m); + m_new->aflags = m->aflags; + KASSERT(m_new->oflags == VPO_UNMANAGED, + ("page %p is managed", m)); + m_new->oflags = m->oflags & VPO_NOSYNC; + pmap_copy_page(m, m_new); + m_new->valid = m->valid; + m_new->dirty = m->dirty; + m->flags &= ~PG_ZERO; + vm_page_xbusy(m); + vm_page_remque(m); + vm_page_replace_checked(m_new, object, + m->pindex, m); + m->valid = 0; + vm_page_undirty(m); + + /* + * The new page must be deactivated + * before the object is unlocked. + */ + new_mtx = vm_page_lockptr(m_new); + if (m_mtx != new_mtx) { + mtx_unlock(m_mtx); + m_mtx = new_mtx; + mtx_lock(m_mtx); + } + vm_page_deactivate(m_new); + } else { + m->flags &= ~PG_ZERO; + vm_page_remque(m); + vm_page_remove(m); + KASSERT(m->dirty == 0, + ("page %p is dirty", m)); + } + SLIST_INSERT_HEAD(&free, m, plinks.s.ss); + } else + error = EBUSY; +unlock: + VM_OBJECT_WUNLOCK(object); + } else { +cached: + mtx_lock(&vm_page_queue_free_mtx); + order = m->order; + if (order < VM_NFREEORDER) { + /* + * The page is enqueued in the physical memory + * allocator's cache/free page queues. + * Moreover, it is the first page in a power- + * of-two-sized run of contiguous cache/free + * pages. Jump ahead to the last page within + * that run, and continue from there. + */ + m += (1 << order) - 1; + } +#if VM_NRESERVLEVEL > 0 + else if (vm_reserv_is_page_free(m)) + order = 0; +#endif + mtx_unlock(&vm_page_queue_free_mtx); + if (order == VM_NFREEORDER) + error = EINVAL; + } + } + if (m_mtx != NULL) + mtx_unlock(m_mtx); + if ((m = SLIST_FIRST(&free)) != NULL) { + mtx_lock(&vm_page_queue_free_mtx); + do { + SLIST_REMOVE_HEAD(&free, plinks.s.ss); + vm_phys_freecnt_adj(m, 1); +#if VM_NRESERVLEVEL > 0 + if (!vm_reserv_free_page(m)) +#else + if (true) +#endif + vm_phys_free_pages(m, 0); + } while ((m = SLIST_FIRST(&free)) != NULL); + vm_page_zero_idle_wakeup(); + vm_page_free_wakeup(); + mtx_unlock(&vm_page_queue_free_mtx); + } + return (error); +} + +#define NRUNS 16 + +CTASSERT(powerof2(NRUNS)); + +#define RUN_INDEX(count) ((count) & (NRUNS - 1)) + +#define MIN_RECLAIM 8 + +/* + * vm_page_reclaim_contig: + * + * Reclaim allocated, contiguous physical memory satisfying the specified + * conditions by relocating the virtual pages using that physical memory. + * Returns true if reclamation is successful and false otherwise. Since + * relocation requires the allocation of physical pages, reclamation may + * fail due to a shortage of cache/free pages. When reclamation fails, + * callers are expected to perform VM_WAIT before retrying a failed + * allocation operation, e.g., vm_page_alloc_contig(). + * + * The caller must always specify an allocation class through "req". + * + * allocation classes: + * VM_ALLOC_NORMAL normal process request + * VM_ALLOC_SYSTEM system *really* needs a page + * VM_ALLOC_INTERRUPT interrupt time request + * + * The optional allocation flags are ignored. + * + * "npages" must be greater than zero. Both "alignment" and "boundary" + * must be a power of two. + */ +bool +vm_page_reclaim_contig(int req, u_long npages, vm_paddr_t low, vm_paddr_t high, + u_long alignment, vm_paddr_t boundary) +{ + vm_paddr_t curr_low; + vm_page_t m_run, m_runs[NRUNS]; + u_long count, reclaimed; + int error, i, options, req_class; + + KASSERT(npages > 0, ("npages is 0")); + KASSERT(powerof2(alignment), ("alignment is not a power of 2")); + KASSERT(powerof2(boundary), ("boundary is not a power of 2")); + req_class = req & VM_ALLOC_CLASS_MASK; + + /* + * The page daemon is allowed to dig deeper into the free page list. + */ + if (curproc == pageproc && req_class != VM_ALLOC_INTERRUPT) + req_class = VM_ALLOC_SYSTEM; + + /* + * Return if the number of cached and free pages cannot satisfy the + * requested allocation. + */ + count = vm_cnt.v_free_count + vm_cnt.v_cache_count; + if (count < npages + vm_cnt.v_free_reserved || (count < npages + + vm_cnt.v_interrupt_free_min && req_class == VM_ALLOC_SYSTEM) || + (count < npages && req_class == VM_ALLOC_INTERRUPT)) + return (false); + + /* + * Scan up to three times, relaxing the restrictions ("options") on + * the reclamation of reservations and superpages each time. + */ + for (options = VPSC_NORESERV;;) { + /* + * Find the highest runs that satisfy the given constraints + * and restrictions, and record them in "m_runs". + */ + curr_low = low; + count = 0; + for (;;) { + m_run = vm_phys_scan_contig(npages, curr_low, high, + alignment, boundary, options); + if (m_run == NULL) + break; + curr_low = VM_PAGE_TO_PHYS(m_run) + ptoa(npages); + m_runs[RUN_INDEX(count)] = m_run; + count++; + } + + /* + * Reclaim the highest runs in LIFO (descending) order until + * the number of reclaimed pages, "reclaimed", is at least + * MIN_RECLAIM. Reset "reclaimed" each time because each + * reclamation is idempotent, and runs will (likely) recur + * from one scan to the next as restrictions are relaxed. + */ + reclaimed = 0; + for (i = 0; count > 0 && i < NRUNS; i++) { + count--; + m_run = m_runs[RUN_INDEX(count)]; + error = vm_page_reclaim_run(req_class, npages, m_run, + high); + if (error == 0) { + reclaimed += npages; + if (reclaimed >= MIN_RECLAIM) + return (true); + } + } + + /* + * Either relax the restrictions on the next scan or return if + * the last scan had no restrictions. + */ + if (options == VPSC_NORESERV) + options = VPSC_NOSUPER; + else if (options == VPSC_NOSUPER) + options = VPSC_ANY; + else if (options == VPSC_ANY) + return (reclaimed != 0); + } +} + /* * vm_wait: (also see VM_WAIT macro) * Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_page.h ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/vm_page.h Fri Dec 18 19:58:34 2015 (r292450) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_page.h Fri Dec 18 20:58:37 2015 (r292451) @@ -475,6 +475,8 @@ vm_page_t vm_page_prev(vm_page_t m); boolean_t vm_page_ps_is_valid(vm_page_t m); void vm_page_putfake(vm_page_t m); void vm_page_readahead_finish(vm_page_t m); +bool vm_page_reclaim_contig(int req, u_long npages, vm_paddr_t low, + vm_paddr_t high, u_long alignment, vm_paddr_t boundary); void vm_page_reference(vm_page_t m); void vm_page_remove (vm_page_t); int vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t); @@ -483,6 +485,8 @@ vm_page_t vm_page_replace(vm_page_t mnew void vm_page_requeue(vm_page_t m); void vm_page_requeue_locked(vm_page_t m); int vm_page_sbusied(vm_page_t m); +vm_page_t vm_page_scan_contig(u_long npages, vm_page_t m_start, + vm_page_t m_end, u_long alignment, vm_paddr_t boundary, int options); void vm_page_set_valid_range(vm_page_t m, int base, int size); int vm_page_sleep_if_busy(vm_page_t m, const char *msg); vm_offset_t vm_page_startup(vm_offset_t vaddr); Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Fri Dec 18 19:58:34 2015 (r292450) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Fri Dec 18 20:58:37 2015 (r292451) @@ -239,8 +239,6 @@ SYSCTL_INT(_vm, OID_AUTO, max_wired, CTLFLAG_RW, &vm_page_max_wired, 0, "System-wide limit to wired page count"); static boolean_t vm_pageout_fallback_object_lock(vm_page_t, vm_page_t *); -static boolean_t vm_pageout_launder(struct vm_pagequeue *pq, int, vm_paddr_t, - vm_paddr_t); static void vm_pageout_launder1(struct vm_domain *vmd); static void vm_pageout_laundry_worker(void *arg); #if !defined(NO_SWAPPING) @@ -601,170 +599,6 @@ vm_pageout_flush(vm_page_t *mc, int coun return (numpagedout); } -static boolean_t -vm_pageout_launder(struct vm_pagequeue *pq, int tries, vm_paddr_t low, - vm_paddr_t high) -{ - struct mount *mp; - struct vnode *vp; - vm_object_t object; - vm_paddr_t pa; - vm_page_t m, m_tmp, next; - int lockmode; - - vm_pagequeue_lock(pq); - TAILQ_FOREACH_SAFE(m, &pq->pq_pl, plinks.q, next) { - if ((m->flags & PG_MARKER) != 0) - continue; - pa = VM_PAGE_TO_PHYS(m); - if (pa < low || pa + PAGE_SIZE > high) - continue; - if (!vm_pageout_page_lock(m, &next) || m->hold_count != 0) { - vm_page_unlock(m); - continue; - } - object = m->object; - if ((!VM_OBJECT_TRYWLOCK(object) && - (!vm_pageout_fallback_object_lock(m, &next) || - m->hold_count != 0)) || vm_page_busied(m)) { - vm_page_unlock(m); - VM_OBJECT_WUNLOCK(object); - continue; - } - vm_page_test_dirty(m); - if (m->dirty == 0 && object->ref_count != 0) - pmap_remove_all(m); - if (m->dirty != 0) { - vm_page_unlock(m); - if (tries == 0 || (object->flags & OBJ_DEAD) != 0) { - VM_OBJECT_WUNLOCK(object); - continue; - } - if (object->type == OBJT_VNODE) { - vm_pagequeue_unlock(pq); - vp = object->handle; - vm_object_reference_locked(object); - VM_OBJECT_WUNLOCK(object); - (void)vn_start_write(vp, &mp, V_WAIT); - lockmode = MNT_SHARED_WRITES(vp->v_mount) ? - LK_SHARED : LK_EXCLUSIVE; - vn_lock(vp, lockmode | LK_RETRY); - VM_OBJECT_WLOCK(object); - vm_object_page_clean(object, 0, 0, OBJPC_SYNC); - VM_OBJECT_WUNLOCK(object); - VOP_UNLOCK(vp, 0); - vm_object_deallocate(object); - vn_finished_write(mp); - return (TRUE); - } else if (object->type == OBJT_SWAP || - object->type == OBJT_DEFAULT) { - vm_pagequeue_unlock(pq); - m_tmp = m; - vm_pageout_flush(&m_tmp, 1, VM_PAGER_PUT_SYNC, - 0, NULL, NULL); - VM_OBJECT_WUNLOCK(object); - return (TRUE); - } - } else { - /* - * Dequeue here to prevent lock recursion in - * vm_page_cache(). - */ - vm_page_dequeue_locked(m); - vm_page_cache(m); - vm_page_unlock(m); - } - VM_OBJECT_WUNLOCK(object); - } - vm_pagequeue_unlock(pq); - return (FALSE); -} - -/* - * Increase the number of cached pages. The specified value, "tries", - * determines which categories of pages are cached: - * - * 0: All clean, inactive pages within the specified physical address range - * are cached. Will not sleep. - * 1: The vm_lowmem handlers are called. All inactive pages within - * the specified physical address range are cached. May sleep. - * 2: The vm_lowmem handlers are called. All inactive and active pages - * within the specified physical address range are cached. May sleep. - */ -void -vm_pageout_grow_cache(int tries, vm_paddr_t low, vm_paddr_t high) -{ - int actl, actmax, inactl, inactmax, dom, initial_dom; - static int start_dom = 0; - - if (tries > 0) { - /* - * Decrease registered cache sizes. The vm_lowmem handlers - * may acquire locks and/or sleep, so they can only be invoked - * when "tries" is greater than zero. - */ - SDT_PROBE0(vm, , , vm__lowmem_cache); - EVENTHANDLER_INVOKE(vm_lowmem, 0); - - /* - * We do this explicitly after the caches have been drained - * above. - */ - uma_reclaim(); - } - - /* - * Make the next scan start on the next domain. - */ - initial_dom = atomic_fetchadd_int(&start_dom, 1) % vm_ndomains; - - inactl = 0; - inactmax = vm_cnt.v_inactive_count; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Fri Dec 18 21:18:09 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E817A4BCE1 for ; Fri, 18 Dec 2015 21:18:09 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1984F149D; Fri, 18 Dec 2015 21:18:09 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBILI8Mx029002; Fri, 18 Dec 2015 21:18:08 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBILI8PN029000; Fri, 18 Dec 2015 21:18:08 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201512182118.tBILI8PN029000@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Fri, 18 Dec 2015 21:18:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292452 - user/alc/PQ_LAUNDRY/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2015 21:18:09 -0000 Author: alc Date: Fri Dec 18 21:18:07 2015 New Revision: 292452 URL: https://svnweb.freebsd.org/changeset/base/292452 Log: Retire vm_page_cache(). Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_page.c user/alc/PQ_LAUNDRY/sys/vm/vm_page.h Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_page.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/vm_page.c Fri Dec 18 20:58:37 2015 (r292451) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_page.c Fri Dec 18 21:18:07 2015 (r292452) @@ -3224,111 +3224,6 @@ vm_page_try_to_free(vm_page_t m) } /* - * vm_page_cache - * - * Put the specified page onto the page cache queue (if appropriate). - * - * The object and page must be locked. - */ -void -vm_page_cache(vm_page_t m) -{ - vm_object_t object; - boolean_t cache_was_empty; - - vm_page_lock_assert(m, MA_OWNED); - object = m->object; - VM_OBJECT_ASSERT_WLOCKED(object); - if (vm_page_busied(m) || (m->oflags & VPO_UNMANAGED) || - m->hold_count || m->wire_count) - panic("vm_page_cache: attempting to cache busy page"); - KASSERT(!pmap_page_is_mapped(m), - ("vm_page_cache: page %p is mapped", m)); - KASSERT(m->dirty == 0, ("vm_page_cache: page %p is dirty", m)); - if (m->valid == 0 || object->type == OBJT_DEFAULT || - (object->type == OBJT_SWAP && - !vm_pager_has_page(object, m->pindex, NULL, NULL))) { - /* - * Hypothesis: A cache-eligible page belonging to a - * default object or swap object but without a backing - * store must be zero filled. - */ - vm_page_free(m); - return; - } - KASSERT((m->flags & PG_CACHED) == 0, - ("vm_page_cache: page %p is already cached", m)); - - /* - * Remove the page from the paging queues. - */ - vm_page_remque(m); - - /* - * Remove the page from the object's collection of resident - * pages. - */ - vm_radix_remove(&object->rtree, m->pindex); - TAILQ_REMOVE(&object->memq, m, listq); - object->resident_page_count--; - - /* - * Restore the default memory attribute to the page. - */ - if (pmap_page_get_memattr(m) != VM_MEMATTR_DEFAULT) - pmap_page_set_memattr(m, VM_MEMATTR_DEFAULT); - - /* - * Insert the page into the object's collection of cached pages - * and the physical memory allocator's cache/free page queues. - */ - m->flags &= ~PG_ZERO; - mtx_lock(&vm_page_queue_free_mtx); - cache_was_empty = vm_radix_is_empty(&object->cache); - if (vm_radix_insert(&object->cache, m)) { - mtx_unlock(&vm_page_queue_free_mtx); - if (object->resident_page_count == 0) - vdrop(object->handle); - m->object = NULL; - vm_page_free(m); - return; - } - - /* - * The above call to vm_radix_insert() could reclaim the one pre- - * existing cached page from this object, resulting in a call to - * vdrop(). - */ - if (!cache_was_empty) - cache_was_empty = vm_radix_is_singleton(&object->cache); - - m->flags |= PG_CACHED; - vm_cnt.v_cache_count++; - PCPU_INC(cnt.v_tcached); -#if VM_NRESERVLEVEL > 0 - if (!vm_reserv_free_page(m)) { -#else - if (TRUE) { -#endif - vm_phys_free_pages(m, 0); - } - vm_page_free_wakeup(); - mtx_unlock(&vm_page_queue_free_mtx); - - /* - * Increment the vnode's hold count if this is the object's only - * cached page. Decrement the vnode's hold count if this was - * the object's only resident page. - */ - if (object->type == OBJT_VNODE) { - if (cache_was_empty && object->resident_page_count != 0) - vhold(object->handle); - else if (!cache_was_empty && object->resident_page_count == 0) - vdrop(object->handle); - } -} - -/* * vm_page_advise * * Deactivate or do nothing, as appropriate. Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_page.h ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/vm_page.h Fri Dec 18 20:58:37 2015 (r292451) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_page.h Fri Dec 18 21:18:07 2015 (r292452) @@ -453,7 +453,6 @@ vm_page_t vm_page_alloc_contig(vm_object vm_paddr_t boundary, vm_memattr_t memattr); vm_page_t vm_page_alloc_freelist(int, int); vm_page_t vm_page_grab (vm_object_t, vm_pindex_t, int); -void vm_page_cache(vm_page_t); void vm_page_cache_free(vm_object_t, vm_pindex_t, vm_pindex_t); void vm_page_cache_transfer(vm_object_t, vm_pindex_t, vm_object_t); int vm_page_try_to_free (vm_page_t); From owner-svn-src-user@freebsd.org Sat Dec 19 01:37:21 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C91BBA4C0E8 for ; Sat, 19 Dec 2015 01:37:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 972111A2A; Sat, 19 Dec 2015 01:37:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBJ1bKUG005181; Sat, 19 Dec 2015 01:37:20 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBJ1bKJV005180; Sat, 19 Dec 2015 01:37:20 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201512190137.tBJ1bKJV005180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sat, 19 Dec 2015 01:37:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292458 - user/alc/PQ_LAUNDRY/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2015 01:37:21 -0000 Author: markj Date: Sat Dec 19 01:37:20 2015 New Revision: 292458 URL: https://svnweb.freebsd.org/changeset/base/292458 Log: Forcibly swapped-in pages should go in the laundry. Discussed with: alc Modified: user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Modified: user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Sat Dec 19 01:24:07 2015 (r292457) +++ user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Sat Dec 19 01:37:20 2015 (r292458) @@ -1609,7 +1609,7 @@ swap_pager_isswapped(vm_object_t object, * * This routine dissociates the page at the given index within a * swap block from its backing store, paging it in if necessary. - * If the page is paged in, it is placed in the inactive queue, + * If the page is paged in, it is placed in the laundry queue, * since it had its backing store ripped out from under it. * We also attempt to swap in all other pages in the swap block, * we only guarantee that the one at the specified index is @@ -1641,7 +1641,7 @@ swp_pager_force_pagein(vm_object_t objec vm_object_pip_wakeup(object); vm_page_dirty(m); vm_page_lock(m); - vm_page_deactivate(m); + vm_page_laundry(m); vm_page_unlock(m); vm_page_xunbusy(m); vm_pager_page_unswapped(m); From owner-svn-src-user@freebsd.org Sat Dec 19 01:45:51 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 59706A4C678 for ; Sat, 19 Dec 2015 01:45:51 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28C64119A; Sat, 19 Dec 2015 01:45:51 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBJ1jo0b008524; Sat, 19 Dec 2015 01:45:50 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBJ1joWa008523; Sat, 19 Dec 2015 01:45:50 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201512190145.tBJ1joWa008523@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sat, 19 Dec 2015 01:45:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292459 - user/alc/PQ_LAUNDRY/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2015 01:45:51 -0000 Author: markj Date: Sat Dec 19 01:45:50 2015 New Revision: 292459 URL: https://svnweb.freebsd.org/changeset/base/292459 Log: Fix the typo in r292458. Modified: user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Modified: user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Sat Dec 19 01:37:20 2015 (r292458) +++ user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Sat Dec 19 01:45:50 2015 (r292459) @@ -1641,7 +1641,7 @@ swp_pager_force_pagein(vm_object_t objec vm_object_pip_wakeup(object); vm_page_dirty(m); vm_page_lock(m); - vm_page_laundry(m); + vm_page_launder(m); vm_page_unlock(m); vm_page_xunbusy(m); vm_pager_page_unswapped(m); From owner-svn-src-user@freebsd.org Sat Dec 19 19:00:26 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25346A4C7FD for ; Sat, 19 Dec 2015 19:00:26 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC7B21511; Sat, 19 Dec 2015 19:00:25 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBJJ0PoB013657; Sat, 19 Dec 2015 19:00:25 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBJJ0OJ8013647; Sat, 19 Dec 2015 19:00:24 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201512191900.tBJJ0OJ8013647@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sat, 19 Dec 2015 19:00:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292470 - in user/alc/PQ_LAUNDRY: bin/ed share/colldef share/ctypedef share/monetdef share/msgdef share/numericdef share/timedef sys/powerpc/pseries tools/tools/locale/tools usr.sbin/ndp X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2015 19:00:26 -0000 Author: alc Date: Sat Dec 19 19:00:24 2015 New Revision: 292470 URL: https://svnweb.freebsd.org/changeset/base/292470 Log: MFhead (loop back the page relocation commit) Modified: user/alc/PQ_LAUNDRY/bin/ed/main.c user/alc/PQ_LAUNDRY/share/colldef/Makefile user/alc/PQ_LAUNDRY/share/ctypedef/Makefile user/alc/PQ_LAUNDRY/share/monetdef/Makefile user/alc/PQ_LAUNDRY/share/msgdef/Makefile user/alc/PQ_LAUNDRY/share/numericdef/Makefile user/alc/PQ_LAUNDRY/share/timedef/Makefile user/alc/PQ_LAUNDRY/sys/powerpc/pseries/phyp_llan.c user/alc/PQ_LAUNDRY/tools/tools/locale/tools/cldr2def.pl user/alc/PQ_LAUNDRY/tools/tools/locale/tools/finalize (contents, props changed) user/alc/PQ_LAUNDRY/usr.sbin/ndp/ndp.c Directory Properties: user/alc/PQ_LAUNDRY/ (props changed) user/alc/PQ_LAUNDRY/share/ (props changed) user/alc/PQ_LAUNDRY/sys/ (props changed) Modified: user/alc/PQ_LAUNDRY/bin/ed/main.c ============================================================================== --- user/alc/PQ_LAUNDRY/bin/ed/main.c Sat Dec 19 18:42:50 2015 (r292469) +++ user/alc/PQ_LAUNDRY/bin/ed/main.c Sat Dec 19 19:00:24 2015 (r292470) @@ -505,7 +505,8 @@ exec_command(void) return ERR; else if (open_sbuf() < 0) return FATAL; - if (*fnp && *fnp != '!') strcpy(old_filename, fnp); + if (*fnp && *fnp != '!') + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; @@ -532,7 +533,8 @@ exec_command(void) return ERR; } GET_COMMAND_SUFFIX(); - if (*fnp) strcpy(old_filename, fnp); + if (*fnp) + strlcpy(old_filename, fnp, PATH_MAX); printf("%s\n", strip_escapes(old_filename)); break; case 'g': @@ -663,7 +665,7 @@ exec_command(void) GET_COMMAND_SUFFIX(); if (!isglobal) clear_undo_stack(); if (*old_filename == '\0' && *fnp != '!') - strcpy(old_filename, fnp); + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; @@ -797,7 +799,7 @@ exec_command(void) return ERR; GET_COMMAND_SUFFIX(); if (*old_filename == '\0' && *fnp != '!') - strcpy(old_filename, fnp); + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; Modified: user/alc/PQ_LAUNDRY/share/colldef/Makefile ============================================================================== --- user/alc/PQ_LAUNDRY/share/colldef/Makefile Sat Dec 19 18:42:50 2015 (r292469) +++ user/alc/PQ_LAUNDRY/share/colldef/Makefile Sat Dec 19 19:00:24 2015 (r292470) @@ -47,170 +47,170 @@ LOCALES+= uk_UA.UTF-8 LOCALES+= zh_Hans_CN.UTF-8 LOCALES+= zh_Hant_TW.UTF-8 -SAME+= af_ZA.UTF-8:af_ZA.ISO8859-15 -SAME+= af_ZA.UTF-8:af_ZA.ISO8859-1 -SAME+= ar_SA.UTF-8:ar_QA.UTF-8 -SAME+= ar_SA.UTF-8:ar_MA.UTF-8 -SAME+= ar_SA.UTF-8:ar_JO.UTF-8 -SAME+= ar_SA.UTF-8:ar_EG.UTF-8 -SAME+= ar_SA.UTF-8:ar_AE.UTF-8 -SAME+= be_BY.UTF-8:be_BY.ISO8859-5 -SAME+= be_BY.UTF-8:be_BY.CP1251 -SAME+= be_BY.UTF-8:be_BY.CP1131 -SAME+= ru_RU.UTF-8:sr_Cyrl_RS.UTF-8 -SAME+= ru_RU.UTF-8:sr_Cyrl_RS.ISO8859-5 -SAME+= ru_RU.UTF-8:ru_RU.KOI8-R -SAME+= ru_RU.UTF-8:ru_RU.ISO8859-5 -SAME+= ru_RU.UTF-8:ru_RU.CP866 -SAME+= ru_RU.UTF-8:ru_RU.CP1251 -SAME+= ru_RU.UTF-8:mn_Cyrl_MN.UTF-8 -SAME+= ru_RU.UTF-8:bg_BG.UTF-8 -SAME+= ru_RU.UTF-8:bg_BG.CP1251 -SAME+= ca_AD.UTF-8:ca_IT.UTF-8 -SAME+= ca_AD.UTF-8:ca_IT.ISO8859-15 -SAME+= ca_AD.UTF-8:ca_IT.ISO8859-1 -SAME+= ca_AD.UTF-8:ca_FR.UTF-8 -SAME+= ca_AD.UTF-8:ca_FR.ISO8859-15 -SAME+= ca_AD.UTF-8:ca_FR.ISO8859-1 -SAME+= ca_AD.UTF-8:ca_ES.UTF-8 -SAME+= ca_AD.UTF-8:ca_ES.ISO8859-15 -SAME+= ca_AD.UTF-8:ca_ES.ISO8859-1 -SAME+= ca_AD.UTF-8:ca_AD.ISO8859-15 -SAME+= ca_AD.UTF-8:ca_AD.ISO8859-1 -SAME+= cs_CZ.UTF-8:cs_CZ.ISO8859-2 -SAME+= da_DK.UTF-8:da_DK.ISO8859-15 -SAME+= da_DK.UTF-8:da_DK.ISO8859-1 -SAME+= en_US.UTF-8:sr_Latn_RS.UTF-8 -SAME+= en_US.UTF-8:sr_Latn_RS.ISO8859-2 -SAME+= en_US.UTF-8:pt_PT.UTF-8 -SAME+= en_US.UTF-8:pt_PT.ISO8859-15 -SAME+= en_US.UTF-8:pt_PT.ISO8859-1 -SAME+= en_US.UTF-8:pt_BR.UTF-8 -SAME+= en_US.UTF-8:pt_BR.ISO8859-1 -SAME+= en_US.UTF-8:nn_NO.UTF-8 -SAME+= en_US.UTF-8:nn_NO.ISO8859-15 -SAME+= en_US.UTF-8:nn_NO.ISO8859-1 -SAME+= en_US.UTF-8:nl_NL.UTF-8 -SAME+= en_US.UTF-8:nl_NL.ISO8859-15 -SAME+= en_US.UTF-8:nl_NL.ISO8859-1 -SAME+= en_US.UTF-8:nl_BE.UTF-8 -SAME+= en_US.UTF-8:nl_BE.ISO8859-15 -SAME+= en_US.UTF-8:nl_BE.ISO8859-1 -SAME+= en_US.UTF-8:it_IT.UTF-8 -SAME+= en_US.UTF-8:it_IT.ISO8859-15 -SAME+= en_US.UTF-8:it_IT.ISO8859-1 -SAME+= en_US.UTF-8:it_CH.UTF-8 -SAME+= en_US.UTF-8:it_CH.ISO8859-15 -SAME+= en_US.UTF-8:it_CH.ISO8859-1 -SAME+= en_US.UTF-8:fr_FR.UTF-8 -SAME+= en_US.UTF-8:fr_FR.ISO8859-15 -SAME+= en_US.UTF-8:fr_FR.ISO8859-1 -SAME+= en_US.UTF-8:fr_CH.UTF-8 -SAME+= en_US.UTF-8:fr_CH.ISO8859-15 -SAME+= en_US.UTF-8:fr_CH.ISO8859-1 -SAME+= en_US.UTF-8:fr_CA.UTF-8 -SAME+= en_US.UTF-8:fr_CA.ISO8859-15 -SAME+= en_US.UTF-8:fr_CA.ISO8859-1 -SAME+= en_US.UTF-8:fr_BE.UTF-8 -SAME+= en_US.UTF-8:fr_BE.ISO8859-15 -SAME+= en_US.UTF-8:fr_BE.ISO8859-1 -SAME+= en_US.UTF-8:eu_ES.UTF-8 -SAME+= en_US.UTF-8:eu_ES.ISO8859-15 -SAME+= en_US.UTF-8:eu_ES.ISO8859-1 -SAME+= en_US.UTF-8:en_ZA.UTF-8 -SAME+= en_US.UTF-8:en_ZA.US-ASCII -SAME+= en_US.UTF-8:en_ZA.ISO8859-15 -SAME+= en_US.UTF-8:en_ZA.ISO8859-1 -SAME+= en_US.UTF-8:en_US.US-ASCII -SAME+= en_US.UTF-8:en_US.ISO8859-15 -SAME+= en_US.UTF-8:en_US.ISO8859-1 -SAME+= en_US.UTF-8:en_SG.UTF-8 -SAME+= en_US.UTF-8:en_SG.ISO8859-1 -SAME+= en_US.UTF-8:en_PH.UTF-8 -SAME+= en_US.UTF-8:en_NZ.UTF-8 -SAME+= en_US.UTF-8:en_NZ.US-ASCII -SAME+= en_US.UTF-8:en_NZ.ISO8859-15 -SAME+= en_US.UTF-8:en_NZ.ISO8859-1 -SAME+= en_US.UTF-8:en_IE.UTF-8 -SAME+= en_US.UTF-8:en_IE.ISO8859-15 -SAME+= en_US.UTF-8:en_IE.ISO8859-1 -SAME+= en_US.UTF-8:en_HK.UTF-8 -SAME+= en_US.UTF-8:en_HK.ISO8859-1 -SAME+= en_US.UTF-8:en_GB.UTF-8 -SAME+= en_US.UTF-8:en_GB.US-ASCII -SAME+= en_US.UTF-8:en_GB.ISO8859-15 -SAME+= en_US.UTF-8:en_GB.ISO8859-1 -SAME+= en_US.UTF-8:en_CA.UTF-8 -SAME+= en_US.UTF-8:en_CA.US-ASCII -SAME+= en_US.UTF-8:en_CA.ISO8859-15 -SAME+= en_US.UTF-8:en_CA.ISO8859-1 -SAME+= en_US.UTF-8:en_AU.UTF-8 -SAME+= en_US.UTF-8:en_AU.US-ASCII -SAME+= en_US.UTF-8:en_AU.ISO8859-15 -SAME+= en_US.UTF-8:en_AU.ISO8859-1 -SAME+= en_US.UTF-8:de_DE.UTF-8 -SAME+= en_US.UTF-8:de_DE.ISO8859-15 -SAME+= en_US.UTF-8:de_DE.ISO8859-1 -SAME+= en_US.UTF-8:de_CH.UTF-8 -SAME+= en_US.UTF-8:de_CH.ISO8859-15 -SAME+= en_US.UTF-8:de_CH.ISO8859-1 -SAME+= en_US.UTF-8:de_AT.UTF-8 -SAME+= en_US.UTF-8:de_AT.ISO8859-15 -SAME+= en_US.UTF-8:de_AT.ISO8859-1 -SAME+= el_GR.UTF-8:el_GR.ISO8859-7 -SAME+= es_MX.UTF-8:es_MX.ISO8859-1 -SAME+= es_MX.UTF-8:es_ES.UTF-8 -SAME+= es_MX.UTF-8:es_ES.ISO8859-15 -SAME+= es_MX.UTF-8:es_ES.ISO8859-1 -SAME+= es_MX.UTF-8:es_CR.UTF-8 -SAME+= es_MX.UTF-8:es_AR.UTF-8 -SAME+= es_MX.UTF-8:es_AR.ISO8859-1 -SAME+= et_EE.UTF-8:et_EE.ISO8859-15 -SAME+= et_EE.UTF-8:et_EE.ISO8859-1 -SAME+= fi_FI.UTF-8:fi_FI.ISO8859-15 -SAME+= fi_FI.UTF-8:fi_FI.ISO8859-1 -SAME+= hi_IN.UTF-8:hi_IN.ISCII-DEV -SAME+= hr_HR.UTF-8:hr_HR.ISO8859-2 -SAME+= hu_HU.UTF-8:hu_HU.ISO8859-2 -SAME+= hy_AM.UTF-8:hy_AM.ARMSCII-8 -SAME+= is_IS.UTF-8:is_IS.ISO8859-15 -SAME+= is_IS.UTF-8:is_IS.ISO8859-1 -SAME+= ja_JP.UTF-8:ja_JP.SJIS -SAME+= ja_JP.UTF-8:ja_JP.eucJP -SAME+= ko_KR.UTF-8:ko_KR.eucKR -SAME+= lt_LT.UTF-8:lt_LT.ISO8859-13 -SAME+= lv_LV.UTF-8:lv_LV.ISO8859-13 -SAME+= nb_NO.UTF-8:nb_NO.ISO8859-15 -SAME+= nb_NO.UTF-8:nb_NO.ISO8859-1 -SAME+= pl_PL.UTF-8:pl_PL.ISO8859-2 -SAME+= ro_RO.UTF-8:ro_RO.ISO8859-2 -SAME+= se_NO.UTF-8:se_FI.UTF-8 -SAME+= sk_SK.UTF-8:sk_SK.ISO8859-2 -SAME+= sl_SI.UTF-8:sl_SI.ISO8859-2 -SAME+= sv_SE.UTF-8:sv_SE.ISO8859-15 -SAME+= sv_SE.UTF-8:sv_SE.ISO8859-1 -SAME+= sv_SE.UTF-8:sv_FI.UTF-8 -SAME+= sv_SE.UTF-8:sv_FI.ISO8859-15 -SAME+= sv_SE.UTF-8:sv_FI.ISO8859-1 -SAME+= tr_TR.UTF-8:tr_TR.ISO8859-9 -SAME+= uk_UA.UTF-8:uk_UA.KOI8-U -SAME+= uk_UA.UTF-8:uk_UA.ISO8859-5 -SAME+= uk_UA.UTF-8:uk_UA.CP1251 -SAME+= zh_Hans_CN.UTF-8:zh_Hans_CN.GBK -SAME+= zh_Hans_CN.UTF-8:zh_Hans_CN.GB2312 -SAME+= zh_Hans_CN.UTF-8:zh_Hans_CN.GB18030 -SAME+= zh_Hans_CN.UTF-8:zh_Hans_CN.eucCN -SAME+= zh_Hant_TW.UTF-8:zh_Hant_TW.Big5 -SAME+= zh_Hant_TW.UTF-8:zh_Hant_HK.UTF-8 -SAME+= zh_Hant_TW.UTF-8:zh_Hant_HK.Big5HKSCS -SAME+= ko_KR.eucKR:ko_KR.CP949 # legacy (same charset) +SAME+= af_ZA.UTF-8 af_ZA.ISO8859-15 +SAME+= af_ZA.UTF-8 af_ZA.ISO8859-1 +SAME+= ar_SA.UTF-8 ar_QA.UTF-8 +SAME+= ar_SA.UTF-8 ar_MA.UTF-8 +SAME+= ar_SA.UTF-8 ar_JO.UTF-8 +SAME+= ar_SA.UTF-8 ar_EG.UTF-8 +SAME+= ar_SA.UTF-8 ar_AE.UTF-8 +SAME+= be_BY.UTF-8 be_BY.ISO8859-5 +SAME+= be_BY.UTF-8 be_BY.CP1251 +SAME+= be_BY.UTF-8 be_BY.CP1131 +SAME+= ru_RU.UTF-8 sr_Cyrl_RS.UTF-8 +SAME+= ru_RU.UTF-8 sr_Cyrl_RS.ISO8859-5 +SAME+= ru_RU.UTF-8 ru_RU.KOI8-R +SAME+= ru_RU.UTF-8 ru_RU.ISO8859-5 +SAME+= ru_RU.UTF-8 ru_RU.CP866 +SAME+= ru_RU.UTF-8 ru_RU.CP1251 +SAME+= ru_RU.UTF-8 mn_Cyrl_MN.UTF-8 +SAME+= ru_RU.UTF-8 bg_BG.UTF-8 +SAME+= ru_RU.UTF-8 bg_BG.CP1251 +SAME+= ca_AD.UTF-8 ca_IT.UTF-8 +SAME+= ca_AD.UTF-8 ca_IT.ISO8859-15 +SAME+= ca_AD.UTF-8 ca_IT.ISO8859-1 +SAME+= ca_AD.UTF-8 ca_FR.UTF-8 +SAME+= ca_AD.UTF-8 ca_FR.ISO8859-15 +SAME+= ca_AD.UTF-8 ca_FR.ISO8859-1 +SAME+= ca_AD.UTF-8 ca_ES.UTF-8 +SAME+= ca_AD.UTF-8 ca_ES.ISO8859-15 +SAME+= ca_AD.UTF-8 ca_ES.ISO8859-1 +SAME+= ca_AD.UTF-8 ca_AD.ISO8859-15 +SAME+= ca_AD.UTF-8 ca_AD.ISO8859-1 +SAME+= cs_CZ.UTF-8 cs_CZ.ISO8859-2 +SAME+= da_DK.UTF-8 da_DK.ISO8859-15 +SAME+= da_DK.UTF-8 da_DK.ISO8859-1 +SAME+= en_US.UTF-8 sr_Latn_RS.UTF-8 +SAME+= en_US.UTF-8 sr_Latn_RS.ISO8859-2 +SAME+= en_US.UTF-8 pt_PT.UTF-8 +SAME+= en_US.UTF-8 pt_PT.ISO8859-15 +SAME+= en_US.UTF-8 pt_PT.ISO8859-1 +SAME+= en_US.UTF-8 pt_BR.UTF-8 +SAME+= en_US.UTF-8 pt_BR.ISO8859-1 +SAME+= en_US.UTF-8 nn_NO.UTF-8 +SAME+= en_US.UTF-8 nn_NO.ISO8859-15 +SAME+= en_US.UTF-8 nn_NO.ISO8859-1 +SAME+= en_US.UTF-8 nl_NL.UTF-8 +SAME+= en_US.UTF-8 nl_NL.ISO8859-15 +SAME+= en_US.UTF-8 nl_NL.ISO8859-1 +SAME+= en_US.UTF-8 nl_BE.UTF-8 +SAME+= en_US.UTF-8 nl_BE.ISO8859-15 +SAME+= en_US.UTF-8 nl_BE.ISO8859-1 +SAME+= en_US.UTF-8 it_IT.UTF-8 +SAME+= en_US.UTF-8 it_IT.ISO8859-15 +SAME+= en_US.UTF-8 it_IT.ISO8859-1 +SAME+= en_US.UTF-8 it_CH.UTF-8 +SAME+= en_US.UTF-8 it_CH.ISO8859-15 +SAME+= en_US.UTF-8 it_CH.ISO8859-1 +SAME+= en_US.UTF-8 fr_FR.UTF-8 +SAME+= en_US.UTF-8 fr_FR.ISO8859-15 +SAME+= en_US.UTF-8 fr_FR.ISO8859-1 +SAME+= en_US.UTF-8 fr_CH.UTF-8 +SAME+= en_US.UTF-8 fr_CH.ISO8859-15 +SAME+= en_US.UTF-8 fr_CH.ISO8859-1 +SAME+= en_US.UTF-8 fr_CA.UTF-8 +SAME+= en_US.UTF-8 fr_CA.ISO8859-15 +SAME+= en_US.UTF-8 fr_CA.ISO8859-1 +SAME+= en_US.UTF-8 fr_BE.UTF-8 +SAME+= en_US.UTF-8 fr_BE.ISO8859-15 +SAME+= en_US.UTF-8 fr_BE.ISO8859-1 +SAME+= en_US.UTF-8 eu_ES.UTF-8 +SAME+= en_US.UTF-8 eu_ES.ISO8859-15 +SAME+= en_US.UTF-8 eu_ES.ISO8859-1 +SAME+= en_US.UTF-8 en_ZA.UTF-8 +SAME+= en_US.UTF-8 en_ZA.US-ASCII +SAME+= en_US.UTF-8 en_ZA.ISO8859-15 +SAME+= en_US.UTF-8 en_ZA.ISO8859-1 +SAME+= en_US.UTF-8 en_US.US-ASCII +SAME+= en_US.UTF-8 en_US.ISO8859-15 +SAME+= en_US.UTF-8 en_US.ISO8859-1 +SAME+= en_US.UTF-8 en_SG.UTF-8 +SAME+= en_US.UTF-8 en_SG.ISO8859-1 +SAME+= en_US.UTF-8 en_PH.UTF-8 +SAME+= en_US.UTF-8 en_NZ.UTF-8 +SAME+= en_US.UTF-8 en_NZ.US-ASCII +SAME+= en_US.UTF-8 en_NZ.ISO8859-15 +SAME+= en_US.UTF-8 en_NZ.ISO8859-1 +SAME+= en_US.UTF-8 en_IE.UTF-8 +SAME+= en_US.UTF-8 en_IE.ISO8859-15 +SAME+= en_US.UTF-8 en_IE.ISO8859-1 +SAME+= en_US.UTF-8 en_HK.UTF-8 +SAME+= en_US.UTF-8 en_HK.ISO8859-1 +SAME+= en_US.UTF-8 en_GB.UTF-8 +SAME+= en_US.UTF-8 en_GB.US-ASCII +SAME+= en_US.UTF-8 en_GB.ISO8859-15 +SAME+= en_US.UTF-8 en_GB.ISO8859-1 +SAME+= en_US.UTF-8 en_CA.UTF-8 +SAME+= en_US.UTF-8 en_CA.US-ASCII +SAME+= en_US.UTF-8 en_CA.ISO8859-15 +SAME+= en_US.UTF-8 en_CA.ISO8859-1 +SAME+= en_US.UTF-8 en_AU.UTF-8 +SAME+= en_US.UTF-8 en_AU.US-ASCII +SAME+= en_US.UTF-8 en_AU.ISO8859-15 +SAME+= en_US.UTF-8 en_AU.ISO8859-1 +SAME+= en_US.UTF-8 de_DE.UTF-8 +SAME+= en_US.UTF-8 de_DE.ISO8859-15 +SAME+= en_US.UTF-8 de_DE.ISO8859-1 +SAME+= en_US.UTF-8 de_CH.UTF-8 +SAME+= en_US.UTF-8 de_CH.ISO8859-15 +SAME+= en_US.UTF-8 de_CH.ISO8859-1 +SAME+= en_US.UTF-8 de_AT.UTF-8 +SAME+= en_US.UTF-8 de_AT.ISO8859-15 +SAME+= en_US.UTF-8 de_AT.ISO8859-1 +SAME+= el_GR.UTF-8 el_GR.ISO8859-7 +SAME+= es_MX.UTF-8 es_MX.ISO8859-1 +SAME+= es_MX.UTF-8 es_ES.UTF-8 +SAME+= es_MX.UTF-8 es_ES.ISO8859-15 +SAME+= es_MX.UTF-8 es_ES.ISO8859-1 +SAME+= es_MX.UTF-8 es_CR.UTF-8 +SAME+= es_MX.UTF-8 es_AR.UTF-8 +SAME+= es_MX.UTF-8 es_AR.ISO8859-1 +SAME+= et_EE.UTF-8 et_EE.ISO8859-15 +SAME+= et_EE.UTF-8 et_EE.ISO8859-1 +SAME+= fi_FI.UTF-8 fi_FI.ISO8859-15 +SAME+= fi_FI.UTF-8 fi_FI.ISO8859-1 +SAME+= hi_IN.UTF-8 hi_IN.ISCII-DEV +SAME+= hr_HR.UTF-8 hr_HR.ISO8859-2 +SAME+= hu_HU.UTF-8 hu_HU.ISO8859-2 +SAME+= hy_AM.UTF-8 hy_AM.ARMSCII-8 +SAME+= is_IS.UTF-8 is_IS.ISO8859-15 +SAME+= is_IS.UTF-8 is_IS.ISO8859-1 +SAME+= ja_JP.UTF-8 ja_JP.SJIS +SAME+= ja_JP.UTF-8 ja_JP.eucJP +SAME+= ko_KR.UTF-8 ko_KR.eucKR +SAME+= lt_LT.UTF-8 lt_LT.ISO8859-13 +SAME+= lv_LV.UTF-8 lv_LV.ISO8859-13 +SAME+= nb_NO.UTF-8 nb_NO.ISO8859-15 +SAME+= nb_NO.UTF-8 nb_NO.ISO8859-1 +SAME+= pl_PL.UTF-8 pl_PL.ISO8859-2 +SAME+= ro_RO.UTF-8 ro_RO.ISO8859-2 +SAME+= se_NO.UTF-8 se_FI.UTF-8 +SAME+= sk_SK.UTF-8 sk_SK.ISO8859-2 +SAME+= sl_SI.UTF-8 sl_SI.ISO8859-2 +SAME+= sv_SE.UTF-8 sv_SE.ISO8859-15 +SAME+= sv_SE.UTF-8 sv_SE.ISO8859-1 +SAME+= sv_SE.UTF-8 sv_FI.UTF-8 +SAME+= sv_SE.UTF-8 sv_FI.ISO8859-15 +SAME+= sv_SE.UTF-8 sv_FI.ISO8859-1 +SAME+= tr_TR.UTF-8 tr_TR.ISO8859-9 +SAME+= uk_UA.UTF-8 uk_UA.KOI8-U +SAME+= uk_UA.UTF-8 uk_UA.ISO8859-5 +SAME+= uk_UA.UTF-8 uk_UA.CP1251 +SAME+= zh_Hans_CN.UTF-8 zh_Hans_CN.GBK +SAME+= zh_Hans_CN.UTF-8 zh_Hans_CN.GB2312 +SAME+= zh_Hans_CN.UTF-8 zh_Hans_CN.GB18030 +SAME+= zh_Hans_CN.UTF-8 zh_Hans_CN.eucCN +SAME+= zh_Hant_TW.UTF-8 zh_Hant_TW.Big5 +SAME+= zh_Hant_TW.UTF-8 zh_Hant_HK.UTF-8 +SAME+= zh_Hant_TW.UTF-8 zh_Hant_HK.Big5HKSCS +SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) FILES= ${LOCALES:S/$/.LC_COLLATE/} CLEANFILES= ${FILES} -.for f in ${SAME} -SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} \ - ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME} +.for f t in ${SAME} +SYMLINKS+= ../$f/${FILESNAME} \ + ${LOCALEDIR}/$t/${FILESNAME} .endfor .for f in ${LOCALES} Modified: user/alc/PQ_LAUNDRY/share/ctypedef/Makefile ============================================================================== --- user/alc/PQ_LAUNDRY/share/ctypedef/Makefile Sat Dec 19 18:42:50 2015 (r292469) +++ user/alc/PQ_LAUNDRY/share/ctypedef/Makefile Sat Dec 19 19:00:24 2015 (r292470) @@ -9,7 +9,7 @@ MAPLOC= ${.CURDIR}/../../tools/tools/lo .src.LC_CTYPE: localedef -D -U -c -w ${MAPLOC}/widths.txt \ - -f ${MAPLOC}/map.${.IMPSRC:T:R:C/^.*\.//} \ + -f ${MAPLOC}/map.${.IMPSRC:T:R:E} \ -i ${.IMPSRC} ${.OBJDIR}/${.IMPSRC:T:R} || true LOCALES+= be_BY.CP1131 @@ -42,202 +42,202 @@ LOCALES+= zh_Hans_CN.eucCN LOCALES+= zh_Hant_HK.Big5HKSCS LOCALES+= zh_Hant_TW.Big5 -SAME+= en_US.UTF-8:ru_RU.UTF-8 -SAME+= en_US.UTF-8:zh_Hant_TW.UTF-8 -SAME+= en_US.UTF-8:zh_Hant_HK.UTF-8 -SAME+= en_US.UTF-8:zh_Hans_CN.UTF-8 -SAME+= en_US.UTF-8:uk_UA.UTF-8 -SAME+= en_US.UTF-8:tr_TR.UTF-8 -SAME+= en_US.UTF-8:sv_SE.UTF-8 -SAME+= en_US.UTF-8:sv_FI.UTF-8 -SAME+= en_US.UTF-8:sr_Latn_RS.UTF-8 -SAME+= en_US.UTF-8:sr_Cyrl_RS.UTF-8 -SAME+= en_US.UTF-8:sl_SI.UTF-8 -SAME+= en_US.UTF-8:sk_SK.UTF-8 -SAME+= en_US.UTF-8:se_NO.UTF-8 -SAME+= en_US.UTF-8:se_FI.UTF-8 -SAME+= en_US.UTF-8:ro_RO.UTF-8 -SAME+= en_US.UTF-8:pt_PT.UTF-8 -SAME+= en_US.UTF-8:pt_BR.UTF-8 -SAME+= en_US.UTF-8:pl_PL.UTF-8 -SAME+= en_US.UTF-8:nn_NO.UTF-8 -SAME+= en_US.UTF-8:nl_NL.UTF-8 -SAME+= en_US.UTF-8:nl_BE.UTF-8 -SAME+= en_US.UTF-8:nb_NO.UTF-8 -SAME+= en_US.UTF-8:mn_Cyrl_MN.UTF-8 -SAME+= en_US.UTF-8:lv_LV.UTF-8 -SAME+= en_US.UTF-8:lt_LT.UTF-8 -SAME+= en_US.UTF-8:ko_KR.UTF-8 -SAME+= en_US.UTF-8:kk_Cyrl_KZ.UTF-8 -SAME+= en_US.UTF-8:ja_JP.UTF-8 -SAME+= en_US.UTF-8:it_IT.UTF-8 -SAME+= en_US.UTF-8:it_CH.UTF-8 -SAME+= en_US.UTF-8:is_IS.UTF-8 -SAME+= en_US.UTF-8:hy_AM.UTF-8 -SAME+= en_US.UTF-8:hu_HU.UTF-8 -SAME+= en_US.UTF-8:hr_HR.UTF-8 -SAME+= en_US.UTF-8:hi_IN.UTF-8 -SAME+= en_US.UTF-8:he_IL.UTF-8 -SAME+= en_US.UTF-8:fr_FR.UTF-8 -SAME+= en_US.UTF-8:fr_CH.UTF-8 -SAME+= en_US.UTF-8:fr_CA.UTF-8 -SAME+= en_US.UTF-8:fr_BE.UTF-8 -SAME+= en_US.UTF-8:fi_FI.UTF-8 -SAME+= en_US.UTF-8:eu_ES.UTF-8 -SAME+= en_US.UTF-8:et_EE.UTF-8 -SAME+= en_US.UTF-8:es_MX.UTF-8 -SAME+= en_US.UTF-8:es_ES.UTF-8 -SAME+= en_US.UTF-8:es_CR.UTF-8 -SAME+= en_US.UTF-8:es_AR.UTF-8 -SAME+= en_US.UTF-8:en_ZA.UTF-8 -SAME+= en_US.UTF-8:en_SG.UTF-8 -SAME+= en_US.UTF-8:en_PH.UTF-8 -SAME+= en_US.UTF-8:en_NZ.UTF-8 -SAME+= en_US.UTF-8:en_IE.UTF-8 -SAME+= en_US.UTF-8:en_HK.UTF-8 -SAME+= en_US.UTF-8:en_GB.UTF-8 -SAME+= en_US.UTF-8:en_CA.UTF-8 -SAME+= en_US.UTF-8:en_AU.UTF-8 -SAME+= en_US.UTF-8:el_GR.UTF-8 -SAME+= en_US.UTF-8:de_DE.UTF-8 -SAME+= en_US.UTF-8:de_CH.UTF-8 -SAME+= en_US.UTF-8:de_AT.UTF-8 -SAME+= en_US.UTF-8:da_DK.UTF-8 -SAME+= en_US.UTF-8:cs_CZ.UTF-8 -SAME+= en_US.UTF-8:ca_IT.UTF-8 -SAME+= en_US.UTF-8:ca_FR.UTF-8 -SAME+= en_US.UTF-8:ca_ES.UTF-8 -SAME+= en_US.UTF-8:ca_AD.UTF-8 -SAME+= en_US.UTF-8:bg_BG.UTF-8 -SAME+= en_US.UTF-8:be_BY.UTF-8 -SAME+= en_US.UTF-8:ar_SA.UTF-8 -SAME+= en_US.UTF-8:ar_QA.UTF-8 -SAME+= en_US.UTF-8:ar_MA.UTF-8 -SAME+= en_US.UTF-8:ar_JO.UTF-8 -SAME+= en_US.UTF-8:ar_EG.UTF-8 -SAME+= en_US.UTF-8:ar_AE.UTF-8 -SAME+= en_US.UTF-8:am_ET.UTF-8 -SAME+= en_US.UTF-8:af_ZA.UTF-8 -SAME+= en_US.ISO8859-1:sv_SE.ISO8859-1 -SAME+= en_US.ISO8859-1:sv_FI.ISO8859-1 -SAME+= en_US.ISO8859-1:pt_PT.ISO8859-1 -SAME+= en_US.ISO8859-1:pt_BR.ISO8859-1 -SAME+= en_US.ISO8859-1:nn_NO.ISO8859-1 -SAME+= en_US.ISO8859-1:nl_NL.ISO8859-1 -SAME+= en_US.ISO8859-1:nl_BE.ISO8859-1 -SAME+= en_US.ISO8859-1:nb_NO.ISO8859-1 -SAME+= en_US.ISO8859-1:it_IT.ISO8859-1 -SAME+= en_US.ISO8859-1:it_CH.ISO8859-1 -SAME+= en_US.ISO8859-1:is_IS.ISO8859-1 -SAME+= en_US.ISO8859-1:fr_FR.ISO8859-1 -SAME+= en_US.ISO8859-1:fr_CH.ISO8859-1 -SAME+= en_US.ISO8859-1:fr_CA.ISO8859-1 -SAME+= en_US.ISO8859-1:fr_BE.ISO8859-1 -SAME+= en_US.ISO8859-1:fi_FI.ISO8859-1 -SAME+= en_US.ISO8859-1:eu_ES.ISO8859-1 -SAME+= en_US.ISO8859-1:et_EE.ISO8859-1 -SAME+= en_US.ISO8859-1:es_MX.ISO8859-1 -SAME+= en_US.ISO8859-1:es_ES.ISO8859-1 -SAME+= en_US.ISO8859-1:es_AR.ISO8859-1 -SAME+= en_US.ISO8859-1:en_ZA.ISO8859-1 -SAME+= en_US.ISO8859-1:en_SG.ISO8859-1 -SAME+= en_US.ISO8859-1:en_NZ.ISO8859-1 -SAME+= en_US.ISO8859-1:en_IE.ISO8859-1 -SAME+= en_US.ISO8859-1:en_HK.ISO8859-1 -SAME+= en_US.ISO8859-1:en_GB.ISO8859-1 -SAME+= en_US.ISO8859-1:en_CA.ISO8859-1 -SAME+= en_US.ISO8859-1:en_AU.ISO8859-1 -SAME+= en_US.ISO8859-1:de_DE.ISO8859-1 -SAME+= en_US.ISO8859-1:de_CH.ISO8859-1 -SAME+= en_US.ISO8859-1:de_AT.ISO8859-1 -SAME+= en_US.ISO8859-1:da_DK.ISO8859-1 -SAME+= en_US.ISO8859-1:af_ZA.ISO8859-1 -SAME+= en_US.ISO8859-15:en_GB.ISO8859-15 -SAME+= en_US.ISO8859-15:sv_SE.ISO8859-15 -SAME+= en_US.ISO8859-15:sv_FI.ISO8859-15 -SAME+= en_US.ISO8859-15:pt_PT.ISO8859-15 -SAME+= en_US.ISO8859-15:nn_NO.ISO8859-15 -SAME+= en_US.ISO8859-15:nl_NL.ISO8859-15 -SAME+= en_US.ISO8859-15:nl_BE.ISO8859-15 -SAME+= en_US.ISO8859-15:nb_NO.ISO8859-15 -SAME+= en_US.ISO8859-15:it_IT.ISO8859-15 -SAME+= en_US.ISO8859-15:it_CH.ISO8859-15 -SAME+= en_US.ISO8859-15:is_IS.ISO8859-15 -SAME+= en_US.ISO8859-15:fr_FR.ISO8859-15 -SAME+= en_US.ISO8859-15:fr_CH.ISO8859-15 -SAME+= en_US.ISO8859-15:fr_CA.ISO8859-15 -SAME+= en_US.ISO8859-15:fr_BE.ISO8859-15 -SAME+= en_US.ISO8859-15:fi_FI.ISO8859-15 -SAME+= en_US.ISO8859-15:eu_ES.ISO8859-15 -SAME+= en_US.ISO8859-15:et_EE.ISO8859-15 -SAME+= en_US.ISO8859-15:es_ES.ISO8859-15 -SAME+= en_US.ISO8859-15:en_ZA.ISO8859-15 -SAME+= en_US.ISO8859-15:en_NZ.ISO8859-15 -SAME+= en_US.ISO8859-15:en_IE.ISO8859-15 -SAME+= en_US.ISO8859-15:en_CA.ISO8859-15 -SAME+= en_US.ISO8859-15:en_AU.ISO8859-15 -SAME+= en_US.ISO8859-15:de_DE.ISO8859-15 -SAME+= en_US.ISO8859-15:de_CH.ISO8859-15 -SAME+= en_US.ISO8859-15:de_AT.ISO8859-15 -SAME+= en_US.ISO8859-15:da_DK.ISO8859-15 -SAME+= en_US.ISO8859-15:af_ZA.ISO8859-15 -SAME+= ru_RU.CP1251:bg_BG.CP1251 -SAME+= ru_RU.CP1251:be_BY.CP1251 -SAME+= ru_RU.ISO8859-5:sr_Cyrl_RS.ISO8859-5 -SAME+= ru_RU.ISO8859-5:be_BY.ISO8859-5 -SAME+= ca_IT.ISO8859-1:ca_FR.ISO8859-1 -SAME+= ca_IT.ISO8859-1:ca_ES.ISO8859-1 -SAME+= ca_IT.ISO8859-1:ca_AD.ISO8859-1 -SAME+= ca_IT.ISO8859-15:ca_FR.ISO8859-15 -SAME+= ca_IT.ISO8859-15:ca_ES.ISO8859-15 -SAME+= ca_IT.ISO8859-15:ca_AD.ISO8859-15 -SAME+= sr_Latn_RS.ISO8859-2:sl_SI.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2:sk_SK.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2:ro_RO.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2:pl_PL.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2:hu_HU.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2:hr_HR.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2:cs_CZ.ISO8859-2 -SAME+= en_US.US-ASCII:en_ZA.US-ASCII -SAME+= en_US.US-ASCII:en_NZ.US-ASCII -SAME+= en_US.US-ASCII:en_GB.US-ASCII -SAME+= en_US.US-ASCII:en_CA.US-ASCII -SAME+= en_US.US-ASCII:en_AU.US-ASCII -SAME+= lv_LV.ISO8859-13:lt_LT.ISO8859-13 -SAME+= ko_KR.eucKR:ko_KR.CP949 # legacy (same charset) +SAME+= en_US.UTF-8 ru_RU.UTF-8 +SAME+= en_US.UTF-8 zh_Hant_TW.UTF-8 +SAME+= en_US.UTF-8 zh_Hant_HK.UTF-8 +SAME+= en_US.UTF-8 zh_Hans_CN.UTF-8 +SAME+= en_US.UTF-8 uk_UA.UTF-8 +SAME+= en_US.UTF-8 tr_TR.UTF-8 +SAME+= en_US.UTF-8 sv_SE.UTF-8 +SAME+= en_US.UTF-8 sv_FI.UTF-8 +SAME+= en_US.UTF-8 sr_Latn_RS.UTF-8 +SAME+= en_US.UTF-8 sr_Cyrl_RS.UTF-8 +SAME+= en_US.UTF-8 sl_SI.UTF-8 +SAME+= en_US.UTF-8 sk_SK.UTF-8 +SAME+= en_US.UTF-8 se_NO.UTF-8 +SAME+= en_US.UTF-8 se_FI.UTF-8 +SAME+= en_US.UTF-8 ro_RO.UTF-8 +SAME+= en_US.UTF-8 pt_PT.UTF-8 +SAME+= en_US.UTF-8 pt_BR.UTF-8 +SAME+= en_US.UTF-8 pl_PL.UTF-8 +SAME+= en_US.UTF-8 nn_NO.UTF-8 +SAME+= en_US.UTF-8 nl_NL.UTF-8 +SAME+= en_US.UTF-8 nl_BE.UTF-8 +SAME+= en_US.UTF-8 nb_NO.UTF-8 +SAME+= en_US.UTF-8 mn_Cyrl_MN.UTF-8 +SAME+= en_US.UTF-8 lv_LV.UTF-8 +SAME+= en_US.UTF-8 lt_LT.UTF-8 +SAME+= en_US.UTF-8 ko_KR.UTF-8 +SAME+= en_US.UTF-8 kk_Cyrl_KZ.UTF-8 +SAME+= en_US.UTF-8 ja_JP.UTF-8 +SAME+= en_US.UTF-8 it_IT.UTF-8 +SAME+= en_US.UTF-8 it_CH.UTF-8 +SAME+= en_US.UTF-8 is_IS.UTF-8 +SAME+= en_US.UTF-8 hy_AM.UTF-8 +SAME+= en_US.UTF-8 hu_HU.UTF-8 +SAME+= en_US.UTF-8 hr_HR.UTF-8 +SAME+= en_US.UTF-8 hi_IN.UTF-8 +SAME+= en_US.UTF-8 he_IL.UTF-8 +SAME+= en_US.UTF-8 fr_FR.UTF-8 +SAME+= en_US.UTF-8 fr_CH.UTF-8 +SAME+= en_US.UTF-8 fr_CA.UTF-8 +SAME+= en_US.UTF-8 fr_BE.UTF-8 +SAME+= en_US.UTF-8 fi_FI.UTF-8 +SAME+= en_US.UTF-8 eu_ES.UTF-8 +SAME+= en_US.UTF-8 et_EE.UTF-8 +SAME+= en_US.UTF-8 es_MX.UTF-8 +SAME+= en_US.UTF-8 es_ES.UTF-8 +SAME+= en_US.UTF-8 es_CR.UTF-8 +SAME+= en_US.UTF-8 es_AR.UTF-8 +SAME+= en_US.UTF-8 en_ZA.UTF-8 +SAME+= en_US.UTF-8 en_SG.UTF-8 +SAME+= en_US.UTF-8 en_PH.UTF-8 +SAME+= en_US.UTF-8 en_NZ.UTF-8 +SAME+= en_US.UTF-8 en_IE.UTF-8 +SAME+= en_US.UTF-8 en_HK.UTF-8 +SAME+= en_US.UTF-8 en_GB.UTF-8 +SAME+= en_US.UTF-8 en_CA.UTF-8 +SAME+= en_US.UTF-8 en_AU.UTF-8 +SAME+= en_US.UTF-8 el_GR.UTF-8 +SAME+= en_US.UTF-8 de_DE.UTF-8 +SAME+= en_US.UTF-8 de_CH.UTF-8 +SAME+= en_US.UTF-8 de_AT.UTF-8 +SAME+= en_US.UTF-8 da_DK.UTF-8 +SAME+= en_US.UTF-8 cs_CZ.UTF-8 +SAME+= en_US.UTF-8 ca_IT.UTF-8 +SAME+= en_US.UTF-8 ca_FR.UTF-8 +SAME+= en_US.UTF-8 ca_ES.UTF-8 +SAME+= en_US.UTF-8 ca_AD.UTF-8 +SAME+= en_US.UTF-8 bg_BG.UTF-8 +SAME+= en_US.UTF-8 be_BY.UTF-8 +SAME+= en_US.UTF-8 ar_SA.UTF-8 +SAME+= en_US.UTF-8 ar_QA.UTF-8 +SAME+= en_US.UTF-8 ar_MA.UTF-8 +SAME+= en_US.UTF-8 ar_JO.UTF-8 +SAME+= en_US.UTF-8 ar_EG.UTF-8 +SAME+= en_US.UTF-8 ar_AE.UTF-8 +SAME+= en_US.UTF-8 am_ET.UTF-8 +SAME+= en_US.UTF-8 af_ZA.UTF-8 +SAME+= en_US.ISO8859-1 sv_SE.ISO8859-1 +SAME+= en_US.ISO8859-1 sv_FI.ISO8859-1 +SAME+= en_US.ISO8859-1 pt_PT.ISO8859-1 +SAME+= en_US.ISO8859-1 pt_BR.ISO8859-1 +SAME+= en_US.ISO8859-1 nn_NO.ISO8859-1 +SAME+= en_US.ISO8859-1 nl_NL.ISO8859-1 +SAME+= en_US.ISO8859-1 nl_BE.ISO8859-1 +SAME+= en_US.ISO8859-1 nb_NO.ISO8859-1 +SAME+= en_US.ISO8859-1 it_IT.ISO8859-1 +SAME+= en_US.ISO8859-1 it_CH.ISO8859-1 +SAME+= en_US.ISO8859-1 is_IS.ISO8859-1 +SAME+= en_US.ISO8859-1 fr_FR.ISO8859-1 +SAME+= en_US.ISO8859-1 fr_CH.ISO8859-1 +SAME+= en_US.ISO8859-1 fr_CA.ISO8859-1 +SAME+= en_US.ISO8859-1 fr_BE.ISO8859-1 +SAME+= en_US.ISO8859-1 fi_FI.ISO8859-1 +SAME+= en_US.ISO8859-1 eu_ES.ISO8859-1 +SAME+= en_US.ISO8859-1 et_EE.ISO8859-1 +SAME+= en_US.ISO8859-1 es_MX.ISO8859-1 +SAME+= en_US.ISO8859-1 es_ES.ISO8859-1 +SAME+= en_US.ISO8859-1 es_AR.ISO8859-1 +SAME+= en_US.ISO8859-1 en_ZA.ISO8859-1 +SAME+= en_US.ISO8859-1 en_SG.ISO8859-1 +SAME+= en_US.ISO8859-1 en_NZ.ISO8859-1 +SAME+= en_US.ISO8859-1 en_IE.ISO8859-1 +SAME+= en_US.ISO8859-1 en_HK.ISO8859-1 +SAME+= en_US.ISO8859-1 en_GB.ISO8859-1 +SAME+= en_US.ISO8859-1 en_CA.ISO8859-1 +SAME+= en_US.ISO8859-1 en_AU.ISO8859-1 +SAME+= en_US.ISO8859-1 de_DE.ISO8859-1 +SAME+= en_US.ISO8859-1 de_CH.ISO8859-1 +SAME+= en_US.ISO8859-1 de_AT.ISO8859-1 +SAME+= en_US.ISO8859-1 da_DK.ISO8859-1 +SAME+= en_US.ISO8859-1 af_ZA.ISO8859-1 +SAME+= en_US.ISO8859-15 en_GB.ISO8859-15 +SAME+= en_US.ISO8859-15 sv_SE.ISO8859-15 +SAME+= en_US.ISO8859-15 sv_FI.ISO8859-15 +SAME+= en_US.ISO8859-15 pt_PT.ISO8859-15 +SAME+= en_US.ISO8859-15 nn_NO.ISO8859-15 +SAME+= en_US.ISO8859-15 nl_NL.ISO8859-15 +SAME+= en_US.ISO8859-15 nl_BE.ISO8859-15 +SAME+= en_US.ISO8859-15 nb_NO.ISO8859-15 +SAME+= en_US.ISO8859-15 it_IT.ISO8859-15 +SAME+= en_US.ISO8859-15 it_CH.ISO8859-15 +SAME+= en_US.ISO8859-15 is_IS.ISO8859-15 +SAME+= en_US.ISO8859-15 fr_FR.ISO8859-15 +SAME+= en_US.ISO8859-15 fr_CH.ISO8859-15 +SAME+= en_US.ISO8859-15 fr_CA.ISO8859-15 +SAME+= en_US.ISO8859-15 fr_BE.ISO8859-15 +SAME+= en_US.ISO8859-15 fi_FI.ISO8859-15 +SAME+= en_US.ISO8859-15 eu_ES.ISO8859-15 +SAME+= en_US.ISO8859-15 et_EE.ISO8859-15 +SAME+= en_US.ISO8859-15 es_ES.ISO8859-15 +SAME+= en_US.ISO8859-15 en_ZA.ISO8859-15 +SAME+= en_US.ISO8859-15 en_NZ.ISO8859-15 +SAME+= en_US.ISO8859-15 en_IE.ISO8859-15 +SAME+= en_US.ISO8859-15 en_CA.ISO8859-15 +SAME+= en_US.ISO8859-15 en_AU.ISO8859-15 +SAME+= en_US.ISO8859-15 de_DE.ISO8859-15 +SAME+= en_US.ISO8859-15 de_CH.ISO8859-15 +SAME+= en_US.ISO8859-15 de_AT.ISO8859-15 +SAME+= en_US.ISO8859-15 da_DK.ISO8859-15 +SAME+= en_US.ISO8859-15 af_ZA.ISO8859-15 +SAME+= ru_RU.CP1251 bg_BG.CP1251 +SAME+= ru_RU.CP1251 be_BY.CP1251 +SAME+= ru_RU.ISO8859-5 sr_Cyrl_RS.ISO8859-5 +SAME+= ru_RU.ISO8859-5 be_BY.ISO8859-5 +SAME+= ca_IT.ISO8859-1 ca_FR.ISO8859-1 +SAME+= ca_IT.ISO8859-1 ca_ES.ISO8859-1 +SAME+= ca_IT.ISO8859-1 ca_AD.ISO8859-1 +SAME+= ca_IT.ISO8859-15 ca_FR.ISO8859-15 +SAME+= ca_IT.ISO8859-15 ca_ES.ISO8859-15 +SAME+= ca_IT.ISO8859-15 ca_AD.ISO8859-15 +SAME+= sr_Latn_RS.ISO8859-2 sl_SI.ISO8859-2 +SAME+= sr_Latn_RS.ISO8859-2 sk_SK.ISO8859-2 +SAME+= sr_Latn_RS.ISO8859-2 ro_RO.ISO8859-2 +SAME+= sr_Latn_RS.ISO8859-2 pl_PL.ISO8859-2 +SAME+= sr_Latn_RS.ISO8859-2 hu_HU.ISO8859-2 +SAME+= sr_Latn_RS.ISO8859-2 hr_HR.ISO8859-2 +SAME+= sr_Latn_RS.ISO8859-2 cs_CZ.ISO8859-2 +SAME+= en_US.US-ASCII en_ZA.US-ASCII +SAME+= en_US.US-ASCII en_NZ.US-ASCII +SAME+= en_US.US-ASCII en_GB.US-ASCII +SAME+= en_US.US-ASCII en_CA.US-ASCII +SAME+= en_US.US-ASCII en_AU.US-ASCII +SAME+= lv_LV.ISO8859-13 lt_LT.ISO8859-13 +SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) FILES= ${LOCALES:S/$/.LC_CTYPE/} CLEANFILES= ${FILES} -.for f in ${SAME} -SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} \ - ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME} +.for f t in ${SAME} +SYMLINKS+= ../$f/${FILESNAME} \ + ${LOCALEDIR}/$t/${FILESNAME} .endfor .for f in ${LOCALES} FILESDIR_${f}.LC_CTYPE= ${LOCALEDIR}/${f} .endfor -SYMPAIRS+= ca_IT.ISO8859-1.src:ca_IT.ISO8859-15.src -SYMPAIRS+= be_BY.CP1131.src:ru_RU.CP1251.src -SYMPAIRS+= be_BY.CP1131.src:ru_RU.CP866.src -SYMPAIRS+= be_BY.CP1131.src:ru_RU.ISO8859-5.src -SYMPAIRS+= be_BY.CP1131.src:ru_RU.KOI8-R.src -SYMPAIRS+= uk_UA.CP1251.src:uk_UA.ISO8859-5.src -SYMPAIRS+= uk_UA.CP1251.src:uk_UA.KOI8-U.src -SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_CN.GB18030.src -SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_CN.GB2312.src -SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_CN.GBK.src -SYMPAIRS+= zh_Hant_HK.Big5HKSCS.src:zh_Hant_TW.Big5.src -SYMPAIRS+= en_US.ISO8859-1.src:en_US.ISO8859-15.src -SYMPAIRS+= en_US.ISO8859-1.src:en_US.US-ASCII.src -SYMPAIRS+= en_US.ISO8859-1.src:lv_LV.ISO8859-13.src -SYMPAIRS+= en_US.ISO8859-1.src:sr_Latn_RS.ISO8859-2.src -SYMPAIRS+= en_US.ISO8859-1.src:tr_TR.ISO8859-9.src -SYMPAIRS+= ja_JP.eucJP.src:ja_JP.SJIS.src +SYMPAIRS+= ca_IT.ISO8859-1.src ca_IT.ISO8859-15.src +SYMPAIRS+= be_BY.CP1131.src ru_RU.CP1251.src +SYMPAIRS+= be_BY.CP1131.src ru_RU.CP866.src +SYMPAIRS+= be_BY.CP1131.src ru_RU.ISO8859-5.src +SYMPAIRS+= be_BY.CP1131.src ru_RU.KOI8-R.src +SYMPAIRS+= uk_UA.CP1251.src uk_UA.ISO8859-5.src +SYMPAIRS+= uk_UA.CP1251.src uk_UA.KOI8-U.src +SYMPAIRS+= zh_Hans_CN.eucCN.src zh_Hans_CN.GB18030.src +SYMPAIRS+= zh_Hans_CN.eucCN.src zh_Hans_CN.GB2312.src +SYMPAIRS+= zh_Hans_CN.eucCN.src zh_Hans_CN.GBK.src +SYMPAIRS+= zh_Hant_HK.Big5HKSCS.src zh_Hant_TW.Big5.src +SYMPAIRS+= en_US.ISO8859-1.src en_US.ISO8859-15.src +SYMPAIRS+= en_US.ISO8859-1.src en_US.US-ASCII.src +SYMPAIRS+= en_US.ISO8859-1.src lv_LV.ISO8859-13.src +SYMPAIRS+= en_US.ISO8859-1.src sr_Latn_RS.ISO8859-2.src +SYMPAIRS+= en_US.ISO8859-1.src tr_TR.ISO8859-9.src +SYMPAIRS+= ja_JP.eucJP.src ja_JP.SJIS.src -.for PAIR in ${SYMPAIRS} -${PAIR:C/^.*://:S/src$/LC_CTYPE/}: ${PAIR:C/:.*//} +.for s t in ${SYMPAIRS} +${t:S/src$/LC_CTYPE/}: $s localedef -D -U -c -w ${MAPLOC}/widths.txt \ -f ${MAPLOC}/map.${.TARGET:T:R:C/^.*\.//} \ -i ${.ALLSRC} ${.OBJDIR}/${.TARGET:T:R} || true Modified: user/alc/PQ_LAUNDRY/share/monetdef/Makefile ============================================================================== --- user/alc/PQ_LAUNDRY/share/monetdef/Makefile Sat Dec 19 18:42:50 2015 (r292469) +++ user/alc/PQ_LAUNDRY/share/monetdef/Makefile Sat Dec 19 19:00:24 2015 (r292470) @@ -109,106 +109,106 @@ LOCALES+= zh_Hant_HK.UTF-8 LOCALES+= zh_Hant_TW.Big5 LOCALES+= zh_Hant_TW.UTF-8 -SAME+= en_ZA.ISO8859-15:en_ZA.ISO8859-1 -SAME+= en_ZA.ISO8859-15:af_ZA.ISO8859-15 -SAME+= en_ZA.ISO8859-15:af_ZA.ISO8859-1 -SAME+= en_ZA.UTF-8:af_ZA.UTF-8 -SAME+= sl_SI.ISO8859-2:nl_BE.ISO8859-1 -SAME+= sl_SI.ISO8859-2:it_IT.ISO8859-1 -SAME+= sl_SI.ISO8859-2:fr_BE.ISO8859-1 -SAME+= sl_SI.ISO8859-2:eu_ES.ISO8859-1 -SAME+= sl_SI.ISO8859-2:es_ES.ISO8859-1 -SAME+= sl_SI.ISO8859-2:de_DE.ISO8859-1 -SAME+= sl_SI.ISO8859-2:ca_IT.ISO8859-1 -SAME+= sl_SI.ISO8859-2:ca_FR.ISO8859-1 -SAME+= sl_SI.ISO8859-2:ca_ES.ISO8859-1 -SAME+= sl_SI.ISO8859-2:ca_AD.ISO8859-1 -SAME+= nl_BE.ISO8859-15:it_IT.ISO8859-15 -SAME+= nl_BE.ISO8859-15:fr_BE.ISO8859-15 -SAME+= nl_BE.ISO8859-15:eu_ES.ISO8859-15 -SAME+= nl_BE.ISO8859-15:es_ES.ISO8859-15 -SAME+= nl_BE.ISO8859-15:el_GR.ISO8859-7 -SAME+= nl_BE.ISO8859-15:de_DE.ISO8859-15 -SAME+= nl_BE.ISO8859-15:ca_IT.ISO8859-15 -SAME+= nl_BE.ISO8859-15:ca_FR.ISO8859-15 -SAME+= nl_BE.ISO8859-15:ca_ES.ISO8859-15 -SAME+= nl_BE.ISO8859-15:ca_AD.ISO8859-15 -SAME+= sl_SI.UTF-8:nl_BE.UTF-8 -SAME+= sl_SI.UTF-8:it_IT.UTF-8 -SAME+= sl_SI.UTF-8:fr_BE.UTF-8 -SAME+= sl_SI.UTF-8:eu_ES.UTF-8 -SAME+= sl_SI.UTF-8:es_ES.UTF-8 -SAME+= sl_SI.UTF-8:el_GR.UTF-8 -SAME+= sl_SI.UTF-8:de_DE.UTF-8 -SAME+= sl_SI.UTF-8:ca_IT.UTF-8 -SAME+= sl_SI.UTF-8:ca_FR.UTF-8 -SAME+= sl_SI.UTF-8:ca_ES.UTF-8 -SAME+= sl_SI.UTF-8:ca_AD.UTF-8 -SAME+= da_DK.UTF-8:da_DK.ISO8859-15 -SAME+= da_DK.UTF-8:da_DK.ISO8859-1 -SAME+= it_CH.UTF-8:it_CH.ISO8859-15 -SAME+= it_CH.UTF-8:it_CH.ISO8859-1 -SAME+= it_CH.UTF-8:de_CH.UTF-8 -SAME+= it_CH.UTF-8:de_CH.ISO8859-15 -SAME+= it_CH.UTF-8:de_CH.ISO8859-1 -SAME+= en_AU.UTF-8:en_AU.US-ASCII -SAME+= en_AU.UTF-8:en_AU.ISO8859-15 -SAME+= en_AU.UTF-8:en_AU.ISO8859-1 -SAME+= en_CA.UTF-8:en_CA.US-ASCII -SAME+= en_CA.UTF-8:en_CA.ISO8859-15 -SAME+= en_CA.UTF-8:en_CA.ISO8859-1 -SAME+= en_GB.ISO8859-15:en_GB.ISO8859-1 -SAME+= zh_Hant_HK.UTF-8:zh_Hant_HK.Big5HKSCS -SAME+= zh_Hant_HK.UTF-8:en_HK.UTF-8 -SAME+= zh_Hant_HK.UTF-8:en_HK.ISO8859-1 -SAME+= en_NZ.UTF-8:en_NZ.US-ASCII -SAME+= en_NZ.UTF-8:en_NZ.ISO8859-15 -SAME+= en_NZ.UTF-8:en_NZ.ISO8859-1 -SAME+= en_SG.UTF-8:en_SG.ISO8859-1 -SAME+= en_US.UTF-8:en_US.US-ASCII -SAME+= en_US.UTF-8:en_US.ISO8859-15 -SAME+= en_US.UTF-8:en_US.ISO8859-1 -SAME+= es_AR.UTF-8:es_AR.ISO8859-1 -SAME+= es_MX.UTF-8:es_MX.ISO8859-1 -SAME+= sv_FI.ISO8859-1:sk_SK.ISO8859-2 -SAME+= sv_FI.ISO8859-1:pt_PT.ISO8859-1 -SAME+= sv_FI.ISO8859-1:lt_LT.ISO8859-13 -SAME+= sv_FI.ISO8859-1:fr_FR.ISO8859-1 -SAME+= sv_FI.ISO8859-1:fi_FI.ISO8859-1 -SAME+= sv_FI.ISO8859-1:et_EE.ISO8859-1 -SAME+= sv_FI.ISO8859-15:pt_PT.ISO8859-15 -SAME+= sv_FI.ISO8859-15:fr_FR.ISO8859-15 -SAME+= sv_FI.ISO8859-15:fi_FI.ISO8859-15 -SAME+= sv_FI.ISO8859-15:et_EE.ISO8859-15 -SAME+= sk_SK.UTF-8:pt_PT.UTF-8 -SAME+= sk_SK.UTF-8:fr_FR.UTF-8 -SAME+= sk_SK.UTF-8:et_EE.UTF-8 -SAME+= sv_FI.UTF-8:se_FI.UTF-8 -SAME+= sv_FI.UTF-8:lt_LT.UTF-8 -SAME+= sv_FI.UTF-8:fi_FI.UTF-8 -SAME+= fr_CA.ISO8859-15:fr_CA.ISO8859-1 -SAME+= fr_CH.ISO8859-15:fr_CH.ISO8859-1 -SAME+= hr_HR.UTF-8:hr_HR.ISO8859-2 -SAME+= is_IS.UTF-8:is_IS.ISO8859-15 -SAME+= is_IS.UTF-8:is_IS.ISO8859-1 -SAME+= nb_NO.ISO8859-15:nb_NO.ISO8859-1 -SAME+= nn_NO.ISO8859-15:nn_NO.ISO8859-1 -SAME+= se_NO.UTF-8:nn_NO.UTF-8 -SAME+= pt_BR.UTF-8:pt_BR.ISO8859-1 -SAME+= ro_RO.UTF-8:ro_RO.ISO8859-2 -SAME+= sr_Latn_RS.UTF-8:sr_Latn_RS.ISO8859-2 -SAME+= sr_Latn_RS.UTF-8:sr_Cyrl_RS.UTF-8 -SAME+= sr_Latn_RS.UTF-8:sr_Cyrl_RS.ISO8859-5 -SAME+= sv_SE.ISO8859-15:sv_SE.ISO8859-1 -SAME+= zh_Hans_CN.GBK:zh_Hans_CN.GB18030 -SAME+= ko_KR.eucKR:ko_KR.CP949 # legacy (same charset) +SAME+= en_ZA.ISO8859-15 en_ZA.ISO8859-1 +SAME+= en_ZA.ISO8859-15 af_ZA.ISO8859-15 +SAME+= en_ZA.ISO8859-15 af_ZA.ISO8859-1 +SAME+= en_ZA.UTF-8 af_ZA.UTF-8 +SAME+= sl_SI.ISO8859-2 nl_BE.ISO8859-1 +SAME+= sl_SI.ISO8859-2 it_IT.ISO8859-1 +SAME+= sl_SI.ISO8859-2 fr_BE.ISO8859-1 +SAME+= sl_SI.ISO8859-2 eu_ES.ISO8859-1 +SAME+= sl_SI.ISO8859-2 es_ES.ISO8859-1 +SAME+= sl_SI.ISO8859-2 de_DE.ISO8859-1 +SAME+= sl_SI.ISO8859-2 ca_IT.ISO8859-1 +SAME+= sl_SI.ISO8859-2 ca_FR.ISO8859-1 +SAME+= sl_SI.ISO8859-2 ca_ES.ISO8859-1 +SAME+= sl_SI.ISO8859-2 ca_AD.ISO8859-1 +SAME+= nl_BE.ISO8859-15 it_IT.ISO8859-15 +SAME+= nl_BE.ISO8859-15 fr_BE.ISO8859-15 +SAME+= nl_BE.ISO8859-15 eu_ES.ISO8859-15 +SAME+= nl_BE.ISO8859-15 es_ES.ISO8859-15 +SAME+= nl_BE.ISO8859-15 el_GR.ISO8859-7 +SAME+= nl_BE.ISO8859-15 de_DE.ISO8859-15 +SAME+= nl_BE.ISO8859-15 ca_IT.ISO8859-15 +SAME+= nl_BE.ISO8859-15 ca_FR.ISO8859-15 +SAME+= nl_BE.ISO8859-15 ca_ES.ISO8859-15 +SAME+= nl_BE.ISO8859-15 ca_AD.ISO8859-15 +SAME+= sl_SI.UTF-8 nl_BE.UTF-8 +SAME+= sl_SI.UTF-8 it_IT.UTF-8 +SAME+= sl_SI.UTF-8 fr_BE.UTF-8 +SAME+= sl_SI.UTF-8 eu_ES.UTF-8 +SAME+= sl_SI.UTF-8 es_ES.UTF-8 +SAME+= sl_SI.UTF-8 el_GR.UTF-8 +SAME+= sl_SI.UTF-8 de_DE.UTF-8 +SAME+= sl_SI.UTF-8 ca_IT.UTF-8 +SAME+= sl_SI.UTF-8 ca_FR.UTF-8 +SAME+= sl_SI.UTF-8 ca_ES.UTF-8 +SAME+= sl_SI.UTF-8 ca_AD.UTF-8 +SAME+= da_DK.UTF-8 da_DK.ISO8859-15 +SAME+= da_DK.UTF-8 da_DK.ISO8859-1 +SAME+= it_CH.UTF-8 it_CH.ISO8859-15 +SAME+= it_CH.UTF-8 it_CH.ISO8859-1 +SAME+= it_CH.UTF-8 de_CH.UTF-8 +SAME+= it_CH.UTF-8 de_CH.ISO8859-15 +SAME+= it_CH.UTF-8 de_CH.ISO8859-1 +SAME+= en_AU.UTF-8 en_AU.US-ASCII +SAME+= en_AU.UTF-8 en_AU.ISO8859-15 +SAME+= en_AU.UTF-8 en_AU.ISO8859-1 +SAME+= en_CA.UTF-8 en_CA.US-ASCII +SAME+= en_CA.UTF-8 en_CA.ISO8859-15 +SAME+= en_CA.UTF-8 en_CA.ISO8859-1 +SAME+= en_GB.ISO8859-15 en_GB.ISO8859-1 +SAME+= zh_Hant_HK.UTF-8 zh_Hant_HK.Big5HKSCS +SAME+= zh_Hant_HK.UTF-8 en_HK.UTF-8 +SAME+= zh_Hant_HK.UTF-8 en_HK.ISO8859-1 +SAME+= en_NZ.UTF-8 en_NZ.US-ASCII +SAME+= en_NZ.UTF-8 en_NZ.ISO8859-15 +SAME+= en_NZ.UTF-8 en_NZ.ISO8859-1 +SAME+= en_SG.UTF-8 en_SG.ISO8859-1 +SAME+= en_US.UTF-8 en_US.US-ASCII +SAME+= en_US.UTF-8 en_US.ISO8859-15 +SAME+= en_US.UTF-8 en_US.ISO8859-1 +SAME+= es_AR.UTF-8 es_AR.ISO8859-1 +SAME+= es_MX.UTF-8 es_MX.ISO8859-1 +SAME+= sv_FI.ISO8859-1 sk_SK.ISO8859-2 +SAME+= sv_FI.ISO8859-1 pt_PT.ISO8859-1 +SAME+= sv_FI.ISO8859-1 lt_LT.ISO8859-13 +SAME+= sv_FI.ISO8859-1 fr_FR.ISO8859-1 +SAME+= sv_FI.ISO8859-1 fi_FI.ISO8859-1 +SAME+= sv_FI.ISO8859-1 et_EE.ISO8859-1 +SAME+= sv_FI.ISO8859-15 pt_PT.ISO8859-15 +SAME+= sv_FI.ISO8859-15 fr_FR.ISO8859-15 +SAME+= sv_FI.ISO8859-15 fi_FI.ISO8859-15 +SAME+= sv_FI.ISO8859-15 et_EE.ISO8859-15 +SAME+= sk_SK.UTF-8 pt_PT.UTF-8 +SAME+= sk_SK.UTF-8 fr_FR.UTF-8 +SAME+= sk_SK.UTF-8 et_EE.UTF-8 +SAME+= sv_FI.UTF-8 se_FI.UTF-8 +SAME+= sv_FI.UTF-8 lt_LT.UTF-8 +SAME+= sv_FI.UTF-8 fi_FI.UTF-8 +SAME+= fr_CA.ISO8859-15 fr_CA.ISO8859-1 +SAME+= fr_CH.ISO8859-15 fr_CH.ISO8859-1 +SAME+= hr_HR.UTF-8 hr_HR.ISO8859-2 +SAME+= is_IS.UTF-8 is_IS.ISO8859-15 +SAME+= is_IS.UTF-8 is_IS.ISO8859-1 +SAME+= nb_NO.ISO8859-15 nb_NO.ISO8859-1 +SAME+= nn_NO.ISO8859-15 nn_NO.ISO8859-1 +SAME+= se_NO.UTF-8 nn_NO.UTF-8 +SAME+= pt_BR.UTF-8 pt_BR.ISO8859-1 +SAME+= ro_RO.UTF-8 ro_RO.ISO8859-2 +SAME+= sr_Latn_RS.UTF-8 sr_Latn_RS.ISO8859-2 +SAME+= sr_Latn_RS.UTF-8 sr_Cyrl_RS.UTF-8 +SAME+= sr_Latn_RS.UTF-8 sr_Cyrl_RS.ISO8859-5 +SAME+= sv_SE.ISO8859-15 sv_SE.ISO8859-1 +SAME+= zh_Hans_CN.GBK zh_Hans_CN.GB18030 +SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) FILES= ${LOCALES:S/$/.out/} CLEANFILES= ${FILES} -.for f in ${SAME} -SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} \ - ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME} +.for f t in ${SAME} +SYMLINKS+= ../$f/${FILESNAME} \ + ${LOCALEDIR}/$t/${FILESNAME} .endfor .for f in ${LOCALES} Modified: user/alc/PQ_LAUNDRY/share/msgdef/Makefile ============================================================================== --- user/alc/PQ_LAUNDRY/share/msgdef/Makefile Sat Dec 19 18:42:50 2015 (r292469) +++ user/alc/PQ_LAUNDRY/share/msgdef/Makefile Sat Dec 19 19:00:24 2015 (r292470) @@ -83,132 +83,132 @@ LOCALES+= zh_Hant_HK.UTF-8 LOCALES+= zh_Hant_TW.Big5 LOCALES+= zh_Hant_TW.UTF-8 -SAME+= nl_NL.UTF-8:nl_NL.ISO8859-15 -SAME+= nl_NL.UTF-8:nl_NL.ISO8859-1 -SAME+= nl_NL.UTF-8:nl_BE.UTF-8 -SAME+= nl_NL.UTF-8:nl_BE.ISO8859-15 -SAME+= nl_NL.UTF-8:nl_BE.ISO8859-1 -SAME+= nl_NL.UTF-8:af_ZA.UTF-8 -SAME+= nl_NL.UTF-8:af_ZA.ISO8859-15 -SAME+= nl_NL.UTF-8:af_ZA.ISO8859-1 -SAME+= ar_SA.UTF-8:ar_QA.UTF-8 -SAME+= ar_SA.UTF-8:ar_MA.UTF-8 -SAME+= ar_SA.UTF-8:ar_JO.UTF-8 -SAME+= ar_SA.UTF-8:ar_EG.UTF-8 -SAME+= ar_SA.UTF-8:ar_AE.UTF-8 -SAME+= es_MX.ISO8859-1:es_ES.ISO8859-15 -SAME+= es_MX.ISO8859-1:es_ES.ISO8859-1 -SAME+= es_MX.ISO8859-1:es_AR.ISO8859-1 -SAME+= es_MX.ISO8859-1:ca_IT.ISO8859-15 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Sat Dec 19 19:57:36 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 357C0A4B7F6 for ; Sat, 19 Dec 2015 19:57:36 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9AE5B12F5; Sat, 19 Dec 2015 19:57:35 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBJJvYh4031036; Sat, 19 Dec 2015 19:57:34 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBJJvS7e030975; Sat, 19 Dec 2015 19:57:28 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512191957.tBJJvS7e030975@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 19 Dec 2015 19:57:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292475 - in user/ngie/more-tests2: bin/ed contrib/openbsm contrib/openbsm/bin contrib/openbsm/bin/audit contrib/openbsm/bin/auditd contrib/openbsm/bin/auditdistd contrib/openbsm/bin/au... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2015 19:57:36 -0000 Author: ngie Date: Sat Dec 19 19:57:28 2015 New Revision: 292475 URL: https://svnweb.freebsd.org/changeset/base/292475 Log: MFhead @ r292474 Added: user/ngie/more-tests2/contrib/openbsm/.travis.yml - copied unchanged from r292474, head/contrib/openbsm/.travis.yml user/ngie/more-tests2/contrib/openbsm/libbsm/au_notify.3 - copied unchanged from r292474, head/contrib/openbsm/libbsm/au_notify.3 user/ngie/more-tests2/lib/libstand/uuid_from_string.c - copied unchanged from r292474, head/lib/libstand/uuid_from_string.c user/ngie/more-tests2/lib/libstand/uuid_to_string.c - copied unchanged from r292474, head/lib/libstand/uuid_to_string.c user/ngie/more-tests2/sys/arm/arm/machdep_intr.c - copied unchanged from r292474, head/sys/arm/arm/machdep_intr.c user/ngie/more-tests2/sys/geom/sched/gs_delay.c - copied unchanged from r292474, head/sys/geom/sched/gs_delay.c user/ngie/more-tests2/sys/kern/pic_if.m - copied unchanged from r292474, head/sys/kern/pic_if.m user/ngie/more-tests2/sys/kern/subr_intr.c - copied unchanged from r292474, head/sys/kern/subr_intr.c user/ngie/more-tests2/sys/modules/geom/geom_sched/gsched_delay/ - copied from r292474, head/sys/modules/geom/geom_sched/gsched_delay/ user/ngie/more-tests2/sys/riscv/ - copied from r292474, head/sys/riscv/ Deleted: user/ngie/more-tests2/sys/arm/arm/intrng.c user/ngie/more-tests2/sys/arm/arm/pic_if.m Modified: user/ngie/more-tests2/bin/ed/main.c user/ngie/more-tests2/contrib/openbsm/INSTALL user/ngie/more-tests2/contrib/openbsm/LICENSE user/ngie/more-tests2/contrib/openbsm/Makefile.am user/ngie/more-tests2/contrib/openbsm/Makefile.in user/ngie/more-tests2/contrib/openbsm/NEWS user/ngie/more-tests2/contrib/openbsm/README user/ngie/more-tests2/contrib/openbsm/TODO user/ngie/more-tests2/contrib/openbsm/VERSION user/ngie/more-tests2/contrib/openbsm/autogen.sh user/ngie/more-tests2/contrib/openbsm/bin/Makefile.am user/ngie/more-tests2/contrib/openbsm/bin/audit/Makefile.am user/ngie/more-tests2/contrib/openbsm/bin/audit/audit.8 user/ngie/more-tests2/contrib/openbsm/bin/audit/audit.c user/ngie/more-tests2/contrib/openbsm/bin/auditd/Makefile.am user/ngie/more-tests2/contrib/openbsm/bin/auditd/audit_triggers.defs user/ngie/more-tests2/contrib/openbsm/bin/auditd/audit_warn.c user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.8 user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.c user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.h user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_control.defs user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_darwin.c user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_fbsd.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/Makefile.am user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.8 user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/faccessat.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/fstatat.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/openat.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/parse.y user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/pjdlog.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/pjdlog.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_common.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_impl.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_socketpair.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_tcp.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_tls.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_uds.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/receiver.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/renameat.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sandbox.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sandbox.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sender.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sigtimedwait.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/strndup.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/subr.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/subr.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/synch.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/token.l user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/trail.c user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/trail.h user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/unlinkat.h user/ngie/more-tests2/contrib/openbsm/bin/auditfilterd/Makefile.am user/ngie/more-tests2/contrib/openbsm/bin/auditfilterd/auditfilterd.8 user/ngie/more-tests2/contrib/openbsm/bin/auditfilterd/auditfilterd.c user/ngie/more-tests2/contrib/openbsm/bin/auditfilterd/auditfilterd.h user/ngie/more-tests2/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c user/ngie/more-tests2/contrib/openbsm/bin/auditreduce/Makefile.am user/ngie/more-tests2/contrib/openbsm/bin/auditreduce/auditreduce.1 user/ngie/more-tests2/contrib/openbsm/bin/auditreduce/auditreduce.c user/ngie/more-tests2/contrib/openbsm/bin/auditreduce/auditreduce.h user/ngie/more-tests2/contrib/openbsm/bin/praudit/Makefile.am user/ngie/more-tests2/contrib/openbsm/bin/praudit/praudit.1 user/ngie/more-tests2/contrib/openbsm/bin/praudit/praudit.c user/ngie/more-tests2/contrib/openbsm/bsm/Makefile.am user/ngie/more-tests2/contrib/openbsm/bsm/audit_filter.h user/ngie/more-tests2/contrib/openbsm/bsm/audit_uevents.h user/ngie/more-tests2/contrib/openbsm/bsm/auditd_lib.h user/ngie/more-tests2/contrib/openbsm/bsm/libbsm.h user/ngie/more-tests2/contrib/openbsm/compat/clock_gettime.h user/ngie/more-tests2/contrib/openbsm/compat/closefrom.h user/ngie/more-tests2/contrib/openbsm/compat/compat.h user/ngie/more-tests2/contrib/openbsm/compat/endian.h user/ngie/more-tests2/contrib/openbsm/compat/endian_enc.h user/ngie/more-tests2/contrib/openbsm/compat/flopen.h user/ngie/more-tests2/contrib/openbsm/compat/pidfile.h user/ngie/more-tests2/contrib/openbsm/compat/queue.h user/ngie/more-tests2/contrib/openbsm/compat/strlcat.h user/ngie/more-tests2/contrib/openbsm/compat/strlcpy.h user/ngie/more-tests2/contrib/openbsm/config/config.h user/ngie/more-tests2/contrib/openbsm/configure user/ngie/more-tests2/contrib/openbsm/configure.ac user/ngie/more-tests2/contrib/openbsm/etc/audit_class user/ngie/more-tests2/contrib/openbsm/etc/audit_control user/ngie/more-tests2/contrib/openbsm/etc/audit_event user/ngie/more-tests2/contrib/openbsm/etc/audit_filter user/ngie/more-tests2/contrib/openbsm/etc/audit_user user/ngie/more-tests2/contrib/openbsm/etc/audit_warn user/ngie/more-tests2/contrib/openbsm/libauditd/Makefile.am user/ngie/more-tests2/contrib/openbsm/libauditd/auditd_lib.c user/ngie/more-tests2/contrib/openbsm/libauditd/libauditd.3 user/ngie/more-tests2/contrib/openbsm/libbsm/Makefile.am user/ngie/more-tests2/contrib/openbsm/libbsm/Makefile.in user/ngie/more-tests2/contrib/openbsm/libbsm/au_class.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_control.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_domain.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_errno.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_event.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_fcntl_cmd.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_free_token.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_io.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_mask.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_open.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_socket_type.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_token.3 user/ngie/more-tests2/contrib/openbsm/libbsm/au_user.3 user/ngie/more-tests2/contrib/openbsm/libbsm/audit_submit.3 user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_audit.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_class.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_control.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_domain.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_errno.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_event.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_fcntl.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_flags.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_io.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_mask.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_notify.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_socket_type.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_token.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_user.c user/ngie/more-tests2/contrib/openbsm/libbsm/bsm_wrappers.c user/ngie/more-tests2/contrib/openbsm/libbsm/libbsm.3 user/ngie/more-tests2/contrib/openbsm/man/Makefile.am user/ngie/more-tests2/contrib/openbsm/man/Makefile.in user/ngie/more-tests2/contrib/openbsm/man/audit.2 user/ngie/more-tests2/contrib/openbsm/man/audit.log.5 user/ngie/more-tests2/contrib/openbsm/man/audit_class.5 user/ngie/more-tests2/contrib/openbsm/man/audit_control.5 user/ngie/more-tests2/contrib/openbsm/man/audit_event.5 user/ngie/more-tests2/contrib/openbsm/man/audit_user.5 user/ngie/more-tests2/contrib/openbsm/man/audit_warn.5 user/ngie/more-tests2/contrib/openbsm/man/auditctl.2 user/ngie/more-tests2/contrib/openbsm/man/auditon.2 user/ngie/more-tests2/contrib/openbsm/man/getaudit.2 user/ngie/more-tests2/contrib/openbsm/man/getauid.2 user/ngie/more-tests2/contrib/openbsm/man/setaudit.2 user/ngie/more-tests2/contrib/openbsm/man/setauid.2 user/ngie/more-tests2/contrib/openbsm/modules/Makefile.am user/ngie/more-tests2/contrib/openbsm/modules/auditfilter_noop/Makefile.am user/ngie/more-tests2/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c user/ngie/more-tests2/contrib/openbsm/sys/Makefile.am user/ngie/more-tests2/contrib/openbsm/sys/bsm/Makefile.am user/ngie/more-tests2/contrib/openbsm/sys/bsm/audit.h user/ngie/more-tests2/contrib/openbsm/sys/bsm/audit_domain.h user/ngie/more-tests2/contrib/openbsm/sys/bsm/audit_errno.h user/ngie/more-tests2/contrib/openbsm/sys/bsm/audit_fcntl.h user/ngie/more-tests2/contrib/openbsm/sys/bsm/audit_internal.h user/ngie/more-tests2/contrib/openbsm/sys/bsm/audit_kevents.h user/ngie/more-tests2/contrib/openbsm/sys/bsm/audit_record.h user/ngie/more-tests2/contrib/openbsm/sys/bsm/audit_socket_type.h user/ngie/more-tests2/contrib/openbsm/test/Makefile.am user/ngie/more-tests2/contrib/openbsm/test/bsm/Makefile.am user/ngie/more-tests2/contrib/openbsm/test/bsm/generate.c user/ngie/more-tests2/contrib/openbsm/tools/Makefile.am user/ngie/more-tests2/contrib/openbsm/tools/audump.c user/ngie/more-tests2/crypto/openssh/digest-libc.c user/ngie/more-tests2/include/netdb.h user/ngie/more-tests2/lib/libbsm/Makefile user/ngie/more-tests2/lib/libc/net/getaddrinfo.3 user/ngie/more-tests2/lib/libc/net/getaddrinfo.c user/ngie/more-tests2/lib/libstand/Makefile user/ngie/more-tests2/libexec/rtld-elf/rtld.c user/ngie/more-tests2/share/colldef/Makefile user/ngie/more-tests2/share/ctypedef/Makefile user/ngie/more-tests2/share/man/man4/ioat.4 user/ngie/more-tests2/share/monetdef/Makefile user/ngie/more-tests2/share/msgdef/Makefile user/ngie/more-tests2/share/numericdef/Makefile user/ngie/more-tests2/share/timedef/Makefile user/ngie/more-tests2/sys/amd64/amd64/machdep.c user/ngie/more-tests2/sys/arm/allwinner/a20/a20_mp.c user/ngie/more-tests2/sys/arm/altera/socfpga/socfpga_mp.c user/ngie/more-tests2/sys/arm/amlogic/aml8726/aml8726_mp.c user/ngie/more-tests2/sys/arm/annapurna/alpine/alpine_machdep_mp.c user/ngie/more-tests2/sys/arm/arm/exception.S user/ngie/more-tests2/sys/arm/arm/gic.c user/ngie/more-tests2/sys/arm/arm/intr.c user/ngie/more-tests2/sys/arm/arm/mp_machdep.c user/ngie/more-tests2/sys/arm/arm/nexus.c user/ngie/more-tests2/sys/arm/freescale/imx/imx6_mp.c user/ngie/more-tests2/sys/arm/freescale/imx/imx_gpio.c user/ngie/more-tests2/sys/arm/freescale/imx/imx_sdhci.c user/ngie/more-tests2/sys/arm/include/intr.h user/ngie/more-tests2/sys/arm/include/smp.h user/ngie/more-tests2/sys/arm/qemu/virt_mp.c user/ngie/more-tests2/sys/arm/rockchip/rk30xx_mp.c user/ngie/more-tests2/sys/arm/samsung/exynos/exynos5_mp.c user/ngie/more-tests2/sys/arm/ti/aintc.c user/ngie/more-tests2/sys/arm/ti/omap4/omap4_mp.c user/ngie/more-tests2/sys/arm/xilinx/zy7_mp.c user/ngie/more-tests2/sys/arm64/include/ofw_machdep.h user/ngie/more-tests2/sys/boot/efi/loader/bootinfo.c user/ngie/more-tests2/sys/conf/Makefile.mips user/ngie/more-tests2/sys/conf/files.arm user/ngie/more-tests2/sys/conf/kern.mk user/ngie/more-tests2/sys/conf/kmod.mk user/ngie/more-tests2/sys/dev/drm2/i915/intel_iic.c user/ngie/more-tests2/sys/dev/drm2/ttm/ttm_bo.c user/ngie/more-tests2/sys/dev/drm2/ttm/ttm_page_alloc.c user/ngie/more-tests2/sys/dev/if_ndis/if_ndis_pci.c user/ngie/more-tests2/sys/dev/ioat/ioat.c user/ngie/more-tests2/sys/dev/ioat/ioat.h user/ngie/more-tests2/sys/dev/ioat/ioat_hw.h user/ngie/more-tests2/sys/dev/mmc/mmc.c user/ngie/more-tests2/sys/dev/nand/nand_cdev.c user/ngie/more-tests2/sys/dev/nand/nand_geom.c user/ngie/more-tests2/sys/dev/ofw/ofw_bus_subr.c user/ngie/more-tests2/sys/dev/ofw/ofw_bus_subr.h user/ngie/more-tests2/sys/kern/kern_proc.c user/ngie/more-tests2/sys/mips/include/pmap.h user/ngie/more-tests2/sys/mips/mips/pmap.c user/ngie/more-tests2/sys/mips/mips/uma_machdep.c user/ngie/more-tests2/sys/modules/geom/geom_sched/Makefile user/ngie/more-tests2/sys/net/if.c user/ngie/more-tests2/sys/net/if_lagg.c user/ngie/more-tests2/sys/net/if_lagg.h user/ngie/more-tests2/sys/net/if_var.h user/ngie/more-tests2/sys/netinet/if_ether.c user/ngie/more-tests2/sys/netinet/if_ether.h user/ngie/more-tests2/sys/netinet/in_var.h user/ngie/more-tests2/sys/netinet/ip_carp.c user/ngie/more-tests2/sys/netinet6/in6.c user/ngie/more-tests2/sys/netinet6/in6_var.h user/ngie/more-tests2/sys/netinet6/nd6.c user/ngie/more-tests2/sys/netinet6/nd6.h user/ngie/more-tests2/sys/netinet6/nd6_nbr.c user/ngie/more-tests2/sys/powerpc/conf/GENERIC64 user/ngie/more-tests2/sys/powerpc/pseries/phyp_llan.c user/ngie/more-tests2/sys/sys/efi.h user/ngie/more-tests2/sys/sys/linker.h user/ngie/more-tests2/sys/sys/proc.h user/ngie/more-tests2/sys/vm/device_pager.c user/ngie/more-tests2/sys/vm/sg_pager.c user/ngie/more-tests2/sys/vm/vm_kern.c user/ngie/more-tests2/sys/vm/vm_page.c user/ngie/more-tests2/sys/vm/vm_page.h user/ngie/more-tests2/sys/vm/vm_pageout.c user/ngie/more-tests2/sys/vm/vm_pageout.h user/ngie/more-tests2/sys/vm/vm_phys.c user/ngie/more-tests2/sys/vm/vm_phys.h user/ngie/more-tests2/sys/vm/vm_reserv.c user/ngie/more-tests2/sys/vm/vm_reserv.h user/ngie/more-tests2/tools/tools/locale/tools/cldr2def.pl user/ngie/more-tests2/tools/tools/locale/tools/finalize (contents, props changed) user/ngie/more-tests2/usr.bin/calendar/calendars/calendar.freebsd user/ngie/more-tests2/usr.sbin/boot0cfg/boot0cfg.c user/ngie/more-tests2/usr.sbin/ndp/ndp.c user/ngie/more-tests2/usr.sbin/ypserv/Makefile.yp Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/contrib/openbsm/ (props changed) user/ngie/more-tests2/crypto/openssh/ (props changed) user/ngie/more-tests2/include/ (props changed) user/ngie/more-tests2/lib/libc/ (props changed) user/ngie/more-tests2/share/ (props changed) user/ngie/more-tests2/share/man/man4/ (props changed) user/ngie/more-tests2/sys/ (props changed) user/ngie/more-tests2/sys/boot/ (props changed) user/ngie/more-tests2/sys/conf/ (props changed) user/ngie/more-tests2/usr.bin/calendar/ (props changed) Modified: user/ngie/more-tests2/bin/ed/main.c ============================================================================== --- user/ngie/more-tests2/bin/ed/main.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/bin/ed/main.c Sat Dec 19 19:57:28 2015 (r292475) @@ -505,7 +505,8 @@ exec_command(void) return ERR; else if (open_sbuf() < 0) return FATAL; - if (*fnp && *fnp != '!') strcpy(old_filename, fnp); + if (*fnp && *fnp != '!') + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; @@ -532,7 +533,8 @@ exec_command(void) return ERR; } GET_COMMAND_SUFFIX(); - if (*fnp) strcpy(old_filename, fnp); + if (*fnp) + strlcpy(old_filename, fnp, PATH_MAX); printf("%s\n", strip_escapes(old_filename)); break; case 'g': @@ -663,7 +665,7 @@ exec_command(void) GET_COMMAND_SUFFIX(); if (!isglobal) clear_undo_stack(); if (*old_filename == '\0' && *fnp != '!') - strcpy(old_filename, fnp); + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; @@ -797,7 +799,7 @@ exec_command(void) return ERR; GET_COMMAND_SUFFIX(); if (*old_filename == '\0' && *fnp != '!') - strcpy(old_filename, fnp); + strlcpy(old_filename, fnp, PATH_MAX); #ifdef BACKWARDS if (*fnp == '\0' && *old_filename == '\0') { errmsg = "no current filename"; Copied: user/ngie/more-tests2/contrib/openbsm/.travis.yml (from r292474, head/contrib/openbsm/.travis.yml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/contrib/openbsm/.travis.yml Sat Dec 19 19:57:28 2015 (r292475, copy of r292474, head/contrib/openbsm/.travis.yml) @@ -0,0 +1,18 @@ +language: c + +compiler: + - clang + - gcc + +os: + - linux + - osx + +before_install: + - if [ $TRAVIS_OS_NAME == "linux" ]; then + sudo apt-get -qq update; + sudo apt-get -qq install byacc flex; + elif [ $TRAVIS_OS_NAME == "osx" ]; then + brew update; + brew install byacc flex; + fi Modified: user/ngie/more-tests2/contrib/openbsm/INSTALL ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/INSTALL Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/INSTALL Sat Dec 19 19:57:28 2015 (r292475) @@ -3,7 +3,7 @@ OpenBSM Build and Installation Instructi OpenBSM is currently built using autoconf and automake, which should allow for building on a range of operating systems, including FreeBSD, Mac OS X, and Linux. Some components are built only if appropriate kernel audit -suppport is found. Typical builds will be performed using: +support is found. Typical builds will be performed using: ./configure make @@ -31,7 +31,7 @@ not configurable. You may wish to specify that the OpenBSM components not be installed in the base system, rather in a specific directory. This may be done using the --prefix argument to configure. If installing to a specific directory, -remember to update your library path so that running tools from that +remember to update your library path so that when running tools from that directory the correct libbsm is used: ./configure --prefix=/home/rwatson/openbsm Modified: user/ngie/more-tests2/contrib/openbsm/LICENSE ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/LICENSE Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/LICENSE Sat Dec 19 19:57:28 2015 (r292475) @@ -34,5 +34,3 @@ as a whole: The TrustedBSD Project would appreciate the contribution of fixes and enhancements under an identical license in order to avoid potentially confusing license proliferation. - -$P4: //depot/projects/trustedbsd/openbsm/LICENSE#6 $ Modified: user/ngie/more-tests2/contrib/openbsm/Makefile.am ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/Makefile.am Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/Makefile.am Sat Dec 19 19:57:28 2015 (r292475) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#5 $ -## - SUBDIRS = \ bsm Modified: user/ngie/more-tests2/contrib/openbsm/Makefile.in ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/Makefile.in Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/Makefile.in Sat Dec 19 19:57:28 2015 (r292475) @@ -59,9 +59,9 @@ DIST_COMMON = README $(am__configure_dep $(top_srcdir)/config/config.sub \ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ $(top_srcdir)/config/missing $(top_srcdir)/configure INSTALL \ - NEWS TODO config/config.guess config/config.sub config/depcomp \ - config/install-sh config/ltmain.sh config/missing \ - config/ylwrap + NEWS TODO config/compile config/config.guess config/config.sub \ + config/depcomp config/install-sh config/ltmain.sh \ + config/missing config/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ Modified: user/ngie/more-tests2/contrib/openbsm/NEWS ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/NEWS Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/NEWS Sat Dec 19 19:57:28 2015 (r292475) @@ -1,5 +1,16 @@ OpenBSM Version History +OpenBSM 1.2 alpha 4 + +- Fix praudit to emit correct XML. +- Fix auditdistd bugs related to IPv6 support, locking, and a kqueue-related + descriptor leak. +- Add audit event definitions for Capsicum-related syscalls, as well as + AUE_BINDAT and AUE_CONNECTAT. +- Manpage symlinks for all libbsm functions are installed again after the + move to autotools in OpenBSM 1.0 Alpha 5. +- A variety of minor documentation cleanups. + OpenBSM 1.2 alpha 3 - Various minor tweaks to the auditdistd build to make it fit the FreeBSD @@ -494,5 +505,3 @@ OpenBSM 1.0 alpha 1 - auditd(8), audit(8) added to the OpenBSM distribution. auditd extended to support reloading of kernel event table. - Allow comments in /etc/security configuration files. - -$P4: //depot/projects/trustedbsd/openbsm/NEWS#55 $ Modified: user/ngie/more-tests2/contrib/openbsm/README ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/README Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/README Sat Dec 19 19:57:28 2015 (r292475) @@ -1,4 +1,4 @@ -OpenBSM 1.2a2 +OpenBSM Introduction @@ -10,7 +10,7 @@ of several organizations. OpenBSM includes several command line tools, including auditreduce(8) and praudit(8) for reducing and printing audit trails, as well as the libbsm(3) library to manage configuration files, generate audit records, and parse and -print audit trils. +print audit trails. Coupled with a kernel audit implementation, OpenBSM can be used to maintain system audit streams, and is a foundation for a full audit-enabled system. @@ -64,5 +64,3 @@ Information on OpenBSM may be found on t Information on TrustedBSD may be found on the TrustedBSD home page: http://www.TrustedBSD.org/ - -$P4: //depot/projects/trustedbsd/openbsm/README#41 $ Modified: user/ngie/more-tests2/contrib/openbsm/TODO ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/TODO Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/TODO Sat Dec 19 19:57:28 2015 (r292475) @@ -7,8 +7,6 @@ OpenBSM TODO - Document contents of libbsm "public" data structures in libbsm man pages. - The audit.log.5 man page is incomplete, as it does not describe all token types. -- With the move to autoconf/automake, man page symlinks are no longer - installed. This needs to be fixed. - It might be desirable to be able to provide EOPNOTSUPP system call stubs on systems that don't have the necessary audit system calls; that would allow the full libbsm and tool set to build, just not run. @@ -23,5 +21,3 @@ OpenBSM TODO not available on the local OS platform. - Support for client certificates in auditdistd, to include certificate chain validation. - -$P4: //depot/projects/trustedbsd/openbsm/TODO#14 $ Modified: user/ngie/more-tests2/contrib/openbsm/VERSION ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/VERSION Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/VERSION Sat Dec 19 19:57:28 2015 (r292475) @@ -1 +1 @@ -OPENBSM_1_2_alpha3 +OPENBSM_1_2_alpha4 Modified: user/ngie/more-tests2/contrib/openbsm/autogen.sh ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/autogen.sh Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/autogen.sh Sat Dec 19 19:57:28 2015 (r292475) @@ -1,7 +1,4 @@ #!/bin/sh -# -# $P4: //depot/projects/trustedbsd/openbsm/autogen.sh#2 $ -# libtoolize --copy --force aclocal Modified: user/ngie/more-tests2/contrib/openbsm/bin/Makefile.am ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/Makefile.am Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/Makefile.am Sat Dec 19 19:57:28 2015 (r292475) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#4 $ -## - SUBDIRS = \ auditdistd \ auditfilterd \ Modified: user/ngie/more-tests2/contrib/openbsm/bin/audit/Makefile.am ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/audit/Makefile.am Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/audit/Makefile.am Sat Dec 19 19:57:28 2015 (r292475) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#7 $ -## - if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) else Modified: user/ngie/more-tests2/contrib/openbsm/bin/audit/audit.8 ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/audit/audit.8 Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/audit/audit.8 Sat Dec 19 19:57:28 2015 (r292475) @@ -25,9 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#16 $ -.\" -.Dd January 29, 2009 +.Dd July 25, 2015 .Dt AUDIT 8 .Os .Sh NAME @@ -88,7 +86,7 @@ Audit policy file used to configure the .Xr audit 4 , .Xr audit_control 5 , .Xr auditd 8 , -.Xr launchd 8 +.Xr launchd 8 (Mac OS X) .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. Modified: user/ngie/more-tests2/contrib/openbsm/bin/audit/audit.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/audit/audit.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/audit/audit.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#15 $ */ /* * Program to trigger the audit daemon with a message that is either: Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditd/Makefile.am ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditd/Makefile.am Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditd/Makefile.am Sat Dec 19 19:57:28 2015 (r292475) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#6 $ -## - if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) else Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditd/audit_triggers.defs ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditd/audit_triggers.defs Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditd/audit_triggers.defs Sat Dec 19 19:57:28 2015 (r292475) @@ -1,5 +1 @@ -/* - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_triggers.defs#1 $ - */ - #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditd/audit_warn.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditd/audit_warn.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditd/audit_warn.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#11 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.8 ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.8 Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.8 Sat Dec 19 19:57:28 2015 (r292475) @@ -25,9 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#19 $ -.\" -.Dd December 11, 2008 +.Dd July 25, 2015 .Dt AUDITD 8 .Os .Sh NAME @@ -123,7 +121,7 @@ and are no longer available as arguments .Xr audit_warn 5 , .Xr audit 8 , .Xr auditdistd 8 , -.Xr launchd 8 +.Xr launchd 8 (Mac OS X) .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#50 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#13 $ */ #ifndef _AUDITD_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_control.defs ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_control.defs Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_control.defs Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_control.defs#2 $ */ /* Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_darwin.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_darwin.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_darwin.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#5 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_fbsd.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_fbsd.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditd/auditd_fbsd.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#4 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/Makefile.am ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/Makefile.am Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/Makefile.am Sat Dec 19 19:57:28 2015 (r292475) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/Makefile.am#1 $ -## - if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) else Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.8 ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.8 Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.8 Sat Dec 19 19:57:28 2015 (r292475) @@ -41,7 +41,7 @@ .Sh DESCRIPTION The .Nm -daemon is responsible for distributing audit trail files over TCP/IP network in +daemon is responsible for distributing audit trail files over a TCP/IP network in a secure and reliable way. .Pp The @@ -49,7 +49,7 @@ The daemon can be started with the following command line arguments: .Bl -tag -width ".Fl P Ar pidfile" .It Fl c Ar config -Specify alternative location of the configuration file. +Specify an alternative location of the configuration file. The default location is .Pa /etc/security/auditdistd.conf . Note: the configuration file may contain passwords. @@ -74,7 +74,7 @@ usage message. Start in a launchd-friendly mode, ie. do not use .Xr daemon 3 . .It Fl P Ar pidfile -Specify alternative location of a file where main process PID will be +Specify an alternative location of a file where main process PID will be stored. The default location is .Pa /var/run/auditdistd.pid . Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#3 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 Sat Dec 19 19:57:28 2015 (r292475) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 22, 2011 +.Dd July 1, 2015 .Dt AUDITDISTD.CONF 5 .Os .Sh NAME @@ -37,19 +37,21 @@ daemon. .Sh DESCRIPTION Note: the configuration file may contain passwords. -Care should be taken to configure proper permissions on this file -.Li ( eg. 0600 ) . +Care should be taken to configure proper permissions for this file +.Li ( e.g., 0600 ) . .Pp -Every line starting with # is treated as comment and ignored. +Every line starting with +.Li # +gets treated as a comment and is ignored. .Sh CONFIGURATION FILE SYNTAX -General syntax of the +The general syntax of the .Nm -file is following: -.Bd -literal -offset +file is as follows: +.Bd -literal ## Global section. # Our name. -# The default is first part of the hostname. +# The default is the first part of the hostname. name "" # Connection timeout. @@ -71,11 +73,11 @@ sender { # The default is /var/audit/dist. directory "" .\" -.\" # Checksum algorithm for data send over the wire. +.\" # Checksum algorithm for data sent over the wire. .\" # The default is none. .\" checksum "" .\" -.\" # Compression algorithm for data send over the wire. +.\" # Compression algorithm for data sent over the wire. .\" # The default is none. .\" compression "" @@ -86,7 +88,7 @@ sender { # Optional. source "" - # Address of auditdistd receiver. + # Address of the auditdistd receiver. # No default. Obligatory. remote "" @@ -95,7 +97,7 @@ sender { directory "" # Fingerprint of the receiver's public key when using TLS - # for connection. + # for connections. # Example fingerprint: # SHA256=8F:0A:FC:8A:3D:09:80:AF:D9:AA:38:CC:8A:86:53:E6:8F:B6:1C:55:30:14:D7:F9:AA:8B:3E:73:CD:F5:76:2B fingerprint "" @@ -103,37 +105,37 @@ sender { # Password used to authenticate in front of the receiver. password "" .\" -.\" # Checksum algorithm for data send over the wire. +.\" # Checksum algorithm for data sent over the wire. .\" # The default is none. .\" checksum "" .\" -.\" # Compression algorithm for data send over the wire. +.\" # Compression algorithm for data sent over the wire. .\" # The default is none. .\" compression "" } - # Currently local audit trail files can be send only to one remote + # Currently local audit trail files can be sent only to one remote # auditdistd receiver, but this can change in the future. } receiver { ## Receiver section. - # Address to listen on. Multiple listen addresses might be specified. + # Address to listen on. Multiple listen addresses may be specified. # The defaults are "tcp4://0.0.0.0:7878" and "tcp6://[::]:7878". listen "" # Base directory. - # If directory in host section is no absolute, it will be concatenated - # with this base directory. + # If the directory in the host section is not absolute, it will be + # concatenated with this base directory. # The default is "/var/audit/remote". directory "" - # Path to receiver's certificate file. + # Path to the receiver's certificate file. # The default is "/etc/security/auditdistd.cert.pem". certfile "" - # Path to receiver's private key file. + # Path to the receiver's private key file. # The default is "/etc/security/auditdistd.key.pem". keyfile "" @@ -158,7 +160,7 @@ receiver { .Ed .Pp Most of the various available configuration parameters are optional. -If parameter is not defined in the particular section, it will be +If a parameter is not defined in the particular section, it will be inherited from the parent section if possible. For example, if the .Ic source @@ -172,14 +174,14 @@ In case the section does not define the .Ic source parameter at all, the default value will be used. -.Sh CONFIGURATION FILE DESCRIPTION +.Sh CONFIGURATION OPTION DESCRIPTION The following statements are available: .Bl -tag -width ".Ic xxxx" .It Ic name Aq name .Pp This host's name. -It is send to the receiver, so it can properly recognize us if there are -more than one sender coming from the same IP address. +It is sent to the receiver, so it can properly recognize us if there are +multiple senders coming from the same IP address. .It Ic timeout Aq seconds .Pp Connection timeout in seconds. @@ -198,17 +200,17 @@ The default value is Local address to bind to before connecting to the remote .Nm auditdistd daemon. -Format is the same as for the +The format is the same as for the .Ic listen statement. .It Ic directory Aq path .Pp -Directory where to look for audit trail files in case of sender mode or -directory where to store received audit trail files. +The directory where to look for audit trail files in case of sender mode, or +the directory where to store received audit trail files. The provided path has to be an absolute path. -The only exception is when directory is provided in the +The only exception is when the directory is provided in the .Ic receiver -section, then path provided in the +section; then the path provided in the .Ic host subsections can be relative to the directory in the .Ic receiver @@ -229,13 +231,13 @@ subsections in the .Ic receiver section where .Aq name -is host's name. +is the host's name. .\".It Ic checksum Aq algorithm .\".Pp .\"Checksum algorithm should be one of the following: .\".Bl -tag -width ".Ic sha256" .\".It Ic none -.\"No checksum will be calculated for the data being send over the network. +.\"No checksum will be calculated for the data being sent over the network. .\"This is the default setting. .\".It Ic crc32 .\"CRC32 checksum will be calculated. @@ -247,30 +249,30 @@ is host's name. .\"Compression algorithm should be one of the following: .\".Bl -tag -width ".Ic none" .\".It Ic none -.\"Data send over the network will not be compressed. +.\"Data sent over the network will not be compressed. .\"This is the default setting. .\".It Ic lzf .\"The .\".Nm LZF .\"algorithm by .\".An Marc Alexander Lehmann -.\"will be used to compress the data send over the network. +.\"will be used to compress the data sent over the network. .\".Nm LZF -.\"is very fast, general purpose compression algorithm. +.\"is a very fast, general purpose compression algorithm. .\".El .It Ic remote Aq addr .Pp Address of the remote .Nm auditdistd daemon. -Format is the same as for the +The format is the same as for the .Ic listen statement. -When operating in the +When operating in .Ic sender mode this address will be used to connect to the .Ic receiver . -When operating in the +When operating in .Ic receiver mode only connections from this address will be accepted. .It Ic listen Aq addr @@ -296,21 +298,22 @@ By default listens on .Pa tcp4://0.0.0.0:7878 and -.Pa tcp6://[::]:7878 -if kernel supports IPv4 and IPv6 respectively. +.Pa tcp6://[::]:7878 , +if the kernel supports IPv4 and IPv6 respectively. .It Ic keyfile Aq path .Pp -Path to a file that contains private key for TLS communication. +Path to a file that contains the private key for TLS communication. .It Ic certfile Aq path .Pp -Path to a file that contains certificate for TLS communication. +Path to a file that contains the certificate for TLS communication. .It Ic fingerprint Aq algo=hash .Pp -Finger print of the receiver's public key. -Currently only SHA256 algorithm is supported. -Certificate public key's fingerprint ready to be pasted into auditdistd +Fingerprint of the receiver's public key. +Currently only the SHA256 algorithm is supported. +The certificate public key's fingerprint ready to be pasted into the +.Nm auditdistd configuration file can be obtained by running: -.Bd -literal -offset +.Bd -literal # openssl x509 -in /etc/security/auditdistd.cert.pem -noout -fingerprint -sha256 | awk -F '[ =]' '{printf("%s=%s\\n", $1, $3)}' .Ed .It Ic password Aq password @@ -352,10 +355,10 @@ receiver { .Ed .Sh SEE ALSO .Xr audit 4 , -.Xr auditdistd 8 . +.Xr auditdistd 8 .Sh AUTHORS The .Nm auditdistd -was developed by +daemon was developed by .An Pawel Jakub Dawidek Aq pawel@dawidek.net under sponsorship of the FreeBSD Foundation. Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/auditdistd.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.h#2 $ */ #ifndef _AUDITDISTD_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/faccessat.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/faccessat.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/faccessat.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/faccessat.h#1 $ */ #ifndef _FACCESSAT_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/fstatat.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/fstatat.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/fstatat.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/fstatat.h#1 $ */ #ifndef _FSTATAT_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/openat.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/openat.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/openat.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/openat.h#1 $ */ #ifndef _OPENAT_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/parse.y ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/parse.y Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/parse.y Sat Dec 19 19:57:28 2015 (r292475) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#5 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/pjdlog.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/pjdlog.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/pjdlog.c Sat Dec 19 19:57:28 2015 (r292475) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/pjdlog.c#1 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/pjdlog.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/pjdlog.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/pjdlog.h Sat Dec 19 19:57:28 2015 (r292475) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/pjdlog.h#1 $ */ #ifndef _PJDLOG_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto.c#1 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto.h#1 $ */ #ifndef _PROTO_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_common.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_common.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_common.c Sat Dec 19 19:57:28 2015 (r292475) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_common.c#1 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_impl.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_impl.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_impl.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_impl.h#1 $ */ #ifndef _PROTO_IMPL_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_socketpair.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_socketpair.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_socketpair.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_socketpair.c#1 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_tcp.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_tcp.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_tcp.c Sat Dec 19 19:57:28 2015 (r292475) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#2 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_tls.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_tls.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_tls.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#2 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_uds.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_uds.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/proto_uds.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#2 $ */ /* UDS - UNIX Domain Socket */ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/receiver.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/receiver.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/receiver.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#3 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/renameat.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/renameat.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/renameat.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/renameat.h#1 $ */ #ifndef _RENAMEAT_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sandbox.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sandbox.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sandbox.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#3 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sandbox.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sandbox.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sandbox.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.h#1 $ */ #ifndef _SANDBOX_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sender.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sender.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sender.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#3 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sigtimedwait.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sigtimedwait.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/sigtimedwait.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sigtimedwait.h#2 $ */ #ifndef _SIGTIMEDWAIT_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/strndup.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/strndup.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/strndup.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/strndup.h#1 $ */ #ifndef _STRNDUP_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/subr.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/subr.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/subr.c Sat Dec 19 19:57:28 2015 (r292475) @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#3 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/subr.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/subr.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/subr.h Sat Dec 19 19:57:28 2015 (r292475) @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.h#1 $ */ #ifndef _AUDITDISTD_SUBR_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/synch.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/synch.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/synch.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#3 $ */ #ifndef _SYNCH_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/token.l ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/token.l Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/token.l Sat Dec 19 19:57:28 2015 (r292475) @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#2 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/trail.c ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/trail.c Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/trail.c Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#3 $ */ #include Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/trail.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/trail.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/trail.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.h#1 $ */ #ifndef _AUDITDISTD_TRAIL_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/unlinkat.h ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/unlinkat.h Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditdistd/unlinkat.h Sat Dec 19 19:57:28 2015 (r292475) @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/unlinkat.h#1 $ */ #ifndef _UNLINKAT_H_ Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditfilterd/Makefile.am ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditfilterd/Makefile.am Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditfilterd/Makefile.am Sat Dec 19 19:57:28 2015 (r292475) @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#4 $ -## - if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) else Modified: user/ngie/more-tests2/contrib/openbsm/bin/auditfilterd/auditfilterd.8 ============================================================================== --- user/ngie/more-tests2/contrib/openbsm/bin/auditfilterd/auditfilterd.8 Sat Dec 19 19:20:48 2015 (r292474) +++ user/ngie/more-tests2/contrib/openbsm/bin/auditfilterd/auditfilterd.8 Sat Dec 19 19:57:28 2015 (r292475) @@ -23,8 +23,6 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Sat Dec 19 20:19:43 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BA2AA4C62E for ; Sat, 19 Dec 2015 20:19:43 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C0DB1C08; Sat, 19 Dec 2015 20:19:43 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBJKJgco037184; Sat, 19 Dec 2015 20:19:42 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBJKJgw2037183; Sat, 19 Dec 2015 20:19:42 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201512192019.tBJKJgw2037183@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sat, 19 Dec 2015 20:19:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292476 - user/alc/PQ_LAUNDRY/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2015 20:19:43 -0000 Author: alc Date: Sat Dec 19 20:19:42 2015 New Revision: 292476 URL: https://svnweb.freebsd.org/changeset/base/292476 Log: Tidy up. Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Sat Dec 19 19:57:28 2015 (r292475) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Sat Dec 19 20:19:42 2015 (r292476) @@ -239,7 +239,7 @@ SYSCTL_INT(_vm, OID_AUTO, max_wired, CTLFLAG_RW, &vm_page_max_wired, 0, "System-wide limit to wired page count"); static boolean_t vm_pageout_fallback_object_lock(vm_page_t, vm_page_t *); -static void vm_pageout_launder1(struct vm_domain *vmd); +static void vm_pageout_launder(struct vm_domain *vmd); static void vm_pageout_laundry_worker(void *arg); #if !defined(NO_SWAPPING) static void vm_pageout_map_deactivate_pages(vm_map_t, long); @@ -877,7 +877,7 @@ unlock_mp: * XXX */ static void -vm_pageout_launder1(struct vm_domain *vmd) +vm_pageout_launder(struct vm_domain *vmd) { vm_page_t m, next; struct vm_pagequeue *pq; @@ -1075,7 +1075,7 @@ vm_pageout_laundry_worker(void *arg) for (;;) { tsleep(&vm_cnt.v_laundry_count, PVM, "laundr", hz / VM_LAUNDER_INTERVAL); - vm_pageout_launder1(domain); + vm_pageout_launder(domain); } } From owner-svn-src-user@freebsd.org Sat Dec 19 20:42:03 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31171A4D36C for ; Sat, 19 Dec 2015 20:42:03 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB6BF1833; Sat, 19 Dec 2015 20:42:02 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBJKg2lK045625; Sat, 19 Dec 2015 20:42:02 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBJKg2Ts045624; Sat, 19 Dec 2015 20:42:02 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201512192042.tBJKg2Ts045624@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sat, 19 Dec 2015 20:42:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292477 - user/alc/cachefree X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2015 20:42:03 -0000 Author: alc Date: Sat Dec 19 20:42:01 2015 New Revision: 292477 URL: https://svnweb.freebsd.org/changeset/base/292477 Log: Retire this branch. There is nothing useful here. Deleted: user/alc/cachefree/ From owner-svn-src-user@freebsd.org Sat Dec 19 21:05:28 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E54BA4DF92 for ; Sat, 19 Dec 2015 21:05:28 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EF46F12A3; Sat, 19 Dec 2015 21:05:27 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBJL5RQD052022; Sat, 19 Dec 2015 21:05:27 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBJL5QC5052014; Sat, 19 Dec 2015 21:05:26 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201512192105.tBJL5QC5052014@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sat, 19 Dec 2015 21:05:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292479 - in user/alc/PG_CACHED: . bin bin/ed cddl contrib crypto etc gnu include kerberos5 lib libexec release rescue sbin secure share share/colldef share/ctypedef share/dict share/do... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2015 21:05:28 -0000 Author: alc Date: Sat Dec 19 21:05:26 2015 New Revision: 292479 URL: https://svnweb.freebsd.org/changeset/base/292479 Log: A staging area for testing the complete removal of PG_CACHED pages. This staging area is derived from the PQ_LAUNDRY branch. Added: user/alc/PG_CACHED/ - copied from r292470, user/alc/PQ_LAUNDRY/ Replaced: user/alc/PG_CACHED/.arcconfig - copied unchanged from r292469, user/alc/PQ_LAUNDRY/.arcconfig user/alc/PG_CACHED/.arclint - copied unchanged from r292469, user/alc/PQ_LAUNDRY/.arclint user/alc/PG_CACHED/COPYRIGHT - copied unchanged from r292469, user/alc/PQ_LAUNDRY/COPYRIGHT user/alc/PG_CACHED/LOCKS - copied unchanged from r292469, user/alc/PQ_LAUNDRY/LOCKS user/alc/PG_CACHED/MAINTAINERS - copied unchanged from r292469, user/alc/PQ_LAUNDRY/MAINTAINERS user/alc/PG_CACHED/Makefile - copied unchanged from r292469, user/alc/PQ_LAUNDRY/Makefile user/alc/PG_CACHED/Makefile.inc1 - copied unchanged from r292469, user/alc/PQ_LAUNDRY/Makefile.inc1 user/alc/PG_CACHED/ObsoleteFiles.inc - copied unchanged from r292469, user/alc/PQ_LAUNDRY/ObsoleteFiles.inc user/alc/PG_CACHED/README - copied unchanged from r292469, user/alc/PQ_LAUNDRY/README user/alc/PG_CACHED/UPDATING - copied unchanged from r292469, user/alc/PQ_LAUNDRY/UPDATING user/alc/PG_CACHED/bin/ - copied from r292469, user/alc/PQ_LAUNDRY/bin/ user/alc/PG_CACHED/bin/ed/main.c - copied unchanged from r292470, user/alc/PQ_LAUNDRY/bin/ed/main.c user/alc/PG_CACHED/cddl/ - copied from r292469, user/alc/PQ_LAUNDRY/cddl/ user/alc/PG_CACHED/contrib/ - copied from r292469, user/alc/PQ_LAUNDRY/contrib/ user/alc/PG_CACHED/crypto/ - copied from r292469, user/alc/PQ_LAUNDRY/crypto/ user/alc/PG_CACHED/etc/ - copied from r292469, user/alc/PQ_LAUNDRY/etc/ user/alc/PG_CACHED/gnu/ - copied from r292469, user/alc/PQ_LAUNDRY/gnu/ user/alc/PG_CACHED/include/ - copied from r292469, user/alc/PQ_LAUNDRY/include/ user/alc/PG_CACHED/kerberos5/ - copied from r292469, user/alc/PQ_LAUNDRY/kerberos5/ user/alc/PG_CACHED/lib/ - copied from r292469, user/alc/PQ_LAUNDRY/lib/ user/alc/PG_CACHED/libexec/ - copied from r292469, user/alc/PQ_LAUNDRY/libexec/ user/alc/PG_CACHED/release/ - copied from r292469, user/alc/PQ_LAUNDRY/release/ user/alc/PG_CACHED/rescue/ - copied from r292469, user/alc/PQ_LAUNDRY/rescue/ user/alc/PG_CACHED/sbin/ - copied from r292469, user/alc/PQ_LAUNDRY/sbin/ user/alc/PG_CACHED/secure/ - copied from r292469, user/alc/PQ_LAUNDRY/secure/ user/alc/PG_CACHED/share/Makefile - copied unchanged from r292469, user/alc/PQ_LAUNDRY/share/Makefile user/alc/PG_CACHED/share/Makefile.inc - copied unchanged from r292469, user/alc/PQ_LAUNDRY/share/Makefile.inc user/alc/PG_CACHED/share/colldef/ - copied from r292469, user/alc/PQ_LAUNDRY/share/colldef/ user/alc/PG_CACHED/share/colldef/Makefile - copied unchanged from r292470, user/alc/PQ_LAUNDRY/share/colldef/Makefile user/alc/PG_CACHED/share/ctypedef/ - copied from r292469, user/alc/PQ_LAUNDRY/share/ctypedef/ user/alc/PG_CACHED/share/ctypedef/Makefile - copied unchanged from r292470, user/alc/PQ_LAUNDRY/share/ctypedef/Makefile user/alc/PG_CACHED/share/dict/ - copied from r292469, user/alc/PQ_LAUNDRY/share/dict/ user/alc/PG_CACHED/share/doc/ - copied from r292469, user/alc/PQ_LAUNDRY/share/doc/ user/alc/PG_CACHED/share/dtrace/ - copied from r292469, user/alc/PQ_LAUNDRY/share/dtrace/ user/alc/PG_CACHED/share/examples/ - copied from r292469, user/alc/PQ_LAUNDRY/share/examples/ user/alc/PG_CACHED/share/i18n/ - copied from r292469, user/alc/PQ_LAUNDRY/share/i18n/ user/alc/PG_CACHED/share/keys/ - copied from r292469, user/alc/PQ_LAUNDRY/share/keys/ user/alc/PG_CACHED/share/locale-links/ - copied from r292469, user/alc/PQ_LAUNDRY/share/locale-links/ user/alc/PG_CACHED/share/man/ - copied from r292469, user/alc/PQ_LAUNDRY/share/man/ user/alc/PG_CACHED/share/me/ - copied from r292469, user/alc/PQ_LAUNDRY/share/me/ user/alc/PG_CACHED/share/misc/ - copied from r292469, user/alc/PQ_LAUNDRY/share/misc/ user/alc/PG_CACHED/share/mk/ - copied from r292469, user/alc/PQ_LAUNDRY/share/mk/ user/alc/PG_CACHED/share/monetdef/ - copied from r292469, user/alc/PQ_LAUNDRY/share/monetdef/ user/alc/PG_CACHED/share/monetdef/Makefile - copied unchanged from r292470, user/alc/PQ_LAUNDRY/share/monetdef/Makefile user/alc/PG_CACHED/share/msgdef/ - copied from r292469, user/alc/PQ_LAUNDRY/share/msgdef/ user/alc/PG_CACHED/share/msgdef/Makefile - copied unchanged from r292470, user/alc/PQ_LAUNDRY/share/msgdef/Makefile user/alc/PG_CACHED/share/numericdef/ - copied from r292469, user/alc/PQ_LAUNDRY/share/numericdef/ user/alc/PG_CACHED/share/numericdef/Makefile - copied unchanged from r292470, user/alc/PQ_LAUNDRY/share/numericdef/Makefile user/alc/PG_CACHED/share/security/ - copied from r292469, user/alc/PQ_LAUNDRY/share/security/ user/alc/PG_CACHED/share/sendmail/ - copied from r292469, user/alc/PQ_LAUNDRY/share/sendmail/ user/alc/PG_CACHED/share/skel/ - copied from r292469, user/alc/PQ_LAUNDRY/share/skel/ user/alc/PG_CACHED/share/snmp/ - copied from r292469, user/alc/PQ_LAUNDRY/share/snmp/ user/alc/PG_CACHED/share/syscons/ - copied from r292469, user/alc/PQ_LAUNDRY/share/syscons/ user/alc/PG_CACHED/share/tabset/ - copied from r292469, user/alc/PQ_LAUNDRY/share/tabset/ user/alc/PG_CACHED/share/termcap/ - copied from r292469, user/alc/PQ_LAUNDRY/share/termcap/ user/alc/PG_CACHED/share/tests/ - copied from r292469, user/alc/PQ_LAUNDRY/share/tests/ user/alc/PG_CACHED/share/timedef/ - copied from r292469, user/alc/PQ_LAUNDRY/share/timedef/ user/alc/PG_CACHED/share/timedef/Makefile - copied unchanged from r292470, user/alc/PQ_LAUNDRY/share/timedef/Makefile user/alc/PG_CACHED/share/vt/ - copied from r292469, user/alc/PQ_LAUNDRY/share/vt/ user/alc/PG_CACHED/share/zoneinfo/ - copied from r292469, user/alc/PQ_LAUNDRY/share/zoneinfo/ user/alc/PG_CACHED/sys/Makefile - copied unchanged from r292469, user/alc/PQ_LAUNDRY/sys/Makefile user/alc/PG_CACHED/sys/amd64/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/amd64/ user/alc/PG_CACHED/sys/arm/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/arm/ user/alc/PG_CACHED/sys/arm64/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/arm64/ user/alc/PG_CACHED/sys/boot/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/boot/ user/alc/PG_CACHED/sys/bsm/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/bsm/ user/alc/PG_CACHED/sys/cam/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/cam/ user/alc/PG_CACHED/sys/cddl/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/cddl/ user/alc/PG_CACHED/sys/compat/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/compat/ user/alc/PG_CACHED/sys/conf/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/conf/ user/alc/PG_CACHED/sys/contrib/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/contrib/ user/alc/PG_CACHED/sys/crypto/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/crypto/ user/alc/PG_CACHED/sys/ddb/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/ddb/ user/alc/PG_CACHED/sys/dev/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/dev/ user/alc/PG_CACHED/sys/fs/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/fs/ user/alc/PG_CACHED/sys/gdb/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/gdb/ user/alc/PG_CACHED/sys/geom/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/geom/ user/alc/PG_CACHED/sys/gnu/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/gnu/ user/alc/PG_CACHED/sys/i386/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/i386/ user/alc/PG_CACHED/sys/isa/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/isa/ user/alc/PG_CACHED/sys/kern/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/kern/ user/alc/PG_CACHED/sys/kgssapi/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/kgssapi/ user/alc/PG_CACHED/sys/libkern/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/libkern/ user/alc/PG_CACHED/sys/mips/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/mips/ user/alc/PG_CACHED/sys/modules/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/modules/ user/alc/PG_CACHED/sys/net/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/net/ user/alc/PG_CACHED/sys/net80211/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/net80211/ user/alc/PG_CACHED/sys/netgraph/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/netgraph/ user/alc/PG_CACHED/sys/netinet/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/netinet/ user/alc/PG_CACHED/sys/netinet6/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/netinet6/ user/alc/PG_CACHED/sys/netipsec/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/netipsec/ user/alc/PG_CACHED/sys/netnatm/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/netnatm/ user/alc/PG_CACHED/sys/netpfil/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/netpfil/ user/alc/PG_CACHED/sys/netsmb/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/netsmb/ user/alc/PG_CACHED/sys/nfs/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/nfs/ user/alc/PG_CACHED/sys/nfsclient/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/nfsclient/ user/alc/PG_CACHED/sys/nfsserver/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/nfsserver/ user/alc/PG_CACHED/sys/nlm/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/nlm/ user/alc/PG_CACHED/sys/ofed/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/ofed/ user/alc/PG_CACHED/sys/opencrypto/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/opencrypto/ user/alc/PG_CACHED/sys/pc98/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/pc98/ user/alc/PG_CACHED/sys/powerpc/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/powerpc/ user/alc/PG_CACHED/sys/powerpc/pseries/phyp_llan.c - copied unchanged from r292470, user/alc/PQ_LAUNDRY/sys/powerpc/pseries/phyp_llan.c user/alc/PG_CACHED/sys/riscv/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/riscv/ user/alc/PG_CACHED/sys/rpc/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/rpc/ user/alc/PG_CACHED/sys/security/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/security/ user/alc/PG_CACHED/sys/sparc64/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/sparc64/ user/alc/PG_CACHED/sys/sys/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/sys/ user/alc/PG_CACHED/sys/teken/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/teken/ user/alc/PG_CACHED/sys/tests/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/tests/ user/alc/PG_CACHED/sys/tools/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/tools/ user/alc/PG_CACHED/sys/ufs/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/ufs/ user/alc/PG_CACHED/sys/vm/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/vm/ user/alc/PG_CACHED/sys/vm/vm_pageout.c - copied unchanged from r292476, user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c user/alc/PG_CACHED/sys/x86/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/x86/ user/alc/PG_CACHED/sys/xdr/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/xdr/ user/alc/PG_CACHED/sys/xen/ - copied from r292469, user/alc/PQ_LAUNDRY/sys/xen/ user/alc/PG_CACHED/targets/ - copied from r292469, user/alc/PQ_LAUNDRY/targets/ user/alc/PG_CACHED/tests/ - copied from r292469, user/alc/PQ_LAUNDRY/tests/ user/alc/PG_CACHED/tools/ - copied from r292469, user/alc/PQ_LAUNDRY/tools/ user/alc/PG_CACHED/tools/tools/locale/tools/cldr2def.pl - copied unchanged from r292470, user/alc/PQ_LAUNDRY/tools/tools/locale/tools/cldr2def.pl user/alc/PG_CACHED/tools/tools/locale/tools/finalize - copied unchanged from r292470, user/alc/PQ_LAUNDRY/tools/tools/locale/tools/finalize user/alc/PG_CACHED/usr.bin/ - copied from r292469, user/alc/PQ_LAUNDRY/usr.bin/ user/alc/PG_CACHED/usr.sbin/ - copied from r292469, user/alc/PQ_LAUNDRY/usr.sbin/ user/alc/PG_CACHED/usr.sbin/ndp/ndp.c - copied unchanged from r292470, user/alc/PQ_LAUNDRY/usr.sbin/ndp/ndp.c Copied: user/alc/PG_CACHED/.arcconfig (from r292469, user/alc/PQ_LAUNDRY/.arcconfig) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/alc/PG_CACHED/.arcconfig Sat Dec 19 21:05:26 2015 (r292479, copy of r292469, user/alc/PQ_LAUNDRY/.arcconfig) @@ -0,0 +1,6 @@ +{ + "project.name": "S", + "repository.callsign" : "S", + "phabricator.uri" : "https://reviews.freebsd.org/", + "history.immutable" : true +} Copied: user/alc/PG_CACHED/.arclint (from r292469, user/alc/PQ_LAUNDRY/.arclint) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/alc/PG_CACHED/.arclint Sat Dec 19 21:05:26 2015 (r292479, copy of r292469, user/alc/PQ_LAUNDRY/.arclint) @@ -0,0 +1,25 @@ +{ + "exclude": "(contrib|crypto)", + "linters": { + "python": { + "type": "pep8", + "include": "(\\.py$)" + }, + "spelling": { + "type": "spelling" + }, + "chmod": { + "type": "chmod" + }, + "merge-conflict": { + "type": "merge-conflict" + }, + "filename": { + "type": "filename" + }, + "json": { + "type": "json", + "include": "(\\.arclint|\\.json$)" + } + } +} Copied: user/alc/PG_CACHED/COPYRIGHT (from r292469, user/alc/PQ_LAUNDRY/COPYRIGHT) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/alc/PG_CACHED/COPYRIGHT Sat Dec 19 21:05:26 2015 (r292479, copy of r292469, user/alc/PQ_LAUNDRY/COPYRIGHT) @@ -0,0 +1,126 @@ +# $FreeBSD$ +# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 + +The compilation of software known as FreeBSD is distributed under the +following terms: + +Copyright (c) 1992-2015 The FreeBSD Project. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +The 4.4BSD and 4.4BSD-Lite software is distributed under the following +terms: + +All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite +Releases is copyrighted by The Regents of the University of California. + +Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 + The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by the University of +California, Berkeley and its contributors. +4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +The Institute of Electrical and Electronics Engineers and the American +National Standards Committee X3, on Information Processing Systems have +given us permission to reprint portions of their documentation. + +In the following statement, the phrase ``this text'' refers to portions +of the system documentation. + +Portions of this text are reprinted and reproduced in electronic form in +the second BSD Networking Software Release, from IEEE Std 1003.1-1988, IEEE +Standard Portable Operating System Interface for Computer Environments +(POSIX), copyright C 1988 by the Institute of Electrical and Electronics +Engineers, Inc. In the event of any discrepancy between these versions +and the original IEEE Standard, the original IEEE Standard is the referee +document. + +In the following statement, the phrase ``This material'' refers to portions +of the system documentation. + +This material is reproduced with permission from American National +Standards Committee X3, on Information Processing Systems. Computer and +Business Equipment Manufacturers Association (CBEMA), 311 First St., NW, +Suite 500, Washington, DC 20001-2178. The developmental work of +Programming Language C was completed by the X3J11 Technical Committee. + +The views and conclusions contained in the software and documentation are +those of the authors and should not be interpreted as representing official +policies, either expressed or implied, of the Regents of the University +of California. + + +NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD") +source has been updated. The copyright addendum may be found at +ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change and is +included below. + +July 22, 1999 + +To All Licensees, Distributors of Any Version of BSD: + +As you know, certain of the Berkeley Software Distribution ("BSD") source +code files require that further distributions of products containing all or +portions of the software, acknowledge within their advertising materials +that such products contain software developed by UC Berkeley and its +contributors. + +Specifically, the provision reads: + +" * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors." + +Effective immediately, licensees and distributors are no longer required to +include the acknowledgement within advertising materials. Accordingly, the +foregoing paragraph of those BSD Unix files containing it is hereby deleted +in its entirety. + +William Hoskins +Director, Office of Technology Licensing +University of California, Berkeley Copied: user/alc/PG_CACHED/LOCKS (from r292469, user/alc/PQ_LAUNDRY/LOCKS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/alc/PG_CACHED/LOCKS Sat Dec 19 21:05:26 2015 (r292479, copy of r292469, user/alc/PQ_LAUNDRY/LOCKS) @@ -0,0 +1,18 @@ +$FreeBSD$ + +This file documents formal review/approval requirements that have been +approved by core. + +subsystem login expires notes +-------------------------------------- + +Special cases: +releng/4.* Requires Security Officer approval. +releng/5.* Requires Security Officer approval. +releng/6.* Requires Security Officer approval. +releng/7.* Requires Security Officer approval. +releng/8.* Requires Security Officer approval. +head/sys/dev/random Requires Security Officer approval. +head/sys/libkern/arc4random.c Requires Security Officer approval. +stable/*/sys/dev/random Requires Security Officer approval. +stable/*/sys/libkern/arc4random.c Requires Security Officer approval. Copied: user/alc/PG_CACHED/MAINTAINERS (from r292469, user/alc/PQ_LAUNDRY/MAINTAINERS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/alc/PG_CACHED/MAINTAINERS Sat Dec 19 21:05:26 2015 (r292479, copy of r292469, user/alc/PQ_LAUNDRY/MAINTAINERS) @@ -0,0 +1,158 @@ +$FreeBSD$ + +Please note that the content of this file is strictly advisory. +No locks listed here are valid. The only strict review requirements +are granted by core. These are documented in head/LOCKS and enforced +by svnadmin/conf/approvers. + +The source tree is a community effort. However, some folks go to the +trouble of looking after particular areas of the tree. In return for +their active caretaking of the code it is polite to coordinate changes +with them. This is a list of people who have expressed an interest in +part of the code or listed their active caretaking role so that other +committers can easily find somebody who is familiar with it. The notes +should specify if there is a 3rd party source tree involved or other +things that should be kept in mind. + +However, this is not a 'big stick', it is an offer to help and a source +of guidance. It does not override the communal nature of the tree. +It is not a registry of 'turf' or private property. + +*** +This list is prone to becoming stale quickly. The best way to find the recent +maintainer of a sub-system is to check recent logs for that directory or +sub-system. +*** + +subsystem login notes +----------------------------- +atf freebsd-testing,jmmv,ngie Pre-commit review requested. +ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +callout_*(9) rrs Pre-commit review requested -- becareful its tricksy code :o. +contrib/compiler-rt dim Pre-commit review preferred. +contrib/libc++ dim Pre-commit review preferred. +contrib/libcxxrt dim Pre-commit review preferred. +contrib/llvm dim Pre-commit review preferred. +contrib/llvm/tools/lldb emaste Pre-commit review preferred. +contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. +contrib/pjdfstest freebsd-testing,ngie,pjd Pre-commit review requested. +dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +*env(3) secteam Due to the problematic security history of this + code, please have patches reviewed by secteam. +etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. +etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. +fetch des Pre-commit review requested. +geli pjd Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/). +isci(4) jimharris Pre-commit review requested. +iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +kqueue jmg Pre-commit review requested. Documentation Required. +libfetch des Pre-commit review requested. +libpam des Pre-commit review requested. +linprocfs des Pre-commit review requested. +lpr gad Pre-commit review requested, particularly for + lpd/recvjob.c and lpd/printjob.c. +nanobsd imp Pre-commit phabricator review requested. +net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. +nis(8), yp(8) araujo Pre-commit review requested. +nvd(4) jimharris Pre-commit review requested. +nvme(4) jimharris Pre-commit review requested. +nvmecontrol(8) jimharris Pre-commit review requested. +opencrypto jmg Pre-commit review requested. Documentation Required. +openssh des Pre-commit review requested. +openssl benl,jkim Pre-commit review requested. +otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +pci bus imp,jhb Pre-commit review requested. +pmcstudy(8) rrs Pre-commit review requested. +procfs des Pre-commit review requested. +pseudofs des Pre-commit review requested. +release/release.sh gjb,re Pre-commit review and regression tests + requested. +sctp rrs,tuexen Pre-commit review requested (changes need to be backported to github). +sendmail gshapiro Pre-commit review requested. +sh(1) jilles Pre-commit review requested. This also applies + to kill(1), printf(1) and test(1) which are + compiled in as builtins. +share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. +share/mk/*.test.mk freebsd-testing,ngie (same list as share/mk too) Pre-commit review requested. +sys/compat/linuxkpi hselasky If in doubt, ask. +sys/dev/e1000 erj Pre-commit phabricator review requested. +sys/dev/ixgbe erj Pre-commit phabricator review requested. +sys/dev/ixl erj Pre-commit phabricator review requested. +sys/dev/sound/usb hselasky If in doubt, ask. +sys/dev/usb hselasky If in doubt, ask. +sys/netinet/ip_carp.c glebius Pre-commit review recommended. +sys/netpfil/pf kp,glebius Pre-commit review recommended. +tests freebsd-testing,ngie Pre-commit review requested. +usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. +vmm(4) neel,grehan Pre-commit review requested. +---- OLD ---- +libc/posix1e rwatson Pre-commit review requested. +POSIX.1e ACLs rwatson Pre-commit review requested. +UFS EAs rwatson Pre-commit review requested. +MAC Framework rwatson Pre-commit review requested. +MAC Modules rwatson Pre-commit review requested. +contrib/openbsm rwatson Pre-commit review requested. +sys/security/audit rwatson Pre-commit review requested. +ahc(4) gibbs Pre-commit review requested. +ahd(4) gibbs Pre-commit review requested. +cdboot jhb Pre-commit review requested. +pxeboot jhb Pre-commit review requested. +witness jhb Pre-commit review requested. +CAM gibbs, + ken Pre-commit review requested. send to scsi@freebsd.org +devstat(9) ken Pre-commit review requested. +camcontrol(8) ken Pre-commit review requested. +libcam ken Pre-commit review requested. +libdevstat ken Pre-commit review requested. +iostat(8) ken Pre-commit review requested. +cd(4) ken Pre-commit review requested. +pass(4) ken Pre-commit review requested. +ch(4) ken Pre-commit review requested. +em(4) jfv Pre-commit review requested. +nvi peter Try not to break it. +libz peter Try not to break it. +groff ru Recommends pre-commit review. +ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org +drm rnoland Just keep me informed of changes, try not to break it. +unifdef(1) fanf Pre-commit review requested. +ntp roberto Pre-commit review requested. +inetd dwmalone Recommends pre-commit review. +contrib/smbfs bp Open for in-tree committs. In case of functional + changes pre-commit review requested. +file obrien Insists to keep file blocked from other's unapproved + commits +contrib/bzip2 obrien Pre-commit review required. +geom freebsd-geom@FreeBSD.org +geom_concat pjd Pre-commit review preferred. +geom_gate pjd Pre-commit review preferred. +geom_label pjd Pre-commit review preferred. +geom_mirror pjd Pre-commit review preferred. +geom_nop pjd Pre-commit review preferred. +geom_raid3 pjd Pre-commit review preferred. +geom_shsec pjd Pre-commit review preferred. +geom_stripe pjd Pre-commit review preferred. +geom_zero pjd Pre-commit review preferred. +sbin/geom pjd Pre-commit review preferred. +zfs freebsd-fs@FreeBSD.org +linux emul emulation Please discuss changes here. +bs{diff,patch} cperciva Pre-commit review requested. +portsnap cperciva Pre-commit review requested. +freebsd-update cperciva Pre-commit review requested. +sys/netgraph/bluetooth emax Pre-commit review preferred. +lib/libbluetooth emax Pre-commit review preferred. +lib/libsdp emax Pre-commit review preferred. +usr.bin/bluetooth emax Pre-commit review preferred. +usr.sbin/bluetooth emax Pre-commit review preferred. +share/zoneinfo edwin Heads-up appreciated, since our data is coming + from a third party source. +usr.sbin/zic edwin Heads-up appreciated, since this code is + maintained by a third party source. +lib/libc/stdtime edwin Heads-up appreciated, since parts of this code + is maintained by a third party source. +sbin/routed bms Pre-commit review; notify vendor at rhyolite.com +cmx daniel@roe.ch Pre-commit review preferred. +filemon obrien Pre-commit review preferred. +sysdoc trhodes Pre-commit review preferred. + Copied: user/alc/PG_CACHED/Makefile (from r292469, user/alc/PQ_LAUNDRY/Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/alc/PG_CACHED/Makefile Sat Dec 19 21:05:26 2015 (r292479, copy of r292469, user/alc/PQ_LAUNDRY/Makefile) @@ -0,0 +1,519 @@ +# +# $FreeBSD$ +# +# The user-driven targets are: +# +# universe - *Really* build *everything* (buildworld and +# all kernels on all architectures). +# tinderbox - Same as universe, but presents a list of failed build +# targets and exits with an error if there were any. +# buildworld - Rebuild *everything*, including glue to help do +# upgrades. +# installworld - Install everything built by "buildworld". +# world - buildworld + installworld, no kernel. +# buildkernel - Rebuild the kernel and the kernel-modules. +# installkernel - Install the kernel and the kernel-modules. +# installkernel.debug +# reinstallkernel - Reinstall the kernel and the kernel-modules. +# reinstallkernel.debug +# kernel - buildkernel + installkernel. +# kernel-toolchain - Builds the subset of world necessary to build a kernel +# kernel-toolchains - Build kernel-toolchain for all universe targets. +# doxygen - Build API documentation of the kernel, needs doxygen. +# update - Convenient way to update your source tree(s). +# check-old - List obsolete directories/files/libraries. +# check-old-dirs - List obsolete directories. +# check-old-files - List obsolete files. +# check-old-libs - List obsolete libraries. +# delete-old - Delete obsolete directories/files. +# delete-old-dirs - Delete obsolete directories. +# delete-old-files - Delete obsolete files. +# delete-old-libs - Delete obsolete libraries. +# targets - Print a list of supported TARGET/TARGET_ARCH pairs +# for world and kernel targets. +# toolchains - Build a toolchain for all world and kernel targets. +# xdev - xdev-build + xdev-install for the architecture +# specified with XDEV and XDEV_ARCH. +# xdev-build - Build cross-development tools. +# xdev-install - Install cross-development tools. +# xdev-links - Create traditional links in /usr/bin for cc, etc +# native-xtools - Create host binaries that produce target objects +# for use in qemu user-mode jails. +# +# "quick" way to test all kernel builds: +# _jflag=`sysctl -n hw.ncpu` +# _jflag=$(($_jflag * 2)) +# [ $_jflag -gt 12 ] && _jflag=12 +# make universe -DMAKE_JUST_KERNELS JFLAG=-j${_jflag} +# +# This makefile is simple by design. The FreeBSD make automatically reads +# the /usr/share/mk/sys.mk unless the -m argument is specified on the +# command line. By keeping this makefile simple, it doesn't matter too +# much how different the installed mk files are from those in the source +# tree. This makefile executes a child make process, forcing it to use +# the mk files from the source tree which are supposed to DTRT. +# +# Most of the user-driven targets (as listed above) are implemented in +# Makefile.inc1. The exceptions are universe, tinderbox and targets. +# +# If you want to build your system from source be sure that /usr/obj has +# at least 6GB of diskspace available. A complete 'universe' build requires +# about 100GB of space. +# +# For individuals wanting to build from the sources currently on their +# system, the simple instructions are: +# +# 1. `cd /usr/src' (or to the directory containing your source tree). +# 2. Define `HISTORICAL_MAKE_WORLD' variable (see README). +# 3. `make world' +# +# For individuals wanting to upgrade their sources (even if only a +# delta of a few days): +# +# 1. `cd /usr/src' (or to the directory containing your source tree). +# 2. `make buildworld' +# 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# [steps 3. & 4. can be combined by using the "kernel" target] +# 5. `reboot' (in single user mode: boot -s from the loader prompt). +# 6. `mergemaster -p' +# 7. `make installworld' +# 8. `mergemaster' (you may wish to use -i, along with -U or -F). +# 9. `make delete-old' +# 10. `reboot' +# 11. `make delete-old-libs' (in case no 3rd party program uses them anymore) +# +# See src/UPDATING `COMMON ITEMS' for more complete information. +# +# If TARGET=machine (e.g. powerpc, sparc64, ...) is specified you can +# cross build world for other machine types using the buildworld target, +# and once the world is built you can cross build a kernel using the +# buildkernel target. +# +# Define the user-driven targets. These are listed here in alphabetical +# order, but that's not important. +# +# Targets that begin with underscore are internal targets intended for +# developer convenience only. They are intentionally not documented and +# completely subject to change without notice. +# +# For more information, see the build(7) manual page. +# + +# This is included so CC is set to ccache for -V, and COMPILER_TYPE/VERSION +# can be cached for sub-makes. +.include + +# Note: we use this awkward construct to be compatible with FreeBSD's +# old make used in 10.0 and 9.2 and earlier. +.if defined(MK_DIRDEPS_BUILD) && ${MK_DIRDEPS_BUILD} == "yes" && !make(showconfig) +# targets/Makefile plays the role of top-level +.include "targets/Makefile" +.else + +TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ + check-old check-old-dirs check-old-files check-old-libs \ + checkdpadd clean cleandepend cleandir cleanworld \ + delete-old delete-old-dirs delete-old-files delete-old-libs \ + depend distribute distributekernel distributekernel.debug \ + distributeworld distrib-dirs distribution doxygen \ + everything hier hierarchy install installcheck installkernel \ + installkernel.debug packagekernel packageworld \ + reinstallkernel reinstallkernel.debug \ + installworld kernel-toolchain libraries lint maninstall \ + obj objlink regress rerelease showconfig tags toolchain update \ + _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ + _build-tools _cross-tools _includes _libraries _depend \ + build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ + xdev-links native-xtools installconfig \ + +TGTS+= ${SUBDIR_TARGETS} + +BITGTS= files includes +BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} +TGTS+= ${BITGTS} + +.ORDER: buildworld installworld +.ORDER: buildworld distributeworld +.ORDER: buildworld buildkernel +.ORDER: buildkernel installkernel +.ORDER: buildkernel installkernel.debug +.ORDER: buildkernel reinstallkernel +.ORDER: buildkernel reinstallkernel.debug + +PATH= /sbin:/bin:/usr/sbin:/usr/bin +MAKEOBJDIRPREFIX?= /usr/obj +_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ + ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \ + -f /dev/null -V MAKEOBJDIRPREFIX dummy +.if !empty(_MAKEOBJDIRPREFIX) +.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ + (in make.conf(5)) or command-line variable. +.endif + +# We often need to use the tree's version of make to build it. +# Choices add to complexity though. +# We cannot blindly use a make which may not be the one we want +# so be exlicit - until all choice is removed. +WANT_MAKE= bmake +MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE} +.if defined(.PARSEDIR) +HAVE_MAKE= bmake +.else +HAVE_MAKE= fmake +.endif +.if exists(${MYMAKE}) +SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk +.elif ${WANT_MAKE} != ${HAVE_MAKE} +# It may not exist yet but we may cause it to. +# In the case of fmake, upgrade_checks may cause a newer version to be built. +SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \ + -m ${.CURDIR}/share/mk +.else +SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk +.endif + +_MAKE= PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} + +# Guess machine architecture from machine type, and vice versa. +.if !defined(TARGET_ARCH) && defined(TARGET) +_TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/} +.elif !defined(TARGET) && defined(TARGET_ARCH) && \ + ${TARGET_ARCH} != ${MACHINE_ARCH} +_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/} +.endif +.if defined(TARGET) && !defined(_TARGET) +_TARGET=${TARGET} +.endif +.if defined(TARGET_ARCH) && !defined(_TARGET_ARCH) +_TARGET_ARCH=${TARGET_ARCH} +.endif +# for historical compatibility for xdev targets +.if defined(XDEV) +_TARGET= ${XDEV} +.endif +.if defined(XDEV_ARCH) +_TARGET_ARCH= ${XDEV_ARCH} +.endif +# Otherwise, default to current machine type and architecture. +_TARGET?= ${MACHINE} +_TARGET_ARCH?= ${MACHINE_ARCH} + +# +# Make sure we have an up-to-date make(1). Only world and buildworld +# should do this as those are the initial targets used for upgrades. +# The user can define ALWAYS_CHECK_MAKE to have this check performed +# for all targets. +# +.if defined(ALWAYS_CHECK_MAKE) +${TGTS}: upgrade_checks +.else +buildworld: upgrade_checks +.endif + +# +# Handle the user-driven targets, using the source relative mk files. +# + +tinderbox toolchains kernel-toolchains: .MAKE +${TGTS}: .PHONY .MAKE + ${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET} + +# The historic default "all" target creates files which may cause stale +# or (in the cross build case) unlinkable results. Fail with an error +# when no target is given. The users can explicitly specify "all" +# if they want the historic behavior. +.MAIN: _guard + +_guard: .PHONY + @echo + @echo "Explicit target required. Likely \"${SUBDIR_OVERRIDE:Dall:Ubuildworld}\" is wanted. See build(7)." + @echo + @false + +STARTTIME!= LC_ALL=C date +CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s ; echo +.if !empty(CHECK_TIME) +.error check your date/time: ${STARTTIME} +.endif + +.if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR) +# +# world +# +# Attempt to rebuild and reinstall everything. This target is not to be +# used for upgrading an existing FreeBSD system, because the kernel is +# not included. One can argue that this target doesn't build everything +# then. +# +world: upgrade_checks + @echo "--------------------------------------------------------------" + @echo ">>> make world started on ${STARTTIME}" + @echo "--------------------------------------------------------------" +.if target(pre-world) + @echo + @echo "--------------------------------------------------------------" + @echo ">>> Making 'pre-world' target" + @echo "--------------------------------------------------------------" + ${_+_}@cd ${.CURDIR}; ${_MAKE} pre-world +.endif + ${_+_}@cd ${.CURDIR}; ${_MAKE} buildworld + ${_+_}@cd ${.CURDIR}; ${_MAKE} -B installworld +.if target(post-world) + @echo + @echo "--------------------------------------------------------------" + @echo ">>> Making 'post-world' target" + @echo "--------------------------------------------------------------" + ${_+_}@cd ${.CURDIR}; ${_MAKE} post-world +.endif + @echo + @echo "--------------------------------------------------------------" + @echo ">>> make world completed on `LC_ALL=C date`" + @echo " (started ${STARTTIME})" + @echo "--------------------------------------------------------------" +.else +world: + @echo "WARNING: make world will overwrite your existing FreeBSD" + @echo "installation without also building and installing a new" + @echo "kernel. This can be dangerous. Please read the handbook," + @echo "'Rebuilding world', for how to upgrade your system." + @echo "Define DESTDIR to where you want to install FreeBSD," + @echo "including /, to override this warning and proceed as usual." + @echo "" + @echo "Bailing out now..." + @false +.endif + +# +# kernel +# +# Short hand for `make buildkernel installkernel' +# +kernel: buildkernel installkernel + +# +# Perform a few tests to determine if the installed tools are adequate +# for building the world. +# +# Note: if we ever need to care about the version of bmake, simply testing +# MAKE_VERSION against a required version should suffice. +# +upgrade_checks: +.if ${HAVE_MAKE} != ${WANT_MAKE} + @(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,}) +.endif + +# +# Upgrade make(1) to the current version using the installed +# headers, libraries and tools. Also, allow the location of +# the system bsdmake-like utility to be overridden. +# +MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \ + DESTDIR= \ + INSTALL="sh ${.CURDIR}/tools/install.sh" +MMAKE= ${MMAKEENV} ${MAKE} \ + -DNO_MAN -DNO_SHARED \ + -DNO_CPU_CFLAGS -DNO_WERROR \ + MK_TESTS=no \ + DESTDIR= PROGNAME=${MYMAKE:T} + +bmake: .PHONY + @echo + @echo "--------------------------------------------------------------" + @echo ">>> Building an up-to-date ${.TARGET}(1)" + @echo "--------------------------------------------------------------" + ${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \ + ${MMAKE} obj; \ + ${MMAKE} depend; \ + ${MMAKE} all; \ + ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= + +tinderbox toolchains kernel-toolchains: upgrade_checks + +tinderbox: + @cd ${.CURDIR}; ${SUB_MAKE} DOING_TINDERBOX=YES universe + +toolchains: + @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe + +kernel-toolchains: + @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe + +# +# universe +# +# Attempt to rebuild *everything* for all supported architectures, +# with a reasonable chance of success, regardless of how old your +# existing system is. +# +.if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) +TARGETS?=amd64 arm arm64 i386 mips pc98 powerpc sparc64 +_UNIVERSE_TARGETS= ${TARGETS} +TARGET_ARCHES_arm?= arm armeb armv6 armv6hf +TARGET_ARCHES_arm64?= aarch64 +TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 +TARGET_ARCHES_powerpc?= powerpc powerpc64 +TARGET_ARCHES_pc98?= i386 +.for target in ${TARGETS} +TARGET_ARCHES_${target}?= ${target} +.endfor + +# XXX Add arm64 to universe only if we have an external binutils installed. +# It does not build with the in-tree linker. +.if !exists(/usr/local/aarch64-freebsd/bin/ld) && empty(${TARGETS}) +_UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:Narm64} +universe: universe_arm64_skip +universe_epilogue: universe_arm64_skip +universe_arm64_skip: universe_prologue + @echo ">> arm64 skipped - install aarch64-binutils port or package to build" +.endif + +.if defined(UNIVERSE_TARGET) +MAKE_JUST_WORLDS= YES +.else +UNIVERSE_TARGET?= buildworld +.endif +KERNSRCDIR?= ${.CURDIR}/sys + +targets: .PHONY + @echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets" +.for target in ${TARGETS} +.for target_arch in ${TARGET_ARCHES_${target}} + @echo " ${target}/${target_arch}" +.endfor +.endfor + +.if defined(DOING_TINDERBOX) +FAILFILE=${.CURDIR}/_.tinderbox.failed +MAKEFAIL=tee -a ${FAILFILE} +.else +MAKEFAIL=cat +.endif + +universe_prologue: upgrade_checks +universe: universe_prologue +universe_prologue: + @echo "--------------------------------------------------------------" + @echo ">>> make universe started on ${STARTTIME}" + @echo "--------------------------------------------------------------" +.if defined(DOING_TINDERBOX) + @rm -f ${FAILFILE} +.endif +.for target in ${_UNIVERSE_TARGETS} +universe: universe_${target} +universe_epilogue: universe_${target} +universe_${target}: universe_${target}_prologue +universe_${target}_prologue: universe_prologue + @echo ">> ${target} started on `LC_ALL=C date`" +universe_${target}_worlds: + +.if !defined(MAKE_JUST_KERNELS) +universe_${target}_done: universe_${target}_worlds +.for target_arch in ${TARGET_ARCHES_${target}} +universe_${target}_worlds: universe_${target}_${target_arch} +universe_${target}_${target_arch}: universe_${target}_prologue .MAKE + @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" + @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ + ${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \ + TARGET=${target} \ + TARGET_ARCH=${target_arch} \ + > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \ + (echo "${target}.${target_arch} ${UNIVERSE_TARGET} failed," \ + "check _.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \ + ${MAKEFAIL})) + @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`" +.endfor +.endif # !MAKE_JUST_KERNELS + +.if !defined(MAKE_JUST_WORLDS) +universe_${target}_done: universe_${target}_kernels +universe_${target}_kernels: universe_${target}_worlds +universe_${target}_kernels: universe_${target}_prologue .MAKE +.if exists(${KERNSRCDIR}/${target}/conf/NOTES) + @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ + ${SUB_MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ + (echo "${target} 'make LINT' failed," \ + "check _.${target}.makeLINT for details"| ${MAKEFAIL})) +.endif + @cd ${.CURDIR}; ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \ + universe_kernels +.endif # !MAKE_JUST_WORLDS + +# Tell the user the worlds and kernels have completed +universe_${target}: universe_${target}_done +universe_${target}_done: + @echo ">> ${target} completed on `LC_ALL=C date`" +.endfor +universe_kernels: universe_kernconfs +.if !defined(TARGET) +TARGET!= uname -m +.endif +.if defined(MAKE_ALL_KERNELS) +_THINNER=cat +.else +_THINNER=xargs grep -L "^.NO_UNIVERSE" || true +.endif +KERNCONFS!= cd ${KERNSRCDIR}/${TARGET}/conf && \ + find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ + ! -name DEFAULTS ! -name NOTES | \ + ${_THINNER} +universe_kernconfs: +.for kernel in ${KERNCONFS} +TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \ + config -m ${KERNSRCDIR}/${TARGET}/conf/${kernel} 2> /dev/null | \ + grep -v WARNING: | cut -f 2 +.if empty(TARGET_ARCH_${kernel}) +.error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old." +.endif +universe_kernconfs: universe_kernconf_${TARGET}_${kernel} +universe_kernconf_${TARGET}_${kernel}: .MAKE + @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ + ${SUB_MAKE} ${JFLAG} buildkernel \ + TARGET=${TARGET} \ + TARGET_ARCH=${TARGET_ARCH_${kernel}} \ + KERNCONF=${kernel} \ + > _.${TARGET}.${kernel} 2>&1 || \ + (echo "${TARGET} ${kernel} kernel failed," \ + "check _.${TARGET}.${kernel} for details"| ${MAKEFAIL})) +.endfor +universe: universe_epilogue +universe_epilogue: + @echo "--------------------------------------------------------------" + @echo ">>> make universe completed on `LC_ALL=C date`" + @echo " (started ${STARTTIME})" + @echo "--------------------------------------------------------------" +.if defined(DOING_TINDERBOX) + @if [ -e ${FAILFILE} ] ; then \ + echo "Tinderbox failed:" ;\ + cat ${FAILFILE} ;\ + exit 1 ;\ + fi +.endif +.endif + +buildLINT: + ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT + +.if defined(.PARSEDIR) +# This makefile does not run in meta mode +.MAKE.MODE= normal +# Normally the things we run from here don't either. +# Using -DWITH_META_MODE +# we can buildworld with meta files created which are useful +# for debugging, but without any of the rest of a meta mode build. +MK_DIRDEPS_BUILD= no +MK_STAGING= no +# tell meta.autodep.mk to not even think about updating anything. +UPDATE_DEPENDFILE= NO +.if !make(showconfig) +.export MK_DIRDEPS_BUILD MK_STAGING UPDATE_DEPENDFILE +.endif + +.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 # bmake + +.endif # DIRDEPS_BUILD Copied: user/alc/PG_CACHED/Makefile.inc1 (from r292469, user/alc/PQ_LAUNDRY/Makefile.inc1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/alc/PG_CACHED/Makefile.inc1 Sat Dec 19 21:05:26 2015 (r292479, copy of r292469, user/alc/PQ_LAUNDRY/Makefile.inc1) @@ -0,0 +1,2402 @@ +# +# $FreeBSD$ +# +# Make command line options: +# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir +# -DNO_CLEAN do not clean at all +# -DDB_FROM_SRC use the user/group databases in src/etc instead of +# the system database when installing. +# -DNO_SHARE do not go into share subdir +# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ} +# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel +# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel +# -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel +# -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel +# -DNO_PORTSUPDATE do not update ports in ${MAKE} update +# -DNO_ROOT install without using root privilege +# -DNO_DOCUPDATE do not update doc in ${MAKE} update +# -DWITHOUT_CTF do not run the DTrace CTF conversion tools on built objects +# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list +# LOCAL_ITOOLS="list of tools" to add additional tools to the ITOOLS list +# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target +# LOCAL_MTREE="list of mtree files" to process to allow local directories +# to be created before files are installed +# LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools +# list +# METALOG="path to metadata log" to write permission and ownership +# when NO_ROOT is set. (default: ${DESTDIR}/METALOG) +# TARGET="machine" to crossbuild world for a different machine type +# TARGET_ARCH= may be required when a TARGET supports multiple endians +# BUILDENV_SHELL= shell to launch for the buildenv target (def:${SHELL}) +# WORLD_FLAGS= additional flags to pass to make(1) during buildworld +# KERNEL_FLAGS= additional flags to pass to make(1) during buildkernel +# SUBDIR_OVERRIDE="list of dirs" to build rather than everything. +# All libraries and includes, and some build tools will still build. + +# +# The intended user-driven targets are: +# buildworld - rebuild *everything*, including glue to help do upgrades +# installworld- install everything built by "buildworld" +# doxygen - build API documentation of the kernel +# update - convenient way to update your source tree (eg: svn/svnup) +# +# Standard targets (not defined here) are documented in the makefiles in +# /usr/share/mk. These include: +# obj depend all install clean cleandepend cleanobj + +.if !defined(TARGET) || !defined(TARGET_ARCH) +.error "Both TARGET and TARGET_ARCH must be defined." +.endif + +# Cross toolchain changes must be in effect before bsd.compiler.mk +# so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes. +.if defined(CROSS_TOOLCHAIN) +LOCALBASE?= /usr/local +.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" +CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}" +.endif +.include # don't depend on src.opts.mk doing it +.include "share/mk/src.opts.mk" + +# We must do lib/ and libexec/ before bin/ in case of a mid-install error to +# keep the users system reasonably usable. For static->dynamic root upgrades, +# we don't want to install a dynamic binary without rtld and the needed +# libraries. More commonly, for dynamic root, we don't want to install a +# binary that requires a newer library version that hasn't been installed yet. +# This ordering is not a guarantee though. The only guarantee of a working +# system here would require fine-grained ordering of all components based +# on their dependencies. +SRCDIR?= ${.CURDIR} +.if !empty(SUBDIR_OVERRIDE) +SUBDIR= ${SUBDIR_OVERRIDE} +.else +SUBDIR= lib libexec +.if make(install*) +# Ensure libraries are installed before progressing. +SUBDIR+=.WAIT +.endif +SUBDIR+=bin +.if ${MK_CDDL} != "no" +SUBDIR+=cddl +.endif +SUBDIR+=gnu include +.if ${MK_KERBEROS} != "no" +SUBDIR+=kerberos5 +.endif +.if ${MK_RESCUE} != "no" +SUBDIR+=rescue +.endif +SUBDIR+=sbin +.if ${MK_CRYPT} != "no" +SUBDIR+=secure +.endif +.if !defined(NO_SHARE) +SUBDIR+=share +.endif +SUBDIR+=sys usr.bin usr.sbin +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif +.if ${MK_OFED} != "no" +SUBDIR+=contrib/ofed +.endif + +# Local directories are last, since it is nice to at least get the base +# system rebuilt before you do them. +.for _DIR in ${LOCAL_DIRS} +.if exists(${.CURDIR}/${_DIR}/Makefile) +SUBDIR+= ${_DIR} +.endif +.endfor +# Add LOCAL_LIB_DIRS, but only if they will not be picked up as a SUBDIR +# of a LOCAL_DIRS directory. This allows LOCAL_DIRS=foo and +# LOCAL_LIB_DIRS=foo/lib to behave as expected. +.for _DIR in ${LOCAL_DIRS:M*/} ${LOCAL_DIRS:N*/:S|$|/|} +_REDUNDENT_LIB_DIRS+= ${LOCAL_LIB_DIRS:M${_DIR}*} +.endfor +.for _DIR in ${LOCAL_LIB_DIRS} +.if empty(_REDUNDENT_LIB_DIRS:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile) +SUBDIR+= ${_DIR} +.else +.warning ${_DIR} not added to SUBDIR list. See UPDATING 20141121. +.endif +.endfor + +# We must do etc/ last as it hooks into building the man whatis file +# by calling 'makedb' in share/man. This is only relevant for +# install/distribute so they build the whatis file after every manpage is *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***