Date: Wed, 12 Mar 2008 21:17:39 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 137546 for review Message-ID: <200803122117.m2CLHduv014114@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=137546 Change 137546 by sam@sam_ebb on 2008/03/12 21:17:30 IFC @ 137545 Affected files ... .. //depot/projects/vap/UPDATING#6 integrate .. //depot/projects/vap/bin/cp/cp.1#3 integrate .. //depot/projects/vap/bin/cp/cp.c#4 integrate .. //depot/projects/vap/bin/cp/utils.c#3 integrate .. //depot/projects/vap/bin/ps/ps.1#3 integrate .. //depot/projects/vap/bin/uuidgen/Makefile#1 branch .. //depot/projects/vap/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/vap/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/vap/etc/rc.d/mountlate#4 integrate .. //depot/projects/vap/etc/rc.d/root#4 integrate .. //depot/projects/vap/lib/Makefile#4 integrate .. //depot/projects/vap/lib/libalias/libalias/Makefile#3 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.3#3 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/vap/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read_private.h#4 integrate .. //depot/projects/vap/lib/libarchive/archive_util.3#3 integrate .. //depot/projects/vap/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.3#3 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#6 integrate .. //depot/projects/vap/lib/libarchive/test/main.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/test.h#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse.c#4 integrate .. //depot/projects/vap/lib/libc/gen/Makefile.inc#5 integrate .. //depot/projects/vap/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/vap/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/vap/lib/libc/sys/Symbol.map#4 integrate .. //depot/projects/vap/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/vap/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/vap/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/vap/lib/libpmc/pmc_capabilities.3#3 integrate .. //depot/projects/vap/lib/libsdp/sdp.h#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_sem.c#4 integrate .. //depot/projects/vap/lib/libthread_db/Makefile#3 integrate .. //depot/projects/vap/release/doc/share/misc/dev.archlist.txt#6 integrate .. //depot/projects/vap/sbin/mount/mount.8#3 integrate .. //depot/projects/vap/share/man/man4/uart.4#3 integrate .. //depot/projects/vap/share/man/man4/vr.4#3 integrate .. //depot/projects/vap/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/vap/sys/amd64/amd64/legacy.c#6 integrate .. //depot/projects/vap/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/vap/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/vap/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/vap/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/vap/sys/arm/arm/nexus.c#5 integrate .. //depot/projects/vap/sys/arm/arm/trap.c#6 integrate .. //depot/projects/vap/sys/arm/conf/AVILA#5 integrate .. //depot/projects/vap/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/vap/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/vap/sys/boot/i386/btx/btx/btx.S#6 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/metadata.c#3 integrate .. //depot/projects/vap/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/vap/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/vap/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/vap/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/vap/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/vap/sys/dev/cpufreq/ichss.c#5 integrate .. //depot/projects/vap/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/vap/sys/dev/msk/if_msk.c#8 integrate .. //depot/projects/vap/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/vap/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/vap/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/vap/sys/dev/uart/uart.h#6 integrate .. //depot/projects/vap/sys/dev/uart/uart_dev_ns8250.c#5 integrate .. //depot/projects/vap/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/vap/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#9 edit .. //depot/projects/vap/sys/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/vap/sys/dev/wpi/if_wpivar.h#4 integrate .. //depot/projects/vap/sys/fs/fifofs/fifo_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/procfs/procfs_ctl.c#5 integrate .. //depot/projects/vap/sys/fs/procfs/procfs_dbregs.c#5 integrate .. //depot/projects/vap/sys/fs/procfs/procfs_status.c#6 integrate .. //depot/projects/vap/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/vap/sys/i386/cpufreq/est.c#7 integrate .. //depot/projects/vap/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/vap/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/vap/sys/i386/i386/legacy.c#6 integrate .. //depot/projects/vap/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/vap/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/i386/trap.c#7 integrate .. //depot/projects/vap/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/ibcs2/imgact_coff.c#7 integrate .. //depot/projects/vap/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/vap/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/vap/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/vap/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/vap/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/vap/sys/ia64/include/ucontext.h#3 integrate .. //depot/projects/vap/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/vap/sys/kern/init_sysent.c#10 integrate .. //depot/projects/vap/sys/kern/kern_clock.c#6 integrate .. //depot/projects/vap/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/vap/sys/kern/kern_exec.c#7 integrate .. //depot/projects/vap/sys/kern/kern_fork.c#6 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#6 integrate .. //depot/projects/vap/sys/kern/kern_kse.c#6 delete .. //depot/projects/vap/sys/kern/kern_proc.c#7 integrate .. //depot/projects/vap/sys/kern/kern_resource.c#6 integrate .. //depot/projects/vap/sys/kern/kern_sig.c#8 integrate .. //depot/projects/vap/sys/kern/kern_switch.c#6 integrate .. //depot/projects/vap/sys/kern/kern_sx.c#6 integrate .. //depot/projects/vap/sys/kern/kern_synch.c#7 integrate .. //depot/projects/vap/sys/kern/kern_thread.c#8 integrate .. //depot/projects/vap/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/vap/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/vap/sys/kern/sched_4bsd.c#8 integrate .. //depot/projects/vap/sys/kern/sched_ule.c#9 integrate .. //depot/projects/vap/sys/kern/subr_bus.c#9 integrate .. //depot/projects/vap/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/vap/sys/kern/subr_smp.c#8 integrate .. //depot/projects/vap/sys/kern/subr_trap.c#7 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#8 integrate .. //depot/projects/vap/sys/kern/sys_process.c#6 integrate .. //depot/projects/vap/sys/kern/syscalls.c#10 integrate .. //depot/projects/vap/sys/kern/syscalls.master#10 integrate .. //depot/projects/vap/sys/kern/systrace_args.c#7 integrate .. //depot/projects/vap/sys/modules/vr/Makefile#5 integrate .. //depot/projects/vap/sys/net/bpf_filter.c#6 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#12 integrate .. //depot/projects/vap/sys/netgraph/ng_socket.c#7 integrate .. //depot/projects/vap/sys/netinet/libalias/alias.c#6 integrate .. //depot/projects/vap/sys/netinet/libalias/alias.h#5 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_old.c#5 delete .. //depot/projects/vap/sys/netsmb/smb_conn.h#4 integrate .. //depot/projects/vap/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/vap/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/vap/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/vap/sys/pci/if_vr.c#6 delete .. //depot/projects/vap/sys/pci/if_vrreg.h#5 delete .. //depot/projects/vap/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/vap/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/vap/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/vap/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/vap/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/vap/sys/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/vap/sys/powerpc/include/bootinfo.h#4 integrate .. //depot/projects/vap/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/vap/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/vap/sys/powerpc/powerpc/intr_machdep.c#7 integrate .. //depot/projects/vap/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/vap/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/vap/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/vap/sys/sparc64/sparc64/iommu.c#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/trap.c#7 integrate .. //depot/projects/vap/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/vap/sys/sys/condvar.h#5 integrate .. //depot/projects/vap/sys/sys/disklabel.h#7 integrate .. //depot/projects/vap/sys/sys/kse.h#3 delete .. //depot/projects/vap/sys/sys/param.h#12 integrate .. //depot/projects/vap/sys/sys/proc.h#10 integrate .. //depot/projects/vap/sys/sys/sched.h#7 integrate .. //depot/projects/vap/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/vap/sys/sys/syscall.h#10 integrate .. //depot/projects/vap/sys/sys/syscall.mk#10 integrate .. //depot/projects/vap/sys/sys/sysproto.h#10 integrate .. //depot/projects/vap/sys/sys/systm.h#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#8 integrate .. //depot/projects/vap/sys/vm/vm_glue.c#6 integrate .. //depot/projects/vap/sys/vm/vm_map.c#7 integrate .. //depot/projects/vap/sys/vm/vm_meter.c#6 integrate .. //depot/projects/vap/usr.bin/ar/ar.1#2 integrate .. //depot/projects/vap/usr.bin/ar/ar.c#2 integrate .. //depot/projects/vap/usr.bin/ar/ar.h#2 integrate .. //depot/projects/vap/usr.bin/ar/write.c#3 integrate .. //depot/projects/vap/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/vap/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/vap/usr.bin/kdump/kdump_subr.h#3 integrate .. //depot/projects/vap/usr.bin/kdump/mksubr#5 integrate .. //depot/projects/vap/usr.bin/make/globals.h#3 integrate .. //depot/projects/vap/usr.bin/make/hash_tables.c#3 integrate .. //depot/projects/vap/usr.bin/make/main.c#4 integrate .. //depot/projects/vap/usr.bin/make/make.1#4 integrate .. //depot/projects/vap/usr.bin/make/parse.c#3 integrate .. //depot/projects/vap/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/vap/usr.sbin/Makefile#5 integrate .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/Makefile#3 integrate .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/profile.c#3 integrate .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/profile.h#3 integrate .. //depot/projects/vap/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/vap/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/vap/usr.sbin/ppp/command.c#3 integrate .. //depot/projects/vap/usr.sbin/ppp/ipcp.c#3 integrate .. //depot/projects/vap/usr.sbin/ppp/main.c#3 integrate .. //depot/projects/vap/usr.sbin/ppp/nat_cmd.c#3 integrate Differences ... ==== //depot/projects/vap/UPDATING#6 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/vap/bin/cp/cp.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/vap/bin/cp/cp.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/vap/bin/cp/utils.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/vap/bin/ps/ps.1#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/vap/etc/rc.d/mountlate#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ # # PROVIDE: mountlate @@ -33,6 +33,12 @@ stop_boot true ;; esac + + # If we booted a special kernel remove the record + # so we will boot the default kernel next time. + if [ -x /sbin/nextboot ]; then + /sbin/nextboot -D + fi } load_rc_config $name ==== //depot/projects/vap/etc/rc.d/root#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $ # # PROVIDE: root @@ -34,7 +34,7 @@ # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } ==== //depot/projects/vap/lib/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include <bsd.own.mk> @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -104,10 +104,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif ==== //depot/projects/vap/lib/libalias/libalias/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $ +# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $ .PATH: ${.CURDIR}/../../../sys/netinet/libalias @@ -6,7 +6,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= libalias.3 -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h WARNS?= 6 NO_WERROR= ==== //depot/projects/vap/lib/libarchive/archive_entry.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.15 2007/07/15 19:10:34 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.16 2008/03/10 14:44:40 jkoshy Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -101,17 +101,47 @@ .Sh SYNOPSIS .In archive_entry.h .Ft void -.Fn archive_entry_acl_add_entry "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const char *name" +.Fo archive_entry_acl_add_entry +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const char *name" +.Fc .Ft void -.Fn archive_entry_acl_add_entry_w "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const wchar_t *name" +.Fo archive_entry_acl_add_entry_w +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const wchar_t *name" +.Fc .Ft void .Fn archive_entry_acl_clear "struct archive_entry *" .Ft int .Fn archive_entry_acl_count "struct archive_entry *" "int type" .Ft int -.Fn archive_entry_acl_next "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const char **name" +.Fo archive_entry_acl_next +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const char **name" +.Fc .Ft int -.Fn archive_entry_acl_next_w "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const wchar_t **name" +.Fo archive_entry_acl_next_w +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const wchar_t **name" +.Fc .Ft int .Fn archive_entry_acl_reset "struct archive_entry *" "int want_type" .Ft const wchar_t * @@ -155,7 +185,11 @@ .Ft mode_t .Fn archive_entry_filetype "struct archive_entry *" .Ft void -.Fn archive_entry_fflags "struct archive_entry *" "unsigned long *set" "unsigned long *clear" +.Fo archive_entry_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long *set" +.Fa "unsigned long *clear" +.Fc .Ft const char * .Fn archive_entry_fflags_text "struct archive_entry *" .Ft void @@ -195,7 +229,11 @@ .Ft void .Fn archive_entry_set_filetype "struct archive_entry *" "unsigned int" .Ft void -.Fn archive_entry_set_fflags "struct archive_entry *" "unsigned long set" "unsigned long clear" +.Fo archive_entry_set_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long set" +.Fa "unsigned long clear" +.Fc .Ft void .Fn archive_entry_set_gid "struct archive_entry *" "gid_t" .Ft void ==== //depot/projects/vap/lib/libarchive/archive_entry.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.45 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.47 2008/03/12 04:47:37 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -1124,6 +1124,11 @@ entry->acl_p = entry->acl_p->next; if (entry->acl_p == NULL) { entry->acl_state = 0; + *type = 0; + *permset = 0; + *tag = 0; + *id = -1; + *name = NULL; return (ARCHIVE_EOF); /* End of ACL entries. */ } *type = entry->acl_p->type; @@ -1505,7 +1510,7 @@ return (ARCHIVE_OK); } else { *name = NULL; - *name = NULL; + *value = NULL; *size = (size_t)0; return (ARCHIVE_WARN); } ==== //depot/projects/vap/lib/libarchive/archive_read.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.36 2008/03/10 14:45:29 jkoshy Exp $ .\" .Dd August 19, 2006 .Dt archive_read 3 @@ -75,7 +75,10 @@ .Ft int .Fn archive_read_support_compression_none "struct archive *" .Ft int -.Fn archive_read_support_compression_program "struct archive *" "const char *cmd" +.Fo archive_read_support_compression_program +.Fa "struct archive *" +.Fa "const char *cmd" +.Fc .Ft int .Fn archive_read_support_format_all "struct archive *" .Ft int @@ -89,15 +92,32 @@ .Ft int .Fn archive_read_support_format_zip "struct archive *" .Ft int -.Fn archive_read_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_close_callback *" +.Fo archive_read_open +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "archive_open_callback *" +.Fa "archive_read_callback *" +.Fa "archive_close_callback *" +.Fc .Ft int -.Fn archive_read_open2 "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_skip_callback *" "archive_close_callback *" +.Fo archive_read_open2 +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "archive_open_callback *" +.Fa "archive_read_callback *" +.Fa "archive_skip_callback *" +.Fa "archive_close_callback *" +.Fc .Ft int .Fn archive_read_open_FILE "struct archive *" "FILE *file" .Ft int .Fn archive_read_open_fd "struct archive *" "int fd" "size_t block_size" .Ft int -.Fn archive_read_open_filename "struct archive *" "const char *filename" "size_t block_size" +.Fo archive_read_open_filename +.Fa "struct archive *" +.Fa "const char *filename" +.Fa "size_t block_size" +.Fc .Ft int .Fn archive_read_open_memory "struct archive *" "void *buff" "size_t size" .Ft int @@ -105,7 +125,12 @@ .Ft ssize_t .Fn archive_read_data "struct archive *" "void *buff" "size_t len" .Ft int -.Fn archive_read_data_block "struct archive *" "const void **buff" "size_t *len" "off_t *offset" +.Fo archive_read_data_block +.Fa "struct archive *" +.Fa "const void **buff" +.Fa "size_t *len" +.Fa "off_t *offset" +.Fc .Ft int .Fn archive_read_data_skip "struct archive *" .\" #if ARCHIVE_API_VERSION < 3 @@ -115,9 +140,17 @@ .Ft int .Fn archive_read_data_into_fd "struct archive *" "int fd" .Ft int -.Fn archive_read_extract "struct archive *" "struct archive_entry *" "int flags" +.Fo archive_read_extract +.Fa "struct archive *" +.Fa "struct archive_entry *" +.Fa "int flags" +.Fc .Ft void -.Fn archive_read_extract_set_progress_callback "struct archive *" "void (*func)(void *)" "void *user_data" +.Fo archive_read_extract_set_progress_callback +.Fa "struct archive *" +.Fa "void (*func)(void *)" +.Fa "void *user_data" +.Fc .Ft int .Fn archive_read_close "struct archive *" .Ft int @@ -136,7 +169,13 @@ Allocates and initializes a .Tn struct archive object suitable for reading from an archive. -.It Fn archive_read_support_compression_all , Fn archive_read_support_compression_bzip2 , Fn archive_read_support_compression_compress , Fn archive_read_support_compression_gzip , Fn archive_read_support_compression_none +.It Xo +.Fn archive_read_support_compression_all , +.Fn archive_read_support_compression_bzip2 , +.Fn archive_read_support_compression_compress , +.Fn archive_read_support_compression_gzip , +.Fn archive_read_support_compression_none +.Xc Enables auto-detection code and decompression support for the specified compression. Note that @@ -150,7 +189,14 @@ Note that this disables automatic detection of the compression format, so it makes no sense to specify this in conjunction with any other decompression option. -.It Fn archive_read_support_format_all , Fn archive_read_support_format_cpio , Fn archive_read_support_format_empty , Fn archive_read_support_format_iso9660 , Fn archive_read_support_format_tar, Fn archive_read_support_format_zip +.It Xo +.Fn archive_read_support_format_all , +.Fn archive_read_support_format_cpio , +.Fn archive_read_support_format_empty , +.Fn archive_read_support_format_iso9660 , +.Fn archive_read_support_format_tar , +.Fn archive_read_support_format_zip +.Xc Enables support---including auto-detection code---for the specified archive format. For example, @@ -311,14 +357,26 @@ .Bl -item -offset indent .It .Ft typedef ssize_t -.Fn archive_read_callback "struct archive *" "void *client_data" "const void **buffer" +.Fo archive_read_callback +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "const void **buffer" +.Fc .It .\" #if ARCHIVE_API_VERSION < 2 .Ft typedef int -.Fn archive_skip_callback "struct archive *" "void *client_data" "size_t request" +.Fo archive_skip_callback +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "size_t request" +.Fc .\" #else .\" .Ft typedef off_t -.\" .Fn archive_skip_callback "struct archive *" "void *client_data" "off_t request" +.\" .Fo archive_skip_callback +.\" .Fa "struct archive *" +.\" .Fa "void *client_data" +.\" .Fa "off_t request" +.\" .Fc .\" #endif .It .Ft typedef int ==== //depot/projects/vap/lib/libarchive/archive_read.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.37 2008/01/03 17:54:26 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.38 2008/03/12 04:58:32 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -64,26 +64,13 @@ archive_read_new(void) { struct archive_read *a; - unsigned char *nulls; a = (struct archive_read *)malloc(sizeof(*a)); if (a == NULL) return (NULL); memset(a, 0, sizeof(*a)); a->archive.magic = ARCHIVE_READ_MAGIC; - a->bytes_per_block = ARCHIVE_DEFAULT_BYTES_PER_BLOCK; - a->null_length = 1024; - nulls = (unsigned char *)malloc(a->null_length); - if (nulls == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate archive object 'nulls' element"); - free(a); - return (NULL); - } - memset(nulls, 0, a->null_length); - a->nulls = nulls; - a->archive.state = ARCHIVE_STATE_NEW; a->entry = archive_entry_new(); @@ -660,8 +647,6 @@ (a->formats[i].cleanup)(a); } - /* Casting a pointer to int allows us to remove 'const.' */ - free((void *)(uintptr_t)(const void *)a->nulls); archive_string_free(&a->archive.error_string); if (a->entry) archive_entry_free(a->entry); ==== //depot/projects/vap/lib/libarchive/archive_read_private.h#4 (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_read_private.h,v 1.4 2008/01/03 17:54:26 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.5 2008/03/12 04:58:32 kientzle Exp $ */ #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED @@ -41,10 +41,6 @@ dev_t skip_file_dev; ino_t skip_file_ino; - /* Utility: Pointer to a block of nulls. */ - const unsigned char *nulls; - size_t null_length; - /* * Used by archive_read_data() to track blocks and copy * data to client buffers, filling gaps with zero bytes. @@ -58,30 +54,9 @@ archive_open_callback *client_opener; archive_read_callback *client_reader; archive_skip_callback *client_skipper; - archive_write_callback *client_writer; archive_close_callback *client_closer; void *client_data; - /* - * Blocking information. Note that bytes_in_last_block is - * misleadingly named; I should find a better name. These - * control the final output from all compressors, including - * compression_none. - */ - int bytes_per_block; - int bytes_in_last_block; - - /* - * These control whether data within a gzip/bzip2 compressed - * stream gets padded or not. If pad_uncompressed is set, - * the data will be padded to a full block before being - * compressed. The pad_uncompressed_byte determines the value - * that will be used for padding. Note that these have no - * effect on compression "none." - */ - int pad_uncompressed; - int pad_uncompressed_byte; /* TODO: Support this. */ - /* File offset of beginning of most recently-read header. */ off_t header_position; @@ -142,18 +117,6 @@ struct archive_format_descriptor *format; /* Active format. */ /* - * Pointers to format-specific functions for writing. They're - * initialized by archive_write_set_format_XXX() calls. - */ - int (*format_init)(struct archive *); /* Only used on write. */ - int (*format_finish)(struct archive *); - int (*format_finish_entry)(struct archive *); - int (*format_write_header)(struct archive *, - struct archive_entry *); - ssize_t (*format_write_data)(struct archive *, - const void *buff, size_t); - - /* * Various information needed by archive_extract. */ struct extract *extract; ==== //depot/projects/vap/lib/libarchive/archive_util.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_util.3,v 1.7 2007/05/29 01:00:19 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_util.3,v 1.8 2008/03/10 14:44:40 jkoshy Exp $ .\" .Dd January 8, 2005 .Dt archive_util 3 @@ -57,7 +57,12 @@ .Ft const char * .Fn archive_format_name "struct archive *" .Ft void -.Fn archive_set_error "struct archive *" "int error_code" "const char *fmt" "..." +.Fo archive_set_error +.Fa "struct archive *" +.Fa "int error_code" +.Fa "const char *fmt" +.Fa "..." +.Fc .Sh DESCRIPTION These functions provide access to various information about the .Tn struct archive ==== //depot/projects/vap/lib/libarchive/archive_write.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.22 2007/05/29 01:00:19 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.23 2008/03/10 14:44:41 jkoshy Exp $ .\" .Dd August 19, 2006 .Dt archive_write 3 @@ -70,7 +70,10 @@ .Ft int .Fn archive_write_set_compression_none "struct archive *" .Ft int -.Fn archive_write_set_compression_program "struct archive *" "const char * cmd" +.Fo archive_write_set_compression_program +.Fa "struct archive *" +.Fa "const char * cmd" +.Fc .Ft int .Fn archive_write_set_format_cpio "struct archive *" .Ft int @@ -84,7 +87,13 @@ .Ft int .Fn archive_write_set_format_ustar "struct archive *" .Ft int -.Fn archive_write_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_write_callback *" "archive_close_callback *" +.Fo archive_write_open +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "archive_open_callback *" +.Fa "archive_write_callback *" +.Fa "archive_close_callback *" +.Fc .Ft int .Fn archive_write_open_fd "struct archive *" "int fd" .Ft int @@ -92,7 +101,12 @@ .Ft int .Fn archive_write_open_filename "struct archive *" "const char *filename" .Ft int -.Fn archive_write_open_memory "struct archive *" "void *buffer" "size_t bufferSize" "size_t *outUsed" +.Fo archive_write_open_memory +.Fa "struct archive *" +.Fa "void *buffer" +.Fa "size_t bufferSize" +.Fa "size_t *outUsed" +.Fc .Ft int .Fn archive_write_header "struct archive *" "struct archive_entry *" .Ft ssize_t @@ -150,7 +164,14 @@ .It Fn archive_write_get_bytes_in_last_block Retrieve the currently-set value for last block size. A value of -1 here indicates that the library should use default values. -.It Fn archive_write_set_format_cpio , Fn archive_write_set_format_pax , Fn archive_write_set_format_pax_restricted , Fn archive_write_set_format_shar , Fn archive_write_set_format_shar_binary , Fn archive_write_set_format_ustar +.It Xo +.Fn archive_write_set_format_cpio , +.Fn archive_write_set_format_pax , +.Fn archive_write_set_format_pax_restricted , +.Fn archive_write_set_format_shar , +.Fn archive_write_set_format_shar_binary , +.Fn archive_write_set_format_ustar +.Xc Sets the format that will be used for the archive. The library can write POSIX octet-oriented cpio format archives, @@ -174,7 +195,11 @@ is the library default; this is the same as pax format, but suppresses the pax extended header for most normal files. In most cases, this will result in ordinary ustar archives. -.It Fn archive_write_set_compression_bzip2 , Fn archive_write_set_compression_gzip , Fn archive_write_set_compression_none +.It Xo +.Fn archive_write_set_compression_bzip2 , +.Fn archive_write_set_compression_gzip , +.Fn archive_write_set_compression_none +.Xc The resulting archive will be compressed as specified. Note that the compressed output is always properly blocked. .It Fn archive_write_set_compression_program @@ -310,7 +335,12 @@ .Bl -item -offset indent .It .Ft typedef ssize_t -.Fn archive_write_callback "struct archive *" "void *client_data" "void *buffer" "size_t length" +.Fo archive_write_callback +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "void *buffer" +.Fa "size_t length" +.Fc .El .Pp The write callback is invoked whenever the library ==== //depot/projects/vap/lib/libarchive/archive_write_disk.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.1 2007/03/03 07:37:36 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.2 2008/03/10 14:44:41 jkoshy Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803122117.m2CLHduv014114>