Date: Tue, 15 Mar 2005 00:33:43 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 73153 for review Message-ID: <200503150033.j2F0XhmM005437@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=73153 Change 73153 by peter@peter_daintree on 2005/03/15 00:33:33 IFC @73152 Affected files ... .. //depot/projects/hammer/MAINTAINERS#31 integrate .. //depot/projects/hammer/bin/pax/ar_io.c#7 integrate .. //depot/projects/hammer/contrib/top/top.X#5 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#50 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#33 integrate .. //depot/projects/hammer/etc/rc.d/lomac#5 delete .. //depot/projects/hammer/etc/syslog.conf#8 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#41 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#19 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#19 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#10 integrate .. //depot/projects/hammer/lib/libbsnmp/Makefile#3 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/Makefile#4 delete .. //depot/projects/hammer/lib/libbsnmp/modules/Makefile.inc#6 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_atm/Makefile#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_atm/atm_freebsd.def#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_atm/atm_sys.c#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_mibII/Makefile#5 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#3 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/Makefile#5 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.def#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#8 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#5 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.h#2 delete .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#87 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#23 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#15 integrate .. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#10 integrate .. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#8 integrate .. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#6 integrate .. //depot/projects/hammer/sbin/geom/class/label/glabel.8#9 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#7 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#8 integrate .. //depot/projects/hammer/sbin/geom/class/nop/geom_nop.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#10 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#10 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#8 integrate .. //depot/projects/hammer/sbin/geom/class/shsec/geom_shsec.c#4 integrate .. //depot/projects/hammer/sbin/geom/class/shsec/gshsec.8#5 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#11 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#13 integrate .. //depot/projects/hammer/sbin/geom/core/geom.8#11 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#7 integrate .. //depot/projects/hammer/sbin/geom/core/geom.h#2 integrate .. //depot/projects/hammer/share/man/man4/altq.4#8 integrate .. //depot/projects/hammer/share/man/man4/ng_ccatm.4#2 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#51 integrate .. //depot/projects/hammer/share/man/man9/VFS_VGET.9#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#18 integrate .. //depot/projects/hammer/sys/alpha/include/bus.h#16 integrate .. //depot/projects/hammer/sys/alpha/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#33 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#65 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#16 integrate .. //depot/projects/hammer/sys/arm/include/bus.h#7 integrate .. //depot/projects/hammer/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/hammer/sys/coda/cnode.h#7 integrate .. //depot/projects/hammer/sys/coda/coda_subr.c#9 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#16 integrate .. //depot/projects/hammer/sys/conf/NOTES#83 integrate .. //depot/projects/hammer/sys/conf/files#107 integrate .. //depot/projects/hammer/sys/conf/files.amd64#64 integrate .. //depot/projects/hammer/sys/conf/files.i386#53 integrate .. //depot/projects/hammer/sys/conf/options#70 integrate .. //depot/projects/hammer/sys/contrib/dev/nve/adapter.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/basetype.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/drvinfo.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/os.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/nve/phy.h#1 branch .. //depot/projects/hammer/sys/dev/amr/amr.c#19 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#42 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#22 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#15 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#1 branch .. //depot/projects/hammer/sys/dev/nve/if_nvereg.h#1 branch .. //depot/projects/hammer/sys/dev/re/if_re.c#24 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#56 integrate .. //depot/projects/hammer/sys/fs/deadfs/dead_vnops.c#12 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#29 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#14 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#29 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs.h#6 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_hash.c#6 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#17 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/msdosfs/denode.h#9 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#10 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#18 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#31 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#10 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#11 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_io.c#14 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#12 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.c#9 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_fileno.c#4 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#12 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#15 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#17 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#22 integrate .. //depot/projects/hammer/sys/fs/udf/udf.h#9 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#18 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#23 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#23 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#22 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_extern.h#7 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_ihash.c#6 delete .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_inode.c#12 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#27 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#23 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#34 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#12 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#26 integrate .. //depot/projects/hammer/sys/i386/include/bus_dma.h#12 integrate .. //depot/projects/hammer/sys/ia64/include/bus.h#14 integrate .. //depot/projects/hammer/sys/ia64/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_node.c#11 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_node.h#7 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#27 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#19 integrate .. //depot/projects/hammer/sys/isofs/cd9660/iso.h#7 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#42 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#43 integrate .. //depot/projects/hammer/sys/kern/subr_unit.c#5 integrate .. //depot/projects/hammer/sys/kern/tty.c#43 integrate .. //depot/projects/hammer/sys/kern/uipc_accf.c#8 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#54 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#34 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_hash.c#1 branch .. //depot/projects/hammer/sys/kern/vfs_subr.c#76 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#43 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#31 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#16 integrate .. //depot/projects/hammer/sys/modules/Makefile#70 integrate .. //depot/projects/hammer/sys/modules/ext2fs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/nve/Makefile#1 branch .. //depot/projects/hammer/sys/modules/pseudofs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ufs/Makefile#3 integrate .. //depot/projects/hammer/sys/net/if.c#42 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#18 integrate .. //depot/projects/hammer/sys/netgraph/ng_etf.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#17 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#21 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#27 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#18 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#32 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#22 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#38 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#18 integrate .. //depot/projects/hammer/sys/powerpc/include/bus.h#11 integrate .. //depot/projects/hammer/sys/powerpc/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/sparc64/include/bus.h#18 integrate .. //depot/projects/hammer/sys/sparc64/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/sys/bus_dma.h#1 branch .. //depot/projects/hammer/sys/sys/socketvar.h#28 integrate .. //depot/projects/hammer/sys/sys/vnode.h#48 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#15 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#35 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#25 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#45 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#33 integrate .. //depot/projects/hammer/sys/ufs/ufs/inode.h#11 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extern.h#10 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_ihash.c#9 delete .. //depot/projects/hammer/sys/ufs/ufs/ufs_inode.c#14 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vfsops.c#10 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#33 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#32 integrate .. //depot/projects/hammer/tools/sched/schedgraph.py#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/Makefile#7 integrate .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#10 integrate .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#11 integrate .. //depot/projects/hammer/usr.bin/make/suff.c#16 integrate .. //depot/projects/hammer/usr.bin/make/var.c#23 integrate .. //depot/projects/hammer/usr.bin/quota/quota.c#5 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#10 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile.am#2 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#16 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#22 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#12 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#7 integrate .. //depot/projects/hammer/usr.bin/tar/configure.ac.in#3 integrate .. //depot/projects/hammer/usr.bin/tar/getdate.y#1 branch .. //depot/projects/hammer/usr.bin/tar/matching.c#9 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#13 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#13 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile.inc#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_atm/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def#1 branch .. //depot/projects/hammer/usr.sbin/tcpdrop/tcpdrop.8#2 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#31 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.102 2004/12/29 03:49:58 gad Exp $ +$FreeBSD: src/MAINTAINERS,v 1.103 2005/03/13 15:30:01 pjd Exp $ subsystem login notes ----------------------------- @@ -98,6 +98,7 @@ geom_mirror pjd Pre-commit review preferred. geom_nop pjd Pre-commit review preferred. geom_raid3 pjd Pre-commit review preferred. +geom_shsec pjd Pre-commit review preferred. geom_stripe pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. nfs alfred Will be happy to review code, but not mandatory. ==== //depot/projects/hammer/bin/pax/ar_io.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.25 2004/06/25 05:27:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.26 2005/03/12 06:38:01 obrien Exp $"); #include <sys/types.h> #include <sys/ioctl.h> @@ -301,6 +301,7 @@ void ar_close(void) { + int status; if (arfd < 0) { did_io = io_ok = flcnt = 0; @@ -336,14 +337,15 @@ * for a quick extract/list, pax frequently exits before the child * process is done */ - if ((act == LIST || act == EXTRACT) && nflag && zpid > 0) { - int status; + if ((act == LIST || act == EXTRACT) && nflag && zpid > 0) kill(zpid, SIGINT); - waitpid(zpid, &status, 0); - } (void)close(arfd); + /* Do not exit before child to ensure data integrity */ + if (zpid > 0) + waitpid(zpid, &status, 0); + if (vflag && (artyp == ISTAPE)) { (void)fputs("done.\n", listf); vfpart = 0; ==== //depot/projects/hammer/contrib/top/top.X#5 (text+ko) ==== @@ -1,6 +1,6 @@ .\" NOTE: changes to the manual page for "top" should be made in the .\" file "top.X" and NOT in the file "top.1". -.\" $FreeBSD: src/contrib/top/top.X,v 1.11 2004/07/12 03:00:50 alfred Exp $ +.\" $FreeBSD: src/contrib/top/top.X,v 1.12 2005/03/13 13:37:02 brueffer Exp $ .nr N %topn% .nr D %delay% .TH TOP 1 Local @@ -262,7 +262,7 @@ .TP .B i (or -.BR I) +.BR I ) Toggle the display of idle processes. .TP .B t ==== //depot/projects/hammer/etc/defaults/rc.conf#50 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.242 2005/03/02 02:46:47 brooks Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.243 2005/03/12 21:09:15 trhodes Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -456,7 +456,6 @@ # a.out shared library search paths kern_securelevel_enable="NO" # kernel security level (see init(8)), kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure -lomac_enable="NO" # start lomac(4) security module at boot update_motd="YES" # update version info in /etc/motd (or NO) unaligned_print="YES" # print unaligned access warnings on the alpha (or NO). entropy_file="/entropy" # Set to NO to disable caching entropy through reboots. ==== //depot/projects/hammer/etc/rc.d/Makefile#33 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.49 2005/03/02 00:40:55 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.50 2005/03/13 08:07:11 dougb Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -18,7 +18,7 @@ ipnat ipsec ipxrouted isdnd \ jail \ kadmind kerberos keyserv kldxref kpasswdd \ - ldconfig local localpkg lomac lpd \ + ldconfig local localpkg lpd \ mixer motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ ==== //depot/projects/hammer/etc/syslog.conf#8 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/etc/syslog.conf,v 1.27 2005/02/22 08:03:09 glebius Exp $ +# $FreeBSD: src/etc/syslog.conf,v 1.28 2005/03/12 12:31:16 glebius Exp $ # # Spaces ARE valid field separators in this file. However, # other *nix-like systems still insist on using tabs as field # separators. If you are sharing this file between systems, you # may want to use only tabs as field separators here. # Consult the syslog.conf(5) manpage. -*.err;kern.debug;auth.notice;mail.crit /dev/console -*.notice;authpriv.none;kern.warning;lpr.info;mail.crit;news.err /var/log/messages +*.err;kern.warning;auth.notice;mail.crit /dev/console +*.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err /var/log/messages security.* /var/log/security auth.info;authpriv.info /var/log/auth.log mail.info /var/log/maillog ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#41 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.170 2005/03/07 06:05:14 yar Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.172 2005/03/14 21:50:25 philip Exp $ % ======================================================================= @@ -6669,8 +6669,6 @@ with two perfectly good legs who has never learned to walk. -- Franklin D. Roosevelt % -A conservative is one who is too cowardly to fight and too fat to run. -% A consultant is a person who borrows your watch, tells you what time it is, pockets the watch, and sends you a bill for it. % @@ -13267,7 +13265,7 @@ discovers something which either abolishes the system or expands it beyond recognition. % -Brooks's Law: +Brooks' Law: Adding manpower to a late software project makes it later % Brucify, v: @@ -14814,8 +14812,6 @@ Conscience is the inner voice that warns us somebody may be looking. -- H. L. Mencken, "A Mencken Chrestomathy" % -Conscience is what hurts when everything else feels so good. -% Conscious is when you are aware of something and conscience is when you wish you weren't. % @@ -15506,7 +15502,7 @@ Only it doesn't leave you much time to think about anything else. % -Death rays don't kill people, people kill people!! +Death rays don't kill people, people kill people! % Death to all fanatics! % @@ -38624,6 +38620,9 @@ Public office is the last refuge of a scoundrel. -- Boies Penrose % +Patience is long forgotten by convenience in this life. + -- Carmen Caicedo Giraudy +% Patriotism is the virtue of the vicious. -- Oscar Wilde % @@ -40079,13 +40078,13 @@ Q: How many tech writers does it take to change a lightbulb? A: None. The user can figure it out. % -Q: How many Harvard MBA's does it take to screw in a lightbulb? +Q: How many Harvard MBAs does it take to screw in a lightbulb? A: Just one. He grasps it firmly and the universe revolves around him. % -Q: How many IBM 370's does it take to execute a job? +Q: How many IBM 370s does it take to execute a job? A: Four, three to hold it down, and one to rip its head off. % -Q: How many IBM CPU's does it take to do a logical right shift? +Q: How many IBM CPUs does it take to do a logical right shift? A: 33. 1 to hold the bits and 32 to push the register. % Q: How many IBM types does it take to change a light bulb? ==== //depot/projects/hammer/lib/libarchive/Makefile#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.30 2005/02/13 23:29:54 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.31 2005/03/13 02:53:42 kientzle Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -7,7 +7,7 @@ LIB= archive -VERSION= 1.02.006 +VERSION= 1.02.013 ARCHIVE_API_FEATURE= 2 ARCHIVE_API_VERSION= 1 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} ==== //depot/projects/hammer/lib/libarchive/archive_entry.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.24 2004/12/11 07:11:42 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.25 2005/03/13 02:53:42 kientzle Exp $"); #include <sys/stat.h> #include <sys/types.h> @@ -598,6 +598,12 @@ } void +archive_entry_copy_pathname(struct archive_entry *entry, const char *name) +{ + aes_copy_mbs(&entry->ae_pathname, name); +} + +void archive_entry_copy_pathname_w(struct archive_entry *entry, const wchar_t *name) { aes_copy_wcs(&entry->ae_pathname, name); ==== //depot/projects/hammer/lib/libarchive/archive_entry.h#11 (text+ko) ==== @@ -23,7 +23,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_entry.h,v 1.12 2004/08/08 07:39:19 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.13 2005/03/13 02:53:42 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -112,6 +112,7 @@ void archive_entry_set_mode(struct archive_entry *, mode_t); void archive_entry_set_mtime(struct archive_entry *, time_t, long); void archive_entry_set_pathname(struct archive_entry *, const char *); +void archive_entry_copy_pathname(struct archive_entry *, const char *); void archive_entry_copy_pathname_w(struct archive_entry *, const wchar_t *); void archive_entry_set_rdevmajor(struct archive_entry *, dev_t); void archive_entry_set_rdevminor(struct archive_entry *, dev_t); ==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.36 2004/11/05 05:16:40 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.37 2005/03/13 02:53:42 kientzle Exp $"); #include <sys/types.h> #ifdef HAVE_SYS_ACL_H @@ -125,11 +125,11 @@ static unsigned int hash(const char *); static gid_t lookup_gid(struct archive *, const char *uname, gid_t); static uid_t lookup_uid(struct archive *, const char *uname, uid_t); +static int create_dir(struct archive *, const char *, int flags); +static int create_dir_mutable(struct archive *, char *, int flags); +static int create_dir_recursive(struct archive *, char *, int flags); static int create_parent_dir(struct archive *, const char *, int flags); -static int create_parent_dir_internal(struct archive *, char *, - int flags); -static int create_parent_dir_recursive(struct archive *, char *, - int flags); +static int create_parent_dir_mutable(struct archive *, char *, int flags); static int restore_metadata(struct archive *, struct archive_entry *, int flags); #ifdef HAVE_POSIX_ACL @@ -164,6 +164,7 @@ struct extract *extract; int ret; int restore_pwd; + char *original_filename; if (a->extract == NULL) { a->extract = malloc(sizeof(*a->extract)); @@ -180,16 +181,53 @@ extract->pst = NULL; extract->current_fixup = NULL; restore_pwd = -1; + original_filename = NULL; /* - * TODO: If pathname is longer than PATH_MAX, record starting - * directory and move to a suitable intermediate dir, which - * might require creating them! + * If pathname is longer than PATH_MAX, record starting directory + * and move to a suitable intermediate dir. */ if (strlen(archive_entry_pathname(entry)) > PATH_MAX) { + /* + * Yes, the copy here is necessary because we edit + * the pathname in-place to create intermediate dirnames. + */ + original_filename = strdup(archive_entry_pathname(entry)); + char *intdir, *tail; + restore_pwd = open(".", O_RDONLY); - /* XXX chdir() to a suitable intermediate dir XXX */ - /* XXX Update pathname in 'entry' XXX */ + /* + * "intdir" points to the initial dir section we're going + * to remove, "tail" points to the remainder of the path. + */ + intdir = tail = original_filename; + while (strlen(tail) > PATH_MAX) { + intdir = tail; + tail = intdir + PATH_MAX - 8; + while (tail > intdir && *tail != '/') + tail--; + if (tail <= intdir) { + close(restore_pwd); + archive_set_error(a, EPERM, + "Path element too long"); + return (ARCHIVE_WARN); + } + *tail = '\0'; /* Terminate dir portion */ + if (create_dir(a, intdir, flags) != ARCHIVE_OK) { + fchdir(restore_pwd); + close(restore_pwd); + return (ARCHIVE_WARN); + } + if (chdir(intdir) != 0) { + archive_set_error(a, errno, "Couldn't chdir"); + fchdir(restore_pwd); + close(restore_pwd); + return (ARCHIVE_WARN); + } + *tail = '/'; /* Restore the / we removed. */ + tail++; + } + archive_entry_set_pathname(entry, tail); } if (stat(archive_entry_pathname(entry), &extract->st) == 0) @@ -229,8 +267,11 @@ } /* If we changed directory above, restore it here. */ - if (restore_pwd >= 0) + if (restore_pwd >= 0 && original_filename != NULL) { fchdir(restore_pwd); + archive_entry_copy_pathname(entry, original_filename); + free(original_filename); + } return (ret); } @@ -364,6 +405,9 @@ /* * Returns a new, initialized fixup entry. + * + * TODO: Reduce the memory requirements for this list by using a tree + * structure rather than a simple list of names. */ static struct fixup_entry * new_fixup(struct archive *a, const char *pathname) @@ -496,7 +540,7 @@ unlink(path); } else { /* Doesn't already exist; try building the parent path. */ - if (create_parent_dir_internal(a, path, flags) != ARCHIVE_OK) + if (create_parent_dir_mutable(a, path, flags) != ARCHIVE_OK) return (ARCHIVE_WARN); } @@ -533,27 +577,36 @@ static int create_parent_dir(struct archive *a, const char *path, int flags) { - struct extract *extract; int r; - extract = a->extract; + /* Copy path to mutable storage. */ + archive_strcpy(&(a->extract->create_parent_dir), path); + r = create_parent_dir_mutable(a, a->extract->create_parent_dir.s, flags); + return (r); +} +/* + * Like create_parent_dir, but creates the dir actually requested, not + * the parent. + */ +static int +create_dir(struct archive *a, const char *path, int flags) +{ + int r; /* Copy path to mutable storage. */ - archive_strcpy(&(extract->create_parent_dir), path); - - r = create_parent_dir_internal(a, extract->create_parent_dir.s, flags); + archive_strcpy(&(a->extract->create_parent_dir), path); + r = create_dir_mutable(a, a->extract->create_parent_dir.s, flags); return (r); } /* - * Handle remaining setup for create_parent_dir_recursive(), assuming - * path is already in mutable storage. + * Create the parent directory of the specified path, assuming path + * is already in mutable storage. */ static int -create_parent_dir_internal(struct archive *a, char *path, int flags) +create_parent_dir_mutable(struct archive *a, char *path, int flags) { char *slash; - mode_t old_umask; int r; /* Remove tail element to obtain parent name. */ @@ -561,10 +614,24 @@ if (slash == NULL) return (ARCHIVE_OK); *slash = '\0'; + r = create_dir_mutable(a, path, flags); + *slash = '/'; + return (r); +} + +/* + * Create the specified dir, assuming path is already in + * mutable storage. + */ +static int +create_dir_mutable(struct archive *a, char *path, int flags) +{ + mode_t old_umask; + int r; + old_umask = umask(~SECURE_DIR_MODE); - r = create_parent_dir_recursive(a, path, flags); + r = create_dir_recursive(a, path, flags); umask(old_umask); - *slash = '/'; return (r); } @@ -575,7 +642,7 @@ * Otherwise, returns ARCHIVE_WARN. */ static int -create_parent_dir_recursive(struct archive *a, char *path, int flags) +create_dir_recursive(struct archive *a, char *path, int flags) { struct stat st; struct extract *extract; @@ -600,7 +667,7 @@ /* Don't bother trying to create null path, '.', or '..'. */ if (slash != NULL) { *slash = '\0'; - r = create_parent_dir_recursive(a, path, flags); + r = create_dir_recursive(a, path, flags); *slash = '/'; return (r); } @@ -632,7 +699,7 @@ return (ARCHIVE_WARN); } else if (slash != NULL) { *slash = '\0'; - r = create_parent_dir_recursive(a, path, flags); + r = create_dir_recursive(a, path, flags); *slash = '/'; if (r != ARCHIVE_OK) return (r); @@ -1011,9 +1078,12 @@ le = current_fixup(a, archive_entry_pathname(entry)); le->fixup |= FIXUP_FFLAGS; le->fflags_set = set; + /* Store the mode if it's not already there. */ + if ((le->fixup & FIXUP_MODE) == 0) + le->mode = mode; } else { r = set_fflags(a, archive_entry_pathname(entry), - archive_entry_mode(entry), set, clear); + mode, set, clear); if (r != ARCHIVE_OK) return (r); } ==== //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.7 2005/02/12 22:44:50 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.8 2005/03/13 01:51:16 kientzle Exp $"); #include <sys/stat.h> #include <errno.h> @@ -99,8 +99,11 @@ /* Remember mode so close can decide whether to flush. */ mine->st_mode = st.st_mode; } else { - archive_set_error(a, errno, "Can't stat '%s'", - mine->filename); + if (mine->filename[0] == '\0') + archive_set_error(a, errno, "Can't stat stdin"); + else + archive_set_error(a, errno, "Can't stat '%s'", + mine->filename); return (ARCHIVE_FATAL); } return (0); @@ -110,10 +113,19 @@ file_read(struct archive *a, void *client_data, const void **buff) { struct read_file_data *mine = client_data; + ssize_t bytes_read; (void)a; /* UNUSED */ *buff = mine->buffer; - return (read(mine->fd, mine->buffer, mine->block_size)); + bytes_read = read(mine->fd, mine->buffer, mine->block_size); + if (bytes_read < 0) { + if (mine->filename[0] == '\0') + archive_set_error(a, errno, "Error reading stdin"); + else + archive_set_error(a, errno, "Error reading '%s'", + mine->filename); + } + return (bytes_read); } static int ==== //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.8 2005/03/02 05:34:05 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.9 2005/03/13 01:48:33 kientzle Exp $"); #include <errno.h> @@ -512,6 +512,9 @@ return (ARCHIVE_OK); default: /* Any other return value is an error. */ + archive_set_error(a, ARCHIVE_ERRNO_MISC, + "gzip decompression failed (%s)", + state->stream.msg); goto fatal; } } ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.11 2004/08/14 03:45:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.12 2005/03/13 01:52:35 kientzle Exp $"); #include <sys/stat.h> @@ -161,8 +161,11 @@ cpio = *(a->pformat_data); bid = 0; bytes_read = (a->compression_read_ahead)(a, &h, 6); + /* Convert error code into error return. */ + if (bytes_read < 0) + return ((int)bytes_read); if (bytes_read < 6) - return (-1); + return (-1); p = h; if (memcmp(p, "070707", 6) == 0) { ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.30 2004/12/22 06:40:28 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.31 2005/03/13 02:35:52 kientzle Exp $"); #include <sys/stat.h> #include <errno.h> @@ -1020,8 +1020,11 @@ return (-1); line_length *= 10; line_length += *p - '0'; - if (line_length > 999999) - return (-1); + if (line_length > 999999) { + archive_set_error(a, ARCHIVE_ERRNO_MISC, + "Rejecting pax extended attribute > 1MB"); + return (ARCHIVE_WARN); + } p++; l--; } ==== //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.10 2005/02/12 23:33:31 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.11 2005/03/13 01:47:31 kientzle Exp $"); #include <sys/stat.h> #include <errno.h> @@ -125,8 +125,15 @@ return (ARCHIVE_FATAL); } - a->skip_file_dev = pst->st_dev; - a->skip_file_ino = pst->st_ino; + /* + * If the output file is a regular file, don't add it to + * itself. If it's a device file, it's okay to add the device + * entry to the output archive. + */ + if (S_ISREG(pst->st_mode)) { + a->skip_file_dev = pst->st_dev; + a->skip_file_ino = pst->st_ino; + } return (ARCHIVE_OK); } ==== //depot/projects/hammer/lib/libbsnmp/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/lib/libbsnmp/Makefile,v 1.2 2004/01/19 19:26:01 ru Exp $ +# $FreeBSD: src/lib/libbsnmp/Makefile,v 1.3 2005/03/14 17:32:15 harti Exp $ -SUBDIR= libbsnmp modules +SUBDIR= libbsnmp .include <bsd.subdir.mk> ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#87 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.819 2005/03/11 05:37:18 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.823 2005/03/14 02:13:50 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -15,6 +15,15 @@ <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> </copyright> + <legalnotice id="trademarks" role="trademarks"> + &tm-attrib.freebsd; + &tm-attrib.ibm; + &tm-attrib.ieee; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.general; + </legalnotice> + <abstract> <para>The release notes for &os; &release.current; contain a summary of the changes made to the &os; base system since &release.branch; is created. @@ -133,9 +142,12 @@ and threads currently holding sleep mutexes (and spin mutexes for the current thread). &merged;</para> - <para>A bug, which caused the last line of configuration files such as &man.hosts.5;, - &man.services.5;, and so on to be ignored if it did not end in a newline character, - has been fixed.</para> + <para>The &man.jail.8; feature now supports a new sysctl + <varname>security.jail.chflags_allowed</varname>, which controls the + behavior of &man.chflags.1; within a jail. + If set to <literal>0</literal> (the default), then a jailed <username>root</username> user is + treated as an unprivileged user; if set to <literal>1</literal>, then + a jailed root user is treated the same as an unjailed <username>root</username> user. &merged;</para> <para arch="alpha,amd64,i386">The loader tunable <varname>debug.mpsafevm</varname> has been enabled by default. &merged;</para> @@ -269,16 +281,18 @@ added. It provides methods for various drivers to control CPU power utilization by adjusting the processor speed. More details can be found in the &man.cpufreq.4; manual page. &merged; - Currently supported drivers include acpi_perf (ACPI CPU - performance states), ichss (Intel SpeedStep for ICH), and - acpi_throttle (ACPI CPU throttling).</para> + Currently supported drivers include ichss (Intel SpeedStep for ICH), + acpi_perf (ACPI CPU performance states), and acpi_throttle + (ACPI CPU throttling). The latter two drivers are contained + in the &man.acpi.4; driver. These can individually be disabled by setting device + hints such as <varname>hint.<replaceable>ichss</replaceable>.0.disabled="1"</varname>.</para> <para arch="i386">Support for the OLDCARD subsystem has been removed. The NEWCARD system is now used for all PCCARD device support.</para> <para>The pcii driver has been added to support GPIB-PCIIA IEEE-488 - cards.</para> + cards. &merged;</para> <para>The &man.atkbd.4; driver now supports a <literal>0x8</literal> (bit 3) flag to disable testing the keyboard port during @@ -303,8 +317,8 @@ <para arch="sparc64">The &man.uart.4; driver is now enabled in the <filename>GENERIC</filename> kernel, and is now the - default driver for serial ports. The ofw_console, - &man.sab.4;, and zs drivers are now disabled in the + default driver for serial ports. The ofw_console and + &man.sab.4; drivers are now disabled in the <filename>GENERIC</filename> kernel. &merged;</para> <para>The &man.uplcom.4; driver now supports handling of the @@ -312,6 +326,9 @@ <para>The &man.ehci.4; driver has been improved.</para> + <para arch="sparc64">The zs driver has been removed + in favor of the &man.uart.4; driver.</para> + <sect4 id="mm"> <title>Multimedia Support</title> @@ -443,6 +460,10 @@ network protocol stack and improving the locking strategies.</para> + <para>A new &man.ng.ipfw.4; NetGraph node provides + a simple interface between the &man.ipfw.4; and &man.netgraph.4; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503150033.j2F0XhmM005437>