Date: Sun, 25 Oct 2009 11:06:22 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 169787 for review Message-ID: <200910251106.n9PB6MlB094665@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=169787 Change 169787 by bz@bz_dumpster on 2009/10/25 11:05:33 IFC @169783 Affected files ... .. //depot/projects/s390/Makefile.inc1#31 integrate .. //depot/projects/s390/ObsoleteFiles.inc#11 integrate .. //depot/projects/s390/bin/cat/Makefile#3 integrate .. //depot/projects/s390/bin/csh/iconv_stub.c#2 integrate .. //depot/projects/s390/bin/ls/ls.c#11 integrate .. //depot/projects/s390/bin/sh/eval.c#12 integrate .. //depot/projects/s390/bin/sh/exec.c#11 integrate .. //depot/projects/s390/bin/sh/expand.c#12 integrate .. //depot/projects/s390/bin/sh/parser.c#9 integrate .. //depot/projects/s390/bin/sh/sh.1#14 integrate .. //depot/projects/s390/bin/uuidgen/Makefile#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate .. //depot/projects/s390/contrib/gcc/config/i386/i386.c#9 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam.conf.5#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-tcp.c#6 integrate .. //depot/projects/s390/contrib/tcpdump/tcp.h#5 integrate .. //depot/projects/s390/contrib/tcsh/sh.c#7 integrate .. //depot/projects/s390/crypto/openssh/ssh_namespace.h#5 integrate .. //depot/projects/s390/crypto/openssh/sshd_config#12 integrate .. //depot/projects/s390/etc/defaults/rc.conf#22 integrate .. //depot/projects/s390/etc/gettytab#6 integrate .. //depot/projects/s390/etc/pam.d/ftpd#7 integrate .. //depot/projects/s390/etc/pam.d/kde#6 integrate .. //depot/projects/s390/etc/pam.d/other#7 integrate .. //depot/projects/s390/etc/pam.d/sshd#9 integrate .. //depot/projects/s390/etc/pam.d/system#2 integrate .. //depot/projects/s390/etc/pam.d/telnetd#7 integrate .. //depot/projects/s390/etc/pam.d/xdm#8 integrate .. //depot/projects/s390/etc/rc.d/bgfsck#7 integrate .. //depot/projects/s390/etc/rc.d/cleartmp#7 integrate .. //depot/projects/s390/etc/rc.d/faith#2 integrate .. //depot/projects/s390/etc/rc.d/fsck#7 integrate .. //depot/projects/s390/etc/rc.d/hostid#3 integrate .. //depot/projects/s390/etc/rc.d/hostname#5 integrate .. //depot/projects/s390/etc/rc.d/ldconfig#8 integrate .. //depot/projects/s390/etc/rc.d/motd#7 integrate .. //depot/projects/s390/etc/rc.d/mountcritlocal#6 integrate .. //depot/projects/s390/etc/rc.d/moused#7 integrate .. //depot/projects/s390/etc/rc.d/netif#10 integrate .. //depot/projects/s390/etc/rc.d/netoptions#5 integrate .. //depot/projects/s390/etc/rc.d/newsyslog#5 integrate .. //depot/projects/s390/etc/rc.d/nfsclient#6 integrate .. //depot/projects/s390/etc/rc.d/pf#5 integrate .. //depot/projects/s390/etc/rc.d/savecore#5 integrate .. //depot/projects/s390/etc/rc.d/stf#2 integrate .. //depot/projects/s390/etc/rc.subr#14 integrate .. //depot/projects/s390/etc/services#10 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes#18 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes.sp.ok#4 integrate .. //depot/projects/s390/games/number/Makefile#2 integrate .. //depot/projects/s390/games/number/number.c#3 integrate .. //depot/projects/s390/include/langinfo.h#3 integrate .. //depot/projects/s390/include/libgen.h#2 integrate .. //depot/projects/s390/kerberos5/lib/libgssapi_krb5/Makefile#2 integrate .. //depot/projects/s390/kerberos5/lib/libgssapi_spnego/Makefile#2 integrate .. //depot/projects/s390/lib/libc/gen/Makefile.inc#16 integrate .. //depot/projects/s390/lib/libc/gen/Symbol.map#7 integrate .. //depot/projects/s390/lib/libc/gen/basename.3#5 integrate .. //depot/projects/s390/lib/libc/gen/basename.c#4 integrate .. //depot/projects/s390/lib/libc/gen/errlst.c#5 integrate .. //depot/projects/s390/lib/libc/gen/fts.3#9 integrate .. //depot/projects/s390/lib/libc/gen/fts.c#7 integrate .. //depot/projects/s390/lib/libc/gen/getcwd.c#7 integrate .. //depot/projects/s390/lib/libc/gen/wordexp.c#3 integrate .. //depot/projects/s390/lib/libc/include/namespace.h#10 integrate .. //depot/projects/s390/lib/libc/include/un-namespace.h#10 integrate .. //depot/projects/s390/lib/libc/locale/nl_langinfo.c#3 integrate .. //depot/projects/s390/lib/libc/nls/C.msg#2 integrate .. //depot/projects/s390/lib/libc/stdio/getdelim.c#2 integrate .. //depot/projects/s390/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/s390/lib/libc/sys/intro.2#11 integrate .. //depot/projects/s390/lib/libc/sys/nanosleep.2#5 integrate .. //depot/projects/s390/lib/libfetch/common.c#9 integrate .. //depot/projects/s390/lib/libpam/modules/pam_ssh/Makefile#7 integrate .. //depot/projects/s390/lib/libpmc/Makefile#3 integrate .. //depot/projects/s390/lib/libpmc/libpmc.c#7 integrate .. //depot/projects/s390/lib/libthr/arch/ia64/Makefile.inc#4 integrate .. //depot/projects/s390/lib/libthr/arch/ia64/ia64/_umtx_op_err.S#1 branch .. //depot/projects/s390/lib/libthr/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/s390/lib/libthr/pthread.map#5 integrate .. //depot/projects/s390/lib/libthr/thread/thr_private.h#9 integrate .. //depot/projects/s390/lib/libthr/thread/thr_syscalls.c#8 integrate .. //depot/projects/s390/lib/libusb/libusb20_ugen20.c#3 integrate .. //depot/projects/s390/libexec/rtld-elf/map_object.c#12 integrate .. //depot/projects/s390/libexec/rtld-elf/rtld.c#17 integrate .. //depot/projects/s390/release/doc/README#3 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/errata/article.sgml#13 integrate .. //depot/projects/s390/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/s390/release/doc/share/mk/doc.relnotes.mk#4 integrate .. //depot/projects/s390/release/doc/share/sgml/release.dsl#6 integrate .. //depot/projects/s390/release/doc/share/sgml/release.ent#10 integrate .. //depot/projects/s390/release/scripts/package-split.py#7 integrate .. //depot/projects/s390/sbin/Makefile.inc#5 integrate .. //depot/projects/s390/sbin/adjkerntz/Makefile#2 integrate .. //depot/projects/s390/sbin/atacontrol/Makefile#4 integrate .. //depot/projects/s390/sbin/atm/atmconfig/Makefile#3 integrate .. //depot/projects/s390/sbin/badsect/Makefile#4 integrate .. //depot/projects/s390/sbin/bsdlabel/Makefile#5 integrate .. //depot/projects/s390/sbin/camcontrol/Makefile#7 integrate .. //depot/projects/s390/sbin/ccdconfig/Makefile#4 integrate .. //depot/projects/s390/sbin/clri/Makefile#2 integrate .. //depot/projects/s390/sbin/comcontrol/Makefile#4 integrate .. //depot/projects/s390/sbin/conscontrol/Makefile#2 integrate .. //depot/projects/s390/sbin/dhclient/Makefile#5 integrate .. //depot/projects/s390/sbin/dhclient/bpf.c#3 integrate .. //depot/projects/s390/sbin/dhclient/dhcpd.h#2 integrate .. //depot/projects/s390/sbin/dhclient/packet.c#2 integrate .. //depot/projects/s390/sbin/dmesg/Makefile#4 integrate .. //depot/projects/s390/sbin/dump/Makefile#6 integrate .. //depot/projects/s390/sbin/dumpfs/Makefile#5 integrate .. //depot/projects/s390/sbin/dumpfs/dumpfs.c#10 integrate .. //depot/projects/s390/sbin/dumpon/Makefile#3 integrate .. //depot/projects/s390/sbin/geom/Makefile#3 integrate .. //depot/projects/s390/sbin/geom/Makefile.inc#2 integrate .. //depot/projects/s390/sbin/geom/class/part/gpart.8#3 integrate .. //depot/projects/s390/sbin/ggate/Makefile.inc#2 integrate .. //depot/projects/s390/sbin/growfs/Makefile#4 integrate .. //depot/projects/s390/sbin/growfs/growfs.c#8 integrate .. //depot/projects/s390/sbin/gvinum/Makefile#3 integrate .. //depot/projects/s390/sbin/ifconfig/af_nd6.c#2 integrate .. //depot/projects/s390/sbin/ifconfig/ifieee80211.c#13 integrate .. //depot/projects/s390/sbin/init/Makefile#5 integrate .. //depot/projects/s390/sbin/ipf/Makefile.inc#2 integrate .. //depot/projects/s390/sbin/iscontrol/Makefile#2 integrate .. //depot/projects/s390/sbin/kldunload/Makefile#4 integrate .. //depot/projects/s390/sbin/ldconfig/Makefile#4 integrate .. //depot/projects/s390/sbin/md5/Makefile#3 integrate .. //depot/projects/s390/sbin/mdconfig/Makefile#4 integrate .. //depot/projects/s390/sbin/mdmfs/Makefile#4 integrate .. //depot/projects/s390/sbin/mksnap_ffs/Makefile#3 integrate .. //depot/projects/s390/sbin/mount/Makefile#5 integrate .. //depot/projects/s390/sbin/mount_autofs/Makefile#2 integrate .. //depot/projects/s390/sbin/mount_cd9660/Makefile#4 integrate .. //depot/projects/s390/sbin/mount_ext2fs/Makefile#3 integrate .. //depot/projects/s390/sbin/mount_msdosfs/Makefile#5 integrate .. //depot/projects/s390/sbin/mount_nullfs/Makefile#4 integrate .. //depot/projects/s390/sbin/mount_reiserfs/Makefile#3 integrate .. //depot/projects/s390/sbin/mount_unionfs/Makefile#4 integrate .. //depot/projects/s390/sbin/newfs_msdos/Makefile#4 integrate .. //depot/projects/s390/sbin/nfsiod/Makefile#3 integrate .. //depot/projects/s390/sbin/pfctl/Makefile#4 integrate .. //depot/projects/s390/sbin/rcorder/Makefile#4 integrate .. //depot/projects/s390/sbin/reboot/Makefile#5 integrate .. //depot/projects/s390/sbin/recoverdisk/Makefile#2 integrate .. //depot/projects/s390/sbin/routed/Makefile#4 integrate .. //depot/projects/s390/sbin/savecore/Makefile#3 integrate .. //depot/projects/s390/sbin/sconfig/Makefile#2 integrate .. //depot/projects/s390/sbin/shutdown/Makefile#3 integrate .. //depot/projects/s390/sbin/spppcontrol/Makefile#2 integrate .. //depot/projects/s390/sbin/swapon/Makefile#5 integrate .. //depot/projects/s390/sbin/sysctl/sysctl.c#12 integrate .. //depot/projects/s390/sbin/tunefs/Makefile#3 integrate .. //depot/projects/s390/sbin/tunefs/tunefs.8#10 integrate .. //depot/projects/s390/share/man/man4/Makefile#25 integrate .. //depot/projects/s390/share/man/man4/acpi_hp.4#2 integrate .. //depot/projects/s390/share/man/man4/acpi_wmi.4#2 integrate .. //depot/projects/s390/share/man/man4/atapicam.4#5 integrate .. //depot/projects/s390/share/man/man4/bce.4#6 integrate .. //depot/projects/s390/share/man/man4/bge.4#14 integrate .. //depot/projects/s390/share/man/man4/de.4#5 integrate .. //depot/projects/s390/share/man/man4/hifn.4#6 integrate .. //depot/projects/s390/share/man/man4/ichwd.4#2 integrate .. //depot/projects/s390/share/man/man4/lindev.4#2 integrate .. //depot/projects/s390/share/man/man4/mac_mls.4#11 integrate .. //depot/projects/s390/share/man/man4/malo.4#3 integrate .. //depot/projects/s390/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/s390/share/man/man4/targ.4#7 integrate .. //depot/projects/s390/share/man/man4/umass.4#13 integrate .. //depot/projects/s390/share/man/man4/unix.4#6 integrate .. //depot/projects/s390/share/man/man4/urtw.4#4 integrate .. //depot/projects/s390/share/man/man9/BUS_BIND_INTR.9#1 branch .. //depot/projects/s390/share/man/man9/BUS_DESCRIBE_INTR.9#1 branch .. //depot/projects/s390/share/man/man9/Makefile#18 integrate .. //depot/projects/s390/share/man/man9/fetch.9#2 integrate .. //depot/projects/s390/share/man/man9/store.9#2 integrate .. //depot/projects/s390/share/misc/bsd-family-tree#19 integrate .. //depot/projects/s390/share/misc/committers-src.dot#6 integrate .. //depot/projects/s390/share/mk/bsd.sys.mk#9 integrate .. //depot/projects/s390/share/zoneinfo/Makefile#7 integrate .. //depot/projects/s390/share/zoneinfo/asia#13 integrate .. //depot/projects/s390/share/zoneinfo/australasia#10 integrate .. //depot/projects/s390/sys/amd64/acpica/acpi_machdep.c#9 integrate .. //depot/projects/s390/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/s390/sys/amd64/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/s390/sys/amd64/amd64/elf_machdep.c#9 integrate .. //depot/projects/s390/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/s390/sys/amd64/amd64/nexus.c#7 integrate .. //depot/projects/s390/sys/amd64/amd64/pmap.c#13 integrate .. //depot/projects/s390/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/s390/sys/amd64/include/atomic.h#6 integrate .. //depot/projects/s390/sys/amd64/include/elf.h#6 integrate .. //depot/projects/s390/sys/amd64/include/intr_machdep.h#7 integrate .. //depot/projects/s390/sys/arm/arm/cpufunc.c#9 integrate .. //depot/projects/s390/sys/arm/arm/elf_machdep.c#8 integrate .. //depot/projects/s390/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/s390/sys/arm/conf/HL200#7 integrate .. //depot/projects/s390/sys/arm/conf/KB920X#7 integrate .. //depot/projects/s390/sys/arm/include/elf.h#7 integrate .. //depot/projects/s390/sys/arm/mv/mv_machdep.c#7 integrate .. //depot/projects/s390/sys/arm/xscale/i80321/i80321_timer.c#5 integrate .. //depot/projects/s390/sys/boot/i386/zfsboot/zfsboot.c#3 integrate .. //depot/projects/s390/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/s390/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/s390/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/s390/sys/cam/ata/ata_pmp.c#1 branch .. //depot/projects/s390/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/s390/sys/cam/cam.h#5 integrate .. //depot/projects/s390/sys/cam/cam_periph.c#19 integrate .. //depot/projects/s390/sys/cam/cam_queue.c#5 integrate .. //depot/projects/s390/sys/cam/cam_queue.h#3 integrate .. //depot/projects/s390/sys/cam/cam_xpt.c#16 integrate .. //depot/projects/s390/sys/cam/cam_xpt_internal.h#3 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_all.c#11 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_cd.c#22 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_ch.c#11 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_da.c#27 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_low.c#11 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_pt.c#10 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_sa.c#19 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_targ_bh.c#8 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_target.c#16 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_xpt.c#2 integrate .. //depot/projects/s390/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/policy.h#4 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/s390/sys/compat/ia32/ia32_sysvec.c#8 integrate .. //depot/projects/s390/sys/compat/linux/linux_socket.c#15 integrate .. //depot/projects/s390/sys/compat/x86bios/x86bios.c#2 integrate .. //depot/projects/s390/sys/compat/x86bios/x86bios.h#2 integrate .. //depot/projects/s390/sys/compat/x86bios/x86bios_alloc.c#2 delete .. //depot/projects/s390/sys/conf/NOTES#29 integrate .. //depot/projects/s390/sys/conf/files#31 integrate .. //depot/projects/s390/sys/conf/files.amd64#14 integrate .. //depot/projects/s390/sys/conf/files.i386#20 integrate .. //depot/projects/s390/sys/conf/options#26 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/changes.txt#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/adfile.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/adisasm.c#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/adwalk.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/dmextern.c#1 branch .. //depot/projects/s390/sys/contrib/dev/acpica/common/dmtable.c#4 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/getopt.c#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslload.c#7 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/debugger/dbcmds.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/disassembler/dmwalk.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/events/evregion.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acapps.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acdebug.h#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acdisasm.h#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acglobal.h#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/aclocal.h#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acpixf.h#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/iwn/LICENSE#2 integrate .. //depot/projects/s390/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#1 branch .. //depot/projects/s390/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#2 delete .. //depot/projects/s390/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#1 branch .. //depot/projects/s390/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu#1 branch .. //depot/projects/s390/sys/contrib/x86emu/x86emu_util.c#2 delete .. //depot/projects/s390/sys/dev/agp/agp_i810.c#5 integrate .. //depot/projects/s390/sys/dev/ahci/ahci.c#3 integrate .. //depot/projects/s390/sys/dev/ahci/ahci.h#3 integrate .. //depot/projects/s390/sys/dev/aic7xxx/aicasm/aicasm.c#5 integrate .. //depot/projects/s390/sys/dev/ata/ata-queue.c#13 integrate .. //depot/projects/s390/sys/dev/ata/atapi-cd.c#19 integrate .. //depot/projects/s390/sys/dev/ata/atapi-fd.c#16 integrate .. //depot/projects/s390/sys/dev/ata/atapi-tape.c#15 integrate .. //depot/projects/s390/sys/dev/ata/chipsets/ata-ati.c#3 integrate .. //depot/projects/s390/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch .. //depot/projects/s390/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#1 branch .. //depot/projects/s390/sys/dev/atkbdc/atkbd.c#6 integrate .. //depot/projects/s390/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/s390/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/s390/sys/dev/bge/if_bge.c#23 integrate .. //depot/projects/s390/sys/dev/bge/if_bgereg.h#15 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/s390/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/s390/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/s390/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/s390/sys/dev/cxgb/cxgb_t3fw.h#3 integrate .. //depot/projects/s390/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/s390/sys/dev/drm/drm_pciids.h#9 integrate .. //depot/projects/s390/sys/dev/drm/i915_drv.h#7 integrate .. //depot/projects/s390/sys/dev/drm/mach64_state.c#4 integrate .. //depot/projects/s390/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/s390/sys/dev/fb/vesa.h#2 integrate .. //depot/projects/s390/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/s390/sys/dev/gem/if_gem_pci.c#9 integrate .. //depot/projects/s390/sys/dev/hwpmc/hwpmc_core.c#5 integrate .. //depot/projects/s390/sys/dev/hwpmc/hwpmc_mod.c#10 integrate .. //depot/projects/s390/sys/dev/ips/ips_disk.c#6 integrate .. //depot/projects/s390/sys/dev/iwn/if_iwn.c#6 integrate .. //depot/projects/s390/sys/dev/iwn/if_iwnreg.h#2 integrate .. //depot/projects/s390/sys/dev/iwn/if_iwnvar.h#3 integrate .. //depot/projects/s390/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/s390/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/s390/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/s390/sys/dev/mpt/mpt_raid.c#8 integrate .. //depot/projects/s390/sys/dev/mwl/if_mwl_pci.c#2 integrate .. //depot/projects/s390/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/s390/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/s390/sys/dev/pci/pci.c#22 integrate .. //depot/projects/s390/sys/dev/pci/vga_pci.c#5 integrate .. //depot/projects/s390/sys/dev/ppbus/lpt.c#15 integrate .. //depot/projects/s390/sys/dev/ppbus/pcfclock.c#11 integrate .. //depot/projects/s390/sys/dev/siis/siis.c#3 integrate .. //depot/projects/s390/sys/dev/syscons/syscons.c#21 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci_mbus.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci_pci.c#4 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehcireg.h#1 branch .. //depot/projects/s390/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ohci_pci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ohcireg.h#1 branch .. //depot/projects/s390/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/uhci_pci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/uhcireg.h#1 branch .. //depot/projects/s390/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/s390/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/s390/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/s390/sys/dev/usb/serial/uch341.c#2 delete .. //depot/projects/s390/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/s390/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs#24 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_uath.c#3 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_urtw.c#3 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_urtwreg.h#2 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/s390/sys/fs/nfsclient/nfs_clport.c#3 integrate .. //depot/projects/s390/sys/fs/nfsclient/nfs_clstate.c#2 integrate .. //depot/projects/s390/sys/fs/nfsclient/nfs_clsubs.c#2 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_vfsops.c#14 integrate .. //depot/projects/s390/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/s390/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/s390/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/s390/sys/geom/concat/g_concat.c#6 integrate .. //depot/projects/s390/sys/geom/label/g_label.c#6 integrate .. //depot/projects/s390/sys/geom/part/g_part.c#7 integrate .. //depot/projects/s390/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/s390/sys/geom/shsec/g_shsec.c#5 integrate .. //depot/projects/s390/sys/geom/stripe/g_stripe.c#6 integrate .. //depot/projects/s390/sys/geom/uzip/g_uzip.c#5 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_create.c#3 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_events.c#3 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_init.c#5 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_move.c#5 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_rm.c#9 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_subr.c#8 integrate .. //depot/projects/s390/sys/i386/conf/GENERIC#25 integrate .. //depot/projects/s390/sys/i386/conf/NOTES#23 integrate .. //depot/projects/s390/sys/i386/i386/elf_machdep.c#13 integrate .. //depot/projects/s390/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/s390/sys/i386/i386/nexus.c#7 integrate .. //depot/projects/s390/sys/i386/i386/pmap.c#24 integrate .. //depot/projects/s390/sys/i386/include/atomic.h#9 integrate .. //depot/projects/s390/sys/i386/include/elf.h#7 integrate .. //depot/projects/s390/sys/i386/include/intr_machdep.h#7 integrate .. //depot/projects/s390/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/s390/sys/ia64/conf/GENERIC#20 integrate .. //depot/projects/s390/sys/ia64/ia64/elf_machdep.c#15 integrate .. //depot/projects/s390/sys/ia64/ia64/pmap.c#22 integrate .. //depot/projects/s390/sys/ia64/include/asm.h#5 integrate .. //depot/projects/s390/sys/ia64/include/elf.h#9 integrate .. //depot/projects/s390/sys/ia64/include/param.h#13 integrate .. //depot/projects/s390/sys/kern/bus_if.m#9 integrate .. //depot/projects/s390/sys/kern/imgact_elf.c#18 integrate .. //depot/projects/s390/sys/kern/init_main.c#20 integrate .. //depot/projects/s390/sys/kern/kern_event.c#17 integrate .. //depot/projects/s390/sys/kern/kern_exec.c#23 integrate .. //depot/projects/s390/sys/kern/kern_exit.c#26 integrate .. //depot/projects/s390/sys/kern/kern_intr.c#17 integrate .. //depot/projects/s390/sys/kern/kern_ktrace.c#16 integrate .. //depot/projects/s390/sys/kern/kern_lock.c#17 integrate .. //depot/projects/s390/sys/kern/kern_shutdown.c#16 integrate .. //depot/projects/s390/sys/kern/kern_sig.c#23 integrate .. //depot/projects/s390/sys/kern/kern_thr.c#14 integrate .. //depot/projects/s390/sys/kern/kern_thread.c#23 integrate .. //depot/projects/s390/sys/kern/sched_ule.c#20 integrate .. //depot/projects/s390/sys/kern/stack_protector.c#2 integrate .. //depot/projects/s390/sys/kern/subr_bus.c#23 integrate .. //depot/projects/s390/sys/kern/subr_taskqueue.c#14 integrate .. //depot/projects/s390/sys/kern/subr_trap.c#21 integrate .. //depot/projects/s390/sys/kern/sys_process.c#15 integrate .. //depot/projects/s390/sys/kern/sysv_shm.c#15 integrate .. //depot/projects/s390/sys/kern/tty.c#22 integrate .. //depot/projects/s390/sys/kern/tty_ttydisc.c#6 integrate .. //depot/projects/s390/sys/kern/uipc_usrreq.c#21 integrate .. //depot/projects/s390/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/s390/sys/mips/include/elf.h#4 integrate .. //depot/projects/s390/sys/mips/mips/elf64_machdep.c#3 integrate .. //depot/projects/s390/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/s390/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/s390/sys/modules/Makefile#28 integrate .. //depot/projects/s390/sys/modules/cam/Makefile#9 integrate .. //depot/projects/s390/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/s390/sys/modules/dpms/Makefile#3 integrate .. //depot/projects/s390/sys/modules/iwnfw/Makefile#3 integrate .. //depot/projects/s390/sys/modules/iwnfw/Makefile.inc#1 branch .. //depot/projects/s390/sys/modules/iwnfw/iwn4965/Makefile#1 branch .. //depot/projects/s390/sys/modules/iwnfw/iwn5000/Makefile#1 branch .. //depot/projects/s390/sys/modules/iwnfw/iwn5150/Makefile#1 branch .. //depot/projects/s390/sys/modules/nfsclient/Makefile#10 integrate .. //depot/projects/s390/sys/modules/nfslockd/Makefile#3 integrate .. //depot/projects/s390/sys/modules/pf/Makefile#7 integrate .. //depot/projects/s390/sys/modules/ubser/Makefile#2 integrate .. //depot/projects/s390/sys/modules/usb/Makefile#9 integrate .. //depot/projects/s390/sys/modules/usb/uch341/Makefile#2 delete .. //depot/projects/s390/sys/modules/usb/ucom/Makefile#2 integrate .. //depot/projects/s390/sys/modules/vesa/Makefile#3 integrate .. //depot/projects/s390/sys/modules/x86bios/Makefile#2 integrate .. //depot/projects/s390/sys/net/bpf.c#20 integrate .. //depot/projects/s390/sys/net/flowtable.c#4 integrate .. //depot/projects/s390/sys/net/if_bridge.c#10 integrate .. //depot/projects/s390/sys/net/if_enc.c#4 integrate .. //depot/projects/s390/sys/net/if_ethersubr.c#22 integrate .. //depot/projects/s390/sys/net/if_gif.c#16 integrate .. //depot/projects/s390/sys/net/pfil.c#8 integrate .. //depot/projects/s390/sys/net/pfil.h#7 integrate .. //depot/projects/s390/sys/net/route.c#18 integrate .. //depot/projects/s390/sys/net80211/ieee80211_hwmp.c#3 integrate .. //depot/projects/s390/sys/net80211/ieee80211_mesh.c#3 integrate .. //depot/projects/s390/sys/net80211/ieee80211_mesh.h#3 integrate .. //depot/projects/s390/sys/net80211/ieee80211_output.c#12 integrate .. //depot/projects/s390/sys/net80211/ieee80211_proto.h#10 integrate .. //depot/projects/s390/sys/netgraph/NOTES#2 integrate .. //depot/projects/s390/sys/netgraph/ng_bridge.c#12 integrate .. //depot/projects/s390/sys/netinet/if_ether.c#19 integrate .. //depot/projects/s390/sys/netinet/in.c#16 integrate .. //depot/projects/s390/sys/netinet/ip_fastfwd.c#10 integrate .. //depot/projects/s390/sys/netinet/ip_icmp.c#19 integrate .. //depot/projects/s390/sys/netinet/ip_input.c#22 integrate .. //depot/projects/s390/sys/netinet/ip_output.c#21 integrate .. //depot/projects/s390/sys/netinet/ip_var.h#15 integrate .. //depot/projects/s390/sys/netinet/ipfw/ip_fw2.c#3 integrate .. //depot/projects/s390/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate .. //depot/projects/s390/sys/netinet/raw_ip.c#20 integrate .. //depot/projects/s390/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/s390/sys/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/s390/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/s390/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/s390/sys/netinet/tcp_input.c#27 integrate .. //depot/projects/s390/sys/netinet6/icmp6.c#16 integrate .. //depot/projects/s390/sys/netinet6/in6.c#16 integrate .. //depot/projects/s390/sys/netinet6/in6_ifattach.c#15 integrate .. //depot/projects/s390/sys/netinet6/ip6_forward.c#10 integrate .. //depot/projects/s390/sys/netinet6/ip6_input.c#18 integrate .. //depot/projects/s390/sys/netinet6/ip6_output.c#18 integrate .. //depot/projects/s390/sys/netinet6/ip6_var.h#13 integrate .. //depot/projects/s390/sys/nfsclient/nfs_kdtrace.c#3 integrate .. //depot/projects/s390/sys/nfsclient/nfs_vnops.c#25 integrate .. //depot/projects/s390/sys/nlm/nlm.h#4 integrate .. //depot/projects/s390/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/s390/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/s390/sys/pc98/conf/GENERIC#22 integrate .. //depot/projects/s390/sys/powerpc/aim/clock.c#3 integrate .. //depot/projects/s390/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/s390/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/s390/sys/powerpc/aim/mmu_oea64.c#3 integrate .. //depot/projects/s390/sys/powerpc/aim/mp_cpudep.c#4 integrate .. //depot/projects/s390/sys/powerpc/aim/platform_chrp.c#2 integrate .. //depot/projects/s390/sys/powerpc/aim/swtch.S#3 integrate .. //depot/projects/s390/sys/powerpc/aim/trap_subr.S#3 integrate .. //depot/projects/s390/sys/powerpc/booke/mp_cpudep.c#2 integrate .. //depot/projects/s390/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/s390/sys/powerpc/include/elf.h#6 integrate .. //depot/projects/s390/sys/powerpc/include/hid.h#5 integrate .. //depot/projects/s390/sys/powerpc/include/pcpu.h#7 integrate .. //depot/projects/s390/sys/powerpc/include/pmap.h#10 integrate .. //depot/projects/s390/sys/powerpc/include/smp.h#4 integrate .. //depot/projects/s390/sys/powerpc/include/spr.h#8 integrate .. //depot/projects/s390/sys/powerpc/powermac/hrowpic.c#6 integrate .. //depot/projects/s390/sys/powerpc/powerpc/cpu.c#6 integrate .. //depot/projects/s390/sys/powerpc/powerpc/elf_machdep.c#12 integrate .. //depot/projects/s390/sys/powerpc/powerpc/mmu_if.m#5 integrate .. //depot/projects/s390/sys/powerpc/powerpc/mp_machdep.c#7 integrate .. //depot/projects/s390/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate .. //depot/projects/s390/sys/powerpc/powerpc/uio_machdep.c#4 integrate .. //depot/projects/s390/sys/sparc64/conf/GENERIC#23 integrate .. //depot/projects/s390/sys/sparc64/include/elf.h#9 integrate .. //depot/projects/s390/sys/sparc64/sparc64/elf_machdep.c#12 integrate .. //depot/projects/s390/sys/sparc64/sparc64/pmap.c#18 integrate .. //depot/projects/s390/sys/sun4v/include/elf.h#4 integrate .. //depot/projects/s390/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/s390/sys/sys/bus.h#13 integrate .. //depot/projects/s390/sys/sys/errno.h#4 integrate .. //depot/projects/s390/sys/sys/interrupt.h#8 integrate .. //depot/projects/s390/sys/sys/kernel.h#12 integrate .. //depot/projects/s390/sys/sys/ktrace.h#8 integrate .. //depot/projects/s390/sys/sys/signalvar.h#11 integrate .. //depot/projects/s390/sys/sys/ttyqueue.h#3 integrate .. //depot/projects/s390/sys/teken/sequences#2 integrate .. //depot/projects/s390/sys/teken/teken.c#2 integrate .. //depot/projects/s390/sys/teken/teken_subr.h#2 integrate .. //depot/projects/s390/sys/tools/fw_stub.awk#4 integrate .. //depot/projects/s390/sys/tools/makeobjops.awk#4 integrate .. //depot/projects/s390/sys/vm/pmap.h#15 integrate .. //depot/projects/s390/sys/vm/swap_pager.c#18 integrate .. //depot/projects/s390/sys/vm/vm_extern.h#12 integrate .. //depot/projects/s390/sys/vm/vm_glue.c#16 integrate .. //depot/projects/s390/sys/vm/vm_page.c#20 integrate .. //depot/projects/s390/sys/vm/vm_page.h#14 integrate .. //depot/projects/s390/tools/regression/bin/sh/execution/unknown1.0#1 branch .. //depot/projects/s390/tools/regression/bin/sh/expansion/question1.0#1 branch .. //depot/projects/s390/tools/regression/bin/sh/expansion/set-u1.0#1 branch .. //depot/projects/s390/tools/regression/bin/sh/expansion/set-u2.0#1 branch .. //depot/projects/s390/tools/regression/fstest/tests/rename/21.t#2 integrate .. //depot/projects/s390/tools/regression/lib/libc/gen/test-wordexp.c#3 integrate .. //depot/projects/s390/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate .. //depot/projects/s390/tools/regression/lib/libutil/test-flopen.c#4 integrate .. //depot/projects/s390/tools/regression/sigqueue/sigqtest1/sigqtest1.c#2 integrate .. //depot/projects/s390/tools/regression/sigqueue/sigqtest2/sigqtest2.c#2 integrate .. //depot/projects/s390/tools/regression/sockets/unix_seqpacket/Makefile#1 branch .. //depot/projects/s390/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch .. //depot/projects/s390/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch .. //depot/projects/s390/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch .. //depot/projects/s390/tools/regression/tmpfs/h_tools.c#2 integrate .. //depot/projects/s390/tools/tools/netrate/netsend/netsend.c#3 integrate .. //depot/projects/s390/usr.bin/calendar/calendars/calendar.freebsd#20 integrate .. //depot/projects/s390/usr.bin/locale/locale.1#4 integrate .. //depot/projects/s390/usr.bin/locale/locale.c#4 integrate .. //depot/projects/s390/usr.bin/make/job.c#10 integrate .. //depot/projects/s390/usr.bin/make/main.c#13 integrate .. //depot/projects/s390/usr.bin/netstat/main.c#14 integrate .. //depot/projects/s390/usr.bin/netstat/netstat.h#11 integrate .. //depot/projects/s390/usr.bin/netstat/route.c#9 integrate .. //depot/projects/s390/usr.bin/netstat/unix.c#6 integrate .. //depot/projects/s390/usr.bin/systat/keyboard.c#3 integrate .. //depot/projects/s390/usr.bin/systat/main.c#5 integrate .. //depot/projects/s390/usr.bin/touch/touch.c#5 integrate .. //depot/projects/s390/usr.sbin/acpi/iasl/Makefile#6 integrate .. //depot/projects/s390/usr.sbin/cdcontrol/cdcontrol.c#10 integrate .. //depot/projects/s390/usr.sbin/jail/jail.8#14 integrate .. //depot/projects/s390/usr.sbin/ntp/doc/ntpd.8#6 integrate .. //depot/projects/s390/usr.sbin/sysinstall/tcpip.c#11 integrate .. //depot/projects/s390/usr.sbin/tzsetup/tzsetup.8#5 integrate .. //depot/projects/s390/usr.sbin/tzsetup/tzsetup.c#5 integrate Differences ... ==== //depot/projects/s390/Makefile.inc1#31 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.629 2009/09/10 07:37:36 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.631 2009/10/21 19:39:34 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -929,6 +929,10 @@ _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 @@ usr.bin/makewhatis \ ${_mklocale} \ usr.bin/rpcgen \ + ${_sed} \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ @@ -1038,7 +1043,6 @@ .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} \ @@ -1127,7 +1131,7 @@ _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 ==== //depot/projects/s390/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.209 2009/09/10 21:42:00 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.211 2009/10/24 12:59:29 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091005: fusword.9 and susword.9 removed +OLD_FILES+=usr/share/man/man9/fusword.9.gz +OLD_FILES+=usr/share/man/man9/susword.9.gz # 20090909: vesa and dpms promoted to be i386/amd64 common OLD_FILES+=usr/include/machine/pc/vesa.h OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz @@ -26,6 +29,49 @@ OLD_FILES+=etc/mtree/BSD.local.dist OLD_FILES+=etc/mtree/BSD.x11.dist OLD_FILES+=etc/mtree/BSD.x11-4.dist +# 20090812: net80211 documentation overhaul +OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz # 20090801: vimage.h removed in favour of vnet.h OLD_FILES+=usr/include/sys/vimage.h # 20090719: library version bump for 8.0 @@ -503,6 +549,8 @@ 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 ==== //depot/projects/s390/bin/cat/Makefile#3 (text+ko) ==== @@ -1,7 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/cat/Makefile,v 1.8 2009/03/16 12:16:17 des Exp $ +# $FreeBSD: src/bin/cat/Makefile,v 1.9 2009/10/15 18:17:29 ru Exp $ PROG= cat -WARNS?= 6 .include <bsd.prog.mk> ==== //depot/projects/s390/bin/csh/iconv_stub.c#2 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/bin/csh/iconv_stub.c,v 1.1 2006/02/19 06:40:29 ume Exp $ + * $FreeBSD: src/bin/csh/iconv_stub.c,v 1.2 2009/10/17 15:53:15 ume Exp $ */ #include <dlfcn.h> @@ -61,9 +61,20 @@ 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; } ==== //depot/projects/s390/bin/ls/ls.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.87 2009/10/13 21:51:50 jilles Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -399,7 +399,7 @@ * 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; /* ==== //depot/projects/s390/bin/sh/eval.c#12 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $"); #include <paths.h> #include <signal.h> @@ -713,12 +713,7 @@ do_clearcmdentry = 1; } - find_command(argv[0], &cmdentry, 1, path); - if (cmdentry.cmdtype == CMDUNKNOWN) { /* command not found */ - exitstatus = 127; - flushout(&errout); - return; - } + find_command(argv[0], &cmdentry, 0, path); /* implement the bltin builtin here */ if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) { for (;;) { @@ -740,7 +735,7 @@ /* Fork off a child process if necessary. */ if (cmd->ncmd.backgnd - || (cmdentry.cmdtype == CMDNORMAL + || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN) && ((flags & EV_EXIT) == 0 || have_traps())) || ((flags & EV_BACKCMD) != 0 && (cmdentry.cmdtype != CMDBUILTIN ==== //depot/projects/s390/bin/sh/exec.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -429,6 +429,7 @@ outfmt(out2, "%s: %s\n", name, strerror(e)); } entry->cmdtype = CMDUNKNOWN; + entry->u.index = 0; return; success: ==== //depot/projects/s390/bin/sh/expand.c#12 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.55 2009/06/25 17:14:06 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.56 2009/10/24 21:20:04 jilles Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -657,7 +657,7 @@ } varlen = 0; startloc = expdest - stackblock(); - if (!set && uflag) { + if (!set && uflag && *var != '@' && *var != '*') { switch (subtype) { case VSNORMAL: case VSTRIMLEFT: ==== //depot/projects/s390/bin/sh/parser.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.65 2009/10/16 16:17:57 jilles Exp $"); #include <stdlib.h> #include <unistd.h> @@ -1308,11 +1308,16 @@ 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; ==== //depot/projects/s390/bin/sh/sh.1#14 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.133 2009/10/24 21:20:04 jilles Exp $ .\" -.Dd May 31, 2009 +.Dd October 24, 2009 .Dt SH 1 .Os .Sh NAME @@ -296,7 +296,10 @@ .Ed .It Fl u Li nounset Write a message to standard error when attempting -to expand a variable that is not set, and if the +to expand a variable, a positional parameter or +the special parameter +.Va \&! +that is not set, and if the shell is not interactive, exit immediately. .It Fl V Li vi Enable the built-in @@ -1227,6 +1230,9 @@ final value of .Ar parameter is substituted. +Quoting inside +.Ar word +does not prevent field splitting or pathname expansion. Only variables, not positional parameters or special parameters, can be assigned in this way. ==== //depot/projects/s390/bin/uuidgen/Makefile#2 (text+ko) ==== @@ -1,6 +1,5 @@ -# $FreeBSD: src/bin/uuidgen/Makefile,v 1.4 2008/03/13 17:38:06 obrien Exp $ +# $FreeBSD: src/bin/uuidgen/Makefile,v 1.5 2009/10/15 18:17:29 ru Exp $ PROG= uuidgen -WARNS?= 6 .include <bsd.prog.mk> ==== //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 (text+ko) ==== @@ -1790,11 +1790,14 @@ /* We don't support those properties on FreeBSD. */ switch (prop) { + case ZFS_PROP_DEVICES: + case ZFS_PROP_ZONED: case ZFS_PROP_SHAREISCSI: - case ZFS_PROP_DEVICES: - case ZFS_PROP_ACLMODE: - case ZFS_PROP_ACLINHERIT: case ZFS_PROP_ISCSIOPTIONS: + case ZFS_PROP_XATTR: + case ZFS_PROP_VSCAN: + case ZFS_PROP_NBMAND: + case ZFS_PROP_SHARESMB: (void) snprintf(errbuf, sizeof (errbuf), "property '%s' not supported on FreeBSD", propname); ret = zfs_error(hdl, EZFS_PERM, errbuf); ==== //depot/projects/s390/contrib/gcc/config/i386/i386.c#9 (text+ko) ==== @@ -19,7 +19,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.25 2007/08/14 03:04:42 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.26 2009/10/21 19:26:12 jhb Exp $ */ #include "config.h" #include "system.h" @@ -1614,7 +1614,7 @@ "-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)) ==== //depot/projects/s390/contrib/openpam/doc/man/pam.conf.5#3 (text) ==== @@ -109,7 +109,7 @@ .It Cm requisite If this module succeeds, the result of the chain will be success unless a later module fails. -If it module fails, the chain is broken and the result is failure. +If the module fails, the chain is broken and the result is failure. .It Cm sufficient If this module succeeds, the chain is broken and the result is success. ==== //depot/projects/s390/contrib/tcpdump/print-tcp.c#6 (text+ko) ==== @@ -124,6 +124,7 @@ { TCPOPT_CCECHO, "" }, { TCPOPT_SIGNATURE, "md5" }, { TCPOPT_AUTH, "enhanced auth" }, + { TCPOPT_UTO, "uto" }, { 0, NULL } }; @@ -613,6 +614,17 @@ */ break; + case TCPOPT_UTO: + datalen = 2; + LENCHECK(datalen); + uint utoval = EXTRACT_16BITS(cp); + if (utoval & 0x0001) + utoval = (utoval >> 1) * 60; + else + utoval >>= 1; + (void)printf(" %u", utoval); + break; + default: datalen = len - 2; for (i = 0; i < datalen; ++i) { ==== //depot/projects/s390/contrib/tcpdump/tcp.h#5 (text+ko) ==== @@ -83,6 +83,8 @@ #define TCPOLEN_SIGNATURE 18 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910251106.n9PB6MlB094665>