Date: Tue, 2 Jul 2013 14:54:19 +0000 (UTC) From: Takuya ASADA <syuu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r252509 - in user/syuu/mq_bpf: . bin/ed bin/sh contrib/libstdc++/libsupc++ contrib/llvm/lib/Target/ARM contrib/smbfs/mount_smbfs crypto/heimdal/lib/gssapi/gssapi crypto/openssh etc etc/... Message-ID: <201307021454.r62EsJjt072076@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: syuu Date: Tue Jul 2 14:54:18 2013 New Revision: 252509 URL: http://svnweb.freebsd.org/changeset/base/252509 Log: merge with head Added: user/syuu/mq_bpf/etc/rc.d/swap - copied unchanged from r252508, head/etc/rc.d/swap user/syuu/mq_bpf/etc/rc.d/swaplate - copied unchanged from r252508, head/etc/rc.d/swaplate user/syuu/mq_bpf/sbin/nvmecontrol/devlist.c - copied unchanged from r252508, head/sbin/nvmecontrol/devlist.c user/syuu/mq_bpf/sbin/nvmecontrol/firmware.c - copied unchanged from r252508, head/sbin/nvmecontrol/firmware.c user/syuu/mq_bpf/sbin/nvmecontrol/identify.c - copied unchanged from r252508, head/sbin/nvmecontrol/identify.c user/syuu/mq_bpf/sbin/nvmecontrol/logpage.c - copied unchanged from r252508, head/sbin/nvmecontrol/logpage.c user/syuu/mq_bpf/sbin/nvmecontrol/nvmecontrol.h - copied unchanged from r252508, head/sbin/nvmecontrol/nvmecontrol.h user/syuu/mq_bpf/sbin/nvmecontrol/perftest.c - copied unchanged from r252508, head/sbin/nvmecontrol/perftest.c user/syuu/mq_bpf/sbin/nvmecontrol/reset.c - copied unchanged from r252508, head/sbin/nvmecontrol/reset.c user/syuu/mq_bpf/share/man/man4/cc_cdg.4 - copied unchanged from r252508, head/share/man/man4/cc_cdg.4 user/syuu/mq_bpf/sys/arm/arm/generic_timer.c - copied unchanged from r252508, head/sys/arm/arm/generic_timer.c user/syuu/mq_bpf/sys/arm/conf/ARNDALE - copied unchanged from r252508, head/sys/arm/conf/ARNDALE user/syuu/mq_bpf/sys/arm/samsung/ - copied from r252508, head/sys/arm/samsung/ user/syuu/mq_bpf/sys/boot/fdt/dts/bcm2835.dtsi - copied unchanged from r252508, head/sys/boot/fdt/dts/bcm2835.dtsi user/syuu/mq_bpf/sys/boot/fdt/dts/exynos5250-arndale.dts - copied unchanged from r252508, head/sys/boot/fdt/dts/exynos5250-arndale.dts user/syuu/mq_bpf/sys/boot/fdt/dts/exynos5250.dtsi - copied unchanged from r252508, head/sys/boot/fdt/dts/exynos5250.dtsi user/syuu/mq_bpf/sys/boot/fdt/dts/rpi.dts - copied unchanged from r252508, head/sys/boot/fdt/dts/rpi.dts user/syuu/mq_bpf/sys/boot/i386/gptboot/gptboot.8 - copied unchanged from r252508, head/sys/boot/i386/gptboot/gptboot.8 user/syuu/mq_bpf/sys/kern/subr_vmem.c - copied unchanged from r252508, head/sys/kern/subr_vmem.c user/syuu/mq_bpf/sys/modules/cc/cc_cdg/ - copied from r252508, head/sys/modules/cc/cc_cdg/ user/syuu/mq_bpf/sys/netinet/cc/cc_cdg.c - copied unchanged from r252508, head/sys/netinet/cc/cc_cdg.c user/syuu/mq_bpf/sys/sys/vmem.h - copied unchanged from r252508, head/sys/sys/vmem.h Deleted: user/syuu/mq_bpf/contrib/smbfs/mount_smbfs/Makefile user/syuu/mq_bpf/etc/rc.d/encswap user/syuu/mq_bpf/etc/rc.d/swap1 user/syuu/mq_bpf/sys/boot/fdt/dts/bcm2835-rpi-b.dts Modified: user/syuu/mq_bpf/Makefile.inc1 user/syuu/mq_bpf/ObsoleteFiles.inc user/syuu/mq_bpf/UPDATING user/syuu/mq_bpf/bin/ed/re.c user/syuu/mq_bpf/bin/sh/eval.c user/syuu/mq_bpf/contrib/libstdc++/libsupc++/unwind-cxx.h user/syuu/mq_bpf/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h user/syuu/mq_bpf/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h user/syuu/mq_bpf/crypto/openssh/sshd_config user/syuu/mq_bpf/crypto/openssh/sshd_config.5 user/syuu/mq_bpf/etc/defaults/rc.conf user/syuu/mq_bpf/etc/mtree/BSD.include.dist user/syuu/mq_bpf/etc/mtree/BSD.usr.dist user/syuu/mq_bpf/etc/network.subr user/syuu/mq_bpf/etc/newsyslog.conf user/syuu/mq_bpf/etc/rc.d/Makefile user/syuu/mq_bpf/etc/rc.d/addswap user/syuu/mq_bpf/etc/rc.d/fsck user/syuu/mq_bpf/etc/rc.d/mdconfig user/syuu/mq_bpf/etc/syslog.conf user/syuu/mq_bpf/include/Makefile user/syuu/mq_bpf/include/gssapi/gssapi.h user/syuu/mq_bpf/include/paths.h user/syuu/mq_bpf/lib/Makefile user/syuu/mq_bpf/lib/libc/gen/siginterrupt.c user/syuu/mq_bpf/lib/libc/gen/signal.c user/syuu/mq_bpf/lib/libc/iconv/Symbol.map user/syuu/mq_bpf/lib/libc/iconv/citrus_lock.h user/syuu/mq_bpf/lib/libc/iconv/citrus_mapper.c user/syuu/mq_bpf/lib/libc/iconv/iconv.c user/syuu/mq_bpf/lib/libdwarf/dwarf_init.c user/syuu/mq_bpf/lib/libdwarf/dwarf_loc.c user/syuu/mq_bpf/lib/libfetch/fetch.c user/syuu/mq_bpf/lib/libprocstat/Makefile user/syuu/mq_bpf/lib/libprocstat/common_kvm.h user/syuu/mq_bpf/lib/libprocstat/libprocstat.c user/syuu/mq_bpf/lib/librt/sigev_thread.c user/syuu/mq_bpf/lib/libstand/nfs.c user/syuu/mq_bpf/lib/libutil/login_times.c user/syuu/mq_bpf/rescue/rescue/Makefile user/syuu/mq_bpf/sbin/devd/devd.8 user/syuu/mq_bpf/sbin/devd/devd.cc user/syuu/mq_bpf/sbin/dhclient/clparse.c user/syuu/mq_bpf/sbin/dhclient/dhclient.c user/syuu/mq_bpf/sbin/dhclient/dhcpd.h user/syuu/mq_bpf/sbin/geom/class/part/gpart.8 user/syuu/mq_bpf/sbin/hastctl/hastctl.c user/syuu/mq_bpf/sbin/hastd/control.c user/syuu/mq_bpf/sbin/hastd/hastd.8 user/syuu/mq_bpf/sbin/hastd/refcnt.h user/syuu/mq_bpf/sbin/ifconfig/af_nd6.c user/syuu/mq_bpf/sbin/mdconfig/mdconfig.8 user/syuu/mq_bpf/sbin/mount/mount.8 user/syuu/mq_bpf/sbin/mount/mount.c user/syuu/mq_bpf/sbin/nvmecontrol/Makefile user/syuu/mq_bpf/sbin/nvmecontrol/nvmecontrol.8 user/syuu/mq_bpf/sbin/nvmecontrol/nvmecontrol.c user/syuu/mq_bpf/sbin/reboot/boot_i386.8 user/syuu/mq_bpf/sbin/swapon/swapon.8 user/syuu/mq_bpf/sbin/swapon/swapon.c user/syuu/mq_bpf/share/examples/Makefile user/syuu/mq_bpf/share/examples/etc/README.examples user/syuu/mq_bpf/share/examples/etc/make.conf user/syuu/mq_bpf/share/man/man4/Makefile user/syuu/mq_bpf/share/man/man5/fstab.5 user/syuu/mq_bpf/share/man/man9/locking.9 user/syuu/mq_bpf/share/mk/bsd.libnames.mk user/syuu/mq_bpf/sys/amd64/include/acpica_machdep.h user/syuu/mq_bpf/sys/amd64/include/counter.h user/syuu/mq_bpf/sys/amd64/vmm/intel/ept.c user/syuu/mq_bpf/sys/amd64/vmm/x86.c user/syuu/mq_bpf/sys/arm/arm/bus_space_generic.c user/syuu/mq_bpf/sys/arm/arm/cpufunc.c user/syuu/mq_bpf/sys/arm/arm/db_trace.c user/syuu/mq_bpf/sys/arm/arm/exception.S user/syuu/mq_bpf/sys/arm/arm/gic.c user/syuu/mq_bpf/sys/arm/arm/identcpu.c user/syuu/mq_bpf/sys/arm/broadcom/bcm2835/bcm2835_mbox.c user/syuu/mq_bpf/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c user/syuu/mq_bpf/sys/arm/conf/RPI-B user/syuu/mq_bpf/sys/arm/include/armreg.h user/syuu/mq_bpf/sys/arm/include/asmacros.h user/syuu/mq_bpf/sys/arm/include/counter.h user/syuu/mq_bpf/sys/arm/include/intr.h user/syuu/mq_bpf/sys/arm/ti/am335x/am335x_lcd.c user/syuu/mq_bpf/sys/arm/versatile/versatile_pci.c user/syuu/mq_bpf/sys/arm/versatile/versatile_sic.c user/syuu/mq_bpf/sys/boot/i386/gptboot/Makefile user/syuu/mq_bpf/sys/cam/cam_ccb.h user/syuu/mq_bpf/sys/cam/scsi/scsi_all.c user/syuu/mq_bpf/sys/cam/scsi/scsi_xpt.c user/syuu/mq_bpf/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c user/syuu/mq_bpf/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c user/syuu/mq_bpf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c user/syuu/mq_bpf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h user/syuu/mq_bpf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c user/syuu/mq_bpf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c user/syuu/mq_bpf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/syuu/mq_bpf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/syuu/mq_bpf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/syuu/mq_bpf/sys/cddl/dev/dtmalloc/dtmalloc.c user/syuu/mq_bpf/sys/conf/NOTES user/syuu/mq_bpf/sys/conf/files user/syuu/mq_bpf/sys/conf/files.amd64 user/syuu/mq_bpf/sys/conf/files.arm user/syuu/mq_bpf/sys/conf/files.i386 user/syuu/mq_bpf/sys/conf/files.ia64 user/syuu/mq_bpf/sys/conf/files.mips user/syuu/mq_bpf/sys/conf/files.pc98 user/syuu/mq_bpf/sys/conf/files.powerpc user/syuu/mq_bpf/sys/conf/files.sparc64 user/syuu/mq_bpf/sys/conf/newvers.sh user/syuu/mq_bpf/sys/conf/options user/syuu/mq_bpf/sys/contrib/dev/acpica/acpica_prep.sh user/syuu/mq_bpf/sys/contrib/dev/acpica/changes.txt (contents, props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/common/dmrestag.c user/syuu/mq_bpf/sys/contrib/dev/acpica/common/dmtable.c user/syuu/mq_bpf/sys/contrib/dev/acpica/common/dmtbdump.c user/syuu/mq_bpf/sys/contrib/dev/acpica/common/dmtbinfo.c user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/aslcompile.c user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/aslmessages.h user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/asltree.c user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/aslutils.c user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/dtfield.c user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/dtio.c user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/dttable.c user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/dttemplate.h user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/dtutils.c user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/preprocess.h user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/prscan.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/debugger/dbcmds.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/debugger/dbdisply.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/debugger/dbinput.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/debugger/dbnames.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/disassembler/dmopcode.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/events/evgpeinit.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/executer/exdump.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/namespace/nsdump.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/namespace/nsrepair2.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/namespace/nsxfname.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/resources/rsdump.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/resources/rsutils.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/tables/tbxfroot.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/utilities/uteval.c user/syuu/mq_bpf/sys/contrib/dev/acpica/components/utilities/utstring.c user/syuu/mq_bpf/sys/contrib/dev/acpica/include/acdisasm.h user/syuu/mq_bpf/sys/contrib/dev/acpica/include/acpixf.h user/syuu/mq_bpf/sys/contrib/dev/acpica/include/actables.h user/syuu/mq_bpf/sys/contrib/dev/acpica/include/actypes.h user/syuu/mq_bpf/sys/contrib/dev/acpica/include/acutils.h user/syuu/mq_bpf/sys/contrib/dev/acpica/include/platform/acfreebsd.h user/syuu/mq_bpf/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c user/syuu/mq_bpf/sys/dev/acpi_support/atk0110.c user/syuu/mq_bpf/sys/dev/acpica/acpi_pcib_acpi.c user/syuu/mq_bpf/sys/dev/ath/if_ath_rx_edma.c user/syuu/mq_bpf/sys/dev/bce/if_bce.c user/syuu/mq_bpf/sys/dev/bce/if_bcereg.h user/syuu/mq_bpf/sys/dev/bge/if_bge.c user/syuu/mq_bpf/sys/dev/bge/if_bgereg.h user/syuu/mq_bpf/sys/dev/cxgbe/t4_main.c user/syuu/mq_bpf/sys/dev/isci/scil/sati_passthrough.c user/syuu/mq_bpf/sys/dev/iwn/if_iwn.c user/syuu/mq_bpf/sys/dev/mfi/mfi.c user/syuu/mq_bpf/sys/dev/nvme/nvme.h user/syuu/mq_bpf/sys/dev/nvme/nvme_ctrlr.c user/syuu/mq_bpf/sys/dev/nvme/nvme_private.h user/syuu/mq_bpf/sys/dev/nvme/nvme_qpair.c user/syuu/mq_bpf/sys/dev/pci/pci.c user/syuu/mq_bpf/sys/dev/pci/pci_private.h user/syuu/mq_bpf/sys/dev/re/if_re.c user/syuu/mq_bpf/sys/dev/uart/uart.h user/syuu/mq_bpf/sys/dev/uart/uart_bus_fdt.c user/syuu/mq_bpf/sys/dev/uart/uart_cpu_fdt.c user/syuu/mq_bpf/sys/dev/uart/uart_subr.c user/syuu/mq_bpf/sys/dev/usb/quirk/usb_quirk.c user/syuu/mq_bpf/sys/dev/usb/serial/u3g.c user/syuu/mq_bpf/sys/dev/usb/usbdevs user/syuu/mq_bpf/sys/dev/usb/wlan/if_urtwn.c user/syuu/mq_bpf/sys/dev/xen/blkfront/blkfront.c user/syuu/mq_bpf/sys/dev/xen/blkfront/block.h user/syuu/mq_bpf/sys/fs/ext2fs/ext2_extern.h user/syuu/mq_bpf/sys/fs/ext2fs/ext2_lookup.c user/syuu/mq_bpf/sys/fs/ext2fs/ext2_vfsops.c user/syuu/mq_bpf/sys/fs/smbfs/smbfs_node.c user/syuu/mq_bpf/sys/fs/smbfs/smbfs_vfsops.c user/syuu/mq_bpf/sys/fs/smbfs/smbfs_vnops.c user/syuu/mq_bpf/sys/geom/geom_io.c user/syuu/mq_bpf/sys/i386/include/acpica_machdep.h user/syuu/mq_bpf/sys/i386/include/counter.h user/syuu/mq_bpf/sys/ia64/include/acpica_machdep.h user/syuu/mq_bpf/sys/ia64/include/counter.h user/syuu/mq_bpf/sys/kern/Make.tags.inc user/syuu/mq_bpf/sys/kern/kern_acct.c user/syuu/mq_bpf/sys/kern/kern_clock.c user/syuu/mq_bpf/sys/kern/kern_descrip.c user/syuu/mq_bpf/sys/kern/kern_synch.c user/syuu/mq_bpf/sys/kern/subr_bus.c user/syuu/mq_bpf/sys/kern/subr_counter.c user/syuu/mq_bpf/sys/kern/sys_generic.c user/syuu/mq_bpf/sys/kern/uipc_usrreq.c user/syuu/mq_bpf/sys/kern/vfs_bio.c user/syuu/mq_bpf/sys/mips/include/counter.h user/syuu/mq_bpf/sys/modules/Makefile user/syuu/mq_bpf/sys/modules/cc/Makefile user/syuu/mq_bpf/sys/net80211/ieee80211_ioctl.c user/syuu/mq_bpf/sys/netsmb/smb_conn.c user/syuu/mq_bpf/sys/nfsclient/nfs_vnops.c user/syuu/mq_bpf/sys/powerpc/include/counter.h user/syuu/mq_bpf/sys/powerpc/wii/wii_ipcreg.h user/syuu/mq_bpf/sys/sparc64/include/counter.h user/syuu/mq_bpf/sys/sys/bus.h user/syuu/mq_bpf/sys/sys/malloc.h user/syuu/mq_bpf/sys/sys/socketvar.h user/syuu/mq_bpf/sys/sys/stdatomic.h user/syuu/mq_bpf/sys/ufs/ffs/ffs_vfsops.c user/syuu/mq_bpf/sys/ufs/ufs/dinode.h user/syuu/mq_bpf/sys/ufs/ufs/inode.h user/syuu/mq_bpf/sys/ufs/ufs/ufs_extattr.c user/syuu/mq_bpf/sys/ufs/ufs/ufs_vnops.c user/syuu/mq_bpf/sys/vm/uma_core.c user/syuu/mq_bpf/sys/vm/vm.h user/syuu/mq_bpf/sys/vm/vm_init.c user/syuu/mq_bpf/sys/vm/vm_kern.c user/syuu/mq_bpf/sys/vm/vm_kern.h user/syuu/mq_bpf/sys/vm/vm_object.c user/syuu/mq_bpf/sys/vm/vm_pager.c user/syuu/mq_bpf/sys/vm/vm_pager.h user/syuu/mq_bpf/tools/tools/cxgbetool/cxgbetool.c user/syuu/mq_bpf/usr.bin/Makefile user/syuu/mq_bpf/usr.bin/Makefile.amd64 user/syuu/mq_bpf/usr.bin/Makefile.i386 user/syuu/mq_bpf/usr.bin/Makefile.ia64 user/syuu/mq_bpf/usr.bin/Makefile.powerpc user/syuu/mq_bpf/usr.bin/Makefile.sparc64 user/syuu/mq_bpf/usr.bin/calendar/calendars/calendar.freebsd user/syuu/mq_bpf/usr.bin/kdump/kdump.c user/syuu/mq_bpf/usr.bin/killall/killall.1 user/syuu/mq_bpf/usr.bin/killall/killall.c user/syuu/mq_bpf/usr.bin/svn/lib/libapr_util/Makefile user/syuu/mq_bpf/usr.bin/svn/lib/libapr_util/apr_ldap.h user/syuu/mq_bpf/usr.bin/svn/lib/libapr_util/apu.h user/syuu/mq_bpf/usr.bin/svn/lib/libapr_util/apu_config.h user/syuu/mq_bpf/usr.bin/truss/syscalls.c user/syuu/mq_bpf/usr.sbin/Makefile.amd64 user/syuu/mq_bpf/usr.sbin/Makefile.i386 user/syuu/mq_bpf/usr.sbin/Makefile.ia64 user/syuu/mq_bpf/usr.sbin/Makefile.powerpc user/syuu/mq_bpf/usr.sbin/Makefile.sparc64 user/syuu/mq_bpf/usr.sbin/acpi/acpidb/acpidb.c user/syuu/mq_bpf/usr.sbin/acpi/acpidump/acpi.c user/syuu/mq_bpf/usr.sbin/bhyve/atpic.c user/syuu/mq_bpf/usr.sbin/bhyve/pci_emul.c user/syuu/mq_bpf/usr.sbin/newsyslog/newsyslog.c user/syuu/mq_bpf/usr.sbin/nfsd/nfsv4.4 user/syuu/mq_bpf/usr.sbin/pkg_install/add/extract.c user/syuu/mq_bpf/usr.sbin/pkg_install/create/pl.c user/syuu/mq_bpf/usr.sbin/pkg_install/lib/exec.c user/syuu/mq_bpf/usr.sbin/pw/pw_user.c Directory Properties: user/syuu/mq_bpf/ (props changed) user/syuu/mq_bpf/contrib/libstdc++/ (props changed) user/syuu/mq_bpf/contrib/llvm/ (props changed) user/syuu/mq_bpf/crypto/heimdal/ (props changed) user/syuu/mq_bpf/crypto/openssh/ (props changed) user/syuu/mq_bpf/lib/libc/ (props changed) user/syuu/mq_bpf/lib/libutil/ (props changed) user/syuu/mq_bpf/sbin/ (props changed) user/syuu/mq_bpf/share/man/man4/ (props changed) user/syuu/mq_bpf/sys/ (props changed) user/syuu/mq_bpf/sys/amd64/vmm/ (props changed) user/syuu/mq_bpf/sys/boot/ (props changed) user/syuu/mq_bpf/sys/cddl/contrib/opensolaris/ (props changed) user/syuu/mq_bpf/sys/conf/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/common/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/compiler/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/components/debugger/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/components/disassembler/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/components/events/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/components/executer/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/components/namespace/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/components/resources/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/components/tables/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/components/utilities/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/include/ (props changed) user/syuu/mq_bpf/sys/contrib/dev/acpica/os_specific/ (props changed) user/syuu/mq_bpf/usr.bin/calendar/ (props changed) user/syuu/mq_bpf/usr.sbin/bhyve/ (props changed) Modified: user/syuu/mq_bpf/Makefile.inc1 ============================================================================== --- user/syuu/mq_bpf/Makefile.inc1 Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/Makefile.inc1 Tue Jul 2 14:54:18 2013 (r252509) @@ -1131,11 +1131,11 @@ legacy: .endif .for _tool in tools/build ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install .endfor @@ -1264,10 +1264,10 @@ bootstrap-tools: ${_crunch} \ ${_nmtree} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install .endfor @@ -1305,16 +1305,16 @@ build-tools: usr.bin/mkesdb_static \ usr.bin/mkcsmapper_static ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ ${MAKE} DIRPRFX=${_tool}/ build-tools .endfor .for _tool in \ ${_gcc_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ ${MAKE} DIRPRFX=${_tool}/ all .endfor @@ -1363,10 +1363,10 @@ cross-tools: ${_crunchide} \ ${_kgzip} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor @@ -1545,10 +1545,10 @@ lib/libradius__L: lib/libmd__L ${_lib}__PL: .PHONY .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_lib}; \ - ${MAKE} DIRPRFX=${_lib}/ obj; \ - ${MAKE} DIRPRFX=${_lib}/ depend; \ - ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \ + cd ${.CURDIR}/${_lib} && \ + ${MAKE} DIRPRFX=${_lib}/ obj && \ + ${MAKE} DIRPRFX=${_lib}/ depend && \ + ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \ ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install .endif .endfor @@ -1557,10 +1557,10 @@ ${_lib}__PL: .PHONY ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_lib}; \ - ${MAKE} DIRPRFX=${_lib}/ obj; \ - ${MAKE} DIRPRFX=${_lib}/ depend; \ - ${MAKE} DIRPRFX=${_lib}/ all; \ + cd ${.CURDIR}/${_lib} && \ + ${MAKE} DIRPRFX=${_lib}/ obj && \ + ${MAKE} DIRPRFX=${_lib}/ depend && \ + ${MAKE} DIRPRFX=${_lib}/ all && \ ${MAKE} DIRPRFX=${_lib}/ install .endif .endfor @@ -1570,10 +1570,10 @@ ${_lib}__L: .PHONY # modules. lib/libpam__L: .PHONY ${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \ - cd ${.CURDIR}/lib/libpam; \ - ${MAKE} DIRPRFX=lib/libpam/ obj; \ - ${MAKE} DIRPRFX=lib/libpam/ depend; \ - ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ + cd ${.CURDIR}/lib/libpam && \ + ${MAKE} DIRPRFX=lib/libpam/ obj && \ + ${MAKE} DIRPRFX=lib/libpam/ depend && \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install _prereq_libs: ${_prereq_libs:S/$/__PL/} @@ -1584,7 +1584,7 @@ _generic_libs: ${_generic_libs:S/$/__L/} .for __target in all clean cleandepend cleandir depend includes obj .for entry in ${SUBDIR} ${entry}.${__target}__D: .PHONY - ${_+_}@if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \ + ${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \ ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \ edir=${entry}.${MACHINE_ARCH}; \ cd ${.CURDIR}/$${edir}; \ @@ -1822,10 +1822,10 @@ _xb-bootstrap-tools: .for _tool in \ ${_clang_tblgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${CDMAKE} DIRPRFX=${_tool}/ obj; \ - ${CDMAKE} DIRPRFX=${_tool}/ depend; \ - ${CDMAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${CDMAKE} DIRPRFX=${_tool}/ obj && \ + ${CDMAKE} DIRPRFX=${_tool}/ depend && \ + ${CDMAKE} DIRPRFX=${_tool}/ all && \ ${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install .endfor @@ -1841,9 +1841,9 @@ _xb-cross-tools: ${_clang_libs} \ ${_clang} ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ - cd ${.CURDIR}/${_tool}; \ - ${CDMAKE} DIRPRFX=${_tool}/ obj; \ - ${CDMAKE} DIRPRFX=${_tool}/ depend; \ + cd ${.CURDIR}/${_tool} && \ + ${CDMAKE} DIRPRFX=${_tool}/ obj && \ + ${CDMAKE} DIRPRFX=${_tool}/ depend && \ ${CDMAKE} DIRPRFX=${_tool}/ all .endfor Modified: user/syuu/mq_bpf/ObsoleteFiles.inc ============================================================================== --- user/syuu/mq_bpf/ObsoleteFiles.inc Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/ObsoleteFiles.inc Tue Jul 2 14:54:18 2013 (r252509) @@ -41,7 +41,7 @@ # 20130623: dialog update from 1.1 to 1.2 OLD_LIBS+=usr/lib/libdialog.so.7 OLD_LIBS+=usr/lib32/libdialog.so.7 -# 20130616: vfs_mounted.9 removed +# 20130616: vfs_mount.9 removed OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz # 20130614: remove CVS from base OLD_FILES+=usr/bin/cvs Modified: user/syuu/mq_bpf/UPDATING ============================================================================== --- user/syuu/mq_bpf/UPDATING Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/UPDATING Tue Jul 2 14:54:18 2013 (r252509) @@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130629: + Fix targets that run multiple make's to use && rather than ; + so that subsequent steps depend on success of previous. + + NOTE: if building 'universe' with -j* on stable/8 or stable/9 + it would be better to start the build using bmake, to avoid + overloading the machine. + 20130618: Fix a bug that allowed a tracing process (e.g. gdb) to write to a memory-mapped file in the traced process's address space Modified: user/syuu/mq_bpf/bin/ed/re.c ============================================================================== --- user/syuu/mq_bpf/bin/ed/re.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/bin/ed/re.c Tue Jul 2 14:54:18 2013 (r252509) @@ -89,7 +89,7 @@ extract_pattern(int delimiter) default: break; case '[': - if ((nd = parse_char_class(++nd)) == NULL) { + if ((nd = parse_char_class(nd + 1)) == NULL) { errmsg = "unbalanced brackets ([])"; return NULL; } Modified: user/syuu/mq_bpf/bin/sh/eval.c ============================================================================== --- user/syuu/mq_bpf/bin/sh/eval.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/bin/sh/eval.c Tue Jul 2 14:54:18 2013 (r252509) @@ -589,7 +589,8 @@ evalpipe(union node *n) pip[1] = -1; if (lp->next) { if (pipe(pip) < 0) { - close(prevfd); + if (prevfd >= 0) + close(prevfd); error("Pipe call failed: %s", strerror(errno)); } } Modified: user/syuu/mq_bpf/contrib/libstdc++/libsupc++/unwind-cxx.h ============================================================================== --- user/syuu/mq_bpf/contrib/libstdc++/libsupc++/unwind-cxx.h Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/contrib/libstdc++/libsupc++/unwind-cxx.h Tue Jul 2 14:54:18 2013 (r252509) @@ -133,7 +133,7 @@ extern "C" void __cxa_bad_typeid (); // throws, and if bad_exception needs to be thrown. Called from the // compiler. extern "C" void __cxa_call_unexpected (void *) __attribute__((noreturn)); -extern "C" void __cxa_call_terminate (void*) __attribute__((noreturn)); +extern "C" void __cxa_call_terminate (_Unwind_Exception*) __attribute__((noreturn)); #ifdef __ARM_EABI_UNWINDER__ // Arm EABI specified routines. Modified: user/syuu/mq_bpf/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h ============================================================================== --- user/syuu/mq_bpf/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h Tue Jul 2 14:54:18 2013 (r252509) @@ -27,7 +27,7 @@ protected: public: explicit ARMFrameLowering(const ARMSubtarget &sti) - : TargetFrameLowering(StackGrowsDown, sti.getStackAlignment(), 0, 4), + : TargetFrameLowering(StackGrowsDown, sti.getStackAlignment(), 0, 8), STI(sti) { } Modified: user/syuu/mq_bpf/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h ============================================================================== --- user/syuu/mq_bpf/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h Tue Jul 2 14:54:18 2013 (r252509) @@ -36,7 +36,7 @@ #ifndef GSSAPI_KRB5_H_ #define GSSAPI_KRB5_H_ -#include <gssapi.h> +#include <gssapi/gssapi.h> GSSAPI_CPP_START Modified: user/syuu/mq_bpf/crypto/openssh/sshd_config ============================================================================== --- user/syuu/mq_bpf/crypto/openssh/sshd_config Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/crypto/openssh/sshd_config Tue Jul 2 14:54:18 2013 (r252509) @@ -105,7 +105,7 @@ #PrintLastLog yes #TCPKeepAlive yes #UseLogin no -#UsePrivilegeSeparation sandbox +#UsePrivilegeSeparation yes #PermitUserEnvironment no #Compression delayed #ClientAliveInterval 0 Modified: user/syuu/mq_bpf/crypto/openssh/sshd_config.5 ============================================================================== --- user/syuu/mq_bpf/crypto/openssh/sshd_config.5 Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/crypto/openssh/sshd_config.5 Tue Jul 2 14:54:18 2013 (r252509) @@ -1169,7 +1169,7 @@ the privilege of the authenticated user. The goal of privilege separation is to prevent privilege escalation by containing any corruption within the unprivileged processes. The default is -.Dq sandbox . +.Dq yes . If .Cm UsePrivilegeSeparation is set to Modified: user/syuu/mq_bpf/etc/defaults/rc.conf ============================================================================== --- user/syuu/mq_bpf/etc/defaults/rc.conf Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/etc/defaults/rc.conf Tue Jul 2 14:54:18 2013 (r252509) @@ -32,8 +32,6 @@ early_late_divider="FILESYSTEMS" # Scrip always_force_depends="NO" # Set to check that indicated dependencies are # running during boot (can increase boot time). -swapfile="NO" # Set to name of swapfile if aux swapfile desired. -swapfile_mdunit="99" # Swapfile md(4) unit number created by mdconfig(8). apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). @@ -85,15 +83,12 @@ geli_autodetach="YES" # Automatically de #geli_da1_autodetach="NO" #geli_mirror_home_flags="-k /etc/geli/home.keys" -geli_swap_flags="-e aes -l 256 -s 4096 -d" # Options for GELI-encrypted - # swap partitions. - root_rw_mount="YES" # Set to NO to inhibit remounting root read-write. fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. fsck_y_flags="" # Additional flags for fsck -y background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. -netfs_types="nfs:NFS oldnfs:OLDNFS" # Net filesystems. +netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB" # Net filesystems. extra_netfs_types="NO" # List of network extra filesystem types for delayed # mount at startup (or NO). Modified: user/syuu/mq_bpf/etc/mtree/BSD.include.dist ============================================================================== --- user/syuu/mq_bpf/etc/mtree/BSD.include.dist Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/etc/mtree/BSD.include.dist Tue Jul 2 14:54:18 2013 (r252509) @@ -176,6 +176,8 @@ .. procfs .. + smbfs + .. udf .. unionfs Modified: user/syuu/mq_bpf/etc/mtree/BSD.usr.dist ============================================================================== --- user/syuu/mq_bpf/etc/mtree/BSD.usr.dist Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/etc/mtree/BSD.usr.dist Tue Jul 2 14:54:18 2013 (r252509) @@ -309,6 +309,10 @@ srcs .. .. + smbfs + print + .. + .. sunrpc dir .. Modified: user/syuu/mq_bpf/etc/network.subr ============================================================================== --- user/syuu/mq_bpf/etc/network.subr Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/etc/network.subr Tue Jul 2 14:54:18 2013 (r252509) @@ -164,6 +164,9 @@ ifconfig_up() fi fi + ifalias $1 link alias + ifalias $1 ether alias + if [ ${_cfg} -eq 0 ]; then ${IFCONFIG_CMD} $1 up fi @@ -318,6 +321,15 @@ dhcpif() local _tmpargs _arg _tmpargs=`_ifconfig_getargs $1` + case $1 in + lo[0-9]*|\ + stf[0-9]*|\ + faith[0-9]*|\ + lp[0-9]*|\ + sl[0-9]*) + return 1 + ;; + esac if noafif $1; then return 1 fi @@ -423,6 +435,9 @@ afexists() return 1 fi ;; + link|ether) + return 0 + ;; *) err 1 "afexists(): Unsupported address family: $_af" ;; @@ -509,7 +524,7 @@ ipv6_autoconfif() _if=$1 case $_if in - lo0|\ + lo[0-9]*|\ stf[0-9]*|\ faith[0-9]*|\ lp[0-9]*|\ @@ -691,7 +706,7 @@ ifalias() afexists $2 || return $_ret case "$2" in - inet|inet6) + inet|inet6|link|ether) ifalias_af_common $1 $2 $3 && _ret=0 ;; esac @@ -898,6 +913,11 @@ ifalias_af_common_handler() *) return ;; esac + # link(ether) does not support address removal. + case $_af:$_action in + link:-alias|ether:-alias) return ;; + esac + _tmpargs= for _c in $_args; do case $_c in @@ -956,6 +976,8 @@ ifalias_af_common() inet\ *) _iaf=inet ;; inet6\ *) _iaf=inet6 ;; ipx\ *) _iaf=ipx ;; + link\ *) _iaf=link ;; + ether\ *) _iaf=ether ;; esac case ${_af}:${_action}:${_iaf}:"${ifconfig_args}" in @@ -1003,7 +1025,7 @@ ifalias_af_common() _tmpargs= for _c in `get_if_var $_if ifconfig_IF_aliases` $_aliasn; do case $_c in - inet|inet6|ipx) + inet|inet6|ipx|link|ether) case $_tmpargs in ${_af}\ *) eval ifalias_af_common_handler $_if $_af $_action $_tmpargs && _ret=0 Modified: user/syuu/mq_bpf/etc/newsyslog.conf ============================================================================== --- user/syuu/mq_bpf/etc/newsyslog.conf Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/etc/newsyslog.conf Tue Jul 2 14:54:18 2013 (r252509) @@ -32,6 +32,7 @@ /var/log/monthly.log 640 12 * $M1D0 JN /var/log/pflog 600 3 100 * JB /var/run/pflogd.pid /var/log/ppp.log root:network 640 3 100 * JC +/var/log/devd.log 644 3 100 * JC /var/log/security 600 10 100 * JC /var/log/sendmail.st 640 10 * 168 BN /var/log/utx.log 644 3 * @01T05 B Modified: user/syuu/mq_bpf/etc/rc.d/Makefile ============================================================================== --- user/syuu/mq_bpf/etc/rc.d/Makefile Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/etc/rc.d/Makefile Tue Jul 2 14:54:18 2013 (r252509) @@ -37,7 +37,6 @@ FILES= DAEMON \ dhclient \ dmesg \ dumpon \ - encswap \ faith \ fsck \ ftp-proxy \ @@ -139,7 +138,8 @@ FILES= DAEMON \ static_arp \ static_ndp \ stf \ - swap1 \ + swap \ + swaplate \ syscons \ sysctl \ syslogd \ Modified: user/syuu/mq_bpf/etc/rc.d/addswap ============================================================================== --- user/syuu/mq_bpf/etc/rc.d/addswap Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/etc/rc.d/addswap Tue Jul 2 14:54:18 2013 (r252509) @@ -13,57 +13,12 @@ . /etc/rc.subr name="addswap" -start_cmd="addswap_start" -stop_cmd="addswap_stop" +start_cmd=":" +stop_cmd=":" +rcvar= -addswap_start() -{ - case ${swapfile} in - [Nn][Oo] | '') - ;; - *) - if [ -w "${swapfile}" ]; then - check_startmsgs && echo "Adding ${swapfile} as additional swap" - - if [ -n "${swapfile_mdunit}" ]; then - mdev="/dev/md${swapfile_mdunit#md}" - mdconfig -a -t vnode -f "${swapfile}" -u ${swapfile_mdunit} - else - mdev="/dev/`mdconfig -a -t vnode -f "${swapfile}"`" - fi - - if [ $? -eq 0 ]; then - swapon ${mdev} - else - echo "error creating swapfile device" - fi - fi - ;; - esac -} - -addswap_stop() -{ - case ${swapfile} in - [Nn][Oo] | '') - ;; - *) - if [ -n "${swapfile_mdunit}" ]; then - mdev="/dev/md${swapfile_mdunit#md}" - else - mdev="/dev/`mdconfig -lv | grep "${swapfile}" | cut -f1`" - swapfile_mdunit=${mdev#md} - fi - if [ -n "${swapfile_mdunit}" ]; then - swapctl -l | grep -q ${mdev} - if [ $? -eq 0 ]; then - echo "Dismounting swapfile ${swapfile}" - swapoff ${mdev} && mdconfig -d -u ${swapfile_mdunit} - fi - fi - ;; - esac -} +set_rcvar_obsolete swapfile +set_rcvar_obsolete geli_swap_flags load_rc_config $name run_rc_command "$1" Modified: user/syuu/mq_bpf/etc/rc.d/fsck ============================================================================== --- user/syuu/mq_bpf/etc/rc.d/fsck Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/etc/rc.d/fsck Tue Jul 2 14:54:18 2013 (r252509) @@ -4,7 +4,7 @@ # # PROVIDE: fsck -# REQUIRE: localswap +# REQUIRE: swap # KEYWORD: nojail . /etc/rc.subr Modified: user/syuu/mq_bpf/etc/rc.d/mdconfig ============================================================================== --- user/syuu/mq_bpf/etc/rc.d/mdconfig Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/etc/rc.d/mdconfig Tue Jul 2 14:54:18 2013 (r252509) @@ -28,7 +28,7 @@ # # PROVIDE: mdconfig -# REQUIRE: localswap root +# REQUIRE: swap root . /etc/rc.subr Copied: user/syuu/mq_bpf/etc/rc.d/swap (from r252508, head/etc/rc.d/swap) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/syuu/mq_bpf/etc/rc.d/swap Tue Jul 2 14:54:18 2013 (r252509, copy of r252508, head/etc/rc.d/swap) @@ -0,0 +1,17 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: swap +# REQUIRE: disks +# KEYWORD: nojail shutdown + +. /etc/rc.subr + +name="swap" +start_cmd='/sbin/swapon -aq' +stop_cmd=':' + +load_rc_config $name +run_rc_command "$1" Copied: user/syuu/mq_bpf/etc/rc.d/swaplate (from r252508, head/etc/rc.d/swaplate) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/syuu/mq_bpf/etc/rc.d/swaplate Tue Jul 2 14:54:18 2013 (r252509, copy of r252508, head/etc/rc.d/swaplate) @@ -0,0 +1,17 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: swaplate +# REQUIRE: mountlate +# KEYWORD: nojail shutdown + +. /etc/rc.subr + +name="swaplate" +start_cmd='/sbin/swapon -aLq' +stop_cmd='/sbin/swapoff -aq' + +load_rc_config swap +run_rc_command "$1" Modified: user/syuu/mq_bpf/etc/syslog.conf ============================================================================== --- user/syuu/mq_bpf/etc/syslog.conf Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/etc/syslog.conf Tue Jul 2 14:54:18 2013 (r252509) @@ -13,6 +13,7 @@ mail.info /var/log/maillog lpr.info /var/log/lpd-errs ftp.info /var/log/xferlog cron.* /var/log/cron +!-devd *.=debug /var/log/debug.log *.emerg * # uncomment this to log all writes to /dev/console to /var/log/console.log @@ -27,6 +28,9 @@ cron.* /var/log/cron # news.crit /var/log/news/news.crit # news.err /var/log/news/news.err # news.notice /var/log/news/news.notice +# Uncomment this if you wish to see messages produced by devd +# !devd +# *.>=info /var/log/devd.log !ppp *.* /var/log/ppp.log !* Modified: user/syuu/mq_bpf/include/Makefile ============================================================================== --- user/syuu/mq_bpf/include/Makefile Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/include/Makefile Tue Jul 2 14:54:18 2013 (r252509) @@ -37,7 +37,7 @@ LHDRS= aio.h errno.h fcntl.h linker_set. syslog.h ucontext.h LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \ - netipsec ${_netipx} netnatm \ + netipsec ${_netipx} netnatm netsmb \ nfs nfsclient nfsserver \ sys vm @@ -48,7 +48,7 @@ LSUBDIRS= cam/ata cam/scsi \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ - fs/procfs fs/udf fs/unionfs \ + fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/mountver geom/multipath geom/nop \ geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \ @@ -80,6 +80,7 @@ INCS+= iconv.h LSUBSUBDIRS+= netgraph/bluetooth/include .endif +# XXX unconditionally needed by <netsmb/netbios.h> #.if ${MK_IPX} != "no" _netipx= netipx #.endif Modified: user/syuu/mq_bpf/include/gssapi/gssapi.h ============================================================================== --- user/syuu/mq_bpf/include/gssapi/gssapi.h Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/include/gssapi/gssapi.h Tue Jul 2 14:54:18 2013 (r252509) @@ -44,6 +44,33 @@ typedef __ssize_t ssize_t; #define _SSIZE_T_DECLARED #endif +/* Compatibility with Heimdal 1.5.1 */ +#ifndef GSSAPI_CPP_START +#ifdef __cplusplus +#define GSSAPI_CPP_START extern "C" { +#define GSSAPI_CPP_END } +#else +#define GSSAPI_CPP_START +#define GSSAPI_CPP_END +#endif +#endif + +/* Compatibility with Heimdal 1.5.1 */ +#ifndef BUILD_GSSAPI_LIB +#define GSSAPI_LIB_FUNCTION +#define GSSAPI_LIB_CALL +#define GSSAPI_LIB_VARIABLE +#endif + +/* Compatibility with Heimdal 1.5.1 */ +#ifndef GSSAPI_DEPRECATED_FUNCTION +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 ))) +#define GSSAPI_DEPRECATED_FUNCTION(X) __attribute__((deprecated)) +#else +#define GSSAPI_DEPRECATED_FUNCTION(X) +#endif +#endif + #if 0 /* * If the platform supports the xom.h header file, it should be Modified: user/syuu/mq_bpf/include/paths.h ============================================================================== --- user/syuu/mq_bpf/include/paths.h Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/include/paths.h Tue Jul 2 14:54:18 2013 (r252509) @@ -57,6 +57,8 @@ #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" #define _PATH_FWMEM "/dev/fwmem" +#define _PATH_GBDE "/sbin/gbde" +#define _PATH_GELI "/sbin/geli" #define _PATH_HALT "/sbin/halt" #ifdef COMPAT_32BIT #define _PATH_I18NMODULE "/usr/lib32/i18n" Modified: user/syuu/mq_bpf/lib/Makefile ============================================================================== --- user/syuu/mq_bpf/lib/Makefile Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/Makefile Tue Jul 2 14:54:18 2013 (r252509) @@ -102,6 +102,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_librtld_db} \ ${_libsdp} \ ${_libsm} \ + ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} \ libstand \ @@ -205,6 +206,7 @@ _libypclnt= libypclnt .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +_libsmb= libsmb _libvgl= libvgl _libproc= libproc _librtld_db= librtld_db @@ -216,6 +218,7 @@ _libvmmapi= libvmmapi .if ${MACHINE_CPUARCH} == "ia64" _libefi= libefi +_libsmb= libsmb .endif .if ${MACHINE_CPUARCH} == "mips" @@ -226,6 +229,11 @@ _librtld_db= librtld_db .if ${MACHINE_CPUARCH} == "powerpc" _libproc= libproc _librtld_db= librtld_db +_libsmb= libsmb +.endif + +.if ${MACHINE_CPUARCH} == "sparc64" +_libsmb= libsmb .endif .if ${MK_OPENSSL} != "no" Modified: user/syuu/mq_bpf/lib/libc/gen/siginterrupt.c ============================================================================== --- user/syuu/mq_bpf/lib/libc/gen/siginterrupt.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libc/gen/siginterrupt.c Tue Jul 2 14:54:18 2013 (r252509) @@ -46,7 +46,7 @@ int siginterrupt(sig, flag) int sig, flag; { - extern sigset_t _sigintr; + extern sigset_t _sigintr __hidden; struct sigaction sa; int ret; Modified: user/syuu/mq_bpf/lib/libc/gen/signal.c ============================================================================== --- user/syuu/mq_bpf/lib/libc/gen/signal.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libc/gen/signal.c Tue Jul 2 14:54:18 2013 (r252509) @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include "un-namespace.h" #include "libc_private.h" -sigset_t _sigintr; /* shared with siginterrupt */ +sigset_t _sigintr __hidden; /* shared with siginterrupt */ sig_t signal(s, a) Modified: user/syuu/mq_bpf/lib/libc/iconv/Symbol.map ============================================================================== --- user/syuu/mq_bpf/lib/libc/iconv/Symbol.map Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libc/iconv/Symbol.map Tue Jul 2 14:54:18 2013 (r252509) @@ -17,6 +17,16 @@ FBSD_1.2 { libiconvlist; }; +FBSD_1.3 { + iconv; + iconv_open; + iconv_close; + iconv_open_into; + iconv_set_relocation_prefix; + iconvctl; + iconvlist; +}; + FBSDprivate_1.0 { _citrus_bcs_convert_to_lower; _citrus_bcs_convert_to_upper; Modified: user/syuu/mq_bpf/lib/libc/iconv/citrus_lock.h ============================================================================== --- user/syuu/mq_bpf/lib/libc/iconv/citrus_lock.h Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libc/iconv/citrus_lock.h Tue Jul 2 14:54:18 2013 (r252509) @@ -27,7 +27,8 @@ #include <pthread.h> -static pthread_rwlock_t lock; +/* XXX Yes, the original code has three separate file-local lock instances */ +static pthread_rwlock_t lock = PTHREAD_RWLOCK_INITIALIZER; #define WLOCK if (__isthreaded) \ pthread_rwlock_wrlock(&lock); Modified: user/syuu/mq_bpf/lib/libc/iconv/citrus_mapper.c ============================================================================== --- user/syuu/mq_bpf/lib/libc/iconv/citrus_mapper.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libc/iconv/citrus_mapper.c Tue Jul 2 14:54:18 2013 (r252509) @@ -96,7 +96,7 @@ _citrus_mapper_create_area( ma->ma_dir = strdup(area); if (ma->ma_dir == NULL) { ret = errno; - free(ma->ma_dir); + free(ma); goto quit; } _CITRUS_HASH_INIT(&ma->ma_cache, CM_HASH_SIZE); Modified: user/syuu/mq_bpf/lib/libc/iconv/iconv.c ============================================================================== --- user/syuu/mq_bpf/lib/libc/iconv/iconv.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libc/iconv/iconv.c Tue Jul 2 14:54:18 2013 (r252509) @@ -47,16 +47,13 @@ #include "citrus_hash.h" #include "citrus_iconv.h" -#ifdef __weak_alias -__weak_alias(libiconv, _iconv) -__weak_alias(libiconv_open, _iconv_open) -__weak_alias(libiconv_open_into, _iconv_open_into) -__weak_alias(libiconv_close, _iconv_close) -__weak_alias(libiconvlist, _iconvlist) -__weak_alias(libiconvctl, _iconvctl) -__weak_alias(libiconv_set_relocation_prefix, _iconv_set_relocation_prefix) -__weak_alias(iconv_canonicalize, _iconv_canonicalize) -#endif +__weak_reference(libiconv, iconv); +__weak_reference(libiconv_open, iconv_open); +__weak_reference(libiconv_open_into, iconv_open_into); +__weak_reference(libiconv_close, iconv_close); +__weak_reference(libiconvlist, iconvlist); +__weak_reference(libiconvctl, iconvctl); +__weak_reference(libiconv_set_relocation_prefix, iconv_set_relocation_prefix); #define ISBADF(_h_) (!(_h_) || (_h_) == (iconv_t)-1) Modified: user/syuu/mq_bpf/lib/libdwarf/dwarf_init.c ============================================================================== --- user/syuu/mq_bpf/lib/libdwarf/dwarf_init.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libdwarf/dwarf_init.c Tue Jul 2 14:54:18 2013 (r252509) @@ -192,7 +192,7 @@ dwarf_read_sleb128(Elf_Data **dp, uint64 shift += 7; } while ((b & 0x80) != 0); - if (shift < 32 && (b & 0x40) != 0) + if (shift < 64 && (b & 0x40) != 0) ret |= (-1 << shift); return ret; Modified: user/syuu/mq_bpf/lib/libdwarf/dwarf_loc.c ============================================================================== --- user/syuu/mq_bpf/lib/libdwarf/dwarf_loc.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libdwarf/dwarf_loc.c Tue Jul 2 14:54:18 2013 (r252509) @@ -46,7 +46,7 @@ dwarf_decode_sleb128(uint8_t **dp) shift += 7; } while ((b & 0x80) != 0); - if (shift < 32 && (b & 0x40) != 0) + if (shift < 64 && (b & 0x40) != 0) ret |= (-1 << shift); *dp = src; Modified: user/syuu/mq_bpf/lib/libfetch/fetch.c ============================================================================== --- user/syuu/mq_bpf/lib/libfetch/fetch.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libfetch/fetch.c Tue Jul 2 14:54:18 2013 (r252509) @@ -376,7 +376,7 @@ fetchParseURL(const char *URL) /* password */ if (*q == ':') - q = fetch_pctdecode(u->pwd, ++q, URL_PWDLEN); + q = fetch_pctdecode(u->pwd, q + 1, URL_PWDLEN); p++; } else { Modified: user/syuu/mq_bpf/lib/libprocstat/Makefile ============================================================================== --- user/syuu/mq_bpf/lib/libprocstat/Makefile Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libprocstat/Makefile Tue Jul 2 14:54:18 2013 (r252509) @@ -9,6 +9,7 @@ SRCS= cd9660.c \ core.c \ libprocstat.c \ msdosfs.c \ + smbfs.c \ udf.c VERSION_DEF= ${.CURDIR}/Versions.def Modified: user/syuu/mq_bpf/lib/libprocstat/common_kvm.h ============================================================================== --- user/syuu/mq_bpf/lib/libprocstat/common_kvm.h Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libprocstat/common_kvm.h Tue Jul 2 14:54:18 2013 (r252509) @@ -41,6 +41,7 @@ int devfs_filestat(kvm_t *kd, struct vno int isofs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int msdosfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int nfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); +int smbfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int udf_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int ufs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int zfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); Modified: user/syuu/mq_bpf/lib/libprocstat/libprocstat.c ============================================================================== --- user/syuu/mq_bpf/lib/libprocstat/libprocstat.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libprocstat/libprocstat.c Tue Jul 2 14:54:18 2013 (r252509) @@ -1220,6 +1220,7 @@ procstat_get_vnode_info_kvm(kvm_t *kd, s FSTYPE(isofs), FSTYPE(msdosfs), FSTYPE(nfs), + FSTYPE(smbfs), FSTYPE(udf), FSTYPE(ufs), #ifdef LIBPROCSTAT_ZFS Modified: user/syuu/mq_bpf/lib/librt/sigev_thread.c ============================================================================== --- user/syuu/mq_bpf/lib/librt/sigev_thread.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/librt/sigev_thread.c Tue Jul 2 14:54:18 2013 (r252509) @@ -28,13 +28,13 @@ */ #include <sys/types.h> -#include <machine/atomic.h> #include "namespace.h" #include <err.h> #include <errno.h> #include <ucontext.h> #include <sys/thr.h> +#include <stdatomic.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -51,7 +51,7 @@ LIST_HEAD(sigev_list_head, sigev_node); static struct sigev_list_head sigev_hash[HASH_QUEUES]; static struct sigev_list_head sigev_all; static LIST_HEAD(,sigev_thread) sigev_threads; -static unsigned int sigev_generation; +static atomic_int sigev_generation; static pthread_mutex_t *sigev_list_mtx; static pthread_once_t sigev_once = PTHREAD_ONCE_INIT; static pthread_once_t sigev_once_default = PTHREAD_ONCE_INIT; @@ -196,7 +196,8 @@ __sigev_alloc(int type, const struct sig if (sn != NULL) { sn->sn_value = evp->sigev_value; sn->sn_func = evp->sigev_notify_function; - sn->sn_gen = atomic_fetchadd_int(&sigev_generation, 1); + sn->sn_gen = atomic_fetch_add_explicit(&sigev_generation, 1, + memory_order_relaxed); sn->sn_type = type; _pthread_attr_init(&sn->sn_attr); _pthread_attr_setdetachstate(&sn->sn_attr, PTHREAD_CREATE_DETACHED); Modified: user/syuu/mq_bpf/lib/libstand/nfs.c ============================================================================== --- user/syuu/mq_bpf/lib/libstand/nfs.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libstand/nfs.c Tue Jul 2 14:54:18 2013 (r252509) @@ -1465,8 +1465,9 @@ nfs_readdir(struct open_file *f, struct d->d_name[d->d_namlen] = '\0'; pos = roundup(d->d_namlen, sizeof(uint32_t)) / sizeof(uint32_t); - fp->off = cookie = ((uint64_t)ntohl(rent->nameplus[pos++]) << 32) | - ntohl(rent->nameplus[pos++]); + fp->off = cookie = ((uint64_t)ntohl(rent->nameplus[pos]) << 32) | + ntohl(rent->nameplus[pos + 1]); + pos += 2; buf = (u_char *)&rent->nameplus[pos]; return (0); } Modified: user/syuu/mq_bpf/lib/libutil/login_times.c ============================================================================== --- user/syuu/mq_bpf/lib/libutil/login_times.c Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/lib/libutil/login_times.c Tue Jul 2 14:54:18 2013 (r252509) @@ -96,7 +96,7 @@ parse_lt(const char *str) else m.lt_start = 0; if (*p == '-') - p = parse_time(++p, &m.lt_end); + p = parse_time(p + 1, &m.lt_end); else m.lt_end = 1440; Modified: user/syuu/mq_bpf/rescue/rescue/Makefile ============================================================================== --- user/syuu/mq_bpf/rescue/rescue/Makefile Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/rescue/rescue/Makefile Tue Jul 2 14:54:18 2013 (r252509) @@ -130,6 +130,8 @@ CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv - .if ${MACHINE_CPUARCH} == "i386" CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk CRUNCH_ALIAS_bsdlabel= disklabel +#CRUNCH_PROGS+= mount_smbfs +#CRUNCH_LIBS+= -lsmb .endif .if ${MACHINE} == "pc98" Modified: user/syuu/mq_bpf/sbin/devd/devd.8 ============================================================================== --- user/syuu/mq_bpf/sbin/devd/devd.8 Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/sbin/devd/devd.8 Tue Jul 2 14:54:18 2013 (r252509) @@ -33,7 +33,7 @@ .Nd "device state change daemon" .Sh SYNOPSIS .Nm -.Op Fl Ddn +.Op Fl dn .Op Fl f Ar file .Op Fl l Ar num .Sh DESCRIPTION @@ -44,10 +44,8 @@ kernel events happen. .Pp The following options are accepted. .Bl -tag -width ".Fl f Ar file" -.It Fl D -Enable debugging messages. .It Fl d -Run in the foreground instead of becoming a daemon. +Run in the foreground instead of becoming a daemon and log additional information for debugging. .It Fl f Ar file Use configuration file .Ar file Modified: user/syuu/mq_bpf/sbin/devd/devd.cc ============================================================================== --- user/syuu/mq_bpf/sbin/devd/devd.cc Tue Jul 2 14:48:39 2013 (r252508) +++ user/syuu/mq_bpf/sbin/devd/devd.cc Tue Jul 2 14:54:18 2013 (r252509) @@ -79,6 +79,7 @@ __FBSDID("$FreeBSD$"); #include <cstdio> #include <csignal> #include <cstring> +#include <cstdarg> #include <dirent.h> #include <err.h> @@ -87,6 +88,7 @@ __FBSDID("$FreeBSD$"); #include <paths.h> #include <poll.h> #include <regex.h> +#include <syslog.h> #include <unistd.h> #include <algorithm> @@ -114,13 +116,15 @@ static const char detach = '-'; static struct pidfh *pfh; -int Dflag; int dflag; int nflag; +static unsigned total_events = 0; +static volatile sig_atomic_t got_siginfo = 0; static volatile sig_atomic_t romeo_must_die = 0; static const char *configfile = CF; +static void devdlog(int priority, const char* message, ...); static void event_loop(void); static void usage(void); @@ -167,7 +171,7 @@ bool event_proc::run(config &c) const { vector<eps *>::const_iterator i; - + for (i = _epsvec.begin(); i != _epsvec.end(); ++i) if (!(*i)->do_action(c)) return (false); @@ -175,7 +179,7 @@ event_proc::run(config &c) const } action::action(const char *cmd) - : _cmd(cmd) + : _cmd(cmd) { // nothing } @@ -194,7 +198,7 @@ my_system(const char *command) sigset_t newsigblock, oldsigblock; if (!command) /* just checking... */ - return(1); + return (1); /* * Ignore SIGINT and SIGQUIT, block SIGCHLD. Remember to save @@ -243,8 +247,7 @@ bool action::do_action(config &c) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307021454.r62EsJjt072076>