PERFORCE change 123159 for review
Kip Macy
kmacy at FreeBSD.org
Sun Jul 8 21:15:41 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=123159
Change 123159 by kmacy at parmacvm:opentoe_parvm on 2007/07/08 21:15:04
IFC
Affected files ...
.. //depot/projects/opentoe/ObsoleteFiles.inc#11 integrate
.. //depot/projects/opentoe/UPDATING#11 integrate
.. //depot/projects/opentoe/bin/sh/var.c#4 integrate
.. //depot/projects/opentoe/etc/inetd.conf#2 integrate
.. //depot/projects/opentoe/etc/mtree/BSD.include.dist#7 integrate
.. //depot/projects/opentoe/include/Makefile#5 integrate
.. //depot/projects/opentoe/lib/libarchive/Makefile#7 integrate
.. //depot/projects/opentoe/lib/libarchive/archive.h.in#7 integrate
.. //depot/projects/opentoe/lib/libarchive/archive_read_open_memory.c#3 integrate
.. //depot/projects/opentoe/lib/libarchive/archive_util.c#3 integrate
.. //depot/projects/opentoe/lib/libarchive/test/main.c#5 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test.h#3 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_acl_basic.c#4 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_acl_pax.c#4 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_archive_api_feature.c#3 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_entry.c#2 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_read_compress_program.c#2 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_read_format_ar.c#4 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_tar_filenames.c#4 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_write_compress_program.c#2 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_write_disk.c#3 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_write_disk_perms.c#5 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_write_disk_secure.c#3 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_write_format_ar.c#5 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_write_format_cpio.c#2 integrate
.. //depot/projects/opentoe/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate
.. //depot/projects/opentoe/lib/libc/amd64/SYS.h#2 integrate
.. //depot/projects/opentoe/lib/libc/amd64/sys/Makefile.inc#2 integrate
.. //depot/projects/opentoe/lib/libc/arm/SYS.h#2 integrate
.. //depot/projects/opentoe/lib/libc/arm/sys/Makefile.inc#2 integrate
.. //depot/projects/opentoe/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/opentoe/lib/libc/gen/__getosreldate.c#1 branch
.. //depot/projects/opentoe/lib/libc/i386/SYS.h#2 integrate
.. //depot/projects/opentoe/lib/libc/i386/sys/Makefile.inc#2 integrate
.. //depot/projects/opentoe/lib/libc/ia64/SYS.h#2 integrate
.. //depot/projects/opentoe/lib/libc/ia64/sys/Makefile.inc#2 integrate
.. //depot/projects/opentoe/lib/libc/include/libc_private.h#2 integrate
.. //depot/projects/opentoe/lib/libc/powerpc/sys/Makefile.inc#2 integrate
.. //depot/projects/opentoe/lib/libc/quad/Makefile.inc#2 integrate
.. //depot/projects/opentoe/lib/libc/sparc64/SYS.h#2 integrate
.. //depot/projects/opentoe/lib/libc/sparc64/sys/Makefile.inc#2 integrate
.. //depot/projects/opentoe/lib/libc/sys/Makefile.inc#3 integrate
.. //depot/projects/opentoe/lib/libc/sys/ftruncate.c#2 integrate
.. //depot/projects/opentoe/lib/libc/sys/lseek.c#2 integrate
.. //depot/projects/opentoe/lib/libc/sys/mmap.c#2 integrate
.. //depot/projects/opentoe/lib/libc/sys/pread.c#2 integrate
.. //depot/projects/opentoe/lib/libc/sys/pwrite.c#2 integrate
.. //depot/projects/opentoe/lib/libc/sys/truncate.c#2 integrate
.. //depot/projects/opentoe/lib/libgssapi/gss_display_status.c#3 integrate
.. //depot/projects/opentoe/sbin/ifconfig/iflagg.c#3 integrate
.. //depot/projects/opentoe/sbin/ping6/Makefile#3 integrate
.. //depot/projects/opentoe/share/examples/isdn/FAQ#2 integrate
.. //depot/projects/opentoe/share/examples/isdn/Overview#2 integrate
.. //depot/projects/opentoe/share/examples/isdn/contrib/hplay.c#2 integrate
.. //depot/projects/opentoe/share/examples/isdn/contrib/isdntelmux.c#2 integrate
.. //depot/projects/opentoe/share/examples/isdn/i4brunppp/i4brunppp.c#2 integrate
.. //depot/projects/opentoe/share/examples/isdn/v21/v21modem.c#2 integrate
.. //depot/projects/opentoe/sys/Makefile#5 integrate
.. //depot/projects/opentoe/sys/amd64/linux32/linux32_machdep.c#6 integrate
.. //depot/projects/opentoe/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/opentoe/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/opentoe/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/opentoe/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/opentoe/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/opentoe/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/opentoe/sys/compat/linux/linux_file.c#5 integrate
.. //depot/projects/opentoe/sys/compat/pecoff/imgact_pecoff.c#2 integrate
.. //depot/projects/opentoe/sys/conf/NOTES#9 integrate
.. //depot/projects/opentoe/sys/conf/files#12 integrate
.. //depot/projects/opentoe/sys/conf/files.amd64#6 integrate
.. //depot/projects/opentoe/sys/conf/files.i386#6 integrate
.. //depot/projects/opentoe/sys/conf/kern.pre.mk#3 integrate
.. //depot/projects/opentoe/sys/conf/options#11 integrate
.. //depot/projects/opentoe/sys/contrib/pf/net/pf_subr.c#3 integrate
.. //depot/projects/opentoe/sys/dev/firewire/firewire.c#5 integrate
.. //depot/projects/opentoe/sys/dev/ipw/if_ipw.c#5 integrate
.. //depot/projects/opentoe/sys/dev/nxge/if_nxge.c#2 integrate
.. //depot/projects/opentoe/sys/dev/ofw/openfirm.c#3 integrate
.. //depot/projects/opentoe/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/opentoe/sys/dev/rp/rp.c#3 integrate
.. //depot/projects/opentoe/sys/dev/sbni/if_sbni.c#2 integrate
.. //depot/projects/opentoe/sys/dev/snp/snp.c#4 integrate
.. //depot/projects/opentoe/sys/dev/sound/pci/es137x.c#4 integrate
.. //depot/projects/opentoe/sys/dev/sound/pcm/dsp.c#4 integrate
.. //depot/projects/opentoe/sys/dev/usb/ubser.c#5 integrate
.. //depot/projects/opentoe/sys/dev/usb/udbp.c#4 integrate
.. //depot/projects/opentoe/sys/dev/usb/umass.c#6 integrate
.. //depot/projects/opentoe/sys/dev/usb/usb_port.h#5 integrate
.. //depot/projects/opentoe/sys/dev/usb/usbdevs#10 integrate
.. //depot/projects/opentoe/sys/dev/usb/uvisor.c#4 integrate
.. //depot/projects/opentoe/sys/dev/usb/uvscom.c#3 integrate
.. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs.h#4 integrate
.. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_subr.c#4 integrate
.. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate
.. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate
.. //depot/projects/opentoe/sys/i386/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/opentoe/sys/i386/i386/sys_machdep.c#5 integrate
.. //depot/projects/opentoe/sys/i386/i386/vm_machdep.c#7 integrate
.. //depot/projects/opentoe/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate
.. //depot/projects/opentoe/sys/i386/include/i4b_cause.h#2 delete
.. //depot/projects/opentoe/sys/i386/include/i4b_debug.h#2 delete
.. //depot/projects/opentoe/sys/i386/include/i4b_ioctl.h#2 delete
.. //depot/projects/opentoe/sys/i386/include/i4b_rbch_ioctl.h#2 delete
.. //depot/projects/opentoe/sys/i386/include/i4b_tel_ioctl.h#2 delete
.. //depot/projects/opentoe/sys/i386/include/i4b_trace.h#2 delete
.. //depot/projects/opentoe/sys/i386/include/pc/vesa.h#2 integrate
.. //depot/projects/opentoe/sys/i386/linux/linux_machdep.c#4 integrate
.. //depot/projects/opentoe/sys/i4b/capi/capi_l4if.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/capi/capi_llif.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/capi/capi_msgs.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/capi/iavc/iavc_card.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/capi/iavc/iavc_isa.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/capi/iavc/iavc_lli.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/capi/iavc/iavc_pci.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/driver/i4b_ctl.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/driver/i4b_ing.c#3 integrate
.. //depot/projects/opentoe/sys/i4b/driver/i4b_ipr.c#3 integrate
.. //depot/projects/opentoe/sys/i4b/driver/i4b_isppp.c#3 integrate
.. //depot/projects/opentoe/sys/i4b/driver/i4b_rbch.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/driver/i4b_tel.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/driver/i4b_trace.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/include/i4b_cause.h#1 branch
.. //depot/projects/opentoe/sys/i4b/include/i4b_debug.h#1 branch
.. //depot/projects/opentoe/sys/i4b/include/i4b_ioctl.h#1 branch
.. //depot/projects/opentoe/sys/i4b/include/i4b_l1l2.h#2 integrate
.. //depot/projects/opentoe/sys/i4b/include/i4b_rbch_ioctl.h#1 branch
.. //depot/projects/opentoe/sys/i4b/include/i4b_tel_ioctl.h#1 branch
.. //depot/projects/opentoe/sys/i4b/include/i4b_trace.h#1 branch
.. //depot/projects/opentoe/sys/i4b/layer1/i4b_l1dmux.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/i4b_l1lib.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#3 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_bchan.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_ctx_s0P.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_diva.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_dynalink.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_hscx.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_isac.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_isic.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_l1.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_l1fsm.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_sws.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer2/i4b_iframe.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer2/i4b_l2.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer2/i4b_l2fsm.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer2/i4b_l2timer.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer2/i4b_lme.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer2/i4b_sframe.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer2/i4b_tei.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer2/i4b_uframe.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer2/i4b_util.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer3/i4b_l2if.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer3/i4b_l3fsm.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer3/i4b_l3timer.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer3/i4b_l4if.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer3/i4b_q931.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer3/i4b_q932fac.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer4/i4b_l4.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate
.. //depot/projects/opentoe/sys/i4b/layer4/i4b_l4timer.c#2 integrate
.. //depot/projects/opentoe/sys/kern/Make.tags.inc#4 integrate
.. //depot/projects/opentoe/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/opentoe/sys/kern/kern_conf.c#5 integrate
.. //depot/projects/opentoe/sys/kern/kern_sx.c#8 integrate
.. //depot/projects/opentoe/sys/kern/makesyscalls.sh#2 integrate
.. //depot/projects/opentoe/sys/kern/subr_unit.c#3 integrate
.. //depot/projects/opentoe/sys/kern/sys_generic.c#5 integrate
.. //depot/projects/opentoe/sys/kern/syscalls.c#2 integrate
.. //depot/projects/opentoe/sys/kern/syscalls.master#2 integrate
.. //depot/projects/opentoe/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/opentoe/sys/kern/tty_pts.c#3 integrate
.. //depot/projects/opentoe/sys/kern/vfs_syscalls.c#8 integrate
.. //depot/projects/opentoe/sys/net/ieee8023ad_lacp.c#4 integrate
.. //depot/projects/opentoe/sys/net/ieee8023ad_lacp.h#4 integrate
.. //depot/projects/opentoe/sys/net/if_lagg.c#4 integrate
.. //depot/projects/opentoe/sys/net/if_lagg.h#4 integrate
.. //depot/projects/opentoe/sys/netinet/tcp_input.c#11 integrate
.. //depot/projects/opentoe/sys/netinet/tcp_subr.c#9 integrate
.. //depot/projects/opentoe/sys/netinet/tcp_var.h#7 integrate
.. //depot/projects/opentoe/sys/netinet/udp_usrreq.c#5 integrate
.. //depot/projects/opentoe/sys/netinet6/dest6.c#2 integrate
.. //depot/projects/opentoe/sys/netinet6/frag6.c#3 integrate
.. //depot/projects/opentoe/sys/netinet6/icmp6.c#4 integrate
.. //depot/projects/opentoe/sys/netinet6/in6.c#4 integrate
.. //depot/projects/opentoe/sys/netinet6/in6.h#4 integrate
.. //depot/projects/opentoe/sys/netinet6/in6_cksum.c#2 integrate
.. //depot/projects/opentoe/sys/netinet6/in6_gif.c#2 integrate
.. //depot/projects/opentoe/sys/netinet6/in6_ifattach.c#4 integrate
.. //depot/projects/opentoe/sys/netinet6/in6_pcb.c#6 integrate
.. //depot/projects/opentoe/sys/netinet6/in6_proto.c#4 integrate
.. //depot/projects/opentoe/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/opentoe/sys/netinet6/in6_src.c#5 integrate
.. //depot/projects/opentoe/sys/netinet6/ip6_forward.c#3 integrate
.. //depot/projects/opentoe/sys/netinet6/ip6_id.c#2 integrate
.. //depot/projects/opentoe/sys/netinet6/ip6_input.c#4 integrate
.. //depot/projects/opentoe/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/opentoe/sys/netinet6/ip6_mroute.c#2 integrate
.. //depot/projects/opentoe/sys/netinet6/ip6_mroute.h#2 integrate
.. //depot/projects/opentoe/sys/netinet6/ip6_output.c#4 integrate
.. //depot/projects/opentoe/sys/netinet6/ip6_var.h#3 integrate
.. //depot/projects/opentoe/sys/netinet6/mld6.c#3 integrate
.. //depot/projects/opentoe/sys/netinet6/nd6.c#4 integrate
.. //depot/projects/opentoe/sys/netinet6/nd6_nbr.c#4 integrate
.. //depot/projects/opentoe/sys/netinet6/nd6_rtr.c#2 integrate
.. //depot/projects/opentoe/sys/netinet6/raw_ip6.c#5 integrate
.. //depot/projects/opentoe/sys/netinet6/route6.c#3 integrate
.. //depot/projects/opentoe/sys/netinet6/scope6.c#2 integrate
.. //depot/projects/opentoe/sys/netinet6/sctp6_usrreq.c#11 integrate
.. //depot/projects/opentoe/sys/netinet6/sctp6_var.h#5 integrate
.. //depot/projects/opentoe/sys/netinet6/udp6_output.c#4 integrate
.. //depot/projects/opentoe/sys/netinet6/udp6_usrreq.c#4 integrate
.. //depot/projects/opentoe/sys/opencrypto/cast.c#2 integrate
.. //depot/projects/opentoe/sys/pc98/include/i4b_cause.h#2 delete
.. //depot/projects/opentoe/sys/pc98/include/i4b_debug.h#2 delete
.. //depot/projects/opentoe/sys/pc98/include/i4b_ioctl.h#2 delete
.. //depot/projects/opentoe/sys/pc98/include/i4b_rbch_ioctl.h#2 delete
.. //depot/projects/opentoe/sys/pc98/include/i4b_tel_ioctl.h#2 delete
.. //depot/projects/opentoe/sys/pc98/include/i4b_trace.h#2 delete
.. //depot/projects/opentoe/sys/pci/if_rlreg.h#3 integrate
.. //depot/projects/opentoe/sys/security/mac/mac_policy.h#5 integrate
.. //depot/projects/opentoe/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate
.. //depot/projects/opentoe/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate
.. //depot/projects/opentoe/sys/sun4v/sun4v/mp_machdep.c#3 integrate
.. //depot/projects/opentoe/sys/sys/param.h#8 integrate
.. //depot/projects/opentoe/sys/sys/sx.h#7 integrate
.. //depot/projects/opentoe/sys/sys/syscall.h#2 integrate
.. //depot/projects/opentoe/sys/sys/syscall.mk#2 integrate
.. //depot/projects/opentoe/sys/sys/sysproto.h#2 integrate
.. //depot/projects/opentoe/sys/sys/systm.h#8 integrate
.. //depot/projects/opentoe/sys/vm/vm_fault.c#7 integrate
.. //depot/projects/opentoe/sys/vm/vm_mmap.c#5 integrate
.. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.icase1.out#1 branch
.. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.icase2.out#1 branch
.. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.icase3.out#1 branch
.. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.sh#5 integrate
.. //depot/projects/opentoe/usr.bin/kdump/kdump.c#3 integrate
.. //depot/projects/opentoe/usr.bin/sed/compile.c#2 integrate
.. //depot/projects/opentoe/usr.bin/sed/defs.h#2 integrate
.. //depot/projects/opentoe/usr.bin/sed/sed.1#3 integrate
.. //depot/projects/opentoe/usr.bin/telnet/Makefile#3 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/g711conv/g711conv.c#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/isdnd/isdnd.8#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/isdnd/isdnd.h#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/isdndebug/main.c#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/isdndecode/decode.h#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/isdnmonitor/monprivate.h#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/isdnphone/defs.h#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/isdntel/defs.h#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/isdntelctl/main.c#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/isdntest/main.c#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/isdntrace/trace.h#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/man/Makefile#2 integrate
.. //depot/projects/opentoe/usr.sbin/i4b/man/i4b.4#2 integrate
.. //depot/projects/opentoe/usr.sbin/inetd/Makefile#3 integrate
.. //depot/projects/opentoe/usr.sbin/ppp/i4b.c#2 integrate
.. //depot/projects/opentoe/usr.sbin/rrenumd/Makefile#3 integrate
.. //depot/projects/opentoe/usr.sbin/traceroute6/Makefile#3 integrate
Differences ...
==== //depot/projects/opentoe/ObsoleteFiles.inc#11 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.102 2007/07/03 13:06:45 mlaier Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.104 2007/07/06 07:24:49 bz 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,21 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20070705: I4B headers repo-copied to include/i4b/
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/include/machine/i4b_cause.h
+OLD_FILES+=usr/include/machine/i4b_debug.h
+OLD_FILES+=usr/include/machine/i4b_ioctl.h
+OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h
+OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h
+OLD_FILES+=usr/include/machine/i4b_trace.h
+.endif
+# 20070704: I4B 'modules' temporary disconnected
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/share/man/man4/i4bing.4.gz
+OLD_FILES+=usr/share/man/man4/i4bipr.4.gz
+OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz
+.endif
# 20070703: pf 4.1 import
OLD_FILES+=usr/libexec/ftp-proxy
# 20070701: KAME IPSec removal
==== //depot/projects/opentoe/UPDATING#11 (text+ko) ====
@@ -21,6 +21,11 @@
developers choose to disable these features on build machines
to maximize performance.
+20070704:
+ The new IPsec code is now compiled in using the IPSEC option. The
+ IPSEC option now requires "device crypto" be defined in your kernel
+ configuration. The FAST_IPSEC kernel option is now deprecated.
+
20070702:
The packet filter (pf) code has been updated to OpenBSD 4.1 Please
note the changed syntax - keep state is now on by default. Also
@@ -41,6 +46,11 @@
cards should be configured using ifconfig(8), see the man page for more
information.
+20060612:
+ The i386/amd64 GENERIC kernel now defaults to the nfe(4) driver
+ instead of the nve(4) driver. Please update your configuration
+ accordingly.
+
20070612:
By default, /etc/rc.d/sendmail no longer rebuilds the aliases
database if it is missing or older than the aliases file. If
@@ -877,4 +887,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.500 2007/07/03 13:06:44 mlaier Exp $
+$FreeBSD: src/UPDATING,v 1.502 2007/07/06 06:35:50 yongari Exp $
==== //depot/projects/opentoe/bin/sh/var.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.36 2007/07/04 00:00:38 scf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.37 2007/07/06 04:04:58 scf Exp $");
#include <unistd.h>
#include <stdlib.h>
@@ -278,6 +278,30 @@
return 0;
}
+
+/*
+ * Sets/unsets an environment variable from a pointer that may actually be a
+ * pointer into environ where the string should not be manipulated.
+ */
+static void
+change_env(char *s, int set)
+{
+ char *eqp;
+ char *ss;
+
+ ss = savestr(s);
+ if ((eqp = strchr(ss, '=')) != NULL)
+ *eqp = '\0';
+ if (set && eqp != NULL)
+ (void) setenv(ss, eqp + 1, 1);
+ else
+ (void) unsetenv(ss);
+ ckfree(ss);
+
+ return;
+}
+
+
/*
* Same as setvar except that the variable and value are passed in
* the first argument as name=value. Since the first argument will
@@ -289,7 +313,6 @@
setvareq(char *s, int flags)
{
struct var *vp, **vpp;
- char *p;
int len;
if (aflag)
@@ -320,10 +343,7 @@
if (vp == &vmpath || (vp == &vmail && ! mpathset()))
chkmail(1);
if ((vp->flags & VEXPORT) && localevar(s)) {
- p = strchr(s, '=');
- *p = '\0';
- (void) setenv(s, p + 1, 1);
- *p = '=';
+ change_env(s, 1);
(void) setlocale(LC_ALL, "");
}
INTON;
@@ -339,10 +359,7 @@
INTOFF;
*vpp = vp;
if ((vp->flags & VEXPORT) && localevar(s)) {
- p = strchr(s, '=');
- *p = '\0';
- (void) setenv(s, p + 1, 1);
- *p = '=';
+ change_env(s, 1);
(void) setlocale(LC_ALL, "");
}
INTON;
@@ -603,10 +620,7 @@
vp->flags |= flag;
if ((vp->flags & VEXPORT) && localevar(vp->text)) {
- p = strchr(vp->text, '=');
- *p = '\0';
- (void) setenv(vp->text, p + 1, 1);
- *p = '=';
+ change_env(vp->text, 1);
(void) setlocale(LC_ALL, "");
}
goto found;
@@ -798,7 +812,7 @@
if (*(strchr(vp->text, '=') + 1) != '\0')
setvar(s, nullstr, 0);
if ((vp->flags & VEXPORT) && localevar(vp->text)) {
- unsetenv(s);
+ change_env(s, 0);
setlocale(LC_ALL, "");
}
vp->flags &= ~VEXPORT;
==== //depot/projects/opentoe/etc/inetd.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/inetd.conf,v 1.72 2006/08/31 17:15:10 obrien Exp $
+# $FreeBSD: src/etc/inetd.conf,v 1.73 2007/07/05 09:46:53 delphij Exp $
#
# Internet server configuration database
#
@@ -118,9 +118,3 @@
#netbios-ssn stream tcp nowait root /usr/local/sbin/smbd smbd
#netbios-ns dgram udp wait root /usr/local/sbin/nmbd nmbd
#swat stream tcp nowait/400 root /usr/local/sbin/swat swat
-#
-# Enable the following entry to enable ftp-proxy to NAT ftp sessions with pf
-# N.B.: inetd binds to * in the default installation so you should add
-# an appropriate block rule to your pf.conf
-#
-#ftp-proxy stream tcp nowait root /usr/libexec/ftp-proxy ftp-proxy
==== //depot/projects/opentoe/etc/mtree/BSD.include.dist#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.116 2007/07/01 12:08:05 gnn Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.117 2007/07/06 07:20:59 bz Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -183,6 +183,8 @@
..
gssapi
..
+ i4b
+ ..
isofs
cd9660
..
==== //depot/projects/opentoe/include/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.272 2007/07/01 12:08:05 gnn Exp $
+# $FreeBSD: src/include/Makefile,v 1.273 2007/07/06 07:20:59 bz Exp $
#
# Doing a "make install" builds /usr/include.
@@ -26,6 +26,9 @@
ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \
wctype.h wordexp.h
+I4BHDRS=i4b_cause.h i4b_debug.h i4b_ioctl.h i4b_rbch_ioctl.h \
+ i4b_tel_ioctl.h i4b_trace.h
+
MHDRS= float.h floatingpoint.h stdarg.h
PHDRS= sched.h semaphore.h _semaphore.h
@@ -175,6 +178,13 @@
cd ${.CURDIR}/../sys/crypto; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 rijndael/rijndael.h \
${DESTDIR}${INCLUDEDIR}/crypto
+.if ${MACHINE_ARCH} == "i386"
+.if ${MK_I4B} != "no"
+ cd ${.CURDIR}/../sys/i4b/include; \
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${I4BHDRS} \
+ ${DESTDIR}${INCLUDEDIR}/i4b
+.endif
+.endif
cd ${.CURDIR}/../sys/opencrypto; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/crypto
@@ -256,6 +266,11 @@
ln -fs ../../../sys/crypto/$$h \
${DESTDIR}${INCLUDEDIR}/crypto; \
done
+ cd ${.CURDIR}/../sys/i4b/include; \
+ for h in ${I4BHDRS}; do \
+ ln -fs ../../../sys/i4b/include/$$h \
+ ${DESTDIR}${INCLUDEDIR}/i4b; \
+ done
cd ${.CURDIR}/../sys/opencrypto; \
for h in *.h; do \
ln -fs ../../../sys/opencrypto/$$h \
==== //depot/projects/opentoe/lib/libarchive/Makefile#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.73 2007/06/22 05:47:00 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.75 2007/07/07 16:55:42 kientzle Exp $
LIB= archive
DPADD= ${LIBBZ2} ${LIBZ}
@@ -13,7 +13,12 @@
ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/\..*//'
ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/[0-9]*\.//' -e 's/\..*//'
+ARCHIVE_API_REV!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/.*\.//'
+# Can't use /usr/bin/printf to format the version stamp here, because
+# that's not available during installworld. Fortunately, awk is.
+ARCHIVE_VERSION_STAMP!= echo ${ARCHIVE_API_MAJOR} ${ARCHIVE_API_MINOR} ${ARCHIVE_API_REV} | awk '{printf("%d%03d%03d",$$1,$$2,$$3)}'
+
# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
# It has no real relation to the version number above.
SHLIB_MAJOR= 4
@@ -31,13 +36,14 @@
# Build archive.h from archive.h.in by substituting version information.
# Note: FreeBSD has inttypes.h, so enable that include in archive.h.in
archive.h: archive.h.in Makefile
- cat ${.CURDIR}/archive.h.in | \
- sed 's/@ARCHIVE_VERSION@/${VERSION}/g' | \
- sed 's/@SHLIB_MAJOR@/${SHLIB_MAJOR}/g' | \
- sed 's/@ARCHIVE_API_MAJOR@/${ARCHIVE_API_MAJOR}/g' | \
- sed 's/@ARCHIVE_API_MINOR@/${ARCHIVE_API_MINOR}/g' | \
- sed 's|@ARCHIVE_H_INCLUDE_INTTYPES_H@|#include <inttypes.h> /* For int64_t */|g' | \
- cat > archive.h
+ cat ${.CURDIR}/archive.h.in | sed \
+ -e 's/@ARCHIVE_VERSION@/${VERSION}/g' \
+ -e 's/@SHLIB_MAJOR@/${SHLIB_MAJOR}/g' \
+ -e 's/@ARCHIVE_API_MAJOR@/${ARCHIVE_API_MAJOR}/g' \
+ -e 's/@ARCHIVE_API_MINOR@/${ARCHIVE_API_MINOR}/g' \
+ -e 's/@ARCHIVE_VERSION_STAMP@/${ARCHIVE_VERSION_STAMP}/g' \
+ -e 's|@ARCHIVE_H_INCLUDE_INTTYPES_H@|#include <inttypes.h> /* For int64_t */|g' \
+ > archive.h
# archive.h needs to be cleaned
CLEANFILES+= archive.h
==== //depot/projects/opentoe/lib/libarchive/archive.h.in#7 (text+ko) ====
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.45 2007/06/22 05:47:00 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.46 2007/07/06 15:36:37 kientzle Exp $
*/
#ifndef ARCHIVE_H_INCLUDED
@@ -50,31 +50,68 @@
extern "C" {
#endif
+/*
+ * Each of the version identifiers comes as a macro and a function.
+ * The macro identifies the installed header; the function identifies
+ * the library version (which may not be the same if you're using a
+ * dynamically-linked version of the library).
+ */
+
+/*
+ * Textual name/version of the library, useful for version displays.
+ */
+#define ARCHIVE_LIBRARY_VERSION "libarchive @ARCHIVE_VERSION@"
+const char * archive_version(void);
/*
- * If ARCHIVE_API_VERSION != archive_api_version(), then the library you
- * were linked with is using an incompatible API to the one you were
- * compiled with. This is almost certainly a fatal problem.
+ * Major version number: If ARCHIVE_API_VERSION !=
+ * archive_api_version(), then the library you were linked with is
+ * using an incompatible API to the one you were compiled with. This
+ * is almost certainly a fatal problem.
+ */
+#define ARCHIVE_API_VERSION @ARCHIVE_API_MAJOR@
+int archive_api_version(void);
+
+/*
+ * Minor version number: ARCHIVE_API_FEATURE is incremented with each
+ * significant feature addition, so you can test (at compile or run
+ * time) if a particular feature is implemented. It's no big deal if
+ * ARCHIVE_API_FEATURE != archive_api_feature(), as long as both are
+ * high enough to include the features you're relying on. Specific
+ * values of FEATURE are documented here:
*
- * ARCHIVE_API_FEATURE is incremented with each significant feature
- * addition, so you can test (at compile or run time) if a particular
- * feature is implemented. It's no big deal if ARCHIVE_API_FEATURE !=
- * archive_api_feature(), as long as both are high enough to include
- * the features you're relying on. Specific values of FEATURE are
- * documented here:
- *
* 1 - Version tests are available.
* 2 - archive_{read,write}_close available separately from _finish.
* 3 - open_memory, open_memory2, open_FILE, open_fd available
* 5 - archive_write_disk interface available
+ *
+ * Unfortunately, this count resets whenever ARCHIVE_API_VERSION changes,
+ * making it awkward to use in practice. For that reason, it is deprecated
+ * in favor of the more-accurate version stamp below. It will eventually
+ * be removed.
*/
-#define ARCHIVE_API_VERSION @ARCHIVE_API_MAJOR@
-int archive_api_version(void);
#define ARCHIVE_API_FEATURE @ARCHIVE_API_MINOR@
int archive_api_feature(void);
-/* Textual name/version of the library. */
-#define ARCHIVE_LIBRARY_VERSION "libarchive @ARCHIVE_VERSION@"
-const char * archive_version(void);
+
+/*
+ * The "version stamp" is a single integer that makes it easy to check
+ * the exact version: for version a.b.c, the version stamp is
+ * printf("%d%03d%03d",a,b,c). For example, version 2.12.108 has
+ * version stamp 2012108.
+ *
+ * This was introduced with libarchive 1.9.0 in the libarchive 1.x family
+ * and libarchive 2.2.4 in the libarchive 2.x family. The following
+ * may be useful if you really want to do feature detection for earlier
+ * libarchive versions:
+ *
+ * #ifndef ARCHIVE_VERSION_STAMP
+ * #define ARCHIVE_VERSION_STAMP \
+ * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000)
+ * #endif
+ */
+#define ARCHIVE_VERSION_STAMP @ARCHIVE_VERSION_STAMP@
+int archive_version_stamp(void);
+
#define ARCHIVE_BYTES_PER_RECORD 512
#define ARCHIVE_DEFAULT_BYTES_PER_BLOCK 10240
==== //depot/projects/opentoe/lib/libarchive/archive_read_open_memory.c#3 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.4 2007/04/02 00:25:11 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.6 2007/07/06 15:51:59 kientzle Exp $");
#include <errno.h>
#include <stdlib.h>
@@ -134,7 +134,7 @@
struct read_memory_data *mine = (struct read_memory_data *)client_data;
(void)a; /* UNUSED */
- if (skip > mine->end - mine->buffer)
+ if ((off_t)skip > (off_t)(mine->end - mine->buffer))
skip = mine->end - mine->buffer;
/* Round down to block size. */
skip /= mine->read_size;
==== //depot/projects/opentoe/lib/libarchive/archive_util.c#3 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.14 2007/05/29 01:00:19 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.15 2007/07/06 15:36:38 kientzle Exp $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -51,6 +51,12 @@
return (ARCHIVE_API_VERSION);
}
+int
+archive_version_stamp(void)
+{
+ return (ARCHIVE_VERSION_STAMP);
+}
+
const char *
archive_version(void)
{
==== //depot/projects/opentoe/lib/libarchive/test/main.c#5 (text+ko) ====
@@ -32,14 +32,16 @@
#include <time.h>
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.4 2007/06/13 03:30:46 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.5 2007/07/06 15:43:11 kientzle Exp $");
/* Default is to crash and try to force a core dump on failure. */
static int dump_on_failure = 1;
/* Default is to print some basic information about each test. */
static int quiet_flag = 0;
-/* Cumulative count of failures. */
+/* Cumulative count of component failures. */
static int failures = 0;
+/* Cumulative count of skipped component tests. */
+static int skips = 0;
/*
* My own implementation of the standard assert() macro emits the
@@ -59,6 +61,19 @@
static char msg[4096];
+/* Inform user that we're skipping a test. */
+void
+skipping(const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ fprintf(stderr, " *** SKIPPING: ");
+ vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "\n");
+ va_end(ap);
+ ++skips;
+}
+
/* Common handling of failed tests. */
static void
test_failed(struct archive *a)
@@ -202,7 +217,7 @@
exit(1);
}
(*tests[i].func)();
- return (failures - failures_before);
+ return (failures == failures_before ? 0 : 1);
}
static void usage(void)
@@ -226,7 +241,7 @@
int main(int argc, char **argv)
{
static const int limit = sizeof(tests) / sizeof(tests[0]);
- int i, tests_run = 0, tests_succeeded = 0, opt;
+ int i, tests_run = 0, tests_failed = 0, opt;
time_t now;
char tmpdir[256];
@@ -266,13 +281,16 @@
exit(1);
}
- printf("Running libarchive tests in: %s\n", tmpdir);
+ if (!quiet_flag) {
+ printf("Running libarchive tests in: %s\n", tmpdir);
+ printf("Exercising %s\n", archive_version());
+ }
if (argc == 0) {
/* Default: Run all tests. */
for (i = 0; i < limit; i++) {
- if (test_run(i, tmpdir) == 0)
- tests_succeeded++;
+ if (test_run(i, tmpdir))
+ tests_failed++;
tests_run++;
}
} else {
@@ -282,13 +300,16 @@
printf("*** INVALID Test %s\n", *argv);
usage();
} else {
- if (test_run(i, tmpdir) == 0)
- tests_succeeded++;
+ if (test_run(i, tmpdir))
+ tests_failed++;
tests_run++;
}
}
}
-
- printf("%d of %d tests succeeded.\n", tests_succeeded, tests_run);
- return (tests_succeeded == tests_run ? 0 : 1);
+ printf("\n");
+ printf("%d of %d test groups reported failures\n",
+ tests_failed, tests_run);
+ printf(" Total of %d individual tests failed.\n", failures);
+ printf(" Total of %d individual tests were skipped.\n", skips);
+ return (tests_failed);
}
==== //depot/projects/opentoe/lib/libarchive/test/test.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/test/test.h,v 1.3 2007/05/29 01:00:20 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/test/test.h,v 1.4 2007/07/06 15:43:11 kientzle Exp $
*/
/* Every test program should #include "test.h" as the first thing. */
@@ -69,6 +69,18 @@
#endif
/*
+ * ARCHIVE_VERSION_STAMP first appeared in 1.9 and libarchive 2.2.4.
+ * We can approximate it for earlier versions, though.
+ * This is used to disable tests of features not present in the current
+ * version.
+ */
+#ifndef ARCHIVE_VERSION_STAMP
+#define ARCHIVE_VERSION_STAMP \
+ (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000)
+#endif
+
+
+/*
* "list.h" is simply created by "grep DEFINE_TEST"; it has
* a line like
* DEFINE_TEST(test_function)
@@ -106,6 +118,7 @@
/* Function declarations. These are defined in test_utility.c. */
void failure(const char *fmt, ...);
+void skipping(const char *fmt, ...);
void test_assert(const char *, int, int, const char *, struct archive *);
void test_assert_equal_int(const char *, int, int, const char *, int, const char *, struct archive *);
void test_assert_equal_string(const char *, int, const char *v1, const char *, const char *v2, const char *, struct archive *);
==== //depot/projects/opentoe/lib/libarchive/test/test_acl_basic.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.3 2007/05/29 01:00:20 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.4 2007/07/06 15:43:11 kientzle Exp $");
/*
* Exercise the system-independent portion of the ACL support.
@@ -165,7 +165,12 @@
assert(matched == 1);
}
}
+#if ARCHIVE_VERSION_STAMP < 1009000
+ /* Known broken before 1.9.0. */
+ skipping("archive_entry_acl_next() exits with ARCHIVE_EOF");
+#else
assertEqualInt(ARCHIVE_EOF, r);
+#endif
assert((mode & 0777) == (archive_entry_mode(ae) & 0777));
failure("Could not find match for ACL "
"(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')",
==== //depot/projects/opentoe/lib/libarchive/test/test_acl_pax.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_pax.c,v 1.3 2007/05/29 01:00:20 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_pax.c,v 1.4 2007/07/06 15:43:11 kientzle Exp $");
/*
* Exercise the system-independent portion of the ACL support.
@@ -390,7 +390,12 @@
assert(matched == 1);
}
}
+#if ARCHIVE_VERSION_STAMP < 1009000
+ /* Known broken before 1.9.0. */
+ skipping("archive_entry_acl_next() exits with ARCHIVE_EOF");
+#else
assertEqualInt(ARCHIVE_EOF, r);
+#endif
assert((mode & 0777) == (archive_entry_mode(ae) & 0777));
failure("Could not find match for ACL "
"(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')",
==== //depot/projects/opentoe/lib/libarchive/test/test_archive_api_feature.c#3 (text+ko) ====
@@ -23,11 +23,29 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.2 2007/05/29 01:00:20 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.3 2007/07/06 15:43:11 kientzle Exp $");
DEFINE_TEST(test_archive_api_feature)
{
assertEqualInt(ARCHIVE_API_FEATURE, archive_api_feature());
assertEqualInt(ARCHIVE_API_VERSION, archive_api_version());
+ /*
+ * Even though ARCHIVE_VERSION_STAMP only appears in
+ * archive.h after 1.9.0 and 2.2.3, the macro is synthesized
+ * in test.h, so this test is always valid.
+ */
+ assertEqualInt(ARCHIVE_VERSION_STAMP / 1000, ARCHIVE_API_VERSION * 1000 + ARCHIVE_API_FEATURE);
+ /*
+ * The function, however, isn't always available. It appeared
+ * sometime in the middle of 2.2.3, but the synthesized value
+ * never has a release version, so the following conditional
+ * exactly determines whether the current library has the
+ * function.
+ */
+#if ARCHIVE_VERSION_STAMP / 1000 == 1009 || ARCHIVE_VERSION_STAMP > 2002000
+ assertEqualInt(ARCHIVE_VERSION_STAMP, archive_version_stamp());
+#else
+ skipping("archive_version_stamp()");
+#endif
assertEqualString(ARCHIVE_LIBRARY_VERSION, archive_version());
}
==== //depot/projects/opentoe/lib/libarchive/test/test_entry.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.1 2007/05/29 01:00:20 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.2 2007/07/06 15:43:11 kientzle Exp $");
/*
* Most of these tests are system-independent, though a few depend on
@@ -49,6 +49,7 @@
const char *xname; /* For xattr tests. */
const void *xval; /* For xattr tests. */
size_t xsize; /* For xattr tests. */
+ int c;
assert((e = archive_entry_new()) != NULL);
@@ -72,13 +73,21 @@
archive_entry_set_ctime(e, 13580, 24681);
assertEqualInt(archive_entry_ctime(e), 13580);
assertEqualInt(archive_entry_ctime_nsec(e), 24681);
+#if ARCHIVE_VERSION_STAMP >= 1009000
/* dev */
archive_entry_set_dev(e, 235);
assertEqualInt(archive_entry_dev(e), 235);
+#else
+ skipping("archive_entry_dev()");
+#endif
/* devmajor/devminor are tested specially below. */
+#if ARCHIVE_VERSION_STAMP >= 1009000
/* filetype */
archive_entry_set_filetype(e, AE_IFREG);
assertEqualInt(archive_entry_filetype(e), AE_IFREG);
+#else
+ skipping("archive_entry_filetype()");
+#endif
/* fflags are tested specially below */
/* gid */
archive_entry_set_gid(e, 204);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list