PERFORCE change 79253 for review
Peter Wemm
peter at FreeBSD.org
Thu Jun 30 06:48:39 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=79253
Change 79253 by peter at peter_overcee on 2005/06/30 06:48:25
IFC @79252
Affected files ...
.. //depot/projects/hammer/UPDATING#79 integrate
.. //depot/projects/hammer/etc/network.subr#11 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#36 integrate
.. //depot/projects/hammer/etc/rc.d/netif#12 integrate
.. //depot/projects/hammer/etc/rc.d/wpa_supplicant#1 branch
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#100 integrate
.. //depot/projects/hammer/sbin/dhclient/dhclient.c#3 integrate
.. //depot/projects/hammer/sbin/dhclient/dhcp.h#2 integrate
.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#28 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#73 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#72 integrate
.. //depot/projects/hammer/sys/i386/i386/identcpu.c#26 integrate
.. //depot/projects/hammer/sys/i386/i386/initcpu.c#13 integrate
.. //depot/projects/hammer/sys/i386/include/md_var.h#16 integrate
.. //depot/projects/hammer/sys/modules/Makefile#81 integrate
.. //depot/projects/hammer/usr.sbin/kbdmap/kbdmap.c#3 integrate
Differences ...
==== //depot/projects/hammer/UPDATING#79 (text+ko) ====
@@ -21,6 +21,13 @@
developers choose to disable these features on build machines
to maximize performance.
+20050629:
+ The pccard_ifconfig rc.conf variable has been removed and a new
+ variable, ifconfig_DEFAULT has been introduced. Unlike
+ pccard_ifconfig, ifconfig_DEFAULT applies to ALL interfaces that
+ do not have ifconfig_ifn entries rather than just those in
+ removable_interfaces.
+
20050610:
Major changes to network interface API. All drivers must be
recompiled. Drivers not in the base system will need to be
@@ -382,4 +389,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.414 2005/06/10 19:59:26 jkoshy Exp $
+$FreeBSD: src/UPDATING,v 1.415 2005/06/30 05:02:34 brooks Exp $
==== //depot/projects/hammer/etc/network.subr#11 (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.162 2005/06/07 23:59:45 brooks Exp $
+# $FreeBSD: src/etc/network.subr,v 1.164 2005/06/30 05:02:34 brooks Exp $
#
#
@@ -48,7 +48,7 @@
fi
if wpaif $1; then
- #/etc/rc.d/wpa_supplicant start $1
+ /etc/rc.d/wpa_supplicant start $1
_cfg=0 # XXX: not sure this should count
fi
@@ -89,7 +89,7 @@
IFS="$oldifs"
if wpaif $1; then
- #/etc/rc.d/wpa_supplicant stop $1
+ /etc/rc.d/wpa_supplicant stop $1
_cfg=0
fi
@@ -113,16 +113,11 @@
fi
eval _args=\$ifconfig_$1
- if [ -z "$_args" -a -n "${pccard_ifconfig}" ]; then
- for _if in ${removable_interfaces} ; do
- if [ "$_if" = "$_ifn" ] ; then
- _args=${pccard_ifconfig}
- break
- fi
- done
+ if [ -z "$_args" ]; then
+ _args=$ifconfig_DEFAULT
fi
- echo $_args
+ echo "$_args"
}
# ifconfig_getargs if
@@ -394,7 +389,7 @@
_tmplist="`ifconfig -l`"
;;
*)
- _tmplist="${network_interfaces} ${cloned_interfaces}"
+ _tmplist="${network_interfaces} ${removable_interfaces} ${cloned_interfaces}"
;;
esac
@@ -408,37 +403,15 @@
_aprefix=
_bprefix=
for _if in ${_tmplist} ; do
- eval _ifarg="\$ifconfig_${_if}"
- case "$_ifarg" in
- [Dd][Hh][Cc][Pp])
+ if dhcpif $_if; then
_dhcplist="${_dhcplist}${_aprefix}${_if}"
[ -z "$_aprefix" ] && _aprefix=' '
- ;;
- ''|*)
+ elif [ -n "`_ifconfig_getargs $if`" ]; then
_nodhcplist="${_nodhcplist}${_bprefix}${_if}"
[ -z "$_bprefix" ] && _bprefix=' '
- ;;
- esac
+ fi
done
- case ${pccard_ifconfig} in
- [Dd][Hh][Cc][Pp])
- for _if in ${removable_interfaces} ; do
- _test_if=`ifconfig ${_if} 2>&1`
- case "$_test_if" in
- "ifconfig: interface $_if does not exist")
- ;;
- *)
- _dhcplist="${_dhcplist}${_aprefix}${_if}"
- [ -z "$_aprefix" ] && _aprefix=' '
- ;;
- esac
- done
- ;;
- *)
- ;;
- esac
-
case "$type" in
nodhcp)
echo $_nodhcplist
==== //depot/projects/hammer/etc/rc.d/Makefile#36 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.52 2005/04/29 23:02:56 brooks Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.53 2005/06/30 04:52:47 brooks Exp $
FILES= DAEMON LOGIN NETWORKING SERVERS \
abi accounting addswap adjkerntz amd \
@@ -36,7 +36,7 @@
timed tmp \
ugidfw usbd \
var virecover \
- watchdogd \
+ watchdogd wpa_supplicant \
ypbind yppasswdd ypserv \
ypset ypupdated ypxfrd
FILESDIR= /etc/rc.d
==== //depot/projects/hammer/etc/rc.d/netif#12 (text+ko) ====
@@ -22,7 +22,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/etc/rc.d/netif,v 1.13 2005/06/07 04:49:12 brooks Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.14 2005/06/30 04:46:21 brooks Exp $
#
# PROVIDE: netif
@@ -109,13 +109,10 @@
#
_cooked_list=
if [ -n "$_cmdifn" ]; then
- for i in $_cmdifn ; do
- eval _if=\"`expr "$_ifn_list" : ".*\(${i}\).*"`\"
- if [ -z "$_if" ]; then
- err 1 "No such network interface: $i"
- fi
- _cooked_list="$_cooked_list $_if"
- done
+ # Don't check that the interfaces exist. We need to run
+ # the down code even when the interface doesn't exist to
+ # kill off wpa_supplicant.
+ _cooked_list="$_cmdifn"
else
_cooked_list="$_ifn_list"
fi
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#100 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.878 2005/06/19 12:38:18 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.879 2005/06/30 04:55:46 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -26,7 +26,8 @@
<abstract>
<para>The release notes for &os; &release.current; contain a summary
- of the changes made to the &os; base system since &release.branch; is created.
+ of the changes made to the &os; base system on the
+ &release.branch; development line.
This document lists applicable security advisories that were issued since
the last release, as well as significant changes to the &os;
kernel and userland.
@@ -136,7 +137,7 @@
<ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:01.telnet.asc">FreeBSD-SA-05:01.telnet</ulink>.
&merged;</para>
- <para>A information disclosure vulnerability in the
+ <para>An information disclosure vulnerability in the
&man.sendfile.2; system call, which could permit it to transmit
random parts of kernel memory, has been fixed. More details are
in security advisory
@@ -168,12 +169,12 @@
allowed unprivileged local users can send commands to the
hardware supported by the &man.iir.4; driver, has been fixed.
For more information, see security advisory
- <ulink url="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:06.iir.asc">FreeBSD-SA-05:06.iir</ulink>.
+ <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:06.iir.asc">FreeBSD-SA-05:06.iir</ulink>.
&merged;</para>
<para>A bug in the validation of &man.i386.get.ldt.2; system call
- input arguments, which may allow kernel memory may be disclosed
- to the user process, has been fixed. For more information, see
+ input arguments, which may allow kernel memory to be disclosed
+ to a user process, has been fixed. For more information, see
security advisory
<ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:07.ldt.asc">FreeBSD-SA-05:07.ldt</ulink>.
&merged;</para>
@@ -247,6 +248,8 @@
<informaltable frame="none">
<tgroup cols="2">
+ <colspec colwidth="1*">
+ <colspec colwidth="3*">
<thead>
<row>
<entry>Value</entry>
@@ -257,22 +260,22 @@
<tbody>
<row>
<entry>0</entry>
- <entry>show all mount-points without any restrictions</entry>
+ <entry>Show all mount-points without any restrictions.</entry>
</row>
<row>
<entry>1</entry>
- <entry>show only mount-points below jail's chroot and show only part of the
- mount-point's path (if jail's chroot directory is
+ <entry>Show only mount-points below jail's chroot and show only part of the
+ mount-point's path (for example, if the jail's chroot directory is
<filename>/jails/foo</filename> and
mount-point is
- <filename>/jails/foo/usr/home</filename>
- only <filename>/usr/home</filename> will be shown)</entry>
+ <filename>/jails/foo/usr/home</filename>,
+ only <filename>/usr/home</filename> will be shown).</entry>
</row>
<row>
<entry>2</entry>
- <entry>show only mount-point where jail's chroot directory is placed.</entry>
+ <entry>Show only mount-point where jail's chroot directory is placed.</entry>
</row>
</tbody>
</tgroup>
@@ -390,7 +393,7 @@
<para>The <command>autoboot</command> loader command
now supports the prompt parameter.</para>
- <para>The <command>autoboot</command> will now prevent the user
+ <para>The <command>autoboot</command> loader command will now prevent the user
from interrupting the boot process at all if the
<varname>autoboot_delay</varname> variable is set to
<literal>-1</literal>. &merged;</para>
@@ -416,10 +419,8 @@
<varname>hw.pci.do_powerstate</varname> sysctls to <literal>0</literal>.</para>
<para arch="i386,amd64">The &man.acpi.ibm.4; driver for IBM laptops
- has been added.</para>
-
- <para arch="i386,amd64">The &man.acpi.ibm.4; driver has been
- improved to support hotkeys and reading fan status and thermal
+ has been added. It provides support for the various
+ hotkeys and reading fan status and thermal
sensors.</para>
<para arch="i386,amd64">The &man.acpi.fujitsu.4; driver for handling
@@ -431,10 +432,11 @@
<para>The &man.atkbdc.4;, &man.atkbd.4;, and &man.psm.4;
drivers have been rewritten in more bus-independent way,
- and now support EBus found on sparc64 platform.</para>
+ and now support the EBus found on the sparc64 platform.</para>
<para arch="sparc64">The following device drivers have been
- added and enabled by default:
+ added and enabled by default in the
+ <filename>GENERIC</filename> kernel:
&man.atkbdc.4;,
&man.atkbd.4;,
creator(4),
@@ -446,7 +448,7 @@
&man.ums.4;,
and &man.usb.4;.</para>
- <para arch="sparc64">The &man.auxio.4; driver has been to drive
+ <para arch="sparc64">The &man.auxio.4; driver has been added; it supports
some auxiliary I/O functions found on various SBus/EBus
&ultrasparc; models. &merged;</para>
@@ -572,7 +574,7 @@
between this feature and promiscuous mode. &merged;</para>
<para>Ethernet flow control is now disabled by default in the
- &man.fxp.4; driver, to prevent problems with a system panics
+ &man.fxp.4; driver, to prevent problems on a subnet when a system panics
or is left in the kernel debugger. &merged;</para>
<para>The gx(4) driver has been removed because
@@ -679,8 +681,9 @@
support IPv6.</para>
<para>&man.ipfw.8; now supports classification and tagging
- of &man.altq.4; packets via a divert socket,
- as well as the TCP data length.</para>
+ of &man.altq.4; packets via a divert socket. It is also
+ possible to specify rules that match TCP packets with specific
+ payload sizes.</para>
<para>The &man.ipfw.8; <literal>ipfw fwd</literal> rule now supports
the full packet destination manipulation when the kernel option
@@ -692,7 +695,7 @@
Note that &man.ipfw.8; rules have to be carefully crafted to
make sure that things like PMTU discovery do not break. &merged;</para>
- <para>The &man.ipfw.8; now supports IPv4 only rules.</para>
+ <para>The &man.ipfw.8; system now supports IPv4 only rules.</para>
<para>&man.ipnat.8; now allows redirect rules to
work for non-TCP/UDP packets. &merged;</para>
@@ -704,7 +707,7 @@
<para>The <filename>libalias</filename> library can now be built
as a kernel module.</para>
- <para>The link state change notifications of network interface
+ <para>The link state change notifications of network interfaces
are sent to <filename>/dev/devctl</filename> now.</para>
<para>A new &man.ng.ipfw.4; NetGraph node provides
@@ -946,18 +949,19 @@
&man.getservbyport.3; functions are now thread-safe. &merged;</para>
<para>For conformation to IEEE Std 1003.1-2001
- (also known as POSIX 2001), the <varname>n_net</varname>
+ (also known as POSIX 2001), the <varname>n_net</varname> member
of <varname>struct netent</varname> and the first argument
- of &man.getnetbyaddr.3; has been changed to an uint32_t.
- Due to these changes the ABI on 64-bit platforms becomes
+ of &man.getnetbyaddr.3; has been changed to an <literal>uint32_t</literal>.
+ Due to these changes, the ABI on 64-bit platforms is
incompatible with previous releases of &os; and
- the major version number of libpcap has been bumped.
- If you upgrade &os; for 64-bit platforms, note that all of
- the userland programs which use &man.getnetbyaddr.3;,
- &man.getnetbyname.3;, &man.getnetent.3; and/or
- <application>libpcap</application> have to be recompiled.</para>
+ the major version number of the <filename>libpcap</filename>
+ shared library has been bumped.
+ On 64-bit platforms being upgraded from older &os; versions, all
+ userland programs that use &man.getnetbyaddr.3;,
+ &man.getnetbyname.3;, &man.getnetent.3;, and/or
+ <filename>libpcap</filename> have to be recompiled.</para>
- <para>The gvinum(8) utility now supports
+ <para>The gvinum(8) utility now supports the
<command>checkparity</command>,
<command>rebuildparity</command>, and
<command>setstate</command>
@@ -1099,22 +1103,22 @@
<para>The &man.periodic.8; security output now supports the display of
information about blocked packet counts from &man.pf.4;. &merged;</para>
- <para>The &man.pgrep.1; now supports an <option>-S</option> option
- which allows to match system processes (kernel threads).</para>
+ <para>The &man.pgrep.1; command now supports a <option>-S</option> option
+ which allows matching system processes (kernel threads).</para>
- <para>The &man.pgrep.1; and &man.pkill.1; now support an
- <option>-F</option> option which allows to use file where PID is stored
- for matching.</para>
+ <para>The &man.pgrep.1; and &man.pkill.1; commands now support a
+ <option>-F</option> option, which matches a process whose PID is
+ stored in a file.</para>
- <para>The &man.pgrep.1; and &man.pkill.1; now support an
+ <para>The &man.pgrep.1; and &man.pkill.1; commands now support a
<option>-i</option> option to ignore case in the process match.</para>
- <para>The &man.pgrep.1; and &man.pkill.1; now support an
- <option>-j</option> option which allows to match processes
- based on its &man.jail.2; ID.</para>
+ <para>The &man.pgrep.1; and &man.pkill.1; commands now support a
+ <option>-j</option> option that matches processes
+ based on their &man.jail.2; ID.</para>
- <para>The &man.pgrep.1; and &man.pkill.1; now support an
- <option>-o</option> option which allows to match oldest
+ <para>The &man.pgrep.1; and &man.pkill.1; commands now support a
+ <option>-o</option> option which matches only the oldest
(least recently started) of the matching processes.</para>
<para>The &man.powerd.8; program for managing power consumption has been
@@ -1137,11 +1141,11 @@
which violates the Microsoft PPP Callback Control Protocol
section 3.2. &merged;</para>
- <para>The &man.ps.1; now supports a <literal>jid</literal>
- keyword in the <option>-o</option> option. It displays
+ <para>The &man.ps.1; utility now supports a <literal>jid</literal>
+ keyword in the <option>-o</option> option. It displays the
&man.jail.2; ID of each process.</para>
- <para>The &man.pstat.8; now supports a <option>-h</option> option
+ <para>The &man.pstat.8; program now supports a <option>-h</option> option
to print swap sizes with SI prefixes such as K, M, and G,
which are used to form binary multiples.</para>
@@ -1158,7 +1162,7 @@
<para>The &man.rexecd.8; utility has been removed.
There are no rexec clients in the &os; tree, and the client
function &man.rexec.3; is present only in
- <application>libcompat</application>.</para>
+ <filename>libcompat</filename>.</para>
<para>The &man.rm.1; utility now supports an <option>-I</option>
option that asks for confirmation (once) if recursively
@@ -1239,7 +1243,7 @@
connection, has been added. It was obtained from
OpenBSD. &merged;</para>
- <para>&man.what.1; now support a <option>-q</option> flag, which
+ <para>&man.what.1; now supports a <option>-q</option> flag, which
causes it to print matching text, but not format it.</para>
<para>&man.whois.1; now supports
@@ -1344,7 +1348,8 @@
to 1.0.3.</para>
<para><application>OpenBSD dhclient</application> as of OpenBSD 3.7
- has been imported.</para>
+ has been imported. It replaces the ISC DHCP client used in
+ prior versions of &os;.</para>
<para><application>FILE</application> has been updated from 4.10
to 4.12.</para>
@@ -1417,7 +1422,7 @@
version 8.13.3 to version 8.13.4. It now supports
<literal>OSTYPE(freebsd6)</literal>.</para>
- <para><application>TCPDUMP</application> has been updated from
+ <para><application>tcpdump</application> has been updated from
v3.8.3 to v3.9.1 (alpha 096).</para>
<para><application>tcsh</application> has been updated from
@@ -1504,7 +1509,7 @@
<para>The supported version of the
<application>GNOME</application> desktop environment has been
- updated from 2.6.2 to 2.10. More information about
+ updated from 2.6.2 to 2.10.1. More information about
running <application>GNOME</application> on &os; can be found on
the <ulink url="&url.base;/gnome/">FreeBSD GNOME Project</ulink>
Web page. &merged;
==== //depot/projects/hammer/sbin/dhclient/dhclient.c#3 (text+ko) ====
@@ -1,5 +1,5 @@
/* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */
-/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.4 2005/06/13 23:43:08 brooks Exp $ */
+/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.6 2005/06/30 05:50:52 brooks Exp $ */
/*
* Copyright 2004 Henning Brauer <henning at openbsd.org>
@@ -2228,13 +2228,18 @@
case DHO_NETBIOS_DD_SERVER:
case DHO_FONT_SERVERS:
case DHO_DHCP_SERVER_IDENTIFIER:
+ case DHO_SMTP_SERVER:
+ case DHO_POP_SERVER:
+ case DHO_NNTP_SERVER:
+ case DHO_WWW_SERVER:
+ case DHO_FINGER_SERVER:
+ case DHO_IRC_SERVER:
if (!ipv4addrs(opbuf)) {
warning("Invalid IP address in option: %s", opbuf);
return (0);
}
return (1) ;
case DHO_HOST_NAME:
- case DHO_DOMAIN_NAME:
case DHO_NIS_DOMAIN:
if (!res_hnok(sbuf)) {
warning("Bogus Host Name option %d: %s (%s)", option,
@@ -2242,6 +2247,7 @@
return (0);
}
return (1);
+ case DHO_DOMAIN_NAME:
case DHO_PAD:
case DHO_TIME_OFFSET:
case DHO_BOOT_SIZE:
==== //depot/projects/hammer/sbin/dhclient/dhcp.h#2 (text+ko) ====
@@ -1,4 +1,5 @@
/* $OpenBSD: dhcp.h,v 1.5 2004/05/04 15:49:49 deraadt Exp $ */
+/* $FreeBSD: src/sbin/dhclient/dhcp.h,v 1.2 2005/06/30 05:50:52 brooks Exp $ */
/* Protocol structures... */
@@ -154,6 +155,12 @@
#define DHO_DHCP_REBINDING_TIME 59
#define DHO_DHCP_CLASS_IDENTIFIER 60
#define DHO_DHCP_CLIENT_IDENTIFIER 61
+#define DHO_SMTP_SERVER 69
+#define DHO_POP_SERVER 70
+#define DHO_NNTP_SERVER 71
+#define DHO_WWW_SERVER 72
+#define DHO_FINGER_SERVER 73
+#define DHO_IRC_SERVER 74
#define DHO_DHCP_USER_CLASS_ID 77
#define DHO_END 255
==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#28 (text+ko) ====
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*
* from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.102 2005/02/28 23:37:35 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.103 2005/06/30 05:33:26 peter Exp $
*/
/*
==== //depot/projects/hammer/sys/amd64/conf/NOTES#73 (text+ko) ====
@@ -5,7 +5,7 @@
# machine independent notes, look in /sys/conf/NOTES.
#
# (XXX from i386:NOTES,v 1.1201)
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.35 2005/06/14 14:21:25 ups Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36 2005/06/30 05:33:25 peter Exp $
#
#
@@ -16,7 +16,7 @@
#
# We want LINT to cover profiling as well.
-#XXX#profile 2
+profile 2
#####################################################################
==== //depot/projects/hammer/sys/conf/files.amd64#72 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.amd64,v 1.69 2005/06/14 04:16:10 marcel Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.70 2005/06/30 05:33:25 peter Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/hammer/sys/i386/i386/identcpu.c#26 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.144 2005/05/29 17:43:24 schweikh Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.145 2005/06/30 06:44:34 peter Exp $");
#include "opt_cpu.h"
==== //depot/projects/hammer/sys/i386/i386/initcpu.c#13 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/initcpu.c,v 1.50 2005/05/16 09:47:53 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/initcpu.c,v 1.51 2005/06/30 06:44:34 peter Exp $");
#include "opt_cpu.h"
==== //depot/projects/hammer/sys/i386/include/md_var.h#16 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/include/md_var.h,v 1.71 2005/05/16 09:47:53 obrien Exp $
+ * $FreeBSD: src/sys/i386/include/md_var.h,v 1.72 2005/06/30 06:44:34 peter Exp $
*/
#ifndef _MACHINE_MD_VAR_H_
==== //depot/projects/hammer/sys/modules/Makefile#81 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.448 2005/06/21 13:01:14 dumbbell Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.449 2005/06/30 05:37:48 peter Exp $
# oldcard -- specialized use for debugging only.
# owi -- totally unsupported for debugging only.
@@ -423,6 +423,7 @@
#_acpi= acpi # doesn't work on amd64 yet
_agp= agp
_arcmsr= arcmsr
+_ath_hal= ath_hal
_ciss= ciss
_cpufreq= cpufreq
_digi= digi
==== //depot/projects/hammer/usr.sbin/kbdmap/kbdmap.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/kbdmap/kbdmap.c,v 1.2 2002/10/27 17:44:33 wollman Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/kbdmap/kbdmap.c,v 1.3 2005/06/30 05:31:01 ru Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -571,7 +571,7 @@
/* en_US.ISO8859-1 -> en_..\.ISO8859-1 */
strlcpy(dialect, lang, sizeof(dialect));
- if (strlen(dialect) >= 6 && dialect[2] == '-') {
+ if (strlen(dialect) >= 6 && dialect[2] == '_') {
dialect[3] = '.';
dialect[4] = '.';
}
@@ -579,8 +579,8 @@
/* en_US.ISO8859-1 -> en */
strlcpy(lang_abk, lang, sizeof(lang_abk));
- if (strlen(lang_abk) >= 3 && lang_abk[2] == '-')
- lang_abk[2] = '.';
+ if (strlen(lang_abk) >= 3 && lang_abk[2] == '_')
+ lang_abk[2] = '\0';
fprintf(stderr, "lang_default = %s\n", lang_default);
fprintf(stderr, "dialect = %s\n", dialect);
More information about the p4-projects
mailing list