Date: Tue, 2 Dec 2003 17:40:09 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 43337 for review Message-ID: <200312030140.hB31e9p2092240@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=43337 Change 43337 by peter@peter_overcee on 2003/12/02 17:39:49 IFC @43321 Affected files ... .. //depot/projects/hammer/bin/ls/ls.1#9 integrate .. //depot/projects/hammer/bin/ls/ls.c#9 integrate .. //depot/projects/hammer/contrib/ipfilter/ipt.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/kmem.c#4 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#4 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#9 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#40 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#13 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#10 integrate .. //depot/projects/hammer/sbin/Makefile#17 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#14 integrate .. //depot/projects/hammer/share/man/man4/wi.4#16 integrate .. //depot/projects/hammer/sys/conf/majors#17 integrate .. //depot/projects/hammer/sys/conf/options.i386#18 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#20 integrate .. //depot/projects/hammer/sys/dev/twe/twe.c#5 integrate .. //depot/projects/hammer/sys/dev/twe/twe_compat.h#6 integrate .. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#8 integrate .. //depot/projects/hammer/sys/dev/twe/twe_tables.h#3 integrate .. //depot/projects/hammer/sys/dev/twe/tweio.h#3 integrate .. //depot/projects/hammer/sys/dev/twe/twereg.h#5 integrate .. //depot/projects/hammer/sys/dev/twe/twevar.h#3 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#22 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#5 integrate .. //depot/projects/hammer/sys/i386/isa/cy.c#7 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#13 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#22 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/hammer/sys/pci/cy_pci.c#4 integrate .. //depot/projects/hammer/usr.sbin/Makefile#34 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#10 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#19 integrate Differences ... ==== //depot/projects/hammer/bin/ls/ls.1#9 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.76 2003/08/08 17:04:17 schweikh Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.77 2003/12/01 19:10:29 obrien Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -186,6 +186,14 @@ not blocks. This option overrides the environment variable .Ev BLOCKSIZE . +Note that +.Fl k +is mutually exclusive to +.Fl h +and later +.Fl k +will nullify earlier +.Fl h . .It Fl l (The lowercase letter .Dq ell . ) ==== //depot/projects/hammer/bin/ls/ls.c#9 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.74 2003/05/03 16:39:33 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.75 2003/12/01 19:10:29 obrien Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -267,6 +267,7 @@ f_inode = 1; break; case 'k': + f_humanval = 0; f_kblocks = 1; break; case 'm': ==== //depot/projects/hammer/contrib/ipfilter/ipt.c#3 (text+ko) ==== @@ -443,7 +443,8 @@ void *ptr; { #if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) #else char buf[32], *s; int len; @@ -458,7 +459,8 @@ if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1) return "X"; #if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) return strdup(netif.if_xname); #else if (kmemcpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1) ==== //depot/projects/hammer/contrib/ipfilter/kmem.c#4 (text+ko) ==== @@ -204,7 +204,8 @@ return ifname; #else # if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) #else char buf[32]; int len; @@ -219,7 +220,8 @@ if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1) return "X"; # if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) return strdup(netif.if_xname); # else if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1) ==== //depot/projects/hammer/lib/libc/sys/sendfile.2#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998, David Greenman +.\" Copyright (c) 2003, David G. Lawrence .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.18 2003/05/22 13:02:28 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.19 2003/12/01 22:12:50 dg Exp $ .\" .Dd November 5, 1998 .Dt SENDFILE 2 @@ -191,6 +191,10 @@ .Fa fd . .It Bq Er EFAULT An invalid address was specified for an argument. +.It Bq Er EINTR +A signal interrupted sendfile before it could be completed. If specified, the number +of bytes successfully sent will be returned in +.Fa *sbytes . .It Bq Er EAGAIN The socket is marked for non-blocking I/O and not all data was sent due to the socket buffer being filled. If specified, the number of bytes successfully sent will be returned in @@ -215,4 +219,4 @@ .Fn sendfile system call and this manual page were written by -.An David Greenman Aq dg@root.com . +.An David G. Lawrence Aq dg@dglawrence.com . ==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/libthr/arch/i386/i386/_setcurthread.c,v 1.10 2003/06/29 00:12:39 mtm Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.11 2003/12/02 16:00:26 mtm Exp $ */ #include <sys/types.h> @@ -90,7 +90,6 @@ union descriptor desc; void **ldt_entry; int ldt_index; - int error; *err = 0; @@ -128,7 +127,6 @@ * what the gs register will point to. */ *ldt_entry = (void *)thr; - ldt_index = LDT_INDEX(ldt_entry); bzero(&desc, sizeof(desc)); @@ -147,9 +145,10 @@ desc.sd.sd_gran = 0; desc.sd.sd_hibase = (unsigned int)ldt_entry >> 24; - error = i386_set_ldt(ldt_index, &desc, 1); - if (error == -1) - abort(); + /* Get a slot from the process' LDT list */ + ldt_index = i386_set_ldt(LDT_AUTO_ALLOC, &desc, 1); + if (ldt_index == -1) + abort(); /* * Set up our gs with the index into the ldt for this entry. ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#7 (text+ko) ==== @@ -22,6 +22,8 @@ <!ENTITY release.4x "4.<replaceable>X</replaceable>"> <!ENTITY release.5x "5.<replaceable>X</replaceable>"> +<!ENTITY release.4last "4.9-RELEASE"> +<!ENTITY release.5branchpoint "5.3-RELEASE"> ]> @@ -33,7 +35,7 @@ <corpauthor>The &os; Release Engineering Team</corpauthor> </authorgroup> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.16 2003/09/08 14:53:01 simon Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.17 2003/12/02 05:54:35 bmah Exp $</pubdate> <copyright> <year>2002</year> @@ -84,11 +86,11 @@ with) possible regressions in the newer releases. Specifically, for more conservative users, we recommend running &release.4x; releases (such as - 4.8-RELEASE) for the near-term + &release.4last;) for the near-term future. We feel that such users are probably best served by upgrading to &release.5x; only after a 5-STABLE development branch has been created; this may be around - the time of 5.2-RELEASE.</para> + the time of &release.5branchpoint;.</para> <para>(&os; &release.5x; suffers from what has been described as a <quote>chicken and egg</quote> problem. The entire project has @@ -132,9 +134,10 @@ it. This branch has the tag <literal>RELENG_4</literal> in the CVS repository.</para> - <para>&os; 5.0 and 5.1 are based on the CURRENT branch. These - are the first releases from this branch in over two years (the - last was &os; 4.0, in March 2000).</para> + <para>&os; 5.0, 5.1, and 5.2 are based on the CURRENT branch. The + first of these releases was made after over two years of development + (prior to these, the + last release from HEAD was &os; 4.0, in March 2000).</para> <para>At some point after the release of &os; 5.0, a <quote>5-STABLE</quote> branch will be created in the &os; @@ -154,8 +157,8 @@ there will be multiple releases in the &release.5x; series before this happens; we estimate - that the 5-STABLE branch will be created sometime after - 5.2-RELEASE.</para> + that the 5-STABLE branch will be created around the time of + &release.5branchpoint;.</para> <para>More information on &os; release engineering processes can be found on the <ulink @@ -183,28 +186,33 @@ <itemizedlist> <listitem> <para>SMPng: The <quote>next generation</quote> support for - SMP machines (work in progress). There is now partial - support for multiple processors to be running in the kernel - at the same time. This work is ongoing.</para> + SMP machines (work in progress). + Ongoing work aims to perform fine-grained locking of various + kernel subsystems to increase the number of threads of + execution that can be running in the kernel. More + information can be found on the + <ulink url="http://www.FreeBSD.org/smp/">FreeBSD SMP + Project</ulink> page.</para> </listitem> <listitem> <para>KSE: Kernel Scheduled Entities allow a single process to have multiple kernel-level threads, similar to Scheduler - Activations. The (experimental) <filename>libkse</filename> - and <filename>libthr</filename> libraries make this - feature available to multi-threaded userland programs.</para> + Activations. The <filename>libkse</filename> + and <filename>libthr</filename> threading libraries make this + feature available to multi-threaded userland programs, + using the &man.pthread.3; API.</para> </listitem> <listitem> - <para>New architectures: Support for the &sparc64; and ia64 - architectures, in addition to the &i386;, pc98, and + <para>New architectures: Support for the sparc64, ia64, and amd64 + architectures, in addition to the i386, pc98, and alpha.</para> </listitem> <listitem> <para>GCC: The compiler toolchain is now based on GCC - 3.2.2, rather than GCC + 3.3.<replaceable>X</replaceable>, rather than GCC 2.95.<replaceable>X</replaceable>.</para> </listitem> @@ -215,7 +223,7 @@ <listitem> <para>GEOM: A flexible framework for transformations of disk - I/O requests. An experimental disk encryption facility has + I/O requests. The GBDE experimental disk encryption facility has been developed based on GEOM.</para> </listitem> @@ -237,10 +245,14 @@ <para>Cardbus: Support for Cardbus devices.</para> </listitem> + <listitem> + <para>Bluetooth: Support for Bluetooth devices.</para> + </listitem> + </itemizedlist> <para>A more comprehensive list of new features can be found in - the release notes for &os; &release.prev; and &os; &release.current;.</para> + the release notes for the various &os; &release.5x; releases.</para> </sect1> @@ -267,7 +279,10 @@ ABIs/APIs, third-party binary device drivers will require modifications to work correctly under &os; 5.0. There is a possibility of more minor ABI/API changes before the - 5-STABLE branch is created.</para> + 5-STABLE branch is created, particularly on newer machine + architectures. In some (hopefully rare) cases, + user-visible structures may change, requiring recompiling of + applications or reinstallation of ports/packages.</para> </listitem> <listitem> @@ -289,32 +304,35 @@ <listitem> <para>A number of ports and packages do not build or do not - run correctly under &os; 5.0, whereas they did under &os; + run correctly under &os; &release.5x;, whereas they did under &os; 4-STABLE. Generally these problems are caused by compiler - toolchain changes or cleanups of header files.</para> + toolchain changes or cleanups of header files. In some + cases they are caused by changes in kernel or device + support.</para> </listitem> <listitem> <para>Many &os; &release.5x; features are seeing wide exposure for the first time. Many of these features (such as SMPng) have broad impacts on the - kernel.</para> + kernel, and it may be difficult to gauge their effects on + stability and performance.</para> </listitem> <listitem> <para>A certain amount of debugging and diagnostic code is - still in place to help track down problems in &os; 5.0's new - features. This may cause &os; 5.0 to perform more slowly + still in place to help track down problems in &os; &release.5x;'s new + features. This may cause &os; &release.5x; to perform more slowly than 4-STABLE.</para> </listitem> <listitem> <para>Features are only added to the 4-STABLE development branch after a <quote>settling time</quote> in -CURRENT. - &os; 5.0 does not have the stabilizing influence of a + &os; &release.5x; does not have the stabilizing influence of a -STABLE branch. (It is likely that the 5-STABLE development branch will be created sometime after - 5.2-RELEASE.)</para> + &release.5branchpoint;.)</para> </listitem> <listitem> @@ -330,20 +348,25 @@ <para>Because a number of these drawbacks affect system stability, the release engineering team recommends that more conservative sites and users stick to releases based on the 4-STABLE branch until - the &release.5x; series is more polished.</para> + the &release.5x; series is more polished. While we believe that + many initial problems with stability have been fixed, some + issues with performance are still being addressed by + works-in-progress. We also note that best common practices in + system administration call for trying operating system upgrades + in a test environment before upgrading one's production, or + <quote>mission-critical</quote> systems.</para> </sect1> <sect1 id="plans-stable"> <title>Plans for the 4-STABLE Branch</title> - <para>The release of &os; 5.0 does not mean the end of the - 4-STABLE branch. Indeed, &os; 4.8 was released two months after - 5.0, in April 2003. There will most likely be at least one more release on - this branch, namely 4.9-RELEASE, currently scheduled for summer - 2003. - A 4.10-RELEASE is a likely possibility as well. - Future releases from this branch will + <para>It is important to note that even though releases are being + made in the &release.5x; series, support for &release.4x; + releases will continue for some time. + Indeed, &os; 4.8 was released two months after + 5.0, in April 2003, followed by 4.9, in October 2003. + Future releases from the 4-STABLE branch (if any) will depend on several factors. The most important of these is the existence and stability of the 5-STABLE branch. If CURRENT is not sufficiently stable to allow the creation of a @@ -358,7 +381,12 @@ account user demand for future 4-STABLE releases. This demand, however, will need to be balanced with release engineering resources (particularly developers' time, computing resources, and mirror - archive space).</para> + archive space). We note that in general, the &os; community + (both users and developers) has shown a preference for + moving forward with new features in + the &release.5x; branch and beyond, due to the difficulty + involved in backporting (and maintaining) new functionality in + &release.4x;.</para> <para>The &a.security-officer; will continue to support releases made from the 4-STABLE branch in accordance with their published @@ -369,6 +397,20 @@ to security advisories and security fixes. At its discretion, the team may support other releases for specific issues.</para> + <para>At this point, the release engineering team has no specific + plans for future releases from the 4-STABLE development branch. + It seems likely that any future releases (if + any) from this branch will be lightweight, + <quote>point</quote> releases. These will probably carry + 4.9.<replaceable>X</replaceable> version numbers, to indicate + that they are not intended to provide large amount of new + functionality compared to &release.4last;. In general, these + releases will emphasize security fixes, bug fixes, and device + driver updates (particularly to accommodate new hardware easily + supported by existing drivers). Major new features (especially those + requiring infrastructure support added in &release.5x;) will + probably not be added in these releases.</para> + </sect1> <sect1 id="upgrade"> @@ -399,12 +441,15 @@ recommended. In particular, a binary upgrade will leave behind a number of files that are present in &os; &release.4x; but not in &release.5x;. These obsolete - files may create some problems.</para> + files may create some problems. Examples of these files + include old C++ headers, programs moved to the Ports + Collection, or shared libraries that have moved to support + dynamically-linked root filesystem executables.</para> <para>On the &i386; and pc98 platforms, a UserConfig utility exists on 4-STABLE to allow boot-time configuration of ISA devices when booting from installation media. Under &os; - 5.0, this functionality has been replaced in part by the + &release.5x;, this functionality has been replaced in part by the &man.device.hints.5; mechanism (it allows specifying the same parameters, but with a very different interface).</para> @@ -455,8 +500,14 @@ &release.4x; executables under &release.5x;, but this requires the <filename>compat4x</filename> distribution to be installed. - Thus, using old ports <emphasis>may</emphasis> be - possible.</para> + Using old ports may be possible in some cases, although there + are a number of known cases of backward incompatibility. As an + example, the + <filename role="package">devel/gnomevfs2</filename>, + <filename role="package">mail/postfix</filename>, and + <filename role="package">security/cfs</filename> ports need to + be recompiled due to changes in the <literal>statfs</literal> + structure.</para> <para>When installing or upgrading over the top of an existing 4-STABLE-based system, it is extremely important to clear out ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#40 (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.202 2003/11/30 23:54:59 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.203 2003/12/02 07:13:03 bmah Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -979,127 +979,11 @@ <para arch="i386">NCR / AT&T / Lucent Technologies WaveLan T1-speed ISA/radio LAN cards (&man.wl.4; driver)</para> - <para arch="i386,pc98,amd64">Lucent Technologies WaveLAN/IEEE 802.11b PCMCIA and ISA - standard speed (2Mbps) and turbo speed (6Mbps) wireless network - adapters and workalikes (&man.wi.4; driver) - <note> - <para>The ISA versions of these adapters are actually PCMCIA - cards combined with an ISA to PCMCIA bridge card, so both kinds - of devices work with the same driver.</para> - </note> - <itemizedlist> - <listitem> - <para>3COM 3crwe737A AirConnect Wireless LAN PC Card</para> - </listitem> - <listitem> - <para>Accton airDirect WN3301</para> - </listitem> - <listitem> - <para>Addtron AWA100</para> - </listitem> - <listitem> - <para>Adtec ADLINK340APC</para> - </listitem> - <listitem> - <para>Airway 802.11 Adapter</para> - </listitem> - <listitem> - <para>Avaya Wireless PC Card</para> - </listitem> - <listitem> - <para>Blue Concentric Circle CF Wireless LAN Model WL-379F</para> - </listitem> - <listitem> - <para>BreezeNET PC-DS.11</para> - </listitem> - <listitem> - <para>Buffalo WLI-CF-S11G</para> - </listitem> - <listitem> - <para>Cabletron RoamAbout 802.11 DS</para> - </listitem> - <listitem> - <para>Compaq WL100, WL110</para> - </listitem> - <listitem> - <para>Corega KK Wireless LAN PCC-11, PCCA-11, PCCB-11</para> - </listitem> - <listitem> - <para>D-Link DWL-650</para> - </listitem> - <listitem> - <para>Dell TrueMobile 1150 Series</para> - </listitem> - <listitem> - <para>ELECOM Air@Hawk/LD-WL11/PCC</para> - </listitem> - <listitem> - <para>ELSA AirLancer MC-11</para> - </listitem> - <listitem> - <para>Farallon Skyline 11Mbps Wireless</para> - </listitem> - <listitem> - <para>ICOM SL-1100</para> - </listitem> - <listitem> - <para>IBM High Rate Wireless LAN PC Card</para> - </listitem> - <listitem> - <para>Intel PRO/Wireless 2011 LAN PC Card</para> - </listitem> - <listitem> - <para>IO Data WN-B11/PCM</para> - </listitem> - <listitem> - <para>Laneed Wireless card</para> - </listitem> - <listitem> - <para>Linksys Instant Wireless WPC11</para> - </listitem> - <listitem> - <para>Lucent WaveLAN/IEEE 802.11</para> - </listitem> - <listitem> - <para>MELCO Airconnect WLI-PCM-S11, WLI-PCM-L11</para> - </listitem> - <listitem> - <para>NCR WaveLAN/IEEE 802.11</para> - </listitem> - <listitem> - <para>NEC Wireless Card CMZ-RT-WP</para> - </listitem> - <listitem> - <para>NEC Aterm WL11C (PC-WL/11C)</para> - </listitem> - <listitem> - <para>NEC PK-WL001</para> - </listitem> - <listitem> - <para>Netgear MA401</para> - </listitem> - <listitem> - <para>PLANEX GeoWave/GW-NS110</para> - </listitem> - <listitem> - <para>Proxim Harmony, RangeLAN-DS</para> - </listitem> - <listitem> - <para>SMC 2632W, 2602W</para> - </listitem> - <listitem> - <para>Sony PCWA-C100</para> - </listitem> - <listitem> - <para>TDK LAK-CD011WL</para> - </listitem> - <listitem> - <para>Toshiba Wireless LAN Card</para> - </listitem> - <listitem> - <para>US Robotics Wireless Card 2410</para> - </listitem> - </itemizedlist> + <para arch="i386,pc98,amd64">Lucent Technologies WaveLAN/IEEE 802.11b + wireless network + adapters and workalikes using the Lucent Hermes, Intersil + PRISM-II, Intersil PRISM-2.5, Intersil Prism-3, and Symbol + Spectrum24 chipsets (&man.wi.4; driver) </para> <para arch="i386,pc98,amd64">Cisco/Aironet 802.11b wireless adapters (&man.an.4; driver) ==== //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#13 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.50 2003/11/30 01:35:19 kris Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.51 2003/12/02 20:47:31 marcus Exp $ # # MAINTAINER: re # @@ -101,8 +101,8 @@ CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-documents" CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-libraries" CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-manuals" -CDROM_SET_1="${CDROM_SET_1} x11/gnome2" -CDROM_SET_1="${CDROM_SET_1} x11/kde3" +CDROM_SET_1="${CDROM_SET_1} x11/gnome2-lite" +CDROM_SET_1="${CDROM_SET_1} x11/kde-lite" CDROM_SET_1="${CDROM_SET_1} www/links" # This is the set of "people really want these" packages. Please add to ==== //depot/projects/hammer/rescue/rescue/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.21 2003/11/09 01:22:27 obrien Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.22 2003/12/02 21:52:14 brooks Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= rescue @@ -128,7 +128,7 @@ .endif .if !defined(NO_IPFILTER) -CRUNCH_PROGS_sbin+= ipf ipfs ipmon # ipnat +CRUNCH_PROGS_sbin+= ipf ipfs ipfstat ipmon ipnat .endif # crunchgen does not like C++ programs; this should be fixed someday ==== //depot/projects/hammer/sbin/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.128 2003/10/31 18:54:46 brooks Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.129 2003/12/02 21:52:14 brooks Exp $ # XXX MISSING: icheck ncheck @@ -87,7 +87,9 @@ .if !defined(NO_IPFILTER) SUBDIR+=ipf \ ipfs \ - ipmon + ipfstat \ + ipmon \ + ipnat .endif .if !defined(NOINET6) ==== //depot/projects/hammer/sbin/ipfw/ipfw.8#14 (text+ko) ==== @@ -1,7 +1,7 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.133 2003/09/26 12:22:28 rse Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.134 2003/12/02 00:23:45 sam Exp $ .\" -.Dd August 13, 2002 +.Dd December 1, 2003 .Dt IPFW 8 .Os .Sh NAME @@ -987,6 +987,13 @@ .Cm proto Ar ipsec as the latter will only look at the specific IP protocol field, irrespective of IPSEC kernel support and the validity of the IPSEC data. +.Pp +Further note that this flag is silently ignored in kernels without +IPSEC support. +It does not affect rule processing when given and the +rules are handled as if with no +.Cm ipsec +flag. .It Cm iptos Ar spec Matches IP packets whose .Cm tos ==== //depot/projects/hammer/share/man/man4/wi.4#16 (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/wi.4,v 1.57 2003/09/22 05:36:32 imp Exp $ +.\" $FreeBSD: src/share/man/man4/wi.4,v 1.58 2003/12/02 07:07:45 bmah Exp $ .\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" .Dd February 17, 2003 @@ -141,10 +141,12 @@ .Em "Card Chip Bus" 3Com AirConnect 3CRWE737A Spectrum24 PCMCIA 3Com AirConnect 3CRWE777A Prism-II PCI +Accton airDirect WN3301 PCMCIA ACTIONTEC HWC01170 Prism-2.5 PCMCIA Addtron AWP-100 Prism-II PCMCIA Adtec Adlink/340C Prism-II PCMCIA Airvast WN 100 Prism-3 PCMCIA +Airway 802.11 Adapter PCMCIA Agere Orinoco Hermes PCMCIA Allied Telesis WR211PCM Prism-II PCMCIA ArTem OnAir Prism? PCMCIA @@ -171,6 +173,8 @@ Dlink Air 660 Prism-II PCMCIA Dlink DWL520 Prism-2.5 PCI Dlink DWL650 Prism-2.5 PCMCIA +ELECOM Air@Hawk/LD-WL11/PCC PCMCIA +ELSA MC-11 PCMCIA ELSA XI300 Prism-II PCMCIA ELSA XI800 Prism-II CF EMTAC A2424i Prism-II PCMCIA @@ -185,6 +189,7 @@ Intel PRO/Wireless 2011 Spectrum24 PCMCIA Intersil Prism II Prism-II PCMCIA Intersil Mini-PCI Prism-2.5 PCI +Laneed Wireless PCMCIA Linksys Instant Wireless WPC11 Prism-II PCMCIA Linksys Instant Wireless WPC11 2.5 Prism-2.5 PCMCIA Linksys Instant Wireless WPC11 3.0 Prism-3 PCMCIA @@ -194,6 +199,7 @@ Melco Airconnect Prism-II PCMCIA Microsoft MN-520 WLAN Prism-II PCMCIA NANOSPEED ROOT-RZ2000 Prism-II PCMCIA +NCR WaveLAN/IEEE 802.11 PCMCIA NDC/Sohoware NCP130 Prism-II PCI NEC CMZ-RT-WP Prism-II PCMCIA NEC PK-WL001 Lucent PCMCIA ==== //depot/projects/hammer/sys/conf/majors#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/majors,v 1.182 2003/11/21 21:03:42 imp Exp $ +# $FreeBSD: src/sys/conf/majors,v 1.183 2003/12/02 04:40:33 imp Exp $ # # This list is semi-obsoleted by DEVFS, but for now it still contains # the current allocation of device major numbers. @@ -171,6 +171,7 @@ 183 *smapi SMAPI BIOS interface <mdodd> 184 dcons Dumb console driver <simokawa> 185 ce Cronyx Tau-32 E1 adapter <rik@cronyx.ru> +186 sx Specialix I/O8+ driver <frank@exit.com> 200 ?? entries from 200-252 are reserved for local use 248 *isp dev/isp/isp_freebsd.c 252 ?? entries from 200-252 are reserved for local use ==== //depot/projects/hammer/sys/conf/options.i386#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.202 2003/11/11 17:14:25 jhb Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.203 2003/12/01 20:39:04 phk Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -49,6 +49,8 @@ CPU_DISABLE_CMPXCHG opt_global.h # XXX global, unlike other CPU_* CPU_DISABLE_SSE opt_cpu.h CPU_ELAN opt_cpu.h +CPU_ELAN_XTAL opt_cpu.h +CPU_ELAN_PPS opt_cpu.h CPU_ENABLE_SSE opt_cpu.h CPU_FASTER_5X86_FPU opt_cpu.h CPU_GEODE opt_cpu.h @@ -64,8 +66,6 @@ CPU_WT_ALLOC opt_cpu.h CYRIX_CACHE_REALLY_WORKS opt_cpu.h CYRIX_CACHE_WORKS opt_cpu.h -ELAN_PPS opt_cpu.h # XXX should be named CPU_* -ELAN_XTAL opt_cpu.h # XXX should be named CPU_* NO_F00F_HACK opt_cpu.h NO_MEMORY_HOLE opt_cpu.h ==== //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_log.c#4 (text+ko) ==== @@ -4,7 +4,7 @@ * See the IPFILTER.LICENCE file for details on licencing. * * $Id: ip_log.c,v 2.5.2.1 2000/07/19 13:11:47 darrenr Exp $ - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.25 2003/10/31 18:31:56 brooks Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.26 2003/12/02 18:28:00 brooks Exp $ */ #include <sys/param.h> #if defined(KERNEL) && !defined(_KERNEL) @@ -253,8 +253,8 @@ mlen = (flags & FR_LOGBODY) ? MIN(msgdsize(m) - hlen, 128) : 0; # else # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) ) + (defined(OpenBSD) && (OpenBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) strncpy(ipfl.fl_ifname, ifp->if_xname, IFNAMSIZ); # else ipfl.fl_unit = (u_char)ifp->if_unit; ==== //depot/projects/hammer/sys/dev/em/if_em.c#20 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.34 2003/11/14 18:02:24 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.35 2003/12/02 22:13:08 pdeuskar Exp $*/ #include <dev/em/if_em.h> @@ -712,7 +712,7 @@ em_initialize_receive_unit(adapter); } #ifdef DEVICE_POLLING - if (!(ifp->if_ipending & IFF_POLLING)) + if (!(ifp->if_flags & IFF_POLLING)) #endif em_enable_intr(adapter); EM_UNLOCK(adapter); @@ -852,7 +852,7 @@ * Only enable interrupts if we are not polling, make sure * they are off otherwise. */ - if (ifp->if_ipending & IFF_POLLING) + if (ifp->if_flags & IFF_POLLING) em_disable_intr(adapter); else #endif /* DEVICE_POLLING */ @@ -936,7 +936,7 @@ ifp = &adapter->interface_data.ac_if; #ifdef DEVICE_POLLING - if (ifp->if_ipending & IFF_POLLING) { + if (ifp->if_flags & IFF_POLLING) { EM_UNLOCK(adapter); return; } ==== //depot/projects/hammer/sys/dev/twe/twe.c#5 (text+ko) ==== @@ -1,5 +1,7 @@ /*- * Copyright (c) 2000 Michael Smith + * Copyright (c) 2003 Paul Saab + * Copyright (c) 2003 Vinod Kashyap * Copyright (c) 2000 BSDi * All rights reserved. * @@ -24,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twe/twe.c,v 1.17 2003/08/19 12:22:17 ps Exp $ + * $FreeBSD: src/sys/dev/twe/twe.c,v 1.18 2003/12/02 07:57:19 ps Exp $ */ /* @@ -60,8 +62,8 @@ static int twe_immediate_request(struct twe_request *tr); static void twe_completeio(struct twe_request *tr); static void twe_reset(struct twe_softc *sc); -static void twe_add_unit(struct twe_softc *sc, int unit); -static void twe_del_unit(struct twe_softc *sc, int unit); +static int twe_add_unit(struct twe_softc *sc, int unit); +static int twe_del_unit(struct twe_softc *sc, int unit); /* * Command I/O to controller. @@ -86,7 +88,7 @@ static int twe_fetch_aen(struct twe_softc *sc); static void twe_handle_aen(struct twe_request *tr); static void twe_enqueue_aen(struct twe_softc *sc, u_int16_t aen); -static int twe_dequeue_aen(struct twe_softc *sc); +static u_int16_t twe_dequeue_aen(struct twe_softc *sc); static int twe_drain_aen_queue(struct twe_softc *sc); static int twe_find_aen(struct twe_softc *sc, u_int16_t aen); @@ -192,17 +194,17 @@ return(0); } -static void +static int twe_add_unit(struct twe_softc *sc, int unit) { struct twe_drive *dr; - int table; + int table, error = 0; u_int16_t dsize; TWE_Param *drives = NULL, *param = NULL; TWE_Unit_Descriptor *ud; if (unit < 0 || unit > TWE_MAX_UNITS) - return; + return (EINVAL); /* * The controller is in a safe state, so try to find drives attached to it. @@ -210,30 +212,36 @@ if ((drives = twe_get_param(sc, TWE_PARAM_UNITSUMMARY, TWE_PARAM_UNITSUMMARY_Status, TWE_MAX_UNITS, NULL)) == NULL) { twe_printf(sc, "can't detect attached units\n"); - return; + return (EIO); } dr = &sc->twe_drive[unit]; /* check that the drive is online */ - if (!(drives->data[unit] & TWE_PARAM_UNITSTATUS_Online)) + if (!(drives->data[unit] & TWE_PARAM_UNITSTATUS_Online)) { + error = ENXIO; goto out; + } table = TWE_PARAM_UNITINFO + unit; if (twe_get_param_4(sc, table, TWE_PARAM_UNITINFO_Capacity, &dr->td_size)) { twe_printf(sc, "error fetching capacity for unit %d\n", unit); + error = EIO; goto out; } if (twe_get_param_1(sc, table, TWE_PARAM_UNITINFO_Status, &dr->td_state)) { twe_printf(sc, "error fetching state for unit %d\n", unit); + error = EIO; goto out; } if (twe_get_param_2(sc, table, TWE_PARAM_UNITINFO_DescriptorSize, &dsize)) { twe_printf(sc, "error fetching descriptor size for unit %d\n", unit); + error = EIO; goto out; } if ((param = twe_get_param(sc, table, TWE_PARAM_UNITINFO_Descriptor, dsize - 3, NULL)) == NULL) { twe_printf(sc, "error fetching descriptor for unit %d\n", unit); + error = EIO; goto out; } ud = (TWE_Unit_Descriptor *)param->data; @@ -248,25 +256,31 @@ dr->td_sectors = 32; } dr->td_cylinders = dr->td_size / (dr->td_heads * dr->td_sectors); - dr->td_unit = unit; + dr->td_twe_unit = unit; - twe_attach_drive(sc, dr); + error = twe_attach_drive(sc, dr); out: >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312030140.hB31e9p2092240>