PERFORCE change 143865 for review
Andrew Thompson
thompsa at FreeBSD.org
Sat Jun 21 07:37:09 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=143865
Change 143865 by thompsa at thompsa_burger on 2008/06/21 07:36:10
IFC
Affected files ...
.. //depot/projects/vap/Makefile#9 integrate
.. //depot/projects/vap/Makefile.inc1#12 integrate
.. //depot/projects/vap/ObsoleteFiles.inc#12 integrate
.. //depot/projects/vap/UPDATING#13 integrate
.. //depot/projects/vap/contrib/cvs/src/classify.c#7 integrate
.. //depot/projects/vap/etc/defaults/rc.conf#15 integrate
.. //depot/projects/vap/etc/devd.conf#4 integrate
.. //depot/projects/vap/etc/rc.d/quota#4 integrate
.. //depot/projects/vap/etc/rc.subr#5 integrate
.. //depot/projects/vap/games/morse/morse.6#3 integrate
.. //depot/projects/vap/games/morse/morse.c#3 integrate
.. //depot/projects/vap/gnu/lib/libstdc++/Makefile#3 integrate
.. //depot/projects/vap/gnu/usr.bin/Makefile#5 integrate
.. //depot/projects/vap/gnu/usr.bin/cpio/Makefile#4 integrate
.. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 integrate
.. //depot/projects/vap/include/Makefile#5 integrate
.. //depot/projects/vap/include/pthread.h#4 integrate
.. //depot/projects/vap/include/sgtty.h#3 integrate
.. //depot/projects/vap/include/spawn.h#1 branch
.. //depot/projects/vap/include/unistd.h#9 integrate
.. //depot/projects/vap/kerberos5/tools/slc/Makefile#2 integrate
.. //depot/projects/vap/lib/libarchive/Makefile#8 integrate
.. //depot/projects/vap/lib/libarchive/archive.h#1 branch
.. //depot/projects/vap/lib/libarchive/archive.h.in#6 delete
.. //depot/projects/vap/lib/libarchive/archive_entry_link_resolver.c#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_entry_strmode.c#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_read_support_compression_program.c#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_read_support_format_mtree.c#5 integrate
.. //depot/projects/vap/lib/libarchive/archive_read_support_format_zip.c#6 integrate
.. //depot/projects/vap/lib/libarchive/archive_string.c#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_string.h#5 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_set_compression_program.c#4 integrate
.. //depot/projects/vap/lib/libarchive/config_freebsd.h#6 integrate
.. //depot/projects/vap/lib/libarchive/filter_fork.c#5 integrate
.. //depot/projects/vap/lib/libarchive/test/Makefile#9 integrate
.. //depot/projects/vap/lib/libarchive/test/main.c#7 integrate
.. //depot/projects/vap/lib/libarchive/test/test.h#6 integrate
.. //depot/projects/vap/lib/libarchive/test/test_link_resolver.c#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_extract.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_disk.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_disk_perms.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_disk_secure.c#3 integrate
.. //depot/projects/vap/lib/libc/gen/Makefile.inc#8 integrate
.. //depot/projects/vap/lib/libc/gen/Symbol.map#5 integrate
.. //depot/projects/vap/lib/libc/gen/exec.3#3 integrate
.. //depot/projects/vap/lib/libc/gen/exec.c#3 integrate
.. //depot/projects/vap/lib/libc/gen/posix_spawn.c#1 branch
.. //depot/projects/vap/lib/libc/include/namespace.h#6 integrate
.. //depot/projects/vap/lib/libc/include/un-namespace.h#6 integrate
.. //depot/projects/vap/lib/libc/stdlib/Symbol.map#3 integrate
.. //depot/projects/vap/lib/libc/stdlib/grantpt.c#5 integrate
.. //depot/projects/vap/lib/libc/stdlib/malloc.c#10 integrate
.. //depot/projects/vap/lib/libc/sys/accept.2#3 integrate
.. //depot/projects/vap/lib/libc/sys/getsockopt.2#4 integrate
.. //depot/projects/vap/lib/libc/sys/setgroups.2#3 integrate
.. //depot/projects/vap/lib/libcompat/4.1/gtty.c#3 delete
.. //depot/projects/vap/lib/libcompat/4.1/stty.3#3 delete
.. //depot/projects/vap/lib/libcompat/4.1/stty.c#3 delete
.. //depot/projects/vap/lib/libcompat/Makefile#3 integrate
.. //depot/projects/vap/lib/libgeom/libgeom.3#4 integrate
.. //depot/projects/vap/lib/libthr/pthread.map#8 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_clean.c#3 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_private.h#8 integrate
.. //depot/projects/vap/lib/msun/Makefile#8 integrate
.. //depot/projects/vap/lib/msun/Symbol.map#8 integrate
.. //depot/projects/vap/lib/msun/man/fmod.3#3 integrate
.. //depot/projects/vap/lib/msun/src/e_fmodl.c#1 branch
.. //depot/projects/vap/lib/msun/src/math.h#8 integrate
.. //depot/projects/vap/libexec/rpc.rstatd/Makefile#3 integrate
.. //depot/projects/vap/libexec/rpc.rstatd/rstat_proc.c#3 integrate
.. //depot/projects/vap/sbin/Makefile#4 integrate
.. //depot/projects/vap/sbin/dhclient/dhclient-script#5 integrate
.. //depot/projects/vap/sbin/fsck_ffs/main.c#6 integrate
.. //depot/projects/vap/sbin/geom/class/part/geom_part.c#6 integrate
.. //depot/projects/vap/sbin/geom/class/part/gpart.8#4 integrate
.. //depot/projects/vap/sbin/ggate/ggated/ggated.c#3 integrate
.. //depot/projects/vap/sbin/ifconfig/ifconfig.8#13 integrate
.. //depot/projects/vap/sbin/ifconfig/ifconfig.c#8 integrate
.. //depot/projects/vap/sbin/rcorder/rcorder.8#3 integrate
.. //depot/projects/vap/share/man/man4/ciss.4#4 integrate
.. //depot/projects/vap/share/man/man4/cpufreq.4#3 integrate
.. //depot/projects/vap/share/man/man4/crypto.4#3 integrate
.. //depot/projects/vap/share/man/man4/ddb.4#7 integrate
.. //depot/projects/vap/share/man/man4/gre.4#3 integrate
.. //depot/projects/vap/share/man/man4/ixgbe.4#1 branch
.. //depot/projects/vap/share/man/man4/ubsa.4#5 integrate
.. //depot/projects/vap/share/man/man4/uplcom.4#3 integrate
.. //depot/projects/vap/share/man/man5/src.conf.5#7 integrate
.. //depot/projects/vap/share/man/man5/tmpfs.5#3 integrate
.. //depot/projects/vap/share/man/man9/bus_dma.9#3 integrate
.. //depot/projects/vap/share/man/man9/taskqueue.9#4 integrate
.. //depot/projects/vap/share/man/man9/zone.9#3 integrate
.. //depot/projects/vap/share/misc/committers-ports.dot#6 integrate
.. //depot/projects/vap/share/misc/committers-src.dot#6 integrate
.. //depot/projects/vap/share/mk/bsd.own.mk#8 integrate
.. //depot/projects/vap/sys/amd64/amd64/mem.c#4 integrate
.. //depot/projects/vap/sys/amd64/amd64/minidump_machdep.c#5 integrate
.. //depot/projects/vap/sys/amd64/amd64/pmap.c#18 integrate
.. //depot/projects/vap/sys/amd64/amd64/trap.c#9 integrate
.. //depot/projects/vap/sys/amd64/conf/GENERIC#17 integrate
.. //depot/projects/vap/sys/amd64/include/pmc_mdep.h#6 integrate
.. //depot/projects/vap/sys/amd64/include/stack.h#2 integrate
.. //depot/projects/vap/sys/arm/at91/if_ate.c#4 integrate
.. //depot/projects/vap/sys/arm/xscale/i8134x/crb_machdep.c#6 integrate
.. //depot/projects/vap/sys/arm/xscale/i8134x/i81342_pci.c#3 integrate
.. //depot/projects/vap/sys/arm/xscale/pxa/files.pxa#2 integrate
.. //depot/projects/vap/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate
.. //depot/projects/vap/sys/arm/xscale/pxa/pxa_obio.c#2 integrate
.. //depot/projects/vap/sys/arm/xscale/pxa/pxa_space.c#2 integrate
.. //depot/projects/vap/sys/boot/i386/libi386/time.c#3 integrate
.. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate
.. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate
.. //depot/projects/vap/sys/compat/linux/linux_file.c#11 integrate
.. //depot/projects/vap/sys/compat/ndis/subr_ndis.c#9 integrate
.. //depot/projects/vap/sys/compat/ndis/subr_ntoskrnl.c#9 integrate
.. //depot/projects/vap/sys/conf/NOTES#22 integrate
.. //depot/projects/vap/sys/conf/files#43 integrate
.. //depot/projects/vap/sys/conf/files.i386#12 integrate
.. //depot/projects/vap/sys/conf/files.pc98#11 integrate
.. //depot/projects/vap/sys/conf/files.powerpc#13 integrate
.. //depot/projects/vap/sys/conf/kern.pre.mk#8 integrate
.. //depot/projects/vap/sys/conf/newvers.sh#6 integrate
.. //depot/projects/vap/sys/conf/options.i386#8 integrate
.. //depot/projects/vap/sys/conf/options.pc98#8 integrate
.. //depot/projects/vap/sys/ddb/db_ps.c#7 integrate
.. //depot/projects/vap/sys/dev/age/if_age.c#2 integrate
.. //depot/projects/vap/sys/dev/agp/agp_i810.c#4 integrate
.. //depot/projects/vap/sys/dev/ata/ata-all.c#11 integrate
.. //depot/projects/vap/sys/dev/ata/ata-chipset.c#12 integrate
.. //depot/projects/vap/sys/dev/ata/ata-pci.c#9 integrate
.. //depot/projects/vap/sys/dev/bce/if_bce.c#8 integrate
.. //depot/projects/vap/sys/dev/bce/if_bcefw.h#5 integrate
.. //depot/projects/vap/sys/dev/bce/if_bcereg.h#5 integrate
.. //depot/projects/vap/sys/dev/bm/if_bm.c#1 branch
.. //depot/projects/vap/sys/dev/bm/if_bmreg.h#1 branch
.. //depot/projects/vap/sys/dev/bm/if_bmvar.h#1 branch
.. //depot/projects/vap/sys/dev/ciss/ciss.c#9 integrate
.. //depot/projects/vap/sys/dev/dc/if_dc.c#4 integrate
.. //depot/projects/vap/sys/dev/et/if_et.c#1 branch
.. //depot/projects/vap/sys/dev/et/if_etreg.h#1 branch
.. //depot/projects/vap/sys/dev/et/if_etvar.h#1 branch
.. //depot/projects/vap/sys/dev/ex/if_ex.c#5 integrate
.. //depot/projects/vap/sys/dev/ex/if_ex_isa.c#5 integrate
.. //depot/projects/vap/sys/dev/ex/if_ex_pccard.c#6 integrate
.. //depot/projects/vap/sys/dev/ex/if_exvar.h#5 integrate
.. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#28 integrate
.. //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#15 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe.h#4 integrate
.. //depot/projects/vap/sys/dev/ixgbe/tcp_lro.c#2 delete
.. //depot/projects/vap/sys/dev/ixgbe/tcp_lro.h#2 delete
.. //depot/projects/vap/sys/dev/mii/brgphy.c#8 integrate
.. //depot/projects/vap/sys/dev/mii/lxtphy.c#5 integrate
.. //depot/projects/vap/sys/dev/mii/miidevs#12 integrate
.. //depot/projects/vap/sys/dev/mii/truephy.c#1 branch
.. //depot/projects/vap/sys/dev/mii/truephyreg.h#1 branch
.. //depot/projects/vap/sys/dev/nmdm/nmdm.c#6 integrate
.. //depot/projects/vap/sys/dev/si/si.c#6 integrate
.. //depot/projects/vap/sys/dev/si/si.h#4 integrate
.. //depot/projects/vap/sys/dev/smc/if_smc.c#2 integrate
.. //depot/projects/vap/sys/dev/smc/if_smcvar.h#2 integrate
.. //depot/projects/vap/sys/dev/snp/snp.c#7 integrate
.. //depot/projects/vap/sys/dev/tx/if_tx.c#6 integrate
.. //depot/projects/vap/sys/dev/tx/if_txvar.h#5 integrate
.. //depot/projects/vap/sys/dev/usb/ehci.c#12 integrate
.. //depot/projects/vap/sys/dev/usb/ehcivar.h#6 integrate
.. //depot/projects/vap/sys/dev/usb/if_rum.c#27 integrate
.. //depot/projects/vap/sys/dev/usb/uplcom.c#7 integrate
.. //depot/projects/vap/sys/dev/usb/usbdevs#21 integrate
.. //depot/projects/vap/sys/dev/vkbd/vkbd.c#7 integrate
.. //depot/projects/vap/sys/fs/cd9660/cd9660_vnops.c#3 integrate
.. //depot/projects/vap/sys/fs/devfs/devfs_devs.c#7 integrate
.. //depot/projects/vap/sys/fs/devfs/devfs_int.h#4 integrate
.. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#10 integrate
.. //depot/projects/vap/sys/fs/ntfs/ntfs_ihash.c#5 integrate
.. //depot/projects/vap/sys/fs/tmpfs/tmpfs_subr.c#5 integrate
.. //depot/projects/vap/sys/geom/journal/g_journal.c#3 integrate
.. //depot/projects/vap/sys/geom/part/g_part.c#7 integrate
.. //depot/projects/vap/sys/geom/part/g_part.h#7 integrate
.. //depot/projects/vap/sys/geom/part/g_part_apm.c#5 integrate
.. //depot/projects/vap/sys/geom/part/g_part_bsd.c#4 integrate
.. //depot/projects/vap/sys/geom/part/g_part_gpt.c#6 integrate
.. //depot/projects/vap/sys/geom/part/g_part_if.m#4 integrate
.. //depot/projects/vap/sys/geom/part/g_part_mbr.c#8 integrate
.. //depot/projects/vap/sys/geom/part/g_part_pc98.c#4 integrate
.. //depot/projects/vap/sys/geom/part/g_part_vtoc8.c#4 integrate
.. //depot/projects/vap/sys/i386/acpica/acpi_machdep.c#6 integrate
.. //depot/projects/vap/sys/i386/conf/GENERIC#19 integrate
.. //depot/projects/vap/sys/i386/conf/NOTES#12 integrate
.. //depot/projects/vap/sys/i386/include/pecoff_machdep.h#3 delete
.. //depot/projects/vap/sys/kern/kern_conf.c#11 integrate
.. //depot/projects/vap/sys/kern/kern_dtrace.c#2 integrate
.. //depot/projects/vap/sys/kern/kern_jail.c#10 integrate
.. //depot/projects/vap/sys/kern/link_elf_obj.c#8 integrate
.. //depot/projects/vap/sys/kern/subr_bus.c#12 integrate
.. //depot/projects/vap/sys/kern/sysv_sem.c#6 integrate
.. //depot/projects/vap/sys/kern/uipc_sem.c#8 integrate
.. //depot/projects/vap/sys/kern/vfs_export.c#7 integrate
.. //depot/projects/vap/sys/kern/vfs_mount.c#16 integrate
.. //depot/projects/vap/sys/mips/include/pte.h#2 integrate
.. //depot/projects/vap/sys/mips/mips/trap.c#2 integrate
.. //depot/projects/vap/sys/modules/Makefile#30 integrate
.. //depot/projects/vap/sys/modules/bm/Makefile#1 branch
.. //depot/projects/vap/sys/modules/et/Makefile#1 branch
.. //depot/projects/vap/sys/modules/ixgbe/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/mii/Makefile#7 integrate
.. //depot/projects/vap/sys/net/if_gre.c#8 integrate
.. //depot/projects/vap/sys/net/if_gre.h#6 integrate
.. //depot/projects/vap/sys/net/if_tap.c#7 integrate
.. //depot/projects/vap/sys/net/if_tun.c#6 integrate
.. //depot/projects/vap/sys/netinet/sctp.h#5 integrate
.. //depot/projects/vap/sys/netinet/sctp_asconf.c#5 integrate
.. //depot/projects/vap/sys/netinet/sctp_auth.c#4 integrate
.. //depot/projects/vap/sys/netinet/sctp_bsd_addr.c#6 integrate
.. //depot/projects/vap/sys/netinet/sctp_bsd_addr.h#4 integrate
.. //depot/projects/vap/sys/netinet/sctp_cc_functions.c#4 integrate
.. //depot/projects/vap/sys/netinet/sctp_header.h#3 integrate
.. //depot/projects/vap/sys/netinet/sctp_indata.c#6 integrate
.. //depot/projects/vap/sys/netinet/sctp_input.c#7 integrate
.. //depot/projects/vap/sys/netinet/sctp_lock_bsd.h#4 integrate
.. //depot/projects/vap/sys/netinet/sctp_os_bsd.h#5 integrate
.. //depot/projects/vap/sys/netinet/sctp_output.c#8 integrate
.. //depot/projects/vap/sys/netinet/sctp_pcb.c#7 integrate
.. //depot/projects/vap/sys/netinet/sctp_pcb.h#5 integrate
.. //depot/projects/vap/sys/netinet/sctp_peeloff.c#4 integrate
.. //depot/projects/vap/sys/netinet/sctp_sysctl.c#5 integrate
.. //depot/projects/vap/sys/netinet/sctp_sysctl.h#4 integrate
.. //depot/projects/vap/sys/netinet/sctp_timer.c#4 integrate
.. //depot/projects/vap/sys/netinet/sctp_uio.h#4 integrate
.. //depot/projects/vap/sys/netinet/sctp_usrreq.c#7 integrate
.. //depot/projects/vap/sys/netinet/sctp_var.h#6 integrate
.. //depot/projects/vap/sys/netinet/sctputil.c#7 integrate
.. //depot/projects/vap/sys/netinet/tcp_lro.c#1 branch
.. //depot/projects/vap/sys/netinet/tcp_lro.h#1 branch
.. //depot/projects/vap/sys/netinet/tcp_syncache.c#11 integrate
.. //depot/projects/vap/sys/netinet6/sctp6_usrreq.c#6 integrate
.. //depot/projects/vap/sys/pc98/conf/NOTES#9 integrate
.. //depot/projects/vap/sys/pc98/include/pecoff_machdep.h#3 delete
.. //depot/projects/vap/sys/pci/if_rl.c#8 integrate
.. //depot/projects/vap/sys/pci/if_rlreg.h#10 integrate
.. //depot/projects/vap/sys/pci/nfsmb.c#5 integrate
.. //depot/projects/vap/sys/powerpc/booke/pmap.c#4 integrate
.. //depot/projects/vap/sys/powerpc/conf/GENERIC#10 integrate
.. //depot/projects/vap/sys/powerpc/conf/NOTES#8 integrate
.. //depot/projects/vap/sys/powerpc/include/dbdma.h#1 branch
.. //depot/projects/vap/sys/powerpc/powermac/dbdma.c#1 branch
.. //depot/projects/vap/sys/powerpc/powermac/dbdmavar.h#1 branch
.. //depot/projects/vap/sys/powerpc/powermac/grackle.c#6 integrate
.. //depot/projects/vap/sys/powerpc/powermac/macio.c#7 integrate
.. //depot/projects/vap/sys/powerpc/powermac/uninorth.c#6 integrate
.. //depot/projects/vap/sys/security/audit/audit_pipe.c#5 integrate
.. //depot/projects/vap/sys/security/audit/audit_worker.c#9 integrate
.. //depot/projects/vap/sys/security/mac/mac_framework.h#5 integrate
.. //depot/projects/vap/sys/security/mac/mac_inet.c#8 integrate
.. //depot/projects/vap/sys/security/mac/mac_policy.h#5 integrate
.. //depot/projects/vap/sys/security/mac_biba/mac_biba.c#6 integrate
.. //depot/projects/vap/sys/security/mac_lomac/mac_lomac.c#6 integrate
.. //depot/projects/vap/sys/security/mac_mls/mac_mls.c#7 integrate
.. //depot/projects/vap/sys/security/mac_stub/mac_stub.c#7 integrate
.. //depot/projects/vap/sys/security/mac_test/mac_test.c#7 integrate
.. //depot/projects/vap/sys/sys/apm.h#3 integrate
.. //depot/projects/vap/sys/sys/bus.h#9 integrate
.. //depot/projects/vap/sys/sys/conf.h#10 integrate
.. //depot/projects/vap/sys/sys/ioctl.h#6 integrate
.. //depot/projects/vap/sys/sys/ioctl_compat.h#5 integrate
.. //depot/projects/vap/sys/sys/jail.h#7 integrate
.. //depot/projects/vap/sys/sys/mount.h#8 integrate
.. //depot/projects/vap/sys/sys/param.h#23 integrate
.. //depot/projects/vap/sys/sys/systm.h#10 integrate
.. //depot/projects/vap/sys/sys/ttychars.h#5 delete
.. //depot/projects/vap/sys/sys/ttydev.h#5 delete
.. //depot/projects/vap/sys/vm/vnode_pager.c#8 integrate
.. //depot/projects/vap/tools/build/options/WITHOUT_BSD_CPIO#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_GNU_GREP#1 branch
.. //depot/projects/vap/tools/build/options/WITH_GNU_CPIO#1 branch
.. //depot/projects/vap/usr.bin/Makefile#9 integrate
.. //depot/projects/vap/usr.bin/calendar/calendars/calendar.freebsd#10 integrate
.. //depot/projects/vap/usr.bin/cpio/Makefile#2 integrate
.. //depot/projects/vap/usr.bin/fstat/fstat.c#5 integrate
.. //depot/projects/vap/usr.bin/lex/flex.skl#3 integrate
.. //depot/projects/vap/usr.bin/lex/flexdef.h#3 integrate
.. //depot/projects/vap/usr.bin/lex/lex.1#3 integrate
.. //depot/projects/vap/usr.bin/lex/parse.y#3 integrate
.. //depot/projects/vap/usr.bin/lex/scan.l#3 integrate
.. //depot/projects/vap/usr.bin/rev/rev.c#3 integrate
.. //depot/projects/vap/usr.bin/shar/shar.sh#4 integrate
.. //depot/projects/vap/usr.bin/tar/subst.c#2 integrate
.. //depot/projects/vap/usr.bin/tar/test/main.c#3 integrate
.. //depot/projects/vap/usr.bin/tar/test/test.h#3 integrate
.. //depot/projects/vap/usr.bin/tar/util.c#5 integrate
.. //depot/projects/vap/usr.bin/whereis/whereis.c#3 integrate
.. //depot/projects/vap/usr.sbin/config/mkmakefile.c#4 integrate
.. //depot/projects/vap/usr.sbin/mergemaster/mergemaster.8#3 integrate
.. //depot/projects/vap/usr.sbin/ndiscvt/inf.c#4 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/Makefile#7 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/add/main.c#5 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/add/perform.c#6 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/create/main.c#4 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/lib/file.c#3 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/lib/lib.h#6 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/lib/url.c#3 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/updating/main.c#4 integrate
.. //depot/projects/vap/usr.sbin/sicontrol/sicontrol.8#3 integrate
.. //depot/projects/vap/usr.sbin/sicontrol/sicontrol.c#5 integrate
Differences ...
==== //depot/projects/vap/Makefile#9 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.351 2008/05/25 22:13:17 jb Exp $
+# $FreeBSD: src/Makefile,v 1.353 2008/06/17 11:08:49 bz Exp $
#
# The user-driven targets are:
#
==== //depot/projects/vap/Makefile.inc1#12 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.605 2008/05/23 04:22:14 jb Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.606 2008/06/18 13:52:58 obrien Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -121,7 +121,7 @@
TARGET?= ${MACHINE}
TARGET_ARCH?= ${MACHINE_ARCH}
-KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v
+KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc sparc64 sparc64/sun4v
.if ${TARGET} == ${TARGET_ARCH}
_t= ${TARGET}
.else
==== //depot/projects/vap/ObsoleteFiles.inc#12 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.141 2008/05/27 21:05:49 bz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.143 2008/06/14 10:42:18 ed Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,14 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20080614: sgtty removed
+OLD_FILES+=usr/include/sys/ttychars.h
+OLD_FILES+=usr/include/sys/ttydev.h
+OLD_FILES+=usr/share/man/man3/gtty.3.gz
+OLD_FILES+=usr/share/man/man3/stty.3.gz
+# 20080609: gpt(8) removed
+OLD_FILES+=sbin/gpt
+OLD_FILES+=usr/share/man/man8/gpt.8.gz
# 20080525: I4B removed
OLD_FILES+=etc/isdn/answer
OLD_FILES+=etc/isdn/isdntel
==== //depot/projects/vap/UPDATING#13 (text+ko) ====
@@ -22,6 +22,10 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20080609:
+ The gpt(8) utility has been removed. Use gpart(8) to partition
+ disks instead.
+
20080603:
The version that Linuxulator emulates was changed from 2.4.2
to 2.6.16. If you experience any problems with Linux binaries
@@ -1049,4 +1053,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.531 2008/06/03 18:09:10 rdivacky Exp $
+$FreeBSD: src/UPDATING,v 1.532 2008/06/09 21:33:57 marcel Exp $
==== //depot/projects/vap/contrib/cvs/src/classify.c#7 (text+ko) ====
@@ -12,6 +12,9 @@
*
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/contrib/cvs/src/classify.c,v 1.4 2008/06/16 17:06:17 obrien Exp $");
+
#include "cvs.h"
static void sticky_ck PROTO ((struct file_info *finfo, int aflag,
==== //depot/projects/vap/etc/defaults/rc.conf#15 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.336 2008/05/26 10:39:45 bz Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.337 2008/06/19 07:06:11 mtm Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -528,7 +528,7 @@
dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO).
dumpdir="/var/crash" # Directory where crash dumps are to be stored
savecore_flags="" # Used if dumpdev is enabled above, and present.
-enable_quotas="NO" # turn on quotas on startup (or NO).
+quota_enable="NO" # turn on quotas on startup (or NO).
check_quotas="YES" # Check quotas on startup (or NO).
quotaon_flags="-a" # Turn quotas on for all file systems (if enabled)
quotaoff_flags="-a" # Turn quotas off for all file systems at shutdown
==== //depot/projects/vap/etc/devd.conf#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.39 2008/01/26 13:50:38 mtm Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.41 2008/06/15 13:26:25 kmacy Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -108,13 +108,16 @@
action "/etc/rc.d/syscons setkeyboard /dev/kbd0";
};
-# The entry below starts moused when a mouse is plugged in. Moused
-# stops automatically (actually it bombs :) when the device disappears.
attach 100 {
device-name "ums[0-9]+";
action "/etc/rc.d/moused quietstart $device-name";
};
+detach 100 {
+ device-name "ums[0-9]+";
+ action "/etc/rc.d/moused stop $device-name";
+};
+
# Firmware download into the ActiveWire board. After the firmware download is
# done the device detaches and reappears as something new and shiny
# automatically.
==== //depot/projects/vap/etc/rc.d/quota#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/quota,v 1.7 2007/12/08 22:27:18 dougb Exp $
+# $FreeBSD: src/etc/rc.d/quota,v 1.8 2008/06/19 07:06:11 mtm Exp $
#
# Enable/Check the quotas (must be after ypbind if using NIS)
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="quota"
-rcvar="enable_quotas"
+rcvar=`set_rcvar`
start_cmd="quota_start"
stop_cmd="/usr/sbin/quotaoff ${quotaoff_flags}"
==== //depot/projects/vap/etc/rc.subr#5 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.83 2008/05/05 15:52:54 maxim Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.85 2008/06/19 07:06:11 mtm Exp $
#
# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -612,29 +612,29 @@
fi
fi
+ eval $_pidcmd # determine the pid if necessary
+
+ for _elem in $_keywords; do
+ if [ "$_elem" != "$rc_arg" ]; then
+ continue
+ fi
# if ${rcvar} is set, and $1 is not
# "rcvar", then run
# checkyesno ${rcvar}
# and return if that failed
#
- if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then
- if ! checkyesno ${rcvar}; then
- if [ -n "${rc_quiet}" ]; then
+ if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then
+ if ! checkyesno ${rcvar}; then
+ if [ -n "${rc_quiet}" ]; then
+ return 0
+ fi
+ echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to "
+ echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' "
+ echo "instead of '${rc_arg}'."
return 0
fi
- echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to "
- echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' "
- echo "instead of '${rc_arg}'."
- return 0
fi
- fi
-
- eval $_pidcmd # determine the pid if necessary
- for _elem in $_keywords; do
- if [ "$_elem" != "$rc_arg" ]; then
- continue
- fi
# if there's a custom ${XXX_cmd},
# run that instead of the default
#
@@ -942,6 +942,10 @@
debug "Sourcing /etc/rc.conf.d/${_name}"
. /etc/rc.conf.d/"$_name"
fi
+
+ # Old variable names support
+ #
+ [ -n "$enable_quotas" ] && quota_enable="$enable_quotas"
}
#
==== //depot/projects/vap/games/morse/morse.6#3 (text+ko) ====
@@ -31,7 +31,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)bcd.6 8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/games/morse/morse.6,v 1.17 2005/06/07 21:43:16 ru Exp $
+.\" $FreeBSD: src/games/morse/morse.6,v 1.18 2008/06/08 19:35:47 scf Exp $
.\"
.Dd June 7, 2005
.Dt MORSE 6
@@ -172,7 +172,8 @@
.Sh FILES
.Bl -tag -width ".Pa /dev/speaker" -compact
.It Pa /dev/speaker
-speaker device file
+.Xr speaker 4
+device file
.El
.Sh SEE ALSO
.Xr speaker 4
@@ -180,7 +181,7 @@
Sound support for
.Nm
added by
-.An Lyndon Nerenberg (VE7TCP/VE6BBM) Aq lyndon at orthanc.com .
+.An Lyndon Nerenberg (VE6BBM) Aq lyndon at orthanc.ca .
.Pp
Ability to key an external device added by
.An J\(:org Wunsch
==== //depot/projects/vap/games/morse/morse.c#3 (text+ko) ====
@@ -32,8 +32,8 @@
*/
/*
- * Taught to send *real* morse by Lyndon Nerenberg (VE7TCP/VE6BBM)
- * <lyndon at orthanc.com>
+ * Taught to send *real* morse by Lyndon Nerenberg (VE6BBM)
+ * <lyndon at orthanc.ca>
*/
#ifndef lint
@@ -47,7 +47,7 @@
static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/games/morse/morse.c,v 1.21 2005/11/11 09:57:32 ru Exp $";
+ "$FreeBSD: src/games/morse/morse.c,v 1.22 2008/06/08 19:35:47 scf Exp $";
#endif /* not lint */
#include <sys/time.h>
@@ -483,7 +483,8 @@
printf(" %s\n", s);
} else {
for (; *s; ++s)
- printf(" %s", *s == '.' ? "dit" : "dah");
+ printf(" %s", *s == '.' ? *(s + 1) == '\0' ? "dit" :
+ "di" : "dah");
printf("\n");
}
}
==== //depot/projects/vap/gnu/lib/libstdc++/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.61 2007/08/16 23:02:00 kan Exp $
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.62 2008/06/16 22:49:30 kan Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
@@ -93,7 +93,7 @@
CLEANFILES+= atomicity.cc
INCSGROUPS= BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \
- TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS PBHDRS0
+ TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS PBHDRS0 PBHDRS1
CXXINCLUDEDIR= ${INCLUDEDIR}/c++/4.2
STDHDRS= std_algorithm.h std_bitset.h std_complex.h std_deque.h \
@@ -208,6 +208,20 @@
PBHDRS0:= ${PBHDRS0:S;^;${SRCDIR}/include/ext/pb_ds/;}
PBHDRS0DIR= ${CXXINCLUDEDIR}/ext/pb_ds
+PBHDRS1 = \
+ basic_types.hpp \
+ cond_dealtor.hpp \
+ constructors_destructor_fn_imps.hpp \
+ container_base_dispatch.hpp \
+ map_debug_base.hpp \
+ priority_queue_base_dispatch.hpp \
+ standard_policies.hpp \
+ tree_trace_base.hpp \
+ type_utils.hpp \
+ types_traits.hpp
+PBHDRS1:= ${PBHDRS1:S;^;${SRCDIR}/include/ext/pb_ds/detail/;}
+PBHDRS1DIR= ${CXXINCLUDEDIR}/ext/pb_ds/detail
+
PBHDRS+= \
basic_tree_policy/basic_tree_policy_base.hpp \
basic_tree_policy/null_node_metadata.hpp \
==== //depot/projects/vap/gnu/usr.bin/Makefile#5 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.96 2008/03/19 15:21:44 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.97 2008/06/16 05:48:15 dougb Exp $
.include <bsd.own.mk>
SUBDIR= bc \
${_binutils} \
${_cc} \
- cpio \
+ ${_cpio} \
${_cvs} \
dc \
dialog \
@@ -13,7 +13,7 @@
diff3 \
${_gdb} \
${_gperf} \
- grep \
+ ${_grep} \
${_groff} \
${_man} \
patch \
@@ -30,10 +30,18 @@
.endif
.endif
+.if ${MK_GNU_CPIO} == "yes"
+_cpio= cpio
+.endif
+
.if ${MK_CVS} != "no"
_cvs= cvs
.endif
+.if ${MK_GNU_GREP} != "no"
+_grep= grep
+.endif
+
.if ${MK_MAN} != "no"
_man= man
.endif
==== //depot/projects/vap/gnu/usr.bin/cpio/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.13 2008/05/26 17:21:12 kientzle Exp $
+# $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.14 2008/06/16 05:48:15 dougb Exp $
CPIODIR= ${.CURDIR}/../../../contrib/cpio
.PATH: ${CPIODIR}/lib ${CPIODIR}/src ${CPIODIR}/doc
@@ -62,9 +62,7 @@
gcpio.1: ${CPIODIR}/doc/cpio.1
cat ${CPIODIR}/doc/cpio.1 >gcpio.1
-.if !defined(WITH_BSDCPIO)
SYMLINKS=gcpio ${BINDIR}/cpio
MLINKS=gcpio.1 cpio.1
-.endif
.include <bsd.prog.mk>
==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_mips.c,v 1.2 2008/05/20 22:58:47 obrien Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_mips.c,v 1.3 2008/06/18 14:23:28 jhb Exp $");
#include <sys/types.h>
#include <machine/asm.h>
@@ -54,7 +54,7 @@
struct kthr *kt;
struct pcb pcb;
- kt = kgdb_thr_lookup_tid(ptid_get_tid(inferior_ptid));
+ kt = kgdb_thr_lookup_tid(ptid_get_pid(inferior_ptid));
if (kt == NULL)
return;
if (kvm_read(kvm, kt->pcb, &pcb, sizeof(pcb)) != sizeof(pcb)) {
@@ -82,6 +82,11 @@
fprintf_unfiltered(gdb_stderr, "XXX: %s\n", __func__);
}
+void
+kgdb_trgt_new_objfile(struct objfile *objfile)
+{
+}
+
struct kgdb_frame_cache {
CORE_ADDR pc;
CORE_ADDR sp;
==== //depot/projects/vap/include/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.279 2008/05/26 10:39:47 bz Exp $
+# $FreeBSD: src/include/Makefile,v 1.280 2008/06/17 06:26:29 davidxu Exp $
#
# Doing a "make install" builds /usr/include.
@@ -19,7 +19,7 @@
printf.h proc_service.h pthread.h \
pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \
res_update.h resolv.h runetype.h search.h setjmp.h sgtty.h \
- signal.h stab.h \
+ signal.h spawn.h stab.h \
stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \
strings.h sysexits.h tar.h tgmath.h \
time.h timeconv.h timers.h ttyent.h \
==== //depot/projects/vap/include/pthread.h#4 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/pthread.h,v 1.42 2008/03/22 09:59:20 davidxu Exp $
+ * $FreeBSD: src/include/pthread.h,v 1.43 2008/06/09 01:14:10 davidxu Exp $
*/
#ifndef _PTHREAD_H_
#define _PTHREAD_H_
@@ -135,6 +135,10 @@
#define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_ERRORCHECK
+struct _pthread_cleanup_info {
+ __uintptr_t pthread_cleanup_pad[8];
+};
+
/*
* Thread function prototype definitions:
*/
@@ -162,8 +166,19 @@
int *);
int pthread_barrierattr_init(pthread_barrierattr_t *);
int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
-void pthread_cleanup_pop(int);
-void pthread_cleanup_push(void (*) (void *), void *);
+
+#define pthread_cleanup_push(cleanup_routine, cleanup_arg) \
+ { \
+ struct _pthread_cleanup_info __cleanup_info__; \
+ __pthread_cleanup_push_imp(cleanup_routine, cleanup_arg,\
+ &__cleanup_info__); \
+ {
+
+#define pthread_cleanup_pop(execute) \
+ } \
+ __pthread_cleanup_pop_imp(execute); \
+ }
+
int pthread_condattr_destroy(pthread_condattr_t *);
int pthread_condattr_getclock(const pthread_condattr_t *,
clockid_t *);
@@ -268,6 +283,10 @@
const struct sched_param *);
int pthread_getconcurrency(void);
int pthread_setconcurrency(int);
+
+void __pthread_cleanup_push_imp(void (*)(void *), void *,
+ struct _pthread_cleanup_info *);
+void __pthread_cleanup_pop_imp(int);
__END_DECLS
#endif
==== //depot/projects/vap/include/sgtty.h#3 (text+ko) ====
@@ -1,39 +1,3 @@
-/*
- * Copyright (c) 1985, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)sgtty.h 8.1 (Berkeley) 6/2/93
- */
-
-#ifndef USE_OLD_TTY
-#define USE_OLD_TTY
-#endif
-#include <sys/ioctl.h>
+/* $FreeBSD: src/include/sgtty.h,v 1.2 2008/06/14 10:42:18 ed Exp $ */
+#error "The sgtty interface has been replaced by termios(4)"
+#error "Try to use <sys/ioctl.h> or migrate to <termios.h>"
==== //depot/projects/vap/include/unistd.h#9 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)unistd.h 8.12 (Berkeley) 4/27/95
- * $FreeBSD: src/include/unistd.h,v 1.87 2008/04/10 12:13:56 kib Exp $
+ * $FreeBSD: src/include/unistd.h,v 1.88 2008/06/17 06:26:29 davidxu Exp $
*/
#ifndef _UNISTD_H_
@@ -335,6 +335,7 @@
int execv(const char *, char * const *);
int execve(const char *, char * const *, char * const *);
int execvp(const char *, char * const *);
+int execvpe(const char *, char * const *, char * const *);
pid_t fork(void);
long fpathconf(int, int);
char *getcwd(char *, size_t);
==== //depot/projects/vap/kerberos5/tools/slc/Makefile#2 (text+ko) ====
@@ -1,10 +1,11 @@
-# $FreeBSD: src/kerberos5/tools/slc/Makefile,v 1.1 2008/05/07 13:53:07 dfr Exp $
+# $FreeBSD: src/kerberos5/tools/slc/Makefile,v 1.2 2008/06/18 21:20:50 marius Exp $
PROG= slc
NO_MAN=
SRCS= get_window_size.c \
getarg.c \
+ roken.h \
slc-gram.y \
slc-lex.l \
slc.h \
==== //depot/projects/vap/lib/libarchive/Makefile#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.84 2008/05/26 17:00:22 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.85 2008/06/15 05:05:53 kientzle Exp $
LIB= archive
DPADD= ${LIBBZ2} ${LIBZ}
@@ -16,16 +16,8 @@
# Headers to be installed in /usr/include
INCS= archive.h archive_entry.h
-# For now, archive.h is the same as archive.h.in.
-archive.h: archive.h.in
- cat ${.CURDIR}/archive.h.in > archive.h
-
-# archive.h needs to be cleaned
-CLEANFILES+= archive.h
-
# Sources to be compiled.
-SRCS= archive.h \
- archive_check_magic.c \
+SRCS= archive_check_magic.c \
archive_entry.c \
archive_entry_copy_stat.c \
archive_entry_stat.c \
==== //depot/projects/vap/lib/libarchive/archive_entry_link_resolver.c#3 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.2 2008/05/26 17:00:22 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.3 2008/06/15 04:31:43 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -181,6 +181,9 @@
/* If it has only one link, then we're done. */
if (archive_entry_nlink(*e) == 1)
return;
+ /* Directories never have hardlinks. */
+ if (archive_entry_filetype(*e) == AE_IFDIR)
+ return;
switch (res->strategy) {
case ARCHIVE_ENTRY_LINKIFY_LIKE_TAR:
==== //depot/projects/vap/lib/libarchive/archive_entry_strmode.c#4 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.3 2008/05/23 04:57:28 cperciva Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.4 2008/06/15 05:14:01 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -57,6 +57,11 @@
case AE_IFLNK: bp[0] = 'l'; break;
case AE_IFSOCK: bp[0] = 's'; break;
case AE_IFIFO: bp[0] = 'p'; break;
+ default:
+ if (archive_entry_hardlink(entry) != NULL) {
+ bp[0] = 'h';
+ break;
+ }
}
for (i = 0; i < 9; i++)
==== //depot/projects/vap/lib/libarchive/archive_read_support_compression_program.c#4 (text+ko) ====
@@ -24,11 +24,12 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_program.c,v 1.3 2008/05/26 17:00:22 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_program.c,v 1.4 2008/06/15 10:45:57 kientzle Exp $");
/* This capability is only available on POSIX systems. */
-#if !defined(HAVE_PIPE) || !defined(HAVE_VFORK) || !defined(HAVE_FCNTL)
+#if !defined(HAVE_PIPE) || !defined(HAVE_FCNTL) || \
+ !(defined(HAVE_FORK) || defined(HAVE_VFORK))
/*
* On non-Posix systems, allow the program to build, but choke if
@@ -177,6 +178,12 @@
state->child_in_buf_avail = ret;
}
+ if (state->child_stdin == -1) {
+ fcntl(state->child_stdout, F_SETFL, 0);
+ __archive_check_child(state->child_stdin, state->child_stdout);
+ goto restart_read;
+ }
+
do {
ret = write(state->child_stdin, state->child_in_buf,
state->child_in_buf_avail);
@@ -191,7 +198,7 @@
goto restart_read;
} else if (ret == 0 || (ret == -1 && errno == EPIPE)) {
close(state->child_stdin);
- state->child_stdout = -1;
+ state->child_stdin = -1;
fcntl(state->child_stdout, F_SETFL, 0);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list