Date: Tue, 03 Sep 2019 14:05:52 -0000 From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345679 - in projects/fuse2: . bin/date bin/dd cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall contrib/elftoolchain/libdwarf contrib/elftoolchain/readelf contrib/elftoolchai... Message-ID: <201903290325.x2T3PKJq096386@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Fri Mar 29 03:25:20 2019 New Revision: 345679 URL: https://svnweb.freebsd.org/changeset/base/345679 Log: MFHead@r345677 Added: projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_zip_bz2_hang.zip.uu - copied unchanged from r345677, head/contrib/libarchive/libarchive/test/test_read_format_zip_bz2_hang.zip.uu projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_zip_ppmd8_crash_1.zipx.uu - copied unchanged from r345677, head/contrib/libarchive/libarchive/test/test_read_format_zip_ppmd8_crash_1.zipx.uu projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_zip_ppmd8_crash_2.zipx.uu - copied unchanged from r345677, head/contrib/libarchive/libarchive/test/test_read_format_zip_ppmd8_crash_2.zipx.uu projects/fuse2/libexec/rc/rc.d/ippool - copied unchanged from r345677, head/libexec/rc/rc.d/ippool projects/fuse2/sys/conf/dtb.build.mk - copied unchanged from r345677, head/sys/conf/dtb.build.mk projects/fuse2/sys/geom/geom_flashmap.h - copied unchanged from r345677, head/sys/geom/geom_flashmap.h projects/fuse2/sys/geom/label/g_label_flashmap.c - copied unchanged from r345677, head/sys/geom/label/g_label_flashmap.c projects/fuse2/sys/powerpc/powernv/opal_hmi.c - copied unchanged from r345677, head/sys/powerpc/powernv/opal_hmi.c projects/fuse2/tests/sys/netpfil/pf/CVE-2019-5598.py - copied unchanged from r345677, head/tests/sys/netpfil/pf/CVE-2019-5598.py projects/fuse2/tests/sys/netpfil/pf/icmp.sh - copied unchanged from r345677, head/tests/sys/netpfil/pf/icmp.sh projects/fuse2/tests/sys/netpfil/pf/sniffer.py - copied unchanged from r345677, head/tests/sys/netpfil/pf/sniffer.py projects/fuse2/tools/build/options/WITHOUT_RETPOLINE - copied unchanged from r345677, head/tools/build/options/WITHOUT_RETPOLINE Deleted: projects/fuse2/sys/powerpc/aim/isa3_hashtb.c Modified: projects/fuse2/Makefile.inc1 projects/fuse2/UPDATING projects/fuse2/bin/date/date.1 projects/fuse2/bin/date/date.c projects/fuse2/bin/dd/dd.1 projects/fuse2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c projects/fuse2/contrib/elftoolchain/libdwarf/libdwarf_lineno.c projects/fuse2/contrib/elftoolchain/readelf/readelf.c projects/fuse2/contrib/elftoolchain/strings/strings.c projects/fuse2/contrib/libarchive/libarchive/archive_blake2sp_ref.c projects/fuse2/contrib/libarchive/libarchive/archive_entry.c projects/fuse2/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar5.c projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_zip.c projects/fuse2/contrib/libarchive/libarchive/archive_string.c projects/fuse2/contrib/libarchive/libarchive/archive_write_disk_posix.c projects/fuse2/contrib/libarchive/libarchive/archive_write_set_format_7zip.c projects/fuse2/contrib/libarchive/libarchive/test/test_entry.c projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar5.c projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_xar.c projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_zip.c projects/fuse2/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp projects/fuse2/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c projects/fuse2/contrib/tzdata/Makefile projects/fuse2/contrib/tzdata/NEWS projects/fuse2/contrib/tzdata/README projects/fuse2/contrib/tzdata/africa projects/fuse2/contrib/tzdata/asia projects/fuse2/contrib/tzdata/backward projects/fuse2/contrib/tzdata/backzone projects/fuse2/contrib/tzdata/etcetera projects/fuse2/contrib/tzdata/europe projects/fuse2/contrib/tzdata/leap-seconds.list projects/fuse2/contrib/tzdata/leapseconds projects/fuse2/contrib/tzdata/northamerica projects/fuse2/contrib/tzdata/theory.html projects/fuse2/contrib/tzdata/version projects/fuse2/crypto/openssh/readconf.c projects/fuse2/crypto/openssh/scp.c projects/fuse2/gnu/usr.bin/binutils/as/Makefile projects/fuse2/gnu/usr.bin/binutils/ld/Makefile projects/fuse2/gnu/usr.bin/binutils/objcopy/Makefile projects/fuse2/gnu/usr.bin/binutils/objdump/Makefile projects/fuse2/lib/libarchive/tests/Makefile projects/fuse2/lib/libc/Makefile projects/fuse2/lib/libc/gen/arc4random.3 projects/fuse2/lib/libc/gen/fts-compat.c projects/fuse2/lib/libc/gen/fts-compat11.c projects/fuse2/lib/libc/gen/fts.c projects/fuse2/lib/libc/gen/sysctl.3 projects/fuse2/lib/libthr/Makefile projects/fuse2/lib/libutil/pidfile.c projects/fuse2/lib/libutil/tests/pidfile_test.c projects/fuse2/lib/libvgl/bitmap.c projects/fuse2/lib/libvgl/main.c projects/fuse2/lib/libvgl/mouse.c projects/fuse2/lib/libvgl/simple.c projects/fuse2/lib/libvgl/text.c projects/fuse2/lib/libvgl/vgl.3 projects/fuse2/lib/libvgl/vgl.h projects/fuse2/libexec/rc/rc.conf projects/fuse2/libexec/rc/rc.d/Makefile projects/fuse2/libexec/rc/rc.d/ipfw projects/fuse2/libexec/rtld-elf/Makefile projects/fuse2/libexec/rtld-elf/rtld.c projects/fuse2/release/arm64/PINE64-LTS.conf projects/fuse2/release/arm64/PINE64.conf projects/fuse2/release/arm64/PINEBOOK.conf projects/fuse2/release/arm64/RPI3.conf projects/fuse2/sbin/camcontrol/fwdownload.c projects/fuse2/sbin/fsck_msdosfs/dir.c projects/fuse2/sbin/init/init.c projects/fuse2/secure/usr.bin/ssh/Makefile projects/fuse2/share/examples/etc/make.conf projects/fuse2/share/man/man4/Makefile projects/fuse2/share/man/man4/geom_uzip.4 projects/fuse2/share/man/man4/tcp.4 projects/fuse2/share/man/man5/rc.conf.5 projects/fuse2/share/misc/committers-src.dot projects/fuse2/share/misc/iso3166 projects/fuse2/share/mk/bsd.cpu.mk projects/fuse2/share/mk/googletest.test.inc.mk projects/fuse2/share/mk/src.opts.mk projects/fuse2/stand/common/disk.c projects/fuse2/stand/common/disk.h projects/fuse2/stand/efi/libefi/efipart.c projects/fuse2/stand/efi/loader/main.c projects/fuse2/stand/i386/libi386/biosdisk.c projects/fuse2/stand/i386/zfsboot/Makefile projects/fuse2/stand/libsa/zfs/zfs.c projects/fuse2/stand/lua/config.lua projects/fuse2/stand/lua/menu.lua projects/fuse2/stand/lua/password.lua projects/fuse2/stand/mips/beri/loader/beri_disk_cfi.c projects/fuse2/stand/mips/beri/loader/beri_disk_sdcard.c projects/fuse2/stand/uboot/common/main.c projects/fuse2/stand/uboot/lib/disk.c projects/fuse2/stand/usb/storage/umass_loader.c projects/fuse2/stand/userboot/userboot/main.c projects/fuse2/stand/userboot/userboot/userboot_disk.c projects/fuse2/sys/amd64/amd64/fpu.c projects/fuse2/sys/amd64/amd64/pmap.c projects/fuse2/sys/amd64/linux/linux_dummy.c projects/fuse2/sys/amd64/linux/linux_machdep.c projects/fuse2/sys/amd64/linux/linux_proto.h projects/fuse2/sys/amd64/linux/linux_syscall.h projects/fuse2/sys/amd64/linux/linux_syscalls.c projects/fuse2/sys/amd64/linux/linux_sysent.c projects/fuse2/sys/amd64/linux/linux_systrace_args.c projects/fuse2/sys/amd64/linux/syscalls.master projects/fuse2/sys/amd64/linux32/linux32_dummy.c projects/fuse2/sys/amd64/linux32/linux32_machdep.c projects/fuse2/sys/amd64/linux32/linux32_proto.h projects/fuse2/sys/amd64/linux32/linux32_syscall.h projects/fuse2/sys/amd64/linux32/linux32_syscalls.c projects/fuse2/sys/amd64/linux32/linux32_sysent.c projects/fuse2/sys/amd64/linux32/linux32_systrace_args.c projects/fuse2/sys/amd64/linux32/syscalls.master projects/fuse2/sys/arm64/arm64/identcpu.c projects/fuse2/sys/arm64/arm64/nexus.c projects/fuse2/sys/arm64/conf/GENERIC projects/fuse2/sys/cam/cam_periph.c projects/fuse2/sys/cam/cam_periph.h projects/fuse2/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/fuse2/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/fuse2/sys/compat/linux/linux_fork.c projects/fuse2/sys/compat/linux/linux_ipc.c projects/fuse2/sys/compat/linux/linux_ipc.h projects/fuse2/sys/conf/dtb.mk projects/fuse2/sys/conf/files projects/fuse2/sys/conf/files.powerpc projects/fuse2/sys/conf/kern.post.mk projects/fuse2/sys/conf/kmod.mk projects/fuse2/sys/conf/options projects/fuse2/sys/dev/cfi/cfi_core.c projects/fuse2/sys/dev/cfi/cfi_reg.h projects/fuse2/sys/dev/cfi/cfi_var.h projects/fuse2/sys/dev/cxgbe/adapter.h projects/fuse2/sys/dev/cxgbe/t4_main.c projects/fuse2/sys/dev/cxgbe/t4_sge.c projects/fuse2/sys/dev/ena/ena.c projects/fuse2/sys/dev/ena/ena.h projects/fuse2/sys/dev/etherswitch/e6000sw/e6000sw.c projects/fuse2/sys/dev/intpm/intpm.c projects/fuse2/sys/dev/jedec_dimm/jedec_dimm.c projects/fuse2/sys/dev/mpr/mpr.c projects/fuse2/sys/dev/mpr/mpr_table.c projects/fuse2/sys/dev/mps/mps.c projects/fuse2/sys/dev/mps/mps_table.c projects/fuse2/sys/dev/neta/if_mvneta.c projects/fuse2/sys/dev/random/random_harvestq.c projects/fuse2/sys/dev/sdhci/sdhci.c projects/fuse2/sys/dev/sdhci/sdhci.h projects/fuse2/sys/dev/smartpqi/smartpqi_cam.c projects/fuse2/sys/dev/smartpqi/smartpqi_mem.c projects/fuse2/sys/dev/tpm/tpm20.c projects/fuse2/sys/dev/tpm/tpm20.h projects/fuse2/sys/dev/tpm/tpm_crb.c projects/fuse2/sys/dev/tpm/tpm_tis.c projects/fuse2/sys/dev/uart/uart_bus_pci.c projects/fuse2/sys/dev/uart/uart_cpu_arm64.c projects/fuse2/sys/dev/usb/controller/xhci_pci.c projects/fuse2/sys/dev/usb/wlan/if_run.c projects/fuse2/sys/fs/nullfs/null_vfsops.c projects/fuse2/sys/fs/tmpfs/tmpfs.h projects/fuse2/sys/fs/tmpfs/tmpfs_vfsops.c projects/fuse2/sys/geom/geom_flashmap.c projects/fuse2/sys/geom/label/g_label.c projects/fuse2/sys/geom/label/g_label.h projects/fuse2/sys/i386/i386/npx.c projects/fuse2/sys/i386/i386/pmap.c projects/fuse2/sys/i386/linux/linux.h projects/fuse2/sys/i386/linux/linux_dummy.c projects/fuse2/sys/i386/linux/linux_machdep.c projects/fuse2/sys/i386/linux/linux_proto.h projects/fuse2/sys/i386/linux/linux_syscall.h projects/fuse2/sys/i386/linux/linux_syscalls.c projects/fuse2/sys/i386/linux/linux_sysent.c projects/fuse2/sys/i386/linux/linux_systrace_args.c projects/fuse2/sys/i386/linux/syscalls.master projects/fuse2/sys/kern/imgact_elf.c projects/fuse2/sys/kern/kern_descrip.c projects/fuse2/sys/kern/kern_intr.c projects/fuse2/sys/kern/kern_mib.c projects/fuse2/sys/mips/atheros/ar71xx_gpio.c projects/fuse2/sys/mips/atheros/ar71xx_gpiovar.h projects/fuse2/sys/mips/conf/DIR-825C1 projects/fuse2/sys/modules/Makefile projects/fuse2/sys/modules/efirt/Makefile projects/fuse2/sys/modules/hwpmc_mips24k/Makefile projects/fuse2/sys/modules/hwpmc_mips74k/Makefile projects/fuse2/sys/modules/iflib/Makefile projects/fuse2/sys/modules/nvdimm/Makefile projects/fuse2/sys/modules/tmpfs/Makefile projects/fuse2/sys/modules/tpm/Makefile projects/fuse2/sys/net/if_bridge.c projects/fuse2/sys/net/if_lagg.c projects/fuse2/sys/net/iflib.c projects/fuse2/sys/netinet/ip_icmp.c projects/fuse2/sys/netinet/sctp.h projects/fuse2/sys/netinet/sctp_indata.c projects/fuse2/sys/netinet/sctp_output.c projects/fuse2/sys/netinet/sctp_pcb.c projects/fuse2/sys/netinet/sctp_ss_functions.c projects/fuse2/sys/netinet/sctp_structs.h projects/fuse2/sys/netinet/sctp_usrreq.c projects/fuse2/sys/netinet/sctputil.c projects/fuse2/sys/netinet/sctputil.h projects/fuse2/sys/netinet/tcp_output.c projects/fuse2/sys/netinet/tcp_subr.c projects/fuse2/sys/netinet/tcp_syncache.c projects/fuse2/sys/netinet/tcp_timer.c projects/fuse2/sys/netinet/tcp_timer.h projects/fuse2/sys/netpfil/ipfw/ip_fw2.c projects/fuse2/sys/netpfil/ipfw/ip_fw_pfil.c projects/fuse2/sys/netpfil/ipfw/ip_fw_private.h projects/fuse2/sys/netpfil/pf/pf.c projects/fuse2/sys/netpfil/pf/pf_ioctl.c projects/fuse2/sys/powerpc/aim/aim_machdep.c projects/fuse2/sys/powerpc/aim/moea64_native.c projects/fuse2/sys/powerpc/aim/trap_subr64.S projects/fuse2/sys/powerpc/booke/locore.S projects/fuse2/sys/powerpc/include/mmuvar.h projects/fuse2/sys/powerpc/include/spr.h projects/fuse2/sys/powerpc/include/trap.h projects/fuse2/sys/powerpc/ofw/ofwcall64.S projects/fuse2/sys/powerpc/powernv/opal.h projects/fuse2/sys/powerpc/powernv/opalcall.S projects/fuse2/sys/powerpc/powerpc/interrupt.c projects/fuse2/sys/powerpc/powerpc/swtch64.S projects/fuse2/sys/riscv/riscv/timer.c projects/fuse2/sys/sys/ctype.h projects/fuse2/sys/sys/random.h projects/fuse2/sys/vm/swap_pager.c projects/fuse2/sys/vm/vm_fault.c projects/fuse2/sys/vm/vm_map.c projects/fuse2/sys/x86/iommu/busdma_dmar.c projects/fuse2/tests/sys/netmap/Makefile projects/fuse2/tests/sys/netmap/ctrl-api-test.c projects/fuse2/tests/sys/netpfil/pf/Makefile projects/fuse2/tests/sys/netpfil/pf/pft_ping.py projects/fuse2/tools/build/mk/OptionalObsoleteFiles.inc projects/fuse2/tools/tools/makeroot/makeroot.sh projects/fuse2/usr.bin/calendar/calendars/calendar.freebsd projects/fuse2/usr.bin/dtc/dtb.cc projects/fuse2/usr.bin/dtc/dtb.hh projects/fuse2/usr.bin/dtc/dtc.1 projects/fuse2/usr.bin/dtc/dtc.cc projects/fuse2/usr.bin/dtc/fdt.cc projects/fuse2/usr.bin/dtc/fdt.hh projects/fuse2/usr.bin/dtc/input_buffer.cc projects/fuse2/usr.bin/dtc/util.hh projects/fuse2/usr.sbin/daemon/daemon.8 projects/fuse2/usr.sbin/iostat/iostat.c Directory Properties: projects/fuse2/ (props changed) projects/fuse2/cddl/ (props changed) projects/fuse2/cddl/contrib/opensolaris/ (props changed) projects/fuse2/contrib/elftoolchain/ (props changed) projects/fuse2/contrib/libarchive/ (props changed) projects/fuse2/contrib/llvm/ (props changed) projects/fuse2/contrib/netbsd-tests/ (props changed) projects/fuse2/contrib/tzdata/ (props changed) projects/fuse2/crypto/openssh/ (props changed) projects/fuse2/gnu/usr.bin/binutils/ (props changed) Modified: projects/fuse2/Makefile.inc1 ============================================================================== --- projects/fuse2/Makefile.inc1 Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/Makefile.inc1 Fri Mar 29 03:25:20 2019 (r345679) @@ -1906,11 +1906,11 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \ ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ - ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ + ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \ create -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \ -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \ -r ${KSTAGEDIR}/${DISTDIR} \ - -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} + -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} . endfor .endif .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" @@ -1938,24 +1938,24 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_ /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \ ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ - ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ + ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \ create -M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \ -p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \ -r ${KSTAGEDIR}/kernel.${_kernel} \ - -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} + -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} . endfor . endif . endfor .endif sign-packages: _pkgbootstrap .PHONY - @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest" ] && \ - unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest ; \ - ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh repo \ - -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \ - ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \ + @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest" ] && \ + unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest ; \ + ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname repo \ + -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ + ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ ${PKGSIGNKEY} ; \ - cd ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI); \ + cd ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI); \ ln -s ${PKG_VERSION} latest # Modified: projects/fuse2/UPDATING ============================================================================== --- projects/fuse2/UPDATING Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/UPDATING Fri Mar 29 03:25:20 2019 (r345679) @@ -43,6 +43,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: prerequisites and upgrading, if you are not already using clang 3.5.0 or higher. +20190226: + geom_uzip(4) depends on the new module xz. If geom_uzip is statically + compiled into your custom kernel, add 'device xz' statement to the + kernel config. + 20190219: drm and drm2 have been removed from the tree. Please see https://wiki.freebsd.org/Graphics for the latest information on Modified: projects/fuse2/bin/date/date.1 ============================================================================== --- projects/fuse2/bin/date/date.1 Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/bin/date/date.1 Fri Mar 29 03:25:20 2019 (r345679) @@ -32,7 +32,7 @@ .\" @(#)date.1 8.3 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd March 12, 2019 +.Dd March 20, 2019 .Dt DATE 1 .Os .Sh NAME @@ -52,13 +52,13 @@ .Ar ... .Op Cm + Ns Ar output_fmt .Nm -.Op Fl jnu +.Op Fl ju .Sm off .Op Oo Oo Oo Oo Ar cc Oc Ar yy Oc Ar mm Oc Ar dd Oc Ar HH .Ar MM Op Ar .ss .Sm on .Nm -.Op Fl jnRu +.Op Fl jRu .Fl f Ar input_fmt new_date .Op Cm + Ns Ar output_fmt .Nm @@ -142,16 +142,6 @@ This allows you to use the flag in addition to the .Cm + option to convert one date format to another. -.It Fl n -By default, if the -.Xr timed 8 -daemon is running, -.Nm -sets the time on all of the machines in the local group. -The -.Fl n -option suppresses this behavior and causes the time to be set only on the -current machine. .It Fl R Use RFC 2822 date and time output format. This is equivalent to using @@ -431,23 +421,6 @@ can be used to parse the output from .Nm and express it in Epoch time. .Sh DIAGNOSTICS -Occasionally, when -.Xr timed 8 -synchronizes the time on many hosts, the setting of a new time value may -require more than a few seconds. -On these occasions, -.Nm -prints: -.Ql Network time being set . -The message -.Ql Communication error with timed -occurs when the communication -between -.Nm -and -.Xr timed 8 -fails. -.Pp It is invalid to combine the .Fl I flag with either @@ -465,8 +438,7 @@ and exits with an error status. .Xr gettimeofday 2 , .Xr getutxent 3 , .Xr strftime 3 , -.Xr strptime 3 , -.Xr timed 8 +.Xr strptime 3 .Rs .%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD" .%A R. Gusella @@ -478,7 +450,7 @@ The utility is expected to be compatible with .St -p1003.2 . The -.Fl d , f , I , j , n , r , t , +.Fl d , f , I , j , r , t , and .Fl v options are all extensions to the standard. Modified: projects/fuse2/bin/date/date.c ============================================================================== --- projects/fuse2/bin/date/date.c Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/bin/date/date.c Fri Mar 29 03:25:20 2019 (r345679) @@ -72,7 +72,7 @@ static void iso8601_usage(const char *); static void multipleformats(void); static void printdate(const char *); static void printisodate(struct tm *); -static void setthetime(const char *, const char *, int, int); +static void setthetime(const char *, const char *, int); static void usage(void); static const struct iso8601_fmt { @@ -92,7 +92,7 @@ int main(int argc, char *argv[]) { int ch, rflag; - bool Iflag, jflag, nflag, Rflag; + bool Iflag, jflag, Rflag; const char *format; char buf[1024]; char *fmt; @@ -107,8 +107,8 @@ main(int argc, char *argv[]) fmt = NULL; (void) setlocale(LC_TIME, ""); rflag = 0; - Iflag = jflag = nflag = Rflag = 0; - while ((ch = getopt(argc, argv, "f:I::jnRr:uv:")) != -1) + Iflag = jflag = Rflag = 0; + while ((ch = getopt(argc, argv, "f:I::jRr:uv:")) != -1) switch((char)ch) { case 'f': fmt = optarg; @@ -132,9 +132,6 @@ main(int argc, char *argv[]) case 'j': jflag = 1; /* don't set time */ break; - case 'n': /* don't set network */ - nflag = 1; - break; case 'R': /* RFC 2822 datetime format */ if (Iflag) multipleformats(); @@ -179,7 +176,7 @@ main(int argc, char *argv[]) } if (*argv) { - setthetime(fmt, *argv, jflag, nflag); + setthetime(fmt, *argv, jflag); ++argv; } else if (fmt != NULL) usage(); @@ -250,7 +247,7 @@ printisodate(struct tm *lt) #define ATOI2(s) ((s) += 2, ((s)[-2] - '0') * 10 + ((s)[-1] - '0')) static void -setthetime(const char *fmt, const char *p, int jflag, int nflag) +setthetime(const char *fmt, const char *p, int jflag) { struct utmpx utx; struct tm *lt; @@ -343,20 +340,17 @@ setthetime(const char *fmt, const char *p, int jflag, errx(1, "nonexistent time"); if (!jflag) { - /* set the time */ - if (nflag) { - utx.ut_type = OLD_TIME; - memset(utx.ut_id, 0, sizeof(utx.ut_id)); - (void)gettimeofday(&utx.ut_tv, NULL); - pututxline(&utx); - tv.tv_sec = tval; - tv.tv_usec = 0; - if (settimeofday(&tv, NULL) != 0) - err(1, "settimeofday (timeval)"); - utx.ut_type = NEW_TIME; - (void)gettimeofday(&utx.ut_tv, NULL); - pututxline(&utx); - } + utx.ut_type = OLD_TIME; + memset(utx.ut_id, 0, sizeof(utx.ut_id)); + (void)gettimeofday(&utx.ut_tv, NULL); + pututxline(&utx); + tv.tv_sec = tval; + tv.tv_usec = 0; + if (settimeofday(&tv, NULL) != 0) + err(1, "settimeofday (timeval)"); + utx.ut_type = NEW_TIME; + (void)gettimeofday(&utx.ut_tv, NULL); + pututxline(&utx); if ((p = getlogin()) == NULL) p = "???"; Modified: projects/fuse2/bin/dd/dd.1 ============================================================================== --- projects/fuse2/bin/dd/dd.1 Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/bin/dd/dd.1 Fri Mar 29 03:25:20 2019 (r345679) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd August 8, 2018 +.Dd March 26, 2019 .Dt DD 1 .Os .Sh NAME @@ -427,7 +427,8 @@ if necessary, to a 1MiB boundary: .Xr mt 1 , .Xr recoverdisk 1 , .Xr tr 1 , -.Xr geom 4 +.Xr geom 4 , +.Xr trim 8 .Sh STANDARDS The .Nm Modified: projects/fuse2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c ============================================================================== --- projects/fuse2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c Fri Mar 29 03:25:20 2019 (r345679) @@ -35,7 +35,8 @@ int main(int argc, char **argv) { for (;;) { - (void) __syscall(SYS_mmap, NULL, 1, 2, 3, -1, 0x12345678); + (void) __syscall(SYS_mmap, NULL, (size_t)1, 2, 3, -1, + (off_t)0x12345678); } return (0); Modified: projects/fuse2/contrib/elftoolchain/libdwarf/libdwarf_lineno.c ============================================================================== --- projects/fuse2/contrib/elftoolchain/libdwarf/libdwarf_lineno.c Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/contrib/elftoolchain/libdwarf/libdwarf_lineno.c Fri Mar 29 03:25:20 2019 (r345679) @@ -33,9 +33,10 @@ _dwarf_lineno_add_file(Dwarf_LineInfo li, uint8_t **p, Dwarf_Error *error, Dwarf_Debug dbg) { Dwarf_LineFile lf; - const char *dirname; + FILE *filepath; + const char *incdir; uint8_t *src; - int slen; + size_t slen; src = *p; @@ -54,20 +55,33 @@ _dwarf_lineno_add_file(Dwarf_LineInfo li, uint8_t **p, return (DW_DLE_DIR_INDEX_BAD); } - /* Make full pathname if need. */ + /* Make a full pathname if needed. */ if (*lf->lf_fname != '/') { - dirname = compdir; + filepath = open_memstream(&lf->lf_fullpath, &slen); + if (filepath == NULL) { + free(lf); + DWARF_SET_ERROR(dbg, error, DW_DLE_MEMORY); + return (DW_DLE_MEMORY); + } + if (lf->lf_dirndx > 0) - dirname = li->li_incdirs[lf->lf_dirndx - 1]; - if (dirname != NULL) { - slen = strlen(dirname) + strlen(lf->lf_fname) + 2; - if ((lf->lf_fullpath = malloc(slen)) == NULL) { - free(lf); - DWARF_SET_ERROR(dbg, error, DW_DLE_MEMORY); - return (DW_DLE_MEMORY); - } - snprintf(lf->lf_fullpath, slen, "%s/%s", dirname, - lf->lf_fname); + incdir = li->li_incdirs[lf->lf_dirndx - 1]; + else + incdir = NULL; + + /* + * Prepend the compilation directory if the directory table + * entry is relative. + */ + if (incdir == NULL || *incdir != '/') + fprintf(filepath, "%s/", compdir); + if (incdir != NULL) + fprintf(filepath, "%s/", incdir); + fprintf(filepath, "%s", lf->lf_fname); + if (fclose(filepath) != 0) { + free(lf); + DWARF_SET_ERROR(dbg, error, DW_DLE_MEMORY); + return (DW_DLE_MEMORY); } } Modified: projects/fuse2/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- projects/fuse2/contrib/elftoolchain/readelf/readelf.c Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/contrib/elftoolchain/readelf/readelf.c Fri Mar 29 03:25:20 2019 (r345679) @@ -2741,6 +2741,7 @@ dump_flags(struct flag_desc *desc, uint64_t val) } if (val != 0) printf(" unknown (0x%jx)", (uintmax_t)val); + printf("\n"); } static struct flag_desc dt_flags[] = { @@ -3524,7 +3525,6 @@ dump_notes_data(const char *name, uint32_t type, const goto unknown; printf(" Features:"); dump_flags(note_feature_ctl_flags, ubuf[0]); - printf("\n"); return; } } Modified: projects/fuse2/contrib/elftoolchain/strings/strings.c ============================================================================== --- projects/fuse2/contrib/elftoolchain/strings/strings.c Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/contrib/elftoolchain/strings/strings.c Fri Mar 29 03:25:20 2019 (r345679) @@ -84,11 +84,11 @@ static struct option strings_longopts[] = { { NULL, 0, NULL, 0 } }; -long getcharacter(void); +int getcharacter(FILE *, long *); int handle_file(const char *); -int handle_elf(const char *, int); -int handle_binary(const char *, int); -int find_strings(const char *, off_t, off_t); +int handle_elf(const char *, FILE *); +int handle_binary(const char *, FILE *, size_t); +int find_strings(const char *, FILE *, off_t, off_t); void show_version(void); void usage(void); @@ -190,7 +190,7 @@ main(int argc, char **argv) if (min_len == 0) min_len = 4; if (*argv == NULL) - rc = find_strings("{standard input}", 0, 0); + rc = find_strings("{standard input}", stdin, 0, 0); else while (*argv != NULL) { if (handle_file(*argv) != 0) rc = 1; @@ -202,19 +202,19 @@ main(int argc, char **argv) int handle_file(const char *name) { - int fd, rt; + FILE *pfile; + int rt; if (name == NULL) return (1); - if (freopen(name, "rb", stdin) == NULL) { + pfile = fopen(name, "rb"); + if (pfile == NULL) { warnx("'%s': %s", name, strerror(errno)); return (1); } - fd = fileno(stdin); - if (fd < 0) - return (1); - rt = handle_elf(name, fd); + rt = handle_elf(name, pfile); + fclose(pfile); return (rt); } @@ -223,15 +223,11 @@ handle_file(const char *name) * treated as a binary file. This would include text file, core dumps ... */ int -handle_binary(const char *name, int fd) +handle_binary(const char *name, FILE *pfile, size_t size) { - struct stat buf; - memset(&buf, 0, sizeof(buf)); - (void)lseek(fd, 0, SEEK_SET); - if (!fstat(fd, &buf)) - return (find_strings(name, 0, buf.st_size)); - return (1); + (void)fseeko(pfile, 0, SEEK_SET); + return (find_strings(name, pfile, 0, size)); } /* @@ -241,24 +237,29 @@ handle_binary(const char *name, int fd) * different archs as flat binary files(has to overridden using -a). */ int -handle_elf(const char *name, int fd) +handle_elf(const char *name, FILE *pfile) { + struct stat buf; GElf_Ehdr elfhdr; GElf_Shdr shdr; Elf *elf; Elf_Scn *scn; - int rc; + int rc, fd; rc = 0; + fd = fileno(pfile); + if (fstat(fd, &buf) < 0) + return (1); + /* If entire file is chosen, treat it as a binary file */ if (entire_file) - return (handle_binary(name, fd)); + return (handle_binary(name, pfile, buf.st_size)); (void)lseek(fd, 0, SEEK_SET); elf = elf_begin(fd, ELF_C_READ, NULL); if (elf_kind(elf) != ELF_K_ELF) { (void)elf_end(elf); - return (handle_binary(name, fd)); + return (handle_binary(name, pfile, buf.st_size)); } if (gelf_getehdr(elf, &elfhdr) == NULL) { @@ -269,7 +270,7 @@ handle_elf(const char *name, int fd) if (elfhdr.e_shnum == 0 && elfhdr.e_type == ET_CORE) { (void)elf_end(elf); - return (handle_binary(name, fd)); + return (handle_binary(name, pfile, buf.st_size)); } else { scn = NULL; while ((scn = elf_nextscn(elf, scn)) != NULL) { @@ -277,7 +278,7 @@ handle_elf(const char *name, int fd) continue; if (shdr.sh_type != SHT_NOBITS && (shdr.sh_flags & SHF_ALLOC) != 0) { - rc = find_strings(name, shdr.sh_offset, + rc = find_strings(name, pfile, shdr.sh_offset, shdr.sh_size); } } @@ -290,51 +291,52 @@ handle_elf(const char *name, int fd) * Retrieves a character from input stream based on the encoding * type requested. */ -long -getcharacter(void) +int +getcharacter(FILE *pfile, long *rt) { - long rt; - int i; - char buf[4], c; + int i, c; + char buf[4]; - rt = EOF; for(i = 0; i < encoding_size; i++) { - c = getc(stdin); - if (feof(stdin)) - return (EOF); + c = getc(pfile); + if (c == EOF) + return (-1); buf[i] = c; } switch (encoding) { case ENCODING_7BIT: case ENCODING_8BIT: - rt = buf[0]; + *rt = buf[0]; break; case ENCODING_16BIT_BIG: - rt = (buf[0] << 8) | buf[1]; + *rt = (buf[0] << 8) | buf[1]; break; case ENCODING_16BIT_LITTLE: - rt = buf[0] | (buf[1] << 8); - break; + *rt = buf[0] | (buf[1] << 8); + break; case ENCODING_32BIT_BIG: - rt = ((long) buf[0] << 24) | ((long) buf[1] << 16) | + *rt = ((long) buf[0] << 24) | ((long) buf[1] << 16) | ((long) buf[2] << 8) | buf[3]; break; case ENCODING_32BIT_LITTLE: - rt = buf[0] | ((long) buf[1] << 8) | ((long) buf[2] << 16) | + *rt = buf[0] | ((long) buf[1] << 8) | ((long) buf[2] << 16) | ((long) buf[3] << 24); break; + default: + return (-1); } - return (rt); + + return (0); } /* - * Input stream stdin is read until the end of file is reached or until + * Input stream is read until the end of file is reached or until * the section size is reached in case of ELF files. Contiguous * characters of >= min_size(default 4) will be displayed. */ int -find_strings(const char *name, off_t offset, off_t size) +find_strings(const char *name, FILE *pfile, off_t offset, off_t size) { off_t cur_off, start_off; char *obuf; @@ -347,7 +349,7 @@ find_strings(const char *name, off_t offset, off_t siz return (1); } - (void)fseeko(stdin, offset, SEEK_SET); + (void)fseeko(pfile, offset, SEEK_SET); cur_off = offset; start_off = 0; for (;;) { @@ -356,8 +358,7 @@ find_strings(const char *name, off_t offset, off_t siz start_off = cur_off; memset(obuf, 0, min_len + 1); for(i = 0; i < min_len; i++) { - c = getcharacter(); - if (c == EOF && feof(stdin)) + if (getcharacter(pfile, &c) < 0) goto _exit1; if (PRINTABLE(c)) { obuf[i] = c; @@ -399,14 +400,15 @@ find_strings(const char *name, off_t offset, off_t siz if ((offset + size) && (cur_off >= offset + size)) break; - c = getcharacter(); + if (getcharacter(pfile, &c) < 0) + break; cur_off += encoding_size; if (encoding == ENCODING_8BIT && (uint8_t)c > 127) { putchar(c); continue; } - if (!PRINTABLE(c) || c == EOF) + if (!PRINTABLE(c)) break; putchar(c); } Modified: projects/fuse2/contrib/libarchive/libarchive/archive_blake2sp_ref.c ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/archive_blake2sp_ref.c Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/contrib/libarchive/libarchive/archive_blake2sp_ref.c Fri Mar 29 03:25:20 2019 (r345679) @@ -89,7 +89,7 @@ int blake2sp_init( blake2sp_state *S, size_t outlen ) return -1; for( i = 0; i < PARALLELISM_DEGREE; ++i ) - if( blake2sp_init_leaf( S->S[i], outlen, 0, i ) < 0 ) return -1; + if( blake2sp_init_leaf( S->S[i], outlen, 0, (uint32_t)i ) < 0 ) return -1; S->R->last_node = 1; S->S[PARALLELISM_DEGREE - 1]->last_node = 1; @@ -112,7 +112,7 @@ int blake2sp_init_key( blake2sp_state *S, size_t outle return -1; for( i = 0; i < PARALLELISM_DEGREE; ++i ) - if( blake2sp_init_leaf( S->S[i], outlen, keylen, i ) < 0 ) return -1; + if( blake2sp_init_leaf( S->S[i], outlen, keylen, (uint32_t)i ) < 0 ) return -1; S->R->last_node = 1; S->S[PARALLELISM_DEGREE - 1]->last_node = 1; @@ -230,7 +230,7 @@ int blake2sp( void *out, size_t outlen, const void *in if( keylen > BLAKE2S_KEYBYTES ) return -1; for( i = 0; i < PARALLELISM_DEGREE; ++i ) - if( blake2sp_init_leaf( S[i], outlen, keylen, i ) < 0 ) return -1; + if( blake2sp_init_leaf( S[i], outlen, keylen, (uint32_t)i ) < 0 ) return -1; S[PARALLELISM_DEGREE - 1]->last_node = 1; /* mark last node */ Modified: projects/fuse2/contrib/libarchive/libarchive/archive_entry.c ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/archive_entry.c Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/contrib/libarchive/libarchive/archive_entry.c Fri Mar 29 03:25:20 2019 (r345679) @@ -1632,6 +1632,51 @@ _archive_entry_acl_text_l(struct archive_entry *entry, * SUCH DAMAGE. */ +/* + * Supported file flags on FreeBSD and Mac OS: + * sappnd,sappend SF_APPEND + * arch,archived SF_ARCHIVED + * schg,schange,simmutable SF_IMMUTABLE + * sunlnk,sunlink SF_NOUNLINK (FreeBSD only) + * uappnd,uappend UF_APPEND + * compressed UF_COMPRESSED (Mac OS only) + * hidden,uhidden UF_HIDDEN + * uchg,uchange,uimmutable UF_IMMUTABLE + * nodump UF_NODUMP + * uunlnk,uunlink UF_NOUNLINK (FreeBSD only) + * offline,uoffline UF_OFFLINE (FreeBSD only) + * opaque UF_OPAQUE + * rdonly,urdonly,readonly UF_READONLY (FreeBSD only) + * reparse,ureparse UF_REPARSE (FreeBSD only) + * sparse,usparse UF_SPARSE (FreeBSD only) + * system,usystem UF_SYSTEM (FreeBSD only) + * + * See chflags(2) for more information + * + * Supported file attributes on Linux: + * a append only FS_APPEND_FL sappnd + * A no atime updates FS_NOATIME_FL atime + * c compress FS_COMPR_FL compress + * C no copy on write FS_NOCOW_FL cow + * d no dump FS_NODUMP_FL dump + * D synchronous directory updates FS_DIRSYNC_FL dirsync + * i immutable FS_IMMUTABLE_FL schg + * j data journalling FS_JOURNAL_DATA_FL journal + * P project hierarchy FS_PROJINHERIT_FL projinherit + * s secure deletion FS_SECRM_FL securedeletion + * S synchronous updates FS_SYNC_FL sync + * t no tail-merging FS_NOTAIL_FL tail + * T top of directory hierarchy FS_TOPDIR_FL topdir + * u undeletable FS_UNRM_FL undel + * + * See ioctl_iflags(2) for more information + * + * Equivalent file flags supported on FreeBSD / Mac OS and Linux: + * SF_APPEND FS_APPEND_FL sappnd + * SF_IMMUTABLE FS_IMMUTABLE_FL schg + * UF_NODUMP FS_NODUMP_FL nodump + */ + static const struct flag { const char *name; const wchar_t *wname; @@ -1640,190 +1685,149 @@ static const struct flag { } flags[] = { /* Preferred (shorter) names per flag first, all prefixed by "no" */ #ifdef SF_APPEND - { "nosappnd", L"nosappnd", SF_APPEND, 0 }, - { "nosappend", L"nosappend", SF_APPEND, 0 }, + { "nosappnd", L"nosappnd", SF_APPEND, 0}, + { "nosappend", L"nosappend", SF_APPEND, 0}, #endif #if defined(FS_APPEND_FL) /* 'a' */ - { "nosappnd", L"nosappnd", FS_APPEND_FL, 0 }, - { "nosappend", L"nosappend", FS_APPEND_FL, 0 }, + { "nosappnd", L"nosappnd", FS_APPEND_FL, 0}, + { "nosappend", L"nosappend", FS_APPEND_FL, 0}, #elif defined(EXT2_APPEND_FL) /* 'a' */ - { "nosappnd", L"nosappnd", EXT2_APPEND_FL, 0 }, - { "nosappend", L"nosappend", EXT2_APPEND_FL, 0 }, + { "nosappnd", L"nosappnd", EXT2_APPEND_FL, 0}, + { "nosappend", L"nosappend", EXT2_APPEND_FL, 0}, #endif #ifdef SF_ARCHIVED - { "noarch", L"noarch", SF_ARCHIVED, 0 }, - { "noarchived", L"noarchived", SF_ARCHIVED, 0 }, + { "noarch", L"noarch", SF_ARCHIVED, 0}, + { "noarchived", L"noarchived", SF_ARCHIVED, 0}, #endif #ifdef SF_IMMUTABLE - { "noschg", L"noschg", SF_IMMUTABLE, 0 }, - { "noschange", L"noschange", SF_IMMUTABLE, 0 }, - { "nosimmutable", L"nosimmutable", SF_IMMUTABLE, 0 }, + { "noschg", L"noschg", SF_IMMUTABLE, 0}, + { "noschange", L"noschange", SF_IMMUTABLE, 0}, + { "nosimmutable", L"nosimmutable", SF_IMMUTABLE, 0}, #endif #if defined(FS_IMMUTABLE_FL) /* 'i' */ - { "noschg", L"noschg", FS_IMMUTABLE_FL, 0 }, - { "noschange", L"noschange", FS_IMMUTABLE_FL, 0 }, - { "nosimmutable", L"nosimmutable", FS_IMMUTABLE_FL, 0 }, + { "noschg", L"noschg", FS_IMMUTABLE_FL, 0}, + { "noschange", L"noschange", FS_IMMUTABLE_FL, 0}, + { "nosimmutable", L"nosimmutable", FS_IMMUTABLE_FL, 0}, #elif defined(EXT2_IMMUTABLE_FL) /* 'i' */ - { "noschg", L"noschg", EXT2_IMMUTABLE_FL, 0 }, - { "noschange", L"noschange", EXT2_IMMUTABLE_FL, 0 }, - { "nosimmutable", L"nosimmutable", EXT2_IMMUTABLE_FL, 0 }, + { "noschg", L"noschg", EXT2_IMMUTABLE_FL, 0}, + { "noschange", L"noschange", EXT2_IMMUTABLE_FL, 0}, + { "nosimmutable", L"nosimmutable", EXT2_IMMUTABLE_FL, 0}, #endif #ifdef SF_NOUNLINK - { "nosunlnk", L"nosunlnk", SF_NOUNLINK, 0 }, - { "nosunlink", L"nosunlink", SF_NOUNLINK, 0 }, + { "nosunlnk", L"nosunlnk", SF_NOUNLINK, 0}, + { "nosunlink", L"nosunlink", SF_NOUNLINK, 0}, #endif -#ifdef SF_SNAPSHOT - { "nosnapshot", L"nosnapshot", SF_SNAPSHOT, 0 }, -#endif #ifdef UF_APPEND - { "nouappnd", L"nouappnd", UF_APPEND, 0 }, - { "nouappend", L"nouappend", UF_APPEND, 0 }, + { "nouappnd", L"nouappnd", UF_APPEND, 0}, + { "nouappend", L"nouappend", UF_APPEND, 0}, #endif #ifdef UF_IMMUTABLE - { "nouchg", L"nouchg", UF_IMMUTABLE, 0 }, - { "nouchange", L"nouchange", UF_IMMUTABLE, 0 }, - { "nouimmutable", L"nouimmutable", UF_IMMUTABLE, 0 }, + { "nouchg", L"nouchg", UF_IMMUTABLE, 0}, + { "nouchange", L"nouchange", UF_IMMUTABLE, 0}, + { "nouimmutable", L"nouimmutable", UF_IMMUTABLE, 0}, #endif #ifdef UF_NODUMP { "nodump", L"nodump", 0, UF_NODUMP}, #endif #if defined(FS_NODUMP_FL) /* 'd' */ { "nodump", L"nodump", 0, FS_NODUMP_FL}, -#elif defined(EXT2_NODUMP_FL) /* 'd' */ +#elif defined(EXT2_NODUMP_FL) { "nodump", L"nodump", 0, EXT2_NODUMP_FL}, #endif #ifdef UF_OPAQUE - { "noopaque", L"noopaque", UF_OPAQUE, 0 }, + { "noopaque", L"noopaque", UF_OPAQUE, 0}, #endif #ifdef UF_NOUNLINK - { "nouunlnk", L"nouunlnk", UF_NOUNLINK, 0 }, - { "nouunlink", L"nouunlink", UF_NOUNLINK, 0 }, + { "nouunlnk", L"nouunlnk", UF_NOUNLINK, 0}, + { "nouunlink", L"nouunlink", UF_NOUNLINK, 0}, #endif #ifdef UF_COMPRESSED - { "nocompressed",L"nocompressed", UF_COMPRESSED, 0 }, + /* Mac OS */ + { "nocompressed", L"nocompressed", UF_COMPRESSED, 0}, #endif #ifdef UF_HIDDEN - { "nohidden", L"nohidden", UF_HIDDEN, 0 }, + { "nohidden", L"nohidden", UF_HIDDEN, 0}, + { "nouhidden", L"nouhidden", UF_HIDDEN, 0}, #endif -#if defined(FS_UNRM_FL) - { "nouunlink", L"nouunlink", FS_UNRM_FL, 0}, -#elif defined(EXT2_UNRM_FL) - { "nouunlink", L"nouunlink", EXT2_UNRM_FL, 0}, +#ifdef UF_OFFLINE + { "nooffline", L"nooffline", UF_OFFLINE, 0}, + { "nouoffline", L"nouoffline", UF_OFFLINE, 0}, #endif - -#if defined(FS_BTREE_FL) - { "nobtree", L"nobtree", FS_BTREE_FL, 0 }, -#elif defined(EXT2_BTREE_FL) - { "nobtree", L"nobtree", EXT2_BTREE_FL, 0 }, +#ifdef UF_READONLY + { "nordonly", L"nordonly", UF_READONLY, 0}, + { "nourdonly", L"nourdonly", UF_READONLY, 0}, + { "noreadonly", L"noreadonly", UF_READONLY, 0}, #endif - -#if defined(FS_ECOMPR_FL) - { "nocomperr", L"nocomperr", FS_ECOMPR_FL, 0 }, -#elif defined(EXT2_ECOMPR_FL) - { "nocomperr", L"nocomperr", EXT2_ECOMPR_FL, 0 }, +#ifdef UF_SPARSE + { "nosparse", L"nosparse", UF_SPARSE, 0}, + { "nousparse", L"nousparse", UF_SPARSE, 0}, #endif - -#if defined(FS_COMPR_FL) /* 'c' */ - { "nocompress", L"nocompress", FS_COMPR_FL, 0 }, -#elif defined(EXT2_COMPR_FL) /* 'c' */ - { "nocompress", L"nocompress", EXT2_COMPR_FL, 0 }, +#ifdef UF_REPARSE + { "noreparse", L"noreparse", UF_REPARSE, 0}, + { "noureparse", L"noureparse", UF_REPARSE, 0}, #endif - -#if defined(FS_NOATIME_FL) /* 'A' */ - { "noatime", L"noatime", 0, FS_NOATIME_FL}, -#elif defined(EXT2_NOATIME_FL) /* 'A' */ - { "noatime", L"noatime", 0, EXT2_NOATIME_FL}, +#ifdef UF_SYSTEM + { "nosystem", L"nosystem", UF_SYSTEM, 0}, + { "nousystem", L"nousystem", UF_SYSTEM, 0}, #endif +#if defined(FS_UNRM_FL) /* 'u' */ + { "noundel", L"noundel", FS_UNRM_FL, 0}, +#elif defined(EXT2_UNRM_FL) + { "noundel", L"noundel", EXT2_UNRM_FL, 0}, +#endif -#if defined(FS_DIRTY_FL) - { "nocompdirty",L"nocompdirty", FS_DIRTY_FL, 0}, -#elif defined(EXT2_DIRTY_FL) - { "nocompdirty",L"nocompdirty", EXT2_DIRTY_FL, 0}, +#if defined(FS_COMPR_FL) /* 'c' */ + { "nocompress", L"nocompress", FS_COMPR_FL, 0}, +#elif defined(EXT2_COMPR_FL) + { "nocompress", L"nocompress", EXT2_COMPR_FL, 0}, #endif -#if defined(FS_COMPRBLK_FL) -#if defined(FS_NOCOMPR_FL) - { "nocomprblk", L"nocomprblk", FS_COMPRBLK_FL, FS_NOCOMPR_FL}, -#else - { "nocomprblk", L"nocomprblk", FS_COMPRBLK_FL, 0}, +#if defined(FS_NOATIME_FL) /* 'A' */ + { "noatime", L"noatime", 0, FS_NOATIME_FL}, +#elif defined(EXT2_NOATIME_FL) + { "noatime", L"noatime", 0, EXT2_NOATIME_FL}, #endif -#elif defined(EXT2_COMPRBLK_FL) -#if defined(EXT2_NOCOMPR_FL) - { "nocomprblk", L"nocomprblk", EXT2_COMPRBLK_FL, EXT2_NOCOMPR_FL}, -#else - { "nocomprblk", L"nocomprblk", EXT2_COMPRBLK_FL, 0}, -#endif -#endif -#if defined(FS_DIRSYNC_FL) - { "nodirsync", L"nodirsync", FS_DIRSYNC_FL, 0}, +#if defined(FS_DIRSYNC_FL) /* 'D' */ + { "nodirsync", L"nodirsync", FS_DIRSYNC_FL, 0}, #elif defined(EXT2_DIRSYNC_FL) - { "nodirsync", L"nodirsync", EXT2_DIRSYNC_FL, 0}, + { "nodirsync", L"nodirsync", EXT2_DIRSYNC_FL, 0}, #endif -#if defined(FS_INDEX_FL) - { "nohashidx", L"nohashidx", FS_INDEX_FL, 0}, -#elif defined(EXT2_INDEX_FL) - { "nohashidx", L"nohashidx", EXT2_INDEX_FL, 0}, -#endif -#if defined(FS_IMAGIC_FL) - { "noimagic", L"noimagic", FS_IMAGIC_FL, 0}, -#elif defined(EXT2_IMAGIC_FL) - { "noimagic", L"noimagic", EXT2_IMAGIC_FL, 0}, -#endif -#if defined(FS_JOURNAL_DATA_FL) - { "nojournal", L"nojournal", FS_JOURNAL_DATA_FL, 0}, +#if defined(FS_JOURNAL_DATA_FL) /* 'j' */ + { "nojournal-data",L"nojournal-data", FS_JOURNAL_DATA_FL, 0}, + { "nojournal", L"nojournal", FS_JOURNAL_DATA_FL, 0}, #elif defined(EXT3_JOURNAL_DATA_FL) - { "nojournal", L"nojournal", EXT3_JOURNAL_DATA_FL, 0}, + { "nojournal-data",L"nojournal-data", EXT3_JOURNAL_DATA_FL, 0}, + { "nojournal", L"nojournal", EXT3_JOURNAL_DATA_FL, 0}, #endif -#if defined(FS_SECRM_FL) - { "nosecuredeletion",L"nosecuredeletion",FS_SECRM_FL, 0}, +#if defined(FS_SECRM_FL) /* 's' */ + { "nosecdel", L"nosecdel", FS_SECRM_FL, 0}, + { "nosecuredeletion",L"nosecuredeletion",FS_SECRM_FL, 0}, #elif defined(EXT2_SECRM_FL) - { "nosecuredeletion",L"nosecuredeletion",EXT2_SECRM_FL, 0}, + { "nosecdel", L"nosecdel", EXT2_SECRM_FL, 0}, + { "nosecuredeletion",L"nosecuredeletion",EXT2_SECRM_FL, 0}, #endif -#if defined(FS_SYNC_FL) - { "nosync", L"nosync", FS_SYNC_FL, 0}, +#if defined(FS_SYNC_FL) /* 'S' */ + { "nosync", L"nosync", FS_SYNC_FL, 0}, #elif defined(EXT2_SYNC_FL) - { "nosync", L"nosync", EXT2_SYNC_FL, 0}, + { "nosync", L"nosync", EXT2_SYNC_FL, 0}, #endif -#if defined(FS_NOTAIL_FL) - { "notail", L"notail", 0, FS_NOTAIL_FL}, +#if defined(FS_NOTAIL_FL) /* 't' */ + { "notail", L"notail", 0, FS_NOTAIL_FL}, #elif defined(EXT2_NOTAIL_FL) - { "notail", L"notail", 0, EXT2_NOTAIL_FL}, + { "notail", L"notail", 0, EXT2_NOTAIL_FL}, #endif -#if defined(FS_TOPDIR_FL) - { "notopdir", L"notopdir", FS_TOPDIR_FL, 0}, +#if defined(FS_TOPDIR_FL) /* 'T' */ + { "notopdir", L"notopdir", FS_TOPDIR_FL, 0}, #elif defined(EXT2_TOPDIR_FL) - { "notopdir", L"notopdir", EXT2_TOPDIR_FL, 0}, + { "notopdir", L"notopdir", EXT2_TOPDIR_FL, 0}, #endif -#ifdef FS_ENCRYPT_FL - { "noencrypt", L"noencrypt", FS_ENCRYPT_FL, 0}, +#ifdef FS_NOCOW_FL /* 'C' */ + { "nocow", L"nocow", 0, FS_NOCOW_FL}, #endif -#ifdef FS_HUGE_FILE_FL - { "nohugefile", L"nohugefile", FS_HUGE_FILE_FL, 0}, +#ifdef FS_PROJINHERIT_FL /* 'P' */ + { "noprojinherit",L"noprojinherit", FS_PROJINHERIT_FL, 0}, #endif -#ifdef FS_EXTENT_FL - { "noextent", L"noextent", FS_EXTENT_FL, 0}, -#endif -#ifdef FS_EA_INODE_FL - { "noeainode", L"noeainode", FS_EA_INODE_FL, 0}, -#endif -#ifdef FS_EOFBLOCKS_FL - { "noeofblocks",L"noeofblocks", FS_EOFBLOCKS_FL, 0}, -#endif -#ifdef FS_NOCOW_FL - { "nocow", L"nocow", FS_NOCOW_FL, 0}, -#endif -#ifdef FS_INLINE_DATA_FL - { "noinlinedata",L"noinlinedata", FS_INLINE_DATA_FL, 0}, -#endif -#ifdef FS_PROJINHERIT_FL - { "noprojinherit",L"noprojinherit", FS_PROJINHERIT_FL, 0}, -#endif -#if defined(FS_RESERVED_FL) - { "noreserved", L"noreserved", FS_RESERVED_FL, 0}, -#elif defined(EXT2_RESERVED_FL) - { "noreserved", L"noreserved", EXT2_RESERVED_FL, 0}, -#endif - { NULL, NULL, 0, 0 } + { NULL, NULL, 0, 0} }; /* Modified: projects/fuse2/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Fri Mar 29 03:25:20 2019 (r345679) @@ -163,6 +163,9 @@ archive_read_disk_entry_from_file(struct archive *_a, int initial_fd = fd; int r, r1; + archive_check_magic(_a, ARCHIVE_READ_DISK_MAGIC, ARCHIVE_STATE_ANY, + "archive_read_disk_entry_from_file"); + archive_clear_error(_a); path = archive_entry_sourcepath(entry); if (path == NULL) Modified: projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar5.c ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar5.c Fri Mar 29 03:01:21 2019 (r345678) +++ projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar5.c Fri Mar 29 03:25:20 2019 (r345679) @@ -517,15 +517,16 @@ static int run_e8e9_filter(struct rar5* rar, struct fi const uint32_t file_size = 0x1000000; ssize_t i; + const int mask = (int)rar->cstate.window_mask; circular_memcpy(rar->cstate.filtered_buf, rar->cstate.window_buf, - rar->cstate.window_mask, + mask, rar->cstate.solid_offset + flt->block_start, rar->cstate.solid_offset + flt->block_start + flt->block_length); for(i = 0; i < flt->block_length - 4;) { uint8_t b = rar->cstate.window_buf[(rar->cstate.solid_offset + - flt->block_start + i++) & rar->cstate.window_mask]; + flt->block_start + i++) & mask]; /* 0xE8 = x86's call <relative_addr_uint32> (function call) * 0xE9 = x86's jmp <relative_addr_uint32> (unconditional jump) */ @@ -534,17 +535,17 @@ static int run_e8e9_filter(struct rar5* rar, struct fi uint32_t addr; uint32_t offset = (i + flt->block_start) % file_size; - addr = read_filter_data(rar, (rar->cstate.solid_offset + + addr = read_filter_data(rar, (uint32_t)(rar->cstate.solid_offset + flt->block_start + i) & rar->cstate.window_mask); if(addr & 0x80000000) { if(((addr + offset) & 0x80000000) == 0) { - write_filter_data(rar, i, addr + file_size); + write_filter_data(rar, (uint32_t)i, addr + file_size); } } else { if((addr - file_size) & 0x80000000) { uint32_t naddr = addr - offset; - write_filter_data(rar, i, naddr); + write_filter_data(rar, (uint32_t)i, naddr); } } *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903290325.x2T3PKJq096386>