Date: Sun, 14 Feb 2010 18:09:19 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r203886 - in projects/ppc64: bin/ls bin/pax bin/pkill bin/ps bin/sh contrib/csup contrib/netcat etc etc/defaults etc/rc.d games/fortune/datfiles games/grdc games/morse gnu/usr.bin/binut... Message-ID: <201002141809.o1EI9JpH045527@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Sun Feb 14 18:09:18 2010 New Revision: 203886 URL: http://svn.freebsd.org/changeset/base/203886 Log: MFC @ 203875 Added: projects/ppc64/contrib/csup/auth.c - copied unchanged from r203881, head/contrib/csup/auth.c projects/ppc64/contrib/csup/auth.h - copied unchanged from r203881, head/contrib/csup/auth.h projects/ppc64/contrib/csup/cpasswd.1 - copied unchanged from r203881, head/contrib/csup/cpasswd.1 projects/ppc64/contrib/csup/cpasswd.sh - copied unchanged from r203881, head/contrib/csup/cpasswd.sh projects/ppc64/etc/rc.d/rtsold - copied unchanged from r203881, head/etc/rc.d/rtsold projects/ppc64/lib/libc/stdlib/ql.h - copied unchanged from r203881, head/lib/libc/stdlib/ql.h projects/ppc64/lib/libc/stdlib/qr.h - copied unchanged from r203881, head/lib/libc/stdlib/qr.h projects/ppc64/lib/libefi/ - copied from r203881, head/lib/libefi/ projects/ppc64/lib/libgpib/gpib.3 - copied unchanged from r203881, head/lib/libgpib/gpib.3 projects/ppc64/share/man/man4/alpm.4 - copied unchanged from r203881, head/share/man/man4/alpm.4 projects/ppc64/share/man/man4/amdpm.4 - copied unchanged from r203881, head/share/man/man4/amdpm.4 projects/ppc64/share/man/man4/mcd.4 - copied unchanged from r203881, head/share/man/man4/mcd.4 projects/ppc64/share/man/man4/padlock.4 - copied unchanged from r203881, head/share/man/man4/padlock.4 projects/ppc64/share/man/man4/pcf.4 - copied unchanged from r203881, head/share/man/man4/pcf.4 projects/ppc64/share/man/man4/run.4 - copied unchanged from r203881, head/share/man/man4/run.4 projects/ppc64/share/man/man4/scd.4 - copied unchanged from r203881, head/share/man/man4/scd.4 projects/ppc64/share/man/man4/viapm.4 - copied unchanged from r203881, head/share/man/man4/viapm.4 projects/ppc64/sys/contrib/dev/run/ - copied from r203881, head/sys/contrib/dev/run/ projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar9285.ini - copied unchanged from r203881, head/sys/dev/ath/ath_hal/ar5416/ar9285.ini projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini - copied unchanged from r203881, head/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini projects/ppc64/sys/dev/drm/drm_hashtab.c - copied unchanged from r203881, head/sys/dev/drm/drm_hashtab.c projects/ppc64/sys/dev/drm/drm_hashtab.h - copied unchanged from r203881, head/sys/dev/drm/drm_hashtab.h projects/ppc64/sys/dev/drm/drm_mm.c - copied unchanged from r203881, head/sys/dev/drm/drm_mm.c projects/ppc64/sys/dev/drm/drm_mm.h - copied unchanged from r203881, head/sys/dev/drm/drm_mm.h projects/ppc64/sys/dev/drm/drm_sman.c - copied unchanged from r203881, head/sys/dev/drm/drm_sman.c projects/ppc64/sys/dev/drm/drm_sman.h - copied unchanged from r203881, head/sys/dev/drm/drm_sman.h projects/ppc64/sys/dev/drm/via_3d_reg.h - copied unchanged from r203881, head/sys/dev/drm/via_3d_reg.h projects/ppc64/sys/dev/drm/via_dma.c - copied unchanged from r203881, head/sys/dev/drm/via_dma.c projects/ppc64/sys/dev/drm/via_dmablit.c - copied unchanged from r203881, head/sys/dev/drm/via_dmablit.c projects/ppc64/sys/dev/drm/via_dmablit.h - copied unchanged from r203881, head/sys/dev/drm/via_dmablit.h projects/ppc64/sys/dev/drm/via_drm.h - copied unchanged from r203881, head/sys/dev/drm/via_drm.h projects/ppc64/sys/dev/drm/via_drv.c - copied unchanged from r203881, head/sys/dev/drm/via_drv.c projects/ppc64/sys/dev/drm/via_drv.h - copied unchanged from r203881, head/sys/dev/drm/via_drv.h projects/ppc64/sys/dev/drm/via_irq.c - copied unchanged from r203881, head/sys/dev/drm/via_irq.c projects/ppc64/sys/dev/drm/via_map.c - copied unchanged from r203881, head/sys/dev/drm/via_map.c projects/ppc64/sys/dev/drm/via_mm.c - copied unchanged from r203881, head/sys/dev/drm/via_mm.c projects/ppc64/sys/dev/drm/via_verifier.c - copied unchanged from r203881, head/sys/dev/drm/via_verifier.c projects/ppc64/sys/dev/drm/via_verifier.h - copied unchanged from r203881, head/sys/dev/drm/via_verifier.h projects/ppc64/sys/dev/drm/via_video.c - copied unchanged from r203881, head/sys/dev/drm/via_video.c projects/ppc64/sys/dev/ieee488/tnt4882.h - copied unchanged from r203881, head/sys/dev/ieee488/tnt4882.h projects/ppc64/sys/dev/siba/siba_bwn.c - copied unchanged from r203881, head/sys/dev/siba/siba_bwn.c projects/ppc64/sys/dev/siba/siba_core.c - copied unchanged from r203881, head/sys/dev/siba/siba_core.c projects/ppc64/sys/dev/usb/wlan/if_run.c - copied unchanged from r203881, head/sys/dev/usb/wlan/if_run.c projects/ppc64/sys/dev/usb/wlan/if_runreg.h - copied unchanged from r203881, head/sys/dev/usb/wlan/if_runreg.h projects/ppc64/sys/dev/usb/wlan/if_runvar.h - copied unchanged from r203881, head/sys/dev/usb/wlan/if_runvar.h projects/ppc64/sys/mips/conf/SWARM_SMP - copied unchanged from r203881, head/sys/mips/conf/SWARM_SMP projects/ppc64/sys/mips/mips/mpboot.S - copied unchanged from r203881, head/sys/mips/mips/mpboot.S projects/ppc64/sys/modules/drm/via/ - copied from r203881, head/sys/modules/drm/via/ projects/ppc64/sys/modules/runfw/ - copied from r203881, head/sys/modules/runfw/ projects/ppc64/sys/modules/siba_bwn/ - copied from r203881, head/sys/modules/siba_bwn/ projects/ppc64/sys/modules/usb/run/ - copied from r203881, head/sys/modules/usb/run/ projects/ppc64/sys/sparc64/include/cmt.h - copied unchanged from r203881, head/sys/sparc64/include/cmt.h projects/ppc64/sys/sparc64/include/fireplane.h - copied unchanged from r203881, head/sys/sparc64/include/fireplane.h projects/ppc64/sys/sparc64/include/jbus.h - copied unchanged from r203881, head/sys/sparc64/include/jbus.h projects/ppc64/sys/sparc64/include/nexusvar.h - copied unchanged from r203881, head/sys/sparc64/include/nexusvar.h projects/ppc64/sys/sparc64/sparc64/ssm.c - copied unchanged from r203881, head/sys/sparc64/sparc64/ssm.c projects/ppc64/sys/sun4v/include/cmt.h - copied unchanged from r203881, head/sys/sun4v/include/cmt.h projects/ppc64/sys/sun4v/include/fireplane.h - copied unchanged from r203881, head/sys/sun4v/include/fireplane.h projects/ppc64/sys/sun4v/include/jbus.h - copied unchanged from r203881, head/sys/sun4v/include/jbus.h projects/ppc64/tools/regression/bin/sh/parameters/mail1.0 - copied unchanged from r203881, head/tools/regression/bin/sh/parameters/mail1.0 projects/ppc64/tools/regression/bin/sh/parameters/mail2.0 - copied unchanged from r203881, head/tools/regression/bin/sh/parameters/mail2.0 projects/ppc64/tools/regression/usr.bin/pkill/pgrep-q.t - copied unchanged from r203881, head/tools/regression/usr.bin/pkill/pgrep-q.t projects/ppc64/usr.bin/ee/nls/pt_BR.ISO8859-1/ - copied from r203881, head/usr.bin/ee/nls/pt_BR.ISO8859-1/ projects/ppc64/usr.bin/tar/err.c - copied unchanged from r203881, head/usr.bin/tar/err.c projects/ppc64/usr.bin/tar/err.h - copied unchanged from r203881, head/usr.bin/tar/err.h projects/ppc64/usr.bin/tar/line_reader.c - copied unchanged from r203881, head/usr.bin/tar/line_reader.c projects/ppc64/usr.bin/tar/line_reader.h - copied unchanged from r203881, head/usr.bin/tar/line_reader.h projects/ppc64/usr.bin/tar/matching.h - copied unchanged from r203881, head/usr.bin/tar/matching.h projects/ppc64/usr.bin/tar/pathmatch.c - copied unchanged from r203881, head/usr.bin/tar/pathmatch.c projects/ppc64/usr.bin/tar/pathmatch.h - copied unchanged from r203881, head/usr.bin/tar/pathmatch.h projects/ppc64/usr.sbin/pmcstat/pmcpl_annotate.c - copied unchanged from r203881, head/usr.sbin/pmcstat/pmcpl_annotate.c projects/ppc64/usr.sbin/pmcstat/pmcpl_annotate.h - copied unchanged from r203881, head/usr.sbin/pmcstat/pmcpl_annotate.h projects/ppc64/usr.sbin/pmcstat/pmcpl_callgraph.c - copied unchanged from r203881, head/usr.sbin/pmcstat/pmcpl_callgraph.c projects/ppc64/usr.sbin/pmcstat/pmcpl_callgraph.h - copied unchanged from r203881, head/usr.sbin/pmcstat/pmcpl_callgraph.h projects/ppc64/usr.sbin/pmcstat/pmcpl_calltree.c - copied unchanged from r203881, head/usr.sbin/pmcstat/pmcpl_calltree.c projects/ppc64/usr.sbin/pmcstat/pmcpl_calltree.h - copied unchanged from r203881, head/usr.sbin/pmcstat/pmcpl_calltree.h projects/ppc64/usr.sbin/pmcstat/pmcpl_gprof.c - copied unchanged from r203881, head/usr.sbin/pmcstat/pmcpl_gprof.c projects/ppc64/usr.sbin/pmcstat/pmcpl_gprof.h - copied unchanged from r203881, head/usr.sbin/pmcstat/pmcpl_gprof.h projects/ppc64/usr.sbin/pmcstat/pmcstat_log.h - copied unchanged from r203881, head/usr.sbin/pmcstat/pmcstat_log.h projects/ppc64/usr.sbin/pmcstat/pmcstat_top.h - copied unchanged from r203881, head/usr.sbin/pmcstat/pmcstat_top.h Deleted: projects/ppc64/gnu/usr.bin/binutils/gdb/Makefile.alpha projects/ppc64/gnu/usr.bin/binutils/ld/Makefile.alpha projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile.alpha projects/ppc64/gnu/usr.bin/binutils/libopcodes/Makefile.alpha projects/ppc64/share/man/man4/man4.i386/alpm.4 projects/ppc64/share/man/man4/man4.i386/amdpm.4 projects/ppc64/share/man/man4/man4.i386/mcd.4 projects/ppc64/share/man/man4/man4.i386/padlock.4 projects/ppc64/share/man/man4/man4.i386/pcf.4 projects/ppc64/share/man/man4/man4.i386/scd.4 projects/ppc64/share/man/man4/man4.i386/viapm.4 projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h projects/ppc64/usr.bin/tar/siginfo.c Modified: projects/ppc64/bin/ls/ls.c projects/ppc64/bin/pax/Makefile projects/ppc64/bin/pax/cpio.h projects/ppc64/bin/pax/tar.h projects/ppc64/bin/pkill/pkill.1 projects/ppc64/bin/pkill/pkill.c projects/ppc64/bin/ps/ps.c projects/ppc64/bin/sh/main.c projects/ppc64/bin/sh/var.c projects/ppc64/contrib/csup/Makefile projects/ppc64/contrib/csup/TODO projects/ppc64/contrib/csup/config.h projects/ppc64/contrib/csup/csup.1 projects/ppc64/contrib/csup/main.c projects/ppc64/contrib/csup/proto.c projects/ppc64/contrib/netcat/FREEBSD-vendor projects/ppc64/etc/defaults/rc.conf projects/ppc64/etc/network.subr projects/ppc64/etc/rc.d/Makefile projects/ppc64/etc/rc.d/ipfw projects/ppc64/etc/rc.d/ntpdate projects/ppc64/etc/services projects/ppc64/games/fortune/datfiles/fortunes projects/ppc64/games/grdc/grdc.c projects/ppc64/games/morse/Makefile projects/ppc64/games/morse/morse.c projects/ppc64/gnu/usr.bin/binutils/Makefile.inc projects/ppc64/gnu/usr.bin/binutils/libbfd/Makefile projects/ppc64/gnu/usr.bin/gdb/kgdb/kthr.c projects/ppc64/gnu/usr.bin/groff/tmac/mdoc.local projects/ppc64/lib/Makefile projects/ppc64/lib/libc/gen/devname.c projects/ppc64/lib/libc/gen/getutxent.3 projects/ppc64/lib/libc/gen/rand48.3 projects/ppc64/lib/libc/mips/sys/ptrace.S projects/ppc64/lib/libc/net/sctp_opt_info.3 projects/ppc64/lib/libc/net/sctp_recvmsg.3 projects/ppc64/lib/libc/net/sctp_send.3 projects/ppc64/lib/libc/net/sctp_sendmsg.3 projects/ppc64/lib/libc/net/sctp_sys_calls.c projects/ppc64/lib/libc/nls/msgcat.c projects/ppc64/lib/libc/posix1e/mac.3 projects/ppc64/lib/libc/stdlib/malloc.3 projects/ppc64/lib/libc/stdlib/malloc.c projects/ppc64/lib/libc/stdlib/strfmon.c projects/ppc64/lib/libc/string/memccpy.3 projects/ppc64/lib/libc/string/memchr.3 projects/ppc64/lib/libc/string/memcmp.3 projects/ppc64/lib/libc/string/memset.3 projects/ppc64/lib/libc/string/strndup.c projects/ppc64/lib/libc/sys/ptrace.2 projects/ppc64/lib/libc/sys/shm_open.2 projects/ppc64/lib/libgpib/Makefile projects/ppc64/lib/libpam/modules/pam_unix/pam_unix.c projects/ppc64/lib/libufs/cgroup.c projects/ppc64/lib/libufs/sblock.c projects/ppc64/lib/libusb/libusb.h projects/ppc64/lib/libusb/libusb10.c projects/ppc64/lib/libusb/libusb10_desc.c projects/ppc64/lib/libusb/libusb10_io.c projects/ppc64/lib/libusb/libusb20.3 projects/ppc64/lib/libusb/libusb20.c projects/ppc64/lib/libusb/libusb20.h projects/ppc64/lib/libusb/libusb20_compat01.c projects/ppc64/lib/libusb/libusb20_desc.c projects/ppc64/lib/libusb/libusb20_int.h projects/ppc64/lib/libusb/libusb20_ugen20.c projects/ppc64/lib/libusb/usb.h projects/ppc64/lib/msun/amd64/fenv.c projects/ppc64/lib/msun/amd64/fenv.h projects/ppc64/lib/msun/i387/fenv.c projects/ppc64/lib/msun/i387/fenv.h projects/ppc64/libexec/ftpd/logwtmp.c projects/ppc64/release/doc/en_US.ISO8859-1/hardware/article.sgml projects/ppc64/release/doc/en_US.ISO8859-1/relnotes/article.sgml projects/ppc64/release/picobsd/build/picobsd projects/ppc64/release/picobsd/tinyware/login/pico-login.c projects/ppc64/sbin/camcontrol/camcontrol.c projects/ppc64/sbin/dump/itime.c projects/ppc64/sbin/dump/main.c projects/ppc64/sbin/fsck_msdosfs/boot.c projects/ppc64/sbin/fsck_msdosfs/check.c projects/ppc64/sbin/fsck_msdosfs/dir.c projects/ppc64/sbin/fsck_msdosfs/dosfs.h projects/ppc64/sbin/fsck_msdosfs/ext.h projects/ppc64/sbin/fsck_msdosfs/fat.c projects/ppc64/sbin/fsck_msdosfs/fsck_msdosfs.8 projects/ppc64/sbin/fsck_msdosfs/main.c projects/ppc64/sbin/geom/class/multipath/geom_multipath.c projects/ppc64/sbin/growfs/growfs.c projects/ppc64/sbin/ifconfig/ifcarp.c projects/ppc64/sbin/iscontrol/iscontrol.h projects/ppc64/sbin/iscontrol/pdu.c projects/ppc64/sbin/mknod/mknod.8 projects/ppc64/sbin/mknod/mknod.c projects/ppc64/sbin/mount/mount.8 projects/ppc64/sbin/mount_nfs/mount_nfs.c projects/ppc64/sbin/newfs/mkfs.c projects/ppc64/sbin/newfs/newfs.c projects/ppc64/sbin/newfs/newfs.h projects/ppc64/sbin/newfs_msdos/newfs_msdos.8 projects/ppc64/sbin/newfs_msdos/newfs_msdos.c projects/ppc64/sbin/restore/Makefile projects/ppc64/sbin/restore/dirs.c projects/ppc64/sbin/restore/extern.h projects/ppc64/sbin/restore/interactive.c projects/ppc64/sbin/restore/tape.c projects/ppc64/sbin/sysctl/sysctl.8 projects/ppc64/sbin/sysctl/sysctl.c projects/ppc64/sbin/tunefs/tunefs.c projects/ppc64/sbin/umount/umount.c projects/ppc64/share/examples/kld/cdev/test/Makefile projects/ppc64/share/examples/kld/syscall/test/Makefile projects/ppc64/share/man/man4/Makefile projects/ppc64/share/man/man4/acpi_asus.4 projects/ppc64/share/man/man4/acpi_fujitsu.4 projects/ppc64/share/man/man4/acpi_hp.4 projects/ppc64/share/man/man4/acpi_ibm.4 projects/ppc64/share/man/man4/acpi_panasonic.4 projects/ppc64/share/man/man4/acpi_sony.4 projects/ppc64/share/man/man4/acpi_toshiba.4 projects/ppc64/share/man/man4/acpi_wmi.4 projects/ppc64/share/man/man4/ahci.4 projects/ppc64/share/man/man4/gpib.4 projects/ppc64/share/man/man4/io.4 projects/ppc64/share/man/man4/iwn.4 projects/ppc64/share/man/man4/iwnfw.4 projects/ppc64/share/man/man4/linux.4 projects/ppc64/share/man/man4/man4.i386/Makefile projects/ppc64/share/man/man4/ndis.4 projects/ppc64/share/man/man4/nvram.4 projects/ppc64/share/man/man4/pcii.4 projects/ppc64/share/man/man4/sctp.4 projects/ppc64/share/man/man4/tnt4882.4 projects/ppc64/share/man/man4/vr.4 projects/ppc64/share/man/man5/rc.conf.5 projects/ppc64/share/man/man5/tmpfs.5 projects/ppc64/share/man/man8/rc.subr.8 projects/ppc64/share/man/man9/VFS.9 projects/ppc64/share/man/man9/alloc_unr.9 projects/ppc64/share/man/man9/locking.9 projects/ppc64/share/man/man9/mtx_pool.9 projects/ppc64/share/man/man9/vnode.9 projects/ppc64/share/misc/committers-src.dot projects/ppc64/share/zoneinfo/Makefile projects/ppc64/sys/amd64/amd64/amd64_mem.c projects/ppc64/sys/amd64/amd64/msi.c projects/ppc64/sys/amd64/conf/GENERIC projects/ppc64/sys/amd64/conf/NOTES projects/ppc64/sys/amd64/conf/XENHVM projects/ppc64/sys/arm/arm/db_trace.c projects/ppc64/sys/arm/arm/pmap.c projects/ppc64/sys/arm/conf/AVILA projects/ppc64/sys/arm/conf/BWCT projects/ppc64/sys/arm/conf/CAMBRIA projects/ppc64/sys/arm/conf/CNS11XXNAS projects/ppc64/sys/arm/conf/CRB projects/ppc64/sys/arm/conf/DB-78XXX projects/ppc64/sys/arm/conf/DB-88F5XXX projects/ppc64/sys/arm/conf/DB-88F6XXX projects/ppc64/sys/arm/conf/EP80219 projects/ppc64/sys/arm/conf/GUMSTIX projects/ppc64/sys/arm/conf/HL200 projects/ppc64/sys/arm/conf/IQ31244 projects/ppc64/sys/arm/conf/KB920X projects/ppc64/sys/arm/conf/NSLU projects/ppc64/sys/arm/conf/SIMICS projects/ppc64/sys/arm/conf/SKYEYE projects/ppc64/sys/arm/include/armreg.h projects/ppc64/sys/arm/xscale/ixp425/cambria_fled.c projects/ppc64/sys/boot/sparc64/loader/main.c projects/ppc64/sys/cam/ata/ata_all.c projects/ppc64/sys/cam/ata/ata_da.c projects/ppc64/sys/cam/ata/ata_pmp.c projects/ppc64/sys/cam/ata/ata_xpt.c projects/ppc64/sys/cam/cam.c projects/ppc64/sys/cam/cam.h projects/ppc64/sys/cam/cam_ccb.h projects/ppc64/sys/cam/cam_periph.c projects/ppc64/sys/cam/cam_periph.h projects/ppc64/sys/cam/cam_queue.h projects/ppc64/sys/cam/cam_sim.c projects/ppc64/sys/cam/cam_xpt.c projects/ppc64/sys/cam/cam_xpt.h projects/ppc64/sys/cam/cam_xpt_internal.h projects/ppc64/sys/cam/cam_xpt_periph.h projects/ppc64/sys/cam/cam_xpt_sim.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_pass.c projects/ppc64/sys/cam/scsi/scsi_xpt.c projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/ppc64/sys/compat/freebsd32/syscalls.master projects/ppc64/sys/compat/linux/linux_socket.c projects/ppc64/sys/compat/svr4/syscalls.master 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/files.ia64 projects/ppc64/sys/conf/files.mips projects/ppc64/sys/conf/files.pc98 projects/ppc64/sys/conf/files.sparc64 projects/ppc64/sys/conf/options.mips projects/ppc64/sys/ddb/db_thread.c projects/ppc64/sys/dev/aac/aac.c projects/ppc64/sys/dev/aac/aac_pci.c projects/ppc64/sys/dev/aac/aacreg.h projects/ppc64/sys/dev/aac/aacvar.h projects/ppc64/sys/dev/acpi_support/acpi_asus.c projects/ppc64/sys/dev/acpi_support/acpi_sony.c projects/ppc64/sys/dev/acpica/acpi.c projects/ppc64/sys/dev/acpica/acpi_cpu.c projects/ppc64/sys/dev/acpica/acpi_video.c projects/ppc64/sys/dev/ahci/ahci.c projects/ppc64/sys/dev/ahci/ahci.h projects/ppc64/sys/dev/aic7xxx/aic79xx_osm.c projects/ppc64/sys/dev/asr/asr.c projects/ppc64/sys/dev/ata/ata-all.c projects/ppc64/sys/dev/ata/ata-all.h projects/ppc64/sys/dev/ata/atapi-cam.c projects/ppc64/sys/dev/ata/chipsets/ata-netcell.c projects/ppc64/sys/dev/ata/chipsets/ata-siliconimage.c projects/ppc64/sys/dev/ath/ath_hal/ah_eeprom_v14.h projects/ppc64/sys/dev/ath/ath_hal/ah_eeprom_v4k.h projects/ppc64/sys/dev/ath/ath_hal/ar5212/ar5212_power.c projects/ppc64/sys/dev/ath/ath_hal/ar5212/ar5212reg.h projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_power.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416desc.h projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416phy.h projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar5416reg.h projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar9280.c projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar9280.h projects/ppc64/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c projects/ppc64/sys/dev/ath/if_ath.c projects/ppc64/sys/dev/ath/if_athvar.h projects/ppc64/sys/dev/bge/if_bge.c projects/ppc64/sys/dev/ciss/ciss.c projects/ppc64/sys/dev/cxgb/cxgb_sge.c projects/ppc64/sys/dev/drm/drmP.h projects/ppc64/sys/dev/drm/drm_linux_list.h projects/ppc64/sys/dev/drm/drm_memory.c projects/ppc64/sys/dev/drm/i915_drv.c projects/ppc64/sys/dev/drm/i915_drv.h projects/ppc64/sys/dev/e1000/if_em.c projects/ppc64/sys/dev/e1000/if_igb.c projects/ppc64/sys/dev/fb/vesa.c projects/ppc64/sys/dev/hptiop/hptiop.c projects/ppc64/sys/dev/hptrr/hptrr_osm_bsd.c projects/ppc64/sys/dev/hptrr/os_bsd.h projects/ppc64/sys/dev/ieee488/ibfoo.c projects/ppc64/sys/dev/ieee488/pcii.c projects/ppc64/sys/dev/ieee488/tnt4882.c projects/ppc64/sys/dev/ieee488/upd7210.c projects/ppc64/sys/dev/ieee488/upd7210.h projects/ppc64/sys/dev/isp/isp.c projects/ppc64/sys/dev/isp/isp_freebsd.c projects/ppc64/sys/dev/isp/isp_library.c projects/ppc64/sys/dev/isp/isp_library.h projects/ppc64/sys/dev/isp/isp_pci.c projects/ppc64/sys/dev/isp/isp_sbus.c projects/ppc64/sys/dev/isp/ispmbox.h projects/ppc64/sys/dev/isp/ispvar.h projects/ppc64/sys/dev/ixgbe/ixgbe.c projects/ppc64/sys/dev/mly/mly.c projects/ppc64/sys/dev/mpt/mpt_cam.c projects/ppc64/sys/dev/mpt/mpt_cam.h projects/ppc64/sys/dev/mpt/mpt_raid.c projects/ppc64/sys/dev/mxge/if_mxge.c projects/ppc64/sys/dev/pci/pci.c projects/ppc64/sys/dev/pci/pcireg.h projects/ppc64/sys/dev/pci/pcivar.h projects/ppc64/sys/dev/ppbus/vpo.c projects/ppc64/sys/dev/siba/siba.c projects/ppc64/sys/dev/siba/siba_cc.c projects/ppc64/sys/dev/siba/siba_ids.h projects/ppc64/sys/dev/siba/siba_pcib.c projects/ppc64/sys/dev/siba/sibareg.h projects/ppc64/sys/dev/siba/sibavar.h projects/ppc64/sys/dev/siis/siis.c projects/ppc64/sys/dev/siis/siis.h projects/ppc64/sys/dev/sound/usb/uaudio.c projects/ppc64/sys/dev/sound/usb/uaudioreg.h projects/ppc64/sys/dev/trm/trm.c projects/ppc64/sys/dev/twa/tw_osl_cam.c projects/ppc64/sys/dev/usb/controller/ehci.c projects/ppc64/sys/dev/usb/controller/ehci.h projects/ppc64/sys/dev/usb/controller/ehci_pci.c projects/ppc64/sys/dev/usb/quirk/usb_quirk.c projects/ppc64/sys/dev/usb/serial/u3g.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_zyd.c projects/ppc64/sys/fs/devfs/devfs_devs.c projects/ppc64/sys/fs/msdosfs/bootsect.h projects/ppc64/sys/fs/msdosfs/bpb.h projects/ppc64/sys/fs/msdosfs/denode.h projects/ppc64/sys/fs/msdosfs/direntry.h projects/ppc64/sys/fs/msdosfs/msdosfs_conv.c projects/ppc64/sys/fs/msdosfs/msdosfs_denode.c projects/ppc64/sys/fs/msdosfs/msdosfs_fat.c projects/ppc64/sys/fs/msdosfs/msdosfs_lookup.c projects/ppc64/sys/fs/msdosfs/msdosfs_vnops.c projects/ppc64/sys/fs/nfsclient/nfs.h projects/ppc64/sys/fs/nfsclient/nfs_clbio.c projects/ppc64/sys/fs/nfsclient/nfs_clnfsiod.c projects/ppc64/sys/fs/nfsclient/nfs_clsubs.c projects/ppc64/sys/fs/nfsclient/nfs_clvfsops.c projects/ppc64/sys/fs/nfsclient/nfs_clvnops.c projects/ppc64/sys/fs/nfsclient/nfsmount.h projects/ppc64/sys/fs/nfsclient/nfsnode.h projects/ppc64/sys/fs/nfsserver/nfs_nfsdcache.c projects/ppc64/sys/fs/nfsserver/nfs_nfsdstate.c projects/ppc64/sys/fs/tmpfs/tmpfs_vfsops.c projects/ppc64/sys/geom/geom_redboot.c projects/ppc64/sys/geom/part/g_part_gpt.c projects/ppc64/sys/geom/virstor/g_virstor.c projects/ppc64/sys/i386/conf/GENERIC projects/ppc64/sys/i386/conf/NOTES projects/ppc64/sys/i386/conf/XEN projects/ppc64/sys/i386/i386/i686_mem.c projects/ppc64/sys/i386/i386/msi.c projects/ppc64/sys/i386/i386/pmap.c projects/ppc64/sys/i386/ibcs2/syscalls.master projects/ppc64/sys/ia64/conf/GENERIC projects/ppc64/sys/ia64/ia64/trap.c projects/ppc64/sys/ia64/pci/pci_cfgreg.c projects/ppc64/sys/kern/kern_event.c projects/ppc64/sys/kern/kern_shutdown.c projects/ppc64/sys/kern/kern_umtx.c projects/ppc64/sys/kern/makesyscalls.sh projects/ppc64/sys/kern/subr_bus.c projects/ppc64/sys/kern/sys_process.c projects/ppc64/sys/kern/syscalls.master projects/ppc64/sys/kern/tty_inq.c projects/ppc64/sys/kern/tty_outq.c projects/ppc64/sys/kern/vfs_lookup.c projects/ppc64/sys/mips/atheros/ar71xx_pci.c projects/ppc64/sys/mips/cavium/asm_octeon.S projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_fau.c projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_fau.h projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_fpa.c projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_fpa.h projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_ipd.c projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_ipd.h projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_pip.h projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_pko.c projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_pko.h projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_rgmx.c projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_rgmx.h projects/ppc64/sys/mips/cavium/driveid.h projects/ppc64/sys/mips/cavium/obiovar.h projects/ppc64/sys/mips/cavium/octeon_ebt3000_cf.c projects/ppc64/sys/mips/cavium/octeon_ebt3000_cf.h projects/ppc64/sys/mips/cavium/octeon_machdep.c projects/ppc64/sys/mips/cavium/octeon_pcmap_regs.h projects/ppc64/sys/mips/conf/ADM5120 projects/ppc64/sys/mips/conf/ALCHEMY projects/ppc64/sys/mips/conf/AR71XX projects/ppc64/sys/mips/conf/IDT projects/ppc64/sys/mips/conf/MALTA projects/ppc64/sys/mips/conf/MALTA64 projects/ppc64/sys/mips/conf/OCTEON1 projects/ppc64/sys/mips/conf/OCTEON1-32 projects/ppc64/sys/mips/conf/QEMU projects/ppc64/sys/mips/conf/SENTRY5 projects/ppc64/sys/mips/conf/SWARM projects/ppc64/sys/mips/conf/XLR projects/ppc64/sys/mips/include/asm.h projects/ppc64/sys/mips/include/cpu.h projects/ppc64/sys/mips/include/hwfunc.h projects/ppc64/sys/mips/include/intr_machdep.h projects/ppc64/sys/mips/include/pcpu.h projects/ppc64/sys/mips/include/proc.h projects/ppc64/sys/mips/include/smp.h projects/ppc64/sys/mips/mips/exception.S projects/ppc64/sys/mips/mips/genassym.c projects/ppc64/sys/mips/mips/intr_machdep.c projects/ppc64/sys/mips/mips/locore.S projects/ppc64/sys/mips/mips/machdep.c projects/ppc64/sys/mips/mips/mp_machdep.c projects/ppc64/sys/mips/mips/nexus.c projects/ppc64/sys/mips/mips/pmap.c projects/ppc64/sys/mips/mips/swtch.S projects/ppc64/sys/mips/mips/tick.c projects/ppc64/sys/mips/mips/trap.c projects/ppc64/sys/mips/rmi/dev/xlr/rge.c projects/ppc64/sys/mips/rmi/on_chip.c projects/ppc64/sys/mips/rmi/pic.h projects/ppc64/sys/mips/rmi/xlr_machdep.c projects/ppc64/sys/mips/sibyte/sb_asm.S projects/ppc64/sys/mips/sibyte/sb_machdep.c projects/ppc64/sys/mips/sibyte/sb_scd.c projects/ppc64/sys/mips/sibyte/sb_scd.h projects/ppc64/sys/mips/sibyte/sb_zbbus.c projects/ppc64/sys/mips/sibyte/sb_zbpci.c projects/ppc64/sys/modules/Makefile projects/ppc64/sys/modules/ath/Makefile projects/ppc64/sys/modules/drm/Makefile projects/ppc64/sys/modules/drm/drm/Makefile projects/ppc64/sys/modules/usb/Makefile projects/ppc64/sys/net/if_bridge.c projects/ppc64/sys/net/if_lagg.c projects/ppc64/sys/net/if_lagg.h projects/ppc64/sys/net/if_var.h projects/ppc64/sys/net/vnet.c projects/ppc64/sys/net/vnet.h projects/ppc64/sys/net80211/ieee80211_adhoc.c projects/ppc64/sys/net80211/ieee80211_crypto_tkip.c projects/ppc64/sys/net80211/ieee80211_hostap.c projects/ppc64/sys/net80211/ieee80211_mesh.c projects/ppc64/sys/net80211/ieee80211_sta.c projects/ppc64/sys/net80211/ieee80211_wds.c projects/ppc64/sys/netinet/in.c projects/ppc64/sys/netinet/ip.h projects/ppc64/sys/netinet/sctp_header.h projects/ppc64/sys/netinet/sctp_input.c projects/ppc64/sys/netinet/tcp.h projects/ppc64/sys/netinet/tcp_hostcache.c projects/ppc64/sys/nfs/nfs_common.c projects/ppc64/sys/nfs/nfs_common.h projects/ppc64/sys/nfsclient/nfs_krpc.c projects/ppc64/sys/nfsserver/nfs.h projects/ppc64/sys/nfsserver/nfs_fha.c projects/ppc64/sys/nfsserver/nfs_srvkrpc.c projects/ppc64/sys/pc98/conf/GENERIC projects/ppc64/sys/powerpc/conf/GENERIC projects/ppc64/sys/powerpc/conf/MPC85XX projects/ppc64/sys/powerpc/mpc85xx/pci_ocp.c projects/ppc64/sys/security/audit/audit_bsm.c projects/ppc64/sys/sparc64/conf/GENERIC projects/ppc64/sys/sparc64/include/asi.h projects/ppc64/sys/sparc64/include/asmacros.h projects/ppc64/sys/sparc64/include/ktr.h projects/ppc64/sys/sparc64/include/md_var.h projects/ppc64/sys/sparc64/include/upa.h projects/ppc64/sys/sparc64/sparc64/genassym.c projects/ppc64/sys/sparc64/sparc64/locore.S projects/ppc64/sys/sparc64/sparc64/machdep.c projects/ppc64/sys/sparc64/sparc64/mp_locore.S projects/ppc64/sys/sparc64/sparc64/mp_machdep.c projects/ppc64/sys/sparc64/sparc64/nexus.c projects/ppc64/sys/sparc64/sparc64/pmap.c projects/ppc64/sys/sparc64/sparc64/swtch.S projects/ppc64/sys/sun4v/conf/GENERIC projects/ppc64/sys/sun4v/include/asi.h projects/ppc64/sys/sun4v/include/bus.h projects/ppc64/sys/sun4v/sun4v/bus_machdep.c projects/ppc64/sys/sys/ata.h projects/ppc64/sys/sys/ptrace.h projects/ppc64/sys/sys/timeb.h projects/ppc64/sys/teken/teken_scs.h projects/ppc64/sys/ufs/ffs/ffs_alloc.c projects/ppc64/sys/ufs/ffs/ffs_vfsops.c projects/ppc64/sys/ufs/ffs/fs.h projects/ppc64/sys/vm/vm_map.c projects/ppc64/tools/build/mk/OptionalObsoleteFiles.inc projects/ppc64/tools/regression/file/newfileops_on_fork/newfileops_on_fork.c projects/ppc64/tools/regression/gaithrstress/gaithrstress.c projects/ppc64/tools/tools/mctest/mctest.cc projects/ppc64/tools/tools/netrate/http/http.c projects/ppc64/tools/tools/netrate/httpd/httpd.c projects/ppc64/tools/tools/netrate/juggle/juggle.c projects/ppc64/usr.bin/Makefile projects/ppc64/usr.bin/bc/Makefile projects/ppc64/usr.bin/bc/bc.y projects/ppc64/usr.bin/bc/extern.h projects/ppc64/usr.bin/bc/scan.l projects/ppc64/usr.bin/calendar/calendars/calendar.freebsd projects/ppc64/usr.bin/cpio/cmdline.c projects/ppc64/usr.bin/cpio/cpio.c projects/ppc64/usr.bin/cpio/cpio.h projects/ppc64/usr.bin/csup/Makefile projects/ppc64/usr.bin/dc/Makefile projects/ppc64/usr.bin/dc/bcode.c projects/ppc64/usr.bin/dc/bcode.h projects/ppc64/usr.bin/dc/dc.c projects/ppc64/usr.bin/dc/inout.c projects/ppc64/usr.bin/dc/mem.c projects/ppc64/usr.bin/dc/stack.c projects/ppc64/usr.bin/ee/Makefile projects/ppc64/usr.bin/elf2aout/elf2aout.1 projects/ppc64/usr.bin/elf2aout/elf2aout.c projects/ppc64/usr.bin/find/Makefile projects/ppc64/usr.bin/find/extern.h projects/ppc64/usr.bin/find/function.c projects/ppc64/usr.bin/find/getdate.y projects/ppc64/usr.bin/gcore/extern.h projects/ppc64/usr.bin/gcore/gcore.c projects/ppc64/usr.bin/kdump/kdump.c projects/ppc64/usr.bin/procstat/procstat.1 projects/ppc64/usr.bin/tar/Makefile projects/ppc64/usr.bin/tar/bsdtar.c projects/ppc64/usr.bin/tar/bsdtar.h projects/ppc64/usr.bin/tar/bsdtar_platform.h projects/ppc64/usr.bin/tar/cmdline.c projects/ppc64/usr.bin/tar/config_freebsd.h projects/ppc64/usr.bin/tar/getdate.c projects/ppc64/usr.bin/tar/matching.c projects/ppc64/usr.bin/tar/read.c projects/ppc64/usr.bin/tar/subst.c projects/ppc64/usr.bin/tar/util.c projects/ppc64/usr.bin/tar/write.c projects/ppc64/usr.bin/truss/mips-fbsd.c projects/ppc64/usr.bin/uname/uname.1 projects/ppc64/usr.bin/uname/uname.c projects/ppc64/usr.bin/w/w.c projects/ppc64/usr.sbin/pmcstat/Makefile projects/ppc64/usr.sbin/pmcstat/pmcstat.8 projects/ppc64/usr.sbin/pmcstat/pmcstat.c projects/ppc64/usr.sbin/pmcstat/pmcstat.h projects/ppc64/usr.sbin/pmcstat/pmcstat_log.c projects/ppc64/usr.sbin/powerd/Makefile projects/ppc64/usr.sbin/powerd/powerd.c projects/ppc64/usr.sbin/rpcbind/rpcb_svc_com.c projects/ppc64/usr.sbin/rpcbind/rpcbind.c projects/ppc64/usr.sbin/rpcbind/rpcbind.h projects/ppc64/usr.sbin/rpcbind/util.c projects/ppc64/usr.sbin/rtsold/rtsold.c projects/ppc64/usr.sbin/sysinstall/package.c projects/ppc64/usr.sbin/wake/Makefile projects/ppc64/usr.sbin/wake/wake.8 projects/ppc64/usr.sbin/wake/wake.c Directory Properties: projects/ppc64/ (props changed) projects/ppc64/contrib/expat/ (props changed) projects/ppc64/contrib/groff/ (props changed) projects/ppc64/contrib/one-true-awk/ (props changed) projects/ppc64/sys/ (props changed) projects/ppc64/sys/dev/xen/xenpci/ (props changed) Modified: projects/ppc64/bin/ls/ls.c ============================================================================== --- projects/ppc64/bin/ls/ls.c Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/bin/ls/ls.c Sun Feb 14 18:09:18 2010 (r203886) @@ -113,6 +113,7 @@ static int f_listdir; /* list actual di static int f_listdot; /* list files beginning with . */ static int f_noautodot; /* do not automatically enable -A for root */ int f_longform; /* long listing format */ +static int f_nofollow; /* don't follow symbolic link arguments */ int f_nonprint; /* show unprintables as ? */ static int f_nosort; /* don't sort output */ int f_notabs; /* don't use tab-separated multi-col output */ @@ -234,6 +235,7 @@ main(int argc, char *argv[]) break; case 'H': fts_options |= FTS_COMFOLLOW; + f_nofollow = 0; break; case 'G': setenv("CLICOLOR", "", 1); @@ -241,11 +243,13 @@ main(int argc, char *argv[]) case 'L': fts_options &= ~FTS_PHYSICAL; fts_options |= FTS_LOGICAL; + f_nofollow = 0; break; case 'P': fts_options &= ~FTS_COMFOLLOW; fts_options &= ~FTS_LOGICAL; fts_options |= FTS_PHYSICAL; + f_nofollow = 1; break; case 'R': f_recursive = 1; @@ -396,10 +400,10 @@ main(int argc, char *argv[]) fts_options |= FTS_NOSTAT; /* - * If not -F, -d or -l options, follow any symbolic links listed on + * If not -F, -P, -d or -l options, follow any symbolic links listed on * the command line. */ - if (!f_longform && !f_listdir && (!f_type || f_slash)) + if (!f_nofollow && !f_longform && !f_listdir && (!f_type || f_slash)) fts_options |= FTS_COMFOLLOW; /* Modified: projects/ppc64/bin/pax/Makefile ============================================================================== --- projects/ppc64/bin/pax/Makefile Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/bin/pax/Makefile Sun Feb 14 18:09:18 2010 (r203886) @@ -33,8 +33,4 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache #MAN= pax.1 tar.1 cpio.1 #LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio -.if ${MACHINE_ARCH} == "arm" -WARNS?= 3 -.endif - .include <bsd.prog.mk> Modified: projects/ppc64/bin/pax/cpio.h ============================================================================== --- projects/ppc64/bin/pax/cpio.h Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/bin/pax/cpio.h Sun Feb 14 18:09:18 2010 (r203886) @@ -67,7 +67,7 @@ typedef struct { char c_mtime[11]; /* modification time */ char c_namesize[6]; /* length of pathname */ char c_filesize[11]; /* length of file in bytes */ -} HD_CPIO; +} HD_CPIO __aligned(1); #define MAGIC 070707 /* transportable archive id */ @@ -98,7 +98,7 @@ typedef struct { u_char h_namesize[2]; u_char h_filesize_1[2]; u_char h_filesize_2[2]; -} HD_BCPIO; +} HD_BCPIO __aligned(1); #ifdef _PAX_ /* @@ -136,7 +136,7 @@ typedef struct { char c_rmin[8]; /* special file minor # */ char c_namesize[8]; /* length of pathname */ char c_chksum[8]; /* 0 OR CRC of bytes of FILE data */ -} HD_VCPIO; +} HD_VCPIO __aligned(1); #define VMAGIC 070701 /* sVr4 new portable archive id */ #define VCMAGIC 070702 /* sVr4 new portable archive id CRC */ Modified: projects/ppc64/bin/pax/tar.h ============================================================================== --- projects/ppc64/bin/pax/tar.h Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/bin/pax/tar.h Sun Feb 14 18:09:18 2010 (r203886) @@ -96,7 +96,7 @@ typedef struct { char chksum[CHK_LEN]; /* checksum */ char linkflag; /* norm, hard, or sym. */ char linkname[TNMSZ]; /* linked to name */ -} HD_TAR; +} HD_TAR __aligned(1); #ifdef _PAX_ /* @@ -142,4 +142,4 @@ typedef struct { char devmajor[8]; /* major device number */ char devminor[8]; /* minor device number */ char prefix[TPFSZ]; /* linked to name */ -} HD_USTAR; +} HD_USTAR __aligned(1); Modified: projects/ppc64/bin/pkill/pkill.1 ============================================================================== --- projects/ppc64/bin/pkill/pkill.1 Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/bin/pkill/pkill.1 Sun Feb 14 18:09:18 2010 (r203886) @@ -36,7 +36,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 16, 2009 +.Dd February 11, 2010 .Dt PKILL 1 .Os .Sh NAME @@ -44,7 +44,7 @@ .Nd find or signal processes by name .Sh SYNOPSIS .Nm pgrep -.Op Fl LSafilnovx +.Op Fl LSafilnoqvx .Op Fl F Ar pidfile .Op Fl G Ar gid .Op Fl M Ar core @@ -175,6 +175,8 @@ command. Select only the newest (most recently started) of the matching processes. .It Fl o Select only the oldest (least recently started) of the matching processes. +.It Fl q +Do not write anything to standard output. .It Fl s Ar sid Restrict matches to processes with a session ID in the comma-separated list Modified: projects/ppc64/bin/pkill/pkill.c ============================================================================== --- projects/ppc64/bin/pkill/pkill.c Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/bin/pkill/pkill.c Sun Feb 14 18:09:18 2010 (r203886) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include <sys/time.h> #include <sys/user.h> +#include <assert.h> #include <stdio.h> #include <stdlib.h> #include <limits.h> @@ -110,6 +111,7 @@ static int matchargs; static int fullmatch; static int kthreads; static int cflags = REG_EXTENDED; +static int quiet; static kvm_t *kd; static pid_t mypid; @@ -180,9 +182,11 @@ main(int argc, char **argv) debug_opt = 0; pidfile = NULL; pidfilelock = 0; - execf = coref = _PATH_DEVNULL; + quiet = 0; + execf = NULL; + coref = _PATH_DEVNULL; - while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnos:t:u:vx")) != -1) + while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnoqs:t:u:vx")) != -1) switch (ch) { case 'D': debug_opt++; @@ -257,6 +261,11 @@ main(int argc, char **argv) oldest = 1; criteria = 1; break; + case 'q': + if (!pgrep) + usage(); + quiet = 1; + break; case 's': makelist(&sidlist, LT_SID, optarg); criteria = 1; @@ -548,7 +557,7 @@ usage(void) const char *ustr; if (pgrep) - ustr = "[-LSfilnovx] [-d delim]"; + ustr = "[-LSfilnoqvx] [-d delim]"; else ustr = "[-signal] [-ILfinovx]"; @@ -566,6 +575,10 @@ show_process(const struct kinfo_proc *kp { char **argv; + if (quiet) { + assert(pgrep); + return; + } if ((longfmt || !pgrep) && matchargs && (argv = kvm_getargv(kd, kp, 0)) != NULL) { printf("%d ", (int)kp->ki_pid); @@ -622,7 +635,8 @@ grepact(const struct kinfo_proc *kp) { show_process(kp); - printf("%s", delim); + if (!quiet) + printf("%s", delim); return (1); } Modified: projects/ppc64/bin/ps/ps.c ============================================================================== --- projects/ppc64/bin/ps/ps.c Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/bin/ps/ps.c Sun Feb 14 18:09:18 2010 (r203886) @@ -212,7 +212,8 @@ main(int argc, char *argv[]) init_list(&sesslist, addelem_pid, sizeof(pid_t), "session id"); init_list(&ttylist, addelem_tty, sizeof(dev_t), "tty"); init_list(&uidlist, addelem_uid, sizeof(uid_t), "user"); - memf = nlistf = _PATH_DEVNULL; + memf = _PATH_DEVNULL; + nlistf = NULL; while ((ch = getopt(argc, argv, PS_ARGS)) != -1) switch (ch) { case 'A': Modified: projects/ppc64/bin/sh/main.c ============================================================================== --- projects/ppc64/bin/sh/main.c Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/bin/sh/main.c Sun Feb 14 18:09:18 2010 (r203886) @@ -157,6 +157,8 @@ main(int argc, char *argv[]) out2fmt_flush("sh: cannot determine working directory\n"); if (getpwd() != NULL) setvar ("PWD", getpwd(), VEXPORT); + if (iflag) + chkmail(1); if (argv[0] && argv[0][0] == '-') { state = 1; read_profile("/etc/profile"); Modified: projects/ppc64/bin/sh/var.c ============================================================================== --- projects/ppc64/bin/sh/var.c Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/bin/sh/var.c Sun Feb 14 18:09:18 2010 (r203886) @@ -337,8 +337,13 @@ setvareq(char *s, int flags) /* * We could roll this to a function, to handle it as * a regular variable function callback, but why bother? + * + * Note: this assumes iflag is not set to 1 initially. + * As part of init(), this is called before arguments + * are looked at. */ - if (vp == &vmpath || (vp == &vmail && ! mpathset())) + if ((vp == &vmpath || (vp == &vmail && ! mpathset())) && + iflag == 1) chkmail(1); if ((vp->flags & VEXPORT) && localevar(s)) { change_env(s, 1); Modified: projects/ppc64/contrib/csup/Makefile ============================================================================== --- projects/ppc64/contrib/csup/Makefile Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/contrib/csup/Makefile Sun Feb 14 18:09:18 2010 (r203886) @@ -7,7 +7,7 @@ MANDIR?= ${PREFIX}/man/man UNAME!= /usr/bin/uname -s PROG= csup -SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ +SRCS= attrstack.c auth.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \ pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \ rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c @@ -42,4 +42,7 @@ parse.h: y.tab.h DPADD= ${LIBCRYPTO} ${LIBZ} LDADD= -lcrypto -lz +SCRIPTS= cpasswd.sh +MAN= csup.1 cpasswd.1 + .include <bsd.prog.mk> Modified: projects/ppc64/contrib/csup/TODO ============================================================================== --- projects/ppc64/contrib/csup/TODO Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/contrib/csup/TODO Sun Feb 14 18:09:18 2010 (r203886) @@ -17,7 +17,6 @@ BUGS: MISSING FEATURES: -- Add support for authentication. - Add support for shell commands sent by the server. - Add missing support for various CVSup options : -D, -a (requires authentication support), -e and -E (requires shell commands support) Copied: projects/ppc64/contrib/csup/auth.c (from r203881, head/contrib/csup/auth.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ppc64/contrib/csup/auth.c Sun Feb 14 18:09:18 2010 (r203886, copy of r203881, head/contrib/csup/auth.c) @@ -0,0 +1,331 @@ +/*- + * Copyright (c) 2003-2007, Petar Zhivkov Petrov <pesho.petrov@gmail.com> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include <sys/param.h> +#include <sys/socket.h> +#include <sys/time.h> +#include <sys/types.h> + +#include <arpa/inet.h> +#include <netinet/in.h> + +#include <ctype.h> +#include <openssl/md5.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include "auth.h" +#include "config.h" +#include "misc.h" +#include "proto.h" +#include "stream.h" + +#define MD5_BYTES 16 + +/* This should be at least 2 * MD5_BYTES + 6 (length of "$md5$" + 1) */ +#define MD5_CHARS_MAX (2*(MD5_BYTES)+6) + +struct srvrecord { + char server[MAXHOSTNAMELEN]; + char client[256]; + char password[256]; +}; + +static int auth_domd5auth(struct config *); +static int auth_lookuprecord(char *, struct srvrecord *); +static int auth_parsetoken(char **, char *, int); +static void auth_makesecret(struct srvrecord *, char *); +static void auth_makeresponse(char *, char *, char *); +static void auth_readablesum(unsigned char *, char *); +static void auth_makechallenge(struct config *, char *); +static int auth_checkresponse(char *, char *, char *); + +int auth_login(struct config *config) +{ + struct stream *s; + char hostbuf[MAXHOSTNAMELEN]; + char *login, *host; + int error; + + s = config->server; + error = gethostname(hostbuf, sizeof(hostbuf)); + hostbuf[sizeof(hostbuf) - 1] = '\0'; + if (error) + host = NULL; + else + host = hostbuf; + login = getlogin(); + proto_printf(s, "USER %s %s\n", login != NULL ? login : "?", + host != NULL ? host : "?"); + stream_flush(s); + error = auth_domd5auth(config); + return (error); +} + +static int +auth_domd5auth(struct config *config) +{ + struct stream *s; + char *line, *cmd, *challenge, *realm, *client, *srvresponse, *msg; + char shrdsecret[MD5_CHARS_MAX], response[MD5_CHARS_MAX]; + char clichallenge[MD5_CHARS_MAX]; + struct srvrecord auth; + int error; + + lprintf(2, "MD5 authentication started\n"); + s = config->server; + line = stream_getln(s, NULL); + cmd = proto_get_ascii(&line); + realm = proto_get_ascii(&line); + challenge = proto_get_ascii(&line); + if (challenge == NULL || + line != NULL || + (strcmp(cmd, "AUTHMD5") != 0)) { + lprintf(-1, "Invalid server reply to USER\n"); + return (STATUS_FAILURE); + } + + client = NULL; + response[0] = clichallenge[0] = '.'; + response[1] = clichallenge[1] = 0; + if (config->reqauth || (strcmp(challenge, ".") != 0)) { + if (strcmp(realm, ".") == 0) { + lprintf(-1, "Authentication required, but not enabled on server\n"); + return (STATUS_FAILURE); + } + error = auth_lookuprecord(realm, &auth); + if (error != STATUS_SUCCESS) + return (error); + client = auth.client; + auth_makesecret(&auth, shrdsecret); + } + + if (strcmp(challenge, ".") != 0) + auth_makeresponse(challenge, shrdsecret, response); + if (config->reqauth) + auth_makechallenge(config, clichallenge); + proto_printf(s, "AUTHMD5 %s %s %s\n", + client == NULL ? "." : client, response, clichallenge); + stream_flush(s); + line = stream_getln(s, NULL); + cmd = proto_get_ascii(&line); + if (cmd == NULL || line == NULL) + goto bad; + if (strcmp(cmd, "OK") == 0) { + srvresponse = proto_get_ascii(&line); + if (srvresponse == NULL) + goto bad; + if (config->reqauth && + !auth_checkresponse(srvresponse, clichallenge, shrdsecret)) { + lprintf(-1, "Server failed to authenticate itself to client\n"); + return (STATUS_FAILURE); + } + lprintf(2, "MD5 authentication successfull\n"); + return (STATUS_SUCCESS); + } + if (strcmp(cmd, "!") == 0) { + msg = proto_get_rest(&line); + if (msg == NULL) + goto bad; + lprintf(-1, "Server error: %s\n", msg); + return (STATUS_FAILURE); + } +bad: + lprintf(-1, "Invalid server reply to AUTHMD5\n"); + return (STATUS_FAILURE); +} + +static int +auth_lookuprecord(char *server, struct srvrecord *auth) +{ + char *home, *line, authfile[FILENAME_MAX]; + struct stream *s; + int linenum = 0, error; + + home = getenv("HOME"); + if (home == NULL) { + lprintf(-1, "Environment variable \"HOME\" is not set\n"); + return (STATUS_FAILURE); + } + snprintf(authfile, sizeof(authfile), "%s/%s", home, AUTHFILE); + s = stream_open_file(authfile, O_RDONLY); + if (s == NULL) { + lprintf(-1, "Could not open file %s\n", authfile); + return (STATUS_FAILURE); + } + + while ((line = stream_getln(s, NULL)) != NULL) { + linenum++; + if (line[0] == '#' || line[0] == '\0') + continue; + error = auth_parsetoken(&line, auth->server, + sizeof(auth->server)); + if (error != STATUS_SUCCESS) { + lprintf(-1, "%s:%d Missng client name\n", authfile, linenum); + goto close; + } + /* Skip the rest of this line, it isn't what we are looking for. */ + if (strcmp(auth->server, server) != 0) + continue; + error = auth_parsetoken(&line, auth->client, + sizeof(auth->client)); + if (error != STATUS_SUCCESS) { + lprintf(-1, "%s:%d Missng password\n", authfile, linenum); + goto close; + } + error = auth_parsetoken(&line, auth->password, + sizeof(auth->password)); + if (error != STATUS_SUCCESS) { + lprintf(-1, "%s:%d Missng comment\n", authfile, linenum); + goto close; + } + stream_close(s); + lprintf(2, "Found authentication record for server \"%s\"\n", + server); + return (STATUS_SUCCESS); + } + lprintf(-1, "Unknown server \"%s\". Fix your %s\n", server , authfile); + memset(auth->password, 0, sizeof(auth->password)); +close: + stream_close(s); + return (STATUS_FAILURE); +} + +static int +auth_parsetoken(char **line, char *buf, int len) +{ + char *colon; + + colon = strchr(*line, ':'); + if (colon == NULL) + return (STATUS_FAILURE); + *colon = 0; + buf[len - 1] = 0; + strncpy(buf, *line, len - 1); + *line = colon + 1; + return (STATUS_SUCCESS); +} + +static void +auth_makesecret(struct srvrecord *auth, char *secret) +{ + char *s, ch; + const char *md5salt = "$md5$"; + unsigned char md5sum[MD5_BYTES]; + MD5_CTX md5; + + MD5_Init(&md5); + for (s = auth->client; *s != 0; ++s) { + ch = tolower(*s); + MD5_Update(&md5, &ch, 1); + } + MD5_Update(&md5, ":", 1); + for (s = auth->server; *s != 0; ++s) { + ch = tolower(*s); + MD5_Update(&md5, &ch, 1); + } + MD5_Update(&md5, ":", 1); + MD5_Update(&md5, auth->password, strlen(auth->password)); + MD5_Final(md5sum, &md5); + memset(secret, 0, sizeof(secret)); + strcpy(secret, md5salt); + auth_readablesum(md5sum, secret + strlen(md5salt)); +} + +static void +auth_makeresponse(char *challenge, char *sharedsecret, char *response) +{ + MD5_CTX md5; + unsigned char md5sum[MD5_BYTES]; + + MD5_Init(&md5); + MD5_Update(&md5, sharedsecret, strlen(sharedsecret)); + MD5_Update(&md5, ":", 1); + MD5_Update(&md5, challenge, strlen(challenge)); + MD5_Final(md5sum, &md5); + auth_readablesum(md5sum, response); +} + +/* + * Generates a challenge string which is an MD5 sum + * of a fairly random string. The purpose is to decrease + * the possibility of generating the same challenge + * string (even by different clients) more then once + * for the same server. + */ +static void +auth_makechallenge(struct config *config, char *challenge) +{ + MD5_CTX md5; + unsigned char md5sum[MD5_BYTES]; + char buf[128]; + struct timeval tv; + struct sockaddr_in laddr; + pid_t pid, ppid; + int error, addrlen; + + gettimeofday(&tv, NULL); + pid = getpid(); + ppid = getppid(); + srand(tv.tv_usec ^ tv.tv_sec ^ pid); + addrlen = sizeof(laddr); + error = getsockname(config->socket, (struct sockaddr *)&laddr, &addrlen); + if (error < 0) { + memset(&laddr, 0, sizeof(laddr)); + } + gettimeofday(&tv, NULL); + MD5_Init(&md5); + snprintf(buf, sizeof(buf), "%s:%ld:%ld:%ld:%d:%d", + inet_ntoa(laddr.sin_addr), tv.tv_sec, tv.tv_usec, random(), pid, ppid); + MD5_Update(&md5, buf, strlen(buf)); + MD5_Final(md5sum, &md5); + auth_readablesum(md5sum, challenge); +} + +static int +auth_checkresponse(char *response, char *challenge, char *secret) +{ + char correctresponse[MD5_CHARS_MAX]; + + auth_makeresponse(challenge, secret, correctresponse); + return (strcmp(response, correctresponse) == 0); +} + +static void +auth_readablesum(unsigned char *md5sum, char *readable) +{ + unsigned int i; + char *s = readable; + + for (i = 0; i < MD5_BYTES; ++i, s+=2) { + sprintf(s, "%.2x", md5sum[i]); + } +} + Copied: projects/ppc64/contrib/csup/auth.h (from r203881, head/contrib/csup/auth.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ppc64/contrib/csup/auth.h Sun Feb 14 18:09:18 2010 (r203886, copy of r203881, head/contrib/csup/auth.h) @@ -0,0 +1,38 @@ +/*- + * Copyright (c) 2003-2007, Petar Zhivkov Petrov <pesho.petrov@gmail.com> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ +#ifndef _AUTH_H_ +#define _AUTH_H_ + +#define AUTHFILE ".csup/auth" /* user home relative */ + +struct config; + +int auth_login(struct config *); + +#endif /* !_AUTH_H_ */ + Modified: projects/ppc64/contrib/csup/config.h ============================================================================== --- projects/ppc64/contrib/csup/config.h Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/contrib/csup/config.h Sun Feb 14 18:09:18 2010 (r203886) @@ -108,6 +108,7 @@ struct config { struct chan *chan1; struct stream *server; fattr_support_t fasupport; + int reqauth; }; struct config *config_init(const char *, struct coll *, int); Copied: projects/ppc64/contrib/csup/cpasswd.1 (from r203881, head/contrib/csup/cpasswd.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ppc64/contrib/csup/cpasswd.1 Sun Feb 14 18:09:18 2010 (r203886, copy of r203881, head/contrib/csup/cpasswd.1) @@ -0,0 +1,120 @@ +.\" Copyright 1999-2003 John D. Polstra. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgment: +.\" This product includes software developed by John D. Polstra. +.\" 4. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $Id: cvpasswd.1,v 1.4 2003/03/04 18:24:42 jdp Exp $ +.\" $FreeBSD $ +.\" +.Dd June 27, 2007 +.Os FreeBSD +.Dt CPASSWD 1 +.Sh NAME +.Nm cpasswd +.Nd scramble passwords for csup authentication +.Sh SYNOPSIS +.Nm +.Ar clientName +.Ar serverName +.Sh DESCRIPTION +The +.Nm +utility creates scrambled passwords for the +.Nm CVSup +server's authentication database. It is invoked with a client name +and a server name. +.Ar ClientName +is the name the client uses to gain access to the +server. By convention, e-mail addresses are used for all client +names, e.g., +.Ql BillyJoe@FreeBSD.ORG . +Client names are case-insensitive. +.Pp +.Ar ServerName +is the name of the +.Nm CVSup +server which the client wishes to access. By convention, +it is the canonical fully-qualified domain name of the server, e.g., +.Ql CVSup.FreeBSD.ORG . +This must agree with the server's own idea of its name. The name is +case-insensitive. +.Pp +To set up authentication for a given server, one must perform the +following steps: +.Bl -enum +.It +Obtain the official +.Ar serverName +from the administrator of the server or from some other source. +.It +Choose an appropriate +.Ar clientName . +It should be in the form of a valid e-mail address, to make it easy +for the server administrator to contact the user if necessary. +.It +Choose an arbitrary secret +.Ar password . +.It +Run +.Nm cpasswd , +and type in the +.Ar password +when prompted for it. The utility will print out a line to send +to the server administrator, and instruct you how to modify your +.Li $ Ns Ev HOME Ns Pa /.csup/auth +file. You should use a secure channel to send the line to the +server administrator. +.El +.Pp +Since +.Li $ Ns Ev HOME Ns Pa /.csup/auth +contains passwords, you should ensure that it is not readable by +anyone except yourself. +.Sh FILES +.Bl -tag -width $HOME/.csup/authxx -compact +.It Li $ Ns Ev HOME Ns Pa /.csup/auth +Authentication password file. +.El +.Sh SEE ALSO +.Xr csup 1 , +.Xr cvsup 1 , +.Xr cvsupd 8 . +.Pp +.Bd -literal +http://www.cvsup.org/ +.Ed +.Sh AUTHORS +.An -nosplit +.An Petar Zhivkov Petrov Aq pesho.petrov@gmail.com +is the author of +.Nm , +the rewrite of +.Nm cvpasswd . +.An John Polstra Aq jdp@polstra.com +is the author of +.Nm CVSup . +.Sh LEGALITIES +CVSup is a registered trademark of John D. Polstra. Copied: projects/ppc64/contrib/csup/cpasswd.sh (from r203881, head/contrib/csup/cpasswd.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ppc64/contrib/csup/cpasswd.sh Sun Feb 14 18:09:18 2010 (r203886, copy of r203881, head/contrib/csup/cpasswd.sh) @@ -0,0 +1,135 @@ +#! /bin/sh +# +# Copyright 2007. Petar Zhivkov Petrov +# pesho.petrov@gmail.com +# +# $FreeBSD$ + +usage() { + echo "Usage: $0 clientName serverName" + echo " $0 -v" +} + +countChars() { + _count="`echo "$1" | sed -e "s/[^$2]//g" | tr -d "\n" | wc -c`" + return 0 +} + +readPassword() { + while [ true ]; do + stty -echo + read -p "$1" _password + stty echo + echo "" + countChars "$_password" ":" + if [ $_count != 0 ]; then + echo "Sorry, password must not contain \":\" characters" + echo "" + else + break + fi + done + return 0 +} + +makeSecret() { + local clientLower="`echo "$1" | tr "[:upper:]" "[:lower:]"`" + local serverLower="`echo "$2" | tr "[:upper:]" "[:lower:]"`" + local secret="`md5 -qs "$clientLower:$serverLower:$3"`" + _secret="\$md5\$$secret" +} + +if [ $# -eq 1 -a "X$1" = "X-v" ]; then + echo "Csup authentication key generator" + usage + exit +elif [ $# -ne 2 ]; then + usage + exit +fi + +clientName=$1 +serverName=$2 + +# +# Client name must contain exactly one '@' and at least one '.'. +# It must not contain a ':'. +# + +countChars "$clientName" "@" +aCount=$_count + +countChars "$clientName" "." +dotCount=$_count +if [ $aCount -ne 1 -o $dotCount -eq 0 ]; then + echo "Client name must have the form of an e-mail address," + echo "e.g., \"user@domain.com\"" + exit +fi + +countChars "$clientName" ":" +colonCount=$_count +if [ $colonCount -gt 0 ]; then + echo "Client name must not contain \":\" characters" + exit +fi + +# +# Server name must not contain '@' and must have at least one '.'. +# It also must not contain a ':'. +# + +countChars "$serverName" "@" +aCount=$_count + +countChars "$serverName" "." +dotCount=$_count +if [ $aCount != 0 -o $dotCount = 0 ]; then + echo "Server name must be a fully-qualified domain name." + echo "e.g., \"host.domain.com\"" + exit +fi + +countChars "$serverName" ":" +colonCount=$_count +if [ $colonCount -gt 0 ]; then + echo "Server name must not contain \":\" characters" + exit +fi + +# +# Ask for password and generate secret. +# + +while [ true ]; do + readPassword "Enter password: " + makeSecret "$clientName" "$serverName" "$_password" + secret=$_secret + + readPassword "Enter same password again: " + makeSecret "$clientName" "$serverName" "$_password" + secret2=$_secret + + if [ "X$secret" = "X$secret2" ]; then + break + else + echo "Passwords did not match. Try again." + echo "" + fi +done + +echo "" +echo "Send this line to the server administrator at $serverName:" +echo "-------------------------------------------------------------------------------" +echo "$clientName:$secret::" +echo "-------------------------------------------------------------------------------" +echo "Be sure to send it using a secure channel!" +echo "" +echo "Add this line to your file \"$HOME/.csup/auth\", replacing \"XXX\"" +echo "with the password you typed in:" +echo "-------------------------------------------------------------------------------" +echo "$serverName:$clientName:XXX:" +echo "-------------------------------------------------------------------------------" +echo "Make sure the file is readable and writable only by you!" +echo "" + Modified: projects/ppc64/contrib/csup/csup.1 ============================================================================== --- projects/ppc64/contrib/csup/csup.1 Sun Feb 14 17:14:11 2010 (r203885) +++ projects/ppc64/contrib/csup/csup.1 Sun Feb 14 18:09:18 2010 (r203886) @@ -32,7 +32,7 @@ .Nd network distribution package for CVS repositories .Sh SYNOPSIS .Nm -.Op Fl 146ksvzZ +.Op Fl 146aksvzZ .Op Fl A Ar addr .Op Fl b Ar base .Op Fl c Ar collDir @@ -106,6 +106,12 @@ to use IPv4 addresses only. Forces .Nm to use IPv6 addresses only. +.It Fl a +Requires the server to authenticate itself (prove its identity) to +the client. If authentication of the server fails, the update is +canceled. See +.Sx AUTHENTICATION , +below. .It Fl A Ar addr Specifies a local address to bind to when connecting to the server. The local address might be a hostname or a numeric host address string @@ -793,6 +799,102 @@ as well: .It .Pa /bar/stool/src-all/refuse.cvs:RELENG_3 .El +.Sh AUTHENTICATION +.Nm +implements an optional authentication mechanism which can be used by the +client and server to verify each other's identities. +Public CVSup servers normally do not enable authentication. +.Nm +users may ignore this section unless they have been informed +that authentication is required by the administrator of their server. +.Pp +The authentication subsystem uses a +challenge-response protocol which is immune to packet sniffing and +replay attacks. No passwords are sent over the network in either +direction. Both the client and the server can independently verify +the identities of each other. +.Pp +The file +.Li $ Ns Ev HOME Ns Pa /.csup/auth +holds the information used for authentication. This file contains a +record for each server that the client is allowed to access. Each +record occupies one line in the file. Lines beginning with +.Ql # +are ignored, as are lines containing only white space. White space is +significant everywhere else in the file. Fields are separated by +.Ql \&: +characters. +.Pp +Each record of the file has the following form: +.Bd -literal -offset indent +.Sm off +.Xo Ar serverName No : Ar clientName No : +.Ar password No : Ar comment +.Xc +.Sm on +.Ed +.Pp +All fields must be present even if some of them are empty. +.Ar ServerName +is the name of the server to which the record applies. By convention, +it is the canonical fully-qualified domain name of the server, e.g., +.Ql CVSup177.FreeBSD.ORG . +This must agree with the server's own idea of its name. The name is +case-insensitive. +.Pp +.Ar ClientName +is the name the client uses to gain access to the server. By +convention, e-mail addresses are used for all client names, e.g., +.Ql BillyJoe@FreeBSD.ORG . +Client names are case-insensitive. +.Pp +.Ar Password +is a secret string of characters that the client uses to prove its +identity. It may not contain any *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002141809.o1EI9JpH045527>