Date: Sat, 7 Nov 2015 11:02:34 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290484 - in projects/collation: . bin/rm bin/sh contrib/libexecinfo contrib/libxo/libxo etc/defaults etc/periodic/daily etc/periodic/security gnu/usr.bin/grep include lib lib/libc/net ... Message-ID: <201511071102.tA7B2YFl005230@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Nov 7 11:02:33 2015 New Revision: 290484 URL: https://svnweb.freebsd.org/changeset/base/290484 Log: Merge from head r290483 Added: projects/collation/etc/periodic/daily/430.status-uptime - copied unchanged from r290483, head/etc/periodic/daily/430.status-uptime projects/collation/lib/libopenbsd/ - copied from r290483, head/lib/libopenbsd/ projects/collation/share/mk/src.init.mk - copied unchanged from r290483, head/share/mk/src.init.mk projects/collation/sys/arm/broadcom/bcm2835/bcm2835_vcio.c - copied unchanged from r290483, head/sys/arm/broadcom/bcm2835/bcm2835_vcio.c projects/collation/sys/cddl/contrib/opensolaris/common/atomic/aarch64/ - copied from r290483, head/sys/cddl/contrib/opensolaris/common/atomic/aarch64/ projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_debugfs.c - copied unchanged from r290483, head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_debugfs.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_debugfs.h - copied unchanged from r290483, head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_debugfs.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_killable.h - copied unchanged from r290483, head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_killable.h projects/collation/tools/build/options/WITH_FAST_DEPEND - copied unchanged from r290483, head/tools/build/options/WITH_FAST_DEPEND Deleted: projects/collation/etc/periodic/daily/430.status-rwho projects/collation/lib/libohash/ projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_proc.c Modified: projects/collation/MAINTAINERS (contents, props changed) projects/collation/Makefile.inc1 projects/collation/ObsoleteFiles.inc projects/collation/bin/rm/rm.1 projects/collation/bin/rm/rm.c projects/collation/bin/sh/eval.c projects/collation/bin/sh/expand.c projects/collation/bin/sh/expand.h projects/collation/contrib/libexecinfo/backtrace.3 projects/collation/contrib/libxo/libxo/xo_format.5 projects/collation/etc/defaults/periodic.conf projects/collation/etc/periodic/daily/Makefile projects/collation/etc/periodic/security/520.pfdenied projects/collation/gnu/usr.bin/grep/savedir.c projects/collation/include/unistd.h projects/collation/lib/Makefile projects/collation/lib/libc/net/getnameinfo.c projects/collation/lib/libc/rpc/clnt_bcast.c projects/collation/lib/libc/rpc/clnt_vc.c projects/collation/lib/libc/rpc/getnetconfig.c projects/collation/lib/libc/rpc/mt_misc.c projects/collation/lib/libc/rpc/rpc_soc.c projects/collation/lib/libc/rpc/rpcb_clnt.c projects/collation/lib/libc/rpc/svc.c projects/collation/lib/libc/rpc/svc_dg.c projects/collation/lib/libc/rpc/svc_simple.c projects/collation/lib/libc/rpc/svc_vc.c projects/collation/lib/libc/tests/c063/Makefile projects/collation/lib/libc/tests/setjmp/Makefile projects/collation/lib/libc/tests/string/Makefile projects/collation/lib/libc/tests/tls_dso/Makefile projects/collation/lib/libdpv/dialogrc.c projects/collation/lib/libdpv/dialogrc.h projects/collation/lib/libfigpar/figpar.3 projects/collation/lib/libfigpar/figpar.c projects/collation/lib/libfigpar/figpar.h projects/collation/lib/libnetbsd/README projects/collation/lib/libutil/pty.3 projects/collation/sbin/ifconfig/ifconfig.8 projects/collation/sbin/ifconfig/ifieee80211.c projects/collation/sbin/ipfw/ipfw2.c projects/collation/sbin/ipfw/ipfw2.h projects/collation/sbin/savecore/savecore.c projects/collation/sbin/sysctl/sysctl.c projects/collation/secure/lib/libcrypto/Makefile projects/collation/secure/lib/libcrypto/Makefile.inc projects/collation/secure/lib/libssl/Makefile projects/collation/secure/usr.bin/openssl/Makefile projects/collation/share/man/man4/Makefile projects/collation/share/man/man4/ddb.4 projects/collation/share/man/man4/lagg.4 projects/collation/share/man/man4/xnb.4 projects/collation/share/man/man5/src.conf.5 projects/collation/share/man/man9/Makefile projects/collation/share/man/man9/pci.9 projects/collation/share/man/man9/sysctl.9 projects/collation/share/man/man9/sysctl_add_oid.9 projects/collation/share/mk/bsd.dep.mk projects/collation/share/mk/bsd.lib.mk projects/collation/share/mk/bsd.opts.mk projects/collation/share/mk/bsd.own.mk projects/collation/share/mk/bsd.prog.mk projects/collation/share/mk/local.init.mk projects/collation/share/mk/src.libnames.mk projects/collation/sys/arm/arm/busdma_machdep-v6.c projects/collation/sys/arm/arm/busdma_machdep.c projects/collation/sys/arm/arm/db_interface.c projects/collation/sys/arm/arm/machdep.c projects/collation/sys/arm/arm/trap-v6.c projects/collation/sys/arm/at91/at91_pmc.c projects/collation/sys/arm/at91/if_macb.c projects/collation/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/collation/sys/arm/broadcom/bcm2835/bcm2835_intr.c projects/collation/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/collation/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h projects/collation/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/collation/sys/arm/broadcom/bcm2835/bcm2836.c projects/collation/sys/arm/broadcom/bcm2835/bcm2836.h projects/collation/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c projects/collation/sys/arm/broadcom/bcm2835/files.bcm283x projects/collation/sys/arm/include/armreg.h projects/collation/sys/arm/include/bus_dma.h projects/collation/sys/arm/include/db_machdep.h projects/collation/sys/arm/include/machdep.h projects/collation/sys/arm/include/proc.h projects/collation/sys/arm/include/vfp.h projects/collation/sys/arm/ti/ti_common.c projects/collation/sys/arm/xscale/ixp425/ixp425_pci.c projects/collation/sys/arm64/arm64/busdma_bounce.c projects/collation/sys/arm64/arm64/mp_machdep.c projects/collation/sys/arm64/arm64/nexus.c projects/collation/sys/arm64/conf/GENERIC projects/collation/sys/boot/fdt/dts/arm/bcm2835.dtsi projects/collation/sys/boot/fdt/dts/arm/bcm2836.dtsi projects/collation/sys/boot/fdt/dts/arm/rpi.dts projects/collation/sys/boot/fdt/dts/arm/rpi2.dts projects/collation/sys/cam/ata/ata_da.c projects/collation/sys/cam/ata/ata_pmp.c projects/collation/sys/cam/ctl/ctl.c projects/collation/sys/cam/scsi/scsi_da.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/collation/sys/compat/linuxkpi/common/include/asm/byteorder.h projects/collation/sys/compat/linuxkpi/common/include/asm/types.h projects/collation/sys/compat/linuxkpi/common/include/linux/bitops.h projects/collation/sys/compat/linuxkpi/common/include/linux/cdev.h projects/collation/sys/compat/linuxkpi/common/include/linux/clocksource.h projects/collation/sys/compat/linuxkpi/common/include/linux/device.h projects/collation/sys/compat/linuxkpi/common/include/linux/idr.h projects/collation/sys/compat/linuxkpi/common/include/linux/if_arp.h projects/collation/sys/compat/linuxkpi/common/include/linux/if_vlan.h projects/collation/sys/compat/linuxkpi/common/include/linux/interrupt.h projects/collation/sys/compat/linuxkpi/common/include/linux/io.h projects/collation/sys/compat/linuxkpi/common/include/linux/jhash.h projects/collation/sys/compat/linuxkpi/common/include/linux/kobject.h projects/collation/sys/compat/linuxkpi/common/include/linux/kref.h projects/collation/sys/compat/linuxkpi/common/include/linux/module.h projects/collation/sys/compat/linuxkpi/common/include/linux/net.h projects/collation/sys/compat/linuxkpi/common/include/linux/notifier.h projects/collation/sys/compat/linuxkpi/common/include/linux/poll.h projects/collation/sys/compat/linuxkpi/common/include/linux/radix-tree.h projects/collation/sys/compat/linuxkpi/common/include/linux/rwlock.h projects/collation/sys/compat/linuxkpi/common/include/linux/sysfs.h projects/collation/sys/compat/linuxkpi/common/include/linux/usb.h projects/collation/sys/compat/linuxkpi/common/include/net/if_inet6.h projects/collation/sys/compat/linuxkpi/common/include/net/ipv6.h projects/collation/sys/compat/linuxkpi/common/include/net/netevent.h projects/collation/sys/conf/files.arm64 projects/collation/sys/conf/kern.opts.mk projects/collation/sys/conf/kern.post.mk projects/collation/sys/contrib/vchiq/interface/vchi/vchi.h projects/collation/sys/contrib/vchiq/interface/vchi/vchi_common.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_cfg.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_connected.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_connected.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_if.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_ioctl.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_pagelist.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_shim.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_util.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_util.h projects/collation/sys/dev/ath/if_ath.c projects/collation/sys/dev/ath/if_athvar.h projects/collation/sys/dev/cxgbe/t4_main.c projects/collation/sys/dev/filemon/filemon.c projects/collation/sys/dev/flash/mx25l.c projects/collation/sys/dev/iwi/if_iwi.c projects/collation/sys/dev/iwi/if_iwivar.h projects/collation/sys/dev/iwn/if_iwn.c projects/collation/sys/dev/ofw/ofw_iicbus.c projects/collation/sys/dev/otus/if_otus.c projects/collation/sys/dev/otus/if_otusreg.h projects/collation/sys/dev/pci/pci.c projects/collation/sys/dev/pci/pcivar.h projects/collation/sys/dev/usb/net/if_cdce.c projects/collation/sys/dev/usb/net/if_urndis.c projects/collation/sys/dev/usb/usb_busdma.c projects/collation/sys/dev/usb/wlan/if_rum.c projects/collation/sys/dev/usb/wlan/if_rumvar.h projects/collation/sys/dev/usb/wlan/if_run.c projects/collation/sys/dev/usb/wlan/if_urtwn.c projects/collation/sys/dev/vnic/thunder_mdio_fdt.c projects/collation/sys/dev/xen/netfront/netfront.c projects/collation/sys/geom/eli/g_eli.c projects/collation/sys/kern/imgact_elf.c projects/collation/sys/kern/kern_descrip.c projects/collation/sys/kern/kern_sysctl.c projects/collation/sys/kern/kern_tc.c projects/collation/sys/kern/link_elf.c projects/collation/sys/kern/subr_rman.c projects/collation/sys/kern/vfs_bio.c projects/collation/sys/mips/atheros/files.ar71xx projects/collation/sys/mips/mips/trap.c projects/collation/sys/modules/Makefile projects/collation/sys/net/flowtable.c projects/collation/sys/net/ieee8023ad_lacp.c projects/collation/sys/net/if_arcsubr.c projects/collation/sys/net/if_ethersubr.c projects/collation/sys/net/if_fddisubr.c projects/collation/sys/net/if_fwsubr.c projects/collation/sys/net/if_iso88025subr.c projects/collation/sys/netinet/in_var.h projects/collation/sys/netinet/ip_carp.c projects/collation/sys/netinet/ip_fastfwd.c projects/collation/sys/netinet/ip_fw.h projects/collation/sys/netinet/ip_input.c projects/collation/sys/netinet/sctp_indata.c projects/collation/sys/netinet/sctp_uio.h projects/collation/sys/netinet/sctputil.c projects/collation/sys/netinet/tcp_input.c projects/collation/sys/netinet6/frag6.c projects/collation/sys/netinet6/in6.h projects/collation/sys/netinet6/in6_rss.c projects/collation/sys/netinet6/ip6_input.c projects/collation/sys/netinet6/ip6_var.h projects/collation/sys/netpfil/ipfw/ip_fw_private.h projects/collation/sys/netpfil/ipfw/ip_fw_sockopt.c projects/collation/sys/netpfil/ipfw/ip_fw_table.c projects/collation/sys/netpfil/ipfw/ip_fw_table.h projects/collation/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/collation/sys/powerpc/powerpc/busdma_machdep.c projects/collation/sys/powerpc/powerpc/db_interface.c projects/collation/sys/sparc64/sparc64/bus_machdep.c projects/collation/sys/sys/cdefs.h projects/collation/sys/sys/param.h projects/collation/sys/sys/sysctl.h projects/collation/sys/x86/x86/busdma_bounce.c projects/collation/sys/x86/xen/xen_intr.c projects/collation/sys/xen/xen-os.h projects/collation/tools/build/mk/OptionalObsoleteFiles.inc projects/collation/tools/build/options/makeman projects/collation/tools/regression/security/open_to_operation/open_to_operation.c projects/collation/tools/tools/zfsboottest/Makefile projects/collation/tools/tools/zfsboottest/zfsboottest.c projects/collation/usr.bin/bsdiff/bsdiff/bsdiff.c projects/collation/usr.bin/m4/Makefile projects/collation/usr.bin/m4/Makefile.depend projects/collation/usr.bin/mandoc/Makefile projects/collation/usr.bin/mandoc/Makefile.depend projects/collation/usr.bin/netstat/if.c projects/collation/usr.bin/netstat/route.c projects/collation/usr.bin/rctl/rctl.8 projects/collation/usr.bin/rctl/rctl.c projects/collation/usr.bin/soelim/soelim.1 projects/collation/usr.bin/svn/lib/Makefile projects/collation/usr.sbin/bsdinstall/distfetch/distfetch.c projects/collation/usr.sbin/makefs/cd9660.c projects/collation/usr.sbin/makefs/ffs/ffs_bswap.c projects/collation/usr.sbin/makefs/makefs.8 projects/collation/usr.sbin/makefs/tests/makefs_cd9660_tests.sh projects/collation/usr.sbin/makefs/tests/makefs_ffs_tests.sh projects/collation/usr.sbin/makefs/tests/makefs_tests_common.sh projects/collation/usr.sbin/pciconf/cap.c projects/collation/usr.sbin/sysrc/sysrc projects/collation/usr.sbin/sysrc/sysrc.8 Directory Properties: projects/collation/ (props changed) projects/collation/contrib/libexecinfo/ (props changed) projects/collation/include/ (props changed) projects/collation/lib/libc/ (props changed) projects/collation/lib/libutil/ (props changed) projects/collation/sbin/ (props changed) projects/collation/sbin/ipfw/ (props changed) projects/collation/share/ (props changed) projects/collation/share/man/man4/ (props changed) projects/collation/sys/ (props changed) projects/collation/sys/boot/ (props changed) projects/collation/sys/cddl/contrib/opensolaris/ (props changed) projects/collation/sys/conf/ (props changed) Modified: projects/collation/MAINTAINERS ============================================================================== --- projects/collation/MAINTAINERS Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/MAINTAINERS Sat Nov 7 11:02:33 2015 (r290484) @@ -26,7 +26,38 @@ 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. +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 Advance notification requested. +fetch des Advance notification 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. +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. +---- OLD ---- libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. UFS EAs rwatson Pre-commit review requested. @@ -34,7 +65,6 @@ MAC Framework rwatson Pre-commit review MAC Modules rwatson Pre-commit review requested. contrib/openbsm rwatson Pre-commit review requested. sys/security/audit rwatson Pre-commit review requested. -ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. @@ -57,20 +87,11 @@ etc/mail gshapiro Pre-commit review requ Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. -libfetch des Advance notification requested. -fetch des Advance notification 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. lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. -net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. -share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. 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. @@ -102,7 +123,6 @@ linux emul emulation Please discuss chan bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. freebsd-update cperciva Pre-commit review requested. -openssl benl,jkim 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. @@ -120,18 +140,8 @@ usr.sbin/zic edwin Heads-up appreciat 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 -isci(4) jimharris Pre-commit review requested. cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. -sh(1) jilles Pre-commit review requested. This also applies - to kill(1), printf(1) and test(1) which are - compiled in as builtins. -nvme(4) jimharris Pre-commit review requested. -nvd(4) jimharris Pre-commit review requested. -nvmecontrol(8) jimharris Pre-commit review requested. -release/release.sh gjb Pre-commit review and regression tests - requested. nanobsd imp Pre-commit review requested for coordination. vmm(4) neel,grehan Pre-commit review requested. -opencrypto jmg Pre-commit review requested. Documentation Required. Modified: projects/collation/Makefile.inc1 ============================================================================== --- projects/collation/Makefile.inc1 Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/Makefile.inc1 Sat Nov 7 11:02:33 2015 (r290484) @@ -27,7 +27,7 @@ # 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:/bin/sh) +# 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. @@ -48,9 +48,15 @@ .error "Both TARGET and TARGET_ARCH must be defined." .endif -.include "share/mk/src.opts.mk" -.include <bsd.arch.inc.mk> -.include <bsd.compiler.mk> +# 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 <bsd.compiler.mk> # 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, @@ -139,7 +145,7 @@ CLEANDIR= cleandir LOCAL_TOOL_DIRS?= -BUILDENV_SHELL?=/bin/sh +BUILDENV_SHELL?=${SHELL} SVN?= /usr/local/bin/svn SVNFLAGS?= -r HEAD @@ -254,7 +260,7 @@ INSTALLTMP!= /usr/bin/mktemp -d -u -t in BOOTSTRAPPING?= 0 # Common environment for world related stages -CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ +CROSSENV+= MAKEOBJDIRPREFIX=${OBJTREE} \ MACHINE_ARCH=${TARGET_ARCH} \ MACHINE=${TARGET} \ CPUTYPE=${TARGET_CPUTYPE} @@ -329,10 +335,6 @@ HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MT HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif -.if defined(CROSS_TOOLCHAIN) -LOCALBASE?= /usr/local -.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" -.endif .if defined(CROSS_TOOLCHAIN_PREFIX) CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} @@ -369,7 +371,7 @@ X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${ X${BINUTIL}?= ${${BINUTIL}} .endif .endfor -WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \ +CROSSENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \ DEPFLAGS="${DEPFLAGS}" \ CPP="${XCPP} ${XCFLAGS}" \ AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \ @@ -771,7 +773,7 @@ buildworld_epilogue: # modification of the current environment's PATH. In addition, we need # to quote multiword values. # -buildenvvars: +buildenvvars: .PHONY @echo ${WMAKEENV:Q} ${.MAKE.EXPORTED:@v@$v=\"${$v}\"@} .if ${.TARGETS:Mbuildenv} @@ -779,9 +781,11 @@ buildenvvars: .error The buildenv target is incompatible with -j .endif .endif -buildenv: +BUILDENV_DIR?= ${.CURDIR} +buildenv: .PHONY @echo Entering world for ${TARGET_ARCH}:${TARGET} - @cd ${.CURDIR} && env ${WMAKEENV} ${BUILDENV_SHELL} || true + @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} \ + || true TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} @@ -1367,10 +1371,10 @@ _sed= usr.bin/sed .endif .if ${BOOTSTRAPPING} < 1000002 -_libohash= lib/libohash +_libopenbsd= lib/libopenbsd _m4= usr.bin/m4 -${_bt}-usr.bin/m4: ${_bt}-lib/libohash +${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd .endif .if ${BOOTSTRAPPING} < 1000026 @@ -1443,10 +1447,10 @@ _kerberos5_bootstrap_tools= \ .endif .if ${MK_MANDOCDB} != "no" -_libohash?= lib/libohash +_libopenbsd?= lib/libopenbsd _makewhatis= lib/libsqlite3 \ usr.bin/mandoc -${_bt}-usr.bin/mandoc: ${_bt}-lib/libohash ${_bt}-lib/libsqlite3 +${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd ${_bt}-lib/libsqlite3 .else _makewhatis=usr.bin/makewhatis .endif @@ -1469,7 +1473,7 @@ bootstrap-tools: .PHONY ${_awk} \ ${_cat} \ usr.bin/lorder \ - ${_libohash} \ + ${_libopenbsd} \ ${_makewhatis} \ usr.bin/rpcgen \ ${_sed} \ Modified: projects/collation/ObsoleteFiles.inc ============================================================================== --- projects/collation/ObsoleteFiles.inc Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/ObsoleteFiles.inc Sat Nov 7 11:02:33 2015 (r290484) @@ -38,7 +38,7 @@ # xargs -n1 | sort | uniq -d; # done -# XXXXX: String collation improvements +# 20151107: String collation improvements OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES @@ -97,6 +97,39 @@ OLD_FILES+=usr/bin/colldef OLD_FILES+=usr/share/man/man1/colldef.1.gz OLD_FILES+=usr/bin/mklocale OLD_FILES+=usr/share/man/man1/mklocale.1.gz +# 20151101: added missing _test suffix on multiple tests in lib/libc +OLD_FILES+=usr/tests/lib/libc/c063/faccessat +OLD_FILES+=usr/tests/lib/libc/c063/fchmodat +OLD_FILES+=usr/tests/lib/libc/c063/fchownat +OLD_FILES+=usr/tests/lib/libc/c063/fexecve +OLD_FILES+=usr/tests/lib/libc/c063/fstatat +OLD_FILES+=usr/tests/lib/libc/c063/linkat +OLD_FILES+=usr/tests/lib/libc/c063/mkdirat +OLD_FILES+=usr/tests/lib/libc/c063/mkfifoat +OLD_FILES+=usr/tests/lib/libc/c063/mknodat +OLD_FILES+=usr/tests/lib/libc/c063/openat +OLD_FILES+=usr/tests/lib/libc/c063/readlinkat +OLD_FILES+=usr/tests/lib/libc/c063/renameat +OLD_FILES+=usr/tests/lib/libc/c063/symlinkat +OLD_FILES+=usr/tests/lib/libc/c063/unlinkat +OLD_FILES+=usr/tests/lib/libc/c063/utimensat +OLD_FILES+=usr/tests/lib/libc/string/memchr +OLD_FILES+=usr/tests/lib/libc/string/memcpy +OLD_FILES+=usr/tests/lib/libc/string/memmem +OLD_FILES+=usr/tests/lib/libc/string/memset +OLD_FILES+=usr/tests/lib/libc/string/strcat +OLD_FILES+=usr/tests/lib/libc/string/strchr +OLD_FILES+=usr/tests/lib/libc/string/strcmp +OLD_FILES+=usr/tests/lib/libc/string/strcpy +OLD_FILES+=usr/tests/lib/libc/string/strcspn +OLD_FILES+=usr/tests/lib/libc/string/strerror +OLD_FILES+=usr/tests/lib/libc/string/strlen +OLD_FILES+=usr/tests/lib/libc/string/strpbrk +OLD_FILES+=usr/tests/lib/libc/string/strrchr +OLD_FILES+=usr/tests/lib/libc/string/strspn +OLD_FILES+=usr/tests/lib/libc/string/swab +# 20151101: 430.status-rwho was renamed to 430.status-uptime +OLD_FILES+=etc/periodic/daily/430.status-rwho # 20151030: OpenSSL 1.0.2d import OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_certs.3.gz OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl.3.gz Modified: projects/collation/bin/rm/rm.1 ============================================================================== --- projects/collation/bin/rm/rm.1 Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/bin/rm/rm.1 Sat Nov 7 11:02:33 2015 (r290484) @@ -32,7 +32,7 @@ .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 .\" $FreeBSD$ .\" -.Dd April 25, 2013 +.Dd November 7, 2015 .Dt RM 1 .Os .Sh NAME @@ -234,7 +234,7 @@ not the standard error output. The .Nm command conforms to -.St -p1003.2 . +.St -p1003.1-2013 . .Pp The simplified .Nm unlink Modified: projects/collation/bin/rm/rm.c ============================================================================== --- projects/collation/bin/rm/rm.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/bin/rm/rm.c Sat Nov 7 11:02:33 2015 (r290484) @@ -155,8 +155,7 @@ main(int argc, char *argv[]) } checkdot(argv); - if (getenv("POSIXLY_CORRECT") == NULL) - checkslash(argv); + checkslash(argv); uid = geteuid(); (void)signal(SIGINFO, siginfo); Modified: projects/collation/bin/sh/eval.c ============================================================================== --- projects/collation/bin/sh/eval.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/bin/sh/eval.c Sat Nov 7 11:02:33 2015 (r290484) @@ -750,7 +750,7 @@ isdeclarationcmd(struct narg *arg) } static void -xtracecommand(struct arglist *varlist, struct arglist *arglist) +xtracecommand(struct arglist *varlist, int argc, char **argv) { char sep = 0; const char *text, *p, *ps4; @@ -771,8 +771,8 @@ xtracecommand(struct arglist *varlist, s out2qstr(text); sep = ' '; } - for (i = 0; i < arglist->count; i++) { - text = arglist->args[i]; + for (i = 0; i < argc; i++) { + text = argv[i]; if (sep != 0) out2c(' '); out2qstr(text); @@ -849,6 +849,8 @@ evalcommand(union node *cmd, int flags, do_clearcmdentry = 0; oexitstatus = exitstatus; exitstatus = 0; + /* Add one slot at the beginning for tryexec(). */ + appendarglist(&arglist, nullstr); for (argp = cmd->ncmd.args ; argp ; argp = argp->narg.next) { if (varflag && isassignment(argp->narg.text)) { expandarg(argp, varflag == 1 ? &varlist : &arglist, @@ -858,13 +860,11 @@ evalcommand(union node *cmd, int flags, varflag = isdeclarationcmd(&argp->narg) ? 2 : 0; expandarg(argp, &arglist, EXP_FULL | EXP_TILDE); } + appendarglist(&arglist, nullstr); expredir(cmd->ncmd.redirect); - argc = arglist.count; - /* Add one slot at the beginning for tryexec(). */ - argv = stalloc(sizeof (char *) * (argc + 2)); - argv++; + argc = arglist.count - 2; + argv = &arglist.args[1]; - memcpy(argv, arglist.args, sizeof(*argv) * argc); argv[argc] = NULL; lastarg = NULL; if (iflag && funcnest == 0 && argc > 0) @@ -872,7 +872,7 @@ evalcommand(union node *cmd, int flags, /* Print the command if xflag is set. */ if (xflag) - xtracecommand(&varlist, &arglist); + xtracecommand(&varlist, argc, argv); /* Now locate the command. */ if (argc == 0) { Modified: projects/collation/bin/sh/expand.c ============================================================================== --- projects/collation/bin/sh/expand.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/bin/sh/expand.c Sat Nov 7 11:02:33 2015 (r290484) @@ -114,7 +114,6 @@ static void expmeta(char *, char *, stru static int expsortcmp(const void *, const void *); static int patmatch(const char *, const char *, int); static char *cvtnum(int, char *); -static void appendarglist(struct arglist *, char *); static int collate_range_cmp(wchar_t, wchar_t); void @@ -126,7 +125,7 @@ emptyarglist(struct arglist *list) list->capacity = sizeof(list->smallarg) / sizeof(list->smallarg[0]); } -static void +void appendarglist(struct arglist *list, char *str) { char **newargs; Modified: projects/collation/bin/sh/expand.h ============================================================================== --- projects/collation/bin/sh/expand.h Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/bin/sh/expand.h Sat Nov 7 11:02:33 2015 (r290484) @@ -52,6 +52,7 @@ struct arglist { void emptyarglist(struct arglist *); +void appendarglist(struct arglist *, char *); union node; void expandarg(union node *, struct arglist *, int); void rmescapes(char *); Modified: projects/collation/contrib/libexecinfo/backtrace.3 ============================================================================== --- projects/collation/contrib/libexecinfo/backtrace.3 Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/contrib/libexecinfo/backtrace.3 Sat Nov 7 11:02:33 2015 (r290484) @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 23, 2013 +.Dd November 3, 2015 .Dt BACKTRACE 3 .Os .Sh NAME @@ -47,7 +47,7 @@ .Ft "char **" .Fn backtrace_symbols_fmt "void * const *addrlist" "size_t len" "const char *fmt" .Ft int -.Fn backtrace_symbols_fmt_fd "void * const *addrlist" "size_t len" "const char *fmt" "int fd" +.Fn backtrace_symbols_fd_fmt "void * const *addrlist" "size_t len" "const char *fmt" "int fd" .Sh DESCRIPTION The .Fn backtrace @@ -106,7 +106,7 @@ with a format argument of The .Fn backtrace_symbols_fd and -.Fn backtrace_symbols_fmt_fd +.Fn backtrace_symbols_fd_fmt are similar to the non _fd named functions, only instead of returning an array or strings, they print a new-line separated array of strings in fd, and return Modified: projects/collation/contrib/libxo/libxo/xo_format.5 ============================================================================== --- projects/collation/contrib/libxo/libxo/xo_format.5 Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/contrib/libxo/libxo/xo_format.5 Sat Nov 7 11:02:33 2015 (r290484) @@ -7,7 +7,7 @@ .\" # LICENSE. .\" # Phil Shafer, July 2014 .\" -.Dd December 4, 2014 +.Dd November 6, 2015 .Dt LIBXO 3 .Os .Sh NAME @@ -367,7 +367,7 @@ particular output styles: .It l "leaf-list " "Field is a leaf-list, a list of leaf values" .It n "no-quotes " "Do not quote the field when using JSON style" .It q "quotes " "Quote the field when using JSON style" -.It q "trim " "Trim leading and trailing whitespace" +.It t "trim " "Trim leading and trailing whitespace" .It w "white space " "A blank ("" "") is appended after the label" .El .Pp Modified: projects/collation/etc/defaults/periodic.conf ============================================================================== --- projects/collation/etc/defaults/periodic.conf Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/etc/defaults/periodic.conf Sat Nov 7 11:02:33 2015 (r290484) @@ -115,8 +115,8 @@ daily_status_network_enable="YES" # Ch daily_status_network_usedns="YES" # DNS lookups are ok daily_status_network_netstat_flags="-d" # netstat(1) flags -# 430.status-rwho -daily_status_rwho_enable="YES" # Check system status +# 430.status-uptime +daily_status_uptime_enable="YES" # Check system uptime # 440.status-mailq daily_status_mailq_enable="YES" # Check mail status Copied: projects/collation/etc/periodic/daily/430.status-uptime (from r290483, head/etc/periodic/daily/430.status-uptime) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/collation/etc/periodic/daily/430.status-uptime Sat Nov 7 11:02:33 2015 (r290484, copy of r290483, head/etc/periodic/daily/430.status-uptime) @@ -0,0 +1,38 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ] +then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +case "$daily_status_uptime_enable" in + [Yy][Ee][Ss]) + rwho=$(echo /var/rwho/*) + if [ -f "${rwho%% *}" ] + then + echo "" + echo "Local network system status:" + prog=ruptime + else + echo "" + echo "Local system status:" + prog=uptime + fi + rc=$($prog | tee /dev/stderr | wc -l) + if [ $? -eq 0 ] + then + [ $rc -gt 1 ] && rc=1 + else + rc=3 + fi;; + + *) rc=0;; +esac + +exit $rc Modified: projects/collation/etc/periodic/daily/Makefile ============================================================================== --- projects/collation/etc/periodic/daily/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/etc/periodic/daily/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -15,6 +15,7 @@ FILES= 100.clean-disks \ 408.status-gstripe \ 409.status-gconcat \ 420.status-network \ + 430.status-uptime \ 450.status-security \ 510.status-world-kernel \ 999.local @@ -38,8 +39,7 @@ FILES+= 480.status-ntpd .endif .if ${MK_RCMDS} != "no" -FILES+= 140.clean-rwho \ - 430.status-rwho +FILES+= 140.clean-rwho .endif .if ${MK_SENDMAIL} != "no" Modified: projects/collation/etc/periodic/security/520.pfdenied ============================================================================== --- projects/collation/etc/periodic/security/520.pfdenied Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/etc/periodic/security/520.pfdenied Sat Nov 7 11:02:33 2015 (r290484) @@ -44,7 +44,7 @@ rc=0 if check_yesno_period security_status_pfdenied_enable then TMP=`mktemp -t security` - if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); print buf$0;} }' > ${TMP}; then + if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); if ($5 > 0) print buf$0;} }' > ${TMP}; then check_diff new_only pf ${TMP} "${host} pf denied packets:" fi rc=$? Modified: projects/collation/gnu/usr.bin/grep/savedir.c ============================================================================== --- projects/collation/gnu/usr.bin/grep/savedir.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/gnu/usr.bin/grep/savedir.c Sat Nov 7 11:02:33 2015 (r290484) @@ -71,6 +71,7 @@ char *stpcpy (); #include <fnmatch.h> #include "savedir.h" +#include "system.h" char *path; size_t pathlen; Modified: projects/collation/include/unistd.h ============================================================================== --- projects/collation/include/unistd.h Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/include/unistd.h Sat Nov 7 11:02:33 2015 (r290484) @@ -327,9 +327,9 @@ int close(int); void closefrom(int); int dup(int); int dup2(int, int); -int execl(const char *, const char *, ...) __sentinel; +int execl(const char *, const char *, ...) __null_sentinel; int execle(const char *, const char *, ...); -int execlp(const char *, const char *, ...) __sentinel; +int execlp(const char *, const char *, ...) __null_sentinel; int execv(const char *, char * const *); int execve(const char *, char * const *, char * const *); int execvp(const char *, char * const *); Modified: projects/collation/lib/Makefile ============================================================================== --- projects/collation/lib/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -75,7 +75,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libnetgraph} \ ${_libngatm} \ libnv \ - libohash \ + libopenbsd \ libopie \ libpam \ libpcap \ Modified: projects/collation/lib/libc/net/getnameinfo.c ============================================================================== --- projects/collation/lib/libc/net/getnameinfo.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/net/getnameinfo.c Sat Nov 7 11:02:33 2015 (r290484) @@ -122,7 +122,8 @@ getnameinfo(const struct sockaddr *sa, s afd = find_afd(sa->sa_family); if (afd == NULL) return (EAI_FAMILY); - if (sa->sa_family == PF_LOCAL) { + switch (sa->sa_family) { + case PF_LOCAL: /* * PF_LOCAL uses variable sa->sa_len depending on the * content length of sun_path. Require 1 byte in @@ -132,8 +133,17 @@ getnameinfo(const struct sockaddr *sa, s salen <= afd->a_socklen - sizeofmember(struct sockaddr_un, sun_path)) return (EAI_FAIL); - } else if (salen != afd->a_socklen) - return (EAI_FAIL); + break; + case PF_LINK: + if (salen <= afd->a_socklen - + sizeofmember(struct sockaddr_dl, sdl_data)) + return (EAI_FAIL); + break; + default: + if (salen != afd->a_socklen) + return (EAI_FAIL); + break; + } return ((*afd->a_func)(afd, sa, salen, host, hostlen, serv, servlen, flags)); Modified: projects/collation/lib/libc/rpc/clnt_bcast.c ============================================================================== --- projects/collation/lib/libc/rpc/clnt_bcast.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/clnt_bcast.c Sat Nov 7 11:02:33 2015 (r290484) @@ -636,13 +636,10 @@ rpc_broadcast_exp(rpcprog_t prog, rpcver } /* The giant for loop */ done_broad: - if (inbuf) - (void) free(inbuf); - if (outbuf) - (void) free(outbuf); + free(inbuf); + free(outbuf); #ifdef PORTMAP - if (outbuf_pmap) - (void) free(outbuf_pmap); + free(outbuf_pmap); #endif /* PORTMAP */ for (i = 0; i < fdlistno; i++) { (void)_close(fdlist[i].fd); Modified: projects/collation/lib/libc/rpc/clnt_vc.c ============================================================================== --- projects/collation/lib/libc/rpc/clnt_vc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/clnt_vc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -651,8 +651,7 @@ clnt_vc_destroy(CLIENT *cl) (void)_close(ct->ct_fd); } XDR_DESTROY(&(ct->ct_xdrs)); - if (ct->ct_addr.buf) - free(ct->ct_addr.buf); + free(ct->ct_addr.buf); mem_free(ct, sizeof(struct ct_data)); if (cl->cl_netid && cl->cl_netid[0]) mem_free(cl->cl_netid, strlen(cl->cl_netid) +1); Modified: projects/collation/lib/libc/rpc/getnetconfig.c ============================================================================== --- projects/collation/lib/libc/rpc/getnetconfig.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/getnetconfig.c Sat Nov 7 11:02:33 2015 (r290484) @@ -164,8 +164,7 @@ __nc_error(void) if ((nc_addr = (int *)thr_getspecific(nc_key)) == NULL) { nc_addr = (int *)malloc(sizeof (int)); if (thr_setspecific(nc_key, (void *) nc_addr) != 0) { - if (nc_addr) - free(nc_addr); + free(nc_addr); return (&nc_error); } *nc_addr = 0; @@ -417,7 +416,7 @@ endnetconfig(void *handlep) while (q != NULL) { p = q->next; - if (q->ncp->nc_lookups != NULL) free(q->ncp->nc_lookups); + free(q->ncp->nc_lookups); free(q->ncp); free(q->linep); free(q); @@ -537,8 +536,7 @@ freenetconfigent(struct netconfig *netco { if (netconfigp != NULL) { free(netconfigp->nc_netid); /* holds all netconfigp's strings */ - if (netconfigp->nc_lookups != NULL) - free(netconfigp->nc_lookups); + free(netconfigp->nc_lookups); free(netconfigp); } return; @@ -628,8 +626,7 @@ parse_ncp(char *stringp, struct netconfi } else { char *cp; /* tmp string */ - if (ncp->nc_lookups != NULL) /* from last visit */ - free(ncp->nc_lookups); + free(ncp->nc_lookups); /* from last visit */ ncp->nc_lookups = NULL; ncp->nc_nlookups = 0; while ((cp = tokenp) != NULL) { Modified: projects/collation/lib/libc/rpc/mt_misc.c ============================================================================== --- projects/collation/lib/libc/rpc/mt_misc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/mt_misc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -106,8 +106,7 @@ __rpc_createerr(void) rce_addr = (struct rpc_createerr *) malloc(sizeof (struct rpc_createerr)); if (thr_setspecific(rce_key, (void *) rce_addr) != 0) { - if (rce_addr) - free(rce_addr); + free(rce_addr); return (&rpc_createerr); } memset(rce_addr, 0, sizeof (struct rpc_createerr)); Modified: projects/collation/lib/libc/rpc/rpc_soc.c ============================================================================== --- projects/collation/lib/libc/rpc/rpc_soc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/rpc_soc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -432,8 +432,7 @@ clntunix_create(struct sockaddr_un *radd if ((raddr->sun_len == 0) || ((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) || ((svcaddr->buf = malloc(sizeof(struct sockaddr_un))) == NULL)) { - if (svcaddr != NULL) - free(svcaddr); + free(svcaddr); rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; return(cl); Modified: projects/collation/lib/libc/rpc/rpcb_clnt.c ============================================================================== --- projects/collation/lib/libc/rpc/rpcb_clnt.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/rpcb_clnt.c Sat Nov 7 11:02:33 2015 (r290484) @@ -179,8 +179,7 @@ delete_cache(struct netbuf *addr) free(cptr->ac_netid); free(cptr->ac_taddr->buf); free(cptr->ac_taddr); - if (cptr->ac_uaddr) - free(cptr->ac_uaddr); + free(cptr->ac_uaddr); if (prevptr) prevptr->ac_next = cptr->ac_next; else @@ -216,14 +215,10 @@ add_cache(const char *host, const char * ad_cache->ac_taddr->buf = (char *) malloc(taddr->len); if (ad_cache->ac_taddr->buf == NULL) { out: - if (ad_cache->ac_host) - free(ad_cache->ac_host); - if (ad_cache->ac_netid) - free(ad_cache->ac_netid); - if (ad_cache->ac_uaddr) - free(ad_cache->ac_uaddr); - if (ad_cache->ac_taddr) - free(ad_cache->ac_taddr); + free(ad_cache->ac_host); + free(ad_cache->ac_netid); + free(ad_cache->ac_uaddr); + free(ad_cache->ac_taddr); free(ad_cache); return; } @@ -256,8 +251,7 @@ out: free(cptr->ac_netid); free(cptr->ac_taddr->buf); free(cptr->ac_taddr); - if (cptr->ac_uaddr) - free(cptr->ac_uaddr); + free(cptr->ac_uaddr); if (prevptr) { prevptr->ac_next = NULL; @@ -798,10 +792,8 @@ __rpcb_findaddr_timed(rpcprog_t program, malloc(remote.len)) == NULL)) { rpc_createerr.cf_stat = RPC_SYSTEMERROR; clnt_geterr(client, &rpc_createerr.cf_error); - if (address) { - free(address); - address = NULL; - } + free(address); + address = NULL; goto error; } memcpy(address->buf, remote.buf, remote.len); Modified: projects/collation/lib/libc/rpc/svc.c ============================================================================== --- projects/collation/lib/libc/rpc/svc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/svc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -198,8 +198,7 @@ svc_reg(SVCXPRT *xprt, const rpcprog_t p rwlock_wrlock(&svc_lock); if ((s = svc_find(prog, vers, &prev, netid)) != NULL) { - if (netid) - free(netid); + free(netid); if (s->sc_dispatch == dispatch) goto rpcb_it; /* he is registering another xptr */ rwlock_unlock(&svc_lock); @@ -207,8 +206,7 @@ svc_reg(SVCXPRT *xprt, const rpcprog_t p } s = mem_alloc(sizeof (struct svc_callout)); if (s == NULL) { - if (netid) - free(netid); + free(netid); rwlock_unlock(&svc_lock); return (FALSE); } Modified: projects/collation/lib/libc/rpc/svc_dg.c ============================================================================== --- projects/collation/lib/libc/rpc/svc_dg.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/svc_dg.c Sat Nov 7 11:02:33 2015 (r290484) @@ -406,8 +406,7 @@ svc_dg_destroy(SVCXPRT *xprt) (void) mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen); if (xprt->xp_ltaddr.buf) (void) mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen); - if (xprt->xp_tp) - (void) free(xprt->xp_tp); + free(xprt->xp_tp); svc_xprt_free(xprt); } Modified: projects/collation/lib/libc/rpc/svc_simple.c ============================================================================== --- projects/collation/lib/libc/rpc/svc_simple.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/svc_simple.c Sat Nov 7 11:02:33 2015 (r290484) @@ -166,10 +166,8 @@ rpc_reg(rpcprog_t prognum, rpcvers_t ver if (((xdrbuf = malloc((unsigned)recvsz)) == NULL) || ((netid = strdup(nconf->nc_netid)) == NULL)) { warnx(rpc_reg_err, rpc_reg_msg, __no_mem_str); - if (xdrbuf != NULL) - free(xdrbuf); - if (netid != NULL) - free(netid); + free(xdrbuf); + free(netid); SVC_DESTROY(svcxprt); break; } Modified: projects/collation/lib/libc/rpc/svc_vc.c ============================================================================== --- projects/collation/lib/libc/rpc/svc_vc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/svc_vc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -394,10 +394,8 @@ __svc_vc_dodestroy(SVCXPRT *xprt) mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen); if (xprt->xp_ltaddr.buf) mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen); - if (xprt->xp_tp) - free(xprt->xp_tp); - if (xprt->xp_netid) - free(xprt->xp_netid); + free(xprt->xp_tp); + free(xprt->xp_netid); svc_xprt_free(xprt); } Modified: projects/collation/lib/libc/tests/c063/Makefile ============================================================================== --- projects/collation/lib/libc/tests/c063/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/tests/c063/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -2,21 +2,21 @@ #TODO: t_o_search -NETBSD_ATF_TESTS_C= faccessat -NETBSD_ATF_TESTS_C+= fchmodat -NETBSD_ATF_TESTS_C+= fchownat -NETBSD_ATF_TESTS_C+= fexecve -NETBSD_ATF_TESTS_C+= fstatat -NETBSD_ATF_TESTS_C+= linkat -NETBSD_ATF_TESTS_C+= mkdirat -NETBSD_ATF_TESTS_C+= mkfifoat -NETBSD_ATF_TESTS_C+= mknodat -NETBSD_ATF_TESTS_C+= openat -NETBSD_ATF_TESTS_C+= readlinkat -NETBSD_ATF_TESTS_C+= renameat -NETBSD_ATF_TESTS_C+= symlinkat -NETBSD_ATF_TESTS_C+= unlinkat -NETBSD_ATF_TESTS_C+= utimensat +NETBSD_ATF_TESTS_C= faccessat_test +NETBSD_ATF_TESTS_C+= fchmodat_test +NETBSD_ATF_TESTS_C+= fchownat_test +NETBSD_ATF_TESTS_C+= fexecve_test +NETBSD_ATF_TESTS_C+= fstatat_test +NETBSD_ATF_TESTS_C+= linkat_test +NETBSD_ATF_TESTS_C+= mkdirat_test +NETBSD_ATF_TESTS_C+= mkfifoat_test +NETBSD_ATF_TESTS_C+= mknodat_test +NETBSD_ATF_TESTS_C+= openat_test +NETBSD_ATF_TESTS_C+= readlinkat_test +NETBSD_ATF_TESTS_C+= renameat_test +NETBSD_ATF_TESTS_C+= symlinkat_test +NETBSD_ATF_TESTS_C+= unlinkat_test +NETBSD_ATF_TESTS_C+= utimensat_test CFLAGS+= -D_INCOMPLETE_XOPEN_C063 Modified: projects/collation/lib/libc/tests/setjmp/Makefile ============================================================================== --- projects/collation/lib/libc/tests/setjmp/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/tests/setjmp/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -1,10 +1,10 @@ # $FreeBSD$ -NETBSD_ATF_TESTS_C= t_setjmp -NETBSD_ATF_TESTS_C+= t_threadjmp +NETBSD_ATF_TESTS_C= setjmp_test +NETBSD_ATF_TESTS_C+= threadjmp_test -DPADD.t_threadjmp+= ${LIBPTHREAD} -LDADD.t_threadjmp+= -lpthread +DPADD.threadjmp_test+= ${LIBPTHREAD} +LDADD.threadjmp_test+= -lpthread WARNS?= 4 Modified: projects/collation/lib/libc/tests/string/Makefile ============================================================================== --- projects/collation/lib/libc/tests/string/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/tests/string/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -4,28 +4,28 @@ # TODO: popcount, stresep -NETBSD_ATF_TESTS_C+= memchr -NETBSD_ATF_TESTS_C+= memcpy -NETBSD_ATF_TESTS_C+= memmem -NETBSD_ATF_TESTS_C+= memset -NETBSD_ATF_TESTS_C+= strcat -NETBSD_ATF_TESTS_C+= strchr -NETBSD_ATF_TESTS_C+= strcmp -NETBSD_ATF_TESTS_C+= strcpy -NETBSD_ATF_TESTS_C+= strcspn -NETBSD_ATF_TESTS_C+= strerror -NETBSD_ATF_TESTS_C+= strlen -NETBSD_ATF_TESTS_C+= strpbrk -NETBSD_ATF_TESTS_C+= strrchr -NETBSD_ATF_TESTS_C+= strspn -NETBSD_ATF_TESTS_C+= swab +NETBSD_ATF_TESTS_C+= memchr_test +NETBSD_ATF_TESTS_C+= memcpy_test +NETBSD_ATF_TESTS_C+= memmem_test +NETBSD_ATF_TESTS_C+= memset_test +NETBSD_ATF_TESTS_C+= strcat_test +NETBSD_ATF_TESTS_C+= strchr_test +NETBSD_ATF_TESTS_C+= strcmp_test +NETBSD_ATF_TESTS_C+= strcpy_test +NETBSD_ATF_TESTS_C+= strcspn_test +NETBSD_ATF_TESTS_C+= strerror_test +NETBSD_ATF_TESTS_C+= strlen_test +NETBSD_ATF_TESTS_C+= strpbrk_test +NETBSD_ATF_TESTS_C+= strrchr_test +NETBSD_ATF_TESTS_C+= strspn_test +NETBSD_ATF_TESTS_C+= swab_test .include "../Makefile.netbsd-tests" -LDADD.memchr+= -lmd -DPADD.memchr+= ${LIBMD} +LDADD.memchr_test+= -lmd +DPADD.memchr_test+= ${LIBMD} -LDADD.memcpy+= -lmd -DPADD.memcpy+= ${LIBMD} +LDADD.memcpy_test+= -lmd +DPADD.memcpy_test+= ${LIBMD} .include <bsd.test.mk> Modified: projects/collation/lib/libc/tests/tls_dso/Makefile ============================================================================== --- projects/collation/lib/libc/tests/tls_dso/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/tests/tls_dso/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -1,7 +1,5 @@ # $FreeBSD$ -SRCDIR= ${SRCTOP}/contrib/netbsd/ - .include <bsd.own.mk> LIB= h_tls_dynamic Modified: projects/collation/lib/libdpv/dialogrc.c ============================================================================== --- projects/collation/lib/libdpv/dialogrc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libdpv/dialogrc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2013-2014 Devin Teske <dteske@FreeBSD.org> + * Copyright (c) 2013-2015 Devin Teske <dteske@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -49,58 +49,58 @@ char gauge_color[STR_BUFSIZE] = "47b"; / char separator[STR_BUFSIZE] = ""; /* Function prototypes */ -static int setattr(struct fp_config *, uint32_t, char *, char *); -static int setbool(struct fp_config *, uint32_t, char *, char *); -static int setnum(struct fp_config *, uint32_t, char *, char *); -static int setstr(struct fp_config *, uint32_t, char *, char *); +static int setattr(struct figpar_config *, uint32_t, char *, char *); +static int setbool(struct figpar_config *, uint32_t, char *, char *); +static int setnum(struct figpar_config *, uint32_t, char *, char *); +static int setstr(struct figpar_config *, uint32_t, char *, char *); /* * Anatomy of DIALOGRC (~/.dialogrc by default) * NOTE: Must appear after private function prototypes (above) * NB: Brace-initialization of union requires cast to *first* member of union */ -static struct fp_config dialogrc_config[] = { - /* TYPE Directive DEFAULT HANDLER */ - {FP_TYPE_INT, "aspect", {(void *)0}, &setnum}, - {FP_TYPE_STR, "separate_widget", {separator}, &setstr}, - {FP_TYPE_INT, "tab_len", {(void *)0}, &setnum}, - {FP_TYPE_BOOL, "visit_items", {(void *)0}, &setbool}, - {FP_TYPE_BOOL, "use_shadow", {(void *)1}, &setbool}, - {FP_TYPE_BOOL, "use_colors", {(void *)1}, &setbool}, - {FP_TYPE_STR, "screen_color", {NULL}, &setattr}, - {FP_TYPE_STR, "shadow_color", {NULL}, &setattr}, - {FP_TYPE_STR, "dialog_color", {NULL}, &setattr}, - {FP_TYPE_STR, "title_color", {NULL}, &setattr}, - {FP_TYPE_STR, "border_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_active_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_inactive_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_key_active_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_key_inactive_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_label_active_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_label_inactive_color",{NULL}, &setattr}, - {FP_TYPE_STR, "inputbox_color", {NULL}, &setattr}, - {FP_TYPE_STR, "inputbox_border_color", {NULL}, &setattr}, - {FP_TYPE_STR, "searchbox_color", {NULL}, &setattr}, - {FP_TYPE_STR, "searchbox_title_color", {NULL}, &setattr}, - {FP_TYPE_STR, "searchbox_border_color", {NULL}, &setattr}, - {FP_TYPE_STR, "position_indicator_color", {NULL}, &setattr}, - {FP_TYPE_STR, "menubox_color", {NULL}, &setattr}, - {FP_TYPE_STR, "menubox_border_color", {NULL}, &setattr}, - {FP_TYPE_STR, "item_color", {NULL}, &setattr}, - {FP_TYPE_STR, "item_selected_color", {NULL}, &setattr}, - {FP_TYPE_STR, "tag_color", {NULL}, &setattr}, - {FP_TYPE_STR, "tag_selected_color", {NULL}, &setattr}, - {FP_TYPE_STR, "tag_key_color", {NULL}, &setattr}, - {FP_TYPE_STR, "tag_key_selected_color", {NULL}, &setattr}, - {FP_TYPE_STR, "check_color", {NULL}, &setattr}, - {FP_TYPE_STR, "check_selected_color", {NULL}, &setattr}, - {FP_TYPE_STR, "uarrow_color", {NULL}, &setattr}, - {FP_TYPE_STR, "darrow_color", {NULL}, &setattr}, - {FP_TYPE_STR, "itemhelp_color", {NULL}, &setattr}, - {FP_TYPE_STR, "form_active_text_color", {NULL}, &setattr}, - {FP_TYPE_STR, "form_text_color", {NULL}, &setattr}, - {FP_TYPE_STR, "form_item_readonly_color", {NULL}, &setattr}, - {FP_TYPE_STR, "gauge_color", {gauge_color}, &setattr}, +static struct figpar_config dialogrc_config[] = { + /* TYPE DIRECTIVE DEFAULT HANDLER */ + {FIGPAR_TYPE_INT, "aspect", {(void *)0}, &setnum}, + {FIGPAR_TYPE_STR, "separate_widget", {separator}, &setstr}, + {FIGPAR_TYPE_INT, "tab_len", {(void *)0}, &setnum}, + {FIGPAR_TYPE_BOOL, "visit_items", {(void *)0}, &setbool}, + {FIGPAR_TYPE_BOOL, "use_shadow", {(void *)1}, &setbool}, + {FIGPAR_TYPE_BOOL, "use_colors", {(void *)1}, &setbool}, *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511071102.tA7B2YFl005230>