PERFORCE change 144726 for review

Edward Tomasz Napierala trasz at FreeBSD.org
Sat Jul 5 17:33:57 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=144726

Change 144726 by trasz at trasz_traszkan on 2008/07/05 17:33:03

	IFC

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/TODO#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ipfw#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/mountcritlocal#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/nfsclient#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/config_freebsd.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_gtar_1.tgz.uu#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/quotacheck/preen.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/quotacheck/quotacheck.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/bdes/bdes.ps#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cnw.4#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/arl.4#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/oltr.4#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/sbni.4#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.powerpc/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.powerpc/bm.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/sbsh.4#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_emu10kx.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/uftdi.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-doc.dot#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-ports.dot#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-src.dot#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/mp_machdep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/vmparam.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.conf#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/README.serial.98#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_stat.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.pc98#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.post.mk#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/oltr/COPYRIGHT#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/oltr/i386-elf.trlld.o.uu#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/oltr/if_oltr.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/oltr/if_oltr_isa.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/oltr/if_oltr_pci.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/oltr/if_oltrvar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/oltr/trlld.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/oltr/trlldbm.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/oltr/trlldhm.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/oltr/trlldmac.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_asus.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/arl/if_arl.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/arl/if_arl_isa.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/arl/if_arlreg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bm/if_bm.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bm/if_bmreg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bm/if_bmvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cnw/if_cnw.c#3 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cnw/if_cnwioctl.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cnw/if_cnwreg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lmc/if_lmc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lmc/if_lmc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbni/if_sbni.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbni/if_sbni_isa.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbni/if_sbni_pci.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbni/if_sbnireg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbni/if_sbnivar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbsh/if_sbsh.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbsh/if_sbshreg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/daemon/daemon_saver.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_ethersubr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_rrip.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_drive.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/mp_machdep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_alq.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_malloc.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_poll.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_xxx.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_param.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_debug.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/arl/Makefile#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cnw/Makefile#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/oltr/Makefile#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sbni/Makefile#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sbsh/Makefile#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_bridge.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_lagg.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ppp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/netisr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/netisr.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netatalk/ddp_usrreq.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_gre.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/frag6.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipx/ipx_input.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netnatm/natm_proto.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nlm/nlm_advlock.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nlm/nlm_prot_impl.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/NOTES#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/include/bus.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/pc98/busiosubr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/authunix_prot.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/in_cksum.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/in_cksum.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/kernel.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/socketvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/lib/msun/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/lib/msun/test-fmaxmin.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/lib/msun/test-fmaxmin.t#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpio/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpio/config_freebsd.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpio/cpio.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ldd/ldd.1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ldd/ldd.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/bsdtar.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/config_freebsd.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/read.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/write.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/arlcontrol/Makefile#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/arlcontrol/arlcontrol.8#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/arlcontrol/arlcontrol.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/edquota/edquota.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/quot/quot.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/quotaon/quotaon.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/repquota/repquota.c#2 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.144 2008/07/01 21:54:08 danger Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.150 2008/07/04 21:24:35 jhb Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,41 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20080704: sbsh(4) removed
+OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz
+OLD_FILES+=usr/share/man/man4/sbsh.4.gz
+# 20080704: sbni(4) removed
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/share/man/man4/i386/if_sbni.4.gz
+OLD_FILES+=usr/share/man/man4/i386/sbni.4.gz
+.endif
+# 20080704: cnw(4) removed
+OLD_FILES+=usr/share/man/man4/if_cnw.4.gz
+OLD_FILES+=usr/share/man/man4/cnw.4.gz
+# 20080704: oltr(4) removed
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/share/man/man4/i386/if_oltr.4.gz
+OLD_FILES+=usr/share/man/man4/i386/oltr.4.gz
+.endif
+# 20080704: arl(4) removed
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/sbin/arlcontrol
+OLD_FILES+=usr/share/man/man4/i386/arl.4.gz
+OLD_FILES+=usr/share/man/man8/arlcontrol.8.gz
+.endif
+# 20080703: sunlabel only for sparc64
+.if ${TARGET_ARCH} != "sparc64"
+OLD_FILES+=sbin/sunlabel
+OLD_FILES+=usr/share/man/man8/sunlabel.8.gz
+.endif
+# 20080703: bsdlabel & fdisk removed on ia64
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=sbin/bsdlabel
+OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
+OLD_FILES+=usr/share/man/man8/disklabel.8.gz
+OLD_FILES+=sbin/fdisk
+OLD_FILES+=usr/share/man/man8/fdisk.8.gz
+.endif
 # 20080701: wpa_supplicant.conf moved to share/examples/etc/
 OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf
 OLD_DIRS+=usr/share/examples/wpa_supplicant

==== //depot/projects/soc2008/trasz_nfs4acl/TODO#4 (text+ko) ====

@@ -4,6 +4,8 @@
 
 - Add the ability to add ACE at a given position in ACL to setfacl(1),
 
+- Add error checking to acl_to_text_nfs4.c.
+
 - Find out what to do with chmod(1).  Right now, "chmod 600" on file
   which already has mode 0600 does not call chmod(2) at all - and it
   should, as it might cause ACL recomputation.

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ipfw#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ipfw,v 1.17 2008/01/27 15:15:12 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipfw,v 1.18 2008/07/05 15:27:39 mtm Exp $
 #
 
 # PROVIDE: ipfw
@@ -51,7 +51,9 @@
 
 	# Enable the firewall
 	#
-	${SYSCTL_W} net.inet.ip.fw.enable=1
+	if ! ${SYSCTL_W} net.inet.ip.fw.enable=1 1>/dev/null 2>&1; then
+		warn "failed to enable firewall"
+	fi
 }
 
 ipfw_stop()

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/mountcritlocal#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $
+# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.17 2008/07/05 15:19:58 mtm Exp $
 #
 
 # PROVIDE: mountcritlocal
@@ -28,7 +28,7 @@
 	esac
 
 	# Mount everything except nfs filesystems.
-	echo -n 'Mounting local file systems:'
+	[ -z "${rc_quiet}" ] && echo -n 'Mounting local file systems:'
 	mount_excludes='no'
 	for i in ${netfs_types}; do
 		fstype=${i%:*}
@@ -37,7 +37,7 @@
 	mount_excludes=${mount_excludes%,}
 	mount -a -t ${mount_excludes}
 	err=$?
-	echo '.'
+	[ -z "${rc_quiet}" ] && echo '.'
 
 	case ${err} in
 	0)

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/nfsclient#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6 2006/12/31 10:37:18 yar Exp $
+# $FreeBSD: src/etc/rc.d/nfsclient,v 1.7 2008/07/05 15:13:21 mtm Exp $
 #
 
 # PROVIDE: nfsclient
@@ -22,11 +22,15 @@
 	#
 
 	if [ -n "${nfs_access_cache}" ]; then
-		echo "NFS access cache time=${nfs_access_cache}"
-		sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null
+		[ -z "${rc_quiet}" ] && echo "NFS access cache time=${nfs_access_cache}"
+		if ! sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null; then
+			warn "failed to set access cache timeout"
+		fi
 	fi
 	if [ -n "${nfs_bufpackets}" ]; then
-		 sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
+		if ! sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null; then
+			warn "failed to set vfs.nfs.bufpackets"
+		fi
 	fi
 
 	unmount_all

==== //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#3 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.265 2008/06/25 04:56:08 wollman Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.266 2008/07/05 08:54:58 phk Exp $
 %
 =======================================================================
 ||								     ||
@@ -22738,6 +22738,10 @@
 they don't even invite me.
 		-- Dave Barry
 %
+I asked a teacher what the opposite of a miracle was and she, without
+thinking, I assume, said it was an act of God.
+			-- Terry Prachett (Daily Mail 21 june 2008)
+%
 I asked the engineer who designed the communication terminal's keyboards
 why these were not manufactured in a central facility, in view of the
 small number needed [1 per month] in his factory.  He explained that this
@@ -52173,6 +52177,9 @@
 the affair," and of course be sadly disappointed thereby.
 		-- Sacramento Daily Union, November 29, 1861
 %
+Too many of his [Mozarts] works sound like interoffice memos.
+		-- Glenn Gould
+%
 Too many people are thinking of security instead of opportunity.
 They seem more afraid of life than death.
 		-- James F. Byrnes

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive.h#2 (text+ko) ====

@@ -22,7 +22,7 @@
  * (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: src/lib/libarchive/archive.h,v 1.17 2008/06/15 05:05:53 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive.h,v 1.18 2008/07/05 01:50:40 kientzle Exp $
  */
 
 #ifndef ARCHIVE_H_INCLUDED
@@ -112,13 +112,13 @@
  *             (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000)
  * #endif
  */
-#define	ARCHIVE_VERSION_NUMBER 2005004
+#define	ARCHIVE_VERSION_NUMBER 2005005
 __LA_DECL int		archive_version_number(void);
 
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_STRING "libarchive 2.5.4b"
+#define	ARCHIVE_VERSION_STRING "libarchive 2.5.5"
 __LA_DECL const char *	archive_version_string(void);
 
 #if ARCHIVE_VERSION_NUMBER < 3000000

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.26 2008/06/21 19:05:29 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.28 2008/07/05 01:48:33 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -64,9 +64,6 @@
 #ifdef HAVE_LINUX_FS_H
 #include <linux/fs.h>	/* for Linux file flags */
 #endif
-#ifdef HAVE_LINUX_EXT2_FS_H
-#include <linux/ext2_fs.h>	/* for Linux file flags */
-#endif
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
@@ -613,8 +610,8 @@
 	/* Restore metadata. */
 
 	/*
-	 * Look up the "real" UID only if we're going to need it.  We
-	 * need this for TODO_SGID because chown() requires both.
+	 * Look up the "real" UID only if we're going to need it.
+	 * TODO: the TODO_SGID condition can be dropped here, can't it?
 	 */
 	if (a->todo & (TODO_OWNER | TODO_SUID | TODO_SGID)) {
 		a->uid = a->lookup_uid(a->lookup_uid_data,
@@ -622,6 +619,7 @@
 		    archive_entry_uid(a->entry));
 	}
 	/* Look up the "real" GID only if we're going to need it. */
+	/* TODO: the TODO_SUID condition can be dropped here, can't it? */
 	if (a->todo & (TODO_OWNER | TODO_SGID | TODO_SUID)) {
 		a->gid = a->lookup_gid(a->lookup_gid_data,
 		    archive_entry_gname(a->entry),
@@ -1023,7 +1021,10 @@
 			a->deferred |= (a->todo & TODO_TIMES);
 			a->todo &= ~TODO_TIMES;
 			/* Never use an immediate chmod(). */
-			if (mode != final_mode)
+			/* We can't avoid the chmod() entirely if EXTRACT_PERM
+			 * because of SysV SGID inheritance. */
+			if ((mode != final_mode)
+			    || (a->flags & ARCHIVE_EXTRACT_PERM))
 				a->deferred |= (a->todo & TODO_MODE);
 			a->todo &= ~TODO_MODE;
 		}
@@ -1565,8 +1566,8 @@
 /*
  * Note: Although we can skip setting the user id if the desired user
  * id matches the current user, we cannot skip setting the group, as
- * many systems set the gid bit based on the containing directory.  So
- * we have to perform a chown syscall if we want to restore the SGID
+ * many systems set the gid based on the containing directory.  So
+ * we have to perform a chown syscall if we want to set the SGID
  * bit.  (The alternative is to stat() and then possibly chown(); it's
  * more efficient to skip the stat() and just always chown().)  Note
  * that a successful chown() here clears the TODO_SGID_CHECK bit, which

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/config_freebsd.h#3 (text+ko) ====

@@ -22,7 +22,7 @@
  * (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: src/lib/libarchive/config_freebsd.h,v 1.10 2008/06/15 05:12:47 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/config_freebsd.h,v 1.11 2008/07/05 01:50:07 kientzle Exp $
  */
 
 /* FreeBSD 5.0 and later have ACL support. */
@@ -87,8 +87,6 @@
 #define	HAVE_STRING_H 1
 #define	HAVE_STRRCHR 1
 #define	HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
-#define	HAVE_STRUCT_STAT_ST_RDEV 1
-#define	HAVE_STRUCT_TM_TM_GMTOFF 1
 #define	HAVE_SYS_ACL_H 1
 #define	HAVE_SYS_IOCTL_H 1
 #define	HAVE_SYS_SELECT_H 1

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_gtar_1.tgz.uu#2 (text+ko) ====

@@ -1,3 +1,4 @@
+$FreeBSD: src/lib/libarchive/test/test_compat_gtar_1.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
 begin 644 test_compat_gtar_1.tgz
 M'XL(`,N`6T<``^W62PZ",!`&X!YE3@`SI:6Z<R^7\(&*+Q+%>'W+PJB)43=4
 MJO^W:1.Z:#KYATG2)!T5]7Y95/N-Z@:UF)ZO7B9"-TPD[%@4%1W=Y\'IV$P.

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#2 (text+ko) ====

@@ -1,3 +1,4 @@
+$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
 begin 644 test_pax_filename_encoding.tar.gz
 M'XL(`)4;VT<``^V6STK#0!#&<\Y3[!/HS/Z-ASVHEQ1$BE[L<4T6$DP32:-$
 MG\%'\Y%Z,*7$UEJLE"91NK_+P.P>OF'X^&9LZM":V):GYCYZ?YOFQ5W]\NH=

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#2 (text+ko) ====

@@ -1,3 +1,4 @@
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
 begin 644 test_read_format_gtar_sparse_1_13.tgz
 M'XL(`&&";$<``^W72VX;1Q2%X<Y.N($`=>NYD*Q``P\\L&.(\OYSNP/)LGE`
 M!SDF.D#^SP,G94&\7?VS']<O3\_7#]M#E2AE]KZ54F*-\O[O7<W_W:*LUJ)$

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#2 (text+ko) ====

@@ -1,3 +1,4 @@
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
 begin 644 test_read_format_gtar_sparse_1_17.tgz
 M'XL(`&&";$<``^W776X3611%83,33Z"E>^[O0'H$?N"!!V at 4A_GWJ8*$".\V
 MK=Y8U1+KB\#H)L2G;BV77=?/EZ?K^]-#E31[WQYCC?+V<5/SSRG*:BU*1,_U

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#2 (text+ko) ====

@@ -1,3 +1,4 @@
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix00.tgz
 M'XL(`&*";$<``^W9S6[;1A2&8:UU%;Z!RO/#^5MHW:R*;'H!K,,`06L[$&7`
 M[=5W%#FN'(Q-Z1S5K-#W642!E&/3/M\$'\'5]<?^\</0?QHVX\KG&,KU^+7?

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#2 (text+ko) ====

@@ -1,3 +1,4 @@
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix01.tgz
 M'XL(`&*";$<``^W7WVX:1QB&<8ZY"B[`Q?/-OYT]X+3-416IZ at 5L'0ZLQHX%
 MMF3UZKN`';]V&SO21[PB>GXG;,#F`_,,F5F>?QSN/ZR'3^O-=IE:K7:^O1DV

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#2 (text+ko) ====

@@ -1,3 +1,4 @@
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix10.tgz
 M'XL(`&.";$<``^W7RV[;5A1&88WU%'J!RN=^&7B:9E0$*/H`1,*!B]@))`<P
 M\O2A)#O];=@RBJV8$+*^"1G*T=9E'8%G??%AN'L_#I_&S78=6RGQ8OMUV&S'

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#2 (text+ko) ====

@@ -1,3 +1,4 @@
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix10_modified.tar
 M+B]087A(96%D97)S+C,X-C8S+W-P87)S90``````````````````````````
 M````````````````````````````````````````````````````````````

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu#2 (text+ko) ====

@@ -1,3 +1,4 @@
+$FreeBSD: src/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
 begin 644 test_compat_tar_1.tar
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.5 (Berkeley) 3/31/94
-# $FreeBSD: src/sbin/Makefile,v 1.170 2008/06/09 16:42:55 marcel Exp $
+# $FreeBSD: src/sbin/Makefile,v 1.172 2008/07/04 04:33:33 marcel Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,7 @@
 	atacontrol \
 	${_atm} \
 	badsect \
-	bsdlabel \
+	${_bsdlabel} \
 	camcontrol \
 	ccdconfig \
 	clri \
@@ -85,7 +85,7 @@
 	slattach \
 	spppcontrol \
 	startslip \
-	sunlabel \
+	${_sunlabel} \
 	swapon \
 	sysctl \
 	tunefs \
@@ -113,6 +113,10 @@
 _rtsol=		rtsol
 .endif
 
+.if ${MACHINE_ARCH} != "ia64"
+_bsdlabel=	bsdlabel
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 .if ${MACHINE} == "i386"
 _fdisk=		fdisk
@@ -131,8 +135,11 @@
 .endif
 
 .if ${MACHINE_ARCH} == "ia64"
-_fdisk=		fdisk
 _mca=		mca
 .endif
 
+.if ${MACHINE_ARCH} == "sparc64"
+_sunlabel=	sunlabel
+.endif
+
 .include <bsd.subdir.mk>

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sbin/geom/Makefile,v 1.5 2008/06/05 15:24:10 marcel Exp $
+# $FreeBSD: src/sbin/geom/Makefile,v 1.6 2008/07/03 19:40:59 marcel Exp $
 
 .if defined(RESCUE) || defined(RELEASE_CRUNCH)
 
@@ -9,6 +9,7 @@
 
 PROG=	geom
 SRCS=	geom.c geom_label.c geom_part.c subr.c
+NO_MAN=
 
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES
 

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/quotacheck/preen.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/quotacheck/preen.c,v 1.27 2008/01/26 12:03:26 mpp Exp $
+ * $FreeBSD: src/sbin/quotacheck/preen.c,v 1.28 2008/07/02 15:51:59 des Exp $
  */
 
 #include <sys/cdefs.h>
@@ -57,17 +57,17 @@
 
 struct partentry {
 	TAILQ_ENTRY(partentry)	 p_entries;
-	char		  	*p_devname;	/* device name */
+	char			*p_devname;	/* device name */
 	char			*p_mntpt;	/* mount point */
-	char		  	*p_type;	/* file system type */
+	char			*p_type;	/* file system type */
 	struct quotaname	*p_quota;	/* quota file info ptr */
 };
 
 TAILQ_HEAD(part, partentry) badh;
 
 struct diskentry {
-	TAILQ_ENTRY(diskentry) 	    d_entries;
-	char		       	   *d_name;	/* disk base name */
+	TAILQ_ENTRY(diskentry)	    d_entries;
+	char			   *d_name;	/* disk base name */
 	TAILQ_HEAD(prt, partentry)  d_part;	/* list of partitions on disk */
 	int			    d_pid;	/* 0 or pid of fsck proc */
 };
@@ -82,7 +82,7 @@
 extern char *estrdup(const char *);
 
 int
-checkfstab()
+checkfstab(void)
 {
 	struct fstab *fs;
 	struct diskentry *d, *nextdisk;
@@ -120,7 +120,7 @@
 				if (sumstatus)
 					return (sumstatus);
 				continue;
-			} 
+			}
 			if (name == NULL) {
 				(void) fprintf(stderr,
 				    "BAD DISK NAME %s\n", fs->fs_spec);
@@ -139,7 +139,7 @@
 		}
 
 		while ((pid = wait(&status)) != -1) {
-			TAILQ_FOREACH(d, &diskh, d_entries) 
+			TAILQ_FOREACH(d, &diskh, d_entries)
 				if (d->d_pid == pid)
 					break;
 
@@ -226,7 +226,7 @@
 	if (len == 0)
 		len = strlen(name);
 
-	TAILQ_FOREACH(d, &diskh, d_entries) 
+	TAILQ_FOREACH(d, &diskh, d_entries)
 		if (strncmp(d->d_name, name, len) == 0 && d->d_name[len] == 0)
 			return d;
 

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/quotacheck/quotacheck.c#2 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.35 2008/01/26 12:03:26 mpp Exp $");
+__FBSDID("$FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.36 2008/07/02 15:51:59 des Exp $");
 
 /*
  * Fix up / report on disk quotas & usage
@@ -133,9 +133,7 @@
 void	 usage(void);
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	struct fstab *fs;
 	struct passwd *pw;
@@ -216,17 +214,16 @@
 }
 
 void
-usage()
+usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n", 
+	(void)fprintf(stderr, "%s\n%s\n",
 		"usage: quotacheck [-guv] [-l maxrun] -a",
 		"       quotacheck [-guv] filesystem ...");
 	exit(1);
 }
 
 struct quotaname *
-needchk(fs)
-	struct fstab *fs;
+needchk(struct fstab *fs)
 {
 	struct quotaname *qnp;
 	char *qfnp;
@@ -260,9 +257,7 @@
  * Scan the specified file system to check quota(s) present on it.
  */
 int
-chkquota(fsname, mntpt, qnp)
-	char *fsname, *mntpt;
-	struct quotaname *qnp;
+chkquota(char *fsname, char *mntpt, struct quotaname *qnp)
 {
 	struct fileusage *fup;
 	union dinode *dp;
@@ -363,7 +358,7 @@
 			 * to be negative to prevent generating 100GB+
 			 * quota files.
 			 */
-			if ((int)DIP(dp, di_uid) < 0 || 
+			if ((int)DIP(dp, di_uid) < 0 ||
 			    (int)DIP(dp, di_gid) < 0) {
 				if (vflag) {
 					if (aflag)
@@ -375,7 +370,7 @@
 				continue;
 			}
 
-			/* 
+			/*
 			 * Do not account for file system snapshot files
 			 * or the actual quota data files to be consistent
 			 * with how they are handled inside the kernel.
@@ -419,9 +414,7 @@
  * Update a specified quota file.
  */
 int
-update(fsname, quotafile, type)
-	char *fsname, *quotafile;
-	int type;
+update(char *fsname, char *quotafile, int type)
 {
 	struct fileusage *fup;
 	FILE *qfi, *qfo;
@@ -475,7 +468,7 @@
 		lastid = (sb.st_size / sizeof(struct dqblk)) - 1;
 	else
 		lastid = 0;
-	for (id = 0, offset = 0; id <= lastid; 
+	for (id = 0, offset = 0; id <= lastid;
 	    id++, offset += sizeof(struct dqblk)) {
 		if (fread((char *)&dqbuf, sizeof(struct dqblk), 1, qfi) == 0)
 			dqbuf = zerodqbuf;
@@ -542,7 +535,7 @@
 			}
 			fwrite((char *)&dqbuf, sizeof(struct dqblk), 1, qfo);
 			(void) quotactl(fsname, QCMD(Q_SETUSE, type), id,
-		    	    (caddr_t)&dqbuf);
+			    (caddr_t)&dqbuf);
 			fup->fu_curinodes = 0;
 			fup->fu_curblocks = 0;
 		}
@@ -559,9 +552,7 @@
  * Check to see if target appears in list of size cnt.
  */
 int
-oneof(target, list, cnt)
-	char *target, *list[];
-	int cnt;
+oneof(char *target, char *list[], int cnt)
 {
 	int i;
 
@@ -575,7 +566,7 @@
  * Determine the group identifier for quota files.
  */
 int
-getquotagid()
+getquotagid(void)
 {
 	struct group *gr;
 
@@ -588,10 +579,7 @@
  * Check to see if a particular quota is to be enabled.
  */
 int
-hasquota(fs, type, qfnamep)
-	struct fstab *fs;
-	int type;
-	char **qfnamep;
+hasquota(struct fstab *fs, int type, char **qfnamep)
 {
 	char *opt;
 	char *cp;
@@ -642,9 +630,7 @@
  * Lookup an id of a specific type.
  */
 struct fileusage *
-lookup(id, type)
-	u_long id;
-	int type;
+lookup(u_long id, int type)
 {
 	struct fileusage *fup;
 
@@ -658,11 +644,7 @@
  * Add a new file usage id if it does not already exist.
  */
 struct fileusage *
-addid(id, type, name, fsname)
-	u_long id;
-	int type;
-	char *name;
-	char *fsname;
+addid(u_long id, int type, char *name, char *fsname)
 {
 	struct fileusage *fup, **fhp;
 	int len;
@@ -686,7 +668,7 @@
 		if (vflag) {
 			if (aflag && fsname != NULL)
 				(void)printf("%s: ", fsname);
-			printf("unknown %cid: %lu\n", 
+			printf("unknown %cid: %lu\n",
 			    type == USRQUOTA ? 'u' : 'g', id);
 		}
 	}
@@ -773,7 +755,7 @@
  * Free up data structures used to scan inodes.
  */
 void
-freeinodebuf()
+freeinodebuf(void)
 {
 
 	if (inodebuf != NULL)
@@ -785,10 +767,7 @@
  * Read specified disk blocks.
  */
 void
-bread(bno, buf, cnt)
-	ufs2_daddr_t bno;
-	char *buf;
-	long cnt;
+bread(ufs2_daddr_t bno, char *buf, long cnt)
 {
 
 	if (lseek(fi, (off_t)bno * dev_bsize, SEEK_SET) < 0 ||
@@ -800,12 +779,8 @@
  * Display updated block and i-node counts.
  */
 void
-printchanges(fsname, type, dp, fup, id)
-	char *fsname;
-	int type;
-	struct dqblk *dp;
-	struct fileusage *fup;
-	u_long id;
+printchanges(char *fsname, int type, struct dqblk *dp,
+    struct fileusage *fup, u_long id)
 {
 	if (!vflag)
 		return;
@@ -833,7 +808,7 @@
 		(void)printf("\tinodes %lu -> %lu", (u_long)dp->dqb_curinodes,
 		    (u_long)fup->fu_curinodes);
 	if (dp->dqb_curblocks != fup->fu_curblocks)
-		(void)printf("\tblocks %lu -> %lu", 
+		(void)printf("\tblocks %lu -> %lu",
 		    (u_long)dp->dqb_curblocks,
 		    (u_long)fup->fu_curblocks);
 	(void)printf("\n");

==== //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/bdes/bdes.ps#2 (text+ko) ====

@@ -9,6 +9,7 @@
 %
 % Known Problems:
 %	Due to bugs in Transcript, the 'PS-Adobe-' is omitted from line 1
+% $FreeBSD: src/secure/usr.bin/bdes/bdes.ps,v 1.3 2008/07/03 03:36:58 peter Exp $
 /FMversion (2.0) def 
 % Set up Color vs. Black-and-White
 	/FMPrintInColor systemdict /colorimage known def

==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.419 2008/05/27 02:18:17 yongari Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.421 2008/07/04 21:24:35 jhb Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
@@ -50,7 +50,6 @@
 	ciss.4 \
 	cm.4 \
 	cmx.4 \
-	cnw.4 \
 	coda.4 \
 	${_coretemp.4} \
 	cpufreq.4 \
@@ -293,7 +292,6 @@
 	safe.4 \
 	sbp.4 \
 	sbp_targ.4 \
-	sbsh.4 \
 	scc.4 \
 	sched_4bsd.4 \
 	sched_ule.4 \
@@ -442,7 +440,6 @@
 MLINKS+=bfe.4 if_bfe.4
 MLINKS+=bge.4 if_bge.4
 MLINKS+=bktr.4 brooktree.4
-MLINKS+=cnw.4 if_cnw.4
 MLINKS+=crypto.4 cryptodev.4
 MLINKS+=cue.4 if_cue.4
 MLINKS+=dc.4 if_dc.4
@@ -507,7 +504,6 @@
 MLINKS+=rl.4 if_rl.4
 MLINKS+=rue.4 if_rue.4
 MLINKS+=rum.4 if_rum.4
-MLINKS+=sbsh.4 if_sbsh.4
 MLINKS+=scsi.4 CAM.4 \
 	scsi.4 cam.4 \
 	scsi.4 scbus.4 \

==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.185 2007/03/30 21:19:10 takawata Exp $
+# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.188 2008/07/04 21:06:57 jhb Exp $
 
 MAN=	acpi_aiboost.4 \
 	acpi_asus.4 \
@@ -12,7 +12,6 @@
 	amdpm.4 \
 	apm.4 \
 	ar.4 \
-	arl.4 \
 	ce.4 \
 	cp.4 \
 	CPU_ELAN.4 \
@@ -32,7 +31,6 @@
 	mse.4 \
 	ndis.4 \
 	npx.4 \
-	oltr.4 \
 	padlock.4 \
 	pae.4 \
 	pbio.4 \
@@ -41,7 +39,6 @@
 	pnp.4 \
 	pnpbios.4 \
 	ray.4 \
-	sbni.4 \
 	scd.4 \
 	smapi.4 \
 	snc.4 \
@@ -55,9 +52,7 @@
 
 MLINKS=	CPU_ELAN.4 CPU_SOEKRIS.4
 MLINKS+=ndis.4 if_ndis.4
-MLINKS+=oltr.4 if_oltr.4
 MLINKS+=pae.4 PAE.4
-MLINKS+=sbni.4 if_sbni.4
 
 MANSUBDIR=/i386
 

==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.powerpc/Makefile#2 (text+ko) ====

@@ -1,6 +1,7 @@
-# $FreeBSD: src/share/man/man4/man4.powerpc/Makefile,v 1.1 2006/08/01 22:19:00 sobomax Exp $
+# $FreeBSD: src/share/man/man4/man4.powerpc/Makefile,v 1.2 2008/07/04 14:51:42 nwhitehorn Exp $
 
-MAN=	powermac_nvram.4
+MAN=	bm.4 \
+	powermac_nvram.4
 
 MANSUBDIR=/powerpc
 

==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_emu10kx.4#3 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/snd_emu10kx.4,v 1.6 2008/05/28 05:46:04 keramida Exp $
+.\" $FreeBSD: src/share/man/man4/snd_emu10kx.4,v 1.7 2008/07/03 16:48:35 danger Exp $
 .\"
 .Dd May 28, 2008
 .Dt SND_EMU10KX 4
@@ -143,7 +143,7 @@
 the sound subsystem does not support such an amount of PCM channels.
 This device can not be opened for read, thus confusing many applications.
 .Pp
-Within a multichannel stream , thefirst half (0-15 or 0-31) is a copy of all DSP

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list