Date: Mon, 8 Feb 2016 12:16:01 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295394 - in projects/release-pkg: . bin/csh bin/dd contrib/bsnmp/snmp_mibII contrib/elftoolchain/readelf etc/defaults etc/periodic/daily etc/rc.d lib/libc/sys lib/libedit lib/libmemsta... Message-ID: <201602081216.u18CG1Kj078078@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Feb 8 12:16:01 2016 New Revision: 295394 URL: https://svnweb.freebsd.org/changeset/base/295394 Log: MFH Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/share/examples/jails/jib - copied unchanged from r295393, head/share/examples/jails/jib projects/release-pkg/share/examples/jails/jng - copied unchanged from r295393, head/share/examples/jails/jng projects/release-pkg/sys/arm/include/cpu-v4.h - copied unchanged from r295393, head/sys/arm/include/cpu-v4.h projects/release-pkg/sys/arm/xscale/i8134x/i80321_timer.c - copied unchanged from r295393, head/sys/arm/xscale/i8134x/i80321_timer.c projects/release-pkg/sys/arm/xscale/i8134x/i80321_wdog.c - copied unchanged from r295393, head/sys/arm/xscale/i8134x/i80321_wdog.c projects/release-pkg/sys/arm/xscale/i8134x/i80321reg.h - copied unchanged from r295393, head/sys/arm/xscale/i8134x/i80321reg.h projects/release-pkg/sys/arm/xscale/i8134x/i80321var.h - copied unchanged from r295393, head/sys/arm/xscale/i8134x/i80321var.h projects/release-pkg/tools/tools/nanobsd/embedded/i386.cfg - copied unchanged from r295393, head/tools/tools/nanobsd/embedded/i386.cfg projects/release-pkg/usr.sbin/ctld/uclparse.c - copied unchanged from r295393, head/usr.sbin/ctld/uclparse.c Deleted: projects/release-pkg/sys/arm/xscale/i80321/ Modified: projects/release-pkg/Makefile projects/release-pkg/Makefile.inc1 projects/release-pkg/bin/csh/Makefile projects/release-pkg/bin/dd/args.c projects/release-pkg/bin/dd/dd.1 projects/release-pkg/contrib/bsnmp/snmp_mibII/mibII.c projects/release-pkg/contrib/elftoolchain/readelf/readelf.c projects/release-pkg/etc/defaults/rc.conf projects/release-pkg/etc/periodic/daily/800.scrub-zfs projects/release-pkg/etc/rc.d/jail projects/release-pkg/lib/libc/sys/connect.2 projects/release-pkg/lib/libc/sys/semget.2 projects/release-pkg/lib/libedit/editline.3 projects/release-pkg/lib/libedit/el.c projects/release-pkg/lib/libedit/hist.h projects/release-pkg/lib/libedit/keymacro.h projects/release-pkg/lib/libedit/search.c projects/release-pkg/lib/libedit/tokenizer.c projects/release-pkg/lib/libedit/tty.c projects/release-pkg/lib/libmemstat/memstat_uma.c projects/release-pkg/share/i18n/esdb/MISC/MISC.alias projects/release-pkg/share/man/man4/bridge.4 projects/release-pkg/share/man/man4/inet.4 projects/release-pkg/share/man/man7/build.7 projects/release-pkg/share/mk/bsd.README projects/release-pkg/share/mk/bsd.incs.mk projects/release-pkg/share/mk/bsd.links.mk projects/release-pkg/share/mk/bsd.man.mk projects/release-pkg/share/mk/bsd.nls.mk projects/release-pkg/share/mk/bsd.subdir.mk projects/release-pkg/share/mk/bsd.sys.mk projects/release-pkg/share/mk/bsd.test.mk projects/release-pkg/share/mk/suite.test.mk projects/release-pkg/sys/amd64/amd64/uma_machdep.c projects/release-pkg/sys/arm/allwinner/a20/a20_mp.c projects/release-pkg/sys/arm/altera/socfpga/socfpga_mp.c projects/release-pkg/sys/arm/amlogic/aml8726/aml8726_mp.c projects/release-pkg/sys/arm/arm/cpufunc.c projects/release-pkg/sys/arm/arm/cpufunc_asm_arm11x6.S projects/release-pkg/sys/arm/arm/cpufunc_asm_arm9.S projects/release-pkg/sys/arm/arm/cpufunc_asm_armv5_ec.S projects/release-pkg/sys/arm/arm/cpufunc_asm_armv7.S projects/release-pkg/sys/arm/arm/cpufunc_asm_fa526.S projects/release-pkg/sys/arm/arm/cpufunc_asm_xscale.S projects/release-pkg/sys/arm/arm/cpufunc_asm_xscale_c3.S projects/release-pkg/sys/arm/arm/cpuinfo.c projects/release-pkg/sys/arm/arm/db_interface.c projects/release-pkg/sys/arm/arm/debug_monitor.c projects/release-pkg/sys/arm/arm/devmap.c projects/release-pkg/sys/arm/arm/dump_machdep.c projects/release-pkg/sys/arm/arm/elf_machdep.c projects/release-pkg/sys/arm/arm/elf_trampoline.c projects/release-pkg/sys/arm/arm/fiq.c projects/release-pkg/sys/arm/arm/fusu.S projects/release-pkg/sys/arm/arm/genassym.c projects/release-pkg/sys/arm/arm/identcpu.c projects/release-pkg/sys/arm/arm/locore-v6.S projects/release-pkg/sys/arm/arm/machdep.c projects/release-pkg/sys/arm/arm/minidump_machdep.c projects/release-pkg/sys/arm/arm/mp_machdep.c projects/release-pkg/sys/arm/arm/pmap-v6.c projects/release-pkg/sys/arm/arm/sys_machdep.c projects/release-pkg/sys/arm/arm/trap-v6.c projects/release-pkg/sys/arm/arm/trap.c projects/release-pkg/sys/arm/arm/vm_machdep.c projects/release-pkg/sys/arm/at91/at91_machdep.c projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2836_mp.c projects/release-pkg/sys/arm/cavium/cns11xx/econa_machdep.c projects/release-pkg/sys/arm/conf/NOTES projects/release-pkg/sys/arm/freescale/imx/imx6_mp.c projects/release-pkg/sys/arm/include/cpu-v6.h projects/release-pkg/sys/arm/include/cpu.h projects/release-pkg/sys/arm/include/cpuconf.h projects/release-pkg/sys/arm/include/cpufunc.h projects/release-pkg/sys/arm/include/kdb.h projects/release-pkg/sys/arm/include/pmap-v6.h projects/release-pkg/sys/arm/include/vm.h projects/release-pkg/sys/arm/mv/armada38x/pmsu.c projects/release-pkg/sys/arm/mv/armadaxp/armadaxp_mp.c projects/release-pkg/sys/arm/rockchip/rk30xx_mp.c projects/release-pkg/sys/arm/samsung/exynos/exynos5_mp.c projects/release-pkg/sys/arm/ti/omap4/omap4_mp.c projects/release-pkg/sys/arm/xilinx/zy7_mp.c projects/release-pkg/sys/arm/xscale/i8134x/crb_machdep.c projects/release-pkg/sys/arm/xscale/i8134x/files.i81342 projects/release-pkg/sys/arm/xscale/ixp425/avila_machdep.c projects/release-pkg/sys/arm/xscale/pxa/pxa_machdep.c projects/release-pkg/sys/arm64/arm64/locore.S projects/release-pkg/sys/arm64/arm64/trap.c projects/release-pkg/sys/arm64/arm64/uma_machdep.c projects/release-pkg/sys/arm64/arm64/vm_machdep.c projects/release-pkg/sys/arm64/include/kdb.h projects/release-pkg/sys/boot/common/load_elf.c projects/release-pkg/sys/boot/efi/boot1/boot1.c projects/release-pkg/sys/boot/efi/boot1/boot_module.h projects/release-pkg/sys/boot/efi/boot1/ufs_module.c projects/release-pkg/sys/boot/efi/boot1/zfs_module.c projects/release-pkg/sys/boot/efi/include/efidevp.h projects/release-pkg/sys/boot/efi/libefi/efinet.c projects/release-pkg/sys/boot/zfs/zfs.c projects/release-pkg/sys/cam/ata/ata_all.c projects/release-pkg/sys/cddl/dev/fbt/arm/fbt_isa.c projects/release-pkg/sys/compat/cloudabi/cloudabi_proc.c projects/release-pkg/sys/compat/linux/linux_fork.c projects/release-pkg/sys/conf/files.arm projects/release-pkg/sys/conf/options projects/release-pkg/sys/conf/options.arm projects/release-pkg/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c projects/release-pkg/sys/dev/ata/ata-all.c projects/release-pkg/sys/dev/cfi/cfi_core.c projects/release-pkg/sys/dev/cxgb/cxgb_sge.c projects/release-pkg/sys/dev/e1000/e1000_80003es2lan.c projects/release-pkg/sys/dev/e1000/e1000_82540.c projects/release-pkg/sys/dev/e1000/e1000_82541.c projects/release-pkg/sys/dev/e1000/e1000_82542.c projects/release-pkg/sys/dev/e1000/e1000_82543.c projects/release-pkg/sys/dev/e1000/e1000_82571.h projects/release-pkg/sys/dev/e1000/e1000_82575.c projects/release-pkg/sys/dev/e1000/e1000_82575.h projects/release-pkg/sys/dev/e1000/e1000_api.c projects/release-pkg/sys/dev/e1000/e1000_defines.h projects/release-pkg/sys/dev/e1000/e1000_hw.h projects/release-pkg/sys/dev/e1000/e1000_i210.c projects/release-pkg/sys/dev/e1000/e1000_ich8lan.c projects/release-pkg/sys/dev/e1000/e1000_ich8lan.h projects/release-pkg/sys/dev/e1000/e1000_mac.h projects/release-pkg/sys/dev/e1000/e1000_mbx.c projects/release-pkg/sys/dev/e1000/e1000_nvm.h projects/release-pkg/sys/dev/e1000/e1000_osdep.h projects/release-pkg/sys/dev/e1000/e1000_phy.c projects/release-pkg/sys/dev/e1000/e1000_regs.h projects/release-pkg/sys/dev/e1000/if_em.c projects/release-pkg/sys/dev/e1000/if_em.h projects/release-pkg/sys/dev/e1000/if_igb.c projects/release-pkg/sys/dev/hwpmc/hwpmc_mod.c projects/release-pkg/sys/dev/hyperv/include/hyperv.h projects/release-pkg/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/release-pkg/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/release-pkg/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/release-pkg/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/release-pkg/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/release-pkg/sys/dev/hyperv/utilities/hv_kvp.c projects/release-pkg/sys/dev/hyperv/utilities/hv_util.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_channel.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_channel_mgmt.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_connection.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_hv.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/release-pkg/sys/dev/ixgbe/if_ix.c projects/release-pkg/sys/dev/mps/mps.c projects/release-pkg/sys/dev/mps/mps_mapping.c projects/release-pkg/sys/dev/mps/mpsvar.h projects/release-pkg/sys/fs/cd9660/cd9660_vfsops.c projects/release-pkg/sys/fs/ext2fs/ext2_inode_cnv.c projects/release-pkg/sys/fs/msdosfs/msdosfs_vnops.c projects/release-pkg/sys/kern/imgact_elf.c projects/release-pkg/sys/kern/init_main.c projects/release-pkg/sys/kern/kern_fork.c projects/release-pkg/sys/kern/kern_kthread.c projects/release-pkg/sys/kern/kern_malloc.c projects/release-pkg/sys/kern/kern_mbuf.c projects/release-pkg/sys/kern/kern_proc.c projects/release-pkg/sys/kern/kern_racct.c projects/release-pkg/sys/kern/sysv_sem.c projects/release-pkg/sys/kern/vfs_aio.c projects/release-pkg/sys/kern/vfs_bio.c projects/release-pkg/sys/kern/vfs_mount.c projects/release-pkg/sys/kern/vfs_syscalls.c projects/release-pkg/sys/mips/mips/uma_machdep.c projects/release-pkg/sys/mips/mips/vm_machdep.c projects/release-pkg/sys/powerpc/fpu/fpu_emu.c projects/release-pkg/sys/powerpc/fpu/fpu_explode.c projects/release-pkg/sys/powerpc/powerpc/uma_machdep.c projects/release-pkg/sys/riscv/include/asm.h projects/release-pkg/sys/riscv/include/pcpu.h projects/release-pkg/sys/riscv/riscv/exception.S projects/release-pkg/sys/riscv/riscv/genassym.c projects/release-pkg/sys/riscv/riscv/machdep.c projects/release-pkg/sys/riscv/riscv/swtch.S projects/release-pkg/sys/riscv/riscv/uma_machdep.c projects/release-pkg/sys/riscv/riscv/vm_machdep.c projects/release-pkg/sys/sparc64/sparc64/vm_machdep.c projects/release-pkg/sys/sys/ata.h projects/release-pkg/sys/sys/event.h projects/release-pkg/sys/sys/proc.h projects/release-pkg/sys/sys/socketvar.h projects/release-pkg/sys/vm/memguard.c projects/release-pkg/sys/vm/sg_pager.c projects/release-pkg/sys/vm/uma.h projects/release-pkg/sys/vm/uma_core.c projects/release-pkg/sys/vm/uma_dbg.c projects/release-pkg/sys/vm/uma_dbg.h projects/release-pkg/sys/vm/uma_int.h projects/release-pkg/sys/vm/vm_page.c projects/release-pkg/tests/sys/acl/Makefile projects/release-pkg/tools/regression/sysvsem/semtest.c projects/release-pkg/tools/tools/ath/athaggrstats/main.c projects/release-pkg/tools/tools/ath/athdebug/athdebug.c projects/release-pkg/tools/tools/ath/athradar/athradar.c projects/release-pkg/tools/tools/ath/athratestats/main.c projects/release-pkg/tools/tools/ath/athregs/dumpregs.c projects/release-pkg/tools/tools/ath/athspectral/athspectral.c projects/release-pkg/tools/tools/ath/athstats/main.c projects/release-pkg/tools/tools/nanobsd/defaults.sh projects/release-pkg/tools/tools/nanobsd/embedded/common projects/release-pkg/usr.sbin/bsdconfig/share/common.subr projects/release-pkg/usr.sbin/bsdconfig/share/strings.subr projects/release-pkg/usr.sbin/ctld/Makefile projects/release-pkg/usr.sbin/ctld/ctld.c projects/release-pkg/usr.sbin/ctld/ctld.h projects/release-pkg/usr.sbin/ctld/parse.y projects/release-pkg/usr.sbin/freebsd-update/freebsd-update.sh Directory Properties: projects/release-pkg/ (props changed) projects/release-pkg/contrib/elftoolchain/ (props changed) projects/release-pkg/lib/libc/ (props changed) projects/release-pkg/lib/libedit/ (props changed) projects/release-pkg/lib/libedit/edit/readline/ (props changed) projects/release-pkg/share/ (props changed) projects/release-pkg/share/man/man4/ (props changed) projects/release-pkg/sys/ (props changed) projects/release-pkg/sys/boot/ (props changed) projects/release-pkg/sys/conf/ (props changed) projects/release-pkg/sys/dev/hyperv/ (props changed) Modified: projects/release-pkg/Makefile ============================================================================== --- projects/release-pkg/Makefile Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/Makefile Mon Feb 8 12:16:01 2016 (r295394) @@ -21,6 +21,7 @@ # 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). +# checkworld - Run test suite on installed world. # check-old - List obsolete directories/files/libraries. # check-old-dirs - List obsolete directories. # check-old-files - List obsolete files. @@ -112,8 +113,8 @@ .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 \ + check check-old check-old-dirs check-old-files check-old-libs \ + checkdpadd checkworld 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 \ @@ -121,7 +122,7 @@ TGTS= all all-man buildenv buildenvvars installkernel.debug packagekernel packageworld \ reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries lint maninstall \ - obj objlink regress rerelease showconfig tags toolchain update \ + obj objlink 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 \ @@ -330,6 +331,10 @@ bmake: .PHONY ${MMAKE} all; \ ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= +regress: .PHONY + @echo "'make regress' has been renamed 'make check'" | /usr/bin/fmt + @false + tinderbox toolchains kernel-toolchains kernels worlds: upgrade_checks tinderbox: Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/Makefile.inc1 Mon Feb 8 12:16:01 2016 (r295394) @@ -37,6 +37,7 @@ # The intended user-driven targets are: # buildworld - rebuild *everything*, including glue to help do upgrades # installworld- install everything built by "buildworld" +# checkworld - run test suite on installed world # doxygen - build API documentation of the kernel # update - convenient way to update your source tree (eg: svn/svnup) # @@ -1121,16 +1122,14 @@ redistribute: .MAKE .PHONY DISTRIBUTION=lib32 .endif -distrib-dirs: .MAKE .PHONY - ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ - ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} - -distribution: .MAKE .PHONY +distrib-dirs distribution: .MAKE .PHONY ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} +.if make(distribution) ${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \ METALOG=${METALOG} installconfig +.endif # # buildkernel and installkernel @@ -1475,6 +1474,20 @@ signpackages: _pkgbootstrap @pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI) ${PKGSIGNKEY} # +# +# checkworld +# +# Run test suite on installed world. +# +checkworld: .PHONY + @if [ ! -x ${LOCALBASE}/bin/kyua ]; then \ + echo "You need kyua (devel/kyua) to run the test suite." | /usr/bin/fmt; \ + exit 1; \ + fi + ${_+_}${LOCALBASE}/bin/kyua test -k ${TESTSBASE}/Kyuafile + +# +# # doxygen # # Build the API documentation with doxygen Modified: projects/release-pkg/bin/csh/Makefile ============================================================================== --- projects/release-pkg/bin/csh/Makefile Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/bin/csh/Makefile Mon Feb 8 12:16:01 2016 (r295394) @@ -51,41 +51,40 @@ FILESDIR= ${SHAREDIR}/examples/tcsh FILES= complete.tcsh csh-mode.el .endif -CATALOGS= et:et_EE.ISO8859-15 \ - finnish:fi_FI.ISO8859-1 \ - french:fr_FR.ISO8859-1 \ - german:de_DE.ISO8859-1 \ - greek:el_GR.ISO8859-7 \ - italian:it_IT.ISO8859-1 \ - ja:ja_JP.eucJP \ - russian:ru_RU.KOI8-R \ - spanish:es_ES.ISO8859-1 \ - ukrainian:uk_UA.KOI8-U - -NLSLINKS_fi_FI.ISO8859-1= fi_FI.ISO8859-15 -NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \ - fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \ - fr_CH.ISO8859-15 fr_FR.ISO8859-15 -NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ - de_CH.ISO8859-15 de_DE.ISO8859-15 -NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15 -NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15 +CATALOGS= et:et_EE.UTF-8 \ + finnish:fi_FI.UTF-8 \ + french:fr_FR.UTF-8 \ + german:de_DE.UTF-8 \ + greek:el_GR.UTF-8 \ + italian:it_IT.UTF-8 \ + ja:ja_JP.UTF-8 \ + russian:ru_RU.UTF-8 \ + spanish:es_ES.UTF-8 \ + ukrainian:uk_UA.UTF-8 + +NLSLINKS_de_DE.UTF-8 = de_AT.UTF-8 de_CH.UTF-8 +NLSLINKS_fr_FR.UTF-8 = fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 +NLSLINKS_it_IT.UTF-8 = it_CH.UTF-8 .if ${MK_NLS_CATALOGS} == "no" || defined(RESCUE) CFLAGS+= -DNO_NLS_CATALOGS .else CFLAGS+= -DHAVE_ICONV .if ${MK_ICONV} != "no" -NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 -NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8 -NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8 -NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8 -NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8 -NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 -NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8 -NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8 -NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8 -NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8 +NLSLINKS_de_DE.UTF-8 += de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ + de_CH.ISO8859-15 de_DE.ISO8859-1 de_DE.ISO8859-15 +NLSLINKS_el_GR.UTF-8 = el_GR.ISO8859-7 +NLSLINKS_es_ES.UTF-8 = es_ES.ISO8859-1 es_ES.ISO8859-15 +NLSLINKS_et_EE.UTF-8 = et_EE.ISO8859-15 +NLSLINKS_fi_FI.UTF-8 = fi_FI.ISO8859-1 fi_FI.ISO8859-15 +NLSLINKS_fr_FR.UTF-8 += fr_BE.ISO8859-1 fr_BE.ISO8859-15 \ + fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \ + fr_CH.ISO8859-15 fr_FR.ISO8859-1 fr_FR.ISO8859-15 +NLSLINKS_it_IT.UTF-8 += it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-1 \ + it_IT.ISO8859-15 +NLSLINKS_ja_JP.UTF-8 = ja_JP.SJIS ja_JP.eucJP +NLSLINKS_ru_RU.UTF-8 = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.KOI8-R +NLSLINKS_uk_UA.UTF-8 = uk_UA.ISO8859-5 uk_UA.KOI8-U .else # Above links can be installed from ports/shells/tcsh_nls Modified: projects/release-pkg/bin/dd/args.c ============================================================================== --- projects/release-pkg/bin/dd/args.c Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/bin/dd/args.c Mon Feb 8 12:16:01 2016 (r295394) @@ -360,6 +360,46 @@ c_conv(const void *a, const void *b) ((const struct conv *)b)->name)); } +static uintmax_t +postfix_to_mult(const char expr) +{ + uintmax_t mult; + + mult = 0; + switch (expr) { + case 'B': + case 'b': + mult = 512; + break; + case 'K': + case 'k': + mult = 1 << 10; + break; + case 'M': + case 'm': + mult = 1 << 20; + break; + case 'G': + case 'g': + mult = 1 << 30; + break; + case 'T': + case 't': + mult = (uintmax_t)1 << 40; + break; + case 'P': + case 'p': + mult = (uintmax_t)1 << 50; + break; + case 'W': + case 'w': + mult = sizeof(int); + break; + } + + return (mult); +} + /* * Convert an expression of the following forms to a uintmax_t. * 1) A positive decimal number. @@ -386,31 +426,7 @@ get_num(const char *val) if (expr == val) /* No valid digits. */ errx(1, "%s: illegal numeric value", oper); - mult = 0; - switch (*expr) { - case 'B': - case 'b': - mult = 512; - break; - case 'K': - case 'k': - mult = 1 << 10; - break; - case 'M': - case 'm': - mult = 1 << 20; - break; - case 'G': - case 'g': - mult = 1 << 30; - break; - case 'W': - case 'w': - mult = sizeof(int); - break; - default: - ; - } + mult = postfix_to_mult(*expr); if (mult != 0) { prevnum = num; @@ -460,29 +476,7 @@ get_off_t(const char *val) if (expr == val) /* No valid digits. */ errx(1, "%s: illegal numeric value", oper); - mult = 0; - switch (*expr) { - case 'B': - case 'b': - mult = 512; - break; - case 'K': - case 'k': - mult = 1 << 10; - break; - case 'M': - case 'm': - mult = 1 << 20; - break; - case 'G': - case 'g': - mult = 1 << 30; - break; - case 'W': - case 'w': - mult = sizeof(int); - break; - } + mult = postfix_to_mult(*expr); if (mult != 0) { prevnum = num; Modified: projects/release-pkg/bin/dd/dd.1 ============================================================================== --- projects/release-pkg/bin/dd/dd.1 Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/bin/dd/dd.1 Mon Feb 8 12:16:01 2016 (r295394) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd August 28, 2014 +.Dd February 4, 2016 .Dt DD 1 .Os .Sh NAME @@ -332,10 +332,13 @@ If the number ends with a .Dq Li k , .Dq Li m , .Dq Li g , +.Dq Li t , +.Dq Li p , or .Dq Li w , the -number is multiplied by 512, 1024 (1K), 1048576 (1M), 1073741824 (1G) +number is multiplied by 512, 1024 (1K), 1048576 (1M), 1073741824 (1G), +1099511627776 (1T), 1125899906842624 (1P) or the number of bytes in an integer, respectively. Two or more numbers may be separated by an .Dq Li x Modified: projects/release-pkg/contrib/bsnmp/snmp_mibII/mibII.c ============================================================================== --- projects/release-pkg/contrib/bsnmp/snmp_mibII/mibII.c Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/contrib/bsnmp/snmp_mibII/mibII.c Mon Feb 8 12:16:01 2016 (r295394) @@ -982,7 +982,7 @@ handle_rtmsg(struct rt_msghdr *rtm) { struct sockaddr *addrs[RTAX_MAX]; struct if_msghdr *ifm; - struct ifa_msghdr ifam; + struct ifa_msghdr ifam, *ifamp; struct ifma_msghdr *ifmam; #ifdef RTM_IFANNOUNCE struct if_announcemsghdr *ifan; @@ -1002,8 +1002,9 @@ handle_rtmsg(struct rt_msghdr *rtm) switch (rtm->rtm_type) { case RTM_NEWADDR: - memcpy(&ifam, rtm, sizeof(ifam)); - mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs); + ifamp = (struct ifa_msghdr *)rtm; + memcpy(&ifam, ifamp, sizeof(ifam)); + mib_extract_addrs(ifam.ifam_addrs, (u_char *)(ifamp + 1), addrs); if (addrs[RTAX_IFA] == NULL || addrs[RTAX_NETMASK] == NULL) break; @@ -1029,8 +1030,9 @@ handle_rtmsg(struct rt_msghdr *rtm) break; case RTM_DELADDR: - memcpy(&ifam, rtm, sizeof(ifam)); - mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs); + ifamp = (struct ifa_msghdr *)rtm; + memcpy(&ifam, ifamp, sizeof(ifam)); + mib_extract_addrs(ifam.ifam_addrs, (u_char *)(ifamp + 1), addrs); if (addrs[RTAX_IFA] == NULL) break; Modified: projects/release-pkg/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- projects/release-pkg/contrib/elftoolchain/readelf/readelf.c Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/contrib/elftoolchain/readelf/readelf.c Mon Feb 8 12:16:01 2016 (r295394) @@ -1053,8 +1053,9 @@ static struct { static const char * r_type(unsigned int mach, unsigned int type) { + static char s_type[32]; + switch(mach) { - case EM_NONE: return ""; case EM_386: case EM_IAMCU: switch(type) { @@ -1089,8 +1090,8 @@ r_type(unsigned int mach, unsigned int t case 35: return "R_386_TLS_DTPMOD32"; case 36: return "R_386_TLS_DTPOFF32"; case 37: return "R_386_TLS_TPOFF32"; - default: return ""; } + break; case EM_AARCH64: switch(type) { case 0: return "R_AARCH64_NONE"; @@ -1145,6 +1146,16 @@ r_type(unsigned int mach, unsigned int t case 311: return "R_AARCH64_ADR_GOT_PAGE"; case 312: return "R_AARCH64_LD64_GOT_LO12_NC"; case 313: return "R_AARCH64_LD64_GOTPAGE_LO15"; + case 560: return "R_AARCH64_TLSDESC_LD_PREL19"; + case 561: return "R_AARCH64_TLSDESC_ADR_PREL21"; + case 562: return "R_AARCH64_TLSDESC_ADR_PAGE21"; + case 563: return "R_AARCH64_TLSDESC_LD64_LO12"; + case 564: return "R_AARCH64_TLSDESC_ADD_LO12"; + case 565: return "R_AARCH64_TLSDESC_OFF_G1"; + case 566: return "R_AARCH64_TLSDESC_OFF_G0_NC"; + case 567: return "R_AARCH64_TLSDESC_LDR"; + case 568: return "R_AARCH64_TLSDESC_ADD"; + case 569: return "R_AARCH64_TLSDESC_CALL"; case 1024: return "R_AARCH64_COPY"; case 1025: return "R_AARCH64_GLOB_DAT"; case 1026: return "R_AARCH64_JUMP_SLOT"; @@ -1154,8 +1165,8 @@ r_type(unsigned int mach, unsigned int t case 1030: return "R_AARCH64_TLS_TPREL64"; case 1031: return "R_AARCH64_TLSDESC"; case 1032: return "R_AARCH64_IRELATIVE"; - default: return ""; } + break; case EM_ARM: switch(type) { case 0: return "R_ARM_NONE"; @@ -1206,8 +1217,8 @@ r_type(unsigned int mach, unsigned int t case 253: return "R_ARM_RABS32"; case 254: return "R_ARM_RPC24"; case 255: return "R_ARM_RBASE"; - default: return ""; } + break; case EM_IA_64: switch(type) { case 0: return "R_IA_64_NONE"; @@ -1290,8 +1301,8 @@ r_type(unsigned int mach, unsigned int t case 182: return "R_IA_64_DTPREL64MSB"; case 183: return "R_IA_64_DTPREL64LSB"; case 186: return "R_IA_64_LTOFF_DTPREL22"; - default: return ""; } + break; case EM_MIPS: switch(type) { case 0: return "R_MIPS_NONE"; @@ -1324,9 +1335,8 @@ r_type(unsigned int mach, unsigned int t case 48: return "R_MIPS_TLS_TPREL64"; case 49: return "R_MIPS_TLS_TPREL_HI16"; case 50: return "R_MIPS_TLS_TPREL_LO16"; - - default: return ""; } + break; case EM_PPC: switch(type) { case 0: return "R_PPC_NONE"; @@ -1406,8 +1416,8 @@ r_type(unsigned int mach, unsigned int t case 114: return "R_PPC_EMB_RELST_HA"; case 115: return "R_PPC_EMB_BIT_FLD"; case 116: return "R_PPC_EMB_RELSDA"; - default: return ""; } + break; case EM_RISCV: switch(type) { case 0: return "R_RISCV_NONE"; @@ -1453,6 +1463,7 @@ r_type(unsigned int mach, unsigned int t case 44: return "R_RISCV_RVC_BRANCH"; case 45: return "R_RISCV_RVC_JUMP"; } + break; case EM_SPARC: case EM_SPARCV9: switch(type) { @@ -1536,8 +1547,8 @@ r_type(unsigned int mach, unsigned int t case 77: return "R_SPARC_TLS_DTPOFF64"; case 78: return "R_SPARC_TLS_TPOFF32"; case 79: return "R_SPARC_TLS_TPOFF64"; - default: return ""; } + break; case EM_X86_64: switch(type) { case 0: return "R_X86_64_NONE"; @@ -1578,10 +1589,12 @@ r_type(unsigned int mach, unsigned int t case 35: return "R_X86_64_TLSDESC_CALL"; case 36: return "R_X86_64_TLSDESC"; case 37: return "R_X86_64_IRELATIVE"; - default: return ""; } - default: return ""; + break; } + + snprintf(s_type, sizeof(s_type), "<unknown: %#x>", type); + return (s_type); } static const char * Modified: projects/release-pkg/etc/defaults/rc.conf ============================================================================== --- projects/release-pkg/etc/defaults/rc.conf Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/etc/defaults/rc.conf Mon Feb 8 12:16:01 2016 (r295394) @@ -716,5 +716,18 @@ if [ -z "${source_rc_confs_defined}" ]; ;; esac done + # Re-do process to pick up [possibly] redefined $rc_conf_files + for i in ${rc_conf_files}; do + case ${sourced_files} in + *:$i:*) + ;; + *) + sourced_files="${sourced_files}:$i:" + if [ -r $i ]; then + . $i + fi + ;; + esac + done } fi Modified: projects/release-pkg/etc/periodic/daily/800.scrub-zfs ============================================================================== --- projects/release-pkg/etc/periodic/daily/800.scrub-zfs Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/etc/periodic/daily/800.scrub-zfs Mon Feb 8 12:16:01 2016 (r295394) @@ -63,6 +63,11 @@ case "$daily_scrub_zfs_enable" in _last_scrub=$(zpool history ${pool} | \ sed -ne '2s/ .*$//p') fi + if [ -z "${_last_scrub}" ]; then + echo " skipping scrubbing of pool '${pool}':" + echo " can't get last scrubbing date" + continue + fi # Now minus last scrub (both in seconds) converted to days. _scrub_diff=$(expr -e \( $(date +%s) - \ @@ -73,11 +78,14 @@ case "$daily_scrub_zfs_enable" in continue fi - _status="$(zpool status ${pool} | grep scrub:)" + _status="$(zpool status ${pool} | grep scan:)" case "${_status}" in *"scrub in progress"*) echo " scrubbing of pool '${pool}' already in progress, skipping:" ;; + *"resilver in progress"*) + echo " resilvering of pool '${pool}' is in progress, skipping:" + ;; *"none requested"*) echo " starting first scrub (since reboot) of pool '${pool}':" zpool scrub ${pool} Modified: projects/release-pkg/etc/rc.d/jail ============================================================================== --- projects/release-pkg/etc/rc.d/jail Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/etc/rc.d/jail Mon Feb 8 12:16:01 2016 (r295394) @@ -563,7 +563,7 @@ jail_warn() # To relieve confusion, show a warning message. case $_confwarn in 1) warn "Per-jail configuration via jail_* variables " \ - "is obsolete. Please consider to migrate to $jail_conf." + "is obsolete. Please consider migrating to $jail_conf." ;; esac } Modified: projects/release-pkg/lib/libc/sys/connect.2 ============================================================================== --- projects/release-pkg/lib/libc/sys/connect.2 Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/lib/libc/sys/connect.2 Mon Feb 8 12:16:01 2016 (r295394) @@ -28,7 +28,7 @@ .\" @(#)connect.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd September 29, 2014 +.Dd February 4, 2016 .Dt CONNECT 2 .Os .Sh NAME @@ -58,6 +58,14 @@ another socket. The other socket is specified by .Fa name , which is an address in the communications space of the socket. +.Fa namelen +indicates the amount of space pointed to by +.Fa name , +in bytes; the +.Fa sa_len +member of +.Fa name +is ignored. Each communications space interprets the .Fa name argument in its own way. Modified: projects/release-pkg/lib/libc/sys/semget.2 ============================================================================== --- projects/release-pkg/lib/libc/sys/semget.2 Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/lib/libc/sys/semget.2 Mon Feb 8 12:16:01 2016 (r295394) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 12, 1995 +.Dd February 7, 2016 .Dt SEMGET 2 .Os .Sh NAME @@ -132,6 +132,17 @@ already exists. .It Bq Er EINVAL The number of semaphores requested exceeds the system imposed maximum per set. +.It Bq Er EINVAL +A semaphore set corresponding to +.Fa key +already exists and contains fewer semaphores than +.Fa nsems . +.It Bq Er EINVAL +A semaphore set corresponding to +.Fa key +does not exist and +.Fa nsems +is 0 or negative. .It Bq Er ENOSPC Insufficiently many semaphores are available. .It Bq Er ENOSPC Modified: projects/release-pkg/lib/libedit/editline.3 ============================================================================== --- projects/release-pkg/lib/libedit/editline.3 Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/lib/libedit/editline.3 Mon Feb 8 12:16:01 2016 (r295394) @@ -1,4 +1,4 @@ -.\" $NetBSD: editline.3,v 1.84 2014/12/25 13:39:41 wiz Exp $ +.\" $NetBSD: editline.3,v 1.85 2015/11/03 21:36:59 christos Exp $ .\" .\" Copyright (c) 1997-2014 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 25, 2014 +.Dd November 3, 2015 .Dt EDITLINE 3 .Os .Sh NAME @@ -191,7 +191,7 @@ counterparts. The following functions are available: .Bl -tag -width 4n .It Fn el_init -Initialise the line editor, and return a data structure +Initialize the line editor, and return a data structure to be used by all other line editing functions, or .Dv NULL on failure. @@ -521,61 +521,68 @@ are supported, along with actual type of .Fa result : .Bl -tag -width 4n .It Dv EL_PROMPT , Fa "char *(*f)(EditLine *)" , Fa "char *c" -Return a pointer to the function that displays the prompt in +Set .Fa f . +to a pointer to the function that displays the prompt. If .Fa c is not .Dv NULL , -return the start/stop literal prompt character in it. +set it to the start/stop literal prompt character. .It Dv EL_RPROMPT , Fa "char *(*f)(EditLine *)" , Fa "char *c" -Return a pointer to the function that displays the prompt in +Set .Fa f . +to a pointer to the function that displays the prompt. If .Fa c is not .Dv NULL , -return the start/stop literal prompt character in it. -.It Dv EL_EDITOR , Fa "const char **" -Return the name of the editor, which will be one of +set it to the start/stop literal prompt character. +.It Dv EL_EDITOR , Fa "const char **n" +Set the name of the editor in +.Fa n , +which will be one of .Dq emacs or .Dq vi . .It Dv EL_GETTC , Fa "const char *name" , Fa "void *value" -Return non-zero if +If .Fa name is a valid .Xr termcap 5 -capability -and set +capability set .Fa value to the current value of that capability. -.It Dv EL_SIGNAL , Fa "int *" -Return non-zero if +.It Dv EL_SIGNAL , Fa "int *s" +Set +.Fa s +to non zero if .Nm has installed private signal handlers (see .Fn el_get above). -.It Dv EL_EDITMODE , Fa "int *" -Return non-zero if editing is enabled. +.It Dv EL_EDITMODE , Fa "int *c" +Set +.Fa c +to non-zero if editing is enabled. .It Dv EL_GETCFN , Fa "int (**f)(EditLine *, char *)" Return a pointer to the function that read characters, which is equal to .Dq Dv EL_BUILTIN_GETCFN in the case of the default builtin function. .It Dv EL_CLIENTDATA , Fa "void **data" -Retrieve +Set .Fa data -previously registered with the corresponding +to the previously registered client data set by an .Fn el_set call. -.It Dv EL_UNBUFFERED , Fa "int" -Return non-zero if unbuffered mode is enabled. -.It Dv EL_PREP_TERM , Fa "int" -Sets or clears terminal editing mode. +.It Dv EL_UNBUFFERED , Fa "int *c" +Set +.Fa c +to non-zero if unbuffered mode is enabled. .It Dv EL_GETFP , Fa "int fd", Fa "FILE **fp" -Return in +Set .Fa fp -the current +to the current .Nm editline file pointer for .Dq input @@ -593,7 +600,7 @@ or .Dv 2 . .El .It Fn el_source -Initialise +Initialize .Nm by reading the contents of .Fa file . @@ -671,7 +678,7 @@ and freed by The following functions are available: .Bl -tag -width 4n .It Fn history_init -Initialise the history list, and return a data structure +Initialize the history list, and return a data structure to be used by all other history list functions, or .Dv NULL on failure. @@ -810,7 +817,7 @@ and freed by The following functions are available: .Bl -tag -width 4n .It Fn tok_init -Initialise the tokenizer, and return a data structure +Initialize the tokenizer, and return a data structure to be used by all other tokenizer functions. .Fa IFS contains the Input Field Separators, which defaults to Modified: projects/release-pkg/lib/libedit/el.c ============================================================================== --- projects/release-pkg/lib/libedit/el.c Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/lib/libedit/el.c Mon Feb 8 12:16:01 2016 (r295394) @@ -1,4 +1,4 @@ -/* $NetBSD: el.c,v 1.73 2014/06/18 18:12:28 christos Exp $ */ +/* $NetBSD: el.c,v 1.74 2015/12/08 12:56:55 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94"; #else -__RCSID("$NetBSD: el.c,v 1.73 2014/06/18 18:12:28 christos Exp $"); +__RCSID("$NetBSD: el.c,v 1.74 2015/12/08 12:56:55 christos Exp $"); #endif #endif /* not lint && not SCCSID */ #include <sys/cdefs.h> @@ -137,7 +137,8 @@ el_end(EditLine *el) terminal_end(el); keymacro_end(el); map_end(el); - tty_end(el); + if (!(el->el_flags & NO_TTY)) + tty_end(el); ch_end(el); search_end(el); hist_end(el); Modified: projects/release-pkg/lib/libedit/hist.h ============================================================================== --- projects/release-pkg/lib/libedit/hist.h Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/lib/libedit/hist.h Mon Feb 8 12:16:01 2016 (r295394) @@ -1,4 +1,4 @@ -/* $NetBSD: hist.h,v 1.14 2014/05/11 01:05:17 christos Exp $ */ +/* $NetBSD: hist.h,v 1.15 2016/01/30 15:05:27 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -47,10 +47,10 @@ typedef int (*hist_fun_t)(void *, TYPE(H typedef struct el_history_t { Char *buf; /* The history buffer */ - size_t sz; /* Size of history buffer */ + size_t sz; /* Size of history buffer */ Char *last; /* The last character */ int eventno; /* Event we are looking for */ - void * ref; /* Argument for history fcns */ + void *ref; /* Argument for history fcns */ hist_fun_t fun; /* Event access */ TYPE(HistEvent) ev; /* Event cookie */ } el_history_t; Modified: projects/release-pkg/lib/libedit/keymacro.h ============================================================================== --- projects/release-pkg/lib/libedit/keymacro.h Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/lib/libedit/keymacro.h Mon Feb 8 12:16:01 2016 (r295394) @@ -1,4 +1,4 @@ -/* $NetBSD: keymacro.h,v 1.2 2011/07/28 03:44:36 christos Exp $ */ +/* $NetBSD: keymacro.h,v 1.3 2016/01/29 19:59:11 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -48,7 +48,7 @@ typedef union keymacro_value_t { typedef struct keymacro_node_t keymacro_node_t; -typedef struct el_keymacromacro_t { +typedef struct el_keymacro_t { Char *buf; /* Key print buffer */ keymacro_node_t *map; /* Key map */ keymacro_value_t val; /* Local conversion buffer */ Modified: projects/release-pkg/lib/libedit/search.c ============================================================================== --- projects/release-pkg/lib/libedit/search.c Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/lib/libedit/search.c Mon Feb 8 12:16:01 2016 (r295394) @@ -1,4 +1,4 @@ -/* $NetBSD: search.c,v 1.30 2011/10/04 15:27:04 christos Exp $ */ +/* $NetBSD: search.c,v 1.31 2016/01/30 04:02:51 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: search.c,v 1.30 2011/10/04 15:27:04 christos Exp $"); +__RCSID("$NetBSD: search.c,v 1.31 2016/01/30 04:02:51 christos Exp $"); #endif #endif /* not lint && not SCCSID */ #include <sys/cdefs.h> @@ -149,7 +149,7 @@ el_match(const Char *str, const Char *pa if (re_comp(ct_encode_string(pat, &conv)) != NULL) return 0; else - return re_exec(ct_encode_string(str, &conv) == 1); + return re_exec(ct_encode_string(str, &conv)) == 1; #endif } Modified: projects/release-pkg/lib/libedit/tokenizer.c ============================================================================== --- projects/release-pkg/lib/libedit/tokenizer.c Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/lib/libedit/tokenizer.c Mon Feb 8 12:16:01 2016 (r295394) @@ -1,4 +1,4 @@ -/* $NetBSD: tokenizer.c,v 1.21 2011/08/16 16:25:15 christos Exp $ */ +/* $NetBSD: tokenizer.c,v 1.22 2016/01/30 04:02:51 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)tokenizer.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: tokenizer.c,v 1.21 2011/08/16 16:25:15 christos Exp $"); +__RCSID("$NetBSD: tokenizer.c,v 1.22 2016/01/30 04:02:51 christos Exp $"); #endif #endif /* not lint && not SCCSID */ #include <sys/cdefs.h> @@ -448,5 +448,5 @@ FUN(tok,str)(TYPE(Tokenizer) *tok, const memset(&li, 0, sizeof(li)); li.buffer = line; li.cursor = li.lastchar = Strchr(line, '\0'); - return FUN(tok,line(tok, &li, argc, argv, NULL, NULL)); + return FUN(tok,line)(tok, &li, argc, argv, NULL, NULL); } Modified: projects/release-pkg/lib/libedit/tty.c ============================================================================== --- projects/release-pkg/lib/libedit/tty.c Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/lib/libedit/tty.c Mon Feb 8 12:16:01 2016 (r295394) @@ -1,4 +1,4 @@ -/* $NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $ */ +/* $NetBSD: tty.c,v 1.49 2015/12/08 16:53:27 gson Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $"); +__RCSID("$NetBSD: tty.c,v 1.49 2015/12/08 16:53:27 gson Exp $"); #endif #endif /* not lint && not SCCSID */ #include <sys/cdefs.h> @@ -582,6 +582,9 @@ protected void /*ARGSUSED*/ tty_end(EditLine *el) { + if (el->el_flags & EDIT_DISABLED) + return; + if (tty_setty(el, TCSAFLUSH, &el->el_tty.t_or) == -1) { #ifdef DEBUG_TTY (void) fprintf(el->el_errfile, Modified: projects/release-pkg/lib/libmemstat/memstat_uma.c ============================================================================== --- projects/release-pkg/lib/libmemstat/memstat_uma.c Mon Feb 8 11:18:13 2016 (r295393) +++ projects/release-pkg/lib/libmemstat/memstat_uma.c Mon Feb 8 12:16:01 2016 (r295394) @@ -29,6 +29,7 @@ #include <sys/param.h> #include <sys/cpuset.h> #include <sys/sysctl.h> +#include <sys/_task.h> #include <vm/vm.h> #include <vm/vm_page.h> Copied: projects/release-pkg/share/examples/jails/jib (from r295393, head/share/examples/jails/jib) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/share/examples/jails/jib Mon Feb 8 12:16:01 2016 (r295394, copy of r295393, head/share/examples/jails/jib) @@ -0,0 +1,367 @@ +#!/bin/sh +#- +# Copyright (c) 2016 Devin Teske +# 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$ +# +############################################################ IDENT(1) +# +# $Title: if_bridge(4) management script for vnet jails $ +# +############################################################ INFORMATION +# +# Use this tool with jail.conf(5) (or rc.conf(5) ``legacy'' configuration) to +# manage `vnet' interfaces. In jail.conf(5) format: +# +# ### BEGIN EXCERPT ### +# +# xxx { +# host.hostname = "xxx.yyy"; +# path = "/vm/xxx"; +# +# # +# # NB: Below 2-lines required +# # NB: The number of eNb_xxx interfaces should match the number of +# # arguments given to `jib addm xxx' in exec.prestart value. +# # +# vnet; +# vnet.interface = "e0b_xxx e1b_xxx ..."; +# +# exec.clean; +# exec.system_user = "root"; +# exec.jail_user = "root"; +# +# # +# # NB: Below 2-lines required +# # NB: The number of arguments after `jib addm xxx' should match +# # the number of eNb_xxx arguments in vnet.interface value. +# # +# exec.prestart += "jib addm xxx em0 em1 ..."; +# exec.poststop += "jib destroy xxx"; +# +# # Standard recipe +# exec.start += "/bin/sh /etc/rc"; +# exec.stop = "/bin/sh /etc/rc.shutdown"; +# exec.consolelog = "/var/log/jail_xxx_console.log"; +# mount.devfs; +# +# # Optional (default off) +# #allow.mount; +# #allow.set_hostname = 1; +# #allow.sysvipc = 1; +# #devfs_ruleset = "11"; # rule to unhide bpf for DHCP +# } +# +# ### END EXCERPT ### +# +# In rc.conf(5) ``legacy'' format (used when /etc/jail.conf does not exist): +# +# ### BEGIN EXCERPT ### +# +# jail_enable="YES" +# jail_list="xxx" +# +# # +# # Global presets for all jails +# # +# jail_devfs_enable="YES" # mount devfs +# +# # +# # Global options (default off) +# # +# #jail_mount_enable="YES" # mount /etc/fstab.{name} +# #jail_set_hostname_allow="YES" # Allow hostname to change +# #jail_sysvipc_allow="YES" # Allow SysV Interprocess Comm. +# +# # xxx +# jail_xxx_hostname="xxx.shxd.cx" # hostname +# jail_xxx_rootdir="/vm/xxx" # root directory +# jail_xxx_vnet_interfaces="e0b_xxx e1bxxx ..." # vnet interface(s) +# jail_xxx_exec_prestart0="jib addm xxx em0 em1 ..." # bridge interface(s) +# jail_xxx_exec_poststop0="jib destroy xxx" # destroy interface(s) +# #jail_xxx_mount_enable="YES" # mount /etc/fstab.xxx +# #jail_xxx_devfs_ruleset="11" # rule to unhide bpf for DHCP +# +# ### END EXCERPT ### +# +# Note that the legacy rc.conf(5) format is converted to +# /var/run/jail.{name}.conf by /etc/rc.d/jail if jail.conf(5) is missing. +# +# ASIDE: dhclient(8) inside a vnet jail... +# +# To allow dhclient(8) to work inside a vnet jail, make sure the following +# appears in /etc/devfs.rules (which should be created if it doesn't exist): +# +# [devfsrules_jail=11] +# add include $devfsrules_hide_all +# add include $devfsrules_unhide_basic +# add include $devfsrules_unhide_login +# add include $devfsrules_unhide_bpf +# +# And set ether devfs.ruleset="11" (jail.conf(5)) or *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602081216.u18CG1Kj078078>