Date: Mon, 30 Aug 2004 21:59:08 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 60725 for review Message-ID: <200408302159.i7ULx8ux029885@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=60725 Change 60725 by peter@peter_hammer on 2004/08/30 21:58:53 IFC @60724 Affected files ... .. //depot/projects/hammer/UPDATING#51 integrate .. //depot/projects/hammer/contrib/cpio/tar.c#2 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#27 integrate .. //depot/projects/hammer/etc/network.subr#7 integrate .. //depot/projects/hammer/etc/rc.d/routed#9 integrate .. //depot/projects/hammer/lib/Makefile#40 integrate .. //depot/projects/hammer/lib/libc/gen/fts.3#7 integrate .. //depot/projects/hammer/release/Makefile#55 integrate .. //depot/projects/hammer/release/Makefile.inc.docports#10 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#13 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#57 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#7 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#6 integrate .. //depot/projects/hammer/release/ia64/mkisoimages.sh#7 integrate .. //depot/projects/hammer/release/scripts/compat1x-install.sh#2 delete .. //depot/projects/hammer/release/scripts/compat20-install.sh#2 delete .. //depot/projects/hammer/release/scripts/compat21-install.sh#2 delete .. //depot/projects/hammer/release/scripts/compat22-install.sh#2 delete .. //depot/projects/hammer/release/scripts/compat3x-install.sh#2 delete .. //depot/projects/hammer/release/scripts/compat4x-install.sh#2 delete .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#4 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#7 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#29 integrate .. //depot/projects/hammer/share/colldef/Makefile#15 integrate .. //depot/projects/hammer/share/examples/kld/cdev/module/cdevmod.c#4 integrate .. //depot/projects/hammer/share/examples/kld/dyn_sysctl/dyn_sysctl.c#2 integrate .. //depot/projects/hammer/share/examples/kld/syscall/module/syscall.c#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ichwd.4#2 integrate .. //depot/projects/hammer/share/man/man4/re.4#7 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#17 integrate .. //depot/projects/hammer/share/misc/pci_vendors#11 integrate .. //depot/projects/hammer/share/mklocale/Makefile#13 integrate .. //depot/projects/hammer/share/monetdef/Makefile#14 integrate .. //depot/projects/hammer/share/msgdef/Makefile#14 integrate .. //depot/projects/hammer/share/msgdef/eu_ES.ISO8859-1.src#1 branch .. //depot/projects/hammer/share/msgdef/ru_RU.UTF-8.src#2 integrate .. //depot/projects/hammer/share/numericdef/Makefile#13 integrate .. //depot/projects/hammer/share/numericdef/eu_ES.ISO8859-1.src#1 branch .. //depot/projects/hammer/share/timedef/Makefile#15 integrate .. //depot/projects/hammer/share/timedef/eu_ES.ISO8859-1.src#1 branch .. //depot/projects/hammer/sys/alpha/conf/GENERIC#21 integrate .. //depot/projects/hammer/sys/alpha/conf/NOTES#7 integrate .. //depot/projects/hammer/sys/alpha/pci/pcibus.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#69 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#103 integrate .. //depot/projects/hammer/sys/boot/common/Makefile.inc#9 integrate .. //depot/projects/hammer/sys/boot/common/bootstrap.h#6 integrate .. //depot/projects/hammer/sys/boot/common/load_elf.c#15 integrate .. //depot/projects/hammer/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/hammer/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/hammer/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/hammer/sys/boot/common/misc.c#3 integrate .. //depot/projects/hammer/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/hammer/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/hammer/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/hammer/sys/boot/i386/boot2/boot1.S#6 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/elf32_freebsd.c#7 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#18 integrate .. //depot/projects/hammer/sys/boot/i386/loader/conf.c#8 integrate .. //depot/projects/hammer/sys/boot/i386/mbr/Makefile#5 integrate .. //depot/projects/hammer/sys/boot/i386/mbr/mbr.s#2 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#14 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#24 integrate .. //depot/projects/hammer/sys/conf/NOTES#62 integrate .. //depot/projects/hammer/sys/conf/files#79 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#33 integrate .. //depot/projects/hammer/sys/conf/options#55 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.c#6 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_acpi.c#4 integrate .. //depot/projects/hammer/sys/dev/firewire/fwcrom.c#9 integrate .. //depot/projects/hammer/sys/dev/md/md.c#36 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#17 integrate .. //depot/projects/hammer/sys/dev/tga/tga_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#9 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#26 integrate .. //depot/projects/hammer/sys/geom/label/g_label.c#6 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#6 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#53 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#32 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#51 integrate .. //depot/projects/hammer/sys/ia64/ia64/exception.S#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/locore.S#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#35 integrate .. //depot/projects/hammer/sys/ia64/ia64/support.S#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/syscall.S#8 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#62 integrate .. //depot/projects/hammer/sys/kern/link_elf_obj.c#47 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#45 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#26 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#21 integrate .. //depot/projects/hammer/sys/modules/Makefile#52 integrate .. //depot/projects/hammer/sys/modules/aac/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/cam/Makefile#8 integrate .. //depot/projects/hammer/sys/net/if.c#26 integrate .. //depot/projects/hammer/sys/net/if.h#12 integrate .. //depot/projects/hammer/sys/net/if_sl.c#19 integrate .. //depot/projects/hammer/sys/net/netisr.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_tty.c#7 integrate .. //depot/projects/hammer/sys/netinet6/ipsec.c#12 integrate .. //depot/projects/hammer/sys/netipx/ipx.c#4 integrate .. //depot/projects/hammer/sys/pc98/pc98/wd.c#12 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#21 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#12 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#23 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#28 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#23 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#18 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#21 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#29 integrate .. //depot/projects/hammer/sys/sys/bio.h#14 integrate .. //depot/projects/hammer/sys/sys/kernel.h#10 integrate .. //depot/projects/hammer/sys/sys/param.h#45 integrate .. //depot/projects/hammer/sys/sys/proc.h#61 integrate .. //depot/projects/hammer/sys/sys/smp.h#8 integrate .. //depot/projects/hammer/sys/sys/systm.h#23 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#42 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#13 integrate .. //depot/projects/hammer/tools/tools/README#9 integrate .. //depot/projects/hammer/tools/tools/genericize/Makefile#1 branch .. //depot/projects/hammer/tools/tools/genericize/genericize.pl#1 branch .. //depot/projects/hammer/usr.bin/tar/write.c#11 integrate .. //depot/projects/hammer/usr.sbin/Makefile#52 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#7 integrate .. //depot/projects/hammer/usr.sbin/kgmon/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/kgmon/kgmon.c#3 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef.c#4 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef.h#4 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_amd64.c#2 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_i386.c#2 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_nop.c#3 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_obj.c#2 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_sparc64.c#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#15 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dispatch.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#18 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.h#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#22 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#27 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#7 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#17 integrate Differences ... ==== //depot/projects/hammer/UPDATING#51 (text+ko) ==== @@ -23,6 +23,24 @@ developers choose to disable these features on build machines to maximize performance. +20040830: + A new variable, ifi_epoch, has been added to struct if_data + which is part if struct ifnet. This means all network drivers + and network monitoring applications need to be recompiled. + +20040828: + The default configuration for the network stack has been changed + such that it now runs without the Giant lock unless configured + otherwise. If you experience network-related instability, you + may wish to try setting "debug.mpsafenet=0" or compiling the + kernel with "options NET_WITH_GIANT". Details on the netperf + project may be found at: + + http://www.watson.org/~robert/freebsd/netperf/ + + Including the 20040828 announcement of configuration change + details. + 20040827: PFIL_HOOKS are a fixed part of the network stack now and do not need to be specified in the kernel configuration file anymore. @@ -1803,4 +1821,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.350 2004/08/27 15:16:24 andre Exp $ +$FreeBSD: src/UPDATING,v 1.352 2004/08/30 06:29:25 brooks Exp $ ==== //depot/projects/hammer/contrib/cpio/tar.c#2 (text+ko) ==== @@ -15,6 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* $FreeBSD: src/contrib/cpio/tar.c,v 1.2 2004/08/28 03:13:05 kientzle Exp $ */ + #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> @@ -343,6 +345,19 @@ else file_hdr->c_mode |= CP_IFREG; break; + case 'x': case 'g': + /* Ignore pax 'x' and 'g' extension entries. */ + /* Skip body of this entry. */ + while (file_hdr->c_filesize > 0) { + tape_buffered_read(((char *) &tar_rec), in_des, TARRECORDSIZE); + if (file_hdr->c_filesize > TARRECORDSIZE) + file_hdr->c_filesize -= TARRECORDSIZE; + else + file_hdr->c_filesize = 0; + } + /* Read next header and return that instead. */ + read_in_tar_header(file_hdr, in_des); + break; } break; } ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.305 2004/08/24 19:03:55 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.306 2004/08/28 12:52:30 tjr Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -441,6 +441,12 @@ .. et_EE.UTF-8 .. + eu_ES.ISO8859-1 + .. + eu_ES.ISO8859-15 + .. + eu_ES.UTF-8 + .. fi_FI.ISO8859-1 .. fi_FI.ISO8859-15 ==== //depot/projects/hammer/etc/network.subr#7 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.155 2004/08/27 12:11:47 yar Exp $ +# $FreeBSD: src/etc/network.subr,v 1.156 2004/08/28 07:58:02 yar Exp $ # # @@ -258,7 +258,9 @@ # nodhcp - all interfaces, excluding DHCP configured interfaces # dhcp - list only DHCP configured interfaces # If no argument is specified all network interfaces are output. -# Note that the list always includes cloned interfaces. +# Note that the list will include cloned interfaces if applicable. +# Cloned interfaces must already exist to have a chance to appear +# in the list if ${network_interfaces} is set to `auto'. # list_net_interfaces() { @@ -271,10 +273,9 @@ _tmplist="`ifconfig -l`" ;; *) - _tmplist="${network_interfaces}" + _tmplist="${network_interfaces} ${cloned_interfaces}" ;; esac - _tmplist="${_tmplist} ${cloned_interfaces}" if [ -z "$type" ]; then echo $_tmplist ==== //depot/projects/hammer/etc/rc.d/routed#9 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: routed,v 1.7 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/routed,v 1.10 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/routed,v 1.11 2004/08/29 15:02:43 kensmith Exp $ # # PROVIDE: routed @@ -19,5 +19,5 @@ load_rc_config $name rcvar="router_enable" command="${router:-/sbin/${name}}" -eval ${name}_flags=${router_flags} +eval ${name}_flags=\"${router_flags}\" run_rc_command "$1" ==== //depot/projects/hammer/lib/Makefile#40 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.190 2004/08/19 23:51:42 davidxu Exp $ +# $FreeBSD: src/lib/Makefile,v 1.191 2004/08/29 18:26:59 obrien Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -24,7 +24,7 @@ SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ - ${_libypclnt} ${_compat} libalias libarchive ${_libatm} ${_libbind} \ + ${_libypclnt} libalias libarchive ${_libatm} ${_libbind} \ ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ @@ -57,7 +57,6 @@ .endif .if ${MACHINE_ARCH} == "i386" -_compat= compat _libncp= libncp _libsmb= libsmb _libvgl= libvgl @@ -74,7 +73,6 @@ .if ${MACHINE_ARCH} == "alpha" _libio= libio -_compat= compat .endif .if !defined(NO_SENDMAIL) ==== //depot/projects/hammer/lib/libc/gen/fts.3#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fts.3 8.5 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.20 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.21 2004/08/29 06:39:58 tjr Exp $ .\" .Dd September 15, 2002 .Dt FTS 3 @@ -778,6 +778,7 @@ .Xr find 1 , .Xr chdir 2 , .Xr stat 2 , +.Xr ftw 3 , .Xr qsort 3 .Sh HISTORY The ==== //depot/projects/hammer/release/Makefile#55 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.856 2004/08/26 19:15:19 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.857 2004/08/29 18:26:59 obrien Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -153,14 +153,9 @@ # Things which without too much trouble can be considered variables # BASE_DISTS are special in that they get full /etc installation sets. # -.if ${TARGET_ARCH} == "i386" -COMPAT_DISTS?= compat1x compat20 compat21 compat22 compat3x compat4x -.elif ${TARGET_ARCH} == "alpha" -COMPAT_DISTS?= compat4x -.endif OTHER_DISTS?= catpages manpages games proflibs dict info doc BASE_DISTS?= base -DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} +DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} # mountpoint for filesystems. MNT= /mnt @@ -601,7 +596,7 @@ # Remove all the directories we don't need. -cd ${RD}/trees && \ - find ${OTHER_DISTS} ${COMPAT_DISTS} -depth -type d -print | xargs rmdir + find ${OTHER_DISTS} -depth -type d -print | xargs rmdir touch ${.TARGET} # ==== //depot/projects/hammer/release/Makefile.inc.docports#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile.inc.docports,v 1.24 2004/07/12 10:12:51 murray Exp $ +# $FreeBSD: src/release/Makefile.inc.docports,v 1.25 2004/08/30 06:19:34 ru Exp $ # # List of (dependent) ports that are minimally required to be # checked out from CVS in order to get ${DOCPORTS} built and @@ -45,6 +45,7 @@ ports/graphics/scr2png \ ports/graphics/tiff \ ports/lang/perl5 \ + ports/lang/perl5.8 \ ports/print/freetype2 \ ports/print/ghostscript-gnu \ ports/print/ghostscript-gnu-nox11 \ ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#13 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.70 2004/08/19 19:23:39 wilko Exp $ --> +<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.71 2004/08/28 21:11:52 wilko Exp $ --> <sect1 id="support-proc"> <sect1info> @@ -1075,10 +1075,12 @@ <para>164LX and 164SX with SRM firmware version 5.8 or later can boot from Adaptec 2940-series adapters. A test with an Adaptec 3940UW - showed that that one is not supported however.</para> + showed that that one is not supported however. 164SX SRM recognises + Intel 8255x Ethernet cards which show up as eia. Using such a + NIC allows network booting.</para> - <para>In summary: this family of machines is <quote>blessed</quote> with a - challenging compatibility as far as SCSI adapters go.</para> + <para>In summary: this family of machines is <quote>blessed</quote> with + a challenging compatibility as far as SCSI adapters go.</para> <para>On 164SX you can have a maximum of 1 Gbyte of RAM. 4 regular (PC100 or PC133) 256MB DIMMs are reported to work just fine. Whether ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#57 (text+ko) ==== @@ -29,7 +29,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.236 2004/08/27 19:59:28 simon Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.238 2004/08/28 15:14:03 simon Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -302,12 +302,6 @@ </para> </listitem> <listitem arch="i386"> - <para>Seagate ST01/02 SCSI controllers</para> - </listitem> - <listitem arch="i386"> - <para>Future Domain 8xx/950 series SCSI controllers</para> - </listitem> - <listitem arch="i386"> <para>WD7000 SCSI controller</para> </listitem> </itemizedlist> @@ -1114,6 +1108,10 @@ <sect2 id="audio"> <title>Audio Devices</title> + &hwlist.snd.ad1816; + &hwlist.snd.cs4281; + &hwlist.snd.solo; + <para arch="i386,amd64">Advance (&man.sbc.4; driver) <itemizedlist> <listitem> @@ -1125,13 +1123,7 @@ </itemizedlist> </para> - <para arch="i386,amd64">CMedia sound chips - <itemizedlist> - <listitem> - <para>CMI8338/CMI8738</para> - </listitem> - </itemizedlist> - </para> + &hwlist.snd.cmi; <para arch="i386,amd64">Crystal Semiconductor (&man.csa.4; driver) <itemizedlist> @@ -1144,13 +1136,7 @@ </itemizedlist> </para> - <para arch="i386,amd64">ENSONIQ (&man.pcm.4; driver) - <itemizedlist> - <listitem> - <para>AudioPCI ES1370/1371</para> - </listitem> - </itemizedlist> - </para> + &hwlist.snd.es137x; <para arch="i386,alpha,amd64">ESS <itemizedlist> @@ -1221,23 +1207,13 @@ </itemizedlist> </para> - <para arch="i386,amd64">Creative Technologies Sound Blaster Live! series - (emu10k1 driver)</para> + &hwlist.snd.emu10k1; <para arch="i386,amd64">Trident 4DWave DX/NX (&man.pcm.4; driver)</para> <para arch="i386,amd64">VIA Technologies VT82C686A</para> - <para arch="i386,amd64">Yamaha - <itemizedlist> - <listitem> - <para>DS1</para> - </listitem> - <listitem> - <para>DS1e</para> - </listitem> - </itemizedlist> - </para> + &hwlist.snd.ds1; <para arch="pc98">NEC PC-9801-73, 86 and compatibles (nss driver) <itemizedlist> ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#7 (text+ko) ==== @@ -1,5 +1,5 @@ <!-- - $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml,v 1.14 2004/06/22 10:11:26 den Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml,v 1.15 2004/08/28 19:04:43 hrs Exp $ This file contains the comments of the old TROUBLE.TXT file. --> @@ -203,8 +203,10 @@ from working.</para> </question> <answer> - <para>Use the UserConfig utility (see - <filename>HARDWARE.TXT</filename>) and disable the probing + <para>Set the hints + <quote>hint.mcd.0.disabled="1"</quote> and + <quote>hint.mcd.1.disabled="1"</quote> + in the third stage boot loader to disable the probing of the <devicename>mcd0</devicename> and <devicename>mcd1</devicename> devices. Generally speaking, you should only leave the devices that you will be using @@ -218,16 +220,17 @@ </question> <answer> <para>Your card is probably on a different IRQ from what is - specified in the kernel configuration. The ed driver does + specified in the <filename>/boot/device.hints</filename> file. The ed driver does not use the `soft' configuration by default (values entered using EZSETUP in DOS), but it will use the software - configuration if you specify <literal>?</literal> in the IRQ field of your - kernel config file.</para> + configuration if you specify <literal>-1</literal> in the hints + for the interface.</para> <para>Either move the jumper on the card to a hard configuration setting (altering the kernel settings if - necessary), or specify the IRQ as <literal>-1</literal> in UserConfig or <literal>?</literal> - in your kernel config file. This will tell the kernel to + necessary), or specify the IRQ as <literal>-1</literal> + by setting the hint <quote>hint.ed.0.irq="-1"</quote> + This will tell the kernel to use the soft configuration.</para> <para>Another possibility is that your card is at IRQ 9, @@ -244,9 +247,9 @@ <answer> <para>Older IBM laptops use a non-standard keyboard controller, so you must tell the keyboard driver (atkbd0) to - go into a special mode which works on the ThinkPads. Change - the atkbd0 'Flags' to 0x4 in UserConfig and it should work - fine. (Look in the Input Menu for 'Keyboard'.)</para> + go into a special mode which works on the ThinkPads. Set the + hint <quote>hint.atkbd.0.flags="4"</quote> and it should work + fine.</para> </answer> </qandaentry> <qandaentry> @@ -268,23 +271,8 @@ <answer> <para>This is a known problem, and will hopefully be fixed in the future. In order to get your system installed at - all, boot with the <option>-c</option> option into - UserConfig, but <emphasis>don't</emphasis> use the pretty - visual mode but the plain old CLI mode. Type:</para> - - <screen><userinput>eisa 12</userinput> -<userinput>quit</userinput></screen> - - <para>at the prompt. (Instead of `quit', you might also - type `visual', and continue the rest of the configuration - session in visual mode.) While it's recommended to compile - a custom kernel, dset now also understands to save - this value.</para> - - <para>Refer to the FAQ topic 5.3 for an explanation of the - problem, and for how to continue. Remember that you can - find the FAQ on your local system in /usr/share/doc/FAQ, - provided you have installed the `doc' distribution.</para> + all, set the hint <quote>hw.eisa_slots="12"</quote> in the + third stage loader.</para> </answer> </qandaentry> <qandaentry> @@ -297,16 +285,7 @@ <para>Your machine doesn't like the new <literal>i586_copyout</literal> and <literal>i586_copyin</literal> code for some reason. To - disable this, boot the installation boot floppy and when it - comes to the very first menu (the choice to drop into kernel - UserConfig mode or not) choose the command-line interface - (<quote>expert mode</quote>) version and type the following - at it:</para> - - <screen><userinput>flags npx0 1</userinput></screen> - - <para>Then proceed normally to boot. This will be saved - into your kernel, so you only need to do it once.</para> + disable this, set the hint <quote>hint.npx.0.flags="1"</quote></para> </answer> </qandaentry> <qandaentry> @@ -328,8 +307,8 @@ <para>With Compaq being always a little different from other systems, they do not announce their floppy drive in the CMOS RAM of an Aero notebook. Therefore, the floppy disk driver - assumes there is no drive configured. Go to the UserConfig - screen, and set the Flags value of the fdc0 device to 0x1. + assumes there is no drive configured. Set the hint + <quote>hint.fdc.0.flags="1"</quote> This pretends the existence of the first floppy drive (as a 1.44 MB drive) to the driver without asking the CMOS at all.</para> ==== //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#6 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.14 2004/08/27 19:59:29 simon Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.15 2004/08/27 22:58:29 simon Exp $ # # @@ -79,6 +79,13 @@ rue i386,pc98,amd64 sf i386,pc98,alpha,amd64 sk i386,pc98,alpha,amd64 +snd_ad1816 i386,amd64 +snd_cmi i386,amd64 +snd_cs4281 i386,amd64 +snd_ds1 i386,amd64 +snd_emu10k1 i386,amd64 +snd_es137x i386,amd64 +snd_solo i386,amd64 stg i386,pc98 sym i386,pc98,alpha,sparc64,amd64 trm i386,amd64 ==== //depot/projects/hammer/release/ia64/mkisoimages.sh#7 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.9 2004/08/10 05:43:40 marcel Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.10 2004/08/29 19:52:33 marcel Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -76,6 +76,7 @@ mkdir -p $MNT/efi/boot $MNT/boot $MNT/boot/kernel cp -R $BASE/boot/defaults $MNT/boot cp $BASE/boot/kernel/kernel $MNT/boot/kernel + cp $BASE/boot/kernel/ispfw.ko $MNT/boot/kernel cp $BASE/boot/device.hints $MNT/boot cp $BASE/boot/loader.* $MNT/boot cp $BASE/boot/mfsroot.gz $MNT/boot ==== //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.4 2004/08/22 16:21:12 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.5 2004/08/28 02:34:10 pjd Exp $"); #include <sys/param.h> #include <errno.h> @@ -149,8 +149,8 @@ char param[16]; int *hardcode, *nargs, *noautosync, *round_robin, *verify; int error, i; - unsigned sectorsize; - off_t mediasize; + unsigned sectorsize, ssize; + off_t mediasize, msize; nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs)); if (nargs == NULL) { @@ -222,9 +222,6 @@ mediasize = 0; sectorsize = 0; for (i = 1; i < *nargs; i++) { - unsigned ssize; - off_t msize; - snprintf(param, sizeof(param), "arg%u", i); str = gctl_get_asciiparam(req, param); @@ -268,6 +265,13 @@ snprintf(param, sizeof(param), "arg%u", i); str = gctl_get_asciiparam(req, param); + msize = g_get_mediasize(str) - g_get_sectorsize(str); + if (mediasize < msize) { + fprintf(stderr, + "warning: %s: only %jd bytes from %jd bytes used.\n", + str, (intmax_t)mediasize, (intmax_t)msize); + } + md.md_no = i - 1; if (!*hardcode) bzero(md.md_provider, sizeof(md.md_provider)); ==== //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/class/stripe/geom_stripe.c,v 1.6 2004/08/09 11:29:41 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/stripe/geom_stripe.c,v 1.7 2004/08/28 02:49:28 pjd Exp $"); #include <sys/param.h> #include <errno.h> @@ -127,10 +127,11 @@ { struct g_stripe_metadata md; intmax_t *stripesizep; + off_t compsize, msize; u_char sector[512]; + unsigned i, ssize; const char *name; char param[16]; - unsigned i; int *hardcode, *nargs, error; nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs)); @@ -151,10 +152,22 @@ /* * Clear last sector first to spoil all components if device exists. */ + compsize = 0; for (i = 1; i < (unsigned)*nargs; i++) { snprintf(param, sizeof(param), "arg%u", i); name = gctl_get_asciiparam(req, param); + msize = g_get_mediasize(name); + ssize = g_get_sectorsize(name); + if (msize == 0 || ssize == 0) { + gctl_error(req, "Can't get informations about %s: %s.", + name, strerror(errno)); + return; + } + msize -= ssize; + if (compsize == 0 || (compsize > 0 && msize < compsize)) + compsize = msize; + error = g_metadata_clear(name, NULL); if (error != 0) { gctl_error(req, "Can't store metadata on %s: %s.", name, @@ -187,6 +200,13 @@ snprintf(param, sizeof(param), "arg%u", i); name = gctl_get_asciiparam(req, param); + msize = g_get_mediasize(name) - g_get_sectorsize(name); + if (compsize < msize) { + fprintf(stderr, + "warning: %s: only %jd bytes from %jd bytes used.\n", + name, (intmax_t)compsize, (intmax_t)msize); + } + md.md_no = i - 1; if (!*hardcode) bzero(md.md_provider, sizeof(md.md_provider)); ==== //depot/projects/hammer/sbin/geom/core/geom.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.6 2004/08/02 09:05:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.7 2004/08/28 02:29:40 pjd Exp $"); #include <sys/param.h> #include <sys/linker.h> @@ -420,8 +420,10 @@ } if (errstr != NULL) { fprintf(stderr, "%s\n", errstr); - gctl_free(req); - exit(EXIT_FAILURE); + if (strncmp(errstr, "warning: ", strlen("warning: ")) != 0) { + gctl_free(req); + exit(EXIT_FAILURE); + } } if (*buf != '\0') printf("%s", buf); @@ -460,8 +462,8 @@ } if (*lib_version != G_LIB_VERSION) { dlclose(dlh); - errx(EXIT_FAILURE, "%s and %s are not synchronized.", comm, - path); + errx(EXIT_FAILURE, "%s and %s are not synchronized.", + getprogname(), path); } version = dlsym(dlh, "version"); if (version == NULL) { ==== //depot/projects/hammer/sbin/ipfw/ipfw2.c#29 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.55 2004/08/23 19:20:27 pjd Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.56 2004/08/29 08:25:02 maxim Exp $ */ #include <sys/param.h> @@ -2781,6 +2781,7 @@ * various flags used to record that we entered some fields. */ ipfw_insn *have_state = NULL; /* check-state or keep-state */ + size_t len; int i; @@ -2962,6 +2963,12 @@ errx(EX_DATAERR, "logamount must be positive"); c->max_log = l; ac--; av++; + } else { + len = sizeof(c->max_log); + if (sysctlbyname("net.inet.ip.fw.verbose_limit", + &c->max_log, &len, NULL, 0) == -1) + errx(1, "sysctlbyname(\"%s\")", + "net.inet.ip.fw.verbose_limit"); } cmd = next_cmd(cmd); } ==== //depot/projects/hammer/share/colldef/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/colldef/Makefile,v 1.66 2004/04/21 15:28:22 tjr Exp $ +# $FreeBSD: src/share/colldef/Makefile,v 1.67 2004/08/28 12:52:30 tjr Exp $ # NOMAN=YES @@ -50,14 +50,15 @@ DELINKS= de_AT de_CH ZHLINKS= zh_TW.Big5 -LATIN1LINKS= af_ZA da_DK en_AU en_CA en_GB en_NZ en_US fi_FI \ +LATIN1LINKS= af_ZA da_DK en_AU en_CA en_GB en_NZ en_US eu_ES fi_FI \ fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL no_NO \ pt_PT LATIN2LINKS= hr_HR hu_HU ro_RO sr_YU UTF8LINKS= af_ZA be_BY bg_BG ca_ES cs_CZ da_DK de_AT de_CH de_DE el_GR \ - en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE fi_FI fr_BE \ + en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES fi_FI \ + fr_BE \ fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \ ja_JP kk_KZ ko_KR lt_LT nl_BE nl_NL no_NO pl_PL pt_BR pt_PT \ ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \ ==== //depot/projects/hammer/share/examples/kld/cdev/module/cdevmod.c#4 (text+ko) ==== @@ -65,7 +65,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/share/examples/kld/cdev/module/cdevmod.c,v 1.6 2004/07/16 06:55:34 tjr Exp $ + * $FreeBSD: src/share/examples/kld/cdev/module/cdevmod.c,v 1.7 2004/08/30 09:49:58 pjd Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -134,7 +134,7 @@ break; /* Success*/ default: /* we only understand load/unload*/ - err = EINVAL; + err = EOPNOTSUPP; break; } ==== //depot/projects/hammer/share/examples/kld/dyn_sysctl/dyn_sysctl.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/share/examples/kld/dyn_sysctl/dyn_sysctl.c,v 1.2 2001/02/10 22:36:05 abial Exp $ + * $FreeBSD: src/share/examples/kld/dyn_sysctl/dyn_sysctl.c,v 1.3 2004/08/30 09:49:58 pjd Exp $ */ #include <sys/types.h> @@ -153,7 +153,7 @@ printf("Ok\n"); break; default : - error = EINVAL; + error = EOPNOTSUPP; break; } return error; ==== //depot/projects/hammer/share/examples/kld/syscall/module/syscall.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/share/examples/kld/syscall/module/syscall.c,v 1.3 2001/11/13 07:42:30 arr Exp $ + * $FreeBSD: src/share/examples/kld/syscall/module/syscall.c,v 1.4 2004/08/30 09:49:59 pjd Exp $ */ #include <sys/types.h> @@ -77,7 +77,7 @@ printf ("syscall unloaded from %d\n", offset); break; default : - error = EINVAL; + error = EOPNOTSUPP; break; } return error; ==== //depot/projects/hammer/share/man/man4/man4.i386/ichwd.4#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/man/man4/man4.i386/ichwd.4,v 1.2 2004/05/11 20:47:17 des Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/ichwd.4,v 1.3 2004/08/29 11:19:35 des Exp $ .\" .Dd May 11, 2004 .Dt ICHWD 4 i386 @@ -59,6 +59,11 @@ .%R Intel Application Note AP-725 .%O Document Number 292273-001 .Re +.Sh HISTORY +The +.Nm +driver appeared in +.Fx 5.3 . .Sh AUTHORS .An -nosplit The @@ -69,8 +74,3 @@ .An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org . This manual page was written by .An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org . -.Sh HISTORY -The -.Nm -driver appeared in -.Fx 5.3 . ==== //depot/projects/hammer/share/man/man4/re.4#7 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/re.4,v 1.6 2004/07/08 12:21:51 ru Exp $ +.\" $FreeBSD: src/share/man/man4/re.4,v 1.7 2004/08/28 10:59:02 sanpei Exp $ .\" .Dd September 4, 2003 .Dt RE 4 @@ -52,6 +52,8 @@ .It Compaq Evo N1015v Integrated Ethernet (8139C+) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408302159.i7ULx8ux029885>