Date: Sat, 14 Feb 2015 08:20:32 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278745 - in user/dchagin/lemul: . bin/pkill/tests cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io cddl/contrib/opensolaris/lib/libdtrace/arm cddl/contrib/opensolaris/tools/ctf/c... Message-ID: <201502140820.t1E8KWwD011108@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Sat Feb 14 08:20:31 2015 New Revision: 278745 URL: https://svnweb.freebsd.org/changeset/base/278745 Log: Merge from head. Added: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/arm/ - copied from r278744, head/cddl/contrib/opensolaris/lib/libdtrace/arm/ user/dchagin/lemul/contrib/xz/src/liblzma/api/lzma/lzma12.h - copied unchanged from r278744, head/contrib/xz/src/liblzma/api/lzma/lzma12.h user/dchagin/lemul/contrib/xz/src/liblzma/common/block_buffer_encoder.h - copied unchanged from r278744, head/contrib/xz/src/liblzma/common/block_buffer_encoder.h user/dchagin/lemul/contrib/xz/src/liblzma/common/hardware_cputhreads.c - copied unchanged from r278744, head/contrib/xz/src/liblzma/common/hardware_cputhreads.c user/dchagin/lemul/contrib/xz/src/liblzma/common/memcmplen.h - copied unchanged from r278744, head/contrib/xz/src/liblzma/common/memcmplen.h user/dchagin/lemul/contrib/xz/src/liblzma/common/outqueue.c - copied unchanged from r278744, head/contrib/xz/src/liblzma/common/outqueue.c user/dchagin/lemul/contrib/xz/src/liblzma/common/outqueue.h - copied unchanged from r278744, head/contrib/xz/src/liblzma/common/outqueue.h user/dchagin/lemul/contrib/xz/src/liblzma/common/stream_encoder_mt.c - copied unchanged from r278744, head/contrib/xz/src/liblzma/common/stream_encoder_mt.c user/dchagin/lemul/contrib/xz/src/liblzma/liblzma.map - copied unchanged from r278744, head/contrib/xz/src/liblzma/liblzma.map user/dchagin/lemul/contrib/xz/src/liblzma/validate_map.sh - copied unchanged from r278744, head/contrib/xz/src/liblzma/validate_map.sh user/dchagin/lemul/contrib/xz/src/xz/mytime.c - copied unchanged from r278744, head/contrib/xz/src/xz/mytime.c user/dchagin/lemul/contrib/xz/src/xz/mytime.h - copied unchanged from r278744, head/contrib/xz/src/xz/mytime.h user/dchagin/lemul/lib/libdevctl/ - copied from r278744, head/lib/libdevctl/ user/dchagin/lemul/release/doc/share/xml/errata.xml - copied unchanged from r278744, head/release/doc/share/xml/errata.xml user/dchagin/lemul/release/doc/share/xml/security.xml - copied unchanged from r278744, head/release/doc/share/xml/security.xml user/dchagin/lemul/sys/arm/broadcom/bcm2835/bcm2835_audio.c - copied unchanged from r278744, head/sys/arm/broadcom/bcm2835/bcm2835_audio.c user/dchagin/lemul/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h - copied unchanged from r278744, head/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/arm/ - copied from r278744, head/sys/cddl/contrib/opensolaris/uts/arm/ user/dchagin/lemul/sys/cddl/dev/dtrace/arm/ - copied from r278744, head/sys/cddl/dev/dtrace/arm/ user/dchagin/lemul/sys/cddl/dev/fbt/arm/ - copied from r278744, head/sys/cddl/dev/fbt/arm/ user/dchagin/lemul/sys/contrib/vchiq/ - copied from r278744, head/sys/contrib/vchiq/ user/dchagin/lemul/sys/dev/cxgbe/if_cxl.c - copied unchanged from r278744, head/sys/dev/cxgbe/if_cxl.c user/dchagin/lemul/sys/dev/wpi/if_wpi_debug.h - copied unchanged from r278744, head/sys/dev/wpi/if_wpi_debug.h user/dchagin/lemul/sys/modules/cxgbe/if_cxl/ - copied from r278744, head/sys/modules/cxgbe/if_cxl/ user/dchagin/lemul/sys/modules/dtb/rpi/ - copied from r278744, head/sys/modules/dtb/rpi/ user/dchagin/lemul/tools/tools/qrndtest/ - copied from r278744, head/tools/tools/qrndtest/ user/dchagin/lemul/usr.sbin/devctl/ - copied from r278744, head/usr.sbin/devctl/ user/dchagin/lemul/usr.sbin/pw/tests/pw_usernext.sh - copied unchanged from r278744, head/usr.sbin/pw/tests/pw_usernext.sh Deleted: user/dchagin/lemul/contrib/xz/src/liblzma/api/lzma/lzma.h user/dchagin/lemul/contrib/xz/src/liblzma/common/stream_encoder.h user/dchagin/lemul/lib/libiconv/ user/dchagin/lemul/share/info/ user/dchagin/lemul/sys/powerpc/conf/WII user/dchagin/lemul/sys/powerpc/wii/ Modified: user/dchagin/lemul/Makefile.inc1 user/dchagin/lemul/ObsoleteFiles.inc user/dchagin/lemul/UPDATING user/dchagin/lemul/bin/pkill/tests/pgrep-j_test.sh user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c user/dchagin/lemul/cddl/lib/Makefile user/dchagin/lemul/cddl/lib/libdtrace/Makefile user/dchagin/lemul/cddl/usr.sbin/Makefile user/dchagin/lemul/contrib/binutils/ld/scripttempl/elf.sc user/dchagin/lemul/contrib/elftoolchain/libdwarf/_libdwarf.h user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_reloc.c user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf.c user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf.h user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf_reloc.c user/dchagin/lemul/contrib/mdocml/lib.in user/dchagin/lemul/contrib/netbsd-tests/games/t_factor.sh user/dchagin/lemul/contrib/top/utils.c user/dchagin/lemul/contrib/xz/ChangeLog user/dchagin/lemul/contrib/xz/FREEBSD-upgrade user/dchagin/lemul/contrib/xz/THANKS user/dchagin/lemul/contrib/xz/TODO user/dchagin/lemul/contrib/xz/src/common/mythread.h user/dchagin/lemul/contrib/xz/src/common/sysdefs.h user/dchagin/lemul/contrib/xz/src/common/tuklib_cpucores.c user/dchagin/lemul/contrib/xz/src/common/tuklib_physmem.c user/dchagin/lemul/contrib/xz/src/liblzma/api/lzma.h user/dchagin/lemul/contrib/xz/src/liblzma/api/lzma/base.h user/dchagin/lemul/contrib/xz/src/liblzma/api/lzma/block.h user/dchagin/lemul/contrib/xz/src/liblzma/api/lzma/container.h user/dchagin/lemul/contrib/xz/src/liblzma/api/lzma/filter.h user/dchagin/lemul/contrib/xz/src/liblzma/api/lzma/hardware.h user/dchagin/lemul/contrib/xz/src/liblzma/api/lzma/index.h user/dchagin/lemul/contrib/xz/src/liblzma/api/lzma/index_hash.h user/dchagin/lemul/contrib/xz/src/liblzma/api/lzma/version.h user/dchagin/lemul/contrib/xz/src/liblzma/check/check.h user/dchagin/lemul/contrib/xz/src/liblzma/check/sha256.c user/dchagin/lemul/contrib/xz/src/liblzma/common/alone_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/alone_decoder.h user/dchagin/lemul/contrib/xz/src/liblzma/common/alone_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/auto_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/block_buffer_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/block_buffer_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/block_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/block_decoder.h user/dchagin/lemul/contrib/xz/src/liblzma/common/block_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/block_encoder.h user/dchagin/lemul/contrib/xz/src/liblzma/common/block_header_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/block_header_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/block_util.c user/dchagin/lemul/contrib/xz/src/liblzma/common/common.c user/dchagin/lemul/contrib/xz/src/liblzma/common/common.h user/dchagin/lemul/contrib/xz/src/liblzma/common/easy_buffer_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/easy_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/filter_buffer_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/filter_buffer_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/filter_common.c user/dchagin/lemul/contrib/xz/src/liblzma/common/filter_common.h user/dchagin/lemul/contrib/xz/src/liblzma/common/filter_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/filter_decoder.h user/dchagin/lemul/contrib/xz/src/liblzma/common/filter_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/filter_encoder.h user/dchagin/lemul/contrib/xz/src/liblzma/common/filter_flags_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/index.c user/dchagin/lemul/contrib/xz/src/liblzma/common/index_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/index_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/index_encoder.h user/dchagin/lemul/contrib/xz/src/liblzma/common/index_hash.c user/dchagin/lemul/contrib/xz/src/liblzma/common/stream_buffer_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/stream_buffer_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/stream_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/common/stream_decoder.h user/dchagin/lemul/contrib/xz/src/liblzma/common/stream_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/delta/delta_common.c user/dchagin/lemul/contrib/xz/src/liblzma/delta/delta_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/delta/delta_decoder.h user/dchagin/lemul/contrib/xz/src/liblzma/delta/delta_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/delta/delta_encoder.h user/dchagin/lemul/contrib/xz/src/liblzma/delta/delta_private.h user/dchagin/lemul/contrib/xz/src/liblzma/liblzma.pc.in user/dchagin/lemul/contrib/xz/src/liblzma/lz/lz_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/lz/lz_decoder.h user/dchagin/lemul/contrib/xz/src/liblzma/lz/lz_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/lz/lz_encoder.h user/dchagin/lemul/contrib/xz/src/liblzma/lz/lz_encoder_mf.c user/dchagin/lemul/contrib/xz/src/liblzma/lzma/fastpos.h user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma2_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma2_decoder.h user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma2_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma2_encoder.h user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma_common.h user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma_decoder.h user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma_encoder.c user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma_encoder.h user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c user/dchagin/lemul/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h user/dchagin/lemul/contrib/xz/src/liblzma/rangecoder/range_decoder.h user/dchagin/lemul/contrib/xz/src/liblzma/simple/arm.c user/dchagin/lemul/contrib/xz/src/liblzma/simple/armthumb.c user/dchagin/lemul/contrib/xz/src/liblzma/simple/ia64.c user/dchagin/lemul/contrib/xz/src/liblzma/simple/powerpc.c user/dchagin/lemul/contrib/xz/src/liblzma/simple/simple_coder.c user/dchagin/lemul/contrib/xz/src/liblzma/simple/simple_coder.h user/dchagin/lemul/contrib/xz/src/liblzma/simple/simple_decoder.c user/dchagin/lemul/contrib/xz/src/liblzma/simple/simple_decoder.h user/dchagin/lemul/contrib/xz/src/liblzma/simple/simple_private.h user/dchagin/lemul/contrib/xz/src/liblzma/simple/sparc.c user/dchagin/lemul/contrib/xz/src/liblzma/simple/x86.c user/dchagin/lemul/contrib/xz/src/xz/args.c user/dchagin/lemul/contrib/xz/src/xz/args.h user/dchagin/lemul/contrib/xz/src/xz/coder.c user/dchagin/lemul/contrib/xz/src/xz/coder.h user/dchagin/lemul/contrib/xz/src/xz/file_io.c user/dchagin/lemul/contrib/xz/src/xz/file_io.h user/dchagin/lemul/contrib/xz/src/xz/hardware.c user/dchagin/lemul/contrib/xz/src/xz/hardware.h user/dchagin/lemul/contrib/xz/src/xz/list.c user/dchagin/lemul/contrib/xz/src/xz/main.c user/dchagin/lemul/contrib/xz/src/xz/message.c user/dchagin/lemul/contrib/xz/src/xz/options.c user/dchagin/lemul/contrib/xz/src/xz/private.h user/dchagin/lemul/contrib/xz/src/xz/signals.c user/dchagin/lemul/contrib/xz/src/xz/suffix.c user/dchagin/lemul/contrib/xz/src/xz/xz.1 user/dchagin/lemul/etc/Makefile user/dchagin/lemul/etc/devd.conf user/dchagin/lemul/etc/login.conf user/dchagin/lemul/etc/master.passwd user/dchagin/lemul/etc/mtree/BSD.debug.dist user/dchagin/lemul/etc/mtree/BSD.usr.dist user/dchagin/lemul/etc/rc.d/LOGIN user/dchagin/lemul/etc/rc.d/Makefile user/dchagin/lemul/etc/rc.d/NETWORKING user/dchagin/lemul/etc/rc.d/jail user/dchagin/lemul/etc/rc.d/local_unbound user/dchagin/lemul/etc/rc.d/netif user/dchagin/lemul/etc/rc.d/routing user/dchagin/lemul/etc/rc.d/utx user/dchagin/lemul/etc/root/dot.cshrc user/dchagin/lemul/etc/root/dot.login user/dchagin/lemul/etc/root/dot.profile user/dchagin/lemul/games/Makefile.inc user/dchagin/lemul/games/caesar/rot13.sh user/dchagin/lemul/games/fortune/datfiles/Makefile user/dchagin/lemul/games/fortune/datfiles/freebsd-tips user/dchagin/lemul/include/stdio.h user/dchagin/lemul/lib/Makefile user/dchagin/lemul/lib/csu/powerpc64/Makefile user/dchagin/lemul/lib/libc/gen/disklabel.c user/dchagin/lemul/lib/libc/gen/getgrent.c user/dchagin/lemul/lib/libc/gen/getpwent.c user/dchagin/lemul/lib/libc/nls/msgcat.c user/dchagin/lemul/lib/libc/regex/regcomp.c user/dchagin/lemul/lib/libc/stdlib/tdelete.c user/dchagin/lemul/lib/libc/sys/setresuid.2 user/dchagin/lemul/lib/libdevinfo/devinfo.h user/dchagin/lemul/lib/liblzma/Makefile user/dchagin/lemul/lib/liblzma/Symbol.map user/dchagin/lemul/lib/liblzma/Versions.def user/dchagin/lemul/lib/liblzma/config.h user/dchagin/lemul/lib/libnetgraph/debug.c user/dchagin/lemul/lib/libproc/proc_bkpt.c user/dchagin/lemul/lib/libproc/proc_regs.c user/dchagin/lemul/lib/libproc/proc_sym.c user/dchagin/lemul/lib/libthr/libthr.3 user/dchagin/lemul/lib/libthr/thread/thr_barrier.c user/dchagin/lemul/lib/msun/src/s_scalbln.c user/dchagin/lemul/release/Makefile user/dchagin/lemul/release/Makefile.vm user/dchagin/lemul/release/doc/en_US.ISO8859-1/errata/article.xml user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml user/dchagin/lemul/release/doc/share/xml/release.ent user/dchagin/lemul/release/scripts/make-manifest.sh user/dchagin/lemul/release/scripts/mk-vmimage.sh user/dchagin/lemul/rescue/rescue/Makefile user/dchagin/lemul/sbin/ipfw/ipfw2.c user/dchagin/lemul/sbin/sysctl/sysctl.8 user/dchagin/lemul/sbin/sysctl/sysctl.c user/dchagin/lemul/share/man/man4/led.4 user/dchagin/lemul/share/man/man4/ral.4 user/dchagin/lemul/share/man/man4/witness.4 user/dchagin/lemul/share/man/man5/nullfs.5 user/dchagin/lemul/share/man/man6/intro.6 user/dchagin/lemul/share/man/man7/hier.7 user/dchagin/lemul/share/mk/bsd.lib.mk user/dchagin/lemul/share/mk/bsd.libnames.mk user/dchagin/lemul/share/mk/bsd.mkopt.mk user/dchagin/lemul/share/mk/bsd.own.mk user/dchagin/lemul/share/mk/bsd.prog.mk user/dchagin/lemul/share/mk/src.libnames.mk user/dchagin/lemul/share/skel/dot.cshrc user/dchagin/lemul/share/skel/dot.login user/dchagin/lemul/share/skel/dot.profile user/dchagin/lemul/sys/amd64/amd64/apic_vector.S user/dchagin/lemul/sys/amd64/amd64/db_disasm.c user/dchagin/lemul/sys/amd64/amd64/genassym.c user/dchagin/lemul/sys/amd64/amd64/mp_machdep.c user/dchagin/lemul/sys/amd64/include/cpufunc.h user/dchagin/lemul/sys/amd64/vmm/vmm_support.S user/dchagin/lemul/sys/arm/arm/cpufunc.c user/dchagin/lemul/sys/arm/arm/cpufunc_asm_armv7.S user/dchagin/lemul/sys/arm/arm/db_trace.c user/dchagin/lemul/sys/arm/arm/elf_trampoline.c user/dchagin/lemul/sys/arm/arm/exception.S user/dchagin/lemul/sys/arm/arm/identcpu.c user/dchagin/lemul/sys/arm/arm/trap.c user/dchagin/lemul/sys/arm/broadcom/bcm2835/files.bcm2835 user/dchagin/lemul/sys/arm/conf/BEAGLEBONE user/dchagin/lemul/sys/arm/conf/RPI-B user/dchagin/lemul/sys/arm/include/armreg.h user/dchagin/lemul/sys/arm/include/cpufunc.h user/dchagin/lemul/sys/arm/xscale/ixp425/if_npe.c user/dchagin/lemul/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu user/dchagin/lemul/sys/boot/amd64/boot1.efi/generate-fat.sh user/dchagin/lemul/sys/boot/arm/ixp425/boot2/ixp425_board.c user/dchagin/lemul/sys/boot/forth/beastie.4th user/dchagin/lemul/sys/boot/forth/brand.4th user/dchagin/lemul/sys/boot/pc98/boot2/Makefile user/dchagin/lemul/sys/cam/ctl/ctl.c user/dchagin/lemul/sys/cam/ctl/ctl.h user/dchagin/lemul/sys/cam/ctl/ctl_backend_block.c user/dchagin/lemul/sys/cam/ctl/ctl_backend_ramdisk.c user/dchagin/lemul/sys/cam/ctl/ctl_frontend_iscsi.c user/dchagin/lemul/sys/cam/ctl/ctl_frontend_iscsi.h user/dchagin/lemul/sys/cam/ctl/ctl_ioctl.h user/dchagin/lemul/sys/cam/ctl/ctl_private.h user/dchagin/lemul/sys/cam/ctl/ctl_tpc.c user/dchagin/lemul/sys/cam/ctl/ctl_tpc.h user/dchagin/lemul/sys/cam/ctl/ctl_tpc_local.c user/dchagin/lemul/sys/cam/scsi/scsi_all.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/dchagin/lemul/sys/cddl/dev/lockstat/lockstat.c user/dchagin/lemul/sys/cddl/dev/profile/profile.c user/dchagin/lemul/sys/conf/dtb.mk user/dchagin/lemul/sys/conf/files user/dchagin/lemul/sys/conf/files.powerpc user/dchagin/lemul/sys/conf/kern.opts.mk user/dchagin/lemul/sys/conf/kern.pre.mk user/dchagin/lemul/sys/conf/options user/dchagin/lemul/sys/conf/options.powerpc user/dchagin/lemul/sys/contrib/dev/acpica/include/actbl2.h user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_keycache.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_osprey22.ini user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9340.ini user/dchagin/lemul/sys/contrib/dev/ath/ath_hal/ar9300/ar9580.ini user/dchagin/lemul/sys/contrib/dev/ral/microcode.h user/dchagin/lemul/sys/contrib/dev/ral/rt2860.fw.uu user/dchagin/lemul/sys/dev/acpica/acpi.c user/dchagin/lemul/sys/dev/cxgb/cxgb_osdep.h user/dchagin/lemul/sys/dev/cxgbe/adapter.h user/dchagin/lemul/sys/dev/cxgbe/common/t4_hw.c user/dchagin/lemul/sys/dev/cxgbe/iw_cxgbe/device.c user/dchagin/lemul/sys/dev/cxgbe/offload.h user/dchagin/lemul/sys/dev/cxgbe/t4_main.c user/dchagin/lemul/sys/dev/cxgbe/tom/t4_listen.c user/dchagin/lemul/sys/dev/cxgbe/tom/t4_tom.c user/dchagin/lemul/sys/dev/drm2/radeon/ni.c user/dchagin/lemul/sys/dev/drm2/radeon/si.c user/dchagin/lemul/sys/dev/dwc/if_dwc.c user/dchagin/lemul/sys/dev/hwpmc/hwpmc_armv7.c user/dchagin/lemul/sys/dev/ipmi/ipmi.c user/dchagin/lemul/sys/dev/ipmi/ipmi_kcs.c user/dchagin/lemul/sys/dev/ipmi/ipmi_smic.c user/dchagin/lemul/sys/dev/ipmi/ipmi_ssif.c user/dchagin/lemul/sys/dev/ipmi/ipmivars.h user/dchagin/lemul/sys/dev/iscsi/icl.c user/dchagin/lemul/sys/dev/iscsi/icl_conn_if.m user/dchagin/lemul/sys/dev/iscsi/icl_soft.c user/dchagin/lemul/sys/dev/iscsi/icl_wrappers.h user/dchagin/lemul/sys/dev/iscsi/iscsi.c user/dchagin/lemul/sys/dev/iscsi/iscsi.h user/dchagin/lemul/sys/dev/malo/if_malo.c user/dchagin/lemul/sys/dev/mwl/if_mwl.c user/dchagin/lemul/sys/dev/oce/oce_mbox.c user/dchagin/lemul/sys/dev/pci/pci.c user/dchagin/lemul/sys/dev/ral/if_ral_pci.c user/dchagin/lemul/sys/dev/ral/rt2860.c user/dchagin/lemul/sys/dev/ral/rt2860reg.h user/dchagin/lemul/sys/dev/sfxge/common/efsys.h user/dchagin/lemul/sys/dev/sfxge/sfxge.c user/dchagin/lemul/sys/dev/sfxge/sfxge.h user/dchagin/lemul/sys/dev/sfxge/sfxge_ev.c user/dchagin/lemul/sys/dev/sfxge/sfxge_mcdi.c user/dchagin/lemul/sys/dev/sfxge/sfxge_port.c user/dchagin/lemul/sys/dev/sfxge/sfxge_tx.c user/dchagin/lemul/sys/dev/sfxge/sfxge_tx.h user/dchagin/lemul/sys/dev/smc/if_smc.c user/dchagin/lemul/sys/dev/sound/usb/uaudio.c user/dchagin/lemul/sys/dev/uart/uart_bus_pci.c user/dchagin/lemul/sys/dev/usb/controller/xhci.c user/dchagin/lemul/sys/dev/usb/serial/u3g.c user/dchagin/lemul/sys/dev/usb/usbdevs user/dchagin/lemul/sys/dev/vt/font/vt_mouse_cursor.c user/dchagin/lemul/sys/dev/vt/hw/vga/vt_vga.c user/dchagin/lemul/sys/dev/wpi/if_wpi.c user/dchagin/lemul/sys/dev/wpi/if_wpireg.h user/dchagin/lemul/sys/dev/wpi/if_wpivar.h user/dchagin/lemul/sys/fs/autofs/autofs.c user/dchagin/lemul/sys/fs/autofs/autofs_ioctl.h user/dchagin/lemul/sys/i386/i386/apic_vector.s user/dchagin/lemul/sys/i386/i386/db_disasm.c user/dchagin/lemul/sys/i386/i386/genassym.c user/dchagin/lemul/sys/i386/i386/mp_machdep.c user/dchagin/lemul/sys/i386/include/cpufunc.h user/dchagin/lemul/sys/kern/init_main.c user/dchagin/lemul/sys/kern/kern_sig.c user/dchagin/lemul/sys/kern/kern_timeout.c user/dchagin/lemul/sys/kern/subr_bus.c user/dchagin/lemul/sys/kern/subr_hints.c user/dchagin/lemul/sys/kern/sysv_shm.c user/dchagin/lemul/sys/kern/uipc_shm.c user/dchagin/lemul/sys/kern/vfs_mount.c user/dchagin/lemul/sys/modules/Makefile user/dchagin/lemul/sys/modules/cxgbe/Makefile user/dchagin/lemul/sys/modules/dtrace/Makefile user/dchagin/lemul/sys/modules/dtrace/dtrace/Makefile user/dchagin/lemul/sys/modules/wpi/Makefile user/dchagin/lemul/sys/netgraph/ng_base.c user/dchagin/lemul/sys/netinet/if_ether.c user/dchagin/lemul/sys/netinet/in.c user/dchagin/lemul/sys/netinet6/in6.c user/dchagin/lemul/sys/netinet6/nd6.c user/dchagin/lemul/sys/netpfil/ipfw/ip_fw_iface.c (contents, props changed) user/dchagin/lemul/sys/netpfil/ipfw/ip_fw_nat.c user/dchagin/lemul/sys/netpfil/ipfw/ip_fw_private.h user/dchagin/lemul/sys/netpfil/ipfw/ip_fw_table.c user/dchagin/lemul/sys/netpfil/ipfw/ip_fw_table_algo.c user/dchagin/lemul/sys/ofed/include/linux/gfp.h user/dchagin/lemul/sys/ofed/include/linux/kernel.h user/dchagin/lemul/sys/ofed/include/linux/kref.h user/dchagin/lemul/sys/ofed/include/linux/pci.h user/dchagin/lemul/sys/powerpc/aim/locore32.S user/dchagin/lemul/sys/powerpc/aim/machdep.c user/dchagin/lemul/sys/powerpc/aim/mmu_oea.c user/dchagin/lemul/sys/powerpc/conf/NOTES user/dchagin/lemul/sys/powerpc/include/cpu.h user/dchagin/lemul/sys/powerpc/ofw/ofw_syscons.c user/dchagin/lemul/sys/powerpc/powerpc/swtch64.S user/dchagin/lemul/sys/powerpc/pseries/mmu_phyp.c user/dchagin/lemul/sys/powerpc/pseries/platform_chrp.c user/dchagin/lemul/sys/powerpc/pseries/xics.c user/dchagin/lemul/sys/sys/bitset.h user/dchagin/lemul/sys/sys/bus.h user/dchagin/lemul/sys/sys/callout.h user/dchagin/lemul/sys/sys/copyright.h user/dchagin/lemul/sys/sys/cpuset.h user/dchagin/lemul/sys/sys/disk.h user/dchagin/lemul/sys/sys/param.h user/dchagin/lemul/sys/sys/sockbuf.h user/dchagin/lemul/sys/sys/systm.h user/dchagin/lemul/sys/ufs/ffs/ffs_softdep.c user/dchagin/lemul/sys/x86/acpica/madt.c user/dchagin/lemul/sys/x86/include/apicreg.h user/dchagin/lemul/sys/x86/include/apicvar.h user/dchagin/lemul/sys/x86/include/specialreg.h user/dchagin/lemul/sys/x86/iommu/intel_drv.c user/dchagin/lemul/sys/x86/iommu/intel_reg.h user/dchagin/lemul/sys/x86/iommu/intel_utils.c user/dchagin/lemul/sys/x86/x86/io_apic.c user/dchagin/lemul/sys/x86/x86/local_apic.c user/dchagin/lemul/sys/x86/xen/xen_apic.c user/dchagin/lemul/tools/build/mk/OptionalObsoleteFiles.inc user/dchagin/lemul/tools/tools/makeroot/makeroot.8 user/dchagin/lemul/tools/tools/makeroot/makeroot.sh user/dchagin/lemul/tools/tools/nanobsd/gateworks/Files/root/.profile user/dchagin/lemul/tools/tools/nanobsd/pcengines/Files/root/.cshrc user/dchagin/lemul/tools/tools/nanobsd/pcengines/Files/root/.login user/dchagin/lemul/tools/tools/nanobsd/rescue/Files/root/.cshrc user/dchagin/lemul/tools/tools/netmap/pkt-gen.c user/dchagin/lemul/usr.bin/ctlstat/ctlstat.c user/dchagin/lemul/usr.bin/ktrdump/ktrdump.8 user/dchagin/lemul/usr.bin/ktrdump/ktrdump.c user/dchagin/lemul/usr.bin/svn/svn/Makefile user/dchagin/lemul/usr.bin/w/w.c user/dchagin/lemul/usr.bin/wc/wc.c user/dchagin/lemul/usr.bin/whereis/pathnames.h user/dchagin/lemul/usr.bin/whereis/whereis.1 user/dchagin/lemul/usr.bin/whereis/whereis.c user/dchagin/lemul/usr.bin/xz/Makefile user/dchagin/lemul/usr.sbin/Makefile user/dchagin/lemul/usr.sbin/bluetooth/hccontrol/hccontrol.8 user/dchagin/lemul/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 user/dchagin/lemul/usr.sbin/bsdconfig/console/INDEX user/dchagin/lemul/usr.sbin/bsdconfig/include/messages.subr user/dchagin/lemul/usr.sbin/bsdconfig/includes/INDEX user/dchagin/lemul/usr.sbin/bsdconfig/networking/share/device.subr user/dchagin/lemul/usr.sbin/bsdconfig/share/dialog.subr user/dchagin/lemul/usr.sbin/bsdconfig/share/keymap.subr user/dchagin/lemul/usr.sbin/bsdconfig/timezone/share/continents.subr user/dchagin/lemul/usr.sbin/bsdconfig/timezone/share/countries.subr user/dchagin/lemul/usr.sbin/bsdconfig/timezone/timezone user/dchagin/lemul/usr.sbin/bsdconfig/usermgmt/share/user.subr user/dchagin/lemul/usr.sbin/ctladm/ctladm.8 user/dchagin/lemul/usr.sbin/ctladm/ctladm.c user/dchagin/lemul/usr.sbin/ctld/ctl.conf.5 user/dchagin/lemul/usr.sbin/ctld/ctld.c user/dchagin/lemul/usr.sbin/ctld/ctld.h user/dchagin/lemul/usr.sbin/ctld/discovery.c user/dchagin/lemul/usr.sbin/ctld/kernel.c user/dchagin/lemul/usr.sbin/ctld/keys.c user/dchagin/lemul/usr.sbin/ctld/login.c user/dchagin/lemul/usr.sbin/ctld/parse.y user/dchagin/lemul/usr.sbin/ctld/token.l user/dchagin/lemul/usr.sbin/devinfo/devinfo.c user/dchagin/lemul/usr.sbin/flowctl/flowctl.c user/dchagin/lemul/usr.sbin/freebsd-update/freebsd-update.sh user/dchagin/lemul/usr.sbin/gssd/Makefile user/dchagin/lemul/usr.sbin/gssd/gssd.c user/dchagin/lemul/usr.sbin/iscsid/iscsid.c user/dchagin/lemul/usr.sbin/iscsid/iscsid.h user/dchagin/lemul/usr.sbin/iscsid/keys.c user/dchagin/lemul/usr.sbin/jail/command.c user/dchagin/lemul/usr.sbin/jail/config.c user/dchagin/lemul/usr.sbin/jail/jail.8 user/dchagin/lemul/usr.sbin/jail/jail.c user/dchagin/lemul/usr.sbin/jail/jailp.h user/dchagin/lemul/usr.sbin/mountd/mountd.c user/dchagin/lemul/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh user/dchagin/lemul/usr.sbin/pw/tests/Makefile user/dchagin/lemul/usr.sbin/syslogd/syslogd.c Directory Properties: user/dchagin/lemul/ (props changed) user/dchagin/lemul/cddl/ (props changed) user/dchagin/lemul/cddl/contrib/opensolaris/ (props changed) user/dchagin/lemul/contrib/binutils/ (props changed) user/dchagin/lemul/contrib/elftoolchain/ (props changed) user/dchagin/lemul/contrib/mdocml/ (props changed) user/dchagin/lemul/contrib/top/ (props changed) user/dchagin/lemul/contrib/xz/ (props changed) user/dchagin/lemul/etc/ (props changed) user/dchagin/lemul/include/ (props changed) user/dchagin/lemul/lib/libc/ (props changed) user/dchagin/lemul/sbin/ (props changed) user/dchagin/lemul/sbin/ipfw/ (props changed) user/dchagin/lemul/share/ (props changed) user/dchagin/lemul/share/man/man4/ (props changed) user/dchagin/lemul/sys/ (props changed) user/dchagin/lemul/sys/amd64/vmm/ (props changed) user/dchagin/lemul/sys/boot/ (props changed) user/dchagin/lemul/sys/cddl/contrib/opensolaris/ (props changed) user/dchagin/lemul/sys/conf/ (props changed) user/dchagin/lemul/sys/contrib/dev/acpica/ (props changed) user/dchagin/lemul/sys/contrib/dev/acpica/include/ (props changed) user/dchagin/lemul/usr.sbin/jail/ (props changed) Modified: user/dchagin/lemul/Makefile.inc1 ============================================================================== --- user/dchagin/lemul/Makefile.inc1 Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/Makefile.inc1 Sat Feb 14 08:20:31 2015 (r278745) @@ -50,10 +50,6 @@ .include <bsd.arch.inc.mk> .include <bsd.compiler.mk> -# We must do share/info early so that installation of info `dir' -# entries works correctly. Do it first since it is less likely to -# grow dependencies on include and lib than vice versa. -# # We must do lib/ and libexec/ before bin/, because if installworld # installs a new /bin/sh, the 'make' command will *immediately* # use that new version. And the new (dynamically-linked) /bin/sh @@ -63,7 +59,7 @@ SRCDIR?= ${.CURDIR} .if defined(SUBDIR_OVERRIDE) SUBDIR= ${SUBDIR_OVERRIDE} .else -SUBDIR= share/info lib libexec +SUBDIR= lib libexec SUBDIR+=bin .if ${MK_GAMES} != "no" SUBDIR+=games @@ -193,9 +189,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} @@ -811,9 +806,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 @@ -823,7 +815,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 @@ -1671,6 +1663,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: user/dchagin/lemul/ObsoleteFiles.inc ============================================================================== --- user/dchagin/lemul/ObsoleteFiles.inc Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/ObsoleteFiles.inc Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/UPDATING ============================================================================== --- user/dchagin/lemul/UPDATING Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/UPDATING Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/bin/pkill/tests/pgrep-j_test.sh ============================================================================== --- user/dchagin/lemul/bin/pkill/tests/pgrep-j_test.sh Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/bin/pkill/tests/pgrep-j_test.sh Sat Feb 14 08:20:31 2015 (r278745) @@ -4,94 +4,87 @@ jail_name_to_jid() { local check_name="$1" - ( - line="$(jls -n 2> /dev/null | grep name=$check_name )" - for nv in $line; do - local name="${nv%=*}" - if [ "${name}" = "jid" ]; then - eval $nv - echo $jid - break - fi - done - ) + jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g' } base=pgrep_j_test +if [ `id -u` -ne 0 ]; then + echo "1..0 # skip Test needs uid 0." + exit 0 +fi + echo "1..3" +sleep=$(pwd)/sleep.txt +ln -sf /bin/sleep $sleep + name="pgrep -j <jid>" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & +sleep_amount=5 +jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount & - jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & +jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & +for i in `seq 1 10`; do jid1=$(jail_name_to_jid ${base}_1_1) jid2=$(jail_name_to_jid ${base}_1_2) jid="${jid1},${jid2}" - pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)" - pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ - $(cat ${PWD}/${base}_1_2.pid) | sort) - if [ "$pid1" = "$pid2" ]; then - echo "ok 1 - $name" - else - echo "not ok 1 - $name" - 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) - rm -f $sleep + case "$jid" in + [0-9]+,[0-9]+) + break + ;; + esac + sleep 0.1 +done + +pid1="$(pgrep -f -x -j "$jid" "$sleep $sleep_amount" | sort)" +pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ + $(cat ${PWD}/${base}_1_2.pid) | sort) +if [ "$pid1" = "$pid2" ]; then + echo "ok 1 - $name" else - echo "ok 1 - $name # skip Test needs uid 0." + 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) +wait name="pgrep -j any" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & - - jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & - - sleep 2 - pid1="$(pgrep -f -x -j any "$sleep 5" | sort)" - pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \ - $(cat ${PWD}/${base}_2_2.pid) | sort) - if [ "$pid1" = "$pid2" ]; then - echo "ok 2 - $name" - else - echo "not ok 2 - $name" - 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) - rm -f $sleep +sleep_amount=6 +jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount & + +sleep 2 +pid1="$(pgrep -f -x -j any "$sleep $sleep_amount" | sort)" +pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \ + $(cat ${PWD}/${base}_2_2.pid) | sort) +if [ "$pid1" = "$pid2" ]; then + echo "ok 2 - $name" else - echo "ok 2 - $name # skip Test needs uid 0." + 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) +wait name="pgrep -j none" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - daemon -p ${PWD}/${base}_3_1.pid $sleep 5 & - jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & - sleep 2 - pid="$(pgrep -f -x -j none "$sleep 5")" - if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then - echo "ok 3 - $name" - else - echo "not ok 3 - $name" - fi - rm -f $sleep - [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) - [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) +sleep_amount=7 +daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount & +jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount & +sleep 2 +pid="$(pgrep -f -x -j none "$sleep $sleep_amount")" +if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then + echo "ok 3 - $name" else - echo "ok 3 - $name # skip Test needs uid 0." + echo "not ok 3 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'" fi +[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) +[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) + +rm -f $sleep Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Sat Feb 14 08:20:31 2015 (r278745) @@ -26,6 +26,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include <sys/ioctl.h> + #include <assert.h> #include <setjmp.h> #include <signal.h> @@ -69,7 +71,7 @@ main(int argc, char *argv[]) */ if (sigsetjmp(env, 1) == 0) { for (;;) - (void) ioctl(-1, -1, NULL); + (void) ioctl(-1, 0, NULL); } /* @@ -80,20 +82,19 @@ main(int argc, char *argv[]) fds[n++] = open(file, O_WRONLY); fds[n++] = open(file, O_RDWR); - fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | O_DSYNC | - O_LARGEFILE | O_NOCTTY | O_NONBLOCK | O_NDELAY | O_RSYNC | - O_SYNC | O_TRUNC | O_XATTR, 0666); + fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | + O_NOCTTY | O_NONBLOCK | O_NDELAY | O_SYNC | O_TRUNC | 0666); fds[n++] = open(file, O_RDWR); (void) lseek(fds[n - 1], 123, SEEK_SET); /* * Once we have all the file descriptors in the state we want to test, - * issue a bogus ioctl() on each fd with cmd -1 and arg NULL to whack + * issue a bogus ioctl() on each fd with cmd 0 and arg NULL to whack * our DTrace script into recording the content of the fds[] array. */ for (i = 0; i < n; i++) - (void) ioctl(fds[i], -1, NULL); + (void) ioctl(fds[i], 0, NULL); assert(n <= sizeof (fds) / sizeof (fds[0])); exit(0); Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Sat Feb 14 08:20:31 2015 (r278745) @@ -36,7 +36,7 @@ syscall::ioctl:entry } syscall::ioctl:entry -/pid == $1 && arg0 != -1u && arg1 == -1u && arg2 == NULL/ +/pid == $1 && arg0 != -1u && arg1 == 0 && arg2 == NULL/ { printf("fds[%d] fi_name = %s\n", arg0, fds[arg0].fi_name); printf("fds[%d] fi_dirname = %s\n", arg0, fds[arg0].fi_dirname); Modified: user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/cddl/lib/Makefile ============================================================================== --- user/dchagin/lemul/cddl/lib/Makefile Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/cddl/lib/Makefile Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/cddl/lib/libdtrace/Makefile ============================================================================== --- user/dchagin/lemul/cddl/lib/libdtrace/Makefile Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/cddl/lib/libdtrace/Makefile Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/cddl/usr.sbin/Makefile ============================================================================== --- user/dchagin/lemul/cddl/usr.sbin/Makefile Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/cddl/usr.sbin/Makefile Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/contrib/binutils/ld/scripttempl/elf.sc ============================================================================== --- user/dchagin/lemul/contrib/binutils/ld/scripttempl/elf.sc Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/binutils/ld/scripttempl/elf.sc Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/contrib/elftoolchain/libdwarf/_libdwarf.h ============================================================================== --- user/dchagin/lemul/contrib/elftoolchain/libdwarf/_libdwarf.h Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/elftoolchain/libdwarf/_libdwarf.h Sat Feb 14 08:20:31 2015 (r278745) @@ -49,7 +49,7 @@ struct _libdwarf_globals { Dwarf_Handler errhand; Dwarf_Ptr errarg; - int applyrela; + int applyreloc; }; extern struct _libdwarf_globals _libdwarf; Modified: user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_reloc.c ============================================================================== --- user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_reloc.c Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_reloc.c Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 ============================================================================== --- user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf.c ============================================================================== --- user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf.c Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf.c Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf.h ============================================================================== --- user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf.h Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf.h Sat Feb 14 08:20:31 2015 (r278745) @@ -439,6 +439,7 @@ enum Dwarf_ISA { DW_ISA_SPARC, DW_ISA_X86, DW_ISA_X86_64, + DW_ISA_AARCH64, DW_ISA_MAX }; Modified: user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c ============================================================================== --- user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf_reloc.c ============================================================================== --- user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/contrib/mdocml/lib.in ============================================================================== --- user/dchagin/lemul/contrib/mdocml/lib.in Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/mdocml/lib.in Sat Feb 14 08:20:31 2015 (r278745) @@ -41,6 +41,7 @@ LINE("libcrypt", "Crypt Library (libcryp LINE("libcurses", "Curses Library (libcurses, \\-lcurses)") LINE("libcuse", "Userland Character Device Library (libcuse, \\-lcuse)") LINE("libdevattr", "Device attribute and event library (libdevattr, \\-ldevattr)") +LINE("libdevctl", "Device Control Library (libdevctl, \\-ldevctl)") LINE("libdevinfo", "Device and Resource Information Utility Library (libdevinfo, \\-ldevinfo)") LINE("libdevstat", "Device Statistics Library (libdevstat, \\-ldevstat)") LINE("libdisk", "Interface to Slice and Partition Labels Library (libdisk, \\-ldisk)") Modified: user/dchagin/lemul/contrib/netbsd-tests/games/t_factor.sh ============================================================================== --- user/dchagin/lemul/contrib/netbsd-tests/games/t_factor.sh Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/netbsd-tests/games/t_factor.sh Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/contrib/top/utils.c ============================================================================== --- user/dchagin/lemul/contrib/top/utils.c Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/top/utils.c Sat Feb 14 08:20:31 2015 (r278745) @@ -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: user/dchagin/lemul/contrib/xz/ChangeLog ============================================================================== --- user/dchagin/lemul/contrib/xz/ChangeLog Sat Feb 14 06:58:32 2015 (r278744) +++ user/dchagin/lemul/contrib/xz/ChangeLog Sat Feb 14 08:20:31 2015 (r278745) @@ -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> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502140820.t1E8KWwD011108>