From owner-p4-projects@FreeBSD.ORG Sat Sep 30 13:29:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1346116A416; Sat, 30 Sep 2006 13:29:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBAA716A412 for ; Sat, 30 Sep 2006 13:29:14 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9257943D8B for ; Sat, 30 Sep 2006 13:28:46 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8UDSjLZ065285 for ; Sat, 30 Sep 2006 13:28:45 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8UDSZJu065269 for perforce@freebsd.org; Sat, 30 Sep 2006 13:28:35 GMT (envelope-from piso@freebsd.org) Date: Sat, 30 Sep 2006 13:28:35 GMT Message-Id: <200609301328.k8UDSZJu065269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 106980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Sep 2006 13:29:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=106980 Change 106980 by piso@piso_newluxor on 2006/09/30 13:27:40 IFC@106979 Affected files ... .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#7 integrate .. //depot/projects/soc2005/libalias/UPDATING#8 integrate .. //depot/projects/soc2005/libalias/bin/cp/cp.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/ntp/include/ntp_stdlib.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ntp/include/ntpd.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/telnet/telnet/telnet.1#3 integrate .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#7 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/mrouted#2 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/soc2005/libalias/lib/libalias/Makefile#8 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/err.3#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 integrate .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/soc2005/libalias/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/soc2005/libalias/share/examples/mdoc/example.4#4 integrate .. //depot/projects/soc2005/libalias/share/examples/mdoc/example.9#2 integrate .. //depot/projects/soc2005/libalias/share/examples/scsi_target/scsi_cmds.c#2 integrate .. //depot/projects/soc2005/libalias/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/soc2005/libalias/share/examples/scsi_target/scsi_target.h#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/bge.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ip6.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/wl.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.info.mk#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/soc2005/libalias/sys/boot/common/merge_help.awk#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/common/panic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/digi/digi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/kbdmux/kbdmux.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/ak452x.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/ak452x.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/envy24ht.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/envy24ht.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/spicds.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/spicds.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/mixer.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/procfs/procfs_ioctl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/soc2005/libalias/sys/geom/label/g_label_msdosfs.h#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/nop/g_nop.h#3 integrate .. //depot/projects/soc2005/libalias/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_proc.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/sys_generic.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_pts.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_pty.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_tty.c#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/kbdmux/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/Makefile#9 integrate .. //depot/projects/soc2005/libalias/sys/modules/procfs/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/vkbd/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_tap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/if_tap.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/atm/ccatm/ng_ccatm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_var.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_output.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#13 edit .. //depot/projects/soc2005/libalias/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/consio.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/digiio.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/ioccom.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/kbio.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/pioctl.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/ttycom.h#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_page.c#6 integrate .. //depot/projects/soc2005/libalias/tools/tools/find-sb/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/find-sb/find-sb.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/soc2005/libalias/usr.bin/du/du.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/file/magic.5#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/find/find.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/locate/locate/locate.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/logger/logger.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/login/login.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/lorder/lorder.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/make.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/mktemp/mktemp.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/mkuzip/mkuzip.8#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/mroute.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/mroute6.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/netstat.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/split/split.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/su/su.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/su/su.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/tftp/tftp.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/time/time.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truncate/truncate.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/truss.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/vmstat/vmstat.8#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/whois/whois.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/xargs/xargs.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/xinstall/install.1#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/Makefile#6 integrate .. //depot/projects/soc2005/libalias/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/arp/arp.4#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/asf/asf.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/asf/asf.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/crunch/crunchgen/crunchgen.1#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/crunch/examples/really-big.conf#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/devinfo/devinfo.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/gstat/gstat.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/iostat/iostat.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/jail/jail.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/jexec/jexec.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/jexec/jexec.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/kbdcontrol/kbdcontrol.1#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mailwrapper/mailwrapper.8#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/moused/moused.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/LICENSE#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/Makefile#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/RELEASE#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/VERSION#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/callout.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/cfparse.y#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/common/Makefile#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/config.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/defs.h#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/dvmrp.h#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/icmp.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/igmp.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/igmpv2.h#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/inet.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/ipip.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/kern.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/main.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/map-mbone.8#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/map-mbone/Makefile#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/mapper.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/mrinfo.8#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/mrinfo.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/mrinfo/Makefile#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/mrouted.8#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/mrouted.conf#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/mrouted/Makefile#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/mtrace.8#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/mtrace.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/mtrace.h#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/mtrace/Makefile#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/pathnames.h#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/prune.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/prune.h#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/route.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/route.h#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/rsrr.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/rsrr.h#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/rsrr_var.h#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/testrsrr/Makefile#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/testrsrr/testrsrr.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/vif.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mrouted/vif.h#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/mtree/mtree.8#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/newsyslog/newsyslog.conf.5#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ntp/doc/ntp.conf.5#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ntp/doc/ntpdc.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ntp/doc/ntpq.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/syslogd/syslog.conf.5#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/syslogd/syslogd.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/watchdogd/watchdog.8#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/watchdogd/watchdogd.8#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/wpa/hostapd/hostapd.conf.5#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/wpa/ndis_events/ndis_events.8#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.51 2006/09/24 10:57:34 simon Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.53 2006/09/29 10:39:23 bms Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,9 +14,20 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20060929: mrouted removed +OLD_FILES+=usr/sbin/map-mbone +OLD_FILES+=usr/sbin/mrinfo +OLD_FILES+=usr/sbin/mrouted +OLD_FILES+=usr/sbin/mtrace +OLD_FILES+=usr/share/man/man8/map-mbone.8.gz +OLD_FILES+=usr/share/man/man8/mrinfo.8.gz +OLD_FILES+=usr/share/man/man8/mrouted.8.gz +OLD_FILES+=usr/share/man/man8/mtrace.8.gz # 20060924: tcpslice removed OLD_FILES+=usr/sbin/tcpslice OLD_FILES+=usr/share/man/man1/tcpslice.1.gz +# 20060829: kvmdb cleanup script removed +OLD_FILES+=etc/periodic/weekly/120.clean-kvmdb # 20060822: ramdisk{,-own} have been replaced by mdconfig{,2} OLD_FILES+=etc/rc.d/ramdisk OLD_FILES+=etc/rc.d/ramdisk-own ==== //depot/projects/soc2005/libalias/UPDATING#8 (text+ko) ==== @@ -21,6 +21,17 @@ developers choose to disable these features on build machines to maximize performance. +20060929: + mrouted and its utilities have been removed from the base system. + +20060924: + tcpslice has been removed from the base system. + +20060913: + The sizes of struct tcpcb (and struct xtcpcb) have changed due to + the rewrite of TCP syncookies. Tools like netstat, sockstat, and + systat needs to be rebuilt. + 20060903: libpcap updated to v0.9.4 and tcpdump to v3.9.4 @@ -613,4 +624,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.456 2006/09/18 11:24:25 maxim Exp $ +$FreeBSD: src/UPDATING,v 1.459 2006/09/29 10:39:23 bms Exp $ ==== //depot/projects/soc2005/libalias/bin/cp/cp.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.54 2006/08/24 20:45:38 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.55 2006/09/29 06:06:39 ru Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfinprvl")) != -1) + while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -127,6 +127,9 @@ iflag = 1; fflag = nflag = 0; break; + case 'l': + lflag = 1; + break; case 'n': nflag = 1; fflag = iflag = 0; @@ -140,9 +143,6 @@ case 'v': vflag = 1; break; - case 'l': - lflag = 1; - break; default: usage(); break; ==== //depot/projects/soc2005/libalias/contrib/ntp/include/ntp_stdlib.h#2 (text+ko) ==== @@ -134,8 +134,10 @@ extern u_int cache_keylen; /* key length */ /* clocktypes.c */ +#ifdef NTP_REFCLOCK_H struct clktype; extern struct clktype clktypes[]; +#endif /* getopt.c */ extern char * ntp_optarg; /* global argument pointer */ ==== //depot/projects/soc2005/libalias/contrib/ntp/include/ntpd.h#2 (text+ko) ==== @@ -226,8 +226,10 @@ #endif /* ntp_control.c */ +#if 0 struct ctl_trap; extern struct ctl_trap ctl_trap[]; +#endif extern int num_ctl_traps; extern keyid_t ctl_auth_keyid; /* keyid used for authenticating write requests */ ==== //depot/projects/soc2005/libalias/contrib/telnet/telnet/telnet.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)telnet.1 8.6 (Berkeley) 6/1/94 -.\" $FreeBSD: src/contrib/telnet/telnet/telnet.1,v 1.19 2006/09/18 15:03:18 maxim Exp $ +.\" $FreeBSD: src/contrib/telnet/telnet/telnet.1,v 1.20 2006/09/29 22:51:29 ru Exp $ .\" .Dd September 18, 2006 .Dt TELNET 1 @@ -233,7 +233,7 @@ port is used. .El .Pp -When in rlogin mode, a line of the form ~. disconnects from the +When in rlogin mode, a line of the form ~.\& disconnects from the remote host; ~ is the .Nm escape character. @@ -645,7 +645,7 @@ the canonical name of that string as determined by .Xr getaddrinfo 3 , or the string -.Dq DEFAULT +.Dq Li DEFAULT indicating all hosts. The rest of the line, and successive lines that begin with white space are assumed to be ==== //depot/projects/soc2005/libalias/etc/defaults/rc.conf#7 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.296 2006/09/20 19:48:31 brooks Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.297 2006/09/29 15:45:09 bms Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -297,7 +297,11 @@ router_enable="NO" # Set to YES to enable a routing daemon. router="/sbin/routed" # Name of routing daemon to use if enabled. router_flags="-q" # Flags for routing daemon. -mrouted_enable="NO" # Do multicast routing (see /etc/mrouted.conf). +mrouted_enable="NO" # Do IPv4 multicast routing. +mrouted_program="/usr/local/sbin/mrouted" # Name of IPv4 multicast + # routing daemon. You need to + # install it from package or + # port. mrouted_flags="" # Flags for multicast routing daemon. ipxgateway_enable="NO" # Set to YES to enable IPX routing. ipxrouted_enable="NO" # Set to YES to run the IPX routing daemon. ==== //depot/projects/soc2005/libalias/etc/rc.d/mrouted#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/mrouted,v 1.9 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/mrouted,v 1.10 2006/09/29 15:45:10 bms Exp $ # # PROVIDE: mrouted @@ -12,7 +12,7 @@ name="mrouted" rcvar=`set_rcvar` -command="/usr/sbin/${name}" +command="/usr/local/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/${name}.conf" extra_commands="reload" ==== //depot/projects/soc2005/libalias/games/fortune/datfiles/limerick#2 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.10 2005/12/26 16:09:58 schweikh Exp $ +%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.11 2006/09/27 19:20:43 schweikh Exp $ A bad little girl in Madrid, A most reprehensible kid, Told her Tante Louise @@ -1457,7 +1457,7 @@ Asked the man who started to bore 'er: "Do you mean birds and bees Go through antics like these, -To suppy us our fauna and flora?" +To supply us our fauna and flora?" % An irate young lady named Booker Told her husband, "You beast, I'm no hooker! ==== //depot/projects/soc2005/libalias/games/fortune/datfiles/startrek#2 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.8 2005/08/30 16:33:39 schweikh Exp $ +%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.9 2006/09/27 19:20:43 schweikh Exp $ A father doesn't destroy his children. -- Lt. Carolyn Palamas, "Who Mourns for Adonais?", stardate 3468.1. @@ -77,7 +77,7 @@ Change is the essential process of all existence. -- Spock, "Let That Be Your Last Battlefield", stardate 5730.2 % -Compassion -- that's the one things no machine ever had. Maybe it's +Compassion -- that's the one thing no machine ever had. Maybe it's the one thing that keeps men ahead of them. -- McCoy, "The Ultimate Computer", stardate 4731.3 % ==== //depot/projects/soc2005/libalias/lib/libalias/Makefile#8 (text+ko) ==== @@ -1,29 +1,5 @@ -# Copyright 2006 Paolo Pisati -# 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: src/lib/libalias/Makefile,v 1.32 2006/09/26 23:26:49 piso Exp $ +# $FreeBSD: src/lib/libalias/Makefile,v 1.33 2006/09/27 12:30:27 ru Exp $ -SUBDIR= libalias modules +SUBDIR= libalias modules .include ==== //depot/projects/soc2005/libalias/lib/libc/gen/err.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)err.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.20 2004/10/04 14:04:37 jkoshy Exp $ +.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.21 2006/09/29 22:57:22 ru Exp $ .\" .Dd March 6, 1999 .Dt ERR 3 @@ -98,7 +98,7 @@ If the .Fa fmt argument is not NULL, the -.Xr printf 3 +.Xr printf 3 Ns -like formatted error message is output. The output is terminated by a newline character. .Pp ==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.975 2006/09/16 03:58:07 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.977 2006/09/28 15:36:59 bmah Exp $ 2000 @@ -212,6 +212,17 @@ has been fixed. For more details, see security advisory FreeBSD-SA-06:20.bind. &merged; + Several programming errors have been fixed in &man.gzip.1;. + They could have the effect of causing a crash or an infinite + loop when decompressing files. More information can be found in + security advisory + FreeBSD-SA-06:21.gzip. &merged; + + Multiple errors in the OpenSSL &man.crypto.3; library have + been fixed. Potential effects are varied, and are documented in + more detail in security advisory + FreeBSD-SA-06:23.openssl. &merged; + @@ -1180,6 +1191,10 @@ The &man.id.1; utility now prints the effective user ID after the group ID. + The &man.id.1; utility now supports a + flag to print process audit properties, including the audit user + id. &merged; + The &man.ifconfig.8; utility now supports a flag to allow printing potentially sensitive keying material to standard output. @@ -1444,6 +1459,11 @@ flag to suppress header lines when multiple files are specified. &merged; + The version of tcpslice in the &os; base system has been + removed due to obsolescence. A more up-to-date version can be + found in the Ports Collection + as net/tcpslice. + The &man.time.1; utility now prints the time that a given command has been running if sent a SIGINFO signal. @@ -1485,6 +1505,9 @@ implemented. This function is popular in Microsoft and GNU systems. + The compiler toolchain is now capable of generating + executables for systems using the ARM processor. + <filename>/etc/rc.d</filename> Scripts @@ -1825,7 +1848,7 @@ The supported version of the KDE desktop environment (x11/kde3) has been - updated from 3.4.2 to 3.5.3. &merged; + updated from 3.4.2 to 3.5.4. &merged; The supported Linux emulation now uses the libraries in the ==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#10 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.98 2006/09/16 19:27:40 jhay Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.99 2006/09/29 08:00:40 maxim Exp $ */ #include @@ -6189,6 +6189,8 @@ */ av += optind - 1; ac -= optind - 1; + if (ac < 2) + errx(EX_USAGE, "no filename argument"); av[ac-1] = NULL; fprintf(stderr, "command is %s\n", av[0]); break; ==== //depot/projects/soc2005/libalias/sbin/newfs/mkfs.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.90 2005/08/14 17:07:04 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.91 2006/09/27 05:49:21 delphij Exp $"); #include #include @@ -755,7 +755,7 @@ if ((grp = getgrnam("operator")) != NULL) { gid = grp->gr_gid; } else { - warnx("Cannot retrieve operator gid."); + warnx("Cannot retrieve operator gid, using gid 0."); gid = 0; } entries = (nflag) ? ROOTLINKCNT - 1: ROOTLINKCNT; ==== //depot/projects/soc2005/libalias/share/examples/mdoc/example.4#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/examples/mdoc/example.4,v 1.26 2006/09/26 19:59:52 danger Exp $ +.\" $FreeBSD: src/share/examples/mdoc/example.4,v 1.27 2006/09/27 21:28:44 danger Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -33,9 +33,11 @@ .Nm example .Nd "example device driver manual page" .Sh SYNOPSIS -To enable support for -.Ns Nm , -place the following lines in the kernel configuration file: +To compile the +.Ns Nm +driver into the kernel, +place the following lines in the +kernel configuration file: .Bd -ragged -offset indent .Cd "device example" .Cd "options EXAMPLE_DEBUG" @@ -43,9 +45,9 @@ .Pp Alternatively, to load the .Ns Nm -as a module at boot time, add the following line into the -.Xr loader.conf 5 -file: +driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : .Bd -literal -offset indent example_load="YES" .Ed ==== //depot/projects/soc2005/libalias/share/examples/mdoc/example.9#2 (text+ko) ==== @@ -22,11 +22,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/examples/mdoc/example.9,v 1.3 2005/01/15 16:01:19 jkoshy Exp $ +.\" $FreeBSD: src/share/examples/mdoc/example.9,v 1.4 2006/09/27 08:39:00 pjd Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. -.Dd January 12, 2005 +.Dd September 27, 2006 .Dt EXAMPLE 9 .Os .Sh NAME @@ -96,14 +96,14 @@ section is returned, to indicate the error. .Sh EXAMPLES .Bd -literal - int val; + int error; - mutex_lock(&example_lock); - if ((val = example(NULL, EXAMPLE_ONE)) != 0) { - mutex_unlock(&example_lock); - return (val); + mtx_lock(&example_lock); + if ((error = example(NULL, EXAMPLE_ONE)) != 0) { + mtx_unlock(&example_lock); + return (error); } - mutex_unlock(&example_lock); + mtx_unlock(&example_lock); .Ed .Sh COMPATIBILITY The @@ -298,7 +298,8 @@ .Xr example 1 , .Xr example 3 , .Xr example 4 , -.Xr mdoc 7 +.Xr mdoc 7 , +.Xr mutex 9 .Rs .%A "A. B. Author" .%T "Example RFC Title" ==== //depot/projects/soc2005/libalias/share/examples/scsi_target/scsi_cmds.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/share/examples/scsi_target/scsi_cmds.c,v 1.9 2006/04/11 21:36:43 mjacob Exp $ + * $FreeBSD: src/share/examples/scsi_target/scsi_cmds.c,v 1.10 2006/09/27 15:38:13 mjacob Exp $ */ #include @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -360,7 +361,7 @@ /* Advertise only what the SIM can actually support */ req_flags &= sim_flags; - scsi_ulto2b(req_flags, &inq->reserved[1]); + scsi_ulto2b(req_flags, &inq->spc2_flags); inq->response_format = 2; /* SCSI2 Inquiry Format */ inq->additional_length = SHORT_INQUIRY_LENGTH - @@ -496,21 +497,13 @@ if ((a_descr->flags & CAM_DIR_IN) != 0) { ret = start_io(atio, ctio, CAM_DIR_IN); if (debug) -#if __FreeBSD_version >= 500000 - warnx("Starting DIR_IN @%jd:%u", -#else - warnx("Starting DIR_IN @%lld:%u", -#endif - c_descr->offset, a_descr->targ_req); + warnx("Starting %p DIR_IN @" OFF_FMT ":%u", + a_descr, c_descr->offset, a_descr->targ_req); } else { ret = start_io(atio, ctio, CAM_DIR_OUT); if (debug) -#if __FreeBSD_version >= 500000 - warnx("Starting DIR_OUT @%jd:%u", -#else - warnx("Starting DIR_OUT @%lld:%u", -#endif - c_descr->offset, a_descr->init_req); + warnx("Starting %p DIR_OUT @" OFF_FMT ":%u", + a_descr, c_descr->offset, a_descr->init_req); } return (ret); @@ -572,29 +565,17 @@ a_descr->total_len = count * sector_size; if (a_descr->total_len == 0) { if (debug) -#if __FreeBSD_version >= 500000 - warnx("r/w 0 blocks @ blkno %ju", blkno); -#else - warnx("r/w 0 blocks @ blkno %llu", blkno); -#endif + warnx("r/w 0 blocks @ blkno " OFF_FMT, blkno); tcmd_null_ok(atio, ctio); return (0); } else if (cdb[0] == WRITE_6 || cdb[0] == WRITE_10) { a_descr->flags |= CAM_DIR_OUT; if (debug) -#if __FreeBSD_version >= 500000 - warnx("write %u blocks @ blkno %ju", count, blkno); -#else - warnx("write %u blocks @ blkno %llu", count, blkno); -#endif + warnx("write %u blocks @ blkno " OFF_FMT, count, blkno); } else { a_descr->flags |= CAM_DIR_IN; if (debug) -#if __FreeBSD_version >= 500000 - warnx("read %u blocks @ blkno %ju", count, blkno); -#else - warnx("read %u blocks @ blkno %llu", count, blkno); -#endif + warnx("read %u blocks @ blkno " OFF_FMT, count, blkno); } return (1); } @@ -626,14 +607,41 @@ /* If DIR_IN, start read from target, otherwise begin CTIO xfer. */ ret = 1; if (dir == CAM_DIR_IN) { - if (aio_read(&c_descr->aiocb) < 0) - err(1, "aio_read"); /* XXX */ + if (notaio) { + if (debug) + warnx("read sync %lud @ block " OFF_FMT, + (unsigned long) + (ctio->dxfer_len / sector_size), + c_descr->offset / sector_size); + if (lseek(c_descr->aiocb.aio_fildes, + c_descr->aiocb.aio_offset, SEEK_SET) < 0) { + perror("lseek"); + err(1, "lseek"); + } + if (read(c_descr->aiocb.aio_fildes, + (void *)c_descr->aiocb.aio_buf, + ctio->dxfer_len) != ctio->dxfer_len) { + err(1, "read"); + } + } else { + if (debug) + warnx("read async %lud @ block " OFF_FMT, + (unsigned long) + (ctio->dxfer_len / sector_size), + c_descr->offset / sector_size); + if (aio_read(&c_descr->aiocb) < 0) { + err(1, "aio_read"); /* XXX */ + } + } a_descr->targ_req += ctio->dxfer_len; + /* if we're done, we can mark the CCB as to send status */ if (a_descr->targ_req == a_descr->total_len) { ctio->ccb_h.flags |= CAM_SEND_STATUS; ctio->scsi_status = SCSI_STATUS_OK; ret = 0; } + if (notaio) + tcmd_rdwr_done(atio, ctio, AIO_DONE); } else { if (a_descr->targ_ack == a_descr->total_len) tcmd_null_ok(atio, ctio); @@ -665,7 +673,7 @@ switch (event) { case AIO_DONE: - if (aio_return(&c_descr->aiocb) < 0) { + if (!notaio && aio_return(&c_descr->aiocb) < 0) { warn("aio_return error"); /* XXX */ tcmd_sense(ctio->init_id, ctio, @@ -675,8 +683,12 @@ } a_descr->targ_ack += ctio->dxfer_len; if ((a_descr->flags & CAM_DIR_IN) != 0) { - if (debug) - warnx("sending CTIO for AIO read"); + if (debug) { + if (notaio) + warnx("sending CTIO for AIO read"); + else + warnx("sending CTIO for sync read"); + } a_descr->init_req += ctio->dxfer_len; send_ccb((union ccb *)ctio, /*priority*/1); } else { @@ -710,11 +722,34 @@ a_descr->init_ack += ctio->dxfer_len; if ((a_descr->flags & CAM_DIR_MASK) == CAM_DIR_OUT && ctio->dxfer_len > 0) { - if (debug) - warnx("sending AIO for CTIO write"); a_descr->targ_req += ctio->dxfer_len; - if (aio_write(&c_descr->aiocb) < 0) - err(1, "aio_write"); /* XXX */ + if (notaio) { + if (debug) + warnx("write sync %lud @ block " + OFF_FMT, (unsigned long) + (ctio->dxfer_len / sector_size), + c_descr->offset / sector_size); + if (lseek(c_descr->aiocb.aio_fildes, + c_descr->aiocb.aio_offset, SEEK_SET) < 0) { + perror("lseek"); + err(1, "lseek"); + } + if (write(c_descr->aiocb.aio_fildes, + (void *) c_descr->aiocb.aio_buf, + ctio->dxfer_len) != ctio->dxfer_len) { + err(1, "write"); + } + tcmd_rdwr_done(atio, ctio, AIO_DONE); + } else { + if (debug) + warnx("write async %lud @ block " + OFF_FMT, (unsigned long) + (ctio->dxfer_len / sector_size), + c_descr->offset / sector_size); + if (aio_write(&c_descr->aiocb) < 0) { + err(1, "aio_write"); /* XXX */ + } + } } else { if (debug) warnx("CTIO done freeing CTIO"); ==== //depot/projects/soc2005/libalias/share/examples/scsi_target/scsi_target.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/share/examples/scsi_target/scsi_target.c,v 1.17 2006/03/22 17:00:14 mjacob Exp $ + * $FreeBSD: src/share/examples/scsi_target/scsi_target.c,v 1.18 2006/09/27 15:38:13 mjacob Exp $ */ #include @@ -56,12 +56,13 @@ /* Maximum amount to transfer per CTIO */ #define MAX_XFER MAXPHYS /* Maximum number of allocated CTIOs */ -#define MAX_CTIOS 32 +#define MAX_CTIOS 64 /* Maximum sector size for emulated volume */ #define MAX_SECTOR 32768 /* Global variables */ int debug; +int notaio = 0; off_t volume_size; u_int sector_size; size_t buf_size; @@ -86,7 +87,7 @@ static void handle_read(void); /* static int work_atio(struct ccb_accept_tio *); */ static void queue_io(struct ccb_scsiio *); -static void run_queue(struct ccb_accept_tio *); +static int run_queue(struct ccb_accept_tio *); static int work_inot(struct ccb_immed_notify *); static struct ccb_scsiio * get_ctio(void); @@ -117,7 +118,7 @@ TAILQ_INIT(&pending_queue); TAILQ_INIT(&work_queue); - while ((ch = getopt(argc, argv, "AdSTb:c:s:W:")) != -1) { + while ((ch = getopt(argc, argv, "AdSTYb:c:s:W:")) != -1) { switch(ch) { case 'A': req_flags |= SID_Addr16; @@ -193,6 +194,9 @@ /* NOTREACHED */ } break; + case 'Y': + notaio = 1; + break; default: usage(); /* NOTREACHED */ @@ -246,20 +250,16 @@ volume_size = user_size / sector_size; } if (debug) -#if __FreeBSD_version >= 500000 - warnx("volume_size: %d bytes x %jd sectors", -#else - warnx("volume_size: %d bytes x %lld sectors", -#endif + warnx("volume_size: %d bytes x " OFF_FMT " sectors", sector_size, volume_size); if (volume_size <= 0) errx(1, "volume must be larger than %d", sector_size); - { + if (notaio == 0) { struct aiocb aio, *aiop; - /* Make sure we have working AIO support */ + /* See if we have we have working AIO support */ memset(&aio, 0, sizeof(aio)); aio.aio_buf = malloc(sector_size); if (aio.aio_buf == NULL) @@ -269,16 +269,17 @@ aio.aio_nbytes = sector_size; signal(SIGSYS, SIG_IGN); if (aio_read(&aio) != 0) { - printf("You must enable VFS_AIO in your kernel " - "or load the aio(4) module.\n"); - err(1, "aio_read"); + printf("AIO support is not available- switchin to" + " single-threaded mode.\n"); >>> TRUNCATED FOR MAIL (1000 lines) <<<