Date: Sun, 6 May 2007 19:45:11 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 119365 for review Message-ID: <200705061945.l46JjB2c085706@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=119365 Change 119365 by imp@imp_paco-paco on 2007/05/06 19:44:57 IFC @119361 Affected files ... .. //depot/projects/arm/src/bin/df/df.c#6 integrate .. //depot/projects/arm/src/bin/sh/var.c#2 integrate .. //depot/projects/arm/src/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/arm/src/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/arm/src/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/arm/src/contrib/gdb/gdb/ppcfbsd-nat.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate .. //depot/projects/arm/src/contrib/top/commands.c#3 integrate .. //depot/projects/arm/src/contrib/top/machine.h#3 integrate .. //depot/projects/arm/src/contrib/top/top.X#3 integrate .. //depot/projects/arm/src/contrib/top/top.c#4 integrate .. //depot/projects/arm/src/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/arm/src/etc/rc.d/netoptions#3 integrate .. //depot/projects/arm/src/etc/rc.d/routing#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/powerpc/Makefile#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/powerpc/init.c#2 integrate .. //depot/projects/arm/src/include/stdlib.h#2 integrate .. //depot/projects/arm/src/lib/libarchive/Makefile#12 integrate .. //depot/projects/arm/src/lib/libarchive/archive.h.in#13 integrate .. //depot/projects/arm/src/lib/libc/Versions.def#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/arm/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/db/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/gen/Symbol.map#5 integrate .. //depot/projects/arm/src/lib/libc/gmon/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/i386/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/ia64/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/inet/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/locale/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isdigit.3#3 integrate .. //depot/projects/arm/src/lib/libc/nameser/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/net/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/nls/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/posix1e/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/powerpc/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/quad/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/regex/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/resolv/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/rpc/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/softfloat/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getenv.3#4 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getenv.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdlib/putenv.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdlib/setenv.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdtime/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/string/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/arm/src/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/uuid/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/xdr/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libc/yp/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libelf/Version.map#3 integrate .. //depot/projects/arm/src/lib/libgeom/Makefile#2 integrate .. //depot/projects/arm/src/lib/libgeom/geom_getxml.c#2 integrate .. //depot/projects/arm/src/lib/libgeom/geom_util.c#1 branch .. //depot/projects/arm/src/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/arm/src/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/arm/src/lib/libpthread/pthread.map#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/arm/src/lib/librt/Makefile#2 integrate .. //depot/projects/arm/src/lib/librt/Version.map#1 branch .. //depot/projects/arm/src/lib/libthr/pthread.map#3 integrate .. //depot/projects/arm/src/lib/libthread_db/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/libthread_db/arch/powerpc/libpthread_md.c#2 integrate .. //depot/projects/arm/src/lib/libutil/login_class.c#2 integrate .. //depot/projects/arm/src/lib/msun/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/msun/amd64/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/msun/arm/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/msun/bsdsrc/b_tgamma.c#2 integrate .. //depot/projects/arm/src/lib/msun/i387/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/msun/ia64/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/msun/powerpc/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/msun/sparc64/Symbol.map#2 integrate .. //depot/projects/arm/src/lib/msun/src/e_lgamma_r.c#2 integrate .. //depot/projects/arm/src/lib/msun/src/e_lgammaf_r.c#2 integrate .. //depot/projects/arm/src/libexec/pppoed/pppoed.c#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/Makefile#4 integrate .. //depot/projects/arm/src/libexec/rtld-elf/Symbol.map#3 integrate .. //depot/projects/arm/src/libexec/rtld-elf/Versions.def#3 delete .. //depot/projects/arm/src/libexec/rtld-elf/i386/Symbol.map#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/rtld.c#8 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate .. //depot/projects/arm/src/sbin/fdisk/fdisk.8#4 integrate .. //depot/projects/arm/src/sbin/fdisk/fdisk.c#2 integrate .. //depot/projects/arm/src/sbin/geom/class/eli/geom_eli.c#7 integrate .. //depot/projects/arm/src/sbin/geom/class/multipath/gmultipath.8#2 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/arm/src/sbin/mdmfs/mdmfs.c#4 integrate .. //depot/projects/arm/src/share/man/man4/snd_hda.4#7 integrate .. //depot/projects/arm/src/share/man/man4/uftdi.4#4 integrate .. //depot/projects/arm/src/share/man/man4/vlan.4#6 integrate .. //depot/projects/arm/src/share/man/man9/disk.9#4 integrate .. //depot/projects/arm/src/share/man/man9/rman.9#2 integrate .. //depot/projects/arm/src/share/misc/bsd-family-tree#7 integrate .. //depot/projects/arm/src/share/misc/committers-ports.dot#5 integrate .. //depot/projects/arm/src/share/misc/committers-src.dot#5 integrate .. //depot/projects/arm/src/share/mk/bsd.symver.mk#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#11 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mptable_pci.c#7 integrate .. //depot/projects/arm/src/sys/amd64/amd64/msi.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/nexus.c#10 integrate .. //depot/projects/arm/src/sys/amd64/include/intr_machdep.h#10 integrate .. //depot/projects/arm/src/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/arm/src/sys/amd64/pci/pci_bus.c#9 integrate .. //depot/projects/arm/src/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_machdep.c#15 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#12 integrate .. //depot/projects/arm/src/sys/boot/common/loader.8#8 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#15 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#20 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/arm/src/sys/conf/files#70 integrate .. //depot/projects/arm/src/sys/conf/kern.pre.mk#9 integrate .. //depot/projects/arm/src/sys/conf/options#44 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_acpi.c#8 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#13 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cam.c#8 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#17 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#32 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#23 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#13 integrate .. //depot/projects/arm/src/sys/dev/ciss/cissvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/em/LICENSE#3 integrate .. //depot/projects/arm/src/sys/dev/em/README#6 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_82540.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_82541.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_82541.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_82542.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_82543.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_82543.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_82571.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_82571.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_82575.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_82575.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_api.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_api.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_defines.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_hw.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_mac.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_mac.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_manage.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_manage.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_nvm.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_nvm.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_osdep.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_phy.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_phy.h#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_regs.h#1 branch .. //depot/projects/arm/src/sys/dev/em/if_em.c#36 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#15 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_hw.c#10 delete .. //depot/projects/arm/src/sys/dev/em/if_em_hw.h#9 delete .. //depot/projects/arm/src/sys/dev/em/if_em_osdep.h#7 delete .. //depot/projects/arm/src/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwdev.c#6 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwohcireg.h#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/if_fwip.c#5 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp.c#7 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/arm/src/sys/dev/hme/if_hme.c#8 integrate .. //depot/projects/arm/src/sys/dev/ipmi/ipmi_smbios.c#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp.c#21 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#27 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#20 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#25 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#17 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_tpublic.h#10 integrate .. //depot/projects/arm/src/sys/dev/mii/brgphy.c#18 integrate .. //depot/projects/arm/src/sys/dev/mii/mii.c#5 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#23 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#26 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#38 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.h#5 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#23 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.c#12 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#26 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_if.m#6 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#11 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_private.h#11 integrate .. //depot/projects/arm/src/sys/dev/pci/pcib_if.m#5 integrate .. //depot/projects/arm/src/sys/dev/pci/pcib_private.h#7 integrate .. //depot/projects/arm/src/sys/dev/pci/pcivar.h#12 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac_private.h#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#19 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.h#12 integrate .. //depot/projects/arm/src/sys/dev/stge/if_stge.c#6 integrate .. //depot/projects/arm/src/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_kbd_sun.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#10 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axereg.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rum.c#1 branch .. //depot/projects/arm/src/sys/dev/usb/if_rumreg.h#1 branch .. //depot/projects/arm/src/sys/dev/usb/if_rumvar.h#1 branch .. //depot/projects/arm/src/sys/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/arm/src/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#29 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_ioctl.c#7 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli_ctl.c#8 integrate .. //depot/projects/arm/src/sys/geom/geom.h#8 integrate .. //depot/projects/arm/src/sys/geom/geom_dev.c#7 integrate .. //depot/projects/arm/src/sys/geom/geom_disk.c#7 integrate .. //depot/projects/arm/src/sys/geom/geom_disk.h#5 integrate .. //depot/projects/arm/src/sys/geom/geom_io.c#9 integrate .. //depot/projects/arm/src/sys/geom/geom_slice.c#6 integrate .. //depot/projects/arm/src/sys/geom/geom_subr.c#6 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#20 integrate .. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#11 integrate .. //depot/projects/arm/src/sys/i386/i386/mptable_pci.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/msi.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/nexus.c#10 integrate .. //depot/projects/arm/src/sys/i386/include/intr_machdep.h#10 integrate .. //depot/projects/arm/src/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/arm/src/sys/i386/pci/pci_bus.c#8 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#13 integrate .. //depot/projects/arm/src/sys/ia64/include/vmparam.h#5 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#21 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#13 integrate .. //depot/projects/arm/src/sys/kern/sys_generic.c#10 integrate .. //depot/projects/arm/src/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_sockbuf.c#7 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#35 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#23 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#25 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#28 integrate .. //depot/projects/arm/src/sys/modules/Makefile#41 integrate .. //depot/projects/arm/src/sys/modules/em/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/rum/Makefile#1 branch .. //depot/projects/arm/src/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/arm/src/sys/net/if.h#9 integrate .. //depot/projects/arm/src/sys/net/if_lagg.c#2 integrate .. //depot/projects/arm/src/sys/net/if_lagg.h#2 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/arm/src/sys/netinet/ip_divert.c#10 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw.h#10 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#30 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_proxy.c#5 integrate .. //depot/projects/arm/src/sys/netinet/raw_ip.c#13 integrate .. //depot/projects/arm/src/sys/netinet/sctp.h#4 integrate .. //depot/projects/arm/src/sys/netinet/sctp_auth.c#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_header.h#3 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.h#4 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#12 integrate .. //depot/projects/arm/src/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#12 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#12 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_peeloff.c#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#12 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#12 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.h#10 integrate .. //depot/projects/arm/src/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#28 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#16 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#23 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#20 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#14 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#17 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#17 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#18 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#12 integrate .. //depot/projects/arm/src/sys/netinet6/in6_src.c#9 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.c#14 integrate .. //depot/projects/arm/src/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/arm/src/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/arm/src/sys/security/audit/audit_ioctl.h#4 integrate .. //depot/projects/arm/src/sys/sparc64/include/vmparam.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/machdep.c#9 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/arm/src/sys/sun4v/include/vmparam.h#3 integrate .. //depot/projects/arm/src/sys/sys/disk.h#3 integrate .. //depot/projects/arm/src/sys/sys/filedesc.h#5 integrate .. //depot/projects/arm/src/sys/sys/interrupt.h#6 integrate .. //depot/projects/arm/src/sys/sys/param.h#28 integrate .. //depot/projects/arm/src/sys/sys/socketvar.h#14 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#18 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#26 integrate .. //depot/projects/arm/src/sys/vm/vm_page.h#11 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#13 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.usholiday#2 integrate .. //depot/projects/arm/src/usr.bin/du/du.c#2 integrate .. //depot/projects/arm/src/usr.bin/env/env.c#2 integrate .. //depot/projects/arm/src/usr.bin/lastcomm/Makefile#2 integrate .. //depot/projects/arm/src/usr.bin/lastcomm/lastcomm.c#4 integrate .. //depot/projects/arm/src/usr.bin/limits/limits.c#2 integrate .. //depot/projects/arm/src/usr.bin/login/login.c#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/inet.c#5 integrate .. //depot/projects/arm/src/usr.bin/stat/stat.1#2 integrate .. //depot/projects/arm/src/usr.bin/su/su.c#5 integrate .. //depot/projects/arm/src/usr.bin/tar/write.c#9 integrate .. //depot/projects/arm/src/usr.sbin/diskinfo/diskinfo.c#2 integrate .. //depot/projects/arm/src/usr.sbin/pstat/pstat.c#4 integrate .. //depot/projects/arm/src/usr.sbin/rpcbind/rpcbind.c#3 integrate .. //depot/projects/arm/src/usr.sbin/sade/main.c#3 integrate .. //depot/projects/arm/src/usr.sbin/sade/variable.c#3 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/variable.c#2 integrate .. //depot/projects/arm/src/usr.sbin/traceroute6/traceroute6.c#3 integrate Differences ... ==== //depot/projects/arm/src/bin/df/df.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.68 2007/04/06 15:36:43 kan Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.70 2007/05/01 16:02:44 ache Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/arm/src/bin/sh/var.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.32 2006/06/15 07:00:49 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.35 2007/05/01 16:02:43 ache Exp $"); #include <unistd.h> #include <stdlib.h> ==== //depot/projects/arm/src/cddl/lib/libzfs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3 2007/05/06 01:39:38 pjd Exp $ .PATH: ${.CURDIR}/../../../compat/opensolaris/misc .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs @@ -9,7 +9,8 @@ DPADD= ${LIBUTIL} LDADD= -lutil -SRCS= mnttab.c \ +SRCS= deviceid.c \ + mnttab.c \ mkdirp.c \ zmount.c \ fsshare.c \ ==== //depot/projects/arm/src/compat/opensolaris/include/devid.h#2 (text+ko) ==== @@ -27,23 +27,28 @@ #ifndef _OPENSOLARIS_DEVID_H_ #define _OPENSOLARIS_DEVID_H_ -#include <sys/types.h> +#include <sys/param.h> +#include <sys/disk.h> #include <stdlib.h> -typedef int ddi_devid_t; +typedef struct ddi_devid { + char devid[DISK_IDENT_SIZE]; +} ddi_devid_t; typedef struct devid_nmlist { - char *devname; + char devname[MAXPATHLEN]; dev_t dev; } devid_nmlist_t; -static inline int devid_str_decode(char *devidstr, ddi_devid_t *retdevid, char **retminor_name) { abort(); } -static inline int devid_deviceid_to_nmlist(char *search_path, ddi_devid_t devid, char *minor_name, devid_nmlist_t **retlist) { abort(); } -static inline void devid_str_free(char *str) { abort(); } -static inline void devid_free(ddi_devid_t devid) { abort(); } -static inline void devid_free_nmlist(devid_nmlist_t *list) { abort(); } -static inline int devid_get(int fd, ddi_devid_t *retdevid) { return -1; } -static inline int devid_get_minor_name(int fd, char **retminor_name) { abort(); } -static inline char *devid_str_encode(ddi_devid_t devid, char *minor_name) { abort(); } +int devid_str_decode(char *devidstr, ddi_devid_t *retdevid, + char **retminor_name); +int devid_deviceid_to_nmlist(char *search_path, ddi_devid_t devid, + char *minor_name, devid_nmlist_t **retlist); +void devid_str_free(char *str); +void devid_free(ddi_devid_t devid); +void devid_free_nmlist(devid_nmlist_t *list); +int devid_get(int fd, ddi_devid_t *retdevid); +int devid_get_minor_name(int fd, char **retminor_name); +char *devid_str_encode(ddi_devid_t devid, char *minor_name); #endif /* !_OPENSOLARIS_DEVID_H_ */ ==== //depot/projects/arm/src/contrib/gdb/gdb/ppcfbsd-nat.c#2 (text+ko) ==== @@ -143,11 +143,23 @@ } void +supply_gregset (char *regs) +{ + ppcfbsd_supply_reg (regs, -1); +} + +void fill_fpregset (char *fpregs, int regnum) { ppcfbsd_fill_fpreg (fpregs, regnum); } +void +supply_fpregset (char *fpregs) +{ + ppcfbsd_supply_fpreg (fpregs, -1); +} + /* Provide a prototype to silence -Wmissing-prototypes. */ void _initialize_ppcfbsd_nat (void); ==== //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 (text+ko) ==== @@ -159,18 +159,14 @@ static boolean_t is_provider(const char *name) { - off_t mediasize; int fd; - fd = open(name, O_RDONLY); - if (fd == -1) - return (B_FALSE); - if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) == -1) { - close(fd); - return (B_FALSE); + fd = g_open(name, 0); + if (fd >= 0) { + g_close(fd); + return (B_TRUE); } - close(fd); - return (B_TRUE); + return (B_FALSE); } /* @@ -183,9 +179,11 @@ nvlist_t * make_leaf_vdev(const char *arg) { - char path[MAXPATHLEN]; + char ident[DISK_IDENT_SIZE], path[MAXPATHLEN]; + struct stat64 statbuf; nvlist_t *vdev = NULL; char *type = NULL; + boolean_t wholedisk = B_FALSE; if (strncmp(arg, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) strlcpy(path, arg, sizeof (path)); @@ -212,6 +210,41 @@ verify(nvlist_add_uint64(vdev, ZPOOL_CONFIG_WHOLE_DISK, (uint64_t)B_FALSE) == 0); + /* + * For a whole disk, defer getting its devid until after labeling it. + */ + if (1 || (S_ISBLK(statbuf.st_mode) && !wholedisk)) { + /* + * Get the devid for the device. + */ + int fd; + ddi_devid_t devid; + char *minor = NULL, *devid_str = NULL; + + if ((fd = open(path, O_RDONLY)) < 0) { + (void) fprintf(stderr, gettext("cannot open '%s': " + "%s\n"), path, strerror(errno)); + nvlist_free(vdev); + return (NULL); + } + + if (devid_get(fd, &devid) == 0) { + if (devid_get_minor_name(fd, &minor) == 0 && + (devid_str = devid_str_encode(devid, minor)) != + NULL) { + verify(nvlist_add_string(vdev, + ZPOOL_CONFIG_DEVID, devid_str) == 0); + } + if (devid_str != NULL) + devid_str_free(devid_str); + if (minor != NULL) + devid_str_free(minor); + devid_free(devid); + } + + (void) close(fd); + } + return (vdev); } ==== //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 (text+ko) ==== @@ -446,10 +446,6 @@ extern int ddi_strtoul(const char *str, char **nptr, int base, unsigned long *result); -#ifdef __cplusplus -} -#endif - /* ZFS Boot Related stuff. */ struct _buf { @@ -508,4 +504,8 @@ #define ERESTART (-1) #endif +#ifdef __cplusplus +} +#endif + #endif /* _SYS_ZFS_CONTEXT_H */ ==== //depot/projects/arm/src/contrib/top/commands.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/commands.c,v 1.13 2007/04/17 03:12:39 rafan Exp $ + * $FreeBSD: src/contrib/top/commands.c,v 1.15 2007/05/04 15:42:58 rafan Exp $ */ /* @@ -73,7 +73,7 @@ e - list errors generated by last \"kill\" or \"renice\" command\n\ H - toggle the displaying of threads\n\ i or I - toggle the displaying of idle processes\n\ -j - toggle the displaying of jail id\n\ +j - toggle the displaying of jail ID\n\ k - kill processes; send a signal to a list of processes\n\ m - toggle the display between 'cpu' and 'io' modes\n\ n or # - change number of processes to display\n", stdout); @@ -89,6 +89,7 @@ r - renice a process\n\ s - change number of seconds to delay between updates\n\ S - toggle the displaying of system processes\n\ +a - toggle the displaying of process titles\n\ t - toggle the display of this process\n\ u - display processes for only one user (+ selects all users)\n\ \n\ ==== //depot/projects/arm/src/contrib/top/machine.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.8 2007/04/17 03:12:39 rafan Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.9 2007/05/04 15:42:58 rafan Exp $ */ /* @@ -62,7 +62,7 @@ int thread; /* show threads */ int uid; /* only this uid (unless uid == -1) */ int wcpu; /* show weighted cpu */ - int jail; /* show jail id */ + int jail; /* show jail ID */ char *command; /* only this command (unless == NULL) */ }; ==== //depot/projects/arm/src/contrib/top/top.X#3 (text+ko) ==== @@ -1,6 +1,6 @@ .\" NOTE: changes to the manual page for "top" should be made in the .\" file "top.X" and NOT in the file "top.1". -.\" $FreeBSD: src/contrib/top/top.X,v 1.18 2007/04/17 03:12:39 rafan Exp $ +.\" $FreeBSD: src/contrib/top/top.X,v 1.20 2007/05/04 15:42:58 rafan Exp $ .nr N %topn% .nr D %delay% .TH TOP 1 Local @@ -105,7 +105,7 @@ .B \-j Display the .IR jail (8) -id. +ID. .TP .B \-t Do not display the @@ -255,6 +255,9 @@ .B S Toggle the display of system processes. .TP +.B a +Toggle the display of process titles. +.TP .B k Send a signal (\*(lqkill\*(rq by default) to a list of processes. This acts similarly to the command @@ -291,7 +294,7 @@ .B j Toggle the display of .IR jail (8) -id. +ID. .TP .B t Toggle the display of the ==== //depot/projects/arm/src/contrib/top/top.c#4 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.22 2007/04/19 14:24:54 rafan Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.23 2007/05/04 15:42:58 rafan Exp $ */ /* @@ -1064,7 +1064,7 @@ case CMD_jidtog: ps.jail = !ps.jail; new_message(MT_standout | MT_delayed, - " %sisplaying jail id.", + " %sisplaying jail ID.", ps.jail ? "D" : "Not d"); header_text = format_header(uname_field); reset_display(); ==== //depot/projects/arm/src/contrib/traceroute/traceroute.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.32 2006/10/15 17:44:49 dwmalone Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.33 2007/04/30 19:08:12 maxim Exp $"; #endif /* @@ -630,7 +630,7 @@ case 'w': waittime = str2val(optarg, "wait time", - 2, 24 * 60 * 60); + 1, 24 * 60 * 60); break; case 'z': ==== //depot/projects/arm/src/etc/rc.d/netoptions#3 (text+ko) ==== @@ -1,17 +1,17 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/netoptions,v 1.142 2007/04/09 10:09:39 des Exp $ +# $FreeBSD: src/etc/rc.d/netoptions,v 1.144 2007/05/02 15:49:30 mtm Exp $ # # PROVIDE: netoptions -# REQUIRE: localpkg +# REQUIRE: FILESYSTEMS # KEYWORD: nojail . /etc/rc.subr load_rc_config 'XXX' -echo -n 'Additional TCP options:' +echo -n 'Additional IP options:' case ${log_in_vain} in [Nn][Oo] | '') log_in_vain=0 @@ -32,4 +32,46 @@ sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null ) + +case ${tcp_extensions} in +[Yy][Ee][Ss] | '') + ;; +*) + echo -n ' tcp extensions=NO' + sysctl net.inet.tcp.rfc1323=0 >/dev/null + ;; +esac + +case ${tcp_keepalive} in +[Nn][Oo]) + echo -n ' TCP keepalive=NO' + sysctl net.inet.tcp.always_keepalive=0 >/dev/null + ;; +esac + +case ${tcp_drop_synfin} in +[Yy][Ee][Ss]) + echo -n ' drop SYN+FIN packets=YES' + sysctl net.inet.tcp.drop_synfin=1 >/dev/null + ;; +esac + +case ${ip_portrange_first} in +[Nn][Oo] | '') + ;; +*) + echo -n " ip_portrange_first=$ip_portrange_first" + sysctl net.inet.ip.portrange.first=$ip_portrange_first >/dev/null + ;; +esac + +case ${ip_portrange_last} in +[Nn][Oo] | '') + ;; +*) + echo -n " ip_portrange_last=$ip_portrange_last" + sysctl net.inet.ip.portrange.last=$ip_portrange_last >/dev/null + ;; +esac + echo '.' ==== //depot/projects/arm/src/etc/rc.d/routing#2 (text+ko) ==== @@ -2,7 +2,7 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.142 2005/10/28 16:07:52 yar Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.143 2007/05/02 15:49:30 mtm Exp $ # # PROVIDE: routing @@ -61,15 +61,6 @@ options_start() { echo -n 'Additional routing options:' - case ${tcp_extensions} in - [Yy][Ee][Ss] | '') - ;; - *) - echo -n ' tcp extensions=NO' - sysctl net.inet.tcp.rfc1323=0 >/dev/null - ;; - esac - case ${icmp_bmcastecho} in [Yy][Ee][Ss]) echo -n ' broadcast ping responses=YES' @@ -112,20 +103,6 @@ ;; esac - case ${tcp_keepalive} in - [Nn][Oo]) - echo -n ' TCP keepalive=NO' - sysctl net.inet.tcp.always_keepalive=0 >/dev/null - ;; - esac - - case ${tcp_drop_synfin} in - [Yy][Ee][Ss]) - echo -n ' drop SYN+FIN packets=YES' - sysctl net.inet.tcp.drop_synfin=1 >/dev/null - ;; - esac - case ${ipxgateway_enable} in [Yy][Ee][Ss]) echo -n ' IPX gateway=YES' @@ -140,24 +117,6 @@ ;; esac - case ${ip_portrange_first} in - [Nn][Oo] | '') - ;; - *) - echo -n " ip_portrange_first=$ip_portrange_first" - sysctl net.inet.ip.portrange.first=$ip_portrange_first >/dev/null - ;; - esac - - case ${ip_portrange_last} in - [Nn][Oo] | '') - ;; - *) - echo -n " ip_portrange_last=$ip_portrange_last" - sysctl net.inet.ip.portrange.last=$ip_portrange_last >/dev/null - ;; - esac - echo '.' } ==== //depot/projects/arm/src/gnu/usr.bin/gdb/arch/powerpc/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/powerpc/Makefile,v 1.1 2006/08/24 02:44:59 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/powerpc/Makefile,v 1.2 2007/05/01 18:29:34 marcel Exp $ .if !defined(GDB_CROSS_DEBUGGER) -LIBSRCS+= fbsd-proc.c gcore.c +LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c LIBSRCS+= ppcfbsd-nat.c .endif LIBSRCS+= solib.c solib-svr4.c ==== //depot/projects/arm/src/gnu/usr.bin/gdb/arch/powerpc/init.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/powerpc/init.c,v 1.1 2006/08/24 02:44:59 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/powerpc/init.c,v 1.2 2007/05/01 18:29:34 marcel Exp $ */ /* Do not modify this file. */ /* It is created automatically by the Makefile. */ @@ -19,6 +19,7 @@ extern initialize_file_ftype _initialize_infptrace; extern initialize_file_ftype _initialize_inftarg; extern initialize_file_ftype _initialize_ppcfbsd_nat; +extern initialize_file_ftype _initialize_thread_db; extern initialize_file_ftype _initialize_remote; extern initialize_file_ftype _initialize_dcache; extern initialize_file_ftype _initialize_sr_support; @@ -131,6 +132,7 @@ _initialize_infptrace (); _initialize_inftarg (); _initialize_ppcfbsd_nat (); + _initialize_thread_db (); #endif _initialize_remote (); _initialize_dcache (); ==== //depot/projects/arm/src/include/stdlib.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.62 2006/03/14 16:57:30 andre Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.64 2007/05/01 16:02:44 ache Exp $ */ #ifndef _STDLIB_H_ ==== //depot/projects/arm/src/lib/libarchive/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.70 2007/04/15 00:53:38 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.71 2007/05/02 05:29:55 cperciva Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -32,7 +32,7 @@ # 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/@VERSION@/${VERSION}/g' | \ + 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' | \ ==== //depot/projects/arm/src/lib/libarchive/archive.h.in#13 (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.42 2007/04/14 22:34:10 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.43 2007/05/02 05:29:55 cperciva Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -30,7 +30,7 @@ /* * This header file corresponds to: - * Library version @VERSION@ + * Library version @ARCHIVE_VERSION@ * Shared library version @SHLIB_MAJOR@ */ @@ -73,7 +73,7 @@ #define ARCHIVE_API_FEATURE @ARCHIVE_API_MINOR@ int archive_api_feature(void); /* Textual name/version of the library. */ -#define ARCHIVE_LIBRARY_VERSION "libarchive @VERSION@" +#define ARCHIVE_LIBRARY_VERSION "libarchive @ARCHIVE_VERSION@" const char * archive_version(void); #define ARCHIVE_BYTES_PER_RECORD 512 ==== //depot/projects/arm/src/lib/libc/Versions.def#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/Versions.def,v 1.1 2006/03/13 00:53:15 deischen Exp $ +# $FreeBSD: src/lib/libc/Versions.def,v 1.3 2007/04/29 16:14:17 kan Exp $ # This is our first version; it depends on no other. FBSD_1.0 { @@ -8,5 +8,5 @@ # strictly for use only by other FreeBSD applications and libraries # are listed here. We use a separate namespace so we can write # simple ABI-checking tools. -FBSDprivate { -}; +FBSDprivate_1.0 { +} FBSD_1.0; ==== //depot/projects/arm/src/lib/libc/amd64/Symbol.map#2 (text) ==== @@ -1,12 +1,14 @@ -# $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.1 2006/03/13 00:53:16 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.2 2007/04/29 14:05:15 deischen Exp $ + */ -# -# This only needs to contain symbols that are not listed in -# symbol maps from other parts of libc (i.e., not found in -# stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...). -# +/* + * This only needs to contain symbols that are not listed in + * symbol maps from other parts of libc (i.e., not found in + * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...). + */ FBSD_1.0 { - # PSEUDO syscalls + /* PSEUDO syscalls */ _exit; _setjmp; @@ -47,11 +49,13 @@ vfork; }; -# -# FreeBSD private ABI -# -FBSDprivate { - # PSEUDO syscalls +/* + * + * FreeBSD private ABI + * + */ +FBSDprivate_1.0 { + /* PSEUDO syscalls */ __sys_getlogin; _getlogin; __sys_exit; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705061945.l46JjB2c085706>