PERFORCE change 178626 for review
Gabor Pali
pgj at FreeBSD.org
Sat May 22 22:59:05 UTC 2010
http://p4web.freebsd.org/@@178626?ac=10
Change 178626 by pgj at csupor on 2010/05/22 22:57:59
IFC @178625
Affected files ...
.. //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/CHANGES#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/api#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/validator.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/version#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/Makefile#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/csh.login#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/network.subr#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/periodic/weekly/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/profile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/SERVERS#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/ddb#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/dumpon#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/hostid#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/hostid_save#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/initrandom#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/mdconfig#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/mountcritlocal#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/savecore#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/sysctl#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/zvol#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/Makefile#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_disk.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_open_fd.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_open_filename.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/config_freebsd.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/isgreater.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/sem_timedwait.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/setproctitle.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/tcgetsid.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libftpio/ftpio.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libmagic/Makefile#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libmagic/config.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_get_error.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_get_mech_info.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_get_mechanisms.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_get_principal_name.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_get_versions.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_getcred.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_is_installed.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_max_data_length.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_mech_to_oid.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_oid_to_mech.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_qop_to_num.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_seccreate.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_set_callback.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_set_defaults.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_set_svc_name.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpcsec_gss.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/amd64/reloc.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/arm/reloc.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/i386/reloc.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/powerpc/reloc.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/rtld.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/sparc64/reloc.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/bsdlabel/bsdlabel.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsck_ffs/pass2.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsck_ffs/pass4.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/geom/class/part/geom_part.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/mount_hpfs/mount_hpfs.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/tunefs/tunefs.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ksyms.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/malo.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.powerpc/bm.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/md.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ng_ccatm.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/smp.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/snd_emu10kx.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/tx.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/u3g.4#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/uath.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/usb.4#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/usb2_template.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/src.conf.5#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man8/nanobsd.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/cr_seeothergids.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/cr_seeotheruids.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/p_candebug.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/p_cansee.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/prison_check.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/usbdi.9#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/watchdog.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/misc/bsd-family-tree#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/misc/committers-src.dot#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/mk/bsd.README#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/mk/bsd.own.mk#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/db_interface.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/apicreg.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/atomic.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/pmap.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/zfsboot/zfsboot.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_da.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_xpt.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_xpt.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.powerpc#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.sparc64#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ahci/ahci.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-all.c#8 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-disk.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-pci.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-pci.h#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-serverworks.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwn/if_bwn.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_main.c#9 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_em.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_igb.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fb/vesa.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/isp/isp_freebsd.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/isp/ispvar.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgbe/ixgbe.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgbe/ixgbe.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mvs/mvs.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mvs/mvs_pci.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mvs/mvs_soc.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/eth_z8e.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/ethp_z8e.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/if_mxge.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/rss_eth_z8e.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/rss_ethp_z8e.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ofw/ofw_if.m#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ofw/ofw_standard.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ofw/openfirm.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ofw/openfirm.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pci/pci.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/puc/pucdata.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/siis/siis.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/syscons.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/syscons.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clsubs.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clvfsops.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nullfs/null_vnops.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/part/g_part_apm.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/pmap.c#8 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/apicreg.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/atomic.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/xen/pmap.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/db_machdep.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/pmap.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/ia64_cpu.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/pmap.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/runq.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/sal.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/vmparam.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/isa/syscons_isa.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_kthread.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sched_4bsd.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sched_ule.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_pcpu.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_smp.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sys_generic.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_bio.c#8 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/conf/XLR#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/hwfunc.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/locore.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/param.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/smp.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/cpu.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/db_trace.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/machdep.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/mp_machdep.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/mpboot.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/pmap.c#8 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/dev/xlr/rge.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/files.xlr#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/interrupt.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/intr_machdep.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/iodi.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/mpwait.S#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/on_chip.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/pic.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/xlr_machdep.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/xlr_pci.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/xlrconfig.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/sibyte/sb_machdep.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/cas/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/mvs/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/flowtable.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/flowtable.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_vlan.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_socket.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_bsd_addr.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_constants.h#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_lock_bsd.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_pcb.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_pcb.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_structs.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctputil.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_input.c#8 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/pc98/include/md_var.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/pc98/pc98/pc98_machdep.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/mmu_oea.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/mmu_oea64.c#8 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/ofw_machdep.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/booke/pmap.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/cpufreq/pcr.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/include/intr_machdep.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/include/pmap.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/ofw/ofw_pcibus.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/ofw/ofw_real.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/ata_kauai.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/cpcht.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/cpchtvar.h#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/smu.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/uninorth.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/uninorthpci.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/uninorthvar.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powerpc/openpic.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/include/md_var.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/ata_machdep.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/pmap.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sun4v/sun4v/pmap.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/endian.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/kthread.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_softdep.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/softdep.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_fault.c#10 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_object.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_page.c#10 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_page.h#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/tools/build/options/WITHOUT_MAN_UTILS#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/tools/ether_reflect/ether_reflect.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/Makefile#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/Makefile#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/acpyacc.y#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/ar.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/ar.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/ar.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/read.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/write.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/csup/cpasswd.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/csup/csup.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/mkuzip/mkuzip.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/vmstat/vmstat.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/vmstat/vmstat.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/wc/wc.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/Makefile#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apm/apm.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/Makefile#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/README#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/apmd.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/clear_locks/clear_locks.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/daemon/daemon.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/gssd/gssd.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/iostat/iostat.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/iostat/iostat.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/jail/jail.8#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/mixer/mixer.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/mptable/mptable.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/nscd/nscd.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/nscd/nscd.conf.5#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/ntp/doc/ntpd.8#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/snapinfo/snapinfo.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sysinstall/network.c#2 integrate
Differences ...
==== //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#7 (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/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 (text+ko) ====
@@ -343,6 +343,9 @@
extern int taskq_member(taskq_t *, void *);
extern void system_taskq_init(void);
+#define taskq_dispatch_safe(tq, func, arg, task) \
+ taskq_dispatch((tq), (func), (arg), TQ_SLEEP)
+
#define XVA_MAPSIZE 3
#define XVA_MAGIC 0x78766174
==== //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/CHANGES#4 (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/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/api#4 (text+ko) ====
@@ -1,3 +1,3 @@
LIBINTERFACE = 56
-LIBREVISION = 0
+LIBREVISION = 1
LIBAGE = 1
==== //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/validator.c#4 (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 <config.h>
@@ -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/soc2009/pgj_libstat/src/contrib/bind9/version#4 (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/soc2009/pgj_libstat/src/etc/Makefile#5 (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 <bsd.own.mk>
@@ -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/soc2009/pgj_libstat/src/etc/csh.login#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/csh.login,v 1.21 2004/06/06 11:46:27 schweikh Exp $
+# $FreeBSD: src/etc/csh.login,v 1.22 2010/05/15 17:49:56 jilles Exp $
#
# System-wide .login file for csh(1).
# Uncomment this to give you the default 4.2 behavior, where disk
@@ -9,7 +9,7 @@
# login.conf(5) and in particular the charset and lang options.
# For full locales list check /usr/share/locale/*
#
-# Read system messages
-# msgs -f
+# Check system messages
+# msgs -q
# Allow terminal messages
# mesg y
==== //depot/projects/soc2009/pgj_libstat/src/etc/network.subr#6 (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/soc2009/pgj_libstat/src/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 <bsd.own.mk>
@@ -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/soc2009/pgj_libstat/src/etc/profile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/profile,v 1.14 2004/06/06 11:46:27 schweikh Exp $
+# $FreeBSD: src/etc/profile,v 1.15 2010/05/15 17:49:56 jilles Exp $
#
# System-wide .profile file for sh(1).
#
@@ -12,7 +12,7 @@
# You should also read the setlocale(3) man page for information
# on how to achieve more precise control of locale settings.
#
-# Read system messages
-# msgs -f
+# Check system messages
+# msgs -q
# Allow terminal messages
# mesg y
==== //depot/projects/soc2009/pgj_libstat/src/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/soc2009/pgj_libstat/src/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/soc2009/pgj_libstat/src/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/soc2009/pgj_libstat/src/etc/rc.d/hostid#3 (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/soc2009/pgj_libstat/src/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/soc2009/pgj_libstat/src/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/soc2009/pgj_libstat/src/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/soc2009/pgj_libstat/src/etc/rc.d/mountcritlocal#3 (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/soc2009/pgj_libstat/src/etc/rc.d/savecore#3 (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/soc2009/pgj_libstat/src/etc/rc.d/sysctl#3 (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/soc2009/pgj_libstat/src/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/soc2009/pgj_libstat/src/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 <bsd.own.mk>
@@ -39,7 +39,7 @@
_texinfo= texinfo
.endif
-.if ${MK_MAN} != "no"
+.if ${MK_MAN_UTILS} != "no"
_man= man
.endif
==== //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/Makefile#5 (text+ko) ====
@@ -1,9 +1,17 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.104 2010/05/10 15:28:44 mm Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.106 2010/05/17 07:06:54 delphij Exp $
.include <bsd.own.mk>
LIB= archive
-DPADD= ${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA}
-LDADD= -lbz2 -lz -lmd -llzma
+DPADD= ${LIBZ} ${LIBMD}
+LDADD= -lz -lmd
+
+DPADD+= ${LIBBZ2}
+LDADD+= -lbz2
+CFLAGS+= -DHAVE_BZLIB_H=1
+
+DPADD+= ${LIBLZMA}
+LDADD+= -llzma
+CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
# It has no real relation to the libarchive version number.
@@ -11,7 +19,6 @@
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
CFLAGS+= -I${.OBJDIR}
-CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
.if ${MK_OPENSSL} != "no"
CFLAGS+= -DWITH_OPENSSL
==== //depot/projects/soc2009/pgj_libstat/src/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 at freebsd.org .
+.An Tim Kientzle Aq kientzle at FreeBSD.org .
.Sh BUGS
The
.Dq standard
==== //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_open_fd.c#3 (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 <sys/stat.h>
@@ -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/soc2009/pgj_libstat/src/lib/libarchive/archive_read_open_filename.c#4 (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 <sys/stat.h>
@@ -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/soc2009/pgj_libstat/src/lib/libarchive/config_freebsd.h#3 (text+ko) ====
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libarchive/config_freebsd.h,v 1.25 2009/12/28 02:01:42 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/config_freebsd.h,v 1.26 2010/05/16 20:43:17 kientzle Exp $
*/
/* FreeBSD 5.0 and later have ACL and extattr support. */
@@ -52,7 +52,6 @@
#endif
#define HAVE_BSDXML_H 1
-#define HAVE_BZLIB_H 1
#define HAVE_CHFLAGS 1
#define HAVE_CHOWN 1
#define HAVE_DECL_INT64_MAX 1
==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/isgreater.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2003 David Schultz <das at FreeBSD.ORG>
+.\" Copyright (c) 2003 David Schultz <das at FreeBSD.org>
.\" 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/soc2009/pgj_libstat/src/lib/libc/gen/sem_timedwait.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008, David Xu <davidxu at freebsd.org>
+.\" Copyright (c) 2008, David Xu <davidxu at FreeBSD.org>
.\" 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/soc2009/pgj_libstat/src/lib/libc/gen/setproctitle.3#3 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1995 Peter Wemm <peter at freebsd.org>
+.\" Copyright (c) 1995 Peter Wemm <peter at FreeBSD.org>
.\" 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/soc2009/pgj_libstat/src/lib/libc/gen/tcgetsid.3#3 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008 David Xu <davidxu at freebsd.org>
+.\" Copyright (c) 2008 David Xu <davidxu at FreeBSD.org>
.\" 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/soc2009/pgj_libstat/src/lib/libftpio/ftpio.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1996 Jordan Hubbard (jkh at FreeBSD.org)
+.\" Copyright (c) 1996 Jordan Hubbard <jkh at FreeBSD.org>
.\" 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/soc2009/pgj_libstat/src/lib/libmagic/Makefile#5 (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/soc2009/pgj_libstat/src/lib/libmagic/config.h#3 (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 <dlfcn.h> header file. */
@@ -51,9 +51,6 @@
/* Define to 1 if you have the <locale.h> 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 <stdint.h> 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
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list