From owner-p4-projects@FreeBSD.ORG Mon May 24 03:52:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D28EB1065672; Mon, 24 May 2010 03:52:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CB2B106566C for ; Mon, 24 May 2010 03:52:26 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 777AD8FC1A for ; Mon, 24 May 2010 03:52:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4O3qQeN057890 for ; Mon, 24 May 2010 03:52:26 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4O3qLCQ057884 for perforce@freebsd.org; Mon, 24 May 2010 03:52:21 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 24 May 2010 03:52:21 GMT Message-Id: <201005240352.o4O3qLCQ057884@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2010 03:52:27 -0000 http://p4web.freebsd.org/@@178687?ac=10 Change 178687 by gcooper@starr-bastion on 2010/05/24 03:51:59 IFC Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bind9/CHANGES#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bind9/version#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/network.subr#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/SERVERS#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/ddb#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/dumpon#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/hostid#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/hostid_save#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/initrandom#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/mdconfig#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/savecore#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/sysctl#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/zvol#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/archive_read_disk.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/archive_read_open_fd.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/isgreater.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/sem_timedwait.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/setproctitle.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/tcgetsid.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/posix1e/acl_get.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/posix1e/acl_perm.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libftpio/ftpio.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libmagic/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libmagic/config.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_get_error.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_get_mech_info.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_get_mechanisms.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_get_principal_name.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_get_versions.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_getcred.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_is_installed.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_max_data_length.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_mech_to_oid.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_oid_to_mech.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_qop_to_num.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_seccreate.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_set_callback.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_set_defaults.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_set_svc_name.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/librpcsec_gss/rpcsec_gss.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/libexec/rtld-elf/amd64/reloc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/libexec/rtld-elf/arm/reloc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/libexec/rtld-elf/i386/reloc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/libexec/rtld-elf/powerpc/reloc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_ffs/pass4.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount_hpfs/mount_hpfs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/tunefs/tunefs.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ksyms.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/malo.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.powerpc/bm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/md.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/mvs.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ng_ccatm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/smp.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/tx.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/u3g.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/uath.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/usb.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/usb2_template.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/src.conf.5#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/cr_seeothergids.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/cr_seeotheruids.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/p_candebug.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/p_cansee.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/prison_check.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/usbdi.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/watchdog.9#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/misc/bsd-family-tree#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/misc/committers-src.dot#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/mk/bsd.README#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/mk/bsd.own.mk#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/local_apic.c#4 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/proc.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/arm/trap.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/i386/zfsboot/zfsboot.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/scsi/scsi_xpt.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/dev/systrace/systrace.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/ia32/ia32_util.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files.amd64#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files.i386#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files.pc98#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files.sparc64#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ahci/ahci.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fb/vesa.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ixgbe/ixgbe.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mvs/mvs.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mvs/mvs_pci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mvs/mvs_soc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/pci/pci.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/siis/siis.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nfsclient/nfs_clsubs.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nfsclient/nfs_clvfsops.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/local_apic.c#4 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/trap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/atomic.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/proc.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/proc.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/runq.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/sal.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/init_main.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_exec.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_sig.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sched_ule.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_trap.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sys_generic.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sys_process.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/hwfunc.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/db_trace.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/mp_machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/mpboot.S#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/trap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/dev/xlr/rge.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/mpwait.S#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/on_chip.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlr_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlrconfig.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/sibyte/sb_machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/ata/atadisk/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/cam/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/uart/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/if_vlan.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet6/in6.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/proc.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/cpcht.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/include/md_var.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/include/proc.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/sparc64/ata_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sun4v/include/proc.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/endian.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/kthread.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/proc.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/ptrace.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/sysent.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ffs/softdep.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_fault.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/x86/local_apic.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/build/options/WITHOUT_MAN_UTILS#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/wait1.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/wait2.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/ether_reflect/ether_reflect.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/csup/cpasswd.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/csup/csup.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/mkuzip/mkuzip.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/vmstat/vmstat.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/vmstat/vmstat.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/wc/wc.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/Makefile#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apm/apm.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/README#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/apmd.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/clear_locks/clear_locks.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/gssd/gssd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/iostat/iostat.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mixer/mixer.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mptable/mptable.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/nscd/nscd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/nscd/nscd.conf.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/snapinfo/snapinfo.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/network.c#2 integrate Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.646 2010/05/10 15:28:44 mm Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.650 2010/05/20 20:15:56 jkim Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 (text+ko) ==== @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -1209,10 +1209,12 @@ /* * And mount all the datasets, keeping track of which ones - * succeeded or failed. By using zfs_alloc(), the good pointer - * will always be non-NULL. + * succeeded or failed. */ - good = zfs_alloc(zhp->zpool_hdl, cb.cb_used * sizeof (int)); + if ((good = zfs_alloc(zhp->zpool_hdl, + cb.cb_used * sizeof (int))) == NULL) + goto out; + ret = 0; for (i = 0; i < cb.cb_used; i++) { if (zfs_mount(cb.cb_datasets[i], mntopts, flags) != 0) ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bind9/CHANGES#3 (text+ko) ==== @@ -1,3 +1,8 @@ + --- 9.6.2-P2 released --- + +2876. [bug] Named could return SERVFAIL for negative responses + from unsigned zones. [RT #21131] + --- 9.6.2-P1 released --- 2852. [bug] Handle broken DNSSEC trust chains better. [RT #15619] ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bind9/lib/dns/api#3 (text+ko) ==== @@ -1,3 +1,3 @@ LIBINTERFACE = 56 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 1 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bind9/lib/dns/validator.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.c,v 1.164.12.11.8.2 2010/02/25 10:57:12 tbox Exp $ */ +/* $Id: validator.c,v 1.164.12.11.8.3 2010/04/21 04:29:01 marka Exp $ */ #include @@ -2961,7 +2961,7 @@ } findnsec3proofs(val); - if (val->authcount == val->authfail) + if (val->authfail != 0 && val->authcount == val->authfail) return (DNS_R_BROKENCHAIN); validator_log(val, ISC_LOG_DEBUG(3), "nonexistence proof(s) not found"); ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bind9/version#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.43.12.8.2.3 2010/03/04 00:08:28 marka Exp $ +# $Id: version,v 1.43.12.8.2.4 2010/05/10 02:07:03 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MINORVER=6 PATCHVER=2 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.381 2010/03/19 15:53:02 ed Exp $ +# $FreeBSD: src/etc/Makefile,v 1.382 2010/05/19 23:56:26 jkim Exp $ .include @@ -64,7 +64,7 @@ BIN1+= ${.CURDIR}/../usr.bin/mail/misc/mail.rc .endif -.if ${MK_MAN} != "no" +.if ${MK_MAN_UTILS} != "no" BIN1+= ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config .endif ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/network.subr#4 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.209 2010/05/14 04:53:57 dougb Exp $ +# $FreeBSD: src/etc/network.subr,v 1.210 2010/05/17 19:51:34 jhb Exp $ # # @@ -917,7 +917,7 @@ _list= for ifn in ${cloned_interfaces}; do - ifconfig ${ifn} destroy + ifconfig -n ${ifn} destroy if [ $? -eq 0 ]; then _list="${_list}${_prefix}${ifn}" [ -z "$_prefix" ] && _prefix=' ' @@ -1002,10 +1002,7 @@ if ! ifexists $child; then continue fi - if autoif $child; then - ifn_stop $child - fi - ifconfig $child destroy && cfg=0 + ifconfig -n $child destroy && cfg=0 done child_vlans=`get_if_var $ifn vlans_IF` @@ -1016,10 +1013,7 @@ if ! ifexists $child; then continue fi - if autoif $child; then - ifn_stop $child - fi - ifconfig $child destroy && cfg=0 + ifconfig -n $child destroy && cfg=0 done return ${cfg} ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/weekly/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.11 2009/01/14 09:00:30 ume Exp $ +# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.12 2010/05/19 23:56:26 jkim Exp $ .include @@ -11,7 +11,7 @@ FILES+= 310.locate .endif -.if ${MK_MAN} != "no" +.if ${MK_MAN_UTILS} != "no" FILES+= 320.whatis 330.catman .endif ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/SERVERS#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/SERVERS,v 1.8 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/SERVERS,v 1.9 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: SERVERS -# REQUIRE: mountcritremote abi ldconfig +# REQUIRE: mountcritremote abi ldconfig savecore # This is a dummy dependency, for early-start servers relying on # some basic configuration. ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/ddb#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ddb,v 1.1 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ddb,v 1.2 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: ddb # REQUIRE: dumpon -# BEFORE: disks savecore initrandom +# BEFORE: disks # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/dumpon#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.12 2008/06/23 04:39:36 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.13 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: dumpon -# BEFORE: disks savecore initrandom +# REQUIRE: zvol +# BEFORE: disks # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/hostid#2 (text+ko) ==== @@ -24,11 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostid,v 1.12 2009/10/10 22:17:03 dougb Exp $ +# $FreeBSD: src/etc/rc.d/hostid,v 1.13 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: hostid -# BEFORE: fsck +# REQUIRE: sysctl # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/hostid_save#2 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/hostid_save,v 1.1 2009/07/29 05:23:52 pjd Exp $ +# $FreeBSD: src/etc/rc.d/hostid_save,v 1.2 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: hostid_save # REQUIRE: root -# BEFORE: mountcritlocal # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/initrandom#2 (text+ko) ==== @@ -1,9 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/initrandom,v 1.8 2008/04/22 15:18:47 ru Exp $ +# $FreeBSD: src/etc/rc.d/initrandom,v 1.9 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: initrandom +# REQUIRE: dumpon ddb # BEFORE: disks # KEYWORD: nojail ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/mdconfig#3 (text) ==== @@ -24,12 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/mdconfig,v 1.6 2010/05/14 04:53:57 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mdconfig,v 1.7 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: mdconfig -# REQUIRE: localswap -# BEFORE: mountcritlocal +# REQUIRE: localswap root . /etc/rc.subr ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/mountcritlocal#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.18 2009/10/10 22:17:03 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.19 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: mountcritlocal -# REQUIRE: root +# REQUIRE: root hostid_save mdconfig # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/savecore#2 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/savecore,v 1.17 2009/10/10 22:17:03 dougb Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.18 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: savecore -# REQUIRE: syslogd -# BEFORE: SERVERS +# REQUIRE: dumpon ddb syslogd # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/sysctl#2 (text+ko) ==== @@ -1,11 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/sysctl,v 1.22 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/sysctl,v 1.23 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: sysctl -# REQUIRE: root -# BEFORE: FILESYSTEMS . /etc/rc.subr ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/zvol#2 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/zvol,v 1.1 2009/07/29 05:23:52 pjd Exp $ +# $FreeBSD: src/etc/rc.d/zvol,v 1.2 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: zvol # REQUIRE: hostid -# BEFORE: fsck # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.102 2010/03/26 17:02:32 delphij Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.103 2010/05/19 23:56:26 jkim Exp $ .include @@ -39,7 +39,7 @@ _texinfo= texinfo .endif -.if ${MK_MAN} != "no" +.if ${MK_MAN_UTILS} != "no" _man= man .endif ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/archive_read_disk.3#2 (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_disk.3,v 1.1 2009/04/12 05:04:02 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read_disk.3,v 1.2 2010/05/19 08:57:53 uqs Exp $ .\" .Dd March 10, 2009 .Dt archive_read_disk 3 @@ -276,7 +276,7 @@ The .Nm libarchive library was written by -.An Tim Kientzle Aq kientzle@freebsd.org . +.An Tim Kientzle Aq kientzle@FreeBSD.org . .Sh BUGS The .Dq standard ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/archive_read_open_fd.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.16 2009/12/28 03:13:49 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.17 2010/05/18 14:11:38 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -116,11 +116,15 @@ ssize_t bytes_read; *buff = mine->buffer; - bytes_read = read(mine->fd, mine->buffer, mine->block_size); - if (bytes_read < 0) { - archive_set_error(a, errno, "Error reading fd %d", mine->fd); + for (;;) { + bytes_read = read(mine->fd, mine->buffer, mine->block_size); + if (bytes_read < 0) { + if (errno == EINTR) + continue; + archive_set_error(a, errno, "Error reading fd %d", mine->fd); + } + return (bytes_read); } - return (bytes_read); } #if ARCHIVE_API_VERSION < 2 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/archive_read_open_filename.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.26 2009/12/28 02:28:44 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.27 2010/05/18 14:11:38 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -160,15 +160,19 @@ ssize_t bytes_read; *buff = mine->buffer; - 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); + for (;;) { + bytes_read = read(mine->fd, mine->buffer, mine->block_size); + if (bytes_read < 0) { + if (errno == EINTR) + continue; + else 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); } - return (bytes_read); } #if ARCHIVE_API_VERSION < 2 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/isgreater.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2003 David Schultz +.\" Copyright (c) 2003 David Schultz .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/isgreater.3,v 1.3 2005/02/06 03:23:31 das Exp $ +.\" $FreeBSD: src/lib/libc/gen/isgreater.3,v 1.4 2010/05/19 08:57:53 uqs Exp $ .\" .Dd February 12, 2003 .Dt ISGREATER 3 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/sem_timedwait.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2008, David Xu +.\" Copyright (c) 2008, David Xu .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -32,7 +32,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_timedwait.3,v 1.4 2008/03/13 10:26:17 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_timedwait.3,v 1.5 2010/05/19 08:57:53 uqs Exp $ .\" .Dd March 3, 2008 .Dt SEM_TIMEDWAIT 3 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/setproctitle.3#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 1995 Peter Wemm +.\" Copyright (c) 1995 Peter Wemm .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -17,7 +17,7 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libc/gen/setproctitle.3,v 1.26 2010/04/14 19:08:06 uqs Exp $ +.\" $FreeBSD: src/lib/libc/gen/setproctitle.3,v 1.27 2010/05/19 08:57:53 uqs Exp $ .\" .\" The following requests are required for all man pages. .Dd December 16, 1995 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/tcgetsid.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2008 David Xu +.\" Copyright (c) 2008 David Xu .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/tcgetsid.3,v 1.2 2009/05/07 13:49:48 ed Exp $ +.\" $FreeBSD: src/lib/libc/gen/tcgetsid.3,v 1.3 2010/05/19 08:57:53 uqs Exp $ .\" .Dd April 15, 2008 .Dt TCGETSID 3 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/posix1e/acl_get.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_get.c,v 1.15 2009/06/25 20:57:53 trasz Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_get.c,v 1.16 2010/05/23 08:12:36 trasz Exp $"); #include #include "namespace.h" @@ -132,30 +132,6 @@ return (aclp); } -int -acl_get_perm_np(acl_permset_t permset_d, acl_perm_t perm) -{ - - if (permset_d == NULL) { - errno = EINVAL; - return (-1); - } - - switch(perm) { - case ACL_READ: - case ACL_WRITE: - case ACL_EXECUTE: - if (*permset_d & perm) - return (1); - break; - default: - errno = EINVAL; - return (-1); - } - - return (0); -} - /* * acl_get_permset() (23.4.17): return via permset_p a descriptor to * the permission set in the ACL entry entry_d. ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/posix1e/acl_perm.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_perm.c,v 1.8 2010/05/13 16:42:01 trasz Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_perm.c,v 1.9 2010/05/23 08:12:36 trasz Exp $"); #include #include "namespace.h" @@ -108,3 +108,21 @@ return (0); } + +int +acl_get_perm_np(acl_permset_t permset_d, acl_perm_t perm) +{ + + if (permset_d == NULL) { + errno = EINVAL; + return (-1); + } + + if (_perm_is_invalid(perm)) + return (-1); + + if (*permset_d & perm) + return (1); + + return (0); +} ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libftpio/ftpio.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 1996 Jordan Hubbard (jkh@FreeBSD.org) +.\" Copyright (c) 1996 Jordan Hubbard .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libftpio/ftpio.3,v 1.35 2005/02/13 23:45:47 ru Exp $ +.\" $FreeBSD: src/lib/libftpio/ftpio.3,v 1.36 2010/05/19 08:57:53 uqs Exp $ .\" .Dd June 17, 1996 .Dt FTPIO 3 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libmagic/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libmagic/Makefile,v 1.14 2010/01/02 09:58:07 ed Exp $ +# $FreeBSD: src/lib/libmagic/Makefile,v 1.15 2010/05/20 09:00:11 marius Exp $ # Copyright (c) David E. O'Brien, 2000-2004 CONTRDIR= ${.CURDIR}/../../contrib/file @@ -20,7 +20,7 @@ CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${CONTRDIR} -WARNS?= 1 +WARNS?= 3 CLEANFILES+= magic magic.mgc ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libmagic/config.h#2 (text+ko) ==== @@ -1,18 +1,18 @@ -/* $FreeBSD: src/lib/libmagic/config.h,v 1.9 2009/05/04 00:37:44 obrien Exp $ */ +/* $FreeBSD: src/lib/libmagic/config.h,v 1.10 2010/05/20 08:56:50 marius Exp $ */ /* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ -/* Use the builtin ELF recognition code */ +/* Define in built-in ELF support is used */ #define BUILTIN_ELF 1 -/* Recognize ELF core files */ +/* Define for ELF core file support */ #define ELFCORE 1 /* Define to 1 if you have the `asprintf' function. */ #define HAVE_ASPRINTF 1 -/* */ +/* HAVE_DAYLIGHT */ /* #undef HAVE_DAYLIGHT */ /* Define to 1 if you have the header file. */ @@ -51,9 +51,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_LOCALE_H 1 -/* */ -#define HAVE_LONG_LONG 1 - /* Define to 1 if you have the `mbrtowc' function. */ #define HAVE_MBRTOWC 1 @@ -69,9 +66,6 @@ /* Define to 1 if you have the `mmap' function. */ #define HAVE_MMAP 1 -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -102,13 +96,12 @@ /* Define to 1 if you have the `strtoul' function. */ #define HAVE_STRTOUL 1 +/* HAVE_STRUCT_OPTION */ +#define HAVE_STRUCT_OPTION 1 + /* Define to 1 if `st_rdev' is member of `struct stat'. */ #define HAVE_STRUCT_STAT_ST_RDEV 1 -/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use - `HAVE_STRUCT_STAT_ST_RDEV' instead. */ -#define HAVE_ST_RDEV 1 - /* Define to 1 if `tm_gmtoff' is member of `struct tm'. */ #define HAVE_STRUCT_TM_TM_GMTOFF 1 @@ -133,7 +126,7 @@ /* Define to 1 if you have that is POSIX.1 compatible. */ #define HAVE_SYS_WAIT_H 1 -/* */ +/* HAVE_TM_ISDST */ #define HAVE_TM_ISDST 1 /* HAVE_TM_ZONE */ @@ -169,9 +162,6 @@ /* Define to 1 if you have the `vasprintf' function. */ >>> TRUNCATED FOR MAIL (1000 lines) <<<