Date: Mon, 1 Jul 2013 14:45:04 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r252466 - in projects/camlock: . bin/ed bin/sh contrib/libstdc++/libsupc++ contrib/smbfs/mount_smbfs crypto/heimdal/lib/gssapi/gssapi crypto/openssh etc etc/defaults etc/mtree etc/rc.d ... Message-ID: <201307011445.r61Ej43G043411@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Jul 1 14:45:03 2013 New Revision: 252466 URL: http://svnweb.freebsd.org/changeset/base/252466 Log: MFC @ r252465 Added: projects/camlock/etc/rc.d/swap - copied unchanged from r252465, head/etc/rc.d/swap projects/camlock/etc/rc.d/swaplate - copied unchanged from r252465, head/etc/rc.d/swaplate projects/camlock/sys/arm/arm/generic_timer.c - copied unchanged from r252465, head/sys/arm/arm/generic_timer.c projects/camlock/sys/arm/conf/ARNDALE - copied unchanged from r252465, head/sys/arm/conf/ARNDALE projects/camlock/sys/arm/samsung/ - copied from r252465, head/sys/arm/samsung/ projects/camlock/sys/boot/fdt/dts/bcm2835.dtsi - copied unchanged from r252465, head/sys/boot/fdt/dts/bcm2835.dtsi projects/camlock/sys/boot/fdt/dts/exynos5250-arndale.dts - copied unchanged from r252465, head/sys/boot/fdt/dts/exynos5250-arndale.dts projects/camlock/sys/boot/fdt/dts/exynos5250.dtsi - copied unchanged from r252465, head/sys/boot/fdt/dts/exynos5250.dtsi projects/camlock/sys/boot/fdt/dts/rpi.dts - copied unchanged from r252465, head/sys/boot/fdt/dts/rpi.dts projects/camlock/sys/kern/subr_vmem.c - copied unchanged from r252465, head/sys/kern/subr_vmem.c projects/camlock/sys/sys/vmem.h - copied unchanged from r252465, head/sys/sys/vmem.h Deleted: projects/camlock/contrib/smbfs/mount_smbfs/Makefile projects/camlock/etc/rc.d/encswap projects/camlock/etc/rc.d/swap1 projects/camlock/sys/boot/fdt/dts/bcm2835-rpi-b.dts Modified: projects/camlock/Makefile.inc1 projects/camlock/UPDATING projects/camlock/bin/ed/re.c projects/camlock/bin/sh/eval.c projects/camlock/contrib/libstdc++/libsupc++/unwind-cxx.h projects/camlock/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h projects/camlock/crypto/openssh/sshd_config projects/camlock/crypto/openssh/sshd_config.5 projects/camlock/etc/defaults/rc.conf projects/camlock/etc/mtree/BSD.include.dist projects/camlock/etc/mtree/BSD.usr.dist projects/camlock/etc/network.subr projects/camlock/etc/rc.d/Makefile projects/camlock/etc/rc.d/addswap projects/camlock/etc/rc.d/fsck projects/camlock/etc/rc.d/mdconfig projects/camlock/include/Makefile projects/camlock/include/gssapi/gssapi.h projects/camlock/include/paths.h projects/camlock/lib/Makefile projects/camlock/lib/libc/gen/siginterrupt.c projects/camlock/lib/libc/gen/signal.c projects/camlock/lib/libc/iconv/Symbol.map projects/camlock/lib/libc/iconv/citrus_lock.h projects/camlock/lib/libc/iconv/citrus_mapper.c projects/camlock/lib/libc/iconv/iconv.c projects/camlock/lib/libdwarf/dwarf_init.c projects/camlock/lib/libdwarf/dwarf_loc.c projects/camlock/lib/libfetch/fetch.c projects/camlock/lib/libprocstat/Makefile projects/camlock/lib/libprocstat/common_kvm.h projects/camlock/lib/libprocstat/libprocstat.c projects/camlock/lib/librt/sigev_thread.c projects/camlock/lib/libutil/login_times.c projects/camlock/rescue/rescue/Makefile projects/camlock/sbin/hastd/hastd.8 projects/camlock/sbin/hastd/refcnt.h projects/camlock/sbin/ifconfig/af_nd6.c projects/camlock/sbin/mdconfig/mdconfig.8 projects/camlock/sbin/mount/mount.8 projects/camlock/sbin/mount/mount.c projects/camlock/sbin/swapon/swapon.8 projects/camlock/sbin/swapon/swapon.c projects/camlock/share/examples/Makefile projects/camlock/share/examples/etc/README.examples projects/camlock/share/examples/etc/make.conf projects/camlock/share/man/man5/fstab.5 projects/camlock/share/man/man9/locking.9 projects/camlock/share/mk/bsd.libnames.mk projects/camlock/sys/amd64/include/counter.h projects/camlock/sys/amd64/vmm/x86.c projects/camlock/sys/arm/arm/bus_space_generic.c projects/camlock/sys/arm/arm/cpufunc.c projects/camlock/sys/arm/arm/db_trace.c projects/camlock/sys/arm/arm/exception.S projects/camlock/sys/arm/arm/gic.c projects/camlock/sys/arm/arm/identcpu.c projects/camlock/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/camlock/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/camlock/sys/arm/conf/RPI-B projects/camlock/sys/arm/include/armreg.h projects/camlock/sys/arm/include/asmacros.h projects/camlock/sys/arm/include/counter.h projects/camlock/sys/arm/include/intr.h projects/camlock/sys/arm/versatile/versatile_pci.c projects/camlock/sys/arm/versatile/versatile_sic.c projects/camlock/sys/cam/cam_ccb.h projects/camlock/sys/cam/scsi/scsi_xpt.c projects/camlock/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/camlock/sys/cddl/dev/dtmalloc/dtmalloc.c projects/camlock/sys/conf/NOTES projects/camlock/sys/conf/files projects/camlock/sys/conf/files.amd64 projects/camlock/sys/conf/files.arm projects/camlock/sys/conf/files.i386 projects/camlock/sys/conf/files.ia64 projects/camlock/sys/conf/files.mips projects/camlock/sys/conf/files.pc98 projects/camlock/sys/conf/files.powerpc projects/camlock/sys/conf/files.sparc64 projects/camlock/sys/conf/options projects/camlock/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/camlock/sys/dev/ath/if_ath_rx_edma.c projects/camlock/sys/dev/bce/if_bce.c projects/camlock/sys/dev/bce/if_bcereg.h projects/camlock/sys/dev/bge/if_bge.c projects/camlock/sys/dev/bge/if_bgereg.h projects/camlock/sys/dev/cxgbe/t4_main.c projects/camlock/sys/dev/iwn/if_iwn.c projects/camlock/sys/dev/pci/pci.c projects/camlock/sys/dev/pci/pci_private.h projects/camlock/sys/dev/re/if_re.c projects/camlock/sys/dev/uart/uart.h projects/camlock/sys/dev/uart/uart_bus_fdt.c projects/camlock/sys/dev/uart/uart_cpu_fdt.c projects/camlock/sys/dev/uart/uart_subr.c projects/camlock/sys/dev/usb/wlan/if_urtwn.c projects/camlock/sys/fs/ext2fs/ext2_lookup.c projects/camlock/sys/fs/ext2fs/ext2_vfsops.c projects/camlock/sys/fs/smbfs/smbfs_node.c projects/camlock/sys/fs/smbfs/smbfs_vfsops.c projects/camlock/sys/fs/smbfs/smbfs_vnops.c projects/camlock/sys/geom/geom_io.c projects/camlock/sys/i386/include/counter.h projects/camlock/sys/ia64/include/counter.h projects/camlock/sys/kern/Make.tags.inc projects/camlock/sys/kern/kern_acct.c projects/camlock/sys/kern/kern_clock.c projects/camlock/sys/kern/kern_descrip.c projects/camlock/sys/kern/kern_synch.c projects/camlock/sys/kern/subr_bus.c projects/camlock/sys/kern/subr_counter.c projects/camlock/sys/kern/sys_generic.c projects/camlock/sys/kern/vfs_bio.c projects/camlock/sys/mips/include/counter.h projects/camlock/sys/modules/Makefile projects/camlock/sys/net80211/ieee80211_ioctl.c projects/camlock/sys/netsmb/smb_conn.c projects/camlock/sys/powerpc/include/counter.h projects/camlock/sys/sparc64/include/counter.h projects/camlock/sys/sys/bus.h projects/camlock/sys/sys/malloc.h projects/camlock/sys/sys/socketvar.h projects/camlock/sys/sys/stdatomic.h projects/camlock/sys/ufs/ffs/ffs_vfsops.c projects/camlock/sys/ufs/ufs/dinode.h projects/camlock/sys/ufs/ufs/inode.h projects/camlock/sys/ufs/ufs/ufs_extattr.c projects/camlock/sys/ufs/ufs/ufs_vnops.c projects/camlock/sys/vm/uma_core.c projects/camlock/sys/vm/vm.h projects/camlock/sys/vm/vm_init.c projects/camlock/sys/vm/vm_kern.c projects/camlock/sys/vm/vm_kern.h projects/camlock/sys/vm/vm_object.c projects/camlock/sys/vm/vm_pager.c projects/camlock/sys/vm/vm_pager.h projects/camlock/usr.bin/Makefile projects/camlock/usr.bin/Makefile.amd64 projects/camlock/usr.bin/Makefile.i386 projects/camlock/usr.bin/Makefile.ia64 projects/camlock/usr.bin/Makefile.powerpc projects/camlock/usr.bin/Makefile.sparc64 projects/camlock/usr.bin/calendar/calendars/calendar.freebsd projects/camlock/usr.bin/kdump/kdump.c projects/camlock/usr.bin/killall/killall.1 projects/camlock/usr.bin/killall/killall.c projects/camlock/usr.bin/svn/lib/libapr_util/Makefile projects/camlock/usr.bin/svn/lib/libapr_util/apr_ldap.h projects/camlock/usr.bin/svn/lib/libapr_util/apu.h projects/camlock/usr.bin/svn/lib/libapr_util/apu_config.h projects/camlock/usr.bin/truss/syscalls.c projects/camlock/usr.sbin/Makefile.amd64 projects/camlock/usr.sbin/Makefile.i386 projects/camlock/usr.sbin/Makefile.ia64 projects/camlock/usr.sbin/Makefile.powerpc projects/camlock/usr.sbin/Makefile.sparc64 projects/camlock/usr.sbin/bhyve/atpic.c projects/camlock/usr.sbin/bhyve/pci_emul.c projects/camlock/usr.sbin/newsyslog/newsyslog.c projects/camlock/usr.sbin/pkg_install/add/extract.c projects/camlock/usr.sbin/pkg_install/create/pl.c projects/camlock/usr.sbin/pkg_install/lib/exec.c projects/camlock/usr.sbin/pw/pw_user.c Directory Properties: projects/camlock/ (props changed) projects/camlock/contrib/libstdc++/ (props changed) projects/camlock/crypto/heimdal/ (props changed) projects/camlock/crypto/openssh/ (props changed) projects/camlock/lib/libc/ (props changed) projects/camlock/lib/libutil/ (props changed) projects/camlock/sbin/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/amd64/vmm/ (props changed) projects/camlock/sys/boot/ (props changed) projects/camlock/sys/cddl/contrib/opensolaris/ (props changed) projects/camlock/sys/conf/ (props changed) projects/camlock/usr.bin/calendar/ (props changed) projects/camlock/usr.sbin/bhyve/ (props changed) Modified: projects/camlock/Makefile.inc1 ============================================================================== --- projects/camlock/Makefile.inc1 Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/Makefile.inc1 Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/UPDATING ============================================================================== --- projects/camlock/UPDATING Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/UPDATING Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/bin/ed/re.c ============================================================================== --- projects/camlock/bin/ed/re.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/bin/ed/re.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/bin/sh/eval.c ============================================================================== --- projects/camlock/bin/sh/eval.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/bin/sh/eval.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/contrib/libstdc++/libsupc++/unwind-cxx.h ============================================================================== --- projects/camlock/contrib/libstdc++/libsupc++/unwind-cxx.h Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/contrib/libstdc++/libsupc++/unwind-cxx.h Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h ============================================================================== --- projects/camlock/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h Mon Jul 1 14:45:03 2013 (r252466) @@ -36,7 +36,7 @@ #ifndef GSSAPI_KRB5_H_ #define GSSAPI_KRB5_H_ -#include <gssapi.h> +#include <gssapi/gssapi.h> GSSAPI_CPP_START Modified: projects/camlock/crypto/openssh/sshd_config ============================================================================== --- projects/camlock/crypto/openssh/sshd_config Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/crypto/openssh/sshd_config Mon Jul 1 14:45:03 2013 (r252466) @@ -105,7 +105,7 @@ #PrintLastLog yes #TCPKeepAlive yes #UseLogin no -#UsePrivilegeSeparation sandbox +#UsePrivilegeSeparation yes #PermitUserEnvironment no #Compression delayed #ClientAliveInterval 0 Modified: projects/camlock/crypto/openssh/sshd_config.5 ============================================================================== --- projects/camlock/crypto/openssh/sshd_config.5 Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/crypto/openssh/sshd_config.5 Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/etc/defaults/rc.conf ============================================================================== --- projects/camlock/etc/defaults/rc.conf Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/etc/defaults/rc.conf Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/etc/mtree/BSD.include.dist ============================================================================== --- projects/camlock/etc/mtree/BSD.include.dist Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/etc/mtree/BSD.include.dist Mon Jul 1 14:45:03 2013 (r252466) @@ -176,6 +176,8 @@ .. procfs .. + smbfs + .. udf .. unionfs Modified: projects/camlock/etc/mtree/BSD.usr.dist ============================================================================== --- projects/camlock/etc/mtree/BSD.usr.dist Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/etc/mtree/BSD.usr.dist Mon Jul 1 14:45:03 2013 (r252466) @@ -309,6 +309,10 @@ srcs .. .. + smbfs + print + .. + .. sunrpc dir .. Modified: projects/camlock/etc/network.subr ============================================================================== --- projects/camlock/etc/network.subr Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/etc/network.subr Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/etc/rc.d/Makefile ============================================================================== --- projects/camlock/etc/rc.d/Makefile Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/etc/rc.d/Makefile Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/etc/rc.d/addswap ============================================================================== --- projects/camlock/etc/rc.d/addswap Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/etc/rc.d/addswap Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/etc/rc.d/fsck ============================================================================== --- projects/camlock/etc/rc.d/fsck Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/etc/rc.d/fsck Mon Jul 1 14:45:03 2013 (r252466) @@ -4,7 +4,7 @@ # # PROVIDE: fsck -# REQUIRE: localswap +# REQUIRE: swap # KEYWORD: nojail . /etc/rc.subr Modified: projects/camlock/etc/rc.d/mdconfig ============================================================================== --- projects/camlock/etc/rc.d/mdconfig Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/etc/rc.d/mdconfig Mon Jul 1 14:45:03 2013 (r252466) @@ -28,7 +28,7 @@ # # PROVIDE: mdconfig -# REQUIRE: localswap root +# REQUIRE: swap root . /etc/rc.subr Copied: projects/camlock/etc/rc.d/swap (from r252465, head/etc/rc.d/swap) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/camlock/etc/rc.d/swap Mon Jul 1 14:45:03 2013 (r252466, copy of r252465, 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: projects/camlock/etc/rc.d/swaplate (from r252465, head/etc/rc.d/swaplate) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/camlock/etc/rc.d/swaplate Mon Jul 1 14:45:03 2013 (r252466, copy of r252465, 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: projects/camlock/include/Makefile ============================================================================== --- projects/camlock/include/Makefile Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/include/Makefile Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/include/gssapi/gssapi.h ============================================================================== --- projects/camlock/include/gssapi/gssapi.h Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/include/gssapi/gssapi.h Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/include/paths.h ============================================================================== --- projects/camlock/include/paths.h Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/include/paths.h Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/Makefile ============================================================================== --- projects/camlock/lib/Makefile Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/Makefile Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libc/gen/siginterrupt.c ============================================================================== --- projects/camlock/lib/libc/gen/siginterrupt.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libc/gen/siginterrupt.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libc/gen/signal.c ============================================================================== --- projects/camlock/lib/libc/gen/signal.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libc/gen/signal.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libc/iconv/Symbol.map ============================================================================== --- projects/camlock/lib/libc/iconv/Symbol.map Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libc/iconv/Symbol.map Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libc/iconv/citrus_lock.h ============================================================================== --- projects/camlock/lib/libc/iconv/citrus_lock.h Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libc/iconv/citrus_lock.h Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libc/iconv/citrus_mapper.c ============================================================================== --- projects/camlock/lib/libc/iconv/citrus_mapper.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libc/iconv/citrus_mapper.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libc/iconv/iconv.c ============================================================================== --- projects/camlock/lib/libc/iconv/iconv.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libc/iconv/iconv.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libdwarf/dwarf_init.c ============================================================================== --- projects/camlock/lib/libdwarf/dwarf_init.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libdwarf/dwarf_init.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libdwarf/dwarf_loc.c ============================================================================== --- projects/camlock/lib/libdwarf/dwarf_loc.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libdwarf/dwarf_loc.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libfetch/fetch.c ============================================================================== --- projects/camlock/lib/libfetch/fetch.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libfetch/fetch.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libprocstat/Makefile ============================================================================== --- projects/camlock/lib/libprocstat/Makefile Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libprocstat/Makefile Mon Jul 1 14:45:03 2013 (r252466) @@ -9,6 +9,7 @@ SRCS= cd9660.c \ core.c \ libprocstat.c \ msdosfs.c \ + smbfs.c \ udf.c VERSION_DEF= ${.CURDIR}/Versions.def Modified: projects/camlock/lib/libprocstat/common_kvm.h ============================================================================== --- projects/camlock/lib/libprocstat/common_kvm.h Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libprocstat/common_kvm.h Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libprocstat/libprocstat.c ============================================================================== --- projects/camlock/lib/libprocstat/libprocstat.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libprocstat/libprocstat.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/librt/sigev_thread.c ============================================================================== --- projects/camlock/lib/librt/sigev_thread.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/librt/sigev_thread.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/lib/libutil/login_times.c ============================================================================== --- projects/camlock/lib/libutil/login_times.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/lib/libutil/login_times.c Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/rescue/rescue/Makefile ============================================================================== --- projects/camlock/rescue/rescue/Makefile Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/rescue/rescue/Makefile Mon Jul 1 14:45:03 2013 (r252466) @@ -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: projects/camlock/sbin/hastd/hastd.8 ============================================================================== --- projects/camlock/sbin/hastd/hastd.8 Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/sbin/hastd/hastd.8 Mon Jul 1 14:45:03 2013 (r252466) @@ -70,18 +70,18 @@ hastd: <resource name> (<role>) .Pp If (and only if) .Nm -operates in primary role for the given resource, corresponding +operates in primary role for the given resource, a corresponding .Pa /dev/hast/<name> disk-like device (GEOM provider) is created. File systems and applications can use this provider to send I/O requests to. Every write, delete and flush operation .Dv ( BIO_WRITE , BIO_DELETE , BIO_FLUSH ) -is send to local component and replicated to the remote (secondary) node if it -is available. +is sent to the local component and replicated on the remote (secondary) node +if it is available. Read operations .Dv ( BIO_READ ) -are handled locally unless I/O error occurs or local version of the data +are handled locally unless an I/O error occurs or the local version of the data is not up-to-date yet (synchronization is in progress). .Pp The @@ -100,38 +100,38 @@ The connection between two .Nm daemons is always initiated from the one running as primary to the one running as secondary. -When primary +When the primary .Nm -is unable to connect or connection fails, it will try to re-establish -connection every few seconds. -Once connection is established, primary +is unable to connect or the connection fails, it will try to re-establish +the connection every few seconds. +Once the connection is established, the primary .Nm will synchronize every extent that was modified during connection outage to the secondary .Nm . .Pp -It is possible that in case of connection outage between the nodes +It is possible that in the case of a connection outage between the nodes the .Nm primary role for the given resource will be configured on both nodes. This in turn leads to incompatible data modifications. -Such condition is called split-brain and cannot be automatically +Such a condition is called a split-brain and cannot be automatically resolved by the .Nm -daemon as this will lead most likely to data corruption or lost of +daemon as this will lead most likely to data corruption or loss of important changes. Even though it cannot be fixed by .Nm -itself, it will be detected and further connection between independently +itself, it will be detected and a further connection between independently modified nodes will not be possible. -Once this situation is manually resolved by an administrator, resource +Once this situation is manually resolved by an administrator, the resource on one of the nodes can be initialized (erasing local data), which makes -connection to the remote node possible again. -Connection of freshly initialized component will trigger full resource +a connection to the remote node possible again. +Connection of the freshly initialized component will trigger full resource synchronization. .Pp -The +A .Nm -daemon itself never picks his role up automatically. +daemon never picks its role automatically. The role has to be configured with the .Xr hastctl 8 control utility by additional software like @@ -139,7 +139,7 @@ control utility by additional software l or .Nm heartbeat that can reliably manage role separation and switch secondary node to -primary role in case of original primary failure. +primary role in case of the primary's failure. .Pp The .Nm Modified: projects/camlock/sbin/hastd/refcnt.h ============================================================================== --- projects/camlock/sbin/hastd/refcnt.h Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/sbin/hastd/refcnt.h Mon Jul 1 14:45:03 2013 (r252466) @@ -32,24 +32,24 @@ #ifndef __REFCNT_H__ #define __REFCNT_H__ -#include <stdatomic.h> +#include <machine/atomic.h> #include "pjdlog.h" -typedef atomic_uint refcnt_t; +typedef unsigned int refcnt_t; static __inline void refcnt_init(refcnt_t *count, unsigned int v) { - atomic_init(count, v); + *count = v; } static __inline void refcnt_acquire(refcnt_t *count) { - atomic_fetch_add_explicit(count, 1, memory_order_acquire); + atomic_add_acq_int(count, 1); } static __inline unsigned int @@ -58,7 +58,7 @@ refcnt_release(refcnt_t *count) unsigned int old; /* XXX: Should this have a rel membar? */ - old = atomic_fetch_sub(count, 1); + old = atomic_fetchadd_int(count, -1); PJDLOG_ASSERT(old > 0); return (old - 1); } Modified: projects/camlock/sbin/ifconfig/af_nd6.c ============================================================================== --- projects/camlock/sbin/ifconfig/af_nd6.c Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/sbin/ifconfig/af_nd6.c Mon Jul 1 14:45:03 2013 (r252466) @@ -148,7 +148,7 @@ nd6_status(int s) memset(&nd, 0, sizeof(nd)); strncpy(nd.ifname, ifr.ifr_name, sizeof(nd.ifname)); if ((s6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { - if (errno != EAFNOSUPPORT) + if (errno != EAFNOSUPPORT && error != EPROTONOSUPPORT) warn("socket(AF_INET6, SOCK_DGRAM)"); return; } Modified: projects/camlock/sbin/mdconfig/mdconfig.8 ============================================================================== --- projects/camlock/sbin/mdconfig/mdconfig.8 Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/sbin/mdconfig/mdconfig.8 Mon Jul 1 14:45:03 2013 (r252466) @@ -144,7 +144,7 @@ If both of and .Fl f options are specified, -display devices which match the two conditions. +display devices which match the two conditions. If the .Fl v option is specified, show all details. Modified: projects/camlock/sbin/mount/mount.8 ============================================================================== --- projects/camlock/sbin/mount/mount.8 Mon Jul 1 12:22:44 2013 (r252465) +++ projects/camlock/sbin/mount/mount.8 Mon Jul 1 14:45:03 2013 (r252466) @@ -450,6 +450,7 @@ However, for the following file system t .Cm nfs , .Cm nullfs , .Cm oldnfs , *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307011445.r61Ej43G043411>