From owner-svn-src-projects@FreeBSD.ORG Fri Oct 23 17:02:39 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 711D81065696; Fri, 23 Oct 2009 17:02:39 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5B3C88FC28; Fri, 23 Oct 2009 17:02:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9NH2dB1067105; Fri, 23 Oct 2009 17:02:39 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9NH2ciX067053; Fri, 23 Oct 2009 17:02:38 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200910231702.n9NH2ciX067053@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 23 Oct 2009 17:02:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r198416 - in projects/ppc64: . bin/cat bin/csh bin/ls bin/sh bin/uuidgen contrib/gcc/config/i386 crypto/openssh etc etc/defaults etc/rc.d games/number kerberos5/lib/libgssapi_krb5 kerbe... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2009 17:02:39 -0000 Author: nwhitehorn Date: Fri Oct 23 17:02:37 2009 New Revision: 198416 URL: http://svn.freebsd.org/changeset/base/198416 Log: IFC @ 198401, and associated changes. This brings up SMP on 64-bit PowerPC (tested on Xserve G5). Added: projects/ppc64/share/man/man9/BUS_BIND_INTR.9 - copied unchanged from r198401, head/share/man/man9/BUS_BIND_INTR.9 projects/ppc64/share/man/man9/BUS_DESCRIBE_INTR.9 - copied unchanged from r198401, head/share/man/man9/BUS_DESCRIBE_INTR.9 projects/ppc64/sys/cam/ata/ata_pmp.c - copied unchanged from r198401, head/sys/cam/ata/ata_pmp.c projects/ppc64/sys/contrib/dev/acpica/common/dmextern.c - copied unchanged from r198401, head/sys/contrib/dev/acpica/common/dmextern.c projects/ppc64/sys/dev/ath/ath_hal/ah_eeprom_v4k.c - copied unchanged from r198401, head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c projects/ppc64/sys/dev/ath/ath_hal/ah_eeprom_v4k.h - copied unchanged from r198401, head/sys/dev/ath/ath_hal/ah_eeprom_v4k.h projects/ppc64/sys/dev/usb/controller/ehcireg.h - copied unchanged from r198401, head/sys/dev/usb/controller/ehcireg.h projects/ppc64/sys/dev/usb/controller/ohcireg.h - copied unchanged from r198401, head/sys/dev/usb/controller/ohcireg.h projects/ppc64/sys/dev/usb/controller/uhcireg.h - copied unchanged from r198401, head/sys/dev/usb/controller/uhcireg.h Deleted: projects/ppc64/sys/compat/x86bios/x86bios_alloc.c projects/ppc64/sys/contrib/x86emu/x86emu_util.c projects/ppc64/sys/dev/usb/serial/uch341.c projects/ppc64/sys/modules/usb/uch341/ Modified: projects/ppc64/ (props changed) projects/ppc64/Makefile.inc1 projects/ppc64/ObsoleteFiles.inc projects/ppc64/bin/cat/Makefile projects/ppc64/bin/csh/iconv_stub.c projects/ppc64/bin/ls/ls.c projects/ppc64/bin/sh/parser.c projects/ppc64/bin/uuidgen/Makefile projects/ppc64/contrib/gcc/config/i386/i386.c projects/ppc64/crypto/openssh/sshd_config projects/ppc64/etc/defaults/rc.conf projects/ppc64/etc/gettytab projects/ppc64/etc/rc.d/bgfsck projects/ppc64/etc/rc.d/cleartmp projects/ppc64/etc/rc.d/faith projects/ppc64/etc/rc.d/fsck projects/ppc64/etc/rc.d/hostid projects/ppc64/etc/rc.d/hostname projects/ppc64/etc/rc.d/ldconfig projects/ppc64/etc/rc.d/motd projects/ppc64/etc/rc.d/mountcritlocal projects/ppc64/etc/rc.d/moused projects/ppc64/etc/rc.d/netif projects/ppc64/etc/rc.d/netoptions projects/ppc64/etc/rc.d/newsyslog projects/ppc64/etc/rc.d/nfsclient projects/ppc64/etc/rc.d/pf projects/ppc64/etc/rc.d/savecore projects/ppc64/etc/rc.d/stf projects/ppc64/etc/rc.subr projects/ppc64/games/number/Makefile projects/ppc64/games/number/number.c projects/ppc64/kerberos5/lib/libgssapi_krb5/Makefile projects/ppc64/kerberos5/lib/libgssapi_spnego/Makefile projects/ppc64/lib/libc/gen/getcwd.c projects/ppc64/lib/libc/include/namespace.h projects/ppc64/lib/libc/include/un-namespace.h projects/ppc64/lib/libc/nls/C.msg projects/ppc64/lib/libc/sys/Symbol.map projects/ppc64/lib/libc/sys/intro.2 projects/ppc64/lib/libc/sys/nanosleep.2 projects/ppc64/lib/libfetch/common.c projects/ppc64/lib/libthr/pthread.map projects/ppc64/lib/libthr/thread/thr_private.h projects/ppc64/lib/libthr/thread/thr_syscalls.c projects/ppc64/lib/libusb/libusb20_ugen20.c projects/ppc64/libexec/rtld-elf/rtld.c projects/ppc64/release/doc/README projects/ppc64/release/doc/en_US.ISO8859-1/errata/article.sgml projects/ppc64/release/doc/share/mk/doc.relnotes.mk projects/ppc64/release/doc/share/sgml/release.dsl projects/ppc64/release/doc/share/sgml/release.ent projects/ppc64/release/scripts/package-split.py projects/ppc64/sbin/Makefile.inc projects/ppc64/sbin/adjkerntz/Makefile projects/ppc64/sbin/atacontrol/Makefile projects/ppc64/sbin/atm/atmconfig/Makefile projects/ppc64/sbin/badsect/Makefile projects/ppc64/sbin/bsdlabel/Makefile projects/ppc64/sbin/camcontrol/Makefile projects/ppc64/sbin/ccdconfig/Makefile projects/ppc64/sbin/clri/Makefile projects/ppc64/sbin/comcontrol/Makefile projects/ppc64/sbin/conscontrol/Makefile projects/ppc64/sbin/dhclient/Makefile projects/ppc64/sbin/dhclient/bpf.c projects/ppc64/sbin/dhclient/dhcpd.h projects/ppc64/sbin/dhclient/packet.c projects/ppc64/sbin/dmesg/Makefile projects/ppc64/sbin/dump/Makefile projects/ppc64/sbin/dumpfs/Makefile projects/ppc64/sbin/dumpfs/dumpfs.c projects/ppc64/sbin/dumpon/Makefile projects/ppc64/sbin/geom/Makefile projects/ppc64/sbin/geom/Makefile.inc projects/ppc64/sbin/geom/class/part/gpart.8 projects/ppc64/sbin/ggate/Makefile.inc projects/ppc64/sbin/growfs/Makefile projects/ppc64/sbin/gvinum/Makefile projects/ppc64/sbin/ifconfig/af_nd6.c projects/ppc64/sbin/ifconfig/ifieee80211.c projects/ppc64/sbin/init/Makefile projects/ppc64/sbin/ipf/Makefile.inc projects/ppc64/sbin/iscontrol/Makefile projects/ppc64/sbin/kldunload/Makefile projects/ppc64/sbin/ldconfig/Makefile projects/ppc64/sbin/md5/Makefile projects/ppc64/sbin/mdconfig/Makefile projects/ppc64/sbin/mdmfs/Makefile projects/ppc64/sbin/mksnap_ffs/Makefile projects/ppc64/sbin/mount/Makefile projects/ppc64/sbin/mount_autofs/Makefile projects/ppc64/sbin/mount_cd9660/Makefile projects/ppc64/sbin/mount_ext2fs/Makefile projects/ppc64/sbin/mount_msdosfs/Makefile projects/ppc64/sbin/mount_nullfs/Makefile projects/ppc64/sbin/mount_reiserfs/Makefile projects/ppc64/sbin/mount_unionfs/Makefile projects/ppc64/sbin/newfs_msdos/Makefile projects/ppc64/sbin/nfsiod/Makefile projects/ppc64/sbin/pfctl/Makefile projects/ppc64/sbin/rcorder/Makefile projects/ppc64/sbin/reboot/Makefile projects/ppc64/sbin/recoverdisk/Makefile projects/ppc64/sbin/routed/Makefile projects/ppc64/sbin/savecore/Makefile projects/ppc64/sbin/sconfig/Makefile projects/ppc64/sbin/shutdown/Makefile projects/ppc64/sbin/spppcontrol/Makefile projects/ppc64/sbin/swapon/Makefile projects/ppc64/sbin/sysctl/sysctl.c projects/ppc64/sbin/tunefs/Makefile projects/ppc64/sbin/tunefs/tunefs.8 projects/ppc64/share/man/man4/Makefile projects/ppc64/share/man/man4/atapicam.4 projects/ppc64/share/man/man4/hifn.4 projects/ppc64/share/man/man4/ichwd.4 projects/ppc64/share/man/man4/mac_mls.4 projects/ppc64/share/man/man4/malo.4 projects/ppc64/share/man/man4/sbp_targ.4 projects/ppc64/share/man/man4/targ.4 projects/ppc64/share/man/man4/umass.4 projects/ppc64/share/man/man4/urtw.4 projects/ppc64/share/man/man9/Makefile projects/ppc64/share/misc/bsd-family-tree projects/ppc64/share/misc/committers-src.dot projects/ppc64/share/mk/bsd.sys.mk projects/ppc64/share/zoneinfo/ (props changed) projects/ppc64/share/zoneinfo/Makefile projects/ppc64/share/zoneinfo/asia projects/ppc64/share/zoneinfo/australasia projects/ppc64/sys/ (props changed) projects/ppc64/sys/amd64/amd64/intr_machdep.c projects/ppc64/sys/amd64/amd64/nexus.c projects/ppc64/sys/amd64/amd64/pmap.c projects/ppc64/sys/amd64/conf/GENERIC projects/ppc64/sys/amd64/include/elf.h projects/ppc64/sys/amd64/include/intr_machdep.h projects/ppc64/sys/arm/arm/pmap.c projects/ppc64/sys/arm/conf/HL200 projects/ppc64/sys/arm/conf/KB920X projects/ppc64/sys/arm/include/elf.h projects/ppc64/sys/boot/i386/zfsboot/zfsboot.c projects/ppc64/sys/cam/ata/ata_da.c projects/ppc64/sys/cam/ata/ata_xpt.c projects/ppc64/sys/cam/cam.h projects/ppc64/sys/cam/cam_periph.c projects/ppc64/sys/cam/cam_queue.c projects/ppc64/sys/cam/cam_xpt.c projects/ppc64/sys/cam/cam_xpt_internal.h projects/ppc64/sys/cam/scsi/scsi_all.c projects/ppc64/sys/cam/scsi/scsi_cd.c projects/ppc64/sys/cam/scsi/scsi_ch.c projects/ppc64/sys/cam/scsi/scsi_da.c projects/ppc64/sys/cam/scsi/scsi_low.c projects/ppc64/sys/cam/scsi/scsi_pt.c projects/ppc64/sys/cam/scsi/scsi_sa.c projects/ppc64/sys/cam/scsi/scsi_targ_bh.c projects/ppc64/sys/cam/scsi/scsi_target.c projects/ppc64/sys/cam/scsi/scsi_xpt.c projects/ppc64/sys/compat/x86bios/x86bios.c projects/ppc64/sys/compat/x86bios/x86bios.h projects/ppc64/sys/conf/NOTES projects/ppc64/sys/conf/files projects/ppc64/sys/conf/files.amd64 projects/ppc64/sys/conf/files.i386 projects/ppc64/sys/conf/options projects/ppc64/sys/contrib/dev/acpica/ (props changed) projects/ppc64/sys/contrib/dev/acpica/changes.txt projects/ppc64/sys/contrib/dev/acpica/common/adfile.c projects/ppc64/sys/contrib/dev/acpica/common/adisasm.c projects/ppc64/sys/contrib/dev/acpica/common/adwalk.c projects/ppc64/sys/contrib/dev/acpica/common/dmtable.c projects/ppc64/sys/contrib/dev/acpica/common/getopt.c projects/ppc64/sys/contrib/dev/acpica/compiler/aslload.c projects/ppc64/sys/contrib/dev/acpica/debugger/dbcmds.c projects/ppc64/sys/contrib/dev/acpica/debugger/dbinput.c projects/ppc64/sys/contrib/dev/acpica/disassembler/dmutils.c projects/ppc64/sys/contrib/dev/acpica/disassembler/dmwalk.c projects/ppc64/sys/contrib/dev/acpica/dispatcher/dswload.c projects/ppc64/sys/contrib/dev/acpica/events/evregion.c projects/ppc64/sys/contrib/dev/acpica/include/acapps.h projects/ppc64/sys/contrib/dev/acpica/include/acdebug.h projects/ppc64/sys/contrib/dev/acpica/include/acdisasm.h projects/ppc64/sys/contrib/dev/acpica/include/acglobal.h projects/ppc64/sys/contrib/dev/acpica/include/aclocal.h projects/ppc64/sys/contrib/dev/acpica/include/acpixf.h projects/ppc64/sys/contrib/dev/acpica/namespace/nsrepair.c projects/ppc64/sys/contrib/dev/acpica/utilities/utglobal.c projects/ppc64/sys/dev/agp/agp_i810.c projects/ppc64/sys/dev/ahci/ahci.c projects/ppc64/sys/dev/ahci/ahci.h projects/ppc64/sys/dev/aic7xxx/aicasm/aicasm.c projects/ppc64/sys/dev/atkbdc/atkbd.c projects/ppc64/sys/dev/bce/if_bce.c projects/ppc64/sys/dev/bce/if_bcereg.h projects/ppc64/sys/dev/bge/if_bge.c projects/ppc64/sys/dev/dpms/dpms.c projects/ppc64/sys/dev/drm/drm_pciids.h projects/ppc64/sys/dev/drm/i915_drv.h projects/ppc64/sys/dev/drm/mach64_state.c projects/ppc64/sys/dev/fb/vesa.c projects/ppc64/sys/dev/fdc/fdc.c projects/ppc64/sys/dev/gem/if_gem_pci.c projects/ppc64/sys/dev/hwpmc/hwpmc_mod.c projects/ppc64/sys/dev/ips/ips_disk.c projects/ppc64/sys/dev/mpt/mpt.c projects/ppc64/sys/dev/mpt/mpt.h projects/ppc64/sys/dev/mpt/mpt_cam.c projects/ppc64/sys/dev/mpt/mpt_raid.c projects/ppc64/sys/dev/mwl/if_mwl_pci.c projects/ppc64/sys/dev/mxge/if_mxge.c projects/ppc64/sys/dev/mxge/if_mxge_var.h projects/ppc64/sys/dev/pci/pci.c projects/ppc64/sys/dev/pci/vga_pci.c projects/ppc64/sys/dev/ppbus/lpt.c projects/ppc64/sys/dev/ppbus/pcfclock.c projects/ppc64/sys/dev/siis/siis.c projects/ppc64/sys/dev/usb/controller/ehci.c projects/ppc64/sys/dev/usb/controller/ehci.h projects/ppc64/sys/dev/usb/controller/ehci_ixp4xx.c projects/ppc64/sys/dev/usb/controller/ehci_mbus.c projects/ppc64/sys/dev/usb/controller/ehci_pci.c projects/ppc64/sys/dev/usb/controller/ohci.c projects/ppc64/sys/dev/usb/controller/ohci.h projects/ppc64/sys/dev/usb/controller/ohci_atmelarm.c projects/ppc64/sys/dev/usb/controller/ohci_pci.c projects/ppc64/sys/dev/usb/controller/uhci.c projects/ppc64/sys/dev/usb/controller/uhci.h projects/ppc64/sys/dev/usb/controller/uhci_pci.c projects/ppc64/sys/dev/usb/input/ukbd.c projects/ppc64/sys/dev/usb/input/ums.c projects/ppc64/sys/dev/usb/net/if_cdce.c projects/ppc64/sys/dev/usb/serial/uchcom.c projects/ppc64/sys/dev/usb/storage/umass.c projects/ppc64/sys/dev/usb/usbdevs projects/ppc64/sys/dev/usb/wlan/if_rum.c projects/ppc64/sys/dev/usb/wlan/if_uath.c projects/ppc64/sys/dev/usb/wlan/if_upgt.c projects/ppc64/sys/dev/usb/wlan/if_ural.c projects/ppc64/sys/dev/usb/wlan/if_urtw.c projects/ppc64/sys/dev/usb/wlan/if_urtwreg.h projects/ppc64/sys/dev/usb/wlan/if_urtwvar.h projects/ppc64/sys/dev/usb/wlan/if_zyd.c projects/ppc64/sys/dev/xen/xenpci/ (props changed) projects/ppc64/sys/fs/nfsclient/nfs_clport.c projects/ppc64/sys/fs/nfsclient/nfs_clstate.c projects/ppc64/sys/fs/nfsclient/nfs_clsubs.c projects/ppc64/sys/fs/tmpfs/tmpfs.h projects/ppc64/sys/fs/tmpfs/tmpfs_subr.c projects/ppc64/sys/fs/tmpfs/tmpfs_vnops.c projects/ppc64/sys/geom/part/g_part_gpt.c projects/ppc64/sys/i386/conf/GENERIC projects/ppc64/sys/i386/conf/NOTES projects/ppc64/sys/i386/i386/intr_machdep.c projects/ppc64/sys/i386/i386/nexus.c projects/ppc64/sys/i386/i386/pmap.c projects/ppc64/sys/i386/include/elf.h projects/ppc64/sys/i386/include/intr_machdep.h projects/ppc64/sys/i386/xen/pmap.c projects/ppc64/sys/ia64/ia64/pmap.c projects/ppc64/sys/ia64/include/asm.h projects/ppc64/sys/ia64/include/elf.h projects/ppc64/sys/kern/bus_if.m projects/ppc64/sys/kern/imgact_elf.c projects/ppc64/sys/kern/init_main.c projects/ppc64/sys/kern/kern_event.c projects/ppc64/sys/kern/kern_exit.c projects/ppc64/sys/kern/kern_intr.c projects/ppc64/sys/kern/kern_sig.c projects/ppc64/sys/kern/kern_thr.c projects/ppc64/sys/kern/sched_ule.c projects/ppc64/sys/kern/stack_protector.c projects/ppc64/sys/kern/subr_bus.c projects/ppc64/sys/kern/subr_trap.c projects/ppc64/sys/kern/sys_process.c projects/ppc64/sys/kern/tty.c projects/ppc64/sys/kern/tty_ttydisc.c projects/ppc64/sys/mips/include/elf.h projects/ppc64/sys/mips/mips/pmap.c projects/ppc64/sys/modules/Makefile projects/ppc64/sys/modules/cam/Makefile projects/ppc64/sys/modules/dpms/Makefile projects/ppc64/sys/modules/pf/Makefile projects/ppc64/sys/modules/ubser/Makefile projects/ppc64/sys/modules/usb/Makefile projects/ppc64/sys/modules/usb/ucom/Makefile projects/ppc64/sys/modules/vesa/Makefile projects/ppc64/sys/modules/x86bios/Makefile projects/ppc64/sys/net/flowtable.c projects/ppc64/sys/net/if_bridge.c projects/ppc64/sys/net/if_enc.c projects/ppc64/sys/net/if_ethersubr.c projects/ppc64/sys/net/if_gif.c projects/ppc64/sys/net/pfil.c projects/ppc64/sys/net/pfil.h projects/ppc64/sys/net80211/ieee80211_hwmp.c projects/ppc64/sys/net80211/ieee80211_mesh.c projects/ppc64/sys/net80211/ieee80211_mesh.h projects/ppc64/sys/net80211/ieee80211_output.c projects/ppc64/sys/net80211/ieee80211_proto.h projects/ppc64/sys/netgraph/ng_bridge.c projects/ppc64/sys/netinet/if_ether.c projects/ppc64/sys/netinet/in.c projects/ppc64/sys/netinet/ip_fastfwd.c projects/ppc64/sys/netinet/ip_icmp.c projects/ppc64/sys/netinet/ip_input.c projects/ppc64/sys/netinet/ip_output.c projects/ppc64/sys/netinet/ip_var.h projects/ppc64/sys/netinet/ipfw/ip_fw2.c projects/ppc64/sys/netinet/ipfw/ip_fw_pfil.c projects/ppc64/sys/netinet/raw_ip.c projects/ppc64/sys/netinet/sctp_bsd_addr.c projects/ppc64/sys/netinet/sctp_os_bsd.h projects/ppc64/sys/netinet/sctp_pcb.c projects/ppc64/sys/netinet6/icmp6.c projects/ppc64/sys/netinet6/in6_ifattach.c projects/ppc64/sys/netinet6/ip6_forward.c projects/ppc64/sys/netinet6/ip6_input.c projects/ppc64/sys/netinet6/ip6_output.c projects/ppc64/sys/netinet6/ip6_var.h projects/ppc64/sys/nfsclient/nfs_kdtrace.c projects/ppc64/sys/nfsclient/nfs_vnops.c projects/ppc64/sys/pc98/conf/GENERIC projects/ppc64/sys/powerpc/aim/machdep.c projects/ppc64/sys/powerpc/aim/mmu_oea.c projects/ppc64/sys/powerpc/aim/mmu_oea64.c projects/ppc64/sys/powerpc/aim/mp_cpudep.c projects/ppc64/sys/powerpc/aim/platform_chrp.c projects/ppc64/sys/powerpc/aim/trap_subr.S projects/ppc64/sys/powerpc/aim/trap_subr64.S projects/ppc64/sys/powerpc/booke/mp_cpudep.c projects/ppc64/sys/powerpc/booke/pmap.c projects/ppc64/sys/powerpc/include/elf.h projects/ppc64/sys/powerpc/include/pcpu.h projects/ppc64/sys/powerpc/include/pmap.h projects/ppc64/sys/powerpc/include/smp.h projects/ppc64/sys/powerpc/include/spr.h projects/ppc64/sys/powerpc/ofw/ofw_real.c projects/ppc64/sys/powerpc/powerpc/cpu.c projects/ppc64/sys/powerpc/powerpc/mmu_if.m projects/ppc64/sys/powerpc/powerpc/mp_machdep.c projects/ppc64/sys/powerpc/powerpc/pmap_dispatch.c projects/ppc64/sys/powerpc/powerpc/uio_machdep.c projects/ppc64/sys/powerpc64/conf/GENERIC projects/ppc64/sys/sparc64/conf/GENERIC projects/ppc64/sys/sparc64/include/elf.h projects/ppc64/sys/sparc64/sparc64/pmap.c projects/ppc64/sys/sun4v/include/elf.h projects/ppc64/sys/sun4v/sun4v/pmap.c projects/ppc64/sys/sys/bus.h projects/ppc64/sys/sys/interrupt.h projects/ppc64/sys/sys/kernel.h projects/ppc64/sys/sys/signalvar.h projects/ppc64/sys/sys/ttyqueue.h projects/ppc64/sys/tools/fw_stub.awk projects/ppc64/sys/tools/makeobjops.awk projects/ppc64/sys/vm/pmap.h projects/ppc64/sys/vm/swap_pager.c projects/ppc64/sys/vm/vm_extern.h projects/ppc64/sys/vm/vm_glue.c projects/ppc64/tools/regression/fstest/tests/rename/21.t projects/ppc64/tools/regression/lib/libutil/test-flopen.c projects/ppc64/tools/regression/sigqueue/sigqtest1/sigqtest1.c projects/ppc64/tools/regression/sigqueue/sigqtest2/sigqtest2.c projects/ppc64/tools/tools/netrate/netsend/netsend.c projects/ppc64/usr.bin/make/job.c projects/ppc64/usr.bin/make/main.c projects/ppc64/usr.bin/netstat/route.c projects/ppc64/usr.bin/systat/keyboard.c projects/ppc64/usr.bin/systat/main.c projects/ppc64/usr.bin/touch/touch.c projects/ppc64/usr.sbin/acpi/iasl/Makefile projects/ppc64/usr.sbin/jail/jail.8 projects/ppc64/usr.sbin/mfiutil/mfiutil.8 (props changed) projects/ppc64/usr.sbin/ntp/doc/ntpd.8 projects/ppc64/usr.sbin/sysinstall/tcpip.c projects/ppc64/usr.sbin/tzsetup/tzsetup.8 projects/ppc64/usr.sbin/tzsetup/tzsetup.c Modified: projects/ppc64/Makefile.inc1 ============================================================================== --- projects/ppc64/Makefile.inc1 Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/Makefile.inc1 Fri Oct 23 17:02:37 2009 (r198416) @@ -929,6 +929,10 @@ _ar= usr.bin/ar _mklocale= usr.bin/mklocale .endif +.if ${BOOTSTRAPPING} < 900002 +_sed= usr.bin/sed +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -954,6 +958,7 @@ bootstrap-tools: usr.bin/makewhatis \ ${_mklocale} \ usr.bin/rpcgen \ + ${_sed} \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ @@ -1033,7 +1038,6 @@ cross-tools: .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ - usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ @@ -1122,7 +1126,7 @@ lib/libradius__L secure/lib/libssl__L: s _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \ +kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ lib/libcrypt__L Modified: projects/ppc64/ObsoleteFiles.inc ============================================================================== --- projects/ppc64/ObsoleteFiles.inc Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/ObsoleteFiles.inc Fri Oct 23 17:02:37 2009 (r198416) @@ -503,6 +503,8 @@ OLD_FILES+=usr/include/dev/usb/usb_quirk OLD_FILES+=usr/include/dev/usb/usbcdc.h OLD_FILES+=usr/include/dev/usb/usbdivar.h OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h +OLD_FILES+=usr/sbin/usbdevs +OLD_FILES+=usr/share/man/man8/usbdevs.8.gz # 20090203: removal of pccard header files OLD_FILES+=usr/include/pccard/cardinfo.h OLD_FILES+=usr/include/pccard/cis.h Modified: projects/ppc64/bin/cat/Makefile ============================================================================== --- projects/ppc64/bin/cat/Makefile Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/bin/cat/Makefile Fri Oct 23 17:02:37 2009 (r198416) @@ -2,6 +2,5 @@ # $FreeBSD$ PROG= cat -WARNS?= 6 .include Modified: projects/ppc64/bin/csh/iconv_stub.c ============================================================================== --- projects/ppc64/bin/csh/iconv_stub.c Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/bin/csh/iconv_stub.c Fri Oct 23 17:02:37 2009 (r198416) @@ -61,9 +61,20 @@ dl_iconv_open(const char *tocode, const if (iconvlib == NULL) return (iconv_t)-1; iconv_open = (iconv_open_t *)dlfunc(iconvlib, ICONV_OPEN); + if (iconv_open == NULL) + goto dlfunc_err; dl_iconv = (dl_iconv_t *)dlfunc(iconvlib, ICONV_ENGINE); + if (dl_iconv == NULL) + goto dlfunc_err; dl_iconv_close = (dl_iconv_close_t *)dlfunc(iconvlib, ICONV_CLOSE); + if (dl_iconv_close == NULL) + goto dlfunc_err; } return iconv_open(tocode, fromcode); + +dlfunc_err: + dlclose(iconvlib); + iconvlib = NULL; + return (iconv_t)-1; } Modified: projects/ppc64/bin/ls/ls.c ============================================================================== --- projects/ppc64/bin/ls/ls.c Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/bin/ls/ls.c Fri Oct 23 17:02:37 2009 (r198416) @@ -399,7 +399,7 @@ main(int argc, char *argv[]) * If not -F, -d or -l options, follow any symbolic links listed on * the command line. */ - if (!f_longform && !f_listdir && !f_type) + if (!f_longform && !f_listdir && (!f_type || f_slash)) fts_options |= FTS_COMFOLLOW; /* Modified: projects/ppc64/bin/sh/parser.c ============================================================================== --- projects/ppc64/bin/sh/parser.c Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/bin/sh/parser.c Fri Oct 23 17:02:37 2009 (r198416) @@ -1308,11 +1308,16 @@ parsebackq: { struct jmploc *const savehandler = handler; int savelen; int saveprompt; + const int bq_startlinno = plinno; if (setjmp(jmploc.loc)) { if (str) ckfree(str); handler = savehandler; + if (exception == EXERROR) { + startlinno = bq_startlinno; + synerror("Error in command substitution"); + } longjmp(handler->loc, 1); } INTOFF; Modified: projects/ppc64/bin/uuidgen/Makefile ============================================================================== --- projects/ppc64/bin/uuidgen/Makefile Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/bin/uuidgen/Makefile Fri Oct 23 17:02:37 2009 (r198416) @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= uuidgen -WARNS?= 6 .include Modified: projects/ppc64/contrib/gcc/config/i386/i386.c ============================================================================== --- projects/ppc64/contrib/gcc/config/i386/i386.c Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/contrib/gcc/config/i386/i386.c Fri Oct 23 17:02:37 2009 (r198416) @@ -1614,7 +1614,7 @@ override_options (void) "-mtune=generic instead as appropriate."); if (!ix86_arch_string) - ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386"; + ix86_arch_string = TARGET_64BIT ? "x86-64" : "i486"; if (!strcmp (ix86_arch_string, "generic")) error ("generic CPU can be used only for -mtune= switch"); if (!strncmp (ix86_arch_string, "generic", 7)) Modified: projects/ppc64/crypto/openssh/sshd_config ============================================================================== --- projects/ppc64/crypto/openssh/sshd_config Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/crypto/openssh/sshd_config Fri Oct 23 17:02:37 2009 (r198416) @@ -17,7 +17,6 @@ #VersionAddendum FreeBSD-20091001 #Port 22 -#Protocol 2 #AddressFamily any #ListenAddress 0.0.0.0 #ListenAddress :: Modified: projects/ppc64/etc/defaults/rc.conf ============================================================================== --- projects/ppc64/etc/defaults/rc.conf Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/defaults/rc.conf Fri Oct 23 17:02:37 2009 (r198416) @@ -600,6 +600,7 @@ harvest_ethernet="YES" # Entropy device harvest_p_to_p="YES" # Entropy device harvests point-to-point randomness dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot watchdogd_enable="NO" # Start the software watchdog daemon +watchdogd_flags="" # Flags to watchdogd (if enabled) devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing # devfs(8) rules. devfs_system_ruleset="" # The name (NOT number) of a ruleset to apply to /dev Modified: projects/ppc64/etc/gettytab ============================================================================== --- projects/ppc64/etc/gettytab Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/gettytab Fri Oct 23 17:02:37 2009 (r198416) @@ -162,7 +162,7 @@ X|Xwindow|X window system:\ :fd@:nd@:cd@:rw:sp#9600: P|Pc|Pc console:\ - :ht:np:sp#115200: + :ht:np:sp#9600: # # Wierdo special case for fast crt's with hardcopy devices Modified: projects/ppc64/etc/rc.d/bgfsck ============================================================================== --- projects/ppc64/etc/rc.d/bgfsck Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/bgfsck Fri Oct 23 17:02:37 2009 (r198416) @@ -31,7 +31,7 @@ bgfsck_start () bgfsck_msg="${bgfsck_msg} in ${background_fsck_delay} seconds" fi if [ -z "${rc_force}" ]; then - [ -z "${rc_quiet}" ] && echo "${bgfsck_msg}." + check_startmsgs && echo "${bgfsck_msg}." fi (sleep ${background_fsck_delay}; nice -4 fsck -B -p) 2>&1 | \ Modified: projects/ppc64/etc/rc.d/cleartmp ============================================================================== --- projects/ppc64/etc/rc.d/cleartmp Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/cleartmp Fri Oct 23 17:02:37 2009 (r198416) @@ -25,7 +25,7 @@ cleartmp_start() ${tmp}/.ICE-unix ${tmp}/.font-unix" if checkyesno ${rcvar1}; then - [ -z "${rc_quiet}" ] && echo "Clearing ${tmp}." + check_startmsgs && echo "Clearing ${tmp}." # This is not needed for mfs, but doesn't hurt anything. # Things to note: @@ -44,7 +44,7 @@ cleartmp_start() elif checkyesno clear_tmp_X; then # Remove X lock files, since they will prevent you from # restarting X. Remove other X related directories. - [ -z "${rc_quiet}" ] && echo "Clearing ${tmp} (X related)." + check_startmsgs && echo "Clearing ${tmp} (X related)." rm -rf ${tmp}/.X[0-9]-lock ${x11_socket_dirs} fi if checkyesno clear_tmp_X; then Modified: projects/ppc64/etc/rc.d/faith ============================================================================== --- projects/ppc64/etc/rc.d/faith Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/faith Fri Oct 23 17:02:37 2009 (r198416) @@ -3,7 +3,7 @@ # # PROVIDE: faith -# REQUIRE: netif routing +# REQUIRE: netif # KEYWORD: nojail . /etc/rc.subr @@ -39,9 +39,7 @@ faith_up() route change -inet6 ${prefix} -prefixlen ${prefixlen} \ -ifp faith0 done - if [ -z "${rc_quiet}" ]; then - ifconfig faith0 - fi + check_startmsgs && ifconfig faith0 ;; esac } Modified: projects/ppc64/etc/rc.d/fsck ============================================================================== --- projects/ppc64/etc/rc.d/fsck Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/fsck Fri Oct 23 17:02:37 2009 (r198416) @@ -23,7 +23,7 @@ fsck_start() # During fsck ignore SIGQUIT trap : 3 - [ -z "${rc_quiet}" ] && echo "Starting file system checks:" + check_startmsgs && echo "Starting file system checks:" if checkyesno background_fsck; then fsck -F -p else Modified: projects/ppc64/etc/rc.d/hostid ============================================================================== --- projects/ppc64/etc/rc.d/hostid Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/hostid Fri Oct 23 17:02:37 2009 (r198416) @@ -49,9 +49,9 @@ hostid_set() # Set both kern.hostuuid and kern.hostid. # - [ -z "${rc_quiet}" ] && echo "Setting hostuuid: ${uuid}." + check_startmsgs && echo "Setting hostuuid: ${uuid}." ${SYSCTL_W} kern.hostuuid="${uuid}" >/dev/null - [ -z "${rc_quiet}" ] && echo "Setting hostid: ${id}." + check_startmsgs && echo "Setting hostid: ${id}." ${SYSCTL_W} kern.hostid=${id} >/dev/null } Modified: projects/ppc64/etc/rc.d/hostname ============================================================================== --- projects/ppc64/etc/rc.d/hostname Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/hostname Fri Oct 23 17:02:37 2009 (r198416) @@ -72,8 +72,9 @@ hostname_start() # All right, it is safe to invoke hostname(1) now. # - [ -z "${rc_quiet}" ] && echo "Setting hostname: ${hostname}." + check_startmsgs && echo -n "Setting hostname: ${hostname}" /bin/hostname "${hostname}" + check_startmsgs && echo '.' } load_rc_config $name Modified: projects/ppc64/etc/rc.d/ldconfig ============================================================================== --- projects/ppc64/etc/rc.d/ldconfig Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/ldconfig Fri Oct 23 17:02:37 2009 (r198416) @@ -36,7 +36,7 @@ ldconfig_start() _LDC="${_LDC} ${i}" fi done - [ -z "${rc_quiet}" ] && echo 'ELF ldconfig path:' ${_LDC} + check_startmsgs && echo 'ELF ldconfig path:' ${_LDC} ${ldconfig} -elf ${_ins} ${_LDC} case `sysctl -n hw.machine_arch` in @@ -55,7 +55,7 @@ ldconfig_start() _LDC="${_LDC} ${i}" fi done - [ -z "${rc_quiet}" ] && + check_startmsgs && echo '32-bit compatibility ldconfig path:' ${_LDC} ${ldconfig} -32 -m ${_ins} ${_LDC} ;; @@ -72,8 +72,7 @@ ldconfig_start() _LDC="${_LDC} ${i}" fi done - [ -z "${rc_quiet}" ] && - echo 'a.out ldconfig path:' ${_LDC} + check_startmsgs && echo 'a.out ldconfig path:' ${_LDC} ${ldconfig} -aout ${_ins} ${_LDC} ;; esac Modified: projects/ppc64/etc/rc.d/motd ============================================================================== --- projects/ppc64/etc/rc.d/motd Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/motd Fri Oct 23 17:02:37 2009 (r198416) @@ -22,7 +22,7 @@ motd_start() # Must be done *before* interactive logins are possible # to prevent possible race conditions. # - [ -z "${rc_quiet}" ] && echo -n 'Updating motd:' + check_startmsgs && echo -n 'Updating motd:' if [ ! -f /etc/motd ]; then install -c -o root -g wheel -m ${PERMS} /dev/null /etc/motd fi @@ -42,7 +42,7 @@ motd_start() } rm -f $T - [ -z "${rc_quiet}" ] && echo . + check_startmsgs && echo '.' } load_rc_config $name Modified: projects/ppc64/etc/rc.d/mountcritlocal ============================================================================== --- projects/ppc64/etc/rc.d/mountcritlocal Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/mountcritlocal Fri Oct 23 17:02:37 2009 (r198416) @@ -28,7 +28,7 @@ mountcritlocal_start() esac # Mount everything except nfs filesystems. - [ -z "${rc_quiet}" ] && echo -n 'Mounting local file systems:' + check_startmsgs && echo -n 'Mounting local file systems:' mount_excludes='no' for i in ${netfs_types}; do fstype=${i%:*} @@ -37,7 +37,7 @@ mountcritlocal_start() mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} err=$? - [ -z "${rc_quiet}" ] && echo '.' + check_startmsgs && echo '.' case ${err} in 0) Modified: projects/ppc64/etc/rc.d/moused ============================================================================== --- projects/ppc64/etc/rc.d/moused Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/moused Fri Oct 23 17:02:37 2009 (r198416) @@ -51,8 +51,9 @@ moused_start() mytype="$moused_type" fi - [ -z "${rc_quiet}" ] && echo -n "Starting ${ms} moused." + check_startmsgs && echo -n "Starting ${ms} moused" /usr/sbin/moused ${myflags} -p ${myport} -t ${mytype} ${pidarg} + check_startmsgs && echo '.' mousechar_arg= case ${mousechar_start} in Modified: projects/ppc64/etc/rc.d/netif ============================================================================== --- projects/ppc64/etc/rc.d/netif Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/netif Fri Oct 23 17:02:37 2009 (r198416) @@ -143,7 +143,7 @@ network_common() ;; esac echo "${_str} Network:${_ok}." - if [ -z "${rc_quiet}" ]; then + if check_startmsgs; then for ifn in ${_ok}; do /sbin/ifconfig ${ifn} done Modified: projects/ppc64/etc/rc.d/netoptions ============================================================================== --- projects/ppc64/etc/rc.d/netoptions Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/netoptions Fri Oct 23 17:02:37 2009 (r198416) @@ -53,7 +53,7 @@ netoptions_inet() ${SYSCTL_W} net.inet.tcp.rfc1323=1 >/dev/null else netoptions_init - echo -n ' rfc1323 extensions=${tcp_extensions}' + echo -n " rfc1323 extensions=${tcp_extensions}" ${SYSCTL_W} net.inet.tcp.rfc1323=0 >/dev/null fi @@ -61,13 +61,13 @@ netoptions_inet() ${SYSCTL_W} net.inet.tcp.always_keepalive=1 >/dev/null else netoptions_init - echo -n ' TCP keepalive=${tcp_keepalive}' + echo -n " TCP keepalive=${tcp_keepalive}" ${SYSCTL_W} net.inet.tcp.always_keepalive=0 >/dev/null fi if checkyesno tcp_drop_synfin; then netoptions_init - echo -n ' drop SYN+FIN packets=${tcp_drop_synfin}' + echo -n " drop SYN+FIN packets=${tcp_drop_synfin}" ${SYSCTL_W} net.inet.tcp.drop_synfin=1 >/dev/null else ${SYSCTL_W} net.inet.tcp.drop_synfin=0 >/dev/null Modified: projects/ppc64/etc/rc.d/newsyslog ============================================================================== --- projects/ppc64/etc/rc.d/newsyslog Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/newsyslog Fri Oct 23 17:02:37 2009 (r198416) @@ -17,9 +17,9 @@ stop_cmd=":" newsyslog_start() { - [ -z "${rc_quiet}" ] && echo -n "Creating and/or trimming log files:" + check_startmsgs && echo -n 'Creating and/or trimming log files' ${command} ${rc_flags} - [ -z "${rc_quiet}" ] && echo "." + check_startmsgs && echo '.' } load_rc_config $name Modified: projects/ppc64/etc/rc.d/nfsclient ============================================================================== --- projects/ppc64/etc/rc.d/nfsclient Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/nfsclient Fri Oct 23 17:02:37 2009 (r198416) @@ -22,7 +22,8 @@ nfsclient_start() # if [ -n "${nfs_access_cache}" ]; then - [ -z "${rc_quiet}" ] && echo "NFS access cache time=${nfs_access_cache}" + check_startmsgs && + echo "NFS access cache time=${nfs_access_cache}" if ! sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null; then warn "failed to set access cache timeout" fi Modified: projects/ppc64/etc/rc.d/pf ============================================================================== --- projects/ppc64/etc/rc.d/pf Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/pf Fri Oct 23 17:02:37 2009 (r198416) @@ -25,19 +25,21 @@ required_modules="pf" pf_start() { - [ -z "${rc_quiet}" ] && echo "Enabling pf." + check_startmsgs && echo -n 'Enabling pf' $pf_program -F all > /dev/null 2>&1 $pf_program -f "$pf_rules" $pf_flags if ! $pf_program -s info | grep -q "Enabled" ; then $pf_program -e fi + check_startmsgs && echo '.' } pf_stop() { if $pf_program -s info | grep -q "Enabled" ; then - [ -z "${rc_quiet}" ] && echo "Disabling pf." + echo -n 'Disabling pf' $pf_program -d + echo '.' fi } Modified: projects/ppc64/etc/rc.d/savecore ============================================================================== --- projects/ppc64/etc/rc.d/savecore Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/savecore Fri Oct 23 17:02:37 2009 (r198416) @@ -69,7 +69,7 @@ savecore_start() ${crashinfo_program} -d ${dumpdir} fi else - [ -z "${rc_quiet}" ] && echo "No core dumps found" + check_startmsgs && echo 'No core dumps found.' fi } Modified: projects/ppc64/etc/rc.d/stf ============================================================================== --- projects/ppc64/etc/rc.d/stf Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.d/stf Fri Oct 23 17:02:37 2009 (r198416) @@ -3,7 +3,7 @@ # # PROVIDE: stf -# REQUIRE: netif routing +# REQUIRE: netif # KEYWORD: nojail . /etc/rc.subr @@ -53,9 +53,8 @@ stf_up() ifconfig stf0 create >/dev/null 2>&1 ifconfig stf0 inet6 2002:${ipv4_in_hexformat}:${stf_interface_ipv6_slaid:-0}:${stf_interface_ipv6_ifid} \ prefixlen ${stf_prefixlen} - if [ -z "${rc_quiet}" ]; then - /sbin/ifconfig stf0 - fi + check_startmsgs && /sbin/ifconfig stf0 + # disallow packets to malicious 6to4 prefix route add -inet6 2002:e000:: -prefixlen 20 ::1 -reject route add -inet6 2002:7f00:: -prefixlen 24 ::1 -reject Modified: projects/ppc64/etc/rc.subr ============================================================================== --- projects/ppc64/etc/rc.subr Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/etc/rc.subr Fri Oct 23 17:02:37 2009 (r198416) @@ -398,6 +398,20 @@ wait_for_pids() } # +# check_startmsgs +# If rc_quiet is set (usually as a result of using faststart at +# boot time) check if rc_startmsgs is enabled. +# +check_startmsgs() +{ + if [ -n "$rc_quiet" ]; then + checkyesno rc_startmsgs + else + return 0 + fi +} + +# # run_rc_command argument # Search for argument in the list of supported commands, which is: # "start stop restart rcvar status poll ${extra_commands}" @@ -579,7 +593,7 @@ run_rc_command() rc_fast=yes rc_quiet=yes ;; - force*) # "force prefix; always run + force*) # "force" prefix; always run rc_force=yes _rc_prefix=force rc_arg=${rc_arg#${_rc_prefix}} @@ -602,7 +616,7 @@ run_rc_command() esac eval _override_command=\$${name}_program - command=${command:+${_override_command:-$command}} + command=${_override_command:-$command} _keywords="start stop restart rcvar $extra_commands" rc_pid= @@ -708,13 +722,7 @@ run_rc_command() # setup the full command to run # - _show_startmsgs=1 - if [ -n "${rc_quiet}" ]; then - if ! checkyesno rc_startmsgs; then - unset _show_startmsgs - fi - fi - [ -n "$_show_startmsgs" ] && echo "Starting ${name}." + check_startmsgs && echo "Starting ${name}." if [ -n "$_chroot" ]; then _doit="\ ${_nice:+nice -n $_nice }\ Modified: projects/ppc64/games/number/Makefile ============================================================================== --- projects/ppc64/games/number/Makefile Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/games/number/Makefile Fri Oct 23 17:02:37 2009 (r198416) @@ -4,4 +4,6 @@ PROG= number MAN= number.6 +WARNS?= 6 + .include Modified: projects/ppc64/games/number/number.c ============================================================================== --- projects/ppc64/games/number/number.c Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/games/number/number.c Fri Oct 23 17:02:37 2009 (r198416) @@ -88,9 +88,7 @@ void usage(void); int lflag; int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { int ch, first; char line[256]; @@ -275,7 +273,7 @@ void pfract(len) int len; { - static char *pref[] = { "", "ten-", "hundred-" }; + static char const * const pref[] = { "", "ten-", "hundred-" }; switch(len) { case 1: Modified: projects/ppc64/kerberos5/lib/libgssapi_krb5/Makefile ============================================================================== --- projects/ppc64/kerberos5/lib/libgssapi_krb5/Makefile Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/kerberos5/lib/libgssapi_krb5/Makefile Fri Oct 23 17:02:37 2009 (r198416) @@ -2,8 +2,8 @@ LIB= gssapi_krb5 LDFLAGS= -Wl,-Bsymbolic -LDADD= -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt -DPADD= ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \ +LDADD= -lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt +DPADD= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \ ${LIBCOM_ERR} ${LIBCRYPT} INCS= ${KRB5DIR}/lib/gssapi/gssapi/gssapi_krb5.h Modified: projects/ppc64/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- projects/ppc64/kerberos5/lib/libgssapi_spnego/Makefile Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/kerberos5/lib/libgssapi_spnego/Makefile Fri Oct 23 17:02:37 2009 (r198416) @@ -2,8 +2,8 @@ LIB= gssapi_spnego LDFLAGS= -Wl,-Bsymbolic -LDADD= -lasn1 -DPADD= ${LIBASN1} +LDADD= -lgssapi -lasn1 +DPADD= ${LIBGSSAPI} ${LIBASN1} SRCS= accept_sec_context.c \ compat.c \ Modified: projects/ppc64/lib/libc/gen/getcwd.c ============================================================================== --- projects/ppc64/lib/libc/gen/getcwd.c Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libc/gen/getcwd.c Fri Oct 23 17:02:37 2009 (r198416) @@ -62,13 +62,14 @@ getcwd(pt, size) dev_t dev; ino_t ino; int first; - char *bpt, *bup; + char *bpt; struct stat s; dev_t root_dev; ino_t root_ino; - size_t ptsize, upsize; + size_t ptsize; int save_errno; - char *ept, *eup, *up, c; + char *ept, c; + int fd; /* * If no buffer specified by the user, allocate one as necessary. @@ -106,18 +107,6 @@ getcwd(pt, size) bpt = ept - 1; *bpt = '\0'; - /* - * Allocate 1024 bytes for the string of "../"'s. - * Should always be enough. If it's not, allocate - * as necessary. Special case the first stat, it's ".", not "..". - */ - if ((up = malloc(upsize = 1024)) == NULL) - goto err; - eup = up + upsize; - bup = up; - up[0] = '.'; - up[1] = '\0'; - /* Save root values, so know when to stop. */ if (stat("/", &s)) goto err; @@ -128,7 +117,7 @@ getcwd(pt, size) for (first = 1;; first = 0) { /* Stat the current level. */ - if (lstat(up, &s)) + if (dir != NULL ? _fstat(dirfd(dir), &s) : lstat(".", &s)) goto err; /* Save current node values. */ @@ -144,32 +133,22 @@ getcwd(pt, size) * been that way and stuff would probably break. */ bcopy(bpt, pt, ept - bpt); - free(up); + if (dir) + (void) closedir(dir); return (pt); } - /* - * Build pointer to the parent directory, allocating memory - * as necessary. Max length is 3 for "../", the largest - * possible component name, plus a trailing NUL. - */ - while (bup + 3 + MAXNAMLEN + 1 >= eup) { - if ((up = reallocf(up, upsize *= 2)) == NULL) - goto err; - bup = up; - eup = up + upsize; - } - *bup++ = '.'; - *bup++ = '.'; - *bup = '\0'; - /* Open and stat parent directory. */ - if (!(dir = opendir(up)) || _fstat(dirfd(dir), &s)) + fd = _openat(dir != NULL ? dirfd(dir) : AT_FDCWD, + "..", O_RDONLY); + if (fd == -1) goto err; - - /* Add trailing slash for next directory. */ - *bup++ = '/'; - *bup = '\0'; + if (dir) + (void) closedir(dir); + if (!(dir = fdopendir(fd)) || _fstat(dirfd(dir), &s)) { + _close(fd); + goto err; + } /* * If it's a mount point, have to stat each element because @@ -190,10 +169,10 @@ getcwd(pt, size) goto notfound; if (ISDOT(dp)) continue; - bcopy(dp->d_name, bup, dp->d_namlen + 1); /* Save the first error for later. */ - if (lstat(up, &s)) { + if (fstatat(dirfd(dir), dp->d_name, &s, + AT_SYMLINK_NOFOLLOW)) { if (!save_errno) save_errno = errno; errno = 0; @@ -227,11 +206,6 @@ getcwd(pt, size) *--bpt = '/'; bpt -= dp->d_namlen; bcopy(dp->d_name, bpt, dp->d_namlen); - (void) closedir(dir); - dir = NULL; - - /* Truncate any file name. */ - *bup = '\0'; } notfound: @@ -250,7 +224,6 @@ err: free(pt); if (dir) (void) closedir(dir); - free(up); errno = save_errno; return (NULL); Modified: projects/ppc64/lib/libc/include/namespace.h ============================================================================== --- projects/ppc64/lib/libc/include/namespace.h Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libc/include/namespace.h Fri Oct 23 17:02:37 2009 (r198416) @@ -80,6 +80,7 @@ #define listen _listen #define nanosleep _nanosleep #define open _open +#define openat _openat #define poll _poll #define pthread_atfork _pthread_atfork #define pthread_attr_destroy _pthread_attr_destroy Modified: projects/ppc64/lib/libc/include/un-namespace.h ============================================================================== --- projects/ppc64/lib/libc/include/un-namespace.h Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libc/include/un-namespace.h Fri Oct 23 17:02:37 2009 (r198416) @@ -61,6 +61,7 @@ #undef listen #undef nanosleep #undef open +#undef openat #undef poll #undef pthread_atfork #undef pthread_attr_destroy Modified: projects/ppc64/lib/libc/nls/C.msg ============================================================================== --- projects/ppc64/lib/libc/nls/C.msg Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libc/nls/C.msg Fri Oct 23 17:02:37 2009 (r198416) @@ -181,6 +181,16 @@ $ ENOATTR 87 Attribute not found $ EDOOFUS 88 Programming error +$ EBADMSG +89 Bad message +$ EMULTIHOP +90 Multihop attempted +$ ENOLINK +91 Link has been severed +$ EPROTO +92 Protocol error +$ ENOTCAPABLE +93 Capabilities insufficient $ $ strsignal() support catalog $ Modified: projects/ppc64/lib/libc/sys/Symbol.map ============================================================================== --- projects/ppc64/lib/libc/sys/Symbol.map Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libc/sys/Symbol.map Fri Oct 23 17:02:37 2009 (r198416) @@ -769,6 +769,8 @@ FBSDprivate_1.0 { __sys_olio_listio; _open; __sys_open; + _openat; + __sys_openat; _pathconf; __sys_pathconf; _pipe; Modified: projects/ppc64/lib/libc/sys/intro.2 ============================================================================== --- projects/ppc64/lib/libc/sys/intro.2 Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libc/sys/intro.2 Fri Oct 23 17:02:37 2009 (r198416) @@ -456,6 +456,14 @@ The specified extended attribute does no .It Er 88 EDOOFUS Em "Programming error" . A function or API is being abused in a way which could only be detected at run-time. +.It Er 89 EBADMSG Em "Bad message" . +A corrupted message was detected. +.It Er 90 EMULTIHOP Em "Multihop attempted" . +This error code is unused, but present for compatibility with other systems. +.It Er 91 ENOLINK Em "Link has been severed" . +This error code is unused, but present for compatibility with other systems. +.It Er 92 EPROTO Em "Protocol error" . +A device or socket encountered an unrecoverable protocol error. .It Er 93 ENOTCAPABLE Em "Capabilities insufficient" . An operation on a capability file descriptor requires greater privilege than the capability allows. Modified: projects/ppc64/lib/libc/sys/nanosleep.2 ============================================================================== --- projects/ppc64/lib/libc/sys/nanosleep.2 Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libc/sys/nanosleep.2 Fri Oct 23 17:02:37 2009 (r198416) @@ -47,7 +47,9 @@ The .Fn nanosleep system call -causes the process to sleep for the specified time. +causes the calling thread to sleep until the time interval specified by +.Fa rqtp +has elapsed. An unmasked signal will cause it to terminate the sleep early, regardless of the .Dv SA_RESTART Modified: projects/ppc64/lib/libfetch/common.c ============================================================================== --- projects/ppc64/lib/libfetch/common.c Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libfetch/common.c Fri Oct 23 17:02:37 2009 (r198416) @@ -772,7 +772,7 @@ fetch_no_proxy_match(const char *host) break; d_len = q - p; - if (d_len > 0 && h_len > d_len && + if (d_len > 0 && h_len >= d_len && strncasecmp(host + h_len - d_len, p, d_len) == 0) { /* domain name matches */ Modified: projects/ppc64/lib/libthr/pthread.map ============================================================================== --- projects/ppc64/lib/libthr/pthread.map Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libthr/pthread.map Fri Oct 23 17:02:37 2009 (r198416) @@ -195,6 +195,7 @@ FBSDprivate_1.0 { __msync; __nanosleep; __open; + __openat; __poll; __pthread_cond_timedwait; __pthread_cond_wait; @@ -406,3 +407,7 @@ FBSD_1.1 { pthread_mutex_setspinloops_np; pthread_mutex_setyieldloops_np; }; + +FBSD_1.2 { + openat; +}; Modified: projects/ppc64/lib/libthr/thread/thr_private.h ============================================================================== --- projects/ppc64/lib/libthr/thread/thr_private.h Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libthr/thread/thr_private.h Fri Oct 23 17:02:37 2009 (r198416) @@ -668,6 +668,7 @@ void _pthread_cleanup_pop(int); #ifdef _SYS_FCNTL_H_ int __sys_fcntl(int, int, ...); int __sys_open(const char *, int, ...); +int __sys_openat(int, const char *, int, ...); #endif /* #include */ Modified: projects/ppc64/lib/libthr/thread/thr_syscalls.c ============================================================================== --- projects/ppc64/lib/libthr/thread/thr_syscalls.c Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libthr/thread/thr_syscalls.c Fri Oct 23 17:02:37 2009 (r198416) @@ -139,6 +139,7 @@ int __fsync(int); int __msync(void *, size_t, int); int __nanosleep(const struct timespec *, struct timespec *); int __open(const char *, int,...); +int __openat(int, const char *, int,...); int __poll(struct pollfd *, unsigned int, int); ssize_t __read(int, void *buf, size_t); ssize_t __readv(int, const struct iovec *, int); @@ -341,6 +342,33 @@ __open(const char *path, int flags,...) return ret; } +__weak_reference(__openat, openat); + +int +__openat(int fd, const char *path, int flags, ...) +{ + struct pthread *curthread = _get_curthread(); + int ret; + int mode = 0; + va_list ap; + + _thr_cancel_enter(curthread); + + /* Check if the file is being created: */ + if (flags & O_CREAT) { + /* Get the creation mode: */ + va_start(ap, flags); + mode = va_arg(ap, int); + va_end(ap); + } + + ret = __sys_openat(fd, path, flags, mode); + + _thr_cancel_leave(curthread); + + return ret; +} + __weak_reference(__poll, poll); int Modified: projects/ppc64/lib/libusb/libusb20_ugen20.c ============================================================================== --- projects/ppc64/lib/libusb/libusb20_ugen20.c Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/lib/libusb/libusb20_ugen20.c Fri Oct 23 17:02:37 2009 (r198416) @@ -800,7 +800,11 @@ ugen20_tr_submit(struct libusb20_transfe if (xfer->flags & LIBUSB20_TRANSFER_DO_CLEAR_STALL) { fsep->flags |= USB_FS_FLAG_CLEAR_STALL; } - fsep->timeout = xfer->timeout; + /* NOTE: The "fsep->timeout" variable is 16-bit. */ + if (xfer->timeout > 65535) + fsep->timeout = 65535; + else + fsep->timeout = xfer->timeout; temp.ep_index = xfer->trIndex; Modified: projects/ppc64/libexec/rtld-elf/rtld.c ============================================================================== --- projects/ppc64/libexec/rtld-elf/rtld.c Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/libexec/rtld-elf/rtld.c Fri Oct 23 17:02:37 2009 (r198416) @@ -474,6 +474,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ /* Initialize a fake symbol for resolving undefined weak references. */ sym_zero.st_info = ELF_ST_INFO(STB_GLOBAL, STT_NOTYPE); sym_zero.st_shndx = SHN_UNDEF; + sym_zero.st_value = -(uintptr_t)obj_main->relocbase; if (!libmap_disable) libmap_disable = (bool)lm_init(libmap_override); @@ -991,26 +992,26 @@ digest_phdr(const Elf_Phdr *phdr, int ph obj = obj_new(); for (ph = phdr; ph < phlimit; ph++) { - switch (ph->p_type) { + if (ph->p_type != PT_PHDR) + continue; - case PT_PHDR: - if ((const Elf_Phdr *)ph->p_vaddr != phdr) { - _rtld_error("%s: invalid PT_PHDR", path); - return NULL; - } - obj->phdr = (const Elf_Phdr *) ph->p_vaddr; - obj->phsize = ph->p_memsz; - break; + obj->phdr = phdr; + obj->phsize = ph->p_memsz; + obj->relocbase = (caddr_t)phdr - ph->p_vaddr; + break; + } + + for (ph = phdr; ph < phlimit; ph++) { + switch (ph->p_type) { case PT_INTERP: - obj->interp = (const char *) ph->p_vaddr; + obj->interp = (const char *)(ph->p_vaddr + obj->relocbase); break; case PT_LOAD: if (nsegs == 0) { /* First load segment */ obj->vaddrbase = trunc_page(ph->p_vaddr); - obj->mapbase = (caddr_t) obj->vaddrbase; - obj->relocbase = obj->mapbase - obj->vaddrbase; + obj->mapbase = obj->vaddrbase + obj->relocbase; obj->textsize = round_page(ph->p_vaddr + ph->p_memsz) - obj->vaddrbase; } else { /* Last load segment */ @@ -1021,7 +1022,7 @@ digest_phdr(const Elf_Phdr *phdr, int ph break; case PT_DYNAMIC: - obj->dynamic = (const Elf_Dyn *) ph->p_vaddr; + obj->dynamic = (const Elf_Dyn *)(ph->p_vaddr + obj->relocbase); break; case PT_TLS: @@ -1029,7 +1030,7 @@ digest_phdr(const Elf_Phdr *phdr, int ph obj->tlssize = ph->p_memsz; obj->tlsalign = ph->p_align; obj->tlsinitsize = ph->p_filesz; - obj->tlsinit = (void*) ph->p_vaddr; + obj->tlsinit = (void*)(ph->p_vaddr + obj->relocbase); break; } } Modified: projects/ppc64/release/doc/README ============================================================================== --- projects/ppc64/release/doc/README Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/release/doc/README Fri Oct 23 17:02:37 2009 (r198416) @@ -99,9 +99,10 @@ element will be included. For example: SPARC64-specific text -The currently-supported architectures are i386, sparc64, and -ia64. An element may appear for multiple architectures by specifying -a comma-separated list of architectures (i.e. arch="sparc64,ia64"). +The currently-supported architectures are amd64, arm, i386, ia64, +pc98, powerpc, and sparc64. An element may appear for multiple +architectures by specifying a comma-separated list of architectures +(i.e. arch="sparc64,ia64"). When creating a translation, make a new directory under this directory with a language code (paralleling the DocProj directory Modified: projects/ppc64/release/doc/en_US.ISO8859-1/errata/article.sgml ============================================================================== --- projects/ppc64/release/doc/en_US.ISO8859-1/errata/article.sgml Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/release/doc/en_US.ISO8859-1/errata/article.sgml Fri Oct 23 17:02:37 2009 (r198416) @@ -16,7 +16,6 @@ %release; - ]>
Modified: projects/ppc64/release/doc/share/mk/doc.relnotes.mk ============================================================================== --- projects/ppc64/release/doc/share/mk/doc.relnotes.mk Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/release/doc/share/mk/doc.relnotes.mk Fri Oct 23 17:02:37 2009 (r198416) @@ -11,23 +11,6 @@ DSLHTML?= ${RELN_ROOT}/share/sgml/defaul DSLPRINT?= ${RELN_ROOT}/share/sgml/default.dsl # -# Tweakable Makefile variables -# -# INCLUDE_HISTORIC Used by relnotes document only. When set, -# causes all release notes entries to be printed, -# even those marked as "historic". If not set -# (the default), only print "non-historic" -# release note entries. To designate a release -# note entry as "historic", add a role="historic" -# attribute to the applicable element(s). -# -.if defined(INCLUDE_HISTORIC) -JADEFLAGS+= -iinclude.historic -.else -JADEFLAGS+= -ino.include.historic -.endif - -# # Automatic device list generation: # .if exists(${RELN_ROOT}/../man4) Modified: projects/ppc64/release/doc/share/sgml/release.dsl ============================================================================== --- projects/ppc64/release/doc/share/sgml/release.dsl Fri Oct 23 16:07:15 2009 (r198415) +++ projects/ppc64/release/doc/share/sgml/release.dsl Fri Oct 23 17:02:37 2009 (r198416) @@ -3,8 +3,6 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***