Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Feb 2015 15:34:17 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r278624 - in projects/release-pkg: . bin/pkill/tests cddl/contrib/opensolaris/lib/libdtrace/arm cddl/contrib/opensolaris/tools/ctf/cvt cddl/lib cddl/lib/libdtrace cddl/usr.sbin contrib/...
Message-ID:  <201502121534.t1CFYHkG044893@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Feb 12 15:34:16 2015
New Revision: 278624
URL: https://svnweb.freebsd.org/changeset/base/278624

Log:
  Merge from HEAD

Added:
  projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/arm/
     - copied from r278623, head/cddl/contrib/opensolaris/lib/libdtrace/arm/
  projects/release-pkg/contrib/xz/src/liblzma/api/lzma/lzma12.h
     - copied unchanged from r278623, head/contrib/xz/src/liblzma/api/lzma/lzma12.h
  projects/release-pkg/contrib/xz/src/liblzma/common/block_buffer_encoder.h
     - copied unchanged from r278623, head/contrib/xz/src/liblzma/common/block_buffer_encoder.h
  projects/release-pkg/contrib/xz/src/liblzma/common/hardware_cputhreads.c
     - copied unchanged from r278623, head/contrib/xz/src/liblzma/common/hardware_cputhreads.c
  projects/release-pkg/contrib/xz/src/liblzma/common/memcmplen.h
     - copied unchanged from r278623, head/contrib/xz/src/liblzma/common/memcmplen.h
  projects/release-pkg/contrib/xz/src/liblzma/common/outqueue.c
     - copied unchanged from r278623, head/contrib/xz/src/liblzma/common/outqueue.c
  projects/release-pkg/contrib/xz/src/liblzma/common/outqueue.h
     - copied unchanged from r278623, head/contrib/xz/src/liblzma/common/outqueue.h
  projects/release-pkg/contrib/xz/src/liblzma/common/stream_encoder_mt.c
     - copied unchanged from r278623, head/contrib/xz/src/liblzma/common/stream_encoder_mt.c
  projects/release-pkg/contrib/xz/src/liblzma/liblzma.map
     - copied unchanged from r278623, head/contrib/xz/src/liblzma/liblzma.map
  projects/release-pkg/contrib/xz/src/liblzma/validate_map.sh
     - copied unchanged from r278623, head/contrib/xz/src/liblzma/validate_map.sh
  projects/release-pkg/contrib/xz/src/xz/mytime.c
     - copied unchanged from r278623, head/contrib/xz/src/xz/mytime.c
  projects/release-pkg/contrib/xz/src/xz/mytime.h
     - copied unchanged from r278623, head/contrib/xz/src/xz/mytime.h
  projects/release-pkg/sys/cddl/contrib/opensolaris/uts/arm/
     - copied from r278623, head/sys/cddl/contrib/opensolaris/uts/arm/
  projects/release-pkg/sys/cddl/dev/dtrace/arm/
     - copied from r278623, head/sys/cddl/dev/dtrace/arm/
  projects/release-pkg/sys/cddl/dev/fbt/arm/
     - copied from r278623, head/sys/cddl/dev/fbt/arm/
  projects/release-pkg/usr.sbin/pw/tests/pw_usernext.sh
     - copied unchanged from r278623, head/usr.sbin/pw/tests/pw_usernext.sh
Deleted:
  projects/release-pkg/contrib/xz/src/liblzma/api/lzma/lzma.h
  projects/release-pkg/contrib/xz/src/liblzma/common/stream_encoder.h
  projects/release-pkg/sys/powerpc/conf/WII
  projects/release-pkg/sys/powerpc/wii/
Modified:
  projects/release-pkg/Makefile.inc1
  projects/release-pkg/ObsoleteFiles.inc
  projects/release-pkg/UPDATING
  projects/release-pkg/bin/pkill/tests/pgrep-j_test.sh
  projects/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
  projects/release-pkg/cddl/lib/Makefile
  projects/release-pkg/cddl/lib/libdtrace/Makefile
  projects/release-pkg/cddl/usr.sbin/Makefile
  projects/release-pkg/contrib/binutils/ld/scripttempl/elf.sc
  projects/release-pkg/contrib/elftoolchain/libdwarf/_libdwarf.h
  projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_reloc.c
  projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
  projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.c
  projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.h
  projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
  projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
  projects/release-pkg/contrib/netbsd-tests/games/t_factor.sh
  projects/release-pkg/contrib/top/utils.c
  projects/release-pkg/contrib/xz/ChangeLog
  projects/release-pkg/contrib/xz/FREEBSD-upgrade
  projects/release-pkg/contrib/xz/THANKS
  projects/release-pkg/contrib/xz/TODO
  projects/release-pkg/contrib/xz/src/common/mythread.h
  projects/release-pkg/contrib/xz/src/common/sysdefs.h
  projects/release-pkg/contrib/xz/src/common/tuklib_cpucores.c
  projects/release-pkg/contrib/xz/src/common/tuklib_physmem.c
  projects/release-pkg/contrib/xz/src/liblzma/api/lzma.h
  projects/release-pkg/contrib/xz/src/liblzma/api/lzma/base.h
  projects/release-pkg/contrib/xz/src/liblzma/api/lzma/block.h
  projects/release-pkg/contrib/xz/src/liblzma/api/lzma/container.h
  projects/release-pkg/contrib/xz/src/liblzma/api/lzma/filter.h
  projects/release-pkg/contrib/xz/src/liblzma/api/lzma/hardware.h
  projects/release-pkg/contrib/xz/src/liblzma/api/lzma/index.h
  projects/release-pkg/contrib/xz/src/liblzma/api/lzma/index_hash.h
  projects/release-pkg/contrib/xz/src/liblzma/api/lzma/version.h
  projects/release-pkg/contrib/xz/src/liblzma/check/check.h
  projects/release-pkg/contrib/xz/src/liblzma/check/sha256.c
  projects/release-pkg/contrib/xz/src/liblzma/common/alone_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/alone_decoder.h
  projects/release-pkg/contrib/xz/src/liblzma/common/alone_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/auto_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/block_buffer_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/block_buffer_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/block_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/block_decoder.h
  projects/release-pkg/contrib/xz/src/liblzma/common/block_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/block_encoder.h
  projects/release-pkg/contrib/xz/src/liblzma/common/block_header_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/block_header_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/block_util.c
  projects/release-pkg/contrib/xz/src/liblzma/common/common.c
  projects/release-pkg/contrib/xz/src/liblzma/common/common.h
  projects/release-pkg/contrib/xz/src/liblzma/common/easy_buffer_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/easy_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/filter_buffer_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/filter_buffer_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/filter_common.c
  projects/release-pkg/contrib/xz/src/liblzma/common/filter_common.h
  projects/release-pkg/contrib/xz/src/liblzma/common/filter_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/filter_decoder.h
  projects/release-pkg/contrib/xz/src/liblzma/common/filter_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/filter_encoder.h
  projects/release-pkg/contrib/xz/src/liblzma/common/filter_flags_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/index.c
  projects/release-pkg/contrib/xz/src/liblzma/common/index_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/index_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/index_encoder.h
  projects/release-pkg/contrib/xz/src/liblzma/common/index_hash.c
  projects/release-pkg/contrib/xz/src/liblzma/common/stream_buffer_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/stream_buffer_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/stream_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/common/stream_decoder.h
  projects/release-pkg/contrib/xz/src/liblzma/common/stream_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/delta/delta_common.c
  projects/release-pkg/contrib/xz/src/liblzma/delta/delta_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/delta/delta_decoder.h
  projects/release-pkg/contrib/xz/src/liblzma/delta/delta_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/delta/delta_encoder.h
  projects/release-pkg/contrib/xz/src/liblzma/delta/delta_private.h
  projects/release-pkg/contrib/xz/src/liblzma/liblzma.pc.in
  projects/release-pkg/contrib/xz/src/liblzma/lz/lz_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/lz/lz_decoder.h
  projects/release-pkg/contrib/xz/src/liblzma/lz/lz_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/lz/lz_encoder.h
  projects/release-pkg/contrib/xz/src/liblzma/lz/lz_encoder_mf.c
  projects/release-pkg/contrib/xz/src/liblzma/lzma/fastpos.h
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma2_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma2_decoder.h
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma2_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma2_encoder.h
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_common.h
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_decoder.h
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_encoder.c
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_encoder.h
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c
  projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h
  projects/release-pkg/contrib/xz/src/liblzma/rangecoder/range_decoder.h
  projects/release-pkg/contrib/xz/src/liblzma/simple/arm.c
  projects/release-pkg/contrib/xz/src/liblzma/simple/armthumb.c
  projects/release-pkg/contrib/xz/src/liblzma/simple/ia64.c
  projects/release-pkg/contrib/xz/src/liblzma/simple/powerpc.c
  projects/release-pkg/contrib/xz/src/liblzma/simple/simple_coder.c
  projects/release-pkg/contrib/xz/src/liblzma/simple/simple_coder.h
  projects/release-pkg/contrib/xz/src/liblzma/simple/simple_decoder.c
  projects/release-pkg/contrib/xz/src/liblzma/simple/simple_decoder.h
  projects/release-pkg/contrib/xz/src/liblzma/simple/simple_private.h
  projects/release-pkg/contrib/xz/src/liblzma/simple/sparc.c
  projects/release-pkg/contrib/xz/src/liblzma/simple/x86.c
  projects/release-pkg/contrib/xz/src/xz/args.c
  projects/release-pkg/contrib/xz/src/xz/args.h
  projects/release-pkg/contrib/xz/src/xz/coder.c
  projects/release-pkg/contrib/xz/src/xz/coder.h
  projects/release-pkg/contrib/xz/src/xz/file_io.c
  projects/release-pkg/contrib/xz/src/xz/file_io.h
  projects/release-pkg/contrib/xz/src/xz/hardware.c
  projects/release-pkg/contrib/xz/src/xz/hardware.h
  projects/release-pkg/contrib/xz/src/xz/list.c
  projects/release-pkg/contrib/xz/src/xz/main.c
  projects/release-pkg/contrib/xz/src/xz/message.c
  projects/release-pkg/contrib/xz/src/xz/options.c
  projects/release-pkg/contrib/xz/src/xz/private.h
  projects/release-pkg/contrib/xz/src/xz/signals.c
  projects/release-pkg/contrib/xz/src/xz/suffix.c
  projects/release-pkg/contrib/xz/src/xz/xz.1
  projects/release-pkg/etc/devd.conf
  projects/release-pkg/etc/login.conf
  projects/release-pkg/etc/master.passwd
  projects/release-pkg/etc/mtree/BSD.debug.dist
  projects/release-pkg/etc/mtree/BSD.usr.dist
  projects/release-pkg/etc/rc.d/Makefile
  projects/release-pkg/etc/rc.d/jail
  projects/release-pkg/etc/rc.d/netif
  projects/release-pkg/etc/root/dot.cshrc
  projects/release-pkg/etc/root/dot.login
  projects/release-pkg/etc/root/dot.profile
  projects/release-pkg/games/Makefile.inc
  projects/release-pkg/games/caesar/rot13.sh
  projects/release-pkg/games/fortune/datfiles/Makefile
  projects/release-pkg/games/fortune/datfiles/freebsd-tips
  projects/release-pkg/include/stdio.h
  projects/release-pkg/lib/Makefile
  projects/release-pkg/lib/libc/nls/msgcat.c
  projects/release-pkg/lib/liblzma/Makefile
  projects/release-pkg/lib/liblzma/Symbol.map
  projects/release-pkg/lib/liblzma/Versions.def
  projects/release-pkg/lib/liblzma/config.h
  projects/release-pkg/lib/libproc/proc_bkpt.c
  projects/release-pkg/lib/libproc/proc_regs.c
  projects/release-pkg/release/Makefile
  projects/release-pkg/release/Makefile.vm
  projects/release-pkg/release/scripts/make-manifest.sh
  projects/release-pkg/release/scripts/mk-vmimage.sh
  projects/release-pkg/rescue/rescue/Makefile
  projects/release-pkg/share/man/man4/led.4
  projects/release-pkg/share/man/man4/ral.4
  projects/release-pkg/share/man/man5/nullfs.5
  projects/release-pkg/share/man/man6/intro.6
  projects/release-pkg/share/man/man7/hier.7
  projects/release-pkg/share/mk/bsd.mkopt.mk
  projects/release-pkg/share/mk/bsd.own.mk
  projects/release-pkg/share/mk/bsd.prog.mk
  projects/release-pkg/share/mk/src.libnames.mk
  projects/release-pkg/share/skel/dot.cshrc
  projects/release-pkg/share/skel/dot.login
  projects/release-pkg/share/skel/dot.profile
  projects/release-pkg/sys/amd64/amd64/apic_vector.S
  projects/release-pkg/sys/amd64/amd64/genassym.c
  projects/release-pkg/sys/amd64/amd64/mp_machdep.c
  projects/release-pkg/sys/amd64/include/cpufunc.h
  projects/release-pkg/sys/amd64/vmm/vmm_support.S
  projects/release-pkg/sys/arm/arm/cpufunc.c
  projects/release-pkg/sys/arm/arm/cpufunc_asm_armv7.S
  projects/release-pkg/sys/arm/arm/db_trace.c
  projects/release-pkg/sys/arm/arm/elf_trampoline.c
  projects/release-pkg/sys/arm/arm/exception.S
  projects/release-pkg/sys/arm/arm/identcpu.c
  projects/release-pkg/sys/arm/arm/trap.c
  projects/release-pkg/sys/arm/conf/BEAGLEBONE
  projects/release-pkg/sys/arm/include/armreg.h
  projects/release-pkg/sys/arm/include/cpufunc.h
  projects/release-pkg/sys/arm/xscale/ixp425/if_npe.c
  projects/release-pkg/sys/boot/arm/ixp425/boot2/ixp425_board.c
  projects/release-pkg/sys/boot/pc98/boot2/Makefile
  projects/release-pkg/sys/cam/ctl/ctl.c
  projects/release-pkg/sys/cam/ctl/ctl.h
  projects/release-pkg/sys/cam/ctl/ctl_backend_block.c
  projects/release-pkg/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/release-pkg/sys/cam/ctl/ctl_frontend_iscsi.h
  projects/release-pkg/sys/cam/ctl/ctl_private.h
  projects/release-pkg/sys/cam/scsi/scsi_all.h
  projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/release-pkg/sys/cddl/dev/lockstat/lockstat.c
  projects/release-pkg/sys/cddl/dev/profile/profile.c
  projects/release-pkg/sys/conf/dtb.mk
  projects/release-pkg/sys/conf/files.powerpc
  projects/release-pkg/sys/conf/kern.opts.mk
  projects/release-pkg/sys/conf/kern.pre.mk
  projects/release-pkg/sys/conf/options.powerpc
  projects/release-pkg/sys/contrib/dev/acpica/include/actbl2.h
  projects/release-pkg/sys/contrib/dev/ral/microcode.h
  projects/release-pkg/sys/contrib/dev/ral/rt2860.fw.uu
  projects/release-pkg/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
  projects/release-pkg/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c
  projects/release-pkg/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h
  projects/release-pkg/sys/dev/cxgbe/common/t4_hw.c
  projects/release-pkg/sys/dev/cxgbe/t4_main.c
  projects/release-pkg/sys/dev/drm2/radeon/ni.c
  projects/release-pkg/sys/dev/drm2/radeon/si.c
  projects/release-pkg/sys/dev/hwpmc/hwpmc_armv7.c
  projects/release-pkg/sys/dev/iscsi/icl_conn_if.m
  projects/release-pkg/sys/dev/iscsi/icl_soft.c
  projects/release-pkg/sys/dev/iscsi/icl_wrappers.h
  projects/release-pkg/sys/dev/iscsi/iscsi.c
  projects/release-pkg/sys/dev/iscsi/iscsi.h
  projects/release-pkg/sys/dev/malo/if_malo.c
  projects/release-pkg/sys/dev/mwl/if_mwl.c
  projects/release-pkg/sys/dev/ral/if_ral_pci.c
  projects/release-pkg/sys/dev/ral/rt2860.c
  projects/release-pkg/sys/dev/ral/rt2860reg.h
  projects/release-pkg/sys/dev/sound/usb/uaudio.c
  projects/release-pkg/sys/dev/usb/controller/xhci.c
  projects/release-pkg/sys/fs/autofs/autofs.c
  projects/release-pkg/sys/fs/autofs/autofs_ioctl.h
  projects/release-pkg/sys/i386/i386/apic_vector.s
  projects/release-pkg/sys/i386/i386/genassym.c
  projects/release-pkg/sys/i386/i386/mp_machdep.c
  projects/release-pkg/sys/i386/include/cpufunc.h
  projects/release-pkg/sys/kern/kern_sig.c
  projects/release-pkg/sys/kern/kern_timeout.c
  projects/release-pkg/sys/kern/uipc_shm.c
  projects/release-pkg/sys/kern/vfs_mount.c
  projects/release-pkg/sys/modules/dtrace/Makefile
  projects/release-pkg/sys/modules/dtrace/dtrace/Makefile
  projects/release-pkg/sys/netinet/if_ether.c
  projects/release-pkg/sys/netinet/in.c
  projects/release-pkg/sys/netinet6/in6.c
  projects/release-pkg/sys/netinet6/nd6.c
  projects/release-pkg/sys/powerpc/aim/locore32.S
  projects/release-pkg/sys/powerpc/aim/machdep.c
  projects/release-pkg/sys/powerpc/aim/mmu_oea.c
  projects/release-pkg/sys/powerpc/conf/NOTES
  projects/release-pkg/sys/powerpc/include/cpu.h
  projects/release-pkg/sys/powerpc/ofw/ofw_syscons.c
  projects/release-pkg/sys/powerpc/powerpc/swtch64.S
  projects/release-pkg/sys/powerpc/pseries/mmu_phyp.c
  projects/release-pkg/sys/powerpc/pseries/platform_chrp.c
  projects/release-pkg/sys/powerpc/pseries/xics.c
  projects/release-pkg/sys/sys/bitset.h
  projects/release-pkg/sys/sys/callout.h
  projects/release-pkg/sys/sys/copyright.h
  projects/release-pkg/sys/sys/cpuset.h
  projects/release-pkg/sys/sys/param.h
  projects/release-pkg/sys/x86/acpica/madt.c
  projects/release-pkg/sys/x86/include/apicreg.h
  projects/release-pkg/sys/x86/include/apicvar.h
  projects/release-pkg/sys/x86/include/specialreg.h
  projects/release-pkg/sys/x86/iommu/intel_drv.c
  projects/release-pkg/sys/x86/iommu/intel_reg.h
  projects/release-pkg/sys/x86/iommu/intel_utils.c
  projects/release-pkg/sys/x86/x86/io_apic.c
  projects/release-pkg/sys/x86/x86/local_apic.c
  projects/release-pkg/sys/x86/xen/xen_apic.c
  projects/release-pkg/tools/build/mk/OptionalObsoleteFiles.inc
  projects/release-pkg/tools/tools/nanobsd/gateworks/Files/root/.profile
  projects/release-pkg/tools/tools/nanobsd/pcengines/Files/root/.cshrc
  projects/release-pkg/tools/tools/nanobsd/pcengines/Files/root/.login
  projects/release-pkg/tools/tools/nanobsd/rescue/Files/root/.cshrc
  projects/release-pkg/usr.bin/svn/svn/Makefile
  projects/release-pkg/usr.bin/w/w.c
  projects/release-pkg/usr.bin/wc/wc.c
  projects/release-pkg/usr.bin/whereis/pathnames.h
  projects/release-pkg/usr.bin/whereis/whereis.1
  projects/release-pkg/usr.bin/whereis/whereis.c
  projects/release-pkg/usr.bin/xz/Makefile
  projects/release-pkg/usr.sbin/bsdconfig/console/INDEX
  projects/release-pkg/usr.sbin/bsdconfig/include/messages.subr
  projects/release-pkg/usr.sbin/bsdconfig/includes/INDEX
  projects/release-pkg/usr.sbin/bsdconfig/networking/share/device.subr
  projects/release-pkg/usr.sbin/bsdconfig/share/dialog.subr
  projects/release-pkg/usr.sbin/bsdconfig/share/keymap.subr
  projects/release-pkg/usr.sbin/bsdconfig/timezone/share/continents.subr
  projects/release-pkg/usr.sbin/bsdconfig/timezone/share/countries.subr
  projects/release-pkg/usr.sbin/bsdconfig/timezone/timezone
  projects/release-pkg/usr.sbin/bsdconfig/usermgmt/share/user.subr
  projects/release-pkg/usr.sbin/ctladm/ctladm.8
  projects/release-pkg/usr.sbin/ctld/ctl.conf.5
  projects/release-pkg/usr.sbin/ctld/ctld.c
  projects/release-pkg/usr.sbin/ctld/ctld.h
  projects/release-pkg/usr.sbin/ctld/keys.c
  projects/release-pkg/usr.sbin/flowctl/flowctl.c
  projects/release-pkg/usr.sbin/iscsid/iscsid.h
  projects/release-pkg/usr.sbin/iscsid/keys.c
  projects/release-pkg/usr.sbin/mountd/mountd.c
  projects/release-pkg/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
  projects/release-pkg/usr.sbin/pw/tests/Makefile
Directory Properties:
  projects/release-pkg/   (props changed)
  projects/release-pkg/cddl/   (props changed)
  projects/release-pkg/cddl/contrib/opensolaris/   (props changed)
  projects/release-pkg/contrib/binutils/   (props changed)
  projects/release-pkg/contrib/elftoolchain/   (props changed)
  projects/release-pkg/contrib/top/   (props changed)
  projects/release-pkg/contrib/xz/   (props changed)
  projects/release-pkg/etc/   (props changed)
  projects/release-pkg/include/   (props changed)
  projects/release-pkg/lib/libc/   (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/amd64/vmm/   (props changed)
  projects/release-pkg/sys/boot/   (props changed)
  projects/release-pkg/sys/cddl/contrib/opensolaris/   (props changed)
  projects/release-pkg/sys/conf/   (props changed)
  projects/release-pkg/sys/contrib/dev/acpica/   (props changed)
  projects/release-pkg/sys/contrib/dev/acpica/include/   (props changed)

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/Makefile.inc1	Thu Feb 12 15:34:16 2015	(r278624)
@@ -204,9 +204,8 @@ OBJTREE=	${MAKEOBJDIRPREFIX}
 OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
 .endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/tmp
-# /usr/games added for fortune which depend on strfile
-BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
-XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
+BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin
+XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin
 STRICTTMPPATH=	${BPATH}:${XPATH}
 TMPPATH=	${STRICTTMPPATH}:${PATH}
 
@@ -825,9 +824,6 @@ ITOOLS+=makewhatis
 
 # Non-base distributions produced by the base system
 EXTRA_DISTRIBUTIONS=	doc
-.if ${MK_GAMES} != "no"
-EXTRA_DISTRIBUTIONS+=	games
-.endif
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 EXTRA_DISTRIBUTIONS+=	lib32
 .endif
@@ -837,7 +833,7 @@ EXTRA_DISTRIBUTIONS+=	tests
 
 DEBUG_DISTRIBUTIONS=
 .if ${MK_DEBUG_FILES} != "no"
-DEBUG_DISTRIBUTIONS+=	base ${EXTRA_DISTRIBUTIONS:S,doc,,}
+DEBUG_DISTRIBUTIONS+=	base ${EXTRA_DISTRIBUTIONS:S,doc,,:S,tests,,}
 .endif
 
 MTREE_MAGIC?=	mtree 2.0
@@ -1751,6 +1747,7 @@ _lib_libcapsicum=lib/libcapsicum
 
 lib/libcapsicum__L: lib/libnv__L
 lib/libpjdlog__L: lib/libutil__L
+lib/liblzma__L: lib/libthr__L
 
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
 .for _DIR in ${LOCAL_LIB_DIRS}

Modified: projects/release-pkg/ObsoleteFiles.inc
==============================================================================
--- projects/release-pkg/ObsoleteFiles.inc	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/ObsoleteFiles.inc	Thu Feb 12 15:34:16 2015	(r278624)
@@ -38,6 +38,24 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150212: /usr/games moving into /usr/bin
+OLD_FILES+=usr/games/bcd
+OLD_FILES+=usr/games/caesar
+OLD_FILES+=usr/games/factor
+OLD_FILES+=usr/games/fortune
+OLD_FILES+=usr/games/grdc
+OLD_FILES+=usr/games/morse
+OLD_FILES+=usr/games/number
+OLD_FILES+=usr/games/pom
+OLD_FILES+=usr/games/ppt
+OLD_FILES+=usr/games/primes
+OLD_FILES+=usr/games/random
+OLD_FILES+=usr/games/rot13
+OLD_FILES+=usr/games/strfile
+OLD_FILES+=usr/games/unstr
+OLD_DIRS+=usr/games
+# 20150209: liblzma header
+OLD_FILES+=usr/include/lzma/lzma.h
 # 20150124: spl.9 and friends
 OLD_FILES+=usr/share/man/man9/spl.9
 OLD_FILES+=usr/share/man/man9/spl0.9

Modified: projects/release-pkg/UPDATING
==============================================================================
--- projects/release-pkg/UPDATING	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/UPDATING	Thu Feb 12 15:34:16 2015	(r278624)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150210:
+	The autofs(4) ABI was changed in order to restore binary compatibility
+	with 10.1-RELEASE.  The automountd(8) daemon needs to be rebuilt to work
+	with the new kernel.
+
 20150131:
 	The powerpc64 kernel has been changed to a position-independent
 	executable. This can only be booted with a new version of loader(8),
@@ -287,6 +292,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	The lindev device has been removed since /dev/full has been made a
 	standard device.  __FreeBSD_version has been bumped.
 
+20140424:
+	The knob WITHOUT_VI was added to the base system, which controls
+	building ex(1), vi(1), etc. Older releases of FreeBSD required ex(1)
+	in order to reorder files share/termcap and didn't build ex(1) as a
+	build tool, so building/installing with WITH_VI is highly advised for
+	build hosts for older releases.
+
+	This issue has been fixed in stable/9 and stable/10 in r277022 and
+	r276991, respectively.
+
 20140418:
 	The YES_HESIOD knob has been removed. It has been obsolete for
 	a decade. Please move to using WITH_HESIOD instead or your builds

Modified: projects/release-pkg/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- projects/release-pkg/bin/pkill/tests/pgrep-j_test.sh	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/bin/pkill/tests/pgrep-j_test.sh	Thu Feb 12 15:34:16 2015	(r278624)
@@ -40,7 +40,7 @@ if [ `id -u` -eq 0 ]; then
 	if [ "$pid1" = "$pid2" ]; then
 		echo "ok 1 - $name"
 	else
-		echo "not ok 1 - $name"
+		echo "not ok 1 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
 	fi
 	[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
 	[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
@@ -66,7 +66,7 @@ if [ `id -u` -eq 0 ]; then
 	if [ "$pid1" = "$pid2" ]; then
 		echo "ok 2 - $name"
 	else
-		echo "not ok 2 - $name"
+		echo "not ok 2 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
 	fi
 	[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
 	[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
@@ -87,7 +87,7 @@ if [ `id -u` -eq 0 ]; then
 	if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
 		echo "ok 3 - $name"
 	else
-		echo "not ok 3 - $name"
+		echo "not ok 3 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
 	fi
 	rm -f $sleep
 	[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) 

Modified: projects/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c	Thu Feb 12 15:34:16 2015	(r278624)
@@ -169,12 +169,12 @@ write_objects(iidesc_t *idp, ctf_buf_t *
 {
 	ushort_t id = (idp ? idp->ii_dtype->t_id : 0);
 
-	ctf_buf_write(b, &id, sizeof (id));
-
 	if (target_requires_swap) {
 		SWAP_16(id);
 	}
 
+	ctf_buf_write(b, &id, sizeof (id));
+
 	debug(3, "Wrote object %s (%d)\n", (idp ? idp->ii_name : "(null)"), id);
 }
 

Modified: projects/release-pkg/cddl/lib/Makefile
==============================================================================
--- projects/release-pkg/cddl/lib/Makefile	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/cddl/lib/Makefile	Thu Feb 12 15:34:16 2015	(r278624)
@@ -27,7 +27,8 @@ _libzpool=	libzpool
 .endif
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
-	${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
+	${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \
+	${MACHINE_CPUARCH} == "arm"
 _drti=		drti
 _libdtrace=	libdtrace
 .endif

Modified: projects/release-pkg/cddl/lib/libdtrace/Makefile
==============================================================================
--- projects/release-pkg/cddl/lib/libdtrace/Makefile	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/cddl/lib/libdtrace/Makefile	Thu Feb 12 15:34:16 2015	(r278624)
@@ -81,6 +81,10 @@ CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/ut
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips
 .PATH:		${.CURDIR}/../../../sys/cddl/dev/dtrace/mips
+.elif ${MACHINE_CPUARCH} == "arm"
+CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
+.PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm
+.PATH:		${.CURDIR}/../../../sys/cddl/dev/dtrace/arm
 .elif ${MACHINE_CPUARCH} == "powerpc"
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc

Modified: projects/release-pkg/cddl/usr.sbin/Makefile
==============================================================================
--- projects/release-pkg/cddl/usr.sbin/Makefile	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/cddl/usr.sbin/Makefile	Thu Feb 12 15:34:16 2015	(r278624)
@@ -30,6 +30,12 @@ _plockstat=	plockstat
 .endif
 .endif
 
+.if ${MACHINE_CPUARCH} == "arm"
+_dtrace=	dtrace
+_dtruss=	dtruss
+_lockstat=	lockstat
+.endif
+
 .if ${MACHINE_CPUARCH} == "mips"
 _dtrace=	dtrace
 .endif

Modified: projects/release-pkg/contrib/binutils/ld/scripttempl/elf.sc
==============================================================================
--- projects/release-pkg/contrib/binutils/ld/scripttempl/elf.sc	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/contrib/binutils/ld/scripttempl/elf.sc	Thu Feb 12 15:34:16 2015	(r278624)
@@ -402,8 +402,8 @@ cat <<EOF
   .fini_array   ${RELOCATING-0} :
   {
     ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_start = .);}}
-    KEEP (*(.fini_array))
     KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array))
     ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_end = .);}}
   }
   ${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}}

Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/_libdwarf.h
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/_libdwarf.h	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/_libdwarf.h	Thu Feb 12 15:34:16 2015	(r278624)
@@ -49,7 +49,7 @@
 struct _libdwarf_globals {
 	Dwarf_Handler	errhand;
 	Dwarf_Ptr	errarg;
-	int		applyrela;
+	int		applyreloc;
 };
 
 extern struct _libdwarf_globals _libdwarf;

Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_reloc.c
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_reloc.c	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_reloc.c	Thu Feb 12 15:34:16 2015	(r278624)
@@ -33,8 +33,8 @@ dwarf_set_reloc_application(int apply)
 {
 	int oldapply;
 
-	oldapply = _libdwarf.applyrela;
-	_libdwarf.applyrela = apply;
+	oldapply = _libdwarf.applyreloc;
+	_libdwarf.applyreloc = apply;
 
 	return (oldapply);
 }

Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3	Thu Feb 12 15:34:16 2015	(r278624)
@@ -24,7 +24,7 @@
 .\"
 .\" $Id: dwarf_set_reloc_application.3 2075 2011-10-27 03:47:28Z jkoshy $
 .\"
-.Dd June 26, 2011
+.Dd February 11, 2015
 .Os
 .Dt DWARF_SET_RELOC_APPLICATION 3
 .Sh NAME
@@ -47,6 +47,8 @@ handled by the DWARF(3) library.
 If the argument
 .Ar apply
 holds a non-zero value, the library will process all the relevant
+.Dq ".rel"
+and
 .Dq ".rela"
 relocation sections and will apply the relocation records found to
 their corresponding DWARF sections.

Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.c
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.c	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.c	Thu Feb 12 15:34:16 2015	(r278624)
@@ -31,5 +31,5 @@ ELFTC_VCSID("$Id: libdwarf.c 2070 2011-1
 struct _libdwarf_globals _libdwarf = {
 	.errhand	= NULL,
 	.errarg		= NULL,
-	.applyrela	= 1
+	.applyreloc	= 1
 };

Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.h
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.h	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.h	Thu Feb 12 15:34:16 2015	(r278624)
@@ -439,6 +439,7 @@ enum Dwarf_ISA {
 	DW_ISA_SPARC,
 	DW_ISA_X86,
 	DW_ISA_X86_64,
+	DW_ISA_AARCH64,
 	DW_ISA_MAX
 };
 

Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c	Thu Feb 12 15:34:16 2015	(r278624)
@@ -50,32 +50,46 @@ static const char *debug_name[] = {
 };
 
 static void
-_dwarf_elf_apply_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
-    Elf_Data *symtab_data, int endian)
+_dwarf_elf_write_reloc(Dwarf_Debug dbg, Elf_Data *symtab_data, int endian,
+    void *buf, uint64_t offset, GElf_Xword r_info, GElf_Sxword r_addend)
 {
-	Dwarf_Unsigned type;
-	GElf_Rela rela;
 	GElf_Sym sym;
-	size_t symndx;
-	uint64_t offset;
-	int size, j;
+	int size;
 
-	j = 0;
-	while (gelf_getrela(rel_data, j++, &rela) != NULL) {
-		symndx = GELF_R_SYM(rela.r_info);
-		type = GELF_R_TYPE(rela.r_info);
+	if (gelf_getsym(symtab_data, GELF_R_SYM(r_info), &sym) == NULL)
+		return;
+	if ((size = _dwarf_get_reloc_size(dbg, GELF_R_TYPE(r_info))) == 0)
+		return; /* Unknown or non-absolute relocation. */
+	if (endian == ELFDATA2MSB)
+		_dwarf_write_msb(buf, &offset, sym.st_value + r_addend, size);
+	else
+		_dwarf_write_lsb(buf, &offset, sym.st_value + r_addend, size);
+}
 
-		if (gelf_getsym(symtab_data, symndx, &sym) == NULL)
-			continue;
+static void
+_dwarf_elf_apply_rel_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+    Elf_Data *symtab_data, int endian)
+{
+	GElf_Rel rel;
+	int j;
 
-		offset = rela.r_offset;
-		size = _dwarf_get_reloc_size(dbg, type);
+	j = 0;
+	while (gelf_getrel(rel_data, j++, &rel) != NULL)
+		_dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+		     rel.r_offset, rel.r_info, 0);
+}
 
-		if (endian == ELFDATA2MSB)
-			_dwarf_write_msb(buf, &offset, rela.r_addend, size);
-		else
-			_dwarf_write_lsb(buf, &offset, rela.r_addend, size);
-	}
+static void
+_dwarf_elf_apply_rela_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+    Elf_Data *symtab_data, int endian)
+{
+	GElf_Rela rela;
+	int j;
+
+	j = 0;
+	while (gelf_getrela(rel_data, j++, &rela) != NULL)
+		_dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+		    rela.r_offset, rela.r_info, rela.r_addend);
 }
 
 static int
@@ -104,7 +118,8 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
 			return (DW_DLE_ELF);
 		}
 
-		if (sh.sh_type != SHT_RELA || sh.sh_size == 0)
+		if ((sh.sh_type != SHT_REL && sh.sh_type != SHT_RELA) ||
+		     sh.sh_size == 0)
 			continue;
 
 		if (sh.sh_info == shndx && sh.sh_link == symtab) {
@@ -125,8 +140,12 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
 			}
 			memcpy(ed->ed_alloc, ed->ed_data->d_buf,
 			    ed->ed_data->d_size);
-			_dwarf_elf_apply_reloc(dbg, ed->ed_alloc, rel,
-			    symtab_data, eh.e_ident[EI_DATA]);
+			if (sh.sh_type == SHT_REL)
+				_dwarf_elf_apply_rel_reloc(dbg, ed->ed_alloc,
+				    rel, symtab_data, eh.e_ident[EI_DATA]);
+			else
+				_dwarf_elf_apply_rela_reloc(dbg, ed->ed_alloc,
+				    rel, symtab_data, eh.e_ident[EI_DATA]);
 
 			return (DW_DLE_NONE);
 		}
@@ -282,7 +301,7 @@ _dwarf_elf_init(Dwarf_Debug dbg, Elf *el
 				}
 			}
 
-			if (_libdwarf.applyrela) {
+			if (_libdwarf.applyreloc) {
 				if (_dwarf_elf_relocate(dbg, elf,
 				    &e->eo_data[j], elf_ndxscn(scn), symtab_ndx,
 				    symtab_data, error) != DW_DLE_NONE)

Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_reloc.c	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_reloc.c	Thu Feb 12 15:34:16 2015	(r278624)
@@ -35,6 +35,8 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg,
 	assert(dbg != NULL);
 
 	switch (dbg->dbgp_isa) {
+	case DW_ISA_AARCH64:
+		return (is64 ? R_AARCH64_ABS64 : R_AARCH64_ABS32);
 	case DW_ISA_X86:
 		return (R_386_32);
 	case DW_ISA_X86_64:
@@ -62,6 +64,12 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, D
 	switch (dbg->dbg_machine) {
 	case EM_NONE:
 		break;
+	case EM_AARCH64:
+		if (rel_type == R_AARCH64_ABS32)
+			return (4);
+		else if (rel_type == R_AARCH64_ABS64)
+			return (8);
+		break;
 	case EM_ARM:
 		if (rel_type == R_ARM_ABS32)
 			return (4);

Modified: projects/release-pkg/contrib/netbsd-tests/games/t_factor.sh
==============================================================================
--- projects/release-pkg/contrib/netbsd-tests/games/t_factor.sh	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/contrib/netbsd-tests/games/t_factor.sh	Thu Feb 12 15:34:16 2015	(r278624)
@@ -27,13 +27,13 @@
 
 expect() {
 	echo "${2}" >expout
-	atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
+	atf_check -s eq:0 -o file:expout -e empty /usr/bin/factor ${1}
 }
 
 atf_test_case overflow
 overflow_head() {
 	atf_set "descr" "Tests for overflow conditions"
-	atf_set "require.progs" "/usr/games/factor"
+	atf_set "require.progs" "/usr/bin/factor"
 }
 overflow_body() {
 	expect '8675309' '8675309: 8675309'
@@ -44,7 +44,7 @@ atf_test_case loop
 loop_head() {
 	atf_set "descr" "Tests some cases that once locked the program" \
 	                "in an infinite loop"
-	atf_set "require.progs" "/usr/games/factor"
+	atf_set "require.progs" "/usr/bin/factor"
 }
 loop_body() {
 	expect '99999999999991' '99999999999991: 7 13 769231 1428571'

Modified: projects/release-pkg/contrib/top/utils.c
==============================================================================
--- projects/release-pkg/contrib/top/utils.c	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/contrib/top/utils.c	Thu Feb 12 15:34:16 2015	(r278624)
@@ -58,6 +58,7 @@ char *str;
 				 * ever convert will be 2^32-1, which is 10
 				 * digits.
 				 */
+_Static_assert(sizeof(int) <= 4, "buffer too small for this sized int");
 
 char *itoa(val)
 

Modified: projects/release-pkg/contrib/xz/ChangeLog
==============================================================================
--- projects/release-pkg/contrib/xz/ChangeLog	Thu Feb 12 13:31:08 2015	(r278623)
+++ projects/release-pkg/contrib/xz/ChangeLog	Thu Feb 12 15:34:16 2015	(r278624)
@@ -1,66 +1,923 @@
-commit 495aaf3a5b7200a5d2bf449bbbcc0e18834607af
+commit a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
 Author: Lasse Collin <lasse.collin@tukaani.org>
-Date:   2014-09-20 20:44:32 +0300
+Date:   2014-12-21 20:48:37 +0200
 
-    Bump version and soname for 5.0.7.
+    DOS: Update Makefile.
+
+ dos/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit b85ee0905ec4ab7656d22e63519fdd3bedb21f2e
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-21 19:50:38 +0200
+
+    Windows: Fix bin_i486 to bin_i686 in build.bash.
+
+ windows/build.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cbafa710918195dbba3db02c3fab4f0538235206
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-21 18:58:44 +0200
+
+    Docs: Use lzma_cputhreads() in 04_compress_easy_mt.c.
+
+ doc/examples/04_compress_easy_mt.c | 30 ++++++++++++++++++++++++++----
+ 1 file changed, 26 insertions(+), 4 deletions(-)
+
+commit 8dbb57238d372c7263cfeb3e7f7fd9a73173156a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-21 18:56:44 +0200
+
+    Docs: Update docs/examples/00_README.txt.
+
+ doc/examples/00_README.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-21 18:11:17 +0200
+
+    Bump version and soname for 5.2.0.
+    
+    I know that soname != app version, but I skip AGE=1
+    in -version-info to make the soname match the liblzma
+    version anyway. It doesn't hurt anything as long as
+    it doesn't conflict with library versioning rules.
 
  src/liblzma/Makefile.am        | 2 +-
- src/liblzma/api/lzma/version.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/liblzma/api/lzma/version.h | 6 +++---
+ src/liblzma/liblzma.map        | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 3e8bd1d15e417f2d588e9be50ce027ee3d48b2da
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-21 18:05:03 +0200
+
+    Avoid variable-length arrays in the debug programs.
+
+ debug/full_flush.c | 3 ++-
+ debug/sync_flush.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 72f7307cfdceb941aeb2bf30d424cc0d13621786
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-21 18:01:45 +0200
+
+    Build: Include 04_compress_easy_mt.c in the tarball.
+
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 2cb82ff21c62def11f3683a8bb0aaf363102aaa0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-21 18:00:38 +0200
+
+    Fix build when --disable-threads is used.
+
+ src/common/mythread.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 9b9e3536e458ef958f66b0e8982efc9d36de4d17
+Author: Adrien Nader <adrien@notk.org>
+Date:   2014-12-21 15:56:15 +0100
+
+    po/fr: improve wording for help for --lzma1/--lzma2.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a8b6b569e7fadbf5b5b9139d53bc764015c15027
+Author: Adrien Nader <adrien@notk.org>
+Date:   2014-12-21 15:55:48 +0100
+
+    po/fr: missing line in translation of --extreme.
+
+ po/fr.po | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit f168a6fd1a888cf4f0caaddcafcb21dadc6ab6e9
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-21 14:32:33 +0200
+
+    Update NEWS for 5.2.0.
+
+ NEWS | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+
+commit cec2ee863b3a88f4bf039cb00f73c4a4fc93a429
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-21 14:32:22 +0200
+
+    Update NEWS for 5.0.8.
+
+ NEWS | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit 42e97a32649bf53ce43be2258b902a417c6e7fa1
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-21 14:07:54 +0200
+
+    xz: Fix a comment.
+
+ src/xz/options.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 29b95d5d6665cedffa6a9d6d3d914f981e852182
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-20 20:43:14 +0200
+
+    Update INSTALL about the dependencies of the scripts.
+
+ INSTALL | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+commit 3af91040bb42c21afbb81f5568c3313125e61192
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-20 20:42:33 +0200
+
+    Windows: Update build instructions.
+
+ INSTALL                     | 15 +++++++++------
+ windows/INSTALL-Windows.txt | 44 +++++++++++++++++++++-----------------------
+ 2 files changed, 30 insertions(+), 29 deletions(-)
+
+commit 0152f72bf6289d744823dc6c849538f3a139ad70
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-20 20:41:48 +0200
+
+    Windows: Update the build script and README-Windows.txt.
+    
+    The 32-bit build is now for i686 or newer because the
+    prebuilt MinGW-w64 toolchains include i686 code in the
+    executables even if one uses -march=i486.
+    
+    The build script builds 32-bit SSE2 enabled version too.
+    Run-time detection of SSE2 support would be nice (on any OS)
+    but it's not implemented in XZ Utils yet.
+
+ windows/README-Windows.txt | 30 ++++++++++++++++--------------
+ windows/build.bash         | 23 ++++++++++++++---------
+ 2 files changed, 30 insertions(+), 23 deletions(-)
+
+commit 4a1f6133ee5533cee8d91e06fcc22443e5f1881a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-19 15:51:50 +0200
+
+    Windows: Define TUKLIB_SYMBOL_PREFIX in config.h.
+    
+    It is to keep all symbols in the lzma_ namespace.
+
+ windows/config.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 7f7d093de79eee0c7dbfd7433647e46302f19f82
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-16 21:00:09 +0200
+
+    xz: Update the man page about --threads.
+
+ src/xz/xz.1 | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit 009823448b82aa5f465668878a544c5842885407
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-16 20:57:43 +0200
+
+    xz: Update the man page about --block-size.
+
+ src/xz/xz.1 | 41 +++++++++++++++++++++++++++++++++--------
+ 1 file changed, 33 insertions(+), 8 deletions(-)
+
+commit 7dddfbeb499e528940bc12047355c184644aafe9
+Author: Adrien Nader <adrien@notk.org>
+Date:   2014-12-10 22:26:57 +0100
+
+    po/fr: several more translation updates: reword and handle --ignore-check.
+
+ po/fr.po | 50 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 26 insertions(+), 24 deletions(-)
+
+commit 6eca5be40e04ddc4b738d493e4e56835956d8b69
+Author: Adrien Nader <adrien@notk.org>
+Date:   2014-12-10 22:23:01 +0100
+
+    po/fr: yet another place where my email address had to be updated.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d1003673e92ba47edd6aeeb3dbea05c18269d0e7
+Author: Adrien Nader <adrien@notk.org>
+Date:   2014-12-10 22:22:20 +0100
+
+    po/fr: fix several typos that have been around since the beginning.
+
+ po/fr.po | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+commit 4c5aa911a0df027e46171e368debc543d2fa72b2
+Author: Adrien Nader <adrien@notk.org>
+Date:   2014-12-03 20:02:31 +0100
+
+    po/fr: last batch of new translations for now.
+    
+    Four new error messages.
+
+ po/fr.po | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+commit 3e3099e36d27059499e7996fb38a62e8ab01d356
+Author: Adrien Nader <adrien@notk.org>
+Date:   2014-12-03 20:01:32 +0100
+
+    po/fr: translations for --threads, --block-size and --block-list.
+
+ po/fr.po | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+commit e7d96a5933eec4e9d4a62569ee88df0ebb0f1d53
+Author: Adrien Nader <adrien@notk.org>
+Date:   2014-12-03 20:00:53 +0100
+
+    po/fr: remove fuzzy marker for error messages that will be kept in English.
+    
+    The following is a copy of a comment inside fr.po:
+    
+    Note from translator on "file status flags".
+    The following entry is kept un-translated on purpose. It is difficult to
+    translate and should only happen in exceptional circumstances which means
+    that translating would:
+    - lose some of the meaning
+    - make it more difficult to look up in search engines; it might happen one
+    in
+    a million times, if we dilute the error message in 20 languages, it will be
+    almost impossible to find an explanation and support for the error.
+
+ po/fr.po | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+commit 46cbb9033af8a21fafe543302d6919746e0d72af
+Author: Adrien Nader <adrien@notk.org>
+Date:   2014-12-03 19:58:25 +0100
+
+    po/fr: several minor updates and better wording.
+    
+    Meaning doesn't change at all: it's only for better wording and/or
+    formatting of a few strings.
+
+ po/fr.po | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+commit 7ce49d444f04e73145f79c832eb4d510594b074a
+Author: Adrien Nader <adrien@notk.org>
+Date:   2014-12-03 19:56:12 +0100
+
+    po/fr: update my email address and copyright years.
+
+ po/fr.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 214c553ebc3047cd720da1ce5c80cf7c38118d3c
+Author: Adrien Nader <adrien@notk.org>
+Date:   2014-11-26 10:08:26 +0100
+
+    fr.po: commit file after only "update-po" so actual is readable.
+
+ po/fr.po | 311 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 199 insertions(+), 112 deletions(-)
+
+commit 1190c641af09cde85f8bd0fbe5c4906f4a29431b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-12-02 20:04:07 +0200
+
+    liblzma: Document how lzma_mt.block_size affects memory usage.
+
+ src/liblzma/api/lzma/container.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit e4fc1d2f9571fba79ce383595be2ea2a9257def0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-11-28 20:07:18 +0200
+
+    Update INSTALL about a "make check" failure in test_scripts.sh.
+
+ INSTALL | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+commit 34f9e40a0a0c3bd2c2730cdb9cd550bbb8a3f2fe
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-11-26 20:12:27 +0200
+
+    Remove LZMA_UNSTABLE macro.
+
+ src/liblzma/api/lzma/container.h | 4 ----
+ src/liblzma/common/common.h      | 2 --
+ src/xz/private.h                 | 1 -
+ 3 files changed, 7 deletions(-)
+
+commit 6d9c0ce9f2677b159e32b224aba5b535b304a705
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-11-26 20:10:33 +0200
+
+    liblzma: Update lzma_stream_encoder_mt() API docs.
+
+ src/liblzma/api/lzma/container.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 2301f3f05dd9742f42cda8f0f318864f5dc39ab3
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-11-25 12:32:05 +0200
+
+    liblzma: Verify the filter chain in threaded encoder initialization.
+    
+    This way an invalid filter chain is detected at the Stream
+    encoder initialization instead of delaying it to the first
+    call to lzma_code() which triggers the initialization of
+    the actual filter encoder(s).
+
+ src/liblzma/common/stream_encoder_mt.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+commit 107a263d5bb63cd3593fd6a5c938706539f84523
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-11-17 19:11:49 +0200
+
+    Build: Update m4/ax_pthread.m4 from Autoconf Archive.
+
+ m4/ax_pthread.m4 | 71 +++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 47 insertions(+), 24 deletions(-)
+
+commit b13a781833399ff5726cfc997f3cb2f0acbdbf31
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-11-17 18:52:21 +0200
+
+    Build: Replace obsolete AC_HELP_STRING with AS_HELP_STRING.
+
+ configure.ac         | 36 ++++++++++++++++++------------------
+ m4/tuklib_integer.m4 |  2 +-
+ 2 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 542cac122ed3550148a2af0033af22b757491378
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-11-17 18:43:19 +0200
+
+    Build: Fix Autoconf warnings about escaped backquotes.
+    
+    Thanks to Daniel Richard G. for pointing out that it's
+    good to sometimes run autoreconf -fi with -Wall.
+
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+commit 7b03a15cea8cd4f19ed680b51c4bcbae3ce4142f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-11-10 18:54:40 +0200
+
+    xzdiff: Use mkdir if mktemp isn't available.
+
+ src/scripts/xzdiff.in | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+commit f8c13e5e3609581d5dd9f8777985ca07f2390ad7
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-11-10 18:45:01 +0200
+
+    xzdiff: Create a temporary directory to hold a temporary file.
+    
+    This avoids the possibility of "File name too long" when
+    creating a temp file when the input file name is very long.
+    
+    This also means that other users on the system can no longer
+    see the input file names in /tmp (or whatever $TMPDIR is)
+    since the temporary directory will have a generic name. This
+    usually doesn't matter since on many systems one can see
+    the arguments given to all processes anyway.
+    
+    The number X chars to mktemp where increased from 6 to 10.
+    
+    Note that with some shells temp files or dirs won't be used at all.
+
+ src/scripts/xzdiff.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 7716dcf9df7f457500cb657314e7a9aea5fedb06
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-11-10 15:38:47 +0200
+
+    liblzma: Fix lzma_mt.preset in lzma_stream_encoder_mt_memusage().
+    
+    It read the filter chain from a wrong variable. This is a similar
+    bug that was fixed in 9494fb6d0ff41c585326f00aa8f7fe58f8106a5e.
+
+ src/liblzma/common/stream_encoder_mt.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 230fa4a605542c84b4178a57381695a0af4e779b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-11-10 14:49:55 +0200
+
+    Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4e4ae08bc7c1711e399c9f2d26eb375d39d08101
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-10-29 21:28:25 +0200
+
+    Update .gitignore files.
+
+ .gitignore    | 2 ++
+ m4/.gitignore | 3 +++
+ 2 files changed, 5 insertions(+)
+
+commit c923b140b27d1a055db6284e10fd546ad1a7fcdb
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-10-29 21:15:35 +0200
+
+    Build: Prepare to support Automake's subdir-objects.
+    
+    Due to a bug in Automake, subdir-objects won't be enabled
+    for now.
+    
+    http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354
+    
+    Thanks to Daniel Richard G. for the original patches.
+
+ configure.ac             |  7 ++++++-
+ src/Makefile.am          | 22 +++++++++++++++++++++-
+ src/liblzma/Makefile.am  |  4 ++--
+ src/lzmainfo/Makefile.am |  4 ++--
+ src/xz/Makefile.am       | 10 +++++-----
+ src/xzdec/Makefile.am    |  8 ++++----
+ 6 files changed, 40 insertions(+), 15 deletions(-)
+
+commit 08c2aa16bea0df82828f665d51fba2e0a5e8997f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-10-24 20:09:29 +0300
+
+    Translations: Update the Italian translation.
+    
+    Thanks to Milo Casagrande.
+
+ po/it.po | 452 ++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 275 insertions(+), 177 deletions(-)
+
+commit 2f9f61aa83539c54ff6c118a2693890f0519b3dd
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-10-18 18:51:45 +0300
+
+    Translations: Update the Polish translation.
+    
+    Thanks to Jakub Bogusz.
+
+ po/pl.po | 332 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 214 insertions(+), 118 deletions(-)
+
+commit 4f9d233f67aea25e532824d11b7642cf7dee7a76
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date:   2014-10-14 17:30:30 +0200
+
+    l10n: de.po: Change translator email address.
+    
+    Although the old address is still working, the new one should
+    be preferred. So this commit changes all three places in de.po
+    accordingly.
+    
+    Signed-off-by: Andre Noll <maan@tuebingen.mpg.de>
+
+ po/de.po | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 00502b2bedad43f0cc167ac17ae0608837ee196b
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date:   2014-10-14 17:30:29 +0200
+
+    l10n: de.po: Update German translation
+    
+    Signed-off-by: Andre Noll <maan@systemlinux.org>
+
+ po/de.po | 531 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 281 insertions(+), 250 deletions(-)
+
+commit 706b0496753fb609e69f1570ec603f11162189d1
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date:   2014-10-14 17:30:28 +0200
+
+    l10n: de.po: Fix typo: Schießen -> Schließen.
+    
+    That's a funny one since "schießen" means to shoot :)
+    
+    Signed-off-by: Andre Noll <maan@systemlinux.org>
+
+ po/de.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7c32e6a935c3d7ee366abad1679bd5f322f0c7d4
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-10-09 19:42:26 +0300
+
+    Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 076258cc458f1e705041ac7a729b15ffe8c5214a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-10-09 19:41:51 +0300
+
+    Add support for AmigaOS/AROS to tuklib_physmem().
+    
+    Thanks to Fredrik Wikstrom.
+
+ m4/tuklib_physmem.m4        | 3 ++-
+ src/common/tuklib_physmem.c | 7 +++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+commit efa7b0a210e1baa8e128fc98c5443a944c39ad24
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2014-10-09 18:42:14 +0300
+
+    xzgrep: Avoid passing both -q and -l to grep.
+    
+    The behavior of grep -ql varies:
+      - GNU grep behaves like grep -q.
+      - OpenBSD grep behaves like grep -l.
+    
+    POSIX doesn't make it 100 % clear what behavior is expected.
+    Anyway, using both -q and -l at the same time makes no sense
+    so both options simply should never be used at the same time.
+    
+    Thanks to Christian Weisgerber.
+
+ src/scripts/xzgrep.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 9c5f76098c9986b48d2fc574a0b764f4cde0c538
+Author: Trần Ngọc Quân <vnwildman@gmail.com>
+Date:   2014-09-25 09:22:45 +0700
+
+    l10n: vi.po: Update Vietnamese translation
+    
+    Signed-off-by: Trần Ngọc Quân <vnwildman@gmail.com>
+
+ po/vi.po | 136 +++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 84 insertions(+), 52 deletions(-)
+
+commit c4911f2db36d811896c73c008b4218d8fa9a4730

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502121534.t1CFYHkG044893>