svn commit: r225639 - in user/attilio/vmcontention: .
contrib/openresolv contrib/top crypto/openssh etc
etc/defaults etc/rc.d lib/libarchive libexec/rtld-elf release
sbin/mdmfs share/man/man4 share...
Attilio Rao
attilio at FreeBSD.org
Sat Sep 17 11:08:41 UTC 2011
Author: attilio
Date: Sat Sep 17 11:08:40 2011
New Revision: 225639
URL: http://svn.freebsd.org/changeset/base/225639
Log:
MFC
Added:
user/attilio/vmcontention/share/man/man4/mod_cc.4
- copied unchanged from r225638, head/share/man/man4/mod_cc.4
user/attilio/vmcontention/share/man/man9/mod_cc.9
- copied unchanged from r225638, head/share/man/man9/mod_cc.9
user/attilio/vmcontention/tools/tools/zfsboottest/
- copied from r225638, head/tools/tools/zfsboottest/
Deleted:
user/attilio/vmcontention/share/man/man4/cc.4
user/attilio/vmcontention/share/man/man9/cc.9
user/attilio/vmcontention/sys/boot/zfs/zfstest.c
Modified:
user/attilio/vmcontention/ObsoleteFiles.inc
user/attilio/vmcontention/UPDATING
user/attilio/vmcontention/contrib/openresolv/dnsmasq.in
user/attilio/vmcontention/contrib/openresolv/libc.in
user/attilio/vmcontention/contrib/openresolv/named.in
user/attilio/vmcontention/contrib/openresolv/pdnsd.in
user/attilio/vmcontention/contrib/openresolv/resolvconf.in
user/attilio/vmcontention/contrib/openresolv/unbound.in
user/attilio/vmcontention/crypto/openssh/auth-pam.c (contents, props changed)
user/attilio/vmcontention/etc/defaults/devfs.rules
user/attilio/vmcontention/etc/defaults/rc.conf
user/attilio/vmcontention/etc/network.subr
user/attilio/vmcontention/etc/rc.d/netoptions
user/attilio/vmcontention/lib/libarchive/archive_read_support_format_cpio.c
user/attilio/vmcontention/lib/libarchive/archive_write_set_format_cpio.c
user/attilio/vmcontention/libexec/rtld-elf/rtld.c
user/attilio/vmcontention/release/rc.local
user/attilio/vmcontention/sbin/mdmfs/mdmfs.c
user/attilio/vmcontention/share/man/man4/Makefile
user/attilio/vmcontention/share/man/man4/cc_chd.4
user/attilio/vmcontention/share/man/man4/cc_cubic.4
user/attilio/vmcontention/share/man/man4/cc_hd.4
user/attilio/vmcontention/share/man/man4/cc_htcp.4
user/attilio/vmcontention/share/man/man4/cc_newreno.4
user/attilio/vmcontention/share/man/man4/cc_vegas.4
user/attilio/vmcontention/share/man/man4/h_ertt.4
user/attilio/vmcontention/share/man/man4/tcp.4
user/attilio/vmcontention/share/man/man5/rc.conf.5
user/attilio/vmcontention/share/man/man9/Makefile
user/attilio/vmcontention/share/man/man9/taskqueue.9
user/attilio/vmcontention/share/misc/committers-ports.dot
user/attilio/vmcontention/share/syscons/keymaps/INDEX.keymaps
user/attilio/vmcontention/sys/amd64/amd64/exception.S
user/attilio/vmcontention/sys/amd64/amd64/machdep.c
user/attilio/vmcontention/sys/amd64/amd64/trap.c
user/attilio/vmcontention/sys/amd64/include/md_var.h
user/attilio/vmcontention/sys/amd64/linux32/linux32_machdep.c
user/attilio/vmcontention/sys/amd64/linux32/linux32_sysent.c
user/attilio/vmcontention/sys/arm/arm/machdep.c
user/attilio/vmcontention/sys/boot/i386/gptboot/Makefile
user/attilio/vmcontention/sys/boot/i386/gptzfsboot/Makefile
user/attilio/vmcontention/sys/boot/i386/zfsboot/Makefile
user/attilio/vmcontention/sys/cddl/boot/zfs/zfssubr.c
user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c
user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_ioctl.c
user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_misc.c
user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_proto.h
user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscall.h
user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscalls.c
user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_sysent.c
user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_util.h
user/attilio/vmcontention/sys/compat/linux/linux_emul.c
user/attilio/vmcontention/sys/compat/linux/linux_file.c
user/attilio/vmcontention/sys/compat/linux/linux_ioctl.c
user/attilio/vmcontention/sys/compat/linux/linux_ipc.c
user/attilio/vmcontention/sys/compat/linux/linux_misc.c
user/attilio/vmcontention/sys/compat/linux/linux_signal.c
user/attilio/vmcontention/sys/compat/linux/linux_socket.c
user/attilio/vmcontention/sys/compat/linux/linux_uid16.c
user/attilio/vmcontention/sys/compat/svr4/svr4_fcntl.c
user/attilio/vmcontention/sys/compat/svr4/svr4_filio.c
user/attilio/vmcontention/sys/compat/svr4/svr4_ipc.c
user/attilio/vmcontention/sys/compat/svr4/svr4_misc.c
user/attilio/vmcontention/sys/compat/svr4/svr4_signal.c
user/attilio/vmcontention/sys/compat/svr4/svr4_socket.c
user/attilio/vmcontention/sys/compat/svr4/svr4_stat.c
user/attilio/vmcontention/sys/compat/svr4/svr4_stream.c
user/attilio/vmcontention/sys/compat/svr4/svr4_sysent.c
user/attilio/vmcontention/sys/dev/acpica/acpi.c
user/attilio/vmcontention/sys/dev/bktr/bktr_core.c
user/attilio/vmcontention/sys/dev/bxe/if_bxe.c
user/attilio/vmcontention/sys/dev/cardbus/cardbus_cis.c
user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_logging.c
user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_mod.c
user/attilio/vmcontention/sys/dev/iscsi/initiator/isc_soc.c
user/attilio/vmcontention/sys/dev/mfi/mfi.c
user/attilio/vmcontention/sys/dev/sound/midi/midi.c
user/attilio/vmcontention/sys/dev/syscons/scmouse.c
user/attilio/vmcontention/sys/dev/syscons/syscons.c
user/attilio/vmcontention/sys/dev/usb/usb_dev.c
user/attilio/vmcontention/sys/dev/usb/usb_msctest.c
user/attilio/vmcontention/sys/fs/nfsserver/nfs_nfsdport.c
user/attilio/vmcontention/sys/fs/procfs/procfs_ctl.c
user/attilio/vmcontention/sys/fs/procfs/procfs_ioctl.c
user/attilio/vmcontention/sys/i386/i386/machdep.c
user/attilio/vmcontention/sys/i386/i386/trap.c
user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_ioctl.c
user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_ipc.c
user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_isc_sysent.c
user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_misc.c
user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_other.c
user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_signal.c
user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_socksys.c
user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_sysent.c
user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_xenix.c
user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_xenix.h
user/attilio/vmcontention/sys/i386/ibcs2/ibcs2_xenix_sysent.c
user/attilio/vmcontention/sys/i386/linux/linux_machdep.c
user/attilio/vmcontention/sys/i386/linux/linux_sysent.c
user/attilio/vmcontention/sys/ia64/ia32/ia32_signal.c
user/attilio/vmcontention/sys/ia64/ia64/machdep.c
user/attilio/vmcontention/sys/kern/init_main.c
user/attilio/vmcontention/sys/kern/init_sysent.c
user/attilio/vmcontention/sys/kern/kern_acct.c
user/attilio/vmcontention/sys/kern/kern_context.c
user/attilio/vmcontention/sys/kern/kern_cpuset.c
user/attilio/vmcontention/sys/kern/kern_descrip.c
user/attilio/vmcontention/sys/kern/kern_environment.c
user/attilio/vmcontention/sys/kern/kern_event.c
user/attilio/vmcontention/sys/kern/kern_exec.c
user/attilio/vmcontention/sys/kern/kern_exit.c
user/attilio/vmcontention/sys/kern/kern_fork.c
user/attilio/vmcontention/sys/kern/kern_jail.c
user/attilio/vmcontention/sys/kern/kern_ktrace.c
user/attilio/vmcontention/sys/kern/kern_linker.c
user/attilio/vmcontention/sys/kern/kern_loginclass.c
user/attilio/vmcontention/sys/kern/kern_module.c
user/attilio/vmcontention/sys/kern/kern_ntptime.c
user/attilio/vmcontention/sys/kern/kern_proc.c
user/attilio/vmcontention/sys/kern/kern_prot.c
user/attilio/vmcontention/sys/kern/kern_rctl.c
user/attilio/vmcontention/sys/kern/kern_resource.c
user/attilio/vmcontention/sys/kern/kern_shutdown.c
user/attilio/vmcontention/sys/kern/kern_sig.c
user/attilio/vmcontention/sys/kern/kern_synch.c
user/attilio/vmcontention/sys/kern/kern_sysctl.c
user/attilio/vmcontention/sys/kern/kern_thr.c
user/attilio/vmcontention/sys/kern/kern_time.c
user/attilio/vmcontention/sys/kern/kern_umtx.c
user/attilio/vmcontention/sys/kern/kern_uuid.c
user/attilio/vmcontention/sys/kern/makesyscalls.sh
user/attilio/vmcontention/sys/kern/p1003_1b.c
user/attilio/vmcontention/sys/kern/subr_bus.c
user/attilio/vmcontention/sys/kern/subr_prof.c
user/attilio/vmcontention/sys/kern/subr_taskqueue.c
user/attilio/vmcontention/sys/kern/subr_trap.c
user/attilio/vmcontention/sys/kern/sys_capability.c
user/attilio/vmcontention/sys/kern/sys_generic.c
user/attilio/vmcontention/sys/kern/sys_pipe.c
user/attilio/vmcontention/sys/kern/sys_procdesc.c
user/attilio/vmcontention/sys/kern/sys_process.c
user/attilio/vmcontention/sys/kern/sysv_msg.c
user/attilio/vmcontention/sys/kern/sysv_sem.c
user/attilio/vmcontention/sys/kern/sysv_shm.c
user/attilio/vmcontention/sys/kern/tty.c
user/attilio/vmcontention/sys/kern/tty_pts.c
user/attilio/vmcontention/sys/kern/uipc_mqueue.c
user/attilio/vmcontention/sys/kern/uipc_sem.c
user/attilio/vmcontention/sys/kern/uipc_shm.c
user/attilio/vmcontention/sys/kern/uipc_syscalls.c
user/attilio/vmcontention/sys/kern/vfs_acl.c
user/attilio/vmcontention/sys/kern/vfs_aio.c
user/attilio/vmcontention/sys/kern/vfs_cache.c
user/attilio/vmcontention/sys/kern/vfs_extattr.c
user/attilio/vmcontention/sys/kern/vfs_init.c
user/attilio/vmcontention/sys/kern/vfs_mount.c
user/attilio/vmcontention/sys/kern/vfs_syscalls.c
user/attilio/vmcontention/sys/kern/vfs_vnops.c
user/attilio/vmcontention/sys/kgssapi/gss_impl.c
user/attilio/vmcontention/sys/mips/mips/pm_machdep.c
user/attilio/vmcontention/sys/modules/Makefile
user/attilio/vmcontention/sys/modules/ipfw/Makefile
user/attilio/vmcontention/sys/modules/netgraph/ipfw/Makefile
user/attilio/vmcontention/sys/net/route.c
user/attilio/vmcontention/sys/netgraph/ng_ipfw.c
user/attilio/vmcontention/sys/netinet/ipfw/ip_fw2.c
user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_dynamic.c
user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_log.c
user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_pfil.c
user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_sockopt.c
user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_table.c
user/attilio/vmcontention/sys/netinet/sctp.h
user/attilio/vmcontention/sys/netinet/sctp_asconf.c
user/attilio/vmcontention/sys/netinet/sctp_constants.h
user/attilio/vmcontention/sys/netinet/sctp_output.c
user/attilio/vmcontention/sys/netinet/sctp_pcb.c
user/attilio/vmcontention/sys/netinet/sctp_pcb.h
user/attilio/vmcontention/sys/netinet/sctp_structs.h
user/attilio/vmcontention/sys/netinet/sctp_usrreq.c
user/attilio/vmcontention/sys/netinet/sctputil.c
user/attilio/vmcontention/sys/netinet6/in6.h
user/attilio/vmcontention/sys/netinet6/in6_proto.c
user/attilio/vmcontention/sys/netinet6/ip6_var.h
user/attilio/vmcontention/sys/netinet6/nd6_rtr.c
user/attilio/vmcontention/sys/nfs/nfs_nfssvc.c
user/attilio/vmcontention/sys/nlm/nlm_prot_impl.c
user/attilio/vmcontention/sys/pc98/pc98/machdep.c
user/attilio/vmcontention/sys/powerpc/powerpc/exec_machdep.c
user/attilio/vmcontention/sys/security/audit/audit_syscalls.c
user/attilio/vmcontention/sys/security/mac/mac_syscalls.c
user/attilio/vmcontention/sys/sparc64/sparc64/machdep.c
user/attilio/vmcontention/sys/sys/posix4.h
user/attilio/vmcontention/sys/sys/signalvar.h
user/attilio/vmcontention/sys/sys/sysent.h
user/attilio/vmcontention/sys/sys/sysproto.h
user/attilio/vmcontention/sys/vm/swap_pager.c
user/attilio/vmcontention/sys/vm/vm_mmap.c
user/attilio/vmcontention/sys/vm/vm_unix.c
user/attilio/vmcontention/usr.bin/csup/auth.c
user/attilio/vmcontention/usr.bin/fetch/fetch.c
user/attilio/vmcontention/usr.bin/units/units.1
user/attilio/vmcontention/usr.sbin/bsdinstall/partedit/gpart_ops.c
user/attilio/vmcontention/usr.sbin/bsdinstall/scripts/auto
user/attilio/vmcontention/usr.sbin/bsdinstall/scripts/netconfig_ipv4
user/attilio/vmcontention/usr.sbin/bsdinstall/scripts/wlanconfig
user/attilio/vmcontention/usr.sbin/pkg_install/delete/perform.c
user/attilio/vmcontention/usr.sbin/rtadvctl/rtadvctl.c
user/attilio/vmcontention/usr.sbin/rtadvd/control.c
user/attilio/vmcontention/usr.sbin/rtadvd/control.h
user/attilio/vmcontention/usr.sbin/rtadvd/control_client.c
user/attilio/vmcontention/usr.sbin/rtadvd/control_client.h
user/attilio/vmcontention/usr.sbin/rtadvd/control_server.c
user/attilio/vmcontention/usr.sbin/rtadvd/control_server.h
user/attilio/vmcontention/usr.sbin/rtadvd/rtadvd.c
user/attilio/vmcontention/usr.sbin/rtsold/rtsol.c
user/attilio/vmcontention/usr.sbin/rtsold/rtsold.8
user/attilio/vmcontention/usr.sbin/rtsold/rtsold.c
user/attilio/vmcontention/usr.sbin/rtsold/rtsold.h
Directory Properties:
user/attilio/vmcontention/ (props changed)
user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed)
user/attilio/vmcontention/contrib/bind9/ (props changed)
user/attilio/vmcontention/contrib/binutils/ (props changed)
user/attilio/vmcontention/contrib/bzip2/ (props changed)
user/attilio/vmcontention/contrib/compiler-rt/ (props changed)
user/attilio/vmcontention/contrib/dialog/ (props changed)
user/attilio/vmcontention/contrib/ee/ (props changed)
user/attilio/vmcontention/contrib/expat/ (props changed)
user/attilio/vmcontention/contrib/file/ (props changed)
user/attilio/vmcontention/contrib/gcc/ (props changed)
user/attilio/vmcontention/contrib/gdb/ (props changed)
user/attilio/vmcontention/contrib/gdtoa/ (props changed)
user/attilio/vmcontention/contrib/gnu-sort/ (props changed)
user/attilio/vmcontention/contrib/groff/ (props changed)
user/attilio/vmcontention/contrib/less/ (props changed)
user/attilio/vmcontention/contrib/libpcap/ (props changed)
user/attilio/vmcontention/contrib/libstdc++/ (props changed)
user/attilio/vmcontention/contrib/llvm/ (props changed)
user/attilio/vmcontention/contrib/llvm/tools/clang/ (props changed)
user/attilio/vmcontention/contrib/ncurses/ (props changed)
user/attilio/vmcontention/contrib/netcat/ (props changed)
user/attilio/vmcontention/contrib/ntp/ (props changed)
user/attilio/vmcontention/contrib/one-true-awk/ (props changed)
user/attilio/vmcontention/contrib/openbsm/ (props changed)
user/attilio/vmcontention/contrib/openpam/ (props changed)
user/attilio/vmcontention/contrib/openresolv/ (props changed)
user/attilio/vmcontention/contrib/pf/ (props changed)
user/attilio/vmcontention/contrib/sendmail/ (props changed)
user/attilio/vmcontention/contrib/tcpdump/ (props changed)
user/attilio/vmcontention/contrib/tcsh/ (props changed)
user/attilio/vmcontention/contrib/tnftp/ (props changed)
user/attilio/vmcontention/contrib/top/ (props changed)
user/attilio/vmcontention/contrib/top/install-sh (props changed)
user/attilio/vmcontention/contrib/tzcode/stdtime/ (props changed)
user/attilio/vmcontention/contrib/tzcode/zic/ (props changed)
user/attilio/vmcontention/contrib/tzdata/ (props changed)
user/attilio/vmcontention/contrib/wpa/ (props changed)
user/attilio/vmcontention/contrib/xz/ (props changed)
user/attilio/vmcontention/crypto/openssh/ (props changed)
user/attilio/vmcontention/crypto/openssl/ (props changed)
user/attilio/vmcontention/gnu/lib/ (props changed)
user/attilio/vmcontention/gnu/usr.bin/binutils/ (props changed)
user/attilio/vmcontention/gnu/usr.bin/cc/cc_tools/ (props changed)
user/attilio/vmcontention/gnu/usr.bin/gdb/ (props changed)
user/attilio/vmcontention/lib/libc/ (props changed)
user/attilio/vmcontention/lib/libc/stdtime/ (props changed)
user/attilio/vmcontention/lib/libutil/ (props changed)
user/attilio/vmcontention/lib/libz/ (props changed)
user/attilio/vmcontention/sbin/ (props changed)
user/attilio/vmcontention/sbin/ipfw/ (props changed)
user/attilio/vmcontention/share/mk/bsd.arch.inc.mk (props changed)
user/attilio/vmcontention/share/zoneinfo/ (props changed)
user/attilio/vmcontention/sys/ (props changed)
user/attilio/vmcontention/sys/amd64/include/xen/ (props changed)
user/attilio/vmcontention/sys/boot/ (props changed)
user/attilio/vmcontention/sys/boot/i386/efi/ (props changed)
user/attilio/vmcontention/sys/boot/ia64/efi/ (props changed)
user/attilio/vmcontention/sys/boot/ia64/ski/ (props changed)
user/attilio/vmcontention/sys/boot/powerpc/boot1.chrp/ (props changed)
user/attilio/vmcontention/sys/boot/powerpc/ofw/ (props changed)
user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed)
user/attilio/vmcontention/sys/conf/ (props changed)
user/attilio/vmcontention/sys/contrib/dev/acpica/ (props changed)
user/attilio/vmcontention/sys/contrib/octeon-sdk/ (props changed)
user/attilio/vmcontention/sys/contrib/pf/ (props changed)
user/attilio/vmcontention/sys/contrib/x86emu/ (props changed)
user/attilio/vmcontention/usr.bin/calendar/ (props changed)
user/attilio/vmcontention/usr.bin/csup/ (props changed)
user/attilio/vmcontention/usr.bin/procstat/ (props changed)
user/attilio/vmcontention/usr.sbin/ndiscvt/ (props changed)
user/attilio/vmcontention/usr.sbin/rtadvctl/ (props changed)
user/attilio/vmcontention/usr.sbin/rtadvd/ (props changed)
user/attilio/vmcontention/usr.sbin/rtsold/ (props changed)
user/attilio/vmcontention/usr.sbin/zic/ (props changed)
Modified: user/attilio/vmcontention/ObsoleteFiles.inc
==============================================================================
--- user/attilio/vmcontention/ObsoleteFiles.inc Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/ObsoleteFiles.inc Sat Sep 17 11:08:40 2011 (r225639)
@@ -38,6 +38,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20110915: rename congestion control manpages
+OLD_FILES+=usr/share/man/man4/cc.4.gz
+OLD_FILES+=usr/share/man/man9/cc.9.gz
# 20110831: atomic page flags operations
OLD_FILES+=usr/share/man/man9/vm_page_flag.9.gz
OLD_FILES+=usr/share/man/man9/vm_page_flag_clear.9.gz
@@ -61,6 +64,11 @@ OLD_LIBS+=usr/lib32/libopie.so.6
OLD_LIBS+=usr/lib32/librtld_db.so.1
OLD_LIBS+=usr/lib32/libtacplus.so.4
.endif
+# 20110718: no longer useful in the age of rc.d
+OLD_FILES+=usr/sbin/named.reconfig
+OLD_FILES+=usr/sbin/named.reload
+# 20110716: bind 9.8.0 import
+OLD_LIBS+=usr/lib/liblwres.so.50
# 20110709: vm_map_clean.9 -> vm_map_sync.9
OLD_FILES+=usr/share/man/man9/vm_map_clean.9.gz
# 20110709: Catch up with removal of these functions.
@@ -84,8 +92,17 @@ OLD_FILES+=usr/lib/libpkg.a
OLD_FILES+=usr/lib/libpkg.so
OLD_LIBS+=usr/lib/libpkg.so.0
OLD_FILES+=usr/lib/libpkg_p.a
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libpkg.a
+OLD_FILES+=usr/lib32/libpkg.so
+OLD_LIBS+=usr/lib32/libpkg.so.0
+OLD_FILES+=usr/lib32/libpkg_p.a
+.endif
# 20110517: libsbuf version bump
OLD_LIBS+=lib/libsbuf.so.5
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libsbuf.so.5
+.endif
# 20110502: new clang import which bumps version from 2.9 to 3.0
OLD_FILES+=usr/include/clang/2.9/emmintrin.h
OLD_FILES+=usr/include/clang/2.9/mm_malloc.h
@@ -114,6 +131,12 @@ OLD_FILES+=usr/lib/libobjc_p.a
OLD_FILES+=usr/libexec/cc1obj
OLD_LIBS+=usr/lib/libobjc.so.4
OLD_DIRS+=usr/include/objc
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libobjc.a
+OLD_FILES+=usr/lib32/libobjc.so
+OLD_FILES+=usr/lib32/libobjc_p.a
+OLD_LIBS+=usr/lib32/libobjc.so.4
+.endif
# 20110331: firmware.img created at build time
OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img
# 20110224: sticky.8 -> sticky.7
Modified: user/attilio/vmcontention/UPDATING
==============================================================================
--- user/attilio/vmcontention/UPDATING Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/UPDATING Sat Sep 17 11:08:40 2011 (r225639)
@@ -22,6 +22,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20110913:
+ This commit modifies vfs_register() so that it uses a hash
+ calculation to set vfc_typenum, which is enabled by default.
+ The first time a system is booted after this change, the
+ vfc_typenum values will change for all file systems. The
+ main effect of this is a change to the NFS server file handles
+ for file systems that use vfc_typenum in their fsid, such as ZFS.
+ It will, however, prevent vfc_typenum from changing when file
+ systems are loaded in a different order for subsequent reboots.
+ To disable this, you can set vfs.typenumhash=0 in /boot/loader.conf
+ until you are ready to remount all NFS clients after a reboot.
+
20110828:
Bump the shared library version numbers for libraries that
do not use symbol versioning, have changed the ABI compared
Modified: user/attilio/vmcontention/contrib/openresolv/dnsmasq.in
==============================================================================
--- user/attilio/vmcontention/contrib/openresolv/dnsmasq.in Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/contrib/openresolv/dnsmasq.in Sat Sep 17 11:08:40 2011 (r225639)
@@ -30,12 +30,14 @@
. "@SYSCONFDIR@/resolvconf.conf" || exit 1
[ -z "$dnsmasq_conf" -a -z "$dnsmasq_resolv" ] && exit 0
[ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
+NL="
+"
: ${dnsmasq_pid:=/var/run/dnsmasq.pid}
[ -s "$dnsmasq_pid" ] || dnsmasq_pid=/var/run/dnsmasq/dnsmasq.pid
: ${dnsmasq_service:=dnsmasq}
: ${dnsmasq_restart:=@RESTARTCMD ${dnsmasq_service}@}
-newconf="# Generated by resolvconf\n"
+newconf="# Generated by resolvconf$NL"
newresolv="$newconf"
# Using dbus means that we never have to restart the daemon
@@ -56,14 +58,14 @@ if [ -s "$dbus_pid" -a -s "$dnsmasq_pid"
kill -0 $(cat "$dnsmasq_pid") 2>/dev/null
then
dbus=true
- newconf="$newconf\n# Domain specific servers will"
- newconf="$newconf be sent over dbus\nenable-dbus\n"
+ newconf="$newconf$NL# Domain specific servers will"
+ newconf="$newconf be sent over dbus${NL}enable-dbus$NL"
fi
fi
fi
for n in $NAMESERVERS; do
- newresolv="${newresolv}nameserver $n\n"
+ newresolv="${newresolv}nameserver $n$NL"
done
dbusdest=
@@ -75,16 +77,16 @@ for d in $DOMAINS; do
SIFS=${IFS-y} OIFS=$IFS
IFS=.
set -- ${ns%%,*}
- num="0x$(printf "%02x" $1 $2 $3 $4)"
+ num="0x$(printf %02x $1 $2 $3 $4)"
if [ "$SIFS" = yi ]; then
unset IFS
else
IFS=$OIFS
fi
- dbusdest="$dbusdest uint32:$(printf "%u" $num)"
+ dbusdest="$dbusdest uint32:$(printf %u $num)"
dbusdest="$dbusdest string:$dn"
else
- newconf="${newconf}server=/$dn/${ns%%,*}\n"
+ newconf="${newconf}server=/$dn/${ns%%,*}$NL"
fi
[ "$ns" = "${ns#*,}" ] && break
ns="${ns#*,}"
@@ -94,22 +96,22 @@ done
changed=false
if [ -n "$dnsmasq_conf" ]; then
if [ ! -f "$dnsmasq_conf" ] || \
- [ "$(cat "$dnsmasq_conf")" != "$(printf "$newconf")" ]
+ [ "$(cat "$dnsmasq_conf")" != "$(printf %s "$newconf")" ]
then
changed=true
- printf "$newconf" >"$dnsmasq_conf"
+ printf %s "$newconf" >"$dnsmasq_conf"
fi
fi
if [ -n "$dnsmasq_resolv" ]; then
if [ -f "$dnsmasq_resolv" ]; then
- if [ "$(cat "$dnsmasq_resolv")" != "$(printf "$newresolv")" ]
+ if [ "$(cat "$dnsmasq_resolv")" != "$(printf %s "$newresolv")" ]
then
changed=true
- printf "$newresolv" >"$dnsmasq_resolv"
+ printf %s "$newresolv" >"$dnsmasq_resolv"
fi
else
# dnsmasq polls this file so no need to set changed=true
- printf "$newresolv" >"$dnsmasq_resolv"
+ printf %s "$newresolv" >"$dnsmasq_resolv"
fi
fi
Modified: user/attilio/vmcontention/contrib/openresolv/libc.in
==============================================================================
--- user/attilio/vmcontention/contrib/openresolv/libc.in Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/contrib/openresolv/libc.in Sat Sep 17 11:08:40 2011 (r225639)
@@ -30,6 +30,8 @@ SYSCONFDIR=@SYSCONFDIR@
LIBEXECDIR=@LIBEXECDIR@
VARDIR=@VARDIR@
IFACEDIR="$VARDIR/interfaces"
+NL="
+"
# sed may not be available, and this is faster on small files
key_get_value()
@@ -109,7 +111,7 @@ case "${resolv_conf_passthrough:-NO}" in
fi
done
[ -z "$newest" ] && exit 0
- newconf="$(cat "$newest")\n"
+ newconf="$(cat "$newest")$NL"
;;
*)
[ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
@@ -118,13 +120,13 @@ case "${resolv_conf_passthrough:-NO}" in
newns="$(uniqify $name_servers $NS $name_servers_append)"
# Hold our new resolv.conf in a variable to save on temporary files
- newconf="# Generated by resolvconf\n"
+ newconf="# Generated by resolvconf$NL"
if [ -n "$resolv_conf_head" ]; then
- newconf="$newconf$resolv_conf_head\n"
+ newconf="$newconf$resolv_conf_head$NL"
fi
- [ -n "$newsearch" ] && newconf="${newconf}search $newsearch\n"
+ [ -n "$newsearch" ] && newconf="${newconf}search $newsearch$NL"
for n in $newns; do
- newconf="${newconf}nameserver $n\n"
+ newconf="${newconf}nameserver $n$NL"
done
# Now get any configured options
@@ -135,22 +137,22 @@ case "${resolv_conf_passthrough:-NO}" in
for opt in $(uniqify $opts); do
newconf="${newconf} $opt"
done
- newconf="$newconf\n"
+ newconf="$newconf$NL"
fi
if [ -n "$resolv_conf_tail" ]; then
- newconf="$newconf$resolv_conf_tail\n"
+ newconf="$newconf$resolv_conf_tail$NL"
fi
;;
esac
# Check if the file has actually changed or not
if [ -e "$resolv_conf" ]; then
- [ "$(cat "$resolv_conf")" = "$(printf "$newconf")" ] && exit 0
+ [ "$(cat "$resolv_conf")" = "$(printf %s "$newconf")" ] && exit 0
fi
# Create our resolv.conf now
-(umask 022; printf "$newconf" >"$resolv_conf")
+(umask 022; echo "$newconf" >"$resolv_conf")
eval $libc_restart
retval=0
Modified: user/attilio/vmcontention/contrib/openresolv/named.in
==============================================================================
--- user/attilio/vmcontention/contrib/openresolv/named.in Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/contrib/openresolv/named.in Sat Sep 17 11:08:40 2011 (r225639)
@@ -30,6 +30,8 @@
. "@SYSCONFDIR@/resolvconf.conf" || exit 1
[ -z "$named_zones" -a -z "$named_options" ] && exit 0
[ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
+NL="
+"
# Platform specific kludges
if [ -z "$named_service" -a -z "$named_restart" -a \
@@ -42,31 +44,31 @@ then
fi
: ${named_service:=named}
: ${named_restart:=@RESTARTCMD ${named_service}@}
-newoptions="# Generated by resolvconf\n"
+newoptions="# Generated by resolvconf$NL"
newzones="$newoptions"
forward=
for n in $NAMESERVERS; do
case "$forward" in
- *"\n\t$n;"*);;
- *) forward="$forward\n\t$n;";;
+ *"$NL $n;"*);;
+ *) forward="$forward$NL $n;";;
esac
done
if [ -n "$forward" ]; then
- newoptions="${newoptions}forward first;\nforwarders {$forward\n};\n"
+ newoptions="${newoptions}forward first;${NL}forwarders {$forward${NL}};$NL"
fi
for d in $DOMAINS; do
- newzones="${newzones}zone \"${d%%:*}\" {\n"
- newzones="$newzones\ttype forward;\n"
- newzones="$newzones\tforward first;\n\tforwarders {\n"
+ newzones="${newzones}zone \"${d%%:*}\" {$NL"
+ newzones="$newzones type forward;$NL"
+ newzones="$newzones forward first;$NL forwarders {$NL"
ns="${d#*:}"
while [ -n "$ns" ]; do
- newzones="$newzones\t\t${ns%%,*};\n"
+ newzones="$newzones ${ns%%,*};$NL"
[ "$ns" = "${ns#*,}" ] && break
ns="${ns#*,}"
done
- newzones="$newzones\t};\n};\n"
+ newzones="$newzones };$NL};$NL"
done
# No point in changing files or reloading bind if the end result has not
@@ -74,17 +76,17 @@ done
changed=false
if [ -n "$named_options" ]; then
if [ ! -f "$named_options" ] || \
- [ "$(cat "$named_options")" != "$(printf "$newoptions")" ]
+ [ "$(cat "$named_options")" != "$(printf %s "$newoptions")" ]
then
- printf "$newoptions" >"$named_options"
+ printf %s "$newoptions" >"$named_options"
changed=true
fi
fi
if [ -n "$named_zones" ]; then
if [ ! -f "$named_zones" ] || \
- [ "$(cat "$named_zones")" != "$(printf "$newzones")" ]
+ [ "$(cat "$named_zones")" != "$(printf %s "$newzones")" ]
then
- printf "$newzones" >"$named_zones"
+ printf %s "$newzones" >"$named_zones"
changed=true
fi
fi
Modified: user/attilio/vmcontention/contrib/openresolv/pdnsd.in
==============================================================================
--- user/attilio/vmcontention/contrib/openresolv/pdnsd.in Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/contrib/openresolv/pdnsd.in Sat Sep 17 11:08:40 2011 (r225639)
@@ -131,7 +131,7 @@ if [ -n "$pdnsd_conf" ]; then
remove_markers "$signature" "$signature_end" "$pdnsd_conf" > "$cf"
if [ -n "$newconf" ]; then
echo "$signature" >> "$cf"
- printf "$newconf" >> "$cf"
+ printf %s "$newconf" >> "$cf"
echo "$signature_end" >> "$cf"
fi
if change_file "$pdnsd_conf" "$cf"; then
@@ -141,10 +141,10 @@ fi
if [ -n "$pdnsd_resolv" ]; then
if [ ! -f "$pdnsd_resolv" ] || \
- [ "$(cat "$pdnsd_resolv")" != "$(printf "$newresolv")" ]
+ [ "$(cat "$pdnsd_resolv")" != "$(printf %s "$newresolv")" ]
then
changed=true
- printf "$newresolv" >"$pdnsd_resolv"
+ printf %s "$newresolv" >"$pdnsd_resolv"
fi
fi
Modified: user/attilio/vmcontention/contrib/openresolv/resolvconf.in
==============================================================================
--- user/attilio/vmcontention/contrib/openresolv/resolvconf.in Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/contrib/openresolv/resolvconf.in Sat Sep 17 11:08:40 2011 (r225639)
@@ -368,17 +368,17 @@ fi
if [ "$cmd" = a ]; then
# Read resolv.conf from stdin
- resolv="$(cat)\n"
+ resolv="$(cat)"
# If what we are given matches what we have, then do nothing
if [ -e "$IFACEDIR/$iface" ]; then
- if [ "$(printf "$resolv")" = \
+ if [ "$(echo "$resolv")" = \
"$(cat "$IFACEDIR/$iface")" ]
then
exit 0
fi
rm "$IFACEDIR/$iface"
fi
- printf "$resolv" >"$IFACEDIR/$iface" || exit $?
+ echo "$resolv" >"$IFACEDIR/$iface" || exit $?
[ ! -d "$METRICDIR" ] && mkdir "$METRICDIR"
rm -f "$METRICDIR/"*" $iface"
if [ -n "$IF_METRIC" ]; then
Modified: user/attilio/vmcontention/contrib/openresolv/unbound.in
==============================================================================
--- user/attilio/vmcontention/contrib/openresolv/unbound.in Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/contrib/openresolv/unbound.in Sat Sep 17 11:08:40 2011 (r225639)
@@ -30,34 +30,36 @@
. "@SYSCONFDIR@/resolvconf.conf" || exit 1
[ -z "$unbound_conf" ] && exit 0
[ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
+NL="
+"
: ${unbound_pid:=/var/run/unbound.pid}
: ${unbound_service:=unbound}
: ${unbound_restart:=@RESTARTCMD ${unbound_service}@}
-newconf="# Generated by resolvconf\n"
+newconf="# Generated by resolvconf$NL"
for d in $DOMAINS; do
dn="${d%%:*}"
ns="${d#*:}"
- newconf="${newconf}\nforward-zone:\n\tname: \"$dn\"\n"
+ newconf="$newconf${NL}forward-zone:$NL name: \"$dn\"$NL"
while [ -n "$ns" ]; do
- newconf="${newconf}\tforward-addr: ${ns%%,*}\n"
+ newconf="$newconf forward-addr: ${ns%%,*}$NL"
[ "$ns" = "${ns#*,}" ] && break
ns="${ns#*,}"
done
done
if [ -n "$NAMESERVERS" ]; then
- newconf="${newconf}\nforward-zone:\n\tname: \".\"\n"
+ newconf="$newconf${NL}forward-zone:$NL name: \".\"$NL"
for n in $NAMESERVERS; do
- newconf="${newconf}\tforward-addr: $n\n"
+ newconf="$newconf forward-addr: $n$NL"
done
fi
if [ ! -f "$unbound_conf" ] || \
- [ "$(cat "$unbound_conf")" != "$(printf "$newconf")" ]
+ [ "$(cat "$unbound_conf")" != "$(printf %s "$newconf")" ]
then
- printf "$newconf" >"$unbound_conf"
+ printf %s "$newconf" >"$unbound_conf"
# If we can't sent a HUP then force a restart
if [ -s "$unbound_pid" ]; then
if ! kill -HUP $(cat "$unbound_pid") 2>/dev/null; then
Modified: user/attilio/vmcontention/crypto/openssh/auth-pam.c
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/auth-pam.c Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/crypto/openssh/auth-pam.c Sat Sep 17 11:08:40 2011 (r225639)
@@ -45,7 +45,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* Based on $FreeBSD$ */
+/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h"
#include <sys/types.h>
Modified: user/attilio/vmcontention/etc/defaults/devfs.rules
==============================================================================
--- user/attilio/vmcontention/etc/defaults/devfs.rules Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/etc/defaults/devfs.rules Sat Sep 17 11:08:40 2011 (r225639)
@@ -26,6 +26,7 @@ add hide
# Requires: devfsrules_hide_all
#
[devfsrules_unhide_basic=2]
+add path log unhide
add path null unhide
add path zero unhide
add path crypto unhide
Modified: user/attilio/vmcontention/etc/defaults/rc.conf
==============================================================================
--- user/attilio/vmcontention/etc/defaults/rc.conf Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/etc/defaults/rc.conf Sat Sep 17 11:08:40 2011 (r225639)
@@ -468,8 +468,11 @@ ipv6_static_routes="" # Set to static r
# route toward loopback interface.
#ipv6_route_xxx="fec0:0000:0000:0006:: -prefixlen 64 ::1"
ipv6_gateway_enable="NO" # Set to YES if this host will be a gateway.
+ipv6_cpe_wanif="NO" # Set to the upstram interface name if this
+ # node will work as a router to forward IPv6
+ # packets not explicitly addressed to itself.
ipv6_privacy="NO" # Use privacy address on RA-receiving IFs
- # (RFC 4193)
+ # (RFC 4941)
route6d_enable="NO" # Set to YES to enable an IPv6 routing daemon.
route6d_program="/usr/sbin/route6d" # Name of IPv6 routing daemon.
Modified: user/attilio/vmcontention/etc/network.subr
==============================================================================
--- user/attilio/vmcontention/etc/network.subr Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/etc/network.subr Sat Sep 17 11:08:40 2011 (r225639)
@@ -32,7 +32,7 @@
# ifn_start ifn
# Bring up and configure an interface. If some configuration is
-# applied print the interface configuration.
+# applied, print the interface configuration.
#
ifn_start()
{
@@ -53,7 +53,7 @@ ifn_start()
}
# ifn_stop ifn
-# Shutdown and de-configure an interface. If action is taken
+# Shutdown and de-configure an interface. If action is taken,
# print the interface name.
#
ifn_stop()
@@ -113,6 +113,12 @@ ifconfig_up()
;;
esac
+ case $ipv6_cpe_wanif in
+ $1)
+ _ipv6_opts="${_ipv6_opts} -no_radr accept_rtadv"
+ ;;
+ esac
+
if [ -n "${_ipv6_opts}" ]; then
ifconfig $1 inet6 ${_ipv6_opts}
fi
@@ -120,8 +126,16 @@ ifconfig_up()
# ifconfig_IF_ipv6
ifconfig_args=`ifconfig_getargs $1 ipv6`
if [ -n "${ifconfig_args}" ]; then
+ # backward compatibility: inet6 keyword
+ case "${ifconfig_args}" in
+ :*|[0-9a-fA-F]*:*)
+ warn "\$ifconfig_$1_ipv6 needs " \
+ "\"inet6\" keyword for an IPv6 address."
+ ifconfig_args="inet6 ${ifconfig_args}"
+ ;;
+ esac
ifconfig $1 inet6 -ifdisabled
- ifconfig $1 ${ifconfig_args}
+ eval ifconfig $1 ${ifconfig_args}
_cfg=0
fi
@@ -131,7 +145,7 @@ ifconfig_up()
warn "\$ipv6_ifconfig_$1 is obsolete." \
" Use ifconfig_$1_ipv6 instead."
ifconfig $1 inet6 -ifdisabled
- ifconfig $1 inet6 ${ifconfig_args}
+ eval ifconfig $1 inet6 ${ifconfig_args}
_cfg=0
fi
fi
@@ -213,8 +227,8 @@ get_if_var()
}
# _ifconfig_getargs if [af]
-# Echos the arguments for the supplied interface to stdout.
-# returns 1 if empty. In general, ifconfig_getargs should be used
+# Prints the arguments for the supplied interface to stdout.
+# Returns 1 if empty. In general, ifconfig_getargs should be used
# outside this file.
_ifconfig_getargs()
{
@@ -258,7 +272,7 @@ ifconfig_getargs()
}
# autoif
-# Returns 0 if the interface should be automaticly configured at
+# Returns 0 if the interface should be automatically configured at
# boot time and 1 otherwise.
autoif()
{
@@ -435,7 +449,7 @@ ipv6if()
# ipv6_autoconfif if
# Returns 0 if the interface should be configured for IPv6 with
-# Stateless Address Configuration, 1 otherwise.
+# Stateless Address Configuration; 1 otherwise.
ipv6_autoconfif()
{
local _if _tmpargs _arg
Modified: user/attilio/vmcontention/etc/rc.d/netoptions
==============================================================================
--- user/attilio/vmcontention/etc/rc.d/netoptions Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/etc/rc.d/netoptions Sat Sep 17 11:08:40 2011 (r225639)
@@ -106,6 +106,19 @@ netoptions_inet6()
${SYSCTL} net.inet6.ip6.use_tempaddr=1 >/dev/null
${SYSCTL} net.inet6.ip6.prefer_tempaddr=1 >/dev/null
fi
+
+ case $ipv6_cpe_wanif in
+ ""|[Nn][Oo]|[Nn][Oo][Nn][Ee]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+ ${SYSCTL} net.inet6.ip6.no_radr=0 >/dev/null
+ ${SYSCTL} net.inet6.ip6.rfc6204w3=0 >/dev/null
+ ;;
+ *)
+ netoptions_init
+ echo -n " IPv6 CPE WANIF=${ipv6_cpe_wanif}"
+ ${SYSCTL} net.inet6.ip6.no_radr=1 >/dev/null
+ ${SYSCTL} net.inet6.ip6.rfc6204w3=1 >/dev/null
+ ;;
+ esac
}
load_rc_config $name
Modified: user/attilio/vmcontention/lib/libarchive/archive_read_support_format_cpio.c
==============================================================================
--- user/attilio/vmcontention/lib/libarchive/archive_read_support_format_cpio.c Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/lib/libarchive/archive_read_support_format_cpio.c Sat Sep 17 11:08:40 2011 (r225639)
@@ -54,7 +54,7 @@ struct cpio_bin_header {
unsigned char c_mtime[4];
unsigned char c_namesize[2];
unsigned char c_filesize[4];
-};
+} __packed;
struct cpio_odc_header {
char c_magic[6];
@@ -68,7 +68,7 @@ struct cpio_odc_header {
char c_mtime[11];
char c_namesize[6];
char c_filesize[11];
-};
+} __packed;
struct cpio_newc_header {
char c_magic[6];
@@ -85,7 +85,7 @@ struct cpio_newc_header {
char c_rdevminor[8];
char c_namesize[8];
char c_crc[8];
-};
+} __packed;
struct links_entry {
struct links_entry *next;
Modified: user/attilio/vmcontention/lib/libarchive/archive_write_set_format_cpio.c
==============================================================================
--- user/attilio/vmcontention/lib/libarchive/archive_write_set_format_cpio.c Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/lib/libarchive/archive_write_set_format_cpio.c Sat Sep 17 11:08:40 2011 (r225639)
@@ -74,7 +74,7 @@ struct cpio_header {
char c_mtime[11];
char c_namesize[6];
char c_filesize[11];
-};
+} __packed;
/*
* Set output format to 'cpio' format.
Modified: user/attilio/vmcontention/libexec/rtld-elf/rtld.c
==============================================================================
--- user/attilio/vmcontention/libexec/rtld-elf/rtld.c Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/libexec/rtld-elf/rtld.c Sat Sep 17 11:08:40 2011 (r225639)
@@ -3370,7 +3370,7 @@ tls_get_addr_common(Elf_Addr** dtvp, int
newdtv[1] = tls_max_index;
free(dtv);
lock_release(rtld_bind_lock, &lockstate);
- *dtvp = newdtv;
+ dtv = *dtvp = newdtv;
}
/* Dynamically allocate module TLS if necessary */
Modified: user/attilio/vmcontention/release/rc.local
==============================================================================
--- user/attilio/vmcontention/release/rc.local Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/release/rc.local Sat Sep 17 11:08:40 2011 (r225639)
@@ -8,13 +8,37 @@
: ${DIALOG_ITEM_HELP=4}
: ${DIALOG_ESC=255}
-TERM=xterm; export TERM # XXX: serial consoles
+kbdcontrol -d >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+ # Syscons: use xterm
+ TERM=xterm
+else
+ # Serial or other console
+ echo
+ echo "Welcome to FreeBSD!"
+ echo
+ echo "Please choose the appropriate terminal type for your system."
+ echo "Common console types are:"
+ echo " ansi Standard ANSI terminal"
+ echo " vt100 VT100 or compatible terminal"
+ echo " xterm xterm terminal emulator (or compatible)"
+ echo
+ echo -n "Console type [vt100]: "
+ read TERM
+ TERM=${TERM:-vt100}
+fi
+export TERM
dialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0
case $? in
$DIALOG_OK) # Install
- BSDINSTALL_CONFIGCURRENT=yes; export BSDINSTALL_CONFIGCURRENT
+ # If not netbooting, have the installer configure the network
+ dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
+ if [ ${dlv:=0} -eq 0 -a ! -f /etc/diskless ]; then
+ BSDINSTALL_CONFIGCURRENT=yes; export BSDINSTALL_CONFIGCURRENT
+ fi
+
trap true SIGINT # Ignore cntrl-C here
bsdinstall
if [ $? -eq 0 ]; then
Modified: user/attilio/vmcontention/sbin/mdmfs/mdmfs.c
==============================================================================
--- user/attilio/vmcontention/sbin/mdmfs/mdmfs.c Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/sbin/mdmfs/mdmfs.c Sat Sep 17 11:08:40 2011 (r225639)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/mdioctl.h>
+#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/wait.h>
@@ -60,6 +61,7 @@ struct mtpt_info {
bool mi_have_gid;
mode_t mi_mode;
bool mi_have_mode;
+ bool mi_forced_pw;
};
static bool debug; /* Emit debugging information? */
@@ -204,6 +206,7 @@ main(int argc, char **argv)
usage();
mi.mi_mode = getmode(set, S_IRWXU | S_IRWXG | S_IRWXO);
mi.mi_have_mode = true;
+ mi.mi_forced_pw = true;
free(set);
break;
case 'S':
@@ -223,6 +226,7 @@ main(int argc, char **argv)
break;
case 'w':
extract_ugid(optarg, &mi);
+ mi.mi_forced_pw = true;
break;
case 'X':
debug = true;
@@ -443,6 +447,29 @@ do_mount(const char *args, const char *m
static void
do_mtptsetup(const char *mtpoint, struct mtpt_info *mip)
{
+ struct statfs sfs;
+
+ if (!mip->mi_have_mode && !mip->mi_have_uid && !mip->mi_have_gid)
+ return;
+
+ if (!norun) {
+ if (statfs(mtpoint, &sfs) == -1) {
+ warn("statfs: %s", mtpoint);
+ return;
+ }
+ if ((sfs.f_flags & MNT_RDONLY) != 0) {
+ if (mip->mi_forced_pw) {
+ warnx(
+ "Not changing mode/owner of %s since it is read-only",
+ mtpoint);
+ } else {
+ debugprintf(
+ "Not changing mode/owner of %s since it is read-only",
+ mtpoint);
+ }
+ return;
+ }
+ }
if (mip->mi_have_mode) {
debugprintf("changing mode of %s to %o.", mtpoint,
Modified: user/attilio/vmcontention/share/man/man4/Makefile
==============================================================================
--- user/attilio/vmcontention/share/man/man4/Makefile Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/share/man/man4/Makefile Sat Sep 17 11:08:40 2011 (r225639)
@@ -71,7 +71,6 @@ MAN= aac.4 \
cardbus.4 \
carp.4 \
cas.4 \
- cc.4 \
cc_chd.4 \
cc_cubic.4 \
cc_hd.4 \
@@ -233,6 +232,7 @@ MAN= aac.4 \
mmc.4 \
mmcsd.4 \
mn.4 \
+ mod_cc.4 \
mos.4 \
mouse.4 \
mps.4 \
Modified: user/attilio/vmcontention/share/man/man4/cc_chd.4
==============================================================================
--- user/attilio/vmcontention/share/man/man4/cc_chd.4 Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/share/man/man4/cc_chd.4 Sat Sep 17 11:08:40 2011 (r225639)
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 15, 2011
+.Dd September 15, 2011
.Dt CC_CHD 4
.Os
.Sh NAME
@@ -86,16 +86,16 @@ is used.
Default is 1.
.El
.Sh SEE ALSO
-.Xr cc 4 ,
.Xr cc_cubic 4 ,
.Xr cc_hd 4 ,
.Xr cc_htcp 4 ,
.Xr cc_newreno 4 ,
.Xr cc_vegas 4 ,
.Xr h_ertt 4 ,
+.Xr mod_cc 4 ,
.Xr tcp 4 ,
-.Xr cc 9 ,
-.Xr khelp 9
+.Xr khelp 9 ,
+.Xr mod_cc 9
.Rs
.%A "D. A. Hayes"
.%A "G. Armitage"
Modified: user/attilio/vmcontention/share/man/man4/cc_cubic.4
==============================================================================
--- user/attilio/vmcontention/share/man/man4/cc_cubic.4 Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/share/man/man4/cc_cubic.4 Sat Sep 17 11:08:40 2011 (r225639)
@@ -30,7 +30,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 15, 2011
+.Dd September 15, 2011
.Dt CC_CUBIC 4
.Os
.Sh NAME
@@ -62,14 +62,14 @@ section below.
.Sh MIB Variables
There are currently no tunable MIB variables.
.Sh SEE ALSO
-.Xr cc 4 ,
.Xr cc_chd 4 ,
.Xr cc_hd 4 ,
.Xr cc_htcp 4 ,
.Xr cc_newreno 4 ,
.Xr cc_vegas 4 ,
+.Xr mod_cc 4 ,
.Xr tcp 4 ,
-.Xr cc 9
+.Xr mod_cc 9
.Rs
.%A "Sangtae Ha"
.%A "Injong Rhee"
Modified: user/attilio/vmcontention/share/man/man4/cc_hd.4
==============================================================================
--- user/attilio/vmcontention/share/man/man4/cc_hd.4 Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/share/man/man4/cc_hd.4 Sat Sep 17 11:08:40 2011 (r225639)
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 15, 2011
+.Dd September 15, 2011
.Dt CC_HD 4
.Os
.Sh NAME
@@ -69,16 +69,16 @@ Minimum queuing delay threshold (qmin) i
Default is 5.
.El
.Sh SEE ALSO
-.Xr cc 4 ,
.Xr cc_chd 4 ,
.Xr cc_cubic 4 ,
.Xr cc_htcp 4 ,
.Xr cc_newreno 4 ,
.Xr cc_vegas 4 ,
.Xr h_ertt 4 ,
+.Xr mod_cc 4 ,
.Xr tcp 4 ,
-.Xr cc 9 ,
-.Xr khelp 9
+.Xr khelp 9 ,
+.Xr mod_cc 9
.Rs
.%A "L. Budzisz"
.%A "R. Stanojevic"
Modified: user/attilio/vmcontention/share/man/man4/cc_htcp.4
==============================================================================
--- user/attilio/vmcontention/share/man/man4/cc_htcp.4 Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/share/man/man4/cc_htcp.4 Sat Sep 17 11:08:40 2011 (r225639)
@@ -30,7 +30,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 15, 2011
+.Dd September 15, 2011
.Dt CC_HTCP 4
.Os
.Sh NAME
@@ -69,14 +69,14 @@ window increase during congestion avoida
Default is 0 (disabled).
.El
.Sh SEE ALSO
-.Xr cc 4 ,
.Xr cc_chd 4 ,
.Xr cc_cubic 4 ,
.Xr cc_hd 4 ,
.Xr cc_newreno 4 ,
.Xr cc_vegas 4 ,
+.Xr mod_cc 4 ,
.Xr tcp 4 ,
-.Xr cc 9
+.Xr mod_cc 9
.Rs
.%A "D. Leith"
.%A "R. Shorten"
Modified: user/attilio/vmcontention/share/man/man4/cc_newreno.4
==============================================================================
--- user/attilio/vmcontention/share/man/man4/cc_newreno.4 Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/share/man/man4/cc_newreno.4 Sat Sep 17 11:08:40 2011 (r225639)
@@ -30,7 +30,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 15, 2011
+.Dd September 15, 2011
.Dt CC_NEWRENO 4
.Os
.Sh NAME
@@ -42,14 +42,14 @@ Details about the algorithm can be found
.Sh MIB Variables
There are currently no tunable MIB variables.
.Sh SEE ALSO
-.Xr cc 4 ,
.Xr cc_chd 4 ,
.Xr cc_cubic 4 ,
.Xr cc_hd 4 ,
.Xr cc_htcp 4 ,
.Xr cc_vegas 4 ,
+.Xr mod_cc 4 ,
.Xr tcp 4 ,
-.Xr cc 9
+.Xr mod_cc 9
.Sh ACKNOWLEDGEMENTS
Development and testing of this software were made possible in part by grants
from the FreeBSD Foundation and Cisco University Research Program Fund at
Modified: user/attilio/vmcontention/share/man/man4/cc_vegas.4
==============================================================================
--- user/attilio/vmcontention/share/man/man4/cc_vegas.4 Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/share/man/man4/cc_vegas.4 Sat Sep 17 11:08:40 2011 (r225639)
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 15, 2011
+.Dd September 15, 2011
.Dt CC_VEGAS 4
.Os
.Sh NAME
@@ -94,16 +94,16 @@ When setting beta, the value must satisf
Default is 3.
.El
.Sh SEE ALSO
-.Xr cc 4 ,
.Xr cc_chd 4 ,
.Xr cc_cubic 4 ,
.Xr cc_hd 4 ,
.Xr cc_htcp 4 ,
.Xr cc_newreno 4 ,
.Xr h_ertt 4 ,
+.Xr mod_cc 4 ,
.Xr tcp 4 ,
-.Xr cc 9 ,
-.Xr khelp 9
+.Xr khelp 9 ,
+.Xr mod_cc 9
.Rs
.%A "L. S. Brakmo"
.%A "L. L. Peterson"
Modified: user/attilio/vmcontention/share/man/man4/h_ertt.4
==============================================================================
--- user/attilio/vmcontention/share/man/man4/h_ertt.4 Sat Sep 17 10:24:19 2011 (r225638)
+++ user/attilio/vmcontention/share/man/man4/h_ertt.4 Sat Sep 17 11:08:40 2011 (r225639)
@@ -108,10 +108,10 @@ consumers to unset the flag if they wish
new measurements.
.El
.Sh SEE ALSO
-.Xr cc 4 ,
.Xr cc_chd 4 ,
.Xr cc_hd 4 ,
.Xr cc_vegas 4 ,
+.Xr mod_cc 4 ,
.Xr hhook 9 ,
.Xr khelp 9
.Sh ACKNOWLEDGEMENTS
Copied: user/attilio/vmcontention/share/man/man4/mod_cc.4 (from r225638, head/share/man/man4/mod_cc.4)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/attilio/vmcontention/share/man/man4/mod_cc.4 Sat Sep 17 11:08:40 2011 (r225639, copy of r225638, head/share/man/man4/mod_cc.4)
@@ -0,0 +1,117 @@
+.\"
+.\" Copyright (c) 2010-2011 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This documentation was written at the Centre for Advanced Internet
+.\" Architectures, Swinburne University of Technology, Melbourne, Australia by
+.\" David Hayes and Lawrence Stewart under sponsorship from the FreeBSD
+.\" Foundation.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd September 15, 2011
+.Dt MOD_CC 4
+.Os
+.Sh NAME
+.Nm mod_cc
+.Nd Modular congestion control
+.Sh DESCRIPTION
+The modular congestion control framework allows the TCP implementation to
+dynamically change the congestion control algorithm used by new and existing
+connections.
+Algorithms are identified by a unique
+.Xr ascii 7
+name.
+Algorithm modules can be compiled into the kernel or loaded as kernel modules
+using the
+.Xr kld 4
+facility.
+.Pp
+The default algorithm is NewReno, and all connections use the default unless
+explicitly overridden using the TCP_CONGESTION socket option (see
+.Xr tcp 4
+for details).
+The default can be changed using a
+.Xr sysctl 3
+MIB variable detailed in the
+.Sx MIB Variables
+section below.
+.Sh MIB Variables
+The framework exposes the following variables in the
+.Va net.inet.tcp.cc
+branch of the
+.Xr sysctl 3
+MIB:
+.Bl -tag -width ".Va available"
+.It Va available
+Read-only list of currently available congestion control algorithms by name.
+.It Va algorithm
+Returns the current default congestion control algorithm when read, and changes
+the default when set.
+When attempting to change the default algorithm, this variable should be set to
+one of the names listed by the
+.Va net.inet.tcp.cc.available
+MIB variable.
+.El
+.Sh SEE ALSO
+.Xr cc_chd 4 ,
+.Xr cc_cubic 4 ,
+.Xr cc_hd 4 ,
+.Xr cc_htcp 4 ,
+.Xr cc_newreno 4 ,
+.Xr cc_vegas 4 ,
+.Xr tcp 4 ,
+.Xr mod_cc 9
+.Sh ACKNOWLEDGEMENTS
+Development and testing of this software were made possible in part by grants
+from the FreeBSD Foundation and Cisco University Research Program Fund at
+Community Foundation Silicon Valley.
+.Sh HISTORY
+The
+.Nm
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list