Date: Fri, 13 Jan 2017 09:32:12 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312060 - in projects/bsnmp-ipv6-mib: . contrib/elftoolchain/libelftc contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/netbsd-tests contrib/netbsd-tests/crypto/l... Message-ID: <201701130932.v0D9WCRH077955@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Fri Jan 13 09:32:11 2017 New Revision: 312060 URL: https://svnweb.freebsd.org/changeset/base/312060 Log: MFhead@r312059 Added: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/test/test_read_pax_schily_xattr.c - copied unchanged from r312059, head/contrib/libarchive/libarchive/test/test_read_pax_schily_xattr.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/test/test_read_pax_schily_xattr.tar.uu - copied unchanged from r312059, head/contrib/libarchive/libarchive/test/test_read_pax_schily_xattr.tar.uu projects/bsnmp-ipv6-mib/contrib/netbsd-tests/dev/cgd/t_cgd_3des.c - copied unchanged from r312059, head/contrib/netbsd-tests/dev/cgd/t_cgd_3des.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/dev/cgd/t_cgd_aes.c - copied unchanged from r312059, head/contrib/netbsd-tests/dev/cgd/t_cgd_aes.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/dev/cgd/t_cgd_blowfish.c - copied unchanged from r312059, head/contrib/netbsd-tests/dev/cgd/t_cgd_blowfish.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/kernel/msg.h - copied unchanged from r312059, head/contrib/netbsd-tests/kernel/msg.h projects/bsnmp-ipv6-mib/contrib/netbsd-tests/kernel/t_ptrace.c - copied unchanged from r312059, head/contrib/netbsd-tests/kernel/t_ptrace.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/kernel/t_ptrace_wait.c - copied unchanged from r312059, head/contrib/netbsd-tests/kernel/t_ptrace_wait.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/kernel/t_ptrace_wait.h - copied unchanged from r312059, head/contrib/netbsd-tests/kernel/t_ptrace_wait.h projects/bsnmp-ipv6-mib/contrib/netbsd-tests/kernel/t_ptrace_wait3.c - copied unchanged from r312059, head/contrib/netbsd-tests/kernel/t_ptrace_wait3.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/kernel/t_ptrace_wait4.c - copied unchanged from r312059, head/contrib/netbsd-tests/kernel/t_ptrace_wait4.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/kernel/t_ptrace_wait6.c - copied unchanged from r312059, head/contrib/netbsd-tests/kernel/t_ptrace_wait6.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/kernel/t_ptrace_waitid.c - copied unchanged from r312059, head/contrib/netbsd-tests/kernel/t_ptrace_waitid.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/kernel/t_ptrace_waitpid.c - copied unchanged from r312059, head/contrib/netbsd-tests/kernel/t_ptrace_waitpid.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_clock_nanosleep.c - copied unchanged from r312059, head/contrib/netbsd-tests/lib/libc/sys/t_clock_nanosleep.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c - copied unchanged from r312059, head/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc_wnohang.c - copied unchanged from r312059, head/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc_wnohang.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libm/t_casinh.c - copied unchanged from r312059, head/contrib/netbsd-tests/lib/libm/t_casinh.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libm/t_fe_round.c - copied unchanged from r312059, head/contrib/netbsd-tests/lib/libm/t_fe_round.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libm/t_ilogb.c - copied unchanged from r312059, head/contrib/netbsd-tests/lib/libm/t_ilogb.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_timedmutex.c - copied unchanged from r312059, head/contrib/netbsd-tests/lib/libpthread/t_timedmutex.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/net/t_mtudisc.sh - copied unchanged from r312059, head/contrib/netbsd-tests/net/net/t_mtudisc.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/net/t_mtudisc6.sh - copied unchanged from r312059, head/contrib/netbsd-tests/net/net/t_mtudisc6.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/net/t_ping6_opts.sh - copied unchanged from r312059, head/contrib/netbsd-tests/net/net/t_ping6_opts.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/net_common.sh - copied unchanged from r312059, head/contrib/netbsd-tests/net/net_common.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_anon_union.c - copied unchanged from r312059, head/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_anon_union.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_cast.c - copied unchanged from r312059, head/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_cast.c projects/bsnmp-ipv6-mib/sys/dev/e1000/em_txrx.c - copied unchanged from r312059, head/sys/dev/e1000/em_txrx.c projects/bsnmp-ipv6-mib/sys/dev/e1000/igb_txrx.c - copied unchanged from r312059, head/sys/dev/e1000/igb_txrx.c projects/bsnmp-ipv6-mib/sys/dev/sdhci/sdhci_acpi.c - copied unchanged from r312059, head/sys/dev/sdhci/sdhci_acpi.c projects/bsnmp-ipv6-mib/sys/modules/sdhci_acpi/ - copied from r312059, head/sys/modules/sdhci_acpi/ projects/bsnmp-ipv6-mib/tests/sys/geom/class/gate/ggate_test.sh - copied unchanged from r312059, head/tests/sys/geom/class/gate/ggate_test.sh projects/bsnmp-ipv6-mib/usr.bin/tail/tests/ - copied from r312059, head/usr.bin/tail/tests/ projects/bsnmp-ipv6-mib/usr.sbin/fstyp/exfat.c - copied unchanged from r312059, head/usr.sbin/fstyp/exfat.c projects/bsnmp-ipv6-mib/usr.sbin/fstyp/tests/dfr-01-xfat.img.bz2 - copied unchanged from r312059, head/usr.sbin/fstyp/tests/dfr-01-xfat.img.bz2 Deleted: projects/bsnmp-ipv6-mib/sys/dev/e1000/if_igb.c projects/bsnmp-ipv6-mib/sys/dev/e1000/if_igb.h projects/bsnmp-ipv6-mib/sys/dev/e1000/if_lem.c projects/bsnmp-ipv6-mib/sys/dev/e1000/if_lem.h projects/bsnmp-ipv6-mib/sys/modules/igb/ projects/bsnmp-ipv6-mib/tests/sys/geom/class/gate/1_test.sh projects/bsnmp-ipv6-mib/tests/sys/geom/class/gate/2_test.sh projects/bsnmp-ipv6-mib/tests/sys/geom/class/gate/3_test.sh projects/bsnmp-ipv6-mib/tests/sys/geom/class/gate/conf.sh Modified: projects/bsnmp-ipv6-mib/ObsoleteFiles.inc projects/bsnmp-ipv6-mib/UPDATING projects/bsnmp-ipv6-mib/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_acl.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_disk_posix.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_filter_lzop.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_7zip.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_lha.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_rar.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_tar.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_warc.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_zip.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string.h projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string_composition.h projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_add_filter_xz.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_disk_acl.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_7zip.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_pax.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_xar.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_zip.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/test/test_archive_read_add_passphrase.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/test/test_compat_uudecode.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/test/test_read_format_cpio_afio.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/test/test_read_format_zip_traditional_encryption_data.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes_large.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/test/test_sparse_basic.c projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/xxhash.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/crypto/libcrypto/t_libcrypto.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/crypto/libcrypto/t_pubkey.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/dev/audio/h_pad.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/dev/audio/t_pad_output.bz2.uue projects/bsnmp-ipv6-mib/contrib/netbsd-tests/fs/ffs/ffs_common.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/fs/fifofs/t_fifo.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/fs/psshfs/t_psshfs.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/fs/puffs/t_basic.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/fs/vfs/t_vnops.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/h_macros.h projects/bsnmp-ipv6-mib/contrib/netbsd-tests/kernel/t_mqueue.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/arch/sparc64/exec_prot_support.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/arch/sparc64/return_one.S projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_faccessat.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_fchownat.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_fexecve.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_fstatat.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_mkfifoat.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_mknodat.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_o_search.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_openat.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_readlinkat.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_unlinkat.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/c063/t_utimensat.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/db/h_db.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/db/t_db.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/t_assert.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/t_dir.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/t_fnmatch.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/t_ftok.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/t_sethostname.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/t_sleep.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/t_time.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/gen/t_vis.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/regex/debug.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/stdio/t_printf.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/string/t_memcpy.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/string/t_memmem.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/string/t_strchr.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/string/t_strerror.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sync/cpp_atomic_ops_linkable.cc projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_access.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_chroot.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_mincore.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_mmap.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_unlink.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_wait.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/t_cdb.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libm/t_ldexp.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libm/t_precision.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/h_common.h projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_mutex.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/librumpclient/h_execthr.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/librumphijack/t_tcpip.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libusbhid/t_usbhid.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/arp/t_arp.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/arp/t_dad.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/icmp/t_icmp6_redirect.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/icmp/t_icmp_redirect.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/if/t_compat.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/if/t_ifconfig.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/if_bridge/t_bridge.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/if_gif/t_gif.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/if_pppoe/t_pppoe.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/if_tap/t_tap.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/mcast/t_mcast.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/ndp/t_dad.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/ndp/t_ndp.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/ndp/t_ra.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/net/t_forwarding.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/net/t_ipaddress.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/net/t_ipv6_lifetime.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/net/t_ipv6address.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/route/t_change.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/route/t_flags.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/route/t_flags6.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/net/route/t_route.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/rump/modautoload/t_modautoload.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/rump/rumpkern/t_lwproc.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/sys/net/t_print.c projects/bsnmp-ipv6-mib/contrib/netbsd-tests/usr.bin/config/t_config.sh projects/bsnmp-ipv6-mib/contrib/netbsd-tests/usr.bin/netpgpverify/t_netpgpverify.sh projects/bsnmp-ipv6-mib/crypto/openssh/serverloop.c projects/bsnmp-ipv6-mib/crypto/openssh/ssh-agent.1 projects/bsnmp-ipv6-mib/crypto/openssh/ssh-agent.c projects/bsnmp-ipv6-mib/crypto/openssh/ssh_config projects/bsnmp-ipv6-mib/crypto/openssh/ssh_config.5 projects/bsnmp-ipv6-mib/crypto/openssh/sshd_config projects/bsnmp-ipv6-mib/crypto/openssh/sshd_config.5 projects/bsnmp-ipv6-mib/crypto/openssh/version.h projects/bsnmp-ipv6-mib/etc/mtree/BSD.tests.dist projects/bsnmp-ipv6-mib/etc/rc.d/ntpdate projects/bsnmp-ipv6-mib/lib/libarchive/tests/Makefile projects/bsnmp-ipv6-mib/lib/libc/gen/tcsendbreak.3 projects/bsnmp-ipv6-mib/lib/libc/tests/db/Makefile projects/bsnmp-ipv6-mib/lib/libc/tests/gen/Makefile projects/bsnmp-ipv6-mib/lib/libc/tests/stdlib/Makefile projects/bsnmp-ipv6-mib/lib/libc/tests/sys/Makefile projects/bsnmp-ipv6-mib/lib/libnetbsd/sys/cdefs.h projects/bsnmp-ipv6-mib/lib/libthr/tests/Makefile projects/bsnmp-ipv6-mib/lib/msun/tests/Makefile projects/bsnmp-ipv6-mib/libexec/rtld-elf/rtld.c projects/bsnmp-ipv6-mib/libexec/rtld-elf/rtld_lock.c projects/bsnmp-ipv6-mib/sbin/camcontrol/modeedit.c projects/bsnmp-ipv6-mib/share/man/man4/em.4 projects/bsnmp-ipv6-mib/share/man/man4/sfxge.4 projects/bsnmp-ipv6-mib/share/man/man4/tty.4 projects/bsnmp-ipv6-mib/share/misc/committers-ports.dot projects/bsnmp-ipv6-mib/sys/amd64/amd64/pmap.c projects/bsnmp-ipv6-mib/sys/amd64/conf/GENERIC projects/bsnmp-ipv6-mib/sys/arm64/conf/GENERIC projects/bsnmp-ipv6-mib/sys/boot/common/reloc_elf.c projects/bsnmp-ipv6-mib/sys/boot/efi/Makefile.inc projects/bsnmp-ipv6-mib/sys/boot/efi/boot1/boot_module.h projects/bsnmp-ipv6-mib/sys/boot/efi/include/efiapi.h projects/bsnmp-ipv6-mib/sys/boot/efi/loader/arch/arm/ldscript.arm projects/bsnmp-ipv6-mib/sys/boot/efi/loader/arch/arm/start.S projects/bsnmp-ipv6-mib/sys/cam/cam_ccb.h projects/bsnmp-ipv6-mib/sys/cam/cam_periph.c projects/bsnmp-ipv6-mib/sys/cam/ctl/ctl.c projects/bsnmp-ipv6-mib/sys/cam/ctl/ctl_frontend_cam_sim.c projects/bsnmp-ipv6-mib/sys/cam/ctl/ctl_ha.c projects/bsnmp-ipv6-mib/sys/cam/ctl/scsi_ctl.c projects/bsnmp-ipv6-mib/sys/cam/nvme/nvme_da.c projects/bsnmp-ipv6-mib/sys/cam/scsi/scsi_all.c projects/bsnmp-ipv6-mib/sys/cam/scsi/scsi_xpt.c projects/bsnmp-ipv6-mib/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/bsnmp-ipv6-mib/sys/conf/NOTES projects/bsnmp-ipv6-mib/sys/conf/files projects/bsnmp-ipv6-mib/sys/conf/files.arm64 projects/bsnmp-ipv6-mib/sys/conf/makeLINT.mk projects/bsnmp-ipv6-mib/sys/conf/options projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/tables/tbxface.c projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/include/acpixf.h projects/bsnmp-ipv6-mib/sys/contrib/ipfilter/netinet/ip_fil.h projects/bsnmp-ipv6-mib/sys/ddb/db_input.c projects/bsnmp-ipv6-mib/sys/dev/ahci/ahci_generic.c projects/bsnmp-ipv6-mib/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/bsnmp-ipv6-mib/sys/dev/cxgbe/common/t4_msg.h projects/bsnmp-ipv6-mib/sys/dev/cxgbe/iw_cxgbe/provider.c projects/bsnmp-ipv6-mib/sys/dev/cxgbe/t4_main.c projects/bsnmp-ipv6-mib/sys/dev/cxgbe/t4_sge.c projects/bsnmp-ipv6-mib/sys/dev/cxgbe/tom/t4_connect.c projects/bsnmp-ipv6-mib/sys/dev/cxgbe/tom/t4_cpl_io.c projects/bsnmp-ipv6-mib/sys/dev/cxgbe/tom/t4_ddp.c projects/bsnmp-ipv6-mib/sys/dev/cxgbe/tom/t4_listen.c projects/bsnmp-ipv6-mib/sys/dev/cxgbe/tom/t4_tom.c projects/bsnmp-ipv6-mib/sys/dev/cxgbe/tom/t4_tom.h projects/bsnmp-ipv6-mib/sys/dev/e1000/if_em.c projects/bsnmp-ipv6-mib/sys/dev/e1000/if_em.h projects/bsnmp-ipv6-mib/sys/dev/mmc/mmcsd.c projects/bsnmp-ipv6-mib/sys/dev/mpr/mpr_table.c projects/bsnmp-ipv6-mib/sys/dev/mps/mps_table.c projects/bsnmp-ipv6-mib/sys/dev/nand/nand_geom.c projects/bsnmp-ipv6-mib/sys/dev/netmap/netmap_generic.c projects/bsnmp-ipv6-mib/sys/dev/ntb/if_ntb/if_ntb.c projects/bsnmp-ipv6-mib/sys/dev/nvd/nvd.c projects/bsnmp-ipv6-mib/sys/dev/rtwn/pci/rtwn_pci_attach.c projects/bsnmp-ipv6-mib/sys/dev/rtwn/rtl8188e/r88e_fw.c projects/bsnmp-ipv6-mib/sys/dev/rtwn/rtl8192c/r92c_fw.c projects/bsnmp-ipv6-mib/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h projects/bsnmp-ipv6-mib/sys/dev/rtwn/usb/rtwn_usb_ep.c projects/bsnmp-ipv6-mib/sys/dev/sdhci/sdhci_fdt_gpio.c projects/bsnmp-ipv6-mib/sys/dev/sfxge/common/efx_mcdi.c projects/bsnmp-ipv6-mib/sys/dev/sfxge/common/efx_mcdi.h projects/bsnmp-ipv6-mib/sys/dev/sfxge/sfxge.h projects/bsnmp-ipv6-mib/sys/dev/sfxge/sfxge_port.c projects/bsnmp-ipv6-mib/sys/dev/sfxge/sfxge_tx.c projects/bsnmp-ipv6-mib/sys/dev/uart/uart_bus_pci.c projects/bsnmp-ipv6-mib/sys/dev/uart/uart_core.c projects/bsnmp-ipv6-mib/sys/dev/usb/controller/ehci_imx.c projects/bsnmp-ipv6-mib/sys/dev/usb/misc/udbp.c projects/bsnmp-ipv6-mib/sys/dev/usb/usbdevs projects/bsnmp-ipv6-mib/sys/dev/usb/wlan/if_rsu.c projects/bsnmp-ipv6-mib/sys/fs/cd9660/cd9660_vfsops.c projects/bsnmp-ipv6-mib/sys/fs/cd9660/iso.h projects/bsnmp-ipv6-mib/sys/fs/pseudofs/pseudofs_vncache.c projects/bsnmp-ipv6-mib/sys/geom/geom_disk.c projects/bsnmp-ipv6-mib/sys/geom/geom_disk.h projects/bsnmp-ipv6-mib/sys/geom/raid/md_ddf.c projects/bsnmp-ipv6-mib/sys/geom/raid/md_promise.c projects/bsnmp-ipv6-mib/sys/i386/conf/GENERIC projects/bsnmp-ipv6-mib/sys/i386/i386/pmap.c projects/bsnmp-ipv6-mib/sys/kern/tty.c projects/bsnmp-ipv6-mib/sys/kern/uipc_mbuf2.c projects/bsnmp-ipv6-mib/sys/kern/vfs_bio.c projects/bsnmp-ipv6-mib/sys/libkern/bcmp.c projects/bsnmp-ipv6-mib/sys/libkern/bsearch.c projects/bsnmp-ipv6-mib/sys/libkern/iconv_ucs.c projects/bsnmp-ipv6-mib/sys/libkern/iconv_xlat16.c projects/bsnmp-ipv6-mib/sys/libkern/memmem.c projects/bsnmp-ipv6-mib/sys/libkern/qdivrem.c projects/bsnmp-ipv6-mib/sys/libkern/qsort.c projects/bsnmp-ipv6-mib/sys/libkern/random.c projects/bsnmp-ipv6-mib/sys/libkern/scanc.c projects/bsnmp-ipv6-mib/sys/libkern/strcmp.c projects/bsnmp-ipv6-mib/sys/libkern/strncpy.c projects/bsnmp-ipv6-mib/sys/mips/conf/OCTEON1 projects/bsnmp-ipv6-mib/sys/modules/Makefile projects/bsnmp-ipv6-mib/sys/modules/ahci/Makefile projects/bsnmp-ipv6-mib/sys/modules/em/Makefile projects/bsnmp-ipv6-mib/sys/net/iflib.c projects/bsnmp-ipv6-mib/sys/net80211/_ieee80211.h projects/bsnmp-ipv6-mib/sys/net80211/ieee80211.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211.h projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_adhoc.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_hostap.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_ht.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_ht.h projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_input.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_node.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_output.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_proto.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_scan_sta.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_sta.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_tdma.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_var.h projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_vht.c projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_vht.h projects/bsnmp-ipv6-mib/sys/netinet/tcp_var.h projects/bsnmp-ipv6-mib/sys/netpfil/ipfw/ip_dummynet.c projects/bsnmp-ipv6-mib/sys/powerpc/conf/GENERIC64 projects/bsnmp-ipv6-mib/sys/powerpc/include/asm.h projects/bsnmp-ipv6-mib/sys/sparc64/include/atomic.h projects/bsnmp-ipv6-mib/sys/sys/cdefs.h projects/bsnmp-ipv6-mib/sys/sys/tty.h projects/bsnmp-ipv6-mib/sys/tools/embed_mfs.sh projects/bsnmp-ipv6-mib/sys/vm/vnode_pager.c projects/bsnmp-ipv6-mib/sys/x86/x86/mca.c projects/bsnmp-ipv6-mib/tests/sys/geom/class/gate/Makefile projects/bsnmp-ipv6-mib/tools/build/mk/OptionalObsoleteFiles.inc projects/bsnmp-ipv6-mib/usr.bin/calendar/calendars/calendar.freebsd projects/bsnmp-ipv6-mib/usr.bin/fortune/fortune/fortune.6 projects/bsnmp-ipv6-mib/usr.bin/rpcgen/rpc_cout.c projects/bsnmp-ipv6-mib/usr.bin/rpcgen/rpc_svcout.c projects/bsnmp-ipv6-mib/usr.bin/tail/Makefile projects/bsnmp-ipv6-mib/usr.bin/tail/reverse.c projects/bsnmp-ipv6-mib/usr.sbin/crunch/crunchide/exec_elf32.c projects/bsnmp-ipv6-mib/usr.sbin/fstyp/Makefile projects/bsnmp-ipv6-mib/usr.sbin/fstyp/fstyp.8 projects/bsnmp-ipv6-mib/usr.sbin/fstyp/fstyp.c projects/bsnmp-ipv6-mib/usr.sbin/fstyp/fstyp.h projects/bsnmp-ipv6-mib/usr.sbin/fstyp/tests/Makefile projects/bsnmp-ipv6-mib/usr.sbin/fstyp/tests/fstyp_test.sh projects/bsnmp-ipv6-mib/usr.sbin/mfiutil/mfi_evt.c projects/bsnmp-ipv6-mib/usr.sbin/pciconf/pciconf.c projects/bsnmp-ipv6-mib/usr.sbin/route6d/route6d.c projects/bsnmp-ipv6-mib/usr.sbin/syslogd/syslogd.c Directory Properties: projects/bsnmp-ipv6-mib/ (props changed) projects/bsnmp-ipv6-mib/contrib/elftoolchain/ (props changed) projects/bsnmp-ipv6-mib/contrib/libarchive/ (props changed) projects/bsnmp-ipv6-mib/contrib/netbsd-tests/ (props changed) projects/bsnmp-ipv6-mib/crypto/openssh/ (props changed) projects/bsnmp-ipv6-mib/sys/cddl/contrib/opensolaris/ (props changed) projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/ (props changed) projects/bsnmp-ipv6-mib/sys/contrib/ipfilter/ (props changed) Modified: projects/bsnmp-ipv6-mib/ObsoleteFiles.inc ============================================================================== --- projects/bsnmp-ipv6-mib/ObsoleteFiles.inc Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/ObsoleteFiles.inc Fri Jan 13 09:32:11 2017 (r312060) @@ -38,6 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20170110: Four files from ggate tests consolidated into one +OLD_FILES+=usr/tests/sys/geom/class/gate/1_test +OLD_FILES+=usr/tests/sys/geom/class/gate/2_test +OLD_FILES+=usr/tests/sys/geom/class/gate/3_test +OLD_FILES+=usr/tests/sys/geom/class/gate/conf.sh # 20170103: libbsnmptools.so made into an INTERNALLIB OLD_FILES+=usr/lib/libbsnmptools.a OLD_FILES+=usr/lib/libbsnmptools_p.a @@ -48,8 +53,8 @@ OLD_FILES+=usr/share/man/man3/sysdecode_ # 20161230: libarchive ACL pax test renamed to test_acl_pax_posix1e.tar.uu OLD_FILES+=usr/tests/lib/libarchive/test_acl_pax.tar.uu # 20161229: Three files from gnop tests consolidated into one -OLD_FILES+=usr/tests/sys/geom/class/nop/1_test.sh -OLD_FILES+=usr/tests/sys/geom/class/nop/2_test.sh +OLD_FILES+=usr/tests/sys/geom/class/nop/1_test +OLD_FILES+=usr/tests/sys/geom/class/nop/2_test OLD_FILES+=usr/tests/sys/geom/class/nop/conf.sh # 20161217: new clang import which bumps version from 3.9.0 to 3.9.1. OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/allocator_interface.h @@ -2260,7 +2265,6 @@ OLD_LIBS+=usr/lib32/private/libyaml.so.1 OLD_FILES+=usr/lib32/private/libyaml_p.a # 20140216: new clang import which bumps version from 3.3 to 3.4. OLD_FILES+=usr/bin/llvm-prof -OLD_FILES+=usr/bin/llvm-ranlib OLD_FILES+=usr/include/clang/3.3/__wmmintrin_aes.h OLD_FILES+=usr/include/clang/3.3/__wmmintrin_pclmul.h OLD_FILES+=usr/include/clang/3.3/altivec.h Modified: projects/bsnmp-ipv6-mib/UPDATING ============================================================================== --- projects/bsnmp-ipv6-mib/UPDATING Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/UPDATING Fri Jan 13 09:32:11 2017 (r312060) @@ -51,6 +51,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 ****************************** SPECIAL WARNING: ****************************** +20170112: + The EM_MULTIQUEUE kernel configuration option is deprecated now that + the em(4) driver conforms to iflib specifications. + +20170109: + The igb(4), em(4) and lem(4) ethernet drivers are now implemented via + IFLIB. If you have a custom kernel configuration that excludes em(4) + but you use igb(4), you need to re-add em(4) to your custom configuration. + 20161217: Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 3.9.1. Please see the 20141231 entry below for information about prerequisites Modified: projects/bsnmp-ipv6-mib/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c Fri Jan 13 09:32:11 2017 (r312060) @@ -501,6 +501,120 @@ elftc_reloc_type_str(unsigned int mach, case 116: return "R_PPC_EMB_RELSDA"; } break; + case EM_PPC64: + switch(type) { + case 0: return "R_PPC64_NONE"; + case 1: return "R_PPC64_ADDR32"; + case 2: return "R_PPC64_ADDR24"; + case 3: return "R_PPC64_ADDR16"; + case 4: return "R_PPC64_ADDR16_LO"; + case 5: return "R_PPC64_ADDR16_HI"; + case 6: return "R_PPC64_ADDR16_HA"; + case 7: return "R_PPC64_ADDR14"; + case 8: return "R_PPC64_ADDR14_BRTAKEN"; + case 9: return "R_PPC64_ADDR14_BRNTAKEN"; + case 10: return "R_PPC64_REL24"; + case 11: return "R_PPC64_REL14"; + case 12: return "R_PPC64_REL14_BRTAKEN"; + case 13: return "R_PPC64_REL14_BRNTAKEN"; + case 14: return "R_PPC64_GOT16"; + case 15: return "R_PPC64_GOT16_LO"; + case 16: return "R_PPC64_GOT16_HI"; + case 17: return "R_PPC64_GOT16_HA"; + case 19: return "R_PPC64_COPY"; + case 20: return "R_PPC64_GLOB_DAT"; + case 21: return "R_PPC64_JMP_SLOT"; + case 22: return "R_PPC64_RELATIVE"; + case 24: return "R_PPC64_UADDR32"; + case 25: return "R_PPC64_UADDR16"; + case 26: return "R_PPC64_REL32"; + case 27: return "R_PPC64_PLT32"; + case 28: return "R_PPC64_PLTREL32"; + case 29: return "R_PPC64_PLT16_LO"; + case 30: return "R_PPC64_PLT16_HI"; + case 31: return "R_PPC64_PLT16_HA"; + case 33: return "R_PPC64_SECTOFF"; + case 34: return "R_PPC64_SECTOFF_LO"; + case 35: return "R_PPC64_SECTOFF_HI"; + case 36: return "R_PPC64_SECTOFF_HA"; + case 37: return "R_PPC64_ADDR30"; + case 38: return "R_PPC64_ADDR64"; + case 39: return "R_PPC64_ADDR16_HIGHER"; + case 40: return "R_PPC64_ADDR16_HIGHERA"; + case 41: return "R_PPC64_ADDR16_HIGHEST"; + case 42: return "R_PPC64_ADDR16_HIGHESTA"; + case 43: return "R_PPC64_UADDR64"; + case 44: return "R_PPC64_REL64"; + case 45: return "R_PPC64_PLT64"; + case 46: return "R_PPC64_PLTREL64"; + case 47: return "R_PPC64_TOC16"; + case 48: return "R_PPC64_TOC16_LO"; + case 49: return "R_PPC64_TOC16_HI"; + case 50: return "R_PPC64_TOC16_HA"; + case 51: return "R_PPC64_TOC"; + case 52: return "R_PPC64_PLTGOT16"; + case 53: return "R_PPC64_PLTGOT16_LO"; + case 54: return "R_PPC64_PLTGOT16_HI"; + case 55: return "R_PPC64_PLTGOT16_HA"; + case 56: return "R_PPC64_ADDR16_DS"; + case 57: return "R_PPC64_ADDR16_LO_DS"; + case 58: return "R_PPC64_GOT16_DS"; + case 59: return "R_PPC64_GOT16_LO_DS"; + case 60: return "R_PPC64_PLT16_LO_DS"; + case 61: return "R_PPC64_SECTOFF_DS"; + case 62: return "R_PPC64_SECTOFF_LO_DS"; + case 63: return "R_PPC64_TOC16_DS"; + case 64: return "R_PPC64_TOC16_LO_DS"; + case 65: return "R_PPC64_PLTGOT16_DS"; + case 66: return "R_PPC64_PLTGOT16_LO_DS"; + case 67: return "R_PPC64_TLS"; + case 68: return "R_PPC64_DTPMOD64"; + case 69: return "R_PPC64_TPREL16"; + case 70: return "R_PPC64_TPREL16_LO"; + case 71: return "R_PPC64_TPREL16_HI"; + case 72: return "R_PPC64_TPREL16_HA"; + case 73: return "R_PPC64_TPREL64"; + case 74: return "R_PPC64_DTPREL16"; + case 75: return "R_PPC64_DTPREL16_LO"; + case 76: return "R_PPC64_DTPREL16_HI"; + case 77: return "R_PPC64_DTPREL16_HA"; + case 78: return "R_PPC64_DTPREL64"; + case 79: return "R_PPC64_GOT_TLSGD16"; + case 80: return "R_PPC64_GOT_TLSGD16_LO"; + case 81: return "R_PPC64_GOT_TLSGD16_HI"; + case 82: return "R_PPC64_GOT_TLSGD16_HA"; + case 83: return "R_PPC64_GOT_TLSLD16"; + case 84: return "R_PPC64_GOT_TLSLD16_LO"; + case 85: return "R_PPC64_GOT_TLSLD16_HI"; + case 86: return "R_PPC64_GOT_TLSLD16_HA"; + case 87: return "R_PPC64_GOT_TPREL16_DS"; + case 88: return "R_PPC64_GOT_TPREL16_LO_DS"; + case 89: return "R_PPC64_GOT_TPREL16_HI"; + case 90: return "R_PPC64_GOT_TPREL16_HA"; + case 91: return "R_PPC64_GOT_DTPREL16_DS"; + case 92: return "R_PPC64_GOT_DTPREL16_LO_DS"; + case 93: return "R_PPC64_GOT_DTPREL16_HI"; + case 94: return "R_PPC64_GOT_DTPREL16_HA"; + case 95: return "R_PPC64_TPREL16_DS"; + case 96: return "R_PPC64_TPREL16_LO_DS"; + case 97: return "R_PPC64_TPREL16_HIGHER"; + case 98: return "R_PPC64_TPREL16_HIGHERA"; + case 99: return "R_PPC64_TPREL16_HIGHEST"; + case 100: return "R_PPC64_TPREL16_HIGHESTA"; + case 101: return "R_PPC64_DTPREL16_DS"; + case 102: return "R_PPC64_DTPREL16_LO_DS"; + case 103: return "R_PPC64_DTPREL16_HIGHER"; + case 104: return "R_PPC64_DTPREL16_HIGHERA"; + case 105: return "R_PPC64_DTPREL16_HIGHEST"; + case 106: return "R_PPC64_DTPREL16_HIGHESTA"; + case 107: return "R_PPC64_TLSGD"; + case 108: return "R_PPC64_TLSLD"; + case 249: return "R_PPC64_REL16"; + case 250: return "R_PPC64_REL16_LO"; + case 251: return "R_PPC64_REL16_HI"; + case 252: return "R_PPC64_REL16_HA"; + } + break; case EM_RISCV: switch(type) { case 0: return "R_RISCV_NONE"; @@ -550,6 +664,37 @@ elftc_reloc_type_str(unsigned int mach, case 48: return "R_RISCV_GPREL_S"; } break; + case EM_S390: + switch (type) { + case 0: return "R_390_NONE"; + case 1: return "R_390_8"; + case 2: return "R_390_12"; + case 3: return "R_390_16"; + case 4: return "R_390_32"; + case 5: return "R_390_PC32"; + case 6: return "R_390_GOT12"; + case 7: return "R_390_GOT32"; + case 8: return "R_390_PLT32"; + case 9: return "R_390_COPY"; + case 10: return "R_390_GLOB_DAT"; + case 11: return "R_390_JMP_SLOT"; + case 12: return "R_390_RELATIVE"; + case 13: return "R_390_GOTOFF"; + case 14: return "R_390_GOTPC"; + case 15: return "R_390_GOT16"; + case 16: return "R_390_PC16"; + case 17: return "R_390_PC16DBL"; + case 18: return "R_390_PLT16DBL"; + case 19: return "R_390_PC32DBL"; + case 20: return "R_390_PLT32DBL"; + case 21: return "R_390_GOTPCDBL"; + case 22: return "R_390_64"; + case 23: return "R_390_PC64"; + case 24: return "R_390_GOT64"; + case 25: return "R_390_PLT64"; + case 26: return "R_390_GOTENT"; + } + break; case EM_SPARC: case EM_SPARCV9: switch(type) { Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_acl.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_acl.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_acl.c Fri Jan 13 09:32:11 2017 (r312060) @@ -786,7 +786,8 @@ append_entry_w(wchar_t **wp, const wchar } else if (tag == ARCHIVE_ENTRY_ACL_USER || tag == ARCHIVE_ENTRY_ACL_GROUP) { append_id_w(wp, id); - id = -1; + if ((type & ARCHIVE_ENTRY_ACL_TYPE_NFS4) == 0) + id = -1; } /* Solaris style has no second colon after other and mask */ if (((flags & ARCHIVE_ENTRY_ACL_STYLE_SOLARIS) == 0) @@ -1042,7 +1043,8 @@ append_entry(char **p, const char *prefi } else if (tag == ARCHIVE_ENTRY_ACL_USER || tag == ARCHIVE_ENTRY_ACL_GROUP) { append_id(p, id); - id = -1; + if ((type & ARCHIVE_ENTRY_ACL_TYPE_NFS4) == 0) + id = -1; } /* Solaris style has no second colon after other and mask */ if (((flags & ARCHIVE_ENTRY_ACL_STYLE_SOLARIS) == 0) @@ -1328,6 +1330,7 @@ archive_acl_from_text_w(struct archive_a tag == ARCHIVE_ENTRY_ACL_GROUP) { n = 1; name = field[1]; + isint_w(name.start, name.end, &id); } else n = 0; @@ -1799,6 +1802,7 @@ archive_acl_from_text_l(struct archive_a tag == ARCHIVE_ENTRY_ACL_GROUP) { n = 1; name = field[1]; + isint(name.start, name.end, &id); } else n = 0; Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Fri Jan 13 09:32:11 2017 (r312060) @@ -526,6 +526,11 @@ setup_acls(struct archive_read_disk *a, /* Only directories can have default ACLs. */ if (S_ISDIR(archive_entry_mode(entry))) { +#if HAVE_ACL_GET_FD_NP + if (*fd >= 0) + acl = acl_get_fd_np(*fd, ACL_TYPE_DEFAULT); + else +#endif acl = acl_get_file(accpath, ACL_TYPE_DEFAULT); if (acl != NULL) { r = translate_acl(a, entry, acl, @@ -581,7 +586,10 @@ static struct { {ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_FILE_INHERIT}, {ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT, ACL_ENTRY_DIRECTORY_INHERIT}, {ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT}, - {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY} + {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY}, + {ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS, ACL_ENTRY_SUCCESSFUL_ACCESS}, + {ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS, ACL_ENTRY_FAILED_ACCESS}, + {ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED} }; #endif static int Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_disk_posix.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_disk_posix.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_disk_posix.c Fri Jan 13 09:32:11 2017 (r312060) @@ -675,7 +675,7 @@ setup_suitable_read_buffer(struct archiv asize = cf->min_xfer_size; /* Increase a buffer size up to 64K bytes in - * a proper incremant size. */ + * a proper increment size. */ while (asize < 1024*64) asize += incr; /* Take a margin to adjust to the filesystem @@ -1656,7 +1656,7 @@ setup_current_filesystem(struct archive_ archive_set_error(&a->archive, errno, "statvfs failed"); return (ARCHIVE_FAILED); } else if (xr == 1) { - /* Usuall come here unless NetBSD supports _PC_REC_XFER_ALIGN + /* Usually come here unless NetBSD supports _PC_REC_XFER_ALIGN * for pathconf() function. */ t->current_filesystem->xfer_align = sfs.f_frsize; t->current_filesystem->max_xfer_size = -1; @@ -1944,7 +1944,7 @@ setup_current_filesystem(struct archive_ if (nm == -1) # endif /* _PC_NAME_MAX */ /* - * Some sysmtes (HP-UX or others?) incorrectly defined + * Some systems (HP-UX or others?) incorrectly defined * NAME_MAX macro to be a smaller value. */ # if defined(NAME_MAX) && NAME_MAX >= 255 Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c Fri Jan 13 09:32:11 2017 (r312060) @@ -180,7 +180,7 @@ lz4_reader_bid(struct archive_read_filte return (0); bits_checked += 8; BD = buffer[5]; - /* A block maximum size shuld be more than 3. */ + /* A block maximum size should be more than 3. */ if (((BD & 0x70) >> 4) < 4) return (0); /* Reserved bits must be "0". */ @@ -417,7 +417,7 @@ lz4_filter_read_descriptor(struct archiv /* Reserved bits must be zero. */ if (bd & 0x8f) goto malformed_error; - /* Get a maxinum block size. */ + /* Get a maximum block size. */ switch (read_buf[1] >> 4) { case 4: /* 64 KB */ state->flags.block_maximum_size = 64 * 1024; @@ -627,7 +627,7 @@ lz4_filter_read_default_stream(struct ar if (state->stage == SELECT_STREAM) { state->stage = READ_DEFAULT_STREAM; - /* First, read a desciprtor. */ + /* First, read a descriptor. */ if((ret = lz4_filter_read_descriptor(self)) != ARCHIVE_OK) return (ret); state->stage = READ_DEFAULT_BLOCK; Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_filter_lzop.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_filter_lzop.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_filter_lzop.c Fri Jan 13 09:32:11 2017 (r312060) @@ -436,7 +436,7 @@ lzop_filter_read(struct archive_read_fil } /* - * Drive lzo uncompresison. + * Drive lzo uncompression. */ out_size = (lzo_uint)state->uncompressed_size; r = lzo1x_decompress_safe(b, (lzo_uint)state->compressed_size, Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_7zip.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_7zip.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_7zip.c Fri Jan 13 09:32:11 2017 (r312060) @@ -552,7 +552,7 @@ skip_sfx(struct archive_read *a, ssize_t /* * If bytes_avail > SFX_MIN_ADDR we do not have to call * __archive_read_seek() at this time since we have - * alredy had enough data. + * already had enough data. */ if (bytes_avail > SFX_MIN_ADDR) __archive_read_consume(a, SFX_MIN_ADDR); @@ -760,7 +760,7 @@ archive_read_format_7zip_read_header(str symsize += size; } if (symsize == 0) { - /* If there is no synname, handle it as a regular + /* If there is no symname, handle it as a regular * file. */ zip_entry->mode &= ~AE_IFMT; zip_entry->mode |= AE_IFREG; @@ -3288,7 +3288,7 @@ read_stream(struct archive_read *a, cons return (r); /* - * Skip the bytes we alrady has skipped in skip_stream(). + * Skip the bytes we already has skipped in skip_stream(). */ while (skip_bytes) { ssize_t skipped; @@ -3506,7 +3506,7 @@ setup_decode_folder(struct archive_read return (ARCHIVE_FATAL); } - /* Allocate memory for the decorded data of a sub + /* Allocate memory for the decoded data of a sub * stream. */ b[i] = malloc((size_t)zip->folder_outbytes_remaining); if (b[i] == NULL) { @@ -3591,7 +3591,7 @@ skip_stream(struct archive_read *a, size if (zip->folder_index == 0) { /* * Optimization for a list mode. - * Avoid unncecessary decoding operations. + * Avoid unnecessary decoding operations. */ zip->si.ci.folders[zip->entry->folderIndex].skipped_bytes += skip_bytes; Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c Fri Jan 13 09:32:11 2017 (r312060) @@ -322,7 +322,7 @@ struct iso9660 { struct archive_string pathname; char seenRockridge; /* Set true if RR extensions are used. */ - char seenSUSP; /* Set true if SUSP is beging used. */ + char seenSUSP; /* Set true if SUSP is being used. */ char seenJoliet; unsigned char suspOffset; Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_lha.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_lha.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_lha.c Fri Jan 13 09:32:11 2017 (r312060) @@ -1711,7 +1711,7 @@ lha_crc16(uint16_t crc, const void *pp, */ for (;len >= 8; len -= 8) { /* This if statement expects compiler optimization will - * remove the stament which will not be executed. */ + * remove the statement which will not be executed. */ #undef bswap16 #if defined(_MSC_VER) && _MSC_VER >= 1400 /* Visual Studio */ # define bswap16(x) _byteswap_ushort(x) Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_rar.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_rar.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_rar.c Fri Jan 13 09:32:11 2017 (r312060) @@ -906,7 +906,7 @@ archive_read_format_rar_read_header(stru sizeof(rar->reserved2)); } - /* Main header is password encrytped, so we cannot read any + /* Main header is password encrypted, so we cannot read any file names or any other info about files from the header. */ if (rar->main_flags & MHD_PASSWORD) { Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_tar.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_tar.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_tar.c Fri Jan 13 09:32:11 2017 (r312060) @@ -204,13 +204,14 @@ static int archive_read_format_tar_read_ struct archive_entry *); static int checksum(struct archive_read *, const void *); static int pax_attribute(struct archive_read *, struct tar *, - struct archive_entry *, const char *key, const char *value); + struct archive_entry *, const char *key, const char *value, + size_t value_length); static int pax_attribute_acl(struct archive_read *, struct tar *, struct archive_entry *, const char *, int); static int pax_attribute_xattr(struct archive_entry *, const char *, const char *); static int pax_header(struct archive_read *, struct tar *, - struct archive_entry *, char *attr); + struct archive_entry *, struct archive_string *); static void pax_time(const char *, int64_t *sec, long *nanos); static ssize_t readline(struct archive_read *, struct tar *, const char **, ssize_t limit, size_t *); @@ -1483,7 +1484,7 @@ header_pax_extensions(struct archive_rea * and then skip any fields in the standard header that were * defined in the pax header. */ - err2 = pax_header(a, tar, entry, tar->pax_header.s); + err2 = pax_header(a, tar, entry, &tar->pax_header); err = err_combine(err, err2); tar->entry_padding = 0x1ff & (-tar->entry_bytes_remaining); return (err); @@ -1564,16 +1565,17 @@ header_ustar(struct archive_read *a, str */ static int pax_header(struct archive_read *a, struct tar *tar, - struct archive_entry *entry, char *attr) + struct archive_entry *entry, struct archive_string *in_as) { - size_t attr_length, l, line_length; + size_t attr_length, l, line_length, value_length; char *p; char *key, *value; struct archive_string *as; struct archive_string_conv *sconv; int err, err2; + char *attr = in_as->s; - attr_length = strlen(attr); + attr_length = in_as->length; tar->pax_hdrcharset_binary = 0; archive_string_empty(&(tar->entry_gname)); archive_string_empty(&(tar->entry_linkpath)); @@ -1638,11 +1640,13 @@ pax_header(struct archive_read *a, struc } *p = '\0'; - /* Identify null-terminated 'value' portion. */ value = p + 1; + /* Some values may be binary data */ + value_length = attr + line_length - 1 - value; + /* Identify this attribute and set it in the entry. */ - err2 = pax_attribute(a, tar, entry, key, value); + err2 = pax_attribute(a, tar, entry, key, value, value_length); if (err2 == ARCHIVE_FATAL) return (err2); err = err_combine(err, err2); @@ -1764,6 +1768,20 @@ pax_attribute_xattr(struct archive_entry } static int +pax_attribute_schily_xattr(struct archive_entry *entry, + const char *name, const char *value, size_t value_length) +{ + if (strlen(name) < 14 || (memcmp(name, "SCHILY.xattr.", 13)) != 0) + return 1; + + name += 13; + + archive_entry_xattr_add_entry(entry, name, value, value_length); + + return 0; +} + +static int pax_attribute_acl(struct archive_read *a, struct tar *tar, struct archive_entry *entry, const char *value, int type) { @@ -1824,7 +1842,7 @@ pax_attribute_acl(struct archive_read *a */ static int pax_attribute(struct archive_read *a, struct tar *tar, - struct archive_entry *entry, const char *key, const char *value) + struct archive_entry *entry, const char *key, const char *value, size_t value_length) { int64_t s; long n; @@ -1961,6 +1979,9 @@ pax_attribute(struct archive_read *a, st } else if (strcmp(key, "SCHILY.realsize") == 0) { tar->realsize = tar_atol10(value, strlen(value)); archive_entry_set_size(entry, tar->realsize); + } else if (strncmp(key, "SCHILY.xattr.", 13) == 0) { + pax_attribute_schily_xattr(entry, key, value, + value_length); } else if (strcmp(key, "SUN.holesdata") == 0) { /* A Solaris extension for sparse. */ r = solaris_sparse_parse(a, tar, entry, value); Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_warc.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_warc.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_warc.c Fri Jan 13 09:32:11 2017 (r312060) @@ -88,7 +88,7 @@ typedef enum { WT_RVIS, /* conversion, unsupported */ WT_CONV, - /* continutation, unsupported at the moment */ + /* continuation, unsupported at the moment */ WT_CONT, /* invalid type */ LAST_WT @@ -562,7 +562,7 @@ xstrpisotime(const char *s, char **endpt goto out; } - /* massage TM to fulfill some of POSIX' contraints */ + /* massage TM to fulfill some of POSIX' constraints */ tm.tm_year -= 1900; tm.tm_mon--; Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_zip.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_zip.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_read_support_format_zip.c Fri Jan 13 09:32:11 2017 (r312060) @@ -199,7 +199,7 @@ struct zip { struct trad_enc_ctx tctx; char tctx_valid; - /* WinZip AES decyption. */ + /* WinZip AES decryption. */ /* Contexts used for AES decryption. */ archive_crypto_ctx cctx; char cctx_valid; @@ -242,7 +242,7 @@ trad_enc_update_keys(struct trad_enc_ctx } static uint8_t -trad_enc_decypt_byte(struct trad_enc_ctx *ctx) +trad_enc_decrypt_byte(struct trad_enc_ctx *ctx) { unsigned temp = ctx->keys[2] | 2; return (uint8_t)((temp * (temp ^ 1)) >> 8) & 0xff; @@ -257,7 +257,7 @@ trad_enc_decrypt_update(struct trad_enc_ max = (unsigned)((in_len < out_len)? in_len: out_len); for (i = 0; i < max; i++) { - uint8_t t = in[i] ^ trad_enc_decypt_byte(ctx); + uint8_t t = in[i] ^ trad_enc_decrypt_byte(ctx); out[i] = t; trad_enc_update_keys(ctx, t); } @@ -710,7 +710,7 @@ process_extra(struct archive_read *a, co break; } case 0x9901: - /* WinZIp AES extra data field. */ + /* WinZip AES extra data field. */ if (p[offset + 2] == 'A' && p[offset + 3] == 'E') { /* Vendor version. */ zip_entry->aes_extra.vendor = @@ -1518,7 +1518,7 @@ read_decryption_header(struct archive_re case 0x6720:/* Blowfish */ case 0x6721:/* Twofish */ case 0x6801:/* RC4 */ - /* Suuported encryption algorithm. */ + /* Supported encryption algorithm. */ break; default: archive_set_error(&a->archive, @@ -1627,7 +1627,7 @@ read_decryption_header(struct archive_re __archive_read_consume(a, 4); /*return (ARCHIVE_OK); - * This is not fully implemnted yet.*/ + * This is not fully implemented yet.*/ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, "Encrypted file is unsupported"); return (ARCHIVE_FAILED); @@ -1709,7 +1709,7 @@ init_traditional_PKWARE_decryption(struc } /* - * Initialize ctx for Traditional PKWARE Decyption. + * Initialize ctx for Traditional PKWARE Decryption. */ r = trad_enc_init(&zip->tctx, passphrase, strlen(passphrase), p, ENC_HEADER_SIZE, &crcchk); Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string.c Fri Jan 13 09:32:11 2017 (r312060) @@ -219,6 +219,12 @@ archive_wstring_append(struct archive_ws return (as); } +struct archive_string * +archive_array_append(struct archive_string *as, const char *p, size_t s) +{ + return archive_string_append(as, p, s); +} + void archive_string_concat(struct archive_string *dest, struct archive_string *src) { @@ -597,7 +603,7 @@ archive_wstring_append_from_mbs(struct a wcs = dest->s + dest->length; /* * We cannot use mbsrtowcs/mbstowcs here because those may convert - * extra MBS when strlen(p) > len and one wide character consis of + * extra MBS when strlen(p) > len and one wide character consists of * multi bytes. */ while (*mbs && mbs_length > 0) { @@ -1248,7 +1254,7 @@ create_sconv_object(const char *fc, cons sc->cd = iconv_open(tc, fc); if (sc->cd == (iconv_t)-1 && (sc->flag & SCONV_BEST_EFFORT)) { /* - * Unfortunaly, all of iconv implements do support + * Unfortunately, all of iconv implements do support * "CP932" character-set, so we should use "SJIS" * instead if iconv_open failed. */ @@ -1261,7 +1267,7 @@ create_sconv_object(const char *fc, cons /* * archive_mstring on Windows directly convert multi-bytes * into archive_wstring in order not to depend on locale - * so that you can do a I18N programing. This will be + * so that you can do a I18N programming. This will be * used only in archive_mstring_copy_mbs_len_l so far. */ if (flag & SCONV_FROM_CHARSET) { @@ -1726,7 +1732,7 @@ archive_string_conversion_from_charset(s * in tar or zip files. But mbstowcs/wcstombs(CRT) usually use CP_ACP * unless you use setlocale(LC_ALL, ".OCP")(specify CP_OEMCP). * So we should make a string conversion between CP_ACP and CP_OEMCP - * for compatibillty. + * for compatibility. */ #if defined(_WIN32) && !defined(__CYGWIN__) struct archive_string_conv * @@ -2220,7 +2226,7 @@ best_effort_strncat_in_locale(struct arc /* * If a character is ASCII, this just copies it. If not, this - * assigns '?' charater instead but in UTF-8 locale this assigns + * assigns '?' character instead but in UTF-8 locale this assigns * byte sequence 0xEF 0xBD 0xBD, which are code point U+FFFD, * a Replacement Character in Unicode. */ @@ -2554,7 +2560,7 @@ utf16_to_unicode(uint32_t *pwc, const ch /* * Surrogate pair values(0xd800 through 0xdfff) are only - * used by UTF-16, so, after above culculation, the code + * used by UTF-16, so, after above calculation, the code * must not be surrogate values, and Unicode has no codes * larger than 0x10ffff. Thus, those are not legal Unicode * values. @@ -2903,7 +2909,7 @@ get_nfc(uint32_t uc, uint32_t uc2) /* * Normalize UTF-8/UTF-16BE characters to Form C and copy the result. * - * TODO: Convert composition exclusions,which are never converted + * TODO: Convert composition exclusions, which are never converted * from NFC,NFD,NFKC and NFKD, to Form C. */ static int @@ -3437,7 +3443,7 @@ strncat_from_utf8_libarchive2(struct arc } /* - * As libarchie 2.x, translates the UTF-8 characters into + * As libarchive 2.x, translates the UTF-8 characters into * wide-characters in the assumption that WCS is Unicode. */ if (n < 0) { @@ -3947,7 +3953,7 @@ archive_mstring_get_mbs_l(struct archive #if defined(_WIN32) && !defined(__CYGWIN__) /* - * Internationalization programing on Windows must use Wide + * Internationalization programming on Windows must use Wide * characters because Windows platform cannot make locale UTF-8. */ if (sc != NULL && (aes->aes_set & AES_SET_WCS) != 0) { @@ -4079,7 +4085,7 @@ archive_mstring_copy_mbs_len_l(struct ar archive_string_empty(&(aes->aes_utf8)); #if defined(_WIN32) && !defined(__CYGWIN__) /* - * Internationalization programing on Windows must use Wide + * Internationalization programming on Windows must use Wide * characters because Windows platform cannot make locale UTF-8. */ if (sc == NULL) { Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string.h ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string.h Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string.h Fri Jan 13 09:32:11 2017 (r312060) @@ -81,6 +81,10 @@ archive_strappend_char(struct archive_st struct archive_wstring * archive_wstrappend_wchar(struct archive_wstring *, wchar_t); +/* Append a raw array to an archive_string, resizing as necessary */ +struct archive_string * +archive_array_append(struct archive_string *, const char *, size_t); + /* Convert a Unicode string to current locale and append the result. */ /* Returns -1 if conversion fails. */ int Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string_composition.h ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string_composition.h Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_string_composition.h Fri Jan 13 09:32:11 2017 (r312060) @@ -1009,7 +1009,7 @@ static const char u_decomposable_blocks[ (((uc) > 0x1D244)?0:\ ccc_val[ccc_val_index[ccc_index[(uc)>>8]][((uc)>>4)&0x0F]][(uc)&0x0F]) -/* The table of the value of Canonical Cimbining Class */ +/* The table of the value of Canonical Combining Class */ static const unsigned char ccc_val[][16] = { /* idx=0: XXXX0 - XXXXF */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write.c Fri Jan 13 09:32:11 2017 (r312060) @@ -231,7 +231,7 @@ __archive_write_filter(struct archive_wr if (length == 0) return(ARCHIVE_OK); if (f->write == NULL) - /* If unset, a fatal error has already ocuured, so this filter + /* If unset, a fatal error has already occurred, so this filter * didn't open. We cannot write anything. */ return(ARCHIVE_FATAL); r = (f->write)(f, buff, length); Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_add_filter_xz.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_add_filter_xz.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_add_filter_xz.c Fri Jan 13 09:32:11 2017 (r312060) @@ -233,7 +233,7 @@ archive_compressor_xz_init_stream(struct if (f->code == ARCHIVE_FILTER_XZ) { #ifdef HAVE_LZMA_STREAM_ENCODER_MT if (data->threads != 1) { - bzero(&mt_options, sizeof(mt_options)); + memset(&mt_options, 0, sizeof(mt_options)); mt_options.threads = data->threads; mt_options.timeout = 300; mt_options.filters = data->lzmafilters; Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_disk_acl.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_disk_acl.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_disk_acl.c Fri Jan 13 09:32:11 2017 (r312060) @@ -124,7 +124,10 @@ static struct { {ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_FILE_INHERIT}, {ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT, ACL_ENTRY_DIRECTORY_INHERIT}, {ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT}, - {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY} + {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY}, + {ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS, ACL_ENTRY_SUCCESSFUL_ACCESS}, + {ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS, ACL_ENTRY_FAILED_ACCESS}, + {ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED} }; #endif @@ -292,29 +295,41 @@ set_acl(struct archive *a, int fd, const } /* Try restoring the ACL through 'fd' if we can. */ -#if HAVE_ACL_SET_FD - if (fd >= 0 && acl_type == ACL_TYPE_ACCESS && acl_set_fd(fd, acl) == 0) - ret = ARCHIVE_OK; - else -#else +#if HAVE_ACL_SET_FD_NP || HAVE_ACL_SET_FD #if HAVE_ACL_SET_FD_NP - if (fd >= 0 && acl_set_fd_np(fd, acl, acl_type) == 0) - ret = ARCHIVE_OK; - else -#endif -#endif + if (fd >= 0) { + if (acl_set_fd_np(fd, acl, acl_type) == 0) +#else /* HAVE_ACL_SET_FD */ + if (fd >= 0 && acl_type == ACL_TYPE_ACCESS) { + if (acl_set_fd(fd, acl) == 0) +#endif + ret = ARCHIVE_OK; + else { + if (errno == EOPNOTSUPP) { + /* Filesystem doesn't support ACLs */ + ret = ARCHIVE_OK; + } else { + archive_set_error(a, errno, + "Failed to set %s acl on fd", tname); + } + } + } else +#endif /* HAVE_ACL_SET_FD_NP || HAVE_ACL_SET_FD */ #if HAVE_ACL_SET_LINK_NP - if (acl_set_link_np(name, acl_type, acl) != 0) { - archive_set_error(a, errno, "Failed to set %s acl", tname); - ret = ARCHIVE_WARN; - } + if (acl_set_link_np(name, acl_type, acl) != 0) { #else /* TODO: Skip this if 'name' is a symlink. */ if (acl_set_file(name, acl_type, acl) != 0) { - archive_set_error(a, errno, "Failed to set %s acl", tname); - ret = ARCHIVE_WARN; - } #endif + if (errno == EOPNOTSUPP) { + /* Filesystem doesn't support ACLs */ + ret = ARCHIVE_OK; + } else { + archive_set_error(a, errno, "Failed to set %s acl", + tname); + ret = ARCHIVE_WARN; + } + } exit_free: acl_free(acl); return (ret); Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_7zip.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_7zip.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_7zip.c Fri Jan 13 09:32:11 2017 (r312060) @@ -1358,7 +1358,7 @@ make_header(struct archive_write *a, uin if (r < 0) return (r); - /* Write Nume size. */ + /* Write Name size. */ r = enc_uint64(a, zip->total_bytes_entry_name+1); if (r < 0) return (r); Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_pax.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_pax.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_pax.c Fri Jan 13 09:32:11 2017 (r312060) @@ -62,10 +62,17 @@ struct pax { struct sparse_block *sparse_tail; struct archive_string_conv *sconv_utf8; int opt_binary; + + unsigned flags; +#define WRITE_SCHILY_XATTR (1 << 0) +#define WRITE_LIBARCHIVE_XATTR (1 << 1) }; static void add_pax_attr(struct archive_string *, const char *key, const char *value); +static void add_pax_attr_binary(struct archive_string *, + const char *key, + const char *value, size_t value_len); static void add_pax_attr_int(struct archive_string *, const char *key, int64_t value); static void add_pax_attr_time(struct archive_string *, @@ -136,6 +143,8 @@ archive_write_set_format_pax(struct arch "Can't allocate pax data"); return (ARCHIVE_FATAL); } + pax->flags = WRITE_LIBARCHIVE_XATTR | WRITE_SCHILY_XATTR; + a->format_data = pax; a->format_name = "pax"; a->format_options = archive_write_pax_options; @@ -275,6 +284,17 @@ add_pax_attr_int(struct archive_string * static void add_pax_attr(struct archive_string *as, const char *key, const char *value) { + add_pax_attr_binary(as, key, value, strlen(value)); +} + +/* + * Add a key/value attribute to the pax header. This function handles + * binary values. + */ +static void +add_pax_attr_binary(struct archive_string *as, const char *key, + const char *value, size_t value_len) +{ int digits, i, len, next_ten; char tmp[1 + 3 * sizeof(int)]; /* < 3 base-10 digits per byte */ @@ -282,7 +302,7 @@ add_pax_attr(struct archive_string *as, * PAX attributes have the following layout: * <len> <space> <key> <=> <value> <nl> */ - len = 1 + (int)strlen(key) + 1 + (int)strlen(value) + 1; + len = 1 + (int)strlen(key) + 1 + (int)value_len + 1; /* * The <len> field includes the length of the <len> field, so @@ -313,21 +333,47 @@ add_pax_attr(struct archive_string *as, archive_strappend_char(as, ' '); archive_strcat(as, key); archive_strappend_char(as, '='); - archive_strcat(as, value); + archive_array_append(as, value, value_len); archive_strappend_char(as, '\n'); } +static void +archive_write_pax_header_xattr(struct pax *pax, const char *encoded_name, + const void *value, size_t value_len) +{ + struct archive_string s; + char *encoded_value; + + if (pax->flags & WRITE_LIBARCHIVE_XATTR) { + encoded_value = base64_encode((const char *)value, value_len); + + if (encoded_name != NULL && encoded_value != NULL) { + archive_string_init(&s); + archive_strcpy(&s, "LIBARCHIVE.xattr."); + archive_strcat(&s, encoded_name); + add_pax_attr(&(pax->pax_header), s.s, encoded_value); + archive_string_free(&s); + } + free(encoded_value); + } + if (pax->flags & WRITE_SCHILY_XATTR) { + archive_string_init(&s); + archive_strcpy(&s, "SCHILY.xattr."); + archive_strcat(&s, encoded_name); + add_pax_attr_binary(&(pax->pax_header), s.s, value, value_len); + archive_string_free(&s); + } +} + static int archive_write_pax_header_xattrs(struct archive_write *a, struct pax *pax, struct archive_entry *entry) { - struct archive_string s; int i = archive_entry_xattr_reset(entry); while (i--) { const char *name; const void *value; - char *encoded_value; char *url_encoded_name = NULL, *encoded_name = NULL; size_t size; int r; @@ -348,16 +394,9 @@ archive_write_pax_header_xattrs(struct a } } - encoded_value = base64_encode((const char *)value, size); + archive_write_pax_header_xattr(pax, encoded_name, + value, size); - if (encoded_name != NULL && encoded_value != NULL) { - archive_string_init(&s); - archive_strcpy(&s, "LIBARCHIVE.xattr."); - archive_strcat(&s, encoded_name); - add_pax_attr(&(pax->pax_header), s.s, encoded_value); - archive_string_free(&s); - } - free(encoded_value); } return (ARCHIVE_OK); } Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_xar.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_xar.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_xar.c Fri Jan 13 09:32:11 2017 (r312060) @@ -2913,7 +2913,7 @@ compression_init_encoder_xz(struct archi *strm = lzma_init_data; #ifdef HAVE_LZMA_STREAM_ENCODER_MT if (threads > 1) { - bzero(&mt_options, sizeof(mt_options)); + memset(&mt_options, 0, sizeof(mt_options)); mt_options.threads = threads; mt_options.timeout = 300; mt_options.filters = lzmafilters; Modified: projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_zip.c ============================================================================== --- projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_zip.c Fri Jan 13 09:19:09 2017 (r312059) +++ projects/bsnmp-ipv6-mib/contrib/libarchive/libarchive/archive_write_set_format_zip.c Fri Jan 13 09:32:11 2017 (r312060) @@ -878,7 +878,7 @@ archive_write_zip_header(struct archive_ || zip->entry_encryption == ENCRYPTION_WINZIP_AES256)) { memcpy(e, "\001\231\007\000\001\000AE", 8); - /* AES vendoer version AE-2 does not store a CRC. + /* AES vendor version AE-2 does not store a CRC. * WinZip 11 uses AE-1, which does store the CRC, * but it does not store the CRC when the file size * is less than 20 bytes. So we simulate what @@ -1013,7 +1013,7 @@ archive_write_zip_data(struct archive_wr if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701130932.v0D9WCRH077955>