Date: Fri, 17 Feb 2017 20:19:39 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r313896 - in projects/clang400-import: . bin/ls bin/pwd bin/sh contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/libpcap contrib/libpcap/bpf/net contrib/libpcap/c... Message-ID: <201702172019.v1HKJdDB091924@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Fri Feb 17 20:19:38 2017 New Revision: 313896 URL: https://svnweb.freebsd.org/changeset/base/313896 Log: Merge ^/head r313644 through r313895. Added: projects/clang400-import/contrib/libpcap/config/ - copied from r313895, head/contrib/libpcap/config/ projects/clang400-import/contrib/libpcap/configure.ac - copied unchanged from r313895, head/contrib/libpcap/configure.ac projects/clang400-import/contrib/libpcap/extract.h - copied unchanged from r313895, head/contrib/libpcap/extract.h projects/clang400-import/contrib/libpcap/fad-helpers.c - copied unchanged from r313895, head/contrib/libpcap/fad-helpers.c projects/clang400-import/contrib/libpcap/gen_version_c.sh - copied unchanged from r313895, head/contrib/libpcap/gen_version_c.sh projects/clang400-import/contrib/libpcap/gen_version_header.sh - copied unchanged from r313895, head/contrib/libpcap/gen_version_header.sh projects/clang400-import/contrib/libpcap/lbl/os-aix7.h - copied unchanged from r313895, head/contrib/libpcap/lbl/os-aix7.h projects/clang400-import/contrib/libpcap/missing/getopt.c - copied unchanged from r313895, head/contrib/libpcap/missing/getopt.c projects/clang400-import/contrib/libpcap/missing/getopt.h - copied unchanged from r313895, head/contrib/libpcap/missing/getopt.h projects/clang400-import/contrib/libpcap/missing/strtok_r.c - copied unchanged from r313895, head/contrib/libpcap/missing/strtok_r.c projects/clang400-import/contrib/libpcap/missing/win_snprintf.c - copied unchanged from r313895, head/contrib/libpcap/missing/win_snprintf.c projects/clang400-import/contrib/libpcap/nametoaddr.h - copied unchanged from r313895, head/contrib/libpcap/nametoaddr.h projects/clang400-import/contrib/libpcap/pcap-new.c - copied unchanged from r313895, head/contrib/libpcap/pcap-new.c projects/clang400-import/contrib/libpcap/pcap-rpcap.c - copied unchanged from r313895, head/contrib/libpcap/pcap-rpcap.c projects/clang400-import/contrib/libpcap/pcap-rpcap.h - copied unchanged from r313895, head/contrib/libpcap/pcap-rpcap.h projects/clang400-import/contrib/libpcap/pcap-tc.c - copied unchanged from r313895, head/contrib/libpcap/pcap-tc.c projects/clang400-import/contrib/libpcap/pcap-tc.h - copied unchanged from r313895, head/contrib/libpcap/pcap-tc.h projects/clang400-import/contrib/libpcap/pcap/can_socketcan.h - copied unchanged from r313895, head/contrib/libpcap/pcap/can_socketcan.h projects/clang400-import/contrib/libpcap/pcap/dlt.h - copied unchanged from r313895, head/contrib/libpcap/pcap/dlt.h projects/clang400-import/contrib/libpcap/pcap/export-defs.h - copied unchanged from r313895, head/contrib/libpcap/pcap/export-defs.h projects/clang400-import/contrib/libpcap/pcap_version.h.in - copied unchanged from r313895, head/contrib/libpcap/pcap_version.h.in projects/clang400-import/contrib/libpcap/portability.h - copied unchanged from r313895, head/contrib/libpcap/portability.h projects/clang400-import/contrib/libpcap/remote-ext.h - copied unchanged from r313895, head/contrib/libpcap/remote-ext.h projects/clang400-import/contrib/libpcap/sockutils.c - copied unchanged from r313895, head/contrib/libpcap/sockutils.c projects/clang400-import/contrib/libpcap/sockutils.h - copied unchanged from r313895, head/contrib/libpcap/sockutils.h projects/clang400-import/contrib/libpcap/tests/can_set_rfmon_test.c - copied unchanged from r313895, head/contrib/libpcap/tests/can_set_rfmon_test.c projects/clang400-import/lib/libc/arm/aeabi/aeabi_int_div.S - copied unchanged from r313895, head/lib/libc/arm/aeabi/aeabi_int_div.S projects/clang400-import/lib/msun/src/catrigl.c - copied unchanged from r313895, head/lib/msun/src/catrigl.c projects/clang400-import/sys/amd64/linux/linux_ptrace.c - copied unchanged from r313895, head/sys/amd64/linux/linux_ptrace.c projects/clang400-import/sys/dev/axgbe/ - copied from r313895, head/sys/dev/axgbe/ projects/clang400-import/sys/mips/broadcom/bcma_nexus.c - copied unchanged from r313895, head/sys/mips/broadcom/bcma_nexus.c projects/clang400-import/sys/mips/broadcom/bhnd_nexus.c - copied unchanged from r313895, head/sys/mips/broadcom/bhnd_nexus.c projects/clang400-import/sys/mips/broadcom/bhnd_nexusvar.h - copied unchanged from r313895, head/sys/mips/broadcom/bhnd_nexusvar.h projects/clang400-import/sys/mips/broadcom/siba_nexus.c - copied unchanged from r313895, head/sys/mips/broadcom/siba_nexus.c projects/clang400-import/sys/net/dlt.h - copied unchanged from r313895, head/sys/net/dlt.h projects/clang400-import/tools/regression/sockets/listen_kqueue/ - copied from r313895, head/tools/regression/sockets/listen_kqueue/ Deleted: projects/clang400-import/contrib/libpcap/configure.in projects/clang400-import/contrib/libpcap/fad-sita.c projects/clang400-import/contrib/libpcap/pcap-can-linux.c projects/clang400-import/contrib/libpcap/pcap-can-linux.h projects/clang400-import/contrib/libpcap/pcap-canusb-linux.c projects/clang400-import/contrib/libpcap/pcap-canusb-linux.h projects/clang400-import/contrib/libpcap/runlex.sh projects/clang400-import/share/man/man4/ahb.4 projects/clang400-import/sys/dev/advansys/adv_eisa.c projects/clang400-import/sys/dev/aha/aha_mca.c projects/clang400-import/sys/dev/ahb/ahb.c projects/clang400-import/sys/dev/ahb/ahbreg.h projects/clang400-import/sys/dev/aic7xxx/ahc_eisa.c projects/clang400-import/sys/dev/bhnd/bcma/bcma_nexus.c projects/clang400-import/sys/dev/bhnd/bhnd_nexus.c projects/clang400-import/sys/dev/bhnd/bhnd_nexusvar.h projects/clang400-import/sys/dev/bhnd/siba/siba_nexus.c projects/clang400-import/sys/dev/buslogic/bt_eisa.c projects/clang400-import/sys/dev/buslogic/bt_mca.c projects/clang400-import/sys/dev/dpt/dpt_eisa.c projects/clang400-import/sys/dev/eisa/eisa_if.m projects/clang400-import/sys/dev/eisa/eisaconf.c projects/clang400-import/sys/dev/eisa/eisaconf.h projects/clang400-import/sys/dev/ep/if_ep_eisa.c projects/clang400-import/sys/dev/ep/if_ep_mca.c projects/clang400-import/sys/dev/ida/ida_eisa.c projects/clang400-import/sys/dev/mca/ projects/clang400-import/sys/dev/pci/eisa_pci.c projects/clang400-import/sys/dev/pdq/if_fea.c projects/clang400-import/sys/dev/vx/if_vx_eisa.c projects/clang400-import/sys/i386/bios/mca_machdep.c projects/clang400-import/sys/i386/bios/mca_machdep.h projects/clang400-import/sys/modules/ahb/Makefile projects/clang400-import/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile projects/clang400-import/tools/build/options/WITH_EISA projects/clang400-import/tools/kerneldoc/subsys/Doxyfile-dev_eisa projects/clang400-import/tools/kerneldoc/subsys/Doxyfile-dev_mca Modified: projects/clang400-import/UPDATING projects/clang400-import/bin/ls/print.c projects/clang400-import/bin/pwd/pwd.1 projects/clang400-import/bin/sh/sh.1 projects/clang400-import/contrib/libarchive/libarchive/archive_acl.c projects/clang400-import/contrib/libarchive/libarchive/archive_entry.h projects/clang400-import/contrib/libarchive/libarchive/archive_entry_acl.3 projects/clang400-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c projects/clang400-import/contrib/libarchive/libarchive/archive_write_disk_acl.c projects/clang400-import/contrib/libarchive/libarchive/archive_write_set_format_pax.c projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_pax_nfs4.tar.uu projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_platform_posix1e.c projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_text.c projects/clang400-import/contrib/libpcap/CHANGES projects/clang400-import/contrib/libpcap/CREDITS projects/clang400-import/contrib/libpcap/INSTALL.txt projects/clang400-import/contrib/libpcap/LICENSE projects/clang400-import/contrib/libpcap/Makefile-devel-adds projects/clang400-import/contrib/libpcap/Makefile.in projects/clang400-import/contrib/libpcap/README projects/clang400-import/contrib/libpcap/TODO projects/clang400-import/contrib/libpcap/VERSION projects/clang400-import/contrib/libpcap/bpf/net/bpf_filter.c projects/clang400-import/contrib/libpcap/bpf_dump.c projects/clang400-import/contrib/libpcap/bpf_image.c projects/clang400-import/contrib/libpcap/config.guess projects/clang400-import/contrib/libpcap/config.h.in projects/clang400-import/contrib/libpcap/config.sub projects/clang400-import/contrib/libpcap/configure projects/clang400-import/contrib/libpcap/dlpisubs.c projects/clang400-import/contrib/libpcap/etherent.c projects/clang400-import/contrib/libpcap/ethertype.h projects/clang400-import/contrib/libpcap/fad-getad.c projects/clang400-import/contrib/libpcap/fad-gifc.c projects/clang400-import/contrib/libpcap/fad-glifc.c projects/clang400-import/contrib/libpcap/gencode.c projects/clang400-import/contrib/libpcap/gencode.h projects/clang400-import/contrib/libpcap/grammar.y projects/clang400-import/contrib/libpcap/inet.c projects/clang400-import/contrib/libpcap/install-sh projects/clang400-import/contrib/libpcap/lbl/os-osf4.h projects/clang400-import/contrib/libpcap/lbl/os-osf5.h projects/clang400-import/contrib/libpcap/lbl/os-solaris2.h projects/clang400-import/contrib/libpcap/lbl/os-sunos4.h projects/clang400-import/contrib/libpcap/lbl/os-ultrix4.h projects/clang400-import/contrib/libpcap/missing/snprintf.c projects/clang400-import/contrib/libpcap/mkdep projects/clang400-import/contrib/libpcap/nametoaddr.c projects/clang400-import/contrib/libpcap/optimize.c projects/clang400-import/contrib/libpcap/pcap-bpf.c projects/clang400-import/contrib/libpcap/pcap-bpf.h projects/clang400-import/contrib/libpcap/pcap-bt-linux.c projects/clang400-import/contrib/libpcap/pcap-bt-linux.h projects/clang400-import/contrib/libpcap/pcap-bt-monitor-linux.c projects/clang400-import/contrib/libpcap/pcap-common.c projects/clang400-import/contrib/libpcap/pcap-config.1 projects/clang400-import/contrib/libpcap/pcap-dag.c projects/clang400-import/contrib/libpcap/pcap-dag.h projects/clang400-import/contrib/libpcap/pcap-dbus.c projects/clang400-import/contrib/libpcap/pcap-dlpi.c projects/clang400-import/contrib/libpcap/pcap-dos.c projects/clang400-import/contrib/libpcap/pcap-dos.h projects/clang400-import/contrib/libpcap/pcap-filter.manmisc.in projects/clang400-import/contrib/libpcap/pcap-int.h projects/clang400-import/contrib/libpcap/pcap-libdlpi.c projects/clang400-import/contrib/libpcap/pcap-linktype.manmisc.in projects/clang400-import/contrib/libpcap/pcap-linux.c projects/clang400-import/contrib/libpcap/pcap-netfilter-linux.c projects/clang400-import/contrib/libpcap/pcap-netfilter-linux.h projects/clang400-import/contrib/libpcap/pcap-nit.c projects/clang400-import/contrib/libpcap/pcap-null.c projects/clang400-import/contrib/libpcap/pcap-pf.c projects/clang400-import/contrib/libpcap/pcap-savefile.manfile.in projects/clang400-import/contrib/libpcap/pcap-septel.c projects/clang400-import/contrib/libpcap/pcap-sita.c projects/clang400-import/contrib/libpcap/pcap-snf.c projects/clang400-import/contrib/libpcap/pcap-snit.c projects/clang400-import/contrib/libpcap/pcap-snoop.c projects/clang400-import/contrib/libpcap/pcap-stdinc.h projects/clang400-import/contrib/libpcap/pcap-tstamp.manmisc.in projects/clang400-import/contrib/libpcap/pcap-usb-linux.c projects/clang400-import/contrib/libpcap/pcap-usb-linux.h projects/clang400-import/contrib/libpcap/pcap-win32.c projects/clang400-import/contrib/libpcap/pcap.3pcap.in projects/clang400-import/contrib/libpcap/pcap.c projects/clang400-import/contrib/libpcap/pcap/bluetooth.h projects/clang400-import/contrib/libpcap/pcap/bpf.h projects/clang400-import/contrib/libpcap/pcap/namedb.h projects/clang400-import/contrib/libpcap/pcap/nflog.h projects/clang400-import/contrib/libpcap/pcap/pcap.h projects/clang400-import/contrib/libpcap/pcap/sll.h projects/clang400-import/contrib/libpcap/pcap/usb.h projects/clang400-import/contrib/libpcap/pcap_activate.3pcap projects/clang400-import/contrib/libpcap/pcap_breakloop.3pcap projects/clang400-import/contrib/libpcap/pcap_can_set_rfmon.3pcap projects/clang400-import/contrib/libpcap/pcap_close.3pcap projects/clang400-import/contrib/libpcap/pcap_compile.3pcap.in projects/clang400-import/contrib/libpcap/pcap_create.3pcap projects/clang400-import/contrib/libpcap/pcap_datalink.3pcap.in projects/clang400-import/contrib/libpcap/pcap_datalink_name_to_val.3pcap projects/clang400-import/contrib/libpcap/pcap_datalink_val_to_name.3pcap projects/clang400-import/contrib/libpcap/pcap_dump.3pcap projects/clang400-import/contrib/libpcap/pcap_dump_close.3pcap projects/clang400-import/contrib/libpcap/pcap_dump_file.3pcap projects/clang400-import/contrib/libpcap/pcap_dump_flush.3pcap projects/clang400-import/contrib/libpcap/pcap_dump_ftell.3pcap projects/clang400-import/contrib/libpcap/pcap_dump_open.3pcap.in projects/clang400-import/contrib/libpcap/pcap_file.3pcap projects/clang400-import/contrib/libpcap/pcap_fileno.3pcap projects/clang400-import/contrib/libpcap/pcap_findalldevs.3pcap projects/clang400-import/contrib/libpcap/pcap_freecode.3pcap projects/clang400-import/contrib/libpcap/pcap_get_selectable_fd.3pcap projects/clang400-import/contrib/libpcap/pcap_get_tstamp_precision.3pcap.in projects/clang400-import/contrib/libpcap/pcap_geterr.3pcap projects/clang400-import/contrib/libpcap/pcap_inject.3pcap projects/clang400-import/contrib/libpcap/pcap_is_swapped.3pcap projects/clang400-import/contrib/libpcap/pcap_lib_version.3pcap projects/clang400-import/contrib/libpcap/pcap_list_datalinks.3pcap.in projects/clang400-import/contrib/libpcap/pcap_list_tstamp_types.3pcap.in projects/clang400-import/contrib/libpcap/pcap_lookupdev.3pcap projects/clang400-import/contrib/libpcap/pcap_lookupnet.3pcap projects/clang400-import/contrib/libpcap/pcap_loop.3pcap projects/clang400-import/contrib/libpcap/pcap_major_version.3pcap projects/clang400-import/contrib/libpcap/pcap_next_ex.3pcap projects/clang400-import/contrib/libpcap/pcap_offline_filter.3pcap projects/clang400-import/contrib/libpcap/pcap_open_dead.3pcap.in projects/clang400-import/contrib/libpcap/pcap_open_live.3pcap projects/clang400-import/contrib/libpcap/pcap_open_offline.3pcap.in projects/clang400-import/contrib/libpcap/pcap_set_buffer_size.3pcap projects/clang400-import/contrib/libpcap/pcap_set_datalink.3pcap projects/clang400-import/contrib/libpcap/pcap_set_immediate_mode.3pcap projects/clang400-import/contrib/libpcap/pcap_set_promisc.3pcap projects/clang400-import/contrib/libpcap/pcap_set_rfmon.3pcap projects/clang400-import/contrib/libpcap/pcap_set_snaplen.3pcap projects/clang400-import/contrib/libpcap/pcap_set_timeout.3pcap projects/clang400-import/contrib/libpcap/pcap_set_tstamp_precision.3pcap.in projects/clang400-import/contrib/libpcap/pcap_set_tstamp_type.3pcap.in projects/clang400-import/contrib/libpcap/pcap_setdirection.3pcap projects/clang400-import/contrib/libpcap/pcap_setfilter.3pcap projects/clang400-import/contrib/libpcap/pcap_setnonblock.3pcap projects/clang400-import/contrib/libpcap/pcap_snapshot.3pcap projects/clang400-import/contrib/libpcap/pcap_stats.3pcap projects/clang400-import/contrib/libpcap/pcap_statustostr.3pcap projects/clang400-import/contrib/libpcap/pcap_strerror.3pcap projects/clang400-import/contrib/libpcap/pcap_tstamp_type_name_to_val.3pcap projects/clang400-import/contrib/libpcap/pcap_tstamp_type_val_to_name.3pcap projects/clang400-import/contrib/libpcap/savefile.c projects/clang400-import/contrib/libpcap/scanner.l projects/clang400-import/contrib/libpcap/sf-pcap-ng.c projects/clang400-import/contrib/libpcap/sf-pcap.c projects/clang400-import/contrib/libpcap/tests/capturetest.c projects/clang400-import/contrib/libpcap/tests/filtertest.c projects/clang400-import/contrib/libpcap/tests/findalldevstest.c projects/clang400-import/contrib/libpcap/tests/opentest.c projects/clang400-import/contrib/libpcap/tests/reactivatetest.c projects/clang400-import/contrib/libpcap/tests/selpolltest.c projects/clang400-import/contrib/libpcap/tests/valgrindtest.c projects/clang400-import/contrib/tzcode/stdtime/localtime.c projects/clang400-import/gnu/usr.bin/gdb/Makefile.inc projects/clang400-import/include/pthread.h projects/clang400-import/include/stdlib.h projects/clang400-import/lib/libc/arm/Symbol_vfp.map projects/clang400-import/lib/libc/arm/aeabi/Makefile.inc projects/clang400-import/lib/libc/arm/aeabi/Symbol.map projects/clang400-import/lib/libc/net/nsdispatch.c projects/clang400-import/lib/libc/sys/kqueue.2 projects/clang400-import/lib/libc/sys/mmap.2 projects/clang400-import/lib/libc/tests/tls/Makefile projects/clang400-import/lib/libpcap/Makefile projects/clang400-import/lib/libpcap/config.h projects/clang400-import/lib/libpcap/pcap-netmap.c projects/clang400-import/lib/libstand/ext2fs.c projects/clang400-import/lib/libstand/nandfs.c projects/clang400-import/lib/libstand/ufs.c projects/clang400-import/lib/libvmmapi/vmmapi.c projects/clang400-import/lib/libvmmapi/vmmapi.h projects/clang400-import/lib/msun/Makefile projects/clang400-import/lib/msun/Symbol.map projects/clang400-import/lib/msun/man/cacos.3 projects/clang400-import/lib/msun/src/catrig.c projects/clang400-import/lib/msun/tests/fmaxmin_test.c projects/clang400-import/release/doc/en_US.ISO8859-1/hardware/article.xml projects/clang400-import/sbin/camcontrol/attrib.c projects/clang400-import/sbin/camcontrol/camcontrol.8 projects/clang400-import/sbin/camcontrol/camcontrol.c projects/clang400-import/sbin/camcontrol/camcontrol.h projects/clang400-import/sbin/camcontrol/fwdownload.c projects/clang400-import/sbin/camcontrol/modeedit.c projects/clang400-import/sbin/camcontrol/persist.c projects/clang400-import/sbin/camcontrol/timestamp.c projects/clang400-import/sbin/camcontrol/zone.c projects/clang400-import/sbin/dump/traverse.c projects/clang400-import/sbin/ffsinfo/ffsinfo.c projects/clang400-import/sbin/fsck_ffs/dir.c projects/clang400-import/sbin/fsck_ffs/fsck_ffs.8 projects/clang400-import/sbin/fsck_ffs/fsutil.c projects/clang400-import/sbin/fsck_ffs/gjournal.c projects/clang400-import/sbin/fsck_ffs/inode.c projects/clang400-import/sbin/fsck_ffs/main.c projects/clang400-import/sbin/fsck_ffs/pass1.c projects/clang400-import/sbin/fsck_ffs/pass1b.c projects/clang400-import/sbin/fsck_ffs/pass2.c projects/clang400-import/sbin/fsck_ffs/pass3.c projects/clang400-import/sbin/fsck_ffs/pass4.c projects/clang400-import/sbin/fsck_ffs/pass5.c projects/clang400-import/sbin/fsck_ffs/suj.c projects/clang400-import/sbin/fsdb/fsdb.c projects/clang400-import/sbin/fsdb/fsdbutil.c projects/clang400-import/sbin/fsirand/fsirand.c projects/clang400-import/sbin/growfs/debug.c projects/clang400-import/sbin/growfs/growfs.c projects/clang400-import/sbin/mdconfig/mdconfig.c projects/clang400-import/sbin/newfs/mkfs.c projects/clang400-import/sbin/newfs_nandfs/newfs_nandfs.c projects/clang400-import/sbin/pflogd/Makefile projects/clang400-import/sbin/quotacheck/quotacheck.c projects/clang400-import/sbin/restore/dirs.c projects/clang400-import/sbin/restore/interactive.c projects/clang400-import/sbin/restore/main.c projects/clang400-import/sbin/restore/restore.c projects/clang400-import/sbin/restore/symtab.c projects/clang400-import/sbin/restore/tape.c projects/clang400-import/sbin/restore/utilities.c projects/clang400-import/sbin/tunefs/tunefs.c projects/clang400-import/share/examples/drivers/README projects/clang400-import/share/man/man4/Makefile projects/clang400-import/share/man/man4/adv.4 projects/clang400-import/share/man/man4/aha.4 projects/clang400-import/share/man/man4/ahc.4 projects/clang400-import/share/man/man4/bt.4 projects/clang400-import/share/man/man4/dpt.4 projects/clang400-import/share/man/man4/fpa.4 projects/clang400-import/share/man/man4/ida.4 projects/clang400-import/share/man/man4/le.4 projects/clang400-import/share/man/man4/man4.i386/ep.4 projects/clang400-import/share/man/man4/man4.i386/vx.4 projects/clang400-import/share/man/man4/mlx.4 projects/clang400-import/share/man/man5/src.conf.5 projects/clang400-import/share/man/man9/bus_space.9 projects/clang400-import/share/misc/committers-ports.dot projects/clang400-import/share/mk/src.opts.mk projects/clang400-import/sys/amd64/amd64/amd64_mem.c projects/clang400-import/sys/amd64/linux/linux_dummy.c projects/clang400-import/sys/amd64/linux/linux_proto.h projects/clang400-import/sys/amd64/linux/linux_systrace_args.c projects/clang400-import/sys/amd64/linux/syscalls.master projects/clang400-import/sys/arm/arm/cpufunc_asm.S projects/clang400-import/sys/arm/freescale/imx/imx6_usbphy.c projects/clang400-import/sys/arm64/arm64/swtch.S projects/clang400-import/sys/arm64/conf/GENERIC projects/clang400-import/sys/boot/common/ufsread.c projects/clang400-import/sys/boot/efi/libefi/efipart.c projects/clang400-import/sys/cam/ctl/ctl.c projects/clang400-import/sys/cam/ctl/ctl_backend_ramdisk.c projects/clang400-import/sys/cam/ctl/ctl_error.c projects/clang400-import/sys/cam/ctl/ctl_frontend_iscsi.c projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/clang400-import/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/clang400-import/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/clang400-import/sys/compat/cloudabi/cloudabi_mem.c projects/clang400-import/sys/compat/freebsd32/freebsd32_misc.c projects/clang400-import/sys/compat/linux/linux.c projects/clang400-import/sys/compat/linux/linux_file.c projects/clang400-import/sys/compat/linux/linux_misc.c projects/clang400-import/sys/compat/linux/linux_mmap.c projects/clang400-import/sys/compat/linux/linux_socket.c projects/clang400-import/sys/compat/linuxkpi/common/include/asm/atomic-long.h projects/clang400-import/sys/compat/linuxkpi/common/include/asm/atomic.h projects/clang400-import/sys/compat/linuxkpi/common/include/asm/atomic64.h projects/clang400-import/sys/compat/linuxkpi/common/include/linux/device.h projects/clang400-import/sys/compat/linuxkpi/common/include/linux/dma-mapping.h projects/clang400-import/sys/compat/linuxkpi/common/include/linux/gfp.h projects/clang400-import/sys/compat/linuxkpi/common/include/linux/kernel.h projects/clang400-import/sys/conf/NOTES projects/clang400-import/sys/conf/config.mk projects/clang400-import/sys/conf/files projects/clang400-import/sys/conf/files.arm64 projects/clang400-import/sys/conf/files.i386 projects/clang400-import/sys/conf/kern.opts.mk projects/clang400-import/sys/conf/options projects/clang400-import/sys/dev/acpica/acpi_package.c projects/clang400-import/sys/dev/acpica/acpi_pcib_acpi.c projects/clang400-import/sys/dev/advansys/advansys.c projects/clang400-import/sys/dev/advansys/advlib.c projects/clang400-import/sys/dev/advansys/advlib.h projects/clang400-import/sys/dev/aha/aha.c projects/clang400-import/sys/dev/aha/ahareg.h projects/clang400-import/sys/dev/aic7xxx/aic7770.c projects/clang400-import/sys/dev/aic7xxx/aic7xxx.h projects/clang400-import/sys/dev/aic7xxx/aic7xxx_osm.h projects/clang400-import/sys/dev/asmc/asmc.c projects/clang400-import/sys/dev/asmc/asmcvar.h projects/clang400-import/sys/dev/atkbdc/psm.c projects/clang400-import/sys/dev/buslogic/bt.c projects/clang400-import/sys/dev/buslogic/bt_isa.c projects/clang400-import/sys/dev/buslogic/btreg.h projects/clang400-import/sys/dev/bxe/bxe.c projects/clang400-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c projects/clang400-import/sys/dev/dpt/dpt.h projects/clang400-import/sys/dev/dpt/dpt_scsi.c projects/clang400-import/sys/dev/e1000/if_em.c projects/clang400-import/sys/dev/ep/if_ep.c projects/clang400-import/sys/dev/ep/if_ep_isa.c projects/clang400-import/sys/dev/ep/if_epreg.h projects/clang400-import/sys/dev/ep/if_epvar.h projects/clang400-import/sys/dev/ida/idareg.h projects/clang400-import/sys/dev/iscsi/icl_soft.c projects/clang400-import/sys/dev/iscsi/iscsi.c projects/clang400-import/sys/dev/iwi/if_iwi.c projects/clang400-import/sys/dev/md/md.c projects/clang400-import/sys/dev/mlx/mlx.c projects/clang400-import/sys/dev/mlx4/mlx4_ib/mlx4_ib_mad.c projects/clang400-import/sys/dev/netmap/netmap_generic.c projects/clang400-import/sys/dev/pci/pcireg.h projects/clang400-import/sys/dev/pdq/pdq.c projects/clang400-import/sys/dev/pdq/pdq_freebsd.h projects/clang400-import/sys/dev/pdq/pdq_ifsubr.c projects/clang400-import/sys/dev/pdq/pdqreg.h projects/clang400-import/sys/dev/pdq/pdqvar.h projects/clang400-import/sys/dev/sdhci/sdhci_acpi.c projects/clang400-import/sys/dev/usb/controller/ehci_imx.c projects/clang400-import/sys/dev/virtio/network/if_vtnet.c projects/clang400-import/sys/dev/vt/vt_buf.c projects/clang400-import/sys/dev/vx/if_vxreg.h projects/clang400-import/sys/fs/devfs/devfs_devs.c projects/clang400-import/sys/fs/devfs/devfs_vnops.c projects/clang400-import/sys/fs/ext2fs/ext2_alloc.c projects/clang400-import/sys/fs/ext2fs/ext2_balloc.c projects/clang400-import/sys/fs/ext2fs/ext2_bmap.c projects/clang400-import/sys/fs/ext2fs/ext2_inode.c projects/clang400-import/sys/fs/ext2fs/ext2_inode_cnv.c projects/clang400-import/sys/fs/ext2fs/inode.h projects/clang400-import/sys/fs/nandfs/bmap.c projects/clang400-import/sys/fs/nandfs/nandfs_fs.h projects/clang400-import/sys/fs/nfsclient/nfs_clvfsops.c projects/clang400-import/sys/fs/nfsserver/nfs_nfsdkrpc.c projects/clang400-import/sys/i386/conf/NOTES projects/clang400-import/sys/i386/i386/i686_mem.c projects/clang400-import/sys/kern/kern_condvar.c projects/clang400-import/sys/kern/kern_exec.c projects/clang400-import/sys/kern/kern_jail.c projects/clang400-import/sys/kern/kern_lock.c projects/clang400-import/sys/kern/kern_lockstat.c projects/clang400-import/sys/kern/kern_mutex.c projects/clang400-import/sys/kern/kern_racct.c projects/clang400-import/sys/kern/kern_rwlock.c projects/clang400-import/sys/kern/kern_sx.c projects/clang400-import/sys/kern/kern_synch.c projects/clang400-import/sys/kern/subr_sleepqueue.c projects/clang400-import/sys/kern/subr_uio.c projects/clang400-import/sys/kern/uipc_shm.c projects/clang400-import/sys/kern/vfs_aio.c projects/clang400-import/sys/kern/vfs_default.c projects/clang400-import/sys/kern/vfs_vnops.c projects/clang400-import/sys/libkern/inet_ntoa.c projects/clang400-import/sys/mips/broadcom/files.broadcom projects/clang400-import/sys/modules/Makefile projects/clang400-import/sys/modules/aic7xxx/ahc/Makefile projects/clang400-import/sys/modules/dpt/Makefile projects/clang400-import/sys/modules/ep/Makefile projects/clang400-import/sys/modules/linux64/Makefile projects/clang400-import/sys/modules/vx/Makefile projects/clang400-import/sys/net/bpf.h projects/clang400-import/sys/netinet/if_ether.c projects/clang400-import/sys/netinet/igmp.c projects/clang400-import/sys/netinet/in.c projects/clang400-import/sys/netinet/in.h projects/clang400-import/sys/netinet/in_mcast.c projects/clang400-import/sys/netinet/in_pcb.c projects/clang400-import/sys/netinet/in_pcb.h projects/clang400-import/sys/netinet/in_proto.c projects/clang400-import/sys/netinet/ip_icmp.c projects/clang400-import/sys/netinet/ip_mroute.c projects/clang400-import/sys/netinet/ip_options.c projects/clang400-import/sys/netinet/ip_output.c projects/clang400-import/sys/netinet/libalias/alias_local.h projects/clang400-import/sys/netinet/libalias/alias_nbt.c projects/clang400-import/sys/netinet/libalias/alias_proxy.c projects/clang400-import/sys/netinet/libalias/alias_sctp.c projects/clang400-import/sys/netinet/sctp_input.c projects/clang400-import/sys/netinet/sctp_os_bsd.h projects/clang400-import/sys/netinet/sctp_pcb.c projects/clang400-import/sys/netinet/tcp_hostcache.c projects/clang400-import/sys/netinet/tcp_input.c projects/clang400-import/sys/netinet/tcp_timer.c projects/clang400-import/sys/netinet/tcp_timer.h projects/clang400-import/sys/netinet/udp_usrreq.c projects/clang400-import/sys/netinet6/in6.h projects/clang400-import/sys/netinet6/in6_pcb.c projects/clang400-import/sys/netinet6/in6_pcb.h projects/clang400-import/sys/netinet6/in6_proto.c projects/clang400-import/sys/netinet6/ip6_output.c projects/clang400-import/sys/netinet6/raw_ip6.c projects/clang400-import/sys/netinet6/sctp6_usrreq.c projects/clang400-import/sys/netinet6/udp6_usrreq.c projects/clang400-import/sys/netipsec/subr_ipsec.c projects/clang400-import/sys/netpfil/ipfw/ip_fw_log.c projects/clang400-import/sys/netpfil/pf/pf_osfp.c projects/clang400-import/sys/rpc/svc.c projects/clang400-import/sys/rpc/svc.h projects/clang400-import/sys/sys/event.h projects/clang400-import/sys/sys/lockmgr.h projects/clang400-import/sys/sys/lockstat.h projects/clang400-import/sys/sys/mutex.h projects/clang400-import/sys/sys/param.h projects/clang400-import/sys/sys/resource.h projects/clang400-import/sys/sys/rwlock.h projects/clang400-import/sys/sys/syscallsubr.h projects/clang400-import/sys/sys/systm.h projects/clang400-import/sys/ufs/ffs/ffs_alloc.c projects/clang400-import/sys/ufs/ffs/ffs_balloc.c projects/clang400-import/sys/ufs/ffs/ffs_inode.c projects/clang400-import/sys/ufs/ffs/ffs_snapshot.c projects/clang400-import/sys/ufs/ffs/ffs_softdep.c projects/clang400-import/sys/ufs/ffs/ffs_vfsops.c projects/clang400-import/sys/ufs/ffs/ffs_vnops.c projects/clang400-import/sys/ufs/ffs/fs.h projects/clang400-import/sys/ufs/ufs/dinode.h projects/clang400-import/sys/ufs/ufs/ufs_bmap.c projects/clang400-import/sys/ufs/ufs/ufs_lookup.c projects/clang400-import/sys/ufs/ufs/ufs_vfsops.c projects/clang400-import/sys/ufs/ufs/ufs_vnops.c projects/clang400-import/sys/vm/device_pager.c projects/clang400-import/sys/vm/sg_pager.c projects/clang400-import/sys/vm/vm_extern.h projects/clang400-import/sys/vm/vm_fault.c projects/clang400-import/sys/vm/vm_mmap.c projects/clang400-import/sys/vm/vm_object.h projects/clang400-import/sys/vm/vm_pageout.c projects/clang400-import/sys/x86/isa/atpic.c projects/clang400-import/sys/x86/isa/clock.c projects/clang400-import/sys/x86/isa/nmi.c projects/clang400-import/sys/x86/x86/legacy.c projects/clang400-import/sys/x86/x86/mca.c projects/clang400-import/tests/sys/vm/mmap_test.c projects/clang400-import/tools/build/mk/OptionalObsoleteFiles.inc projects/clang400-import/usr.bin/atm/sscop/Makefile projects/clang400-import/usr.bin/awk/Makefile projects/clang400-import/usr.bin/bc/bc.1 projects/clang400-import/usr.bin/bluetooth/Makefile.inc projects/clang400-import/usr.bin/bsdcat/Makefile projects/clang400-import/usr.bin/ctlstat/ctlstat.8 projects/clang400-import/usr.bin/dtc/input_buffer.cc projects/clang400-import/usr.bin/env/env.1 projects/clang400-import/usr.bin/expand/expand.1 projects/clang400-import/usr.bin/ipcrm/ipcrm.1 projects/clang400-import/usr.bin/mail/mail.1 projects/clang400-import/usr.bin/mkimg/mkimg.1 projects/clang400-import/usr.bin/mkuzip/mkuzip.8 projects/clang400-import/usr.bin/mt/mt.1 projects/clang400-import/usr.bin/perror/perror.1 projects/clang400-import/usr.bin/revoke/revoke.1 projects/clang400-import/usr.bin/sdiff/sdiff.1 projects/clang400-import/usr.bin/sort/bwstring.c projects/clang400-import/usr.bin/sort/coll.c projects/clang400-import/usr.bin/sort/file.c projects/clang400-import/usr.bin/svn/Makefile.inc projects/clang400-import/usr.bin/svn/svn/Makefile projects/clang400-import/usr.bin/svn/svnadmin/Makefile projects/clang400-import/usr.bin/svn/svnbench/Makefile projects/clang400-import/usr.bin/svn/svndumpfilter/Makefile projects/clang400-import/usr.bin/svn/svnfsfs/Makefile projects/clang400-import/usr.bin/svn/svnlook/Makefile projects/clang400-import/usr.bin/svn/svnmucc/Makefile projects/clang400-import/usr.bin/svn/svnrdump/Makefile projects/clang400-import/usr.bin/svn/svnserve/Makefile projects/clang400-import/usr.bin/svn/svnsync/Makefile projects/clang400-import/usr.bin/svn/svnversion/Makefile projects/clang400-import/usr.bin/timeout/timeout.1 projects/clang400-import/usr.bin/units/units.1 projects/clang400-import/usr.bin/unzip/unzip.1 projects/clang400-import/usr.bin/uuencode/uuencode.1 projects/clang400-import/usr.bin/whois/whois.1 projects/clang400-import/usr.sbin/bhyve/bhyverun.c projects/clang400-import/usr.sbin/bhyve/block_if.c projects/clang400-import/usr.sbin/bhyve/consport.c projects/clang400-import/usr.sbin/bhyve/dbgport.c projects/clang400-import/usr.sbin/bhyve/mevent.c projects/clang400-import/usr.sbin/bhyve/pci_e82545.c projects/clang400-import/usr.sbin/bhyve/pci_passthru.c projects/clang400-import/usr.sbin/bhyve/pci_virtio_console.c projects/clang400-import/usr.sbin/bhyve/pci_virtio_net.c projects/clang400-import/usr.sbin/bhyve/pci_virtio_rnd.c projects/clang400-import/usr.sbin/bhyve/rfb.c (contents, props changed) projects/clang400-import/usr.sbin/bhyve/uart_emul.c projects/clang400-import/usr.sbin/bsdinstall/scripts/hardening projects/clang400-import/usr.sbin/ipfwpcap/Makefile projects/clang400-import/usr.sbin/makefs/ffs.c projects/clang400-import/usr.sbin/makefs/ffs/ffs_alloc.c projects/clang400-import/usr.sbin/makefs/ffs/ffs_balloc.c projects/clang400-import/usr.sbin/makefs/ffs/mkfs.c projects/clang400-import/usr.sbin/makefs/ffs/ufs_bmap.c projects/clang400-import/usr.sbin/makefs/makefs.h projects/clang400-import/usr.sbin/ndp/ndp.c projects/clang400-import/usr.sbin/pciconf/pciconf.c projects/clang400-import/usr.sbin/quot/quot.c Directory Properties: projects/clang400-import/ (props changed) projects/clang400-import/contrib/libarchive/ (props changed) projects/clang400-import/contrib/libpcap/ (props changed) projects/clang400-import/contrib/tzcode/stdtime/ (props changed) projects/clang400-import/gnu/usr.bin/gdb/ (props changed) projects/clang400-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang400-import/UPDATING ============================================================================== --- projects/clang400-import/UPDATING Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/UPDATING Fri Feb 17 20:19:38 2017 (r313896) @@ -56,6 +56,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 Please see the 20141231 entry below for information about prerequisites and upgrading, if you are not already using clang 3.5.0 or higher. +20170216: + EISA bus support has been removed. The WITH_EISA option is no longer + valid. + +20170215: + MCA bus support has been removed. + 20170127: The WITH_LLD_AS_LD / WITHOUT_LLD_AS_LD build knobs have been renamed WITH_LLD_IS_LD / WITHOUT_LLD_IS_LD, for consistency with CLANG_IS_CC. Modified: projects/clang400-import/bin/ls/print.c ============================================================================== --- projects/clang400-import/bin/ls/print.c Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/bin/ls/print.c Fri Feb 17 20:19:38 2017 (r313896) @@ -259,12 +259,12 @@ printlong(const DISPLAY *dp) np = p->fts_pointer; xo_attr("value", "%03o", (int) sp->st_mode & ALLPERMS); if (f_numericonly) { - xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*u} {td:user/%-*s}{e:user/%ju} {td:group/%-*s}{e:group/%ju} ", - buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, sp->st_nlink, + xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*ju} {td:user/%-*s}{e:user/%ju} {td:group/%-*s}{e:group/%ju} ", + buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, (uintmax_t)sp->st_nlink, dp->s_user, np->user, (uintmax_t)sp->st_uid, dp->s_group, np->group, (uintmax_t)sp->st_gid); } else { - xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*u} {t:user/%-*s} {t:group/%-*s} ", - buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, sp->st_nlink, + xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*ju} {t:user/%-*s} {t:group/%-*s} ", + buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, (uintmax_t)sp->st_nlink, dp->s_user, np->user, dp->s_group, np->group); } if (S_ISBLK(sp->st_mode)) Modified: projects/clang400-import/bin/pwd/pwd.1 ============================================================================== --- projects/clang400-import/bin/pwd/pwd.1 Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/bin/pwd/pwd.1 Fri Feb 17 20:19:38 2017 (r313896) @@ -87,7 +87,7 @@ utility conforms to .St -p1003.1-2001 . .Sh HISTORY The -.Nm +.Nm command appeared in .At v5 . .Sh BUGS Modified: projects/clang400-import/bin/sh/sh.1 ============================================================================== --- projects/clang400-import/bin/sh/sh.1 Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/bin/sh/sh.1 Fri Feb 17 20:19:38 2017 (r313896) @@ -1033,7 +1033,7 @@ The syntax of the command is: .Bd -unfilled -offset indent -compact .Ic case Ar word Ic in -.Ar pattern Ns Li ) Ar list Li ;; +.Ar pattern Ns ) Ar list Li ;; .Ar ... .Ic esac .Ed Modified: projects/clang400-import/contrib/libarchive/libarchive/archive_acl.c ============================================================================== --- projects/clang400-import/contrib/libarchive/libarchive/archive_acl.c Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libarchive/libarchive/archive_acl.c Fri Feb 17 20:19:38 2017 (r313896) @@ -83,6 +83,50 @@ static void append_entry(char **p, const int tag, int flags, const char *name, int perm, int id); static void append_id(char **p, int id); +static const struct { + const int perm; + const char c; + const wchar_t wc; +} nfsv4_acl_perm_map[] = { + { ARCHIVE_ENTRY_ACL_READ_DATA | ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, 'r', + L'r' }, + { ARCHIVE_ENTRY_ACL_WRITE_DATA | ARCHIVE_ENTRY_ACL_ADD_FILE, 'w', + L'w' }, + { ARCHIVE_ENTRY_ACL_EXECUTE, 'x', L'x' }, + { ARCHIVE_ENTRY_ACL_APPEND_DATA | ARCHIVE_ENTRY_ACL_ADD_SUBDIRECTORY, + 'p', L'p' }, + { ARCHIVE_ENTRY_ACL_DELETE, 'd', L'd' }, + { ARCHIVE_ENTRY_ACL_DELETE_CHILD, 'D', L'D' }, + { ARCHIVE_ENTRY_ACL_READ_ATTRIBUTES, 'a', L'a' }, + { ARCHIVE_ENTRY_ACL_WRITE_ATTRIBUTES, 'A', L'A' }, + { ARCHIVE_ENTRY_ACL_READ_NAMED_ATTRS, 'R', L'R' }, + { ARCHIVE_ENTRY_ACL_WRITE_NAMED_ATTRS, 'W', L'W' }, + { ARCHIVE_ENTRY_ACL_READ_ACL, 'c', L'c' }, + { ARCHIVE_ENTRY_ACL_WRITE_ACL, 'C', L'C' }, + { ARCHIVE_ENTRY_ACL_WRITE_OWNER, 'o', L'o' }, + { ARCHIVE_ENTRY_ACL_SYNCHRONIZE, 's', L's' } +}; + +static const int nfsv4_acl_perm_map_size = (int)(sizeof(nfsv4_acl_perm_map) / + sizeof(nfsv4_acl_perm_map[0])); + +static const struct { + const int perm; + const char c; + const wchar_t wc; +} nfsv4_acl_flag_map[] = { + { ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, 'f', L'f' }, + { ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT, 'd', L'd' }, + { ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, 'i', L'i' }, + { ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, 'n', L'n' }, + { ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS, 'S', L'S' }, + { ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS, 'F', L'F' }, + { ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, 'I', L'I' } +}; + +static const int nfsv4_acl_flag_map_size = (int)(sizeof(nfsv4_acl_flag_map) / + sizeof(nfsv4_acl_flag_map[0])); + void archive_acl_clear(struct archive_acl *acl) { @@ -741,6 +785,8 @@ static void append_entry_w(wchar_t **wp, const wchar_t *prefix, int type, int tag, int flags, const wchar_t *wname, int perm, int id) { + int i; + if (prefix != NULL) { wcscpy(*wp, prefix); *wp += wcslen(*wp); @@ -810,46 +856,20 @@ append_entry_w(wchar_t **wp, const wchar *(*wp)++ = (perm & 0222) ? L'w' : L'-'; *(*wp)++ = (perm & 0111) ? L'x' : L'-'; } else { - /* NFS4 ACL perms */ - *(*wp)++ = (perm & (ARCHIVE_ENTRY_ACL_READ_DATA | - ARCHIVE_ENTRY_ACL_LIST_DIRECTORY)) ? L'r' : L'-'; - *(*wp)++ = (perm & (ARCHIVE_ENTRY_ACL_WRITE_DATA | - ARCHIVE_ENTRY_ACL_ADD_FILE)) ? L'w' : L'-'; - *(*wp)++ = (perm & ARCHIVE_ENTRY_ACL_EXECUTE) ? L'x' : L'-'; - *(*wp)++ = (perm & (ARCHIVE_ENTRY_ACL_APPEND_DATA | - ARCHIVE_ENTRY_ACL_ADD_SUBDIRECTORY)) ? L'p' : L'-'; - *(*wp)++ = (perm & ARCHIVE_ENTRY_ACL_DELETE) ? L'd' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_DELETE_CHILD) ? L'D' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_READ_ATTRIBUTES) ? L'a' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_WRITE_ATTRIBUTES) ? L'A' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_READ_NAMED_ATTRS) ? L'R' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_WRITE_NAMED_ATTRS) ? L'W' : L'-'; - *(*wp)++ = (perm & ARCHIVE_ENTRY_ACL_READ_ACL) ? L'c' : L'-'; - *(*wp)++ = (perm & ARCHIVE_ENTRY_ACL_WRITE_ACL) ? L'C' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_WRITE_OWNER) ? L'o' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_SYNCHRONIZE) ? L's' : L'-'; + /* NFSv4 ACL perms */ + for (i = 0; i < nfsv4_acl_perm_map_size; i++) { + if (perm & nfsv4_acl_perm_map[i].perm) + *(*wp)++ = nfsv4_acl_perm_map[i].wc; + else if ((flags & ARCHIVE_ENTRY_ACL_STYLE_COMPACT) == 0) + *(*wp)++ = L'-'; + } *(*wp)++ = L':'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT) ? L'f' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT) ? L'd' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY) ? L'i' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT) ? L'n' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS) ? L'S' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS) ? L'F' : L'-'; - *(*wp)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_INHERITED) ? L'I' : L'-'; + for (i = 0; i < nfsv4_acl_flag_map_size; i++) { + if (perm & nfsv4_acl_flag_map[i].perm) + *(*wp)++ = nfsv4_acl_flag_map[i].wc; + else if ((flags & ARCHIVE_ENTRY_ACL_STYLE_COMPACT) == 0) + *(*wp)++ = L'-'; + } *(*wp)++ = L':'; switch (type) { case ARCHIVE_ENTRY_ACL_TYPE_ALLOW: @@ -998,6 +1018,8 @@ static void append_entry(char **p, const char *prefix, int type, int tag, int flags, const char *name, int perm, int id) { + int i; + if (prefix != NULL) { strcpy(*p, prefix); *p += strlen(*p); @@ -1067,47 +1089,20 @@ append_entry(char **p, const char *prefi *(*p)++ = (perm & 0222) ? 'w' : '-'; *(*p)++ = (perm & 0111) ? 'x' : '-'; } else { - /* NFS4 ACL perms */ - *(*p)++ = (perm & (ARCHIVE_ENTRY_ACL_READ_DATA | - ARCHIVE_ENTRY_ACL_LIST_DIRECTORY)) ? 'r' : '-'; - *(*p)++ = (perm & (ARCHIVE_ENTRY_ACL_WRITE_DATA | - ARCHIVE_ENTRY_ACL_ADD_FILE)) ? 'w' : '-'; - *(*p)++ = (perm & (ARCHIVE_ENTRY_ACL_EXECUTE)) ? 'x' : '-'; - *(*p)++ = (perm & (ARCHIVE_ENTRY_ACL_APPEND_DATA | - ARCHIVE_ENTRY_ACL_ADD_SUBDIRECTORY)) ? 'p' : '-'; - *(*p)++ = (perm & ARCHIVE_ENTRY_ACL_DELETE) ? 'd' : '-'; - *(*p)++ = (perm & ARCHIVE_ENTRY_ACL_DELETE_CHILD) ? 'D' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_READ_ATTRIBUTES) ? 'a' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_WRITE_ATTRIBUTES) ? 'A' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_READ_NAMED_ATTRS) ? 'R' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_WRITE_NAMED_ATTRS) ? 'W' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_READ_ACL) ? 'c' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_WRITE_ACL) ? 'C' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_WRITE_OWNER) ? 'o' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_SYNCHRONIZE) ? 's' : '-'; + /* NFSv4 ACL perms */ + for (i = 0; i < nfsv4_acl_perm_map_size; i++) { + if (perm & nfsv4_acl_perm_map[i].perm) + *(*p)++ = nfsv4_acl_perm_map[i].c; + else if ((flags & ARCHIVE_ENTRY_ACL_STYLE_COMPACT) == 0) + *(*p)++ = '-'; + } *(*p)++ = ':'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT) ? 'f' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT) ? 'd' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY) ? 'i' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT) ? 'n' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS) ? 'S' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS) ? 'F' : '-'; - *(*p)++ = (perm & - ARCHIVE_ENTRY_ACL_ENTRY_INHERITED) ? 'I' : '-'; + for (i = 0; i < nfsv4_acl_flag_map_size; i++) { + if (perm & nfsv4_acl_flag_map[i].perm) + *(*p)++ = nfsv4_acl_flag_map[i].c; + else if ((flags & ARCHIVE_ENTRY_ACL_STYLE_COMPACT) == 0) + *(*p)++ = '-'; + } *(*p)++ = ':'; switch (type) { case ARCHIVE_ENTRY_ACL_TYPE_ALLOW: @@ -1467,11 +1462,8 @@ ismode_w(const wchar_t *start, const wch static int is_nfs4_perms_w(const wchar_t *start, const wchar_t *end, int *permset) { - const wchar_t *p; + const wchar_t *p = start; - if (start >= end) - return (0); - p = start; while (p < end) { switch (*p++) { case L'r': @@ -1533,11 +1525,8 @@ is_nfs4_perms_w(const wchar_t *start, co static int is_nfs4_flags_w(const wchar_t *start, const wchar_t *end, int *permset) { - const wchar_t *p; + const wchar_t *p = start; - if (start >= end) - return (0); - p = start; while (p < end) { switch(*p++) { case L'f': @@ -1945,11 +1934,8 @@ ismode(const char *start, const char *en static int is_nfs4_perms(const char *start, const char *end, int *permset) { - const char *p; + const char *p = start; - if (start >= end) - return (0); - p = start; while (p < end) { switch (*p++) { case 'r': @@ -2011,11 +1997,8 @@ is_nfs4_perms(const char *start, const c static int is_nfs4_flags(const char *start, const char *end, int *permset) { - const char *p; + const char *p = start; - if (start >= end) - return (0); - p = start; while (p < end) { switch(*p++) { case 'f': Modified: projects/clang400-import/contrib/libarchive/libarchive/archive_entry.h ============================================================================== --- projects/clang400-import/contrib/libarchive/libarchive/archive_entry.h Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libarchive/libarchive/archive_entry.h Fri Feb 17 20:19:38 2017 (r313896) @@ -509,6 +509,10 @@ __LA_DECL int archive_entry_acl_next_w( * ARCHIVE_ENTRY_ACL_STYLE_SOLARIS - Output only one colon after "other" and * "mask" entries. * + * Flags only for archive entries with NFSv4 ACL: + * ARCHIVE_ENTRY_ACL_STYLE_COMPACT - Do not output the minus character for + * unset permissions and flags in NFSv4 ACL permission and flag fields + * * Flags for for archive entries with POSIX.1e ACL or NFSv4 ACL: * ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID - Include extra numeric ID field in * each ACL entry. @@ -519,6 +523,7 @@ __LA_DECL int archive_entry_acl_next_w( #define ARCHIVE_ENTRY_ACL_STYLE_MARK_DEFAULT 0x00000002 #define ARCHIVE_ENTRY_ACL_STYLE_SOLARIS 0x00000004 #define ARCHIVE_ENTRY_ACL_STYLE_SEPARATOR_COMMA 0x00000008 +#define ARCHIVE_ENTRY_ACL_STYLE_COMPACT 0x00000010 __LA_DECL wchar_t *archive_entry_acl_to_text_w(struct archive_entry *, ssize_t * /* len */, int /* flags */); Modified: projects/clang400-import/contrib/libarchive/libarchive/archive_entry_acl.3 ============================================================================== --- projects/clang400-import/contrib/libarchive/libarchive/archive_entry_acl.3 Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libarchive/libarchive/archive_entry_acl.3 Fri Feb 17 20:19:38 2017 (r313896) @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 27, 2016 +.Dd February 15, 2017 .Dt ARCHIVE_ENTRY_ACL 3 .Os .Sh NAME @@ -390,6 +390,13 @@ Prefix each default ACL entry with the w The mask and other ACLs don not contain a double colon. .El .Pp +The following flags are effecive only on NFSv4 ACL: +.Bl -tag -offset indent -compact -width ARCHIV +.It Dv ARCHIVE_ENTRY_ACL_STYLE_COMPACT +Do not output minus characters for unset permissions and flags in NFSv4 ACL +permission and flag fields. +.El +.Pp The following flags are effective on both POSIX.1e and NFSv4 ACL: .Bl -tag -offset indent -compact -width ARCHIV .It Dv ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID Modified: projects/clang400-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c ============================================================================== --- projects/clang400-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Fri Feb 17 20:19:38 2017 (r313896) @@ -618,9 +618,9 @@ setup_acls(struct archive_read_disk *a, /* * Translate system ACL permissions into libarchive internal structure */ -static struct { - int archive_perm; - int platform_perm; +static const struct { + const int archive_perm; + const int platform_perm; } acl_perm_map[] = { #if HAVE_SUN_ACL /* Solaris NFSv4 ACL permissions */ {ARCHIVE_ENTRY_ACL_EXECUTE, ACE_EXECUTE}, @@ -687,9 +687,9 @@ static struct { /* * Translate system NFSv4 inheritance flags into libarchive internal structure */ -static struct { - int archive_inherit; - int platform_inherit; +static const struct { + const int archive_inherit; + const int platform_inherit; } acl_inherit_map[] = { #if HAVE_SUN_ACL /* Solaris ACL inheritance flags */ {ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACE_FILE_INHERIT_ACE}, @@ -882,7 +882,7 @@ sun_acl_is_trivial(acl_t *acl, mode_t mo /* * POSIX.1e ACLs marked with ACL_IS_TRIVIAL are compatible with * FreeBSD acl_is_trivial_np(). On Solaris they have 4 entries, - * incuding mask. + * including mask. */ if (acl->acl_type == ACLENT_T) { if (acl->acl_cnt == 4) Modified: projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c ============================================================================== --- projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c Fri Feb 17 20:19:38 2017 (r313896) @@ -452,26 +452,38 @@ process_extra(struct archive_read *a, co /* Zip64 extended information extra field. */ zip_entry->flags |= LA_USED_ZIP64; if (zip_entry->uncompressed_size == 0xffffffff) { - if (datasize < 8) - break; - zip_entry->uncompressed_size = - archive_le64dec(p + offset); + uint64_t t = 0; + if (datasize < 8 + || (t = archive_le64dec(p + offset)) > INT64_MAX) { + archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, + "Malformed 64-bit uncompressed size"); + return ARCHIVE_FAILED; + } + zip_entry->uncompressed_size = t; offset += 8; datasize -= 8; } if (zip_entry->compressed_size == 0xffffffff) { - if (datasize < 8) - break; - zip_entry->compressed_size = - archive_le64dec(p + offset); + uint64_t t = 0; + if (datasize < 8 + || (t = archive_le64dec(p + offset)) > INT64_MAX) { + archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, + "Malformed 64-bit compressed size"); + return ARCHIVE_FAILED; + } + zip_entry->compressed_size = t; offset += 8; datasize -= 8; } if (zip_entry->local_header_offset == 0xffffffff) { - if (datasize < 8) - break; - zip_entry->local_header_offset = - archive_le64dec(p + offset); + uint64_t t = 0; + if (datasize < 8 + || (t = archive_le64dec(p + offset)) > INT64_MAX) { + archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, + "Malformed 64-bit local header offset"); + return ARCHIVE_FAILED; + } + zip_entry->local_header_offset = t; offset += 8; datasize -= 8; } @@ -1156,11 +1168,18 @@ zip_read_data_none(struct archive_read * || (zip->hctx_valid && zip->entry->aes_extra.vendor == AES_VENDOR_AE_2))) { if (zip->entry->flags & LA_USED_ZIP64) { + uint64_t compressed, uncompressed; zip->entry->crc32 = archive_le32dec(p + 4); - zip->entry->compressed_size = - archive_le64dec(p + 8); - zip->entry->uncompressed_size = - archive_le64dec(p + 16); + compressed = archive_le64dec(p + 8); + uncompressed = archive_le64dec(p + 16); + if (compressed > INT64_MAX || uncompressed > INT64_MAX) { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_FILE_FORMAT, + "Overflow of 64-bit file sizes"); + return ARCHIVE_FAILED; + } + zip->entry->compressed_size = compressed; + zip->entry->uncompressed_size = uncompressed; zip->unconsumed = 24; } else { zip->entry->crc32 = archive_le32dec(p + 4); @@ -1437,9 +1456,18 @@ zip_read_data_deflate(struct archive_rea zip->unconsumed = 4; } if (zip->entry->flags & LA_USED_ZIP64) { + uint64_t compressed, uncompressed; zip->entry->crc32 = archive_le32dec(p); - zip->entry->compressed_size = archive_le64dec(p + 4); - zip->entry->uncompressed_size = archive_le64dec(p + 12); + compressed = archive_le64dec(p + 4); + uncompressed = archive_le64dec(p + 12); + if (compressed > INT64_MAX || uncompressed > INT64_MAX) { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_FILE_FORMAT, + "Overflow of 64-bit file sizes"); + return ARCHIVE_FAILED; + } + zip->entry->compressed_size = compressed; + zip->entry->uncompressed_size = uncompressed; zip->unconsumed += 20; } else { zip->entry->crc32 = archive_le32dec(p); Modified: projects/clang400-import/contrib/libarchive/libarchive/archive_write_disk_acl.c ============================================================================== --- projects/clang400-import/contrib/libarchive/libarchive/archive_write_disk_acl.c Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libarchive/libarchive/archive_write_disk_acl.c Fri Feb 17 20:19:38 2017 (r313896) @@ -101,7 +101,7 @@ archive_write_disk_set_acls(struct archi ACL_TYPE_DEFAULT, ARCHIVE_ENTRY_ACL_TYPE_DEFAULT, "default"); #endif /* !HAVE_SUN_ACL */ - /* Simultaeous POSIX.1e and NFSv4 is not supported */ + /* Simultaneous POSIX.1e and NFSv4 is not supported */ return (ret); } #endif /* !HAVE_DARWIN_ACL */ @@ -119,9 +119,9 @@ archive_write_disk_set_acls(struct archi /* * Translate system ACL permissions into libarchive internal structure */ -static struct { - int archive_perm; - int platform_perm; +static const struct { + const int archive_perm; + const int platform_perm; } acl_perm_map[] = { #if HAVE_SUN_ACL /* Solaris NFSv4 ACL permissions */ {ARCHIVE_ENTRY_ACL_EXECUTE, ACE_EXECUTE}, @@ -188,9 +188,9 @@ static struct { /* * Translate system NFSv4 inheritance flags into libarchive internal structure */ -static struct { - int archive_inherit; - int platform_inherit; +static const struct { + const int archive_inherit; + const int platform_inherit; } acl_inherit_map[] = { #if HAVE_SUN_ACL /* Solaris NFSv4 inheritance flags */ {ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACE_FILE_INHERIT_ACE}, Modified: projects/clang400-import/contrib/libarchive/libarchive/archive_write_set_format_pax.c ============================================================================== --- projects/clang400-import/contrib/libarchive/libarchive/archive_write_set_format_pax.c Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libarchive/libarchive/archive_write_set_format_pax.c Fri Feb 17 20:19:38 2017 (r313896) @@ -1166,7 +1166,8 @@ archive_write_pax_header(struct archive_ if ((acl_types & ARCHIVE_ENTRY_ACL_TYPE_NFS4) != 0) { ret = add_pax_acl(a, entry_original, pax, ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID | - ARCHIVE_ENTRY_ACL_STYLE_SEPARATOR_COMMA); + ARCHIVE_ENTRY_ACL_STYLE_SEPARATOR_COMMA | + ARCHIVE_ENTRY_ACL_STYLE_COMPACT); if (ret == ARCHIVE_FATAL) return (ARCHIVE_FATAL); } Modified: projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_pax_nfs4.tar.uu ============================================================================== --- projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_pax_nfs4.tar.uu Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_pax_nfs4.tar.uu Fri Feb 17 20:19:38 2017 (r313896) @@ -1,8 +1,8 @@ begin 644 test_acl_pax_nfs4.tar M4&%X2&5A9&5R+V9I;&4````````````````````````````````````````` M```````````````````````````````````````````````````````````` -M`````````````#`P,#<W-R``,#`P,#`P(``P,#`P,#`@`#`P,#`P,#`P,C`R -M(#`P,#`P,#`P,#`P(#`Q,C`P,0`@>``````````````````````````````` +M`````````````#`P,#<W-R``,#`P,#`P(``P,#`P,#`@`#`P,#`P,#`P,3,R +M(#`P,#`P,#`P,#`P(#`Q,C`P,P`@>``````````````````````````````` M```````````````````````````````````````````````````````````` M``````````````````````````````````````````!U<W1A<@`P,``````` M```````````````````````````````````````````````````````````` @@ -10,10 +10,10 @@ M```````````````````P,#`P,#`@`#`P,#`P,"` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` -M```````````````````````Q,S`@4T-(24Q9+F%C;"YA8V4];W=N97)`.G)W -M>'`M+6%!4E=C0V]S.BTM+2TM+2TZ86QL;W<L9W)O=7!`.G)W+7`M+6$M4BUC -M+2US.BTM+2TM+2TZ86QL;W<L979E<GEO;F5`.G(M+2TM+6$M4BUC+2US.BTM -M+2TM+2TZ86QL;W<*```````````````````````````````````````````` +M```````````````````````Y,"!30TA)3%DN86-L+F%C93UO=VYE<D`Z<G=X +M<&%!4E=C0V]S.CIA;&QO=RQG<F]U<$`Z<G=P85)C<SHZ86QL;W<L979E<GEO +M;F5`.G)A4F-S.CIA;&QO=PH````````````````````````````````````` +M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` @@ -36,7 +36,7 @@ M``````````````````````````````````````` M````````4&%X2&5A9&5R+V9I;&4````````````````````````````````` M```````````````````````````````````````````````````````````` M`````````````````````#`P,#<W-R``,#`P,#`P(``P,#`P,#`@`#`P,#`P -M,#`P-#`V(#`P,#`P,#`P,#`P(#`Q,C`P-P`@>``````````````````````` +M,#`P,C4V(#`P,#`P,#`P,#`P(#`Q,C`Q,@`@>``````````````````````` M```````````````````````````````````````````````````````````` M``````````````````````````````````````````````````!U<W1A<@`P M,``````````````````````````````````````````````````````````` @@ -44,13 +44,13 @@ M```````````````````````````P,#`P,#`@`#` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` -M```````````````````````````````R-C(@4T-(24Q9+F%C;"YA8V4];W=N -M97)`.G)W+7`M+6%!4E=C0V]S.BTM+2TM+2TZ86QL;W<L=7-E<CIU<V5R-S<Z -M<BTM+2TM82U2+6,M+7,Z+2TM+2TM23IA;&QO=SHW-RQU<V5R.G5S97(W.#IR -M=W@M+2TM+2TM+2TM+3HM+2TM+2TM.F1E;GDZ-S@L9W)O=7!`.G)W+7`M+6$M -M4BUC+2US.BTM+2TM+2TZ86QL;W<L9W)O=7`Z9W)O=7`W.#HM=RUP+2TM02U7 -M+4-O+3HM+2TM+2TM.F1E;GDZ-S@L979E<GEO;F5`.G(M+2TM+6$M4BUC+2US -M.BTM+2TM+2TZ86QL;W<*```````````````````````````````````````` +M```````````````````````````````Q-S0@4T-(24Q9+F%C;"YA8V4];W=N +M97)`.G)W<&%!4E=C0V]S.CIA;&QO=RQU<V5R.G5S97(W-SIR85)C<SI).F%L +M;&]W.C<W+'5S97(Z=7-E<C<X.G)W>#HZ9&5N>3HW."QG<F]U<$`Z<G=P85)C +M<SHZ86QL;W<L9W)O=7`Z9W)O=7`W.#IW<$%70V\Z.F1E;GDZ-S@L979E<GEO +M;F5`.G)A4F-S.CIA;&QO=PH````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` @@ -70,7 +70,7 @@ M``````````````````````````````````````` M````````````````4&%X2&5A9&5R+V9I;&4````````````````````````` M```````````````````````````````````````````````````````````` M`````````````````````````````#`P,#<W-R``,#`P,#`P(``P,#`P,#`@ -M`#`P,#`P,#`P-#$P(#`P,#`P,#`P,#`P(#`Q,C`P,@`@>``````````````` +M`#`P,#`P,#`P,C8R(#`P,#`P,#`P,#`P(#`Q,C`P-P`@>``````````````` M```````````````````````````````````````````````````````````` M``````````````````````````````````````````````````````````!U M<W1A<@`P,``````````````````````````````````````````````````` @@ -78,13 +78,13 @@ M```````````````````````````````````P,#` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` -M```````````````````````````````````````R-C0@4T-(24Q9+F%C;"YA -M8V4];W=N97)`.G)W>'`M+6%!4E=C0V]S.BTM+2TM+2TZ86QL;W<L=7-E<CIU -M<V5R-S<Z<G<M<"TM82U2+6,M;W,Z+2TM+2TM+3IA;&QO=SHW-RQU<V5R.G5S -M97(W-SHM=RUP+2TM+2TM+2TM+3HM+2TM4RTM.F%U9&ET.C<W+&=R;W5P0#IR -M=RUP+2UA+5(M8RTM<SHM+2TM+2TM.F%L;&]W+&=R;W5P.F=R;W5P-S@Z<BTM -M+2TM82U2+6,M+2TZ+2TM+2U&+3IA;&%R;3HW."QE=F5R>6]N94`Z<BTM+2TM -M82U2+6,M+7,Z+2TM+2TM+3IA;&QO=PH````````````````````````````` +M```````````````````````````````````````Q-S@@4T-(24Q9+F%C;"YA +M8V4];W=N97)`.G)W>'!A05)78T-O<SHZ86QL;W<L=7-E<CIU<V5R-S<Z<G=P +M85)C;W,Z.F%L;&]W.C<W+'5S97(Z=7-E<C<W.G=P.E,Z875D:70Z-S<L9W)O +M=7!`.G)W<&%28W,Z.F%L;&]W+&=R;W5P.F=R;W5P-S@Z<F%28SI&.F%L87)M +M.C<X+&5V97)Y;VYE0#IR85)C<SHZ86QL;W<*```````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` Modified: projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_platform_posix1e.c ============================================================================== --- projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_platform_posix1e.c Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_platform_posix1e.c Fri Feb 17 20:19:38 2017 (r313896) @@ -472,7 +472,7 @@ DEFINE_TEST(test_acl_platform_posix1e_re return; } #if HAVE_SUN_ACL - /* Check if Solars filesystem supports POSIX.1e ACLs */ + /* Check if Solaris filesystem supports POSIX.1e ACLs */ n = facl_get(fd, 0, &acl); if (n != 0) close(fd); Modified: projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_text.c ============================================================================== --- projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_text.c Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_text.c Fri Feb 17 20:19:38 2017 (r313896) @@ -221,7 +221,14 @@ const char* acltext[] = { "group:group78:r-----a-R-c---:------I:allow:78\n" "owner@:rwxp--aARWcCo-:-------:allow\n" "group@:rw-p--a-R-c---:-------:allow\n" - "everyone@:r-----a-R-c--s:-------:allow" + "everyone@:r-----a-R-c--s:-------:allow", + + "user:user77:rwpaRco::allow:77\n" + "user:user101:wpdD:fdin:deny:101\n" + "group:group78:raRc:I:allow:78\n" + "owner@:rwxpaARWcCo::allow\n" + "group@:rwpaRc::allow\n" + "everyone@:raRcs::allow" }; static wchar_t * @@ -458,5 +465,9 @@ DEFINE_TEST(test_acl_to_text) /* NFSv4 ACLs like "getfacl -i" on FreeBSD */ compare_acl_text(ae, ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID, acltext[10]); + /* NFSv4 ACLs like "getfacl -i" on FreeBSD with stripped minus chars */ + compare_acl_text(ae, ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID | + ARCHIVE_ENTRY_ACL_STYLE_COMPACT, acltext[11]); + archive_entry_free(ae); } Modified: projects/clang400-import/contrib/libpcap/CHANGES ============================================================================== --- projects/clang400-import/contrib/libpcap/CHANGES Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libpcap/CHANGES Fri Feb 17 20:19:38 2017 (r313896) @@ -1,5 +1,80 @@ +Tuesday, Oct. 25, 2016 mcr@sandelman.ca + Summary for 1.8.1 libpcap release + Add a target in Makefile.in for Exuberant Ctags use: 'extags'. + Rename configure.in to configure.ac: autoconf 2.59 + Clean up the name-to-DLT mapping table. + Add some newer DLT_ values: IPMI_HPM_2,ZWAVE_R1_R2,ZWAVE_R3,WATTSTOPPER_DLM,ISO_14443,RDS + Clarify what the return values are for both success and failure. + Many changes to build on windows + Check for the "break the loop" condition in the inner loop for TPACKET_V3. + Fix handling of packet count in the TPACKET_V3 inner loop: GitHub issue #493. + Filter out duplicate looped back CAN frames. + Fix the handling of loopback filters for IPv6 packets. + Add a link-layer header type for RDS (IEC 62106) groups. + Use different intermediate folders for x86 and x64 builds on Windows. + On Linux, handle all CAN captures with pcap-linux.c, in cooked mode. + Removes the need for the "host-endian" link-layer header type. + Compile with '-Wused-but-marked-unused' in devel mode if supported + Have separate DLTs for big-endian and host-endian SocketCAN headers. + Reflect version.h being renamed to pcap_version.h. + Require that version.h be generated: all build procedures we support generate version.h (autoconf, CMake, MSVC)! + Properly check for sock_recv() errors. + Re-impose some of Winsock's limitations on sock_recv(). + Replace sprintf() with pcap_snprintf(). + Fix signature of pcap_stats_ex_remote(). + Initial cmake support for remote packet capture. + Have rpcap_remoteact_getsock() return a SOCKET and supply an "is active" flag. + Clean up {DAG, Septel, Myricom SNF}-only builds. + Do UTF-16-to-ASCII conversion into the right place. + pcap_create_interface() needs the interface name on Linux. + Clean up hardware time stamp support: the "any" device does not support any time stamp types. + Add support for capturing on FreeBSD usbusN interfaces. + Add a LINKTYPE/DLT_ value for FreeBSD USB. + Go back to using PCAP_API on Windows. + CMake support + Add TurboCap support from WinPcap. + Recognize 802.1ad nested VLAN tag in vlan filter. + +Thursday Sep. 3, 2015 guy@alum.mit.edu + Summary for 1.7.5 libpcap release + Man page cleanups. + Add some allocation failure checks. + Fix a number of Linux/ucLinux configure/build issues. + Fix some memory leaks. + Recognize 802.1ad nested VLAN tag in vlan filter. + Fix building Bluetooth Linux Monitor support with BlueZ 5.1+ + +Saturday Jun. 27, 2015 mcr@sandelman.ca + Summary for 1.7.4 libpcap release + Include fix for GitHub issue #424 -- out of tree builds. + +Friday Apr. 10, 2015 guy@alum.mit.edu + Summary for 1.7.3 libpcap release + Work around a Linux bonding driver bug. + +Thursday Feb. 12, 2015 guy@alum.mit.edu/mcr@sandelman.ca + Summary for 1.7.2 libpcap release + Support for filtering Geneve encapsulated packets. + Generalize encapsulation handling, fixing some bugs. + Don't add null addresses to address lists. + Add pcap_dump_open_append() to open for appending. + Fix the swapping of isochronous descriptors in Linux USB. + Attempt to handle TPACKET_V1 with 32-bit userland and 64-bit kernel. + +Wednesday Nov. 12, 2014 guy@alum.mit.edu/mcr@sandelman.ca + Summary for 1.7.0 libpcap release + Fix handling of zones for BPF on Solaris + new DLT for ZWAVE + clarifications for read timeouts. + Use BPF extensions in compiled filters, fixing VLAN filters + some fixes to compilation without stdint.h + EBUSY can now be returned by SNFv3 code. + Fix the range checks in BPF loads + Various DAG fixes. + Various Linux fixes. + Monday Aug. 12, 2014 guy@alum.mit.edu - Summary for 1.6.2 tcpdump release + Summary for 1.6.2 libpcap release Don't crash on filters testing a non-existent link-layer type field. Fix sending in non-blocking mode on Linux with memory-mapped @@ -8,12 +83,12 @@ Monday Aug. 12, 2014 guy@alum.mit.edu machines. Saturday Jul. 19, 2014 mcr@sandelman.ca - Summary for 1.6.1 tcpdump release + Summary for 1.6.1 libpcap release some fixes for the any device - changes for how --enable-XXX works + changes for how --enable-XXX (--enable-sniffing, --enable-can) works Wednesday Jul. 2, 2014 mcr@sandelman.ca - Summary for 1.6.0 tcpdump release + Summary for 1.6.0 libpcap release Don't support D-Bus sniffing on OS X fixes for byte order issues with NFLOG captures Handle using cooked mode for DLT_NETLINK in activate_new(). Modified: projects/clang400-import/contrib/libpcap/CREDITS ============================================================================== --- projects/clang400-import/contrib/libpcap/CREDITS Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libpcap/CREDITS Fri Feb 17 20:19:38 2017 (r313896) @@ -2,11 +2,12 @@ This file lists people who have contribu The current maintainers: Bill Fenner <fenner at research dot att dot com> - Denis Ovsienko <infrastation at yandex dot ru> + Denis Ovsienko <denis at ovsienko dot info> Fulvio Risso <risso at polito dot it> Guy Harris <guy at alum dot mit dot edu> Hannes Gredler <hannes at juniper dot net> Michael Richardson <mcr at sandelman dot ottawa dot on dot ca> + Francois-Xavier Le Bail <fx dot lebail at yahoo dot com> Additional people who have contributed patches: @@ -45,7 +46,7 @@ Additional people who have contributed p David Young <dyoung at ojctech dot com> Dean Gaudet <dean at arctic dot org> dhruv <rsrivat at sourceforge dot net> - Don Ebright <Don dot Ebright at compuware dot com> + Don Ebright <Don dot Ebright at compuware dot com> Dug Song <dugsong at monkey dot org> Dustin Spicuzza <dustin at virtualroadside dot com> dzejarczech <dzejarczech at sourceforge dot net> @@ -83,6 +84,7 @@ Additional people who have contributed p Jefferson Ogata <jogata at nodc dot noaa dot gov> Jesper Dangaard Brouer <hawk at comx dot dk> Jesper Peterson <jesper at endace dot com> + Jesse Gross <jesse at nicira dot com> Jiri Slaby <jirislaby at gmail dot com> Joerg Mayer <jmayer at loplof dot de> John Bankier <jbankier at rainfinity dot com> @@ -105,6 +107,7 @@ Additional people who have contributed p Mansour Behabadi <mansour at oxplot dot com> Marcus Felipe Pereira <marcus at task dot com dot br> Mark C. Brown <mbrown at hp dot com> + Mark Johnston <markjdb at gmail dot com> Mark Pizzolato <List-tcpdump-workers at subscriptions dot pizzolato dot net> Markus Mayer <markus_mayer at sourceforge dot net> Martin Husemann <martin at netbsd dot org> Modified: projects/clang400-import/contrib/libpcap/INSTALL.txt ============================================================================== --- projects/clang400-import/contrib/libpcap/INSTALL.txt Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libpcap/INSTALL.txt Fri Feb 17 20:19:38 2017 (r313896) @@ -16,7 +16,7 @@ does support packet capture but libpcap particular type. (If you have HP-UX, see below.) If your system uses a packet capture not supported by libpcap, please send us patches; don't forget to include an autoconf fragment suitable for use in -configure.in. +configure.ac. It is possible to override the default packet capture type, although the circumstance where this works are limited. For example if you have @@ -31,40 +31,22 @@ You will need an ANSI C compiler to buil will abort if your compiler is not ANSI compliant. If this happens, use the generally available GNU C compiler (GCC). -If you use flex, you must use version 2.4.6 or higher. The configure -script automatically detects the version of flex and will not use it -unless it is new enough. You can use "flex -V" to see what version you -have (unless it's really old). The current version of flex is available -at flex.sourceforge.net and often comes packaged by means of the OS. -As of this writing, the current version is 2.5.37. - -If you use bison, you must use flex (and visa versa). The configure -script automatically falls back to lex and yacc if both flex and bison -are not found. - -Sometimes the stock C compiler does not interact well with flex and -bison. The list of problems includes undefined references for alloca. -You can get around this by installing gcc or manually disabling flex -and bison with: - - ./configure --without-flex --without-bison - -If your system only has AT&T lex, this is okay unless your libpcap -program uses other lex/yacc generated code. (Although it's possible to -map the yy* identifiers with a script, we use flex and bison so we -don't feel this is necessary.) - -Some systems support the Berkeley Packet Filter natively; for example -out of the box OSF and BSD/OS have bpf. If your system does not support -bpf, you will need to pick up: - - ftp://ftp.ee.lbl.gov/bpf-*.tar.Z - -Note well: you MUST have kernel source for your operating system in -order to install bpf. An exception is SunOS 4; the bpf distribution -includes replacement kernel objects for some of the standard SunOS 4 -network device drivers. See the bpf INSTALL document for more -information. +You will need either Flex 2.5.31 or later, or a version of Lex +compatible with it (if any exist), to build libpcap. The configure +script will abort if there isn't any such program. If you have an older +version of Flex, or don't have a compatible version of Lex, the current +version of flex is available at flex.sourceforge.net. + +You will need either Bison, Berkeley YACC, or a version of YACC +compatible with them (if any exist), to build libpcap. The configure +script will abort if there isn't any such program. If you don't have +any such program, the current version of Bison can be found at +http://ftp.gnu.org/gnu/bison/ and the current version of Berkeley YACC +can be found at http://invisible-island.net/byacc/. + +Sometimes the stock C compiler does not interact well with Flex and +Bison. The list of problems includes undefined references for alloca. +You can get around this by installing GCC. If you use Solaris, there is a bug with bufmod(7) that is fixed in Solaris 2.3.2 (aka SunOS 5.3.2). Setting a snapshot length with the @@ -178,14 +160,14 @@ packet timestamps aren't very good. Thi handling of the timestamp in the kernel. Note well: there is rumoured to be a version of tcpdump floating around -called 3.0.3 that includes libpcap and is supposed to support Linux. +called 3.0.3 that includes libpcap and is supposed to support Linux. You should be advised that neither the Network Research Group at LBNL -nor the Tcpdump Group ever generated a release with this version number. +nor the Tcpdump Group ever generated a release with this version number. The LBNL Network Research Group notes with interest that a standard cracker trick to get people to install trojans is to distribute bogus -packages that have a version number higher than the current release. +packages that have a version number higher than the current release. They also noted with annoyance that 90% of the Linux related bug reports -they got are due to changes made to unofficial versions of their page. +they got are due to changes made to unofficial versions of their page. If you are having trouble but aren't using a version that came from tcpdump.org, please try that before submitting a bug report! @@ -239,11 +221,11 @@ the libpcap 0.6.2 source release, so thi build without changes on UnixWare 7. If linking tcpdump fails with "Undefined: _alloca" when using bison on -a Sun4, your version of bison is broken. In any case version 1.16 or +a Sun4, your version of Bison is broken. In any case version 1.16 or higher is recommended (1.14 is known to cause problems 1.16 is known to work). Either pick up a current version from: - ftp://ftp.gnu.org/pub/gnu/bison + http://ftp.gnu.org/gnu/bison/ or hack around it by inserting the lines: @@ -289,6 +271,7 @@ FILES CHANGES - description of differences between releases ChmodBPF/* - Mac OS X startup item to set ownership and permissions on /dev/bpf* +CMakeLists.txt - CMake file CREDITS - people that have helped libpcap along INSTALL.txt - this file LICENSE - the license under which tcpdump is distributed @@ -317,7 +300,7 @@ config.guess - autoconf support config.h.in - autoconf input config.sub - autoconf support configure - configure script (run this first) -configure.in - configure script source +configure.ac - configure script source dlpisubs.c - DLPI-related functions for pcap-dlpi.c and pcap-libdlpi.c dlpisubs.h - DLPI-related function declarations etherent.c - /etc/ethers support routines @@ -325,9 +308,6 @@ ethertype.h - Ethernet protocol types an fad-getad.c - pcap_findalldevs() for systems with getifaddrs() fad-gifc.c - pcap_findalldevs() for systems with only SIOCGIFLIST fad-glifc.c - pcap_findalldevs() for systems with SIOCGLIFCONF -fad-null.c - pcap_findalldevs() for systems without capture support -fad-sita.c - pcap_findalldevs() for systems with SITA support -fad-win32.c - pcap_findalldevs() for WinPcap filtertest.c - test program for BPF compiler findalldevstest.c - test program for pcap_findalldevs() gencode.c - BPF code generation routines @@ -345,7 +325,6 @@ nametoaddr.c - hostname to address routi nlpid.h - OSI network layer protocol identifier definitions net - symlink to bpf/net optimize.c - BPF optimization routines -packaging - packaging information for building libpcap RPMs pcap/bluetooth.h - public definition of DLT_BLUETOOTH_HCI_H4_WITH_PHDR header pcap/bpf.h - BPF definitions pcap/namedb.h - public libpcap name database definitions @@ -389,7 +368,6 @@ pcap_*.3pcap - manual entries for librar pcap-filter.4 - manual entry for filter syntax pcap-linktype.4 - manual entry for link-layer header types ppp.h - Point to Point Protocol definitions -runlex.sh - wrapper for Lex/Flex savefile.c - offline support scanner.l - filter string scanner sunatmpos.h - definitions for SunATM capturing Modified: projects/clang400-import/contrib/libpcap/LICENSE ============================================================================== --- projects/clang400-import/contrib/libpcap/LICENSE Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libpcap/LICENSE Fri Feb 17 20:19:38 2017 (r313896) @@ -1,9 +1,9 @@ License: BSD - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright @@ -13,7 +13,7 @@ are met: 3. The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Modified: projects/clang400-import/contrib/libpcap/Makefile-devel-adds ============================================================================== --- projects/clang400-import/contrib/libpcap/Makefile-devel-adds Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libpcap/Makefile-devel-adds Fri Feb 17 20:19:38 2017 (r313896) @@ -2,12 +2,12 @@ # Auto-regenerate configure script or Makefile when things change. # From autoconf.info . Works best with GNU Make. # -${srcdir}/configure: configure.in aclocal.m4 +${srcdir}/configure: configure.ac aclocal.m4 cd ${srcdir} && autoconf # autoheader might not change config.h.in, so touch a stamp file. ${srcdir}/config.h.in: ${srcdir}/stamp-h.in -${srcdir}/stamp-h.in: configure.in aclocal.m4 +${srcdir}/stamp-h.in: configure.ac aclocal.m4 cd ${srcdir} && autoheader echo timestamp > ${srcdir}/stamp-h.in Modified: projects/clang400-import/contrib/libpcap/Makefile.in ============================================================================== --- projects/clang400-import/contrib/libpcap/Makefile.in Fri Feb 17 20:15:27 2017 (r313895) +++ projects/clang400-import/contrib/libpcap/Makefile.in Fri Feb 17 20:19:38 2017 (r313896) @@ -49,12 +49,13 @@ LN_S = @LN_S@ MKDEP = @MKDEP@ CCOPT = @V_CCOPT@ INCLS = -I. @V_INCLS@ -DEFS = @DEFS@ @V_DEFS@ +DEFS = -DBUILDING_PCAP @DEFS@ @V_DEFS@ ADDLOBJS = @ADDLOBJS@ ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@ LIBS = @LIBS@ -CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ +CROSSFLAGS= +CFLAGS = @CFLAGS@ ${CROSSFLAGS} +LDFLAGS = @LDFLAGS@ ${CROSSFLAGS} DYEXT = @DYEXT@ V_RPATH_OPT = @V_RPATH_OPT@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702172019.v1HKJdDB091924>