PERFORCE change 128247 for review
John Birrell
jb at FreeBSD.org
Sun Oct 28 13:48:31 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=128247
Change 128247 by jb at jb_freebsd1 on 2007/10/28 20:47:42
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#43 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.java.mk#6 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.lua.mk#9 integrate
.. //depot/projects/dtrace/src/bin/ps/keyword.c#5 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#21 integrate
.. //depot/projects/dtrace/src/include/_ctype.h#6 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_none.c#9 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#13 integrate
.. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#20 integrate
.. //depot/projects/dtrace/src/sys/conf/files#48 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_pci_link.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#24 integrate
.. //depot/projects/dtrace/src/sys/netatalk/aarp.c#7 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/if_ether.c#11 integrate
.. //depot/projects/dtrace/src/sys/netinet/igmp.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#23 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet6/nd6.c#13 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_pipe.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_atalk.c#1 branch
.. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#13 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_inet.c#11 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_inet6.c#1 branch
.. //depot/projects/dtrace/src/sys/security/mac/mac_internal.h#9 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_net.c#11 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_policy.h#7 integrate
.. //depot/projects/dtrace/src/sys/security/mac_biba/mac_biba.c#14 integrate
.. //depot/projects/dtrace/src/sys/security/mac_lomac/mac_lomac.c#12 integrate
.. //depot/projects/dtrace/src/sys/security/mac_mls/mac_mls.c#13 integrate
.. //depot/projects/dtrace/src/sys/security/mac_stub/mac_stub.c#11 integrate
.. //depot/projects/dtrace/src/sys/security/mac_test/mac_test.c#10 integrate
.. //depot/projects/dtrace/www/en/features.sgml#6 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#43 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.882 2007/10/25 20:36:01 delphij Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.883 2007/10/28 17:38:22 marius Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -11585,6 +11585,13 @@
<entry>700054</entry>
</row>
<row>
+ <entry>700055 after ABI backwards compatibility
+ to the FreeBSD 4/5/6 versions of the PCIOCGETCONF,
+ PCIOCREAD and PCIOCWRITE IOCTLs was MFC'ed, which
+ required the ABI of the PCIOCGETCONF IOCTL to be
+ broken again</entry>
+ <entry>700055</entry>
+ <row>
<entry>8.0-CURRENT. Separating wide and single byte
ctype.</entry>
<entry>800000</entry>
@@ -11604,7 +11611,7 @@
to the FreeBSD 4/5/6 versions of the PCIOCGETCONF,
PCIOCREAD and PCIOCWRITE IOCTLs was added, which
required the ABI of the PCIOCGETCONF IOCTL to be
- broken again
+ broken again</entry>
<entry>800003</entry>
</row>
==== //depot/projects/dtrace/ports/Mk/bsd.java.mk#6 (text+ko) ====
@@ -9,7 +9,7 @@
# Please send all suggested changes to the maintainer instead of committing
# them to CVS yourself.
#
-# $FreeBSD: ports/Mk/bsd.java.mk,v 1.81 2007/10/07 14:42:03 glewis Exp $
+# $FreeBSD: ports/Mk/bsd.java.mk,v 1.82 2007/10/28 15:09:43 hq Exp $
#
.if !defined(Java_Include)
@@ -25,7 +25,7 @@
#
# JAVA_VERSION List of space-separated suitable java versions for the
# port. An optional "+" allows you to specify a range of
-# versions. (allowed values: 1.1[+] 1.2[+] 1.3[+] 1.4[+])
+# versions. (allowed values: 1.3[+] 1.4[+] 1.5[+] 1.6[+])
#
# JAVA_OS List of space-separated suitable JDK port operating systems
# for the port. (allowed values: native linux)
@@ -70,13 +70,13 @@
# '/usr/local/jdk1.3.1')
#
# JAVAC Path to the Java compiler to use. (e.g.
-# '/usr/local/jdk1.1.8/bin/javac' or '/usr/local/bin/jikes')
+# '/usr/local/jdk1.5.0/bin/javac' or '/usr/local/bin/jikes')
#
# JAR Path to the JAR tool to use. (e.g.
-# '/usr/local/jdk1.2.2/bin/jar' or '/usr/local/bin/fastjar')
+# '/usr/local/jdk1.5.0/bin/jar' or '/usr/local/bin/fastjar')
#
# APPLETVIEWER Path to the appletviewer utility. (e.g.
-# '/usr/local/linux-jdk1.2.2/bin/appletviewer')
+# '/usr/local/linux-jdk1.3.1/bin/appletviewer')
#
# JAVA Path to the java executable. Use this for executing Java
# programs. (e.g. '/usr/local/jdk1.3.1/bin/java')
@@ -87,13 +87,11 @@
#
# JAVAP Path to the javap program.
#
-# JAVA_KEYTOOL Path to the keytool utility program. This settings is
-# availble only if the JDK is Java 1.2 or higher.
+# JAVA_KEYTOOL Path to the keytool utility program.
#
# JAVA_N2A Path to the native2ascii tool.
#
-# JAVA_POLICYTOOL Path to the policytool program. This variable is available
-# only if the JDK is Java 1.2 or higher.
+# JAVA_POLICYTOOL Path to the policytool program.
#
# JAVA_SERIALVER Path to the serialver utility program.
#
@@ -101,12 +99,10 @@
#
# RMIREGISTRY Path to the RMI registry program, rmiregistry.
#
-# RMID Path to the RMI daemon program. This settings is only
-# available if the JDK is Java 1.2 or higher.
+# RMID Path to the RMI daemon program.
#
# JAVA_CLASSES Path to the archive that contains the JDK class files. On
-# JDK 1.2 or later, this is ${JAVA_HOME}/jre/lib/rt.jar.
-# Earlier JDK's use ${JAVA_HOME}/lib/classes.zip.
+# most JDKs, this is ${JAVA_HOME}/jre/lib/rt.jar.
#
# JAVASHAREDIR The base directory for all shared Java resources.
#
@@ -166,8 +162,8 @@
. endif
# The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST= 1.1 1.2 1.3 1.4 1.5 1.6
-_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
+__JAVA_VERSION_LIST= 1.3 1.4 1.5 1.6
+_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} 1.1+ 1.2+
_JAVA_OS_LIST= native linux
_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown
@@ -175,10 +171,6 @@
# port location, corresponding JAVA_HOME, JDK version, OS, vendor
_JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO= PORT=java/diablo-jdk15 HOME=${LOCALBASE}/diablo-jdk1.5.0 \
VERSION=1.5.0 OS=native VENDOR=freebsd
-_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1_INFO= PORT=java/jdk11 HOME=${LOCALBASE}/jdk1.1.8 \
- VERSION=1.1.8 OS=native VENDOR=bsdjava
-_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2_INFO= PORT=java/jdk12 HOME=${LOCALBASE}/jdk1.2.2 \
- VERSION=1.2.2 OS=native VENDOR=bsdjava
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO= PORT=java/jdk13 HOME=${LOCALBASE}/jdk1.3.1 \
VERSION=1.3.1 OS=native VENDOR=bsdjava
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4_INFO= PORT=java/jdk14 HOME=${LOCALBASE}/jdk1.4.2 \
@@ -187,12 +179,8 @@
VERSION=1.5.0 OS=native VENDOR=bsdjava
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO= PORT=java/jdk16 HOME=${LOCALBASE}/jdk1.6.0 \
VERSION=1.6.0 OS=native VENDOR=bsdjava
-_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO= PORT=java/linux-blackdown-jdk12 HOME=${LOCALBASE}/linux-blackdown-jdk1.2.2 \
- VERSION=1.2.2 OS=linux VENDOR=blackdown
_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO= PORT=java/linux-blackdown-jdk14 HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \
VERSION=1.4.2 OS=linux VENDOR=blackdown
-_JAVA_PORT_LINUX_SUN_JDK_1_2_INFO= PORT=java/linux-sun-jdk12 HOME=${LOCALBASE}/linux-sun-jdk1.2.2 \
- VERSION=1.2.2 OS=linux VENDOR=sun
_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO= PORT=java/linux-sun-jdk13 HOME=${LOCALBASE}/linux-sun-jdk1.3.1 \
VERSION=1.3.1 OS=linux VENDOR=sun
_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO= PORT=java/linux-sun-jdk14 HOME=${LOCALBASE}/linux-sun-jdk1.4.2 \
@@ -226,15 +214,11 @@
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \
- JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2 \
- JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1 \
JAVA_PORT_LINUX_SUN_JDK_1_6 \
JAVA_PORT_LINUX_SUN_JDK_1_5 \
JAVA_PORT_LINUX_SUN_JDK_1_4 \
JAVA_PORT_LINUX_SUN_JDK_1_3 \
- JAVA_PORT_LINUX_SUN_JDK_1_2 \
- JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 \
- JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2
+ JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4
_JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \
${_JAVA_PREFERRED_PORTS} \
${__JAVA_PORTS_ALL}
@@ -308,7 +292,7 @@
. undef _JAVA_PORTS_INSTALLED
. undef _JAVA_PORTS_POSSIBLE
. if defined(JAVA_VERSION)
-_JAVA_VERSION= ${JAVA_VERSION:S/1.1+/1.1 1.2 1.3 1.4 1.5 1.6/:S/1.2+/1.2 1.3 1.4 1.5 1.6/:S/1.3+/1.3 1.4 1.5 1.6/:S/1.4+/1.4 1.5 1.6/:S/1.5+/1.5 1.6/:S/1.6+/1.6/}
+_JAVA_VERSION= ${JAVA_VERSION:S/1.1+/1.3+/:S/1.2+/1.3+/:S/1.3+/1.3 1.4+/:S/1.4+/1.4 1.5+/:S/1.5+/1.5 1.6+/:S/1.6+/1.6/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif
@@ -490,20 +474,12 @@
JAVA_SERIALVER?=${JAVA_HOME}/bin/serialver
RMIC?= ${JAVA_HOME}/bin/rmic
RMIREGISTRY?= ${JAVA_HOME}/bin/rmiregistry
-
-# Some executables only exists in JDK 1.2 and up
-. if ${_JAVA_PORT} != "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1"
JAVA_KEYTOOL?= ${JAVA_HOME}/bin/keytool
JAVA_POLICYTOOL?= ${JAVA_HOME}/bin/policytool
RMID?= ${JAVA_HOME}/bin/rmid
-. endif
# Set the location of the ZIP or JAR file with all standard Java classes.
-. if ${_JAVA_PORT} == "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1"
-JAVA_CLASSES= ${JAVA_HOME}/lib/classes.zip
-. else
JAVA_CLASSES= ${JAVA_HOME}/jre/lib/rt.jar
-. endif
#-------------------------------------------------------------------------------
==== //depot/projects/dtrace/ports/Mk/bsd.lua.mk#9 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.13 2007/04/11 03:22:34 alepulver Exp $
+# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.14 2007/10/28 19:43:49 pav Exp $
#
# bsd.lua.mk - Support for Lua based ports.
#
@@ -38,7 +38,7 @@
# Other components (modules):
# 5.0 - app, compat51, dfui, filename, gettext,
# posix, pty, socket.
-# 5.1 - filename, gettext, posix, pty.
+# 5.1 - filename, gettext, posix, pty, socket.
# The available dependency types are:
# build - Requires component for building.
# lib - Requires component for building and running.
@@ -159,7 +159,7 @@
_LUA_PORT_gettext_5.0= devel/lua50-gettext
_LUA_PORT_posix_5.0= devel/lua50-posix
_LUA_PORT_pty_5.0= devel/lua50-pty
-_LUA_PORT_socket_5.0= net/luasocket
+_LUA_PORT_socket_5.0= net/lua50-luasocket
_LUA_PORT_lua_5.1= lang/lua
_LUA_DEPTYPE_lua_5.1= build
@@ -168,6 +168,7 @@
_LUA_PORT_gettext_5.1= devel/lua-gettext
_LUA_PORT_posix_5.1= devel/lua-posix
_LUA_PORT_pty_5.1= devel/lua-pty
+_LUA_PORT_socket_5.1= net/luasocket
. for comp in ${_LUA_COMPS_ALL}
_LUA_COMP= ${comp}
==== //depot/projects/dtrace/src/bin/ps/keyword.c#5 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.77 2007/10/26 08:00:40 julian Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -186,9 +186,8 @@
{"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid),
UINT, UIDFMT, 0},
{"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0},
+ {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0},
{"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0},
- {"tdnam", "THRDNAME", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR,
- NULL, 0},
{"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT,
PIDFMT, 0},
{"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT,
==== //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#21 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.243 2007/10/21 05:16:52 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.244 2007/10/28 07:02:10 dougb Exp $
%
=======================================================================
@@ -16494,10 +16494,10 @@
you through times of no dope.
-- Gilbert Shelton
%
-Dorothy: But how can you talk without a brain?
-Scarecrow: Well, I don't know... but some people
- without brains do an awful lot of talking.
- -- The Wizard of Oz
+Dorothy: How can you talk if you haven't got a brain?
+Scarecrow: I don't know. But some people without brains do an
+ awful lot of talking, don't they?
+ -- Judy Garland and Ray Bolger, "The Wizard of Oz"
%
Double!
%
@@ -20094,8 +20094,6 @@
think not, my friend, I think not.
-- Arthur Naiman, "Every Goy's Guide to Yiddish"
%
-"Gee, Toto, I don't think we are in Kansas anymore."
-%
GEMINI (May 21 - June 20)
A day to take the initiative. Put the garbage out, for
instance, and pick up the stuff at the dry cleaners. Watch
@@ -22013,7 +22011,7 @@
Guernsey cows? It's gonna be the herd shot 'round the world.
%
Hearts will never be practical until they can be made unbreakable.
- -- The Wizard of Oz
+ -- Frank Morgan as The Wizard, "The Wizard of Oz"
%
Heaven and earth were created all together in the same instant,
on October 23rd, 4004 B.C. at nine o'clock in the morning.
@@ -23447,6 +23445,9 @@
I can't believe that out of 100,000 sperm, you were the quickest.
-- Steven Pearl
%
+I CAN'T come back, I don't know how it works.
+ -- Frank Morgan as The Wizard, "The Wizard of Oz"
+%
I can't complain, but sometimes I still do.
-- Joe Walsh
%
@@ -28015,6 +28016,9 @@
thank everyone for making this night necessary.
-- Yogi Berra at a dinner in his honor
%
+Oh no my dear, I'm a very good man. I'm just a very bad wizard.
+ -- Frank Morgan as The Wizard, "The Wizard of Oz"
+%
I'm all for computer dating, but I
wouldn't want one to marry my sister.
%
@@ -38585,6 +38589,9 @@
%
Pause for storage relocation.
%
+Pay no attention to that man behind the curtain.
+ -- Frank Morgan as The Wizard, "The Wizard of Oz"
+%
paycheck:
The weekly $5.27 that remains after deductions for federal
withholding, state withholding, city withholding, FICA,
@@ -53297,8 +53304,8 @@
TOTD (T-shirt Of The Day):
I'm the person your mother warned you about.
%
-Toto, I don't think we're in Kansas anymore.
- -- Judy Garland, "Wizard of Oz"
+Toto, I have a feeling we're not in Kansas anymore.
+ -- Judy Garland as Dorothy Gale, "The Wizard of Oz"
%
Tourists -- have some fun with New York's hard-boiled cabbies. When you
get to your destination, say to your driver, "Pay? I was hitch-hiking."
@@ -56222,6 +56229,9 @@
%
What will you do if all your problems aren't solved by the time you die?
%
+What would you do with a brain if you had one?
+ -- Judy Garland as Dorothy Gale, "The Wizard of Oz"
+%
What you don't know can hurt you, only you won't know it.
%
What you don't know won't help you much either.
==== //depot/projects/dtrace/src/include/_ctype.h#6 (text+ko) ====
@@ -40,7 +40,7 @@
*
* From @(#)ctype.h 8.4 (Berkeley) 1/21/94
* From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp
- * $FreeBSD: src/include/_ctype.h,v 1.32 2007/10/27 09:32:32 ache Exp $
+ * $FreeBSD: src/include/_ctype.h,v 1.33 2007/10/27 22:32:27 ache Exp $
*/
#ifndef __CTYPE_H_
@@ -126,7 +126,7 @@
static __inline int
__isctype(__ct_rune_t _c, unsigned long _f)
{
- return (_c < 0 || _c >= 128) ? 0 :
+ return (_c & ~0x7F) ? 0 :
!!(_DefaultRuneLocale.__runetype[_c] & _f);
}
==== //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_none.c#9 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.17 2007/05/29 01:00:19 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.18 2007/10/27 22:45:40 kientzle Exp $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -334,7 +334,7 @@
const void* dummy_buffer;
ssize_t bytes_read;
bytes_read = archive_decompressor_none_read_ahead(a,
- &dummy_buffer, request);
+ &dummy_buffer, 1);
if (bytes_read < 0)
return (bytes_read);
if (bytes_read == 0) {
==== //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#13 (text+ko) ====
@@ -17,7 +17,7 @@
*
* NEW command line interface for IP firewall facility
*
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.109 2007/10/19 12:48:02 rpaulo Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.110 2007/10/27 22:04:19 maxim Exp $
*/
#include <sys/param.h>
@@ -6226,16 +6226,16 @@
config_pipe(ac, av);
else if (do_nat && _substrcmp(*av, "config") == 0)
config_nat(ac, av);
- else if (_substrcmp(*av, "set") == 0)
- sets_handler(ac, av);
- else if (_substrcmp(*av, "table") == 0)
- table_handler(ac, av);
- else if (_substrcmp(*av, "enable") == 0)
- sysctl_handler(ac, av, 1);
- else if (_substrcmp(*av, "disable") == 0)
- sysctl_handler(ac, av, 0);
- else
- try_next = 1;
+ else if (_substrcmp(*av, "set") == 0)
+ sets_handler(ac, av);
+ else if (_substrcmp(*av, "table") == 0)
+ table_handler(ac, av);
+ else if (_substrcmp(*av, "enable") == 0)
+ sysctl_handler(ac, av, 1);
+ else if (_substrcmp(*av, "disable") == 0)
+ sysctl_handler(ac, av, 0);
+ else
+ try_next = 1;
}
if (use_set || try_next) {
==== //depot/projects/dtrace/src/share/man/man5/rc.conf.5#20 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.330 2007/10/15 20:00:20 netchild Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.331 2007/10/28 13:33:25 miwi Exp $
.\"
-.Dd September 3, 2007
+.Dd October 27, 2007
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -1127,7 +1127,9 @@
ifconfig_ed0="DHCP"
.Ed
.Pp
-Also, if your interface needs WPA authentication, it is possible to add
+Also, if you want to configure your wireless interface with
+.Xr wpa_supplicant 8
+for use with WPA, EAP/LEAP or WEP, you need to add
.Dq Li WPA
to the
.Va ifconfig_ Ns Aq Ar interface
==== //depot/projects/dtrace/src/sys/conf/files#48 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1248 2007/10/27 15:31:50 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1249 2007/10/28 15:55:20 rwatson Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -2031,9 +2031,11 @@
security/audit/audit_syscalls.c standard
security/audit/audit_trigger.c optional audit
security/audit/audit_worker.c optional audit
+security/mac/mac_atalk.c optional mac netatalk
security/mac/mac_audit.c optional mac audit
security/mac/mac_framework.c optional mac
security/mac/mac_inet.c optional mac inet
+security/mac/mac_inet6.c optional mac inet6
security/mac/mac_label.c optional mac
security/mac/mac_net.c optional mac
security/mac/mac_pipe.c optional mac
==== //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#11 (text+ko) ====
@@ -40,7 +40,7 @@
#include "opt_inet6.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.49 2007/10/26 13:18:36 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.50 2007/10/28 17:12:46 rwatson Exp $");
#endif
#ifdef __FreeBSD__
@@ -1818,7 +1818,7 @@
#ifdef __FreeBSD__
#ifdef MAC
if (replyto)
- mac_mbuf_create_netlayer(replyto, m);
+ mac_netinet_firewall_reply(replyto, m);
else
mac_netinet_firewall_send(m);
#else
==== //depot/projects/dtrace/src/sys/dev/acpica/acpi_pci_link.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.57 2007/10/27 13:12:29 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.58 2007/10/27 22:14:17 jhb Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -932,9 +932,10 @@
routed++;
if (routed == sc->pl_num_links)
status = acpi_pci_link_route_irqs(dev);
- else
- status = AcpiEvaluateObject(acpi_get_handle(dev), "_DIS", NULL,
- NULL);
+ else {
+ AcpiEvaluateObject(acpi_get_handle(dev), "_DIS", NULL, NULL);
+ status = AE_OK;
+ }
ACPI_SERIAL_END(pci_link);
if (ACPI_FAILURE(status))
return (ENXIO);
==== //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#24 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.107 2007/10/26 08:00:41 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.108 2007/10/27 22:07:40 jhb Exp $");
#include "opt_hwpmc_hooks.h"
@@ -108,10 +108,7 @@
static int sched_quantum; /* Roundrobin scheduling quantum in ticks. */
#define SCHED_QUANTUM (hz / 10) /* Default sched quantum */
-static struct callout roundrobin_callout;
-
static void setup_runqs(void);
-static void roundrobin(void *arg);
static void schedcpu(void);
static void schedcpu_thread(void);
static void sched_priority(struct thread *td, u_char prio);
@@ -256,27 +253,6 @@
}
/*
- * Force switch among equal priority processes every 100ms.
- * We don't actually need to force a context switch of the current process.
- * The act of firing the event triggers a context switch to softclock() and
- * then switching back out again which is equivalent to a preemption, thus
- * no further work is needed on the local CPU.
- */
-/* ARGSUSED */
-static void
-roundrobin(void *arg)
-{
-
-#ifdef SMP
- mtx_lock_spin(&sched_lock);
- forward_roundrobin();
- mtx_unlock_spin(&sched_lock);
-#endif
-
- callout_reset(&roundrobin_callout, sched_quantum, roundrobin, NULL);
-}
-
-/*
* Constants for digital decay and forget:
* 90% of (td_estcpu) usage in 5 * loadav time
* 95% of (ts_pctcpu) usage in 60 seconds (load insensitive)
@@ -551,11 +527,6 @@
sched_quantum = SCHED_QUANTUM;
hogticks = 2 * sched_quantum;
- callout_init(&roundrobin_callout, CALLOUT_MPSAFE);
-
- /* Kick off timeout driven events by calling first time. */
- roundrobin(NULL);
-
/* Account for thread0. */
sched_load_add();
}
@@ -626,6 +597,14 @@
resetpriority(td);
resetpriority_thread(td);
}
+
+ /*
+ * Force a context switch if the current thread has used up a full
+ * quantum (default quantum is 100ms).
+ */
+ if (!TD_IS_IDLETHREAD(td) &&
+ ticks - PCPU_GET(switchticks) >= sched_quantum)
+ td->td_flags |= TDF_NEEDRESCHED;
}
/*
==== //depot/projects/dtrace/src/sys/netatalk/aarp.c#7 (text+ko) ====
@@ -47,7 +47,7 @@
* +1-313-764-2278
* netatalk at umich.edu
*
- * $FreeBSD: src/sys/netatalk/aarp.c,v 1.43 2007/10/26 13:18:37 rwatson Exp $
+ * $FreeBSD: src/sys/netatalk/aarp.c,v 1.44 2007/10/28 15:55:21 rwatson Exp $
*/
#include "opt_atalk.h"
@@ -177,7 +177,7 @@
if (m == NULL)
return;
#ifdef MAC
- mac_mbuf_create_linklayer(ifp, m);
+ mac_netatalk_aarp_send(ifp, m);
#endif
m->m_len = sizeof(*ea);
m->m_pkthdr.len = sizeof(*ea);
@@ -602,7 +602,7 @@
if (m == NULL)
return;
#ifdef MAC
- mac_mbuf_create_linklayer(ifp, m);
+ mac_netatalk_aarp_send(ifp, m);
#endif
m->m_len = sizeof(*ea);
m->m_pkthdr.len = sizeof(*ea);
==== //depot/projects/dtrace/src/sys/netgraph/ng_base.c#8 (text+ko) ====
@@ -38,7 +38,7 @@
* Authors: Julian Elischer <julian at freebsd.org>
* Archie Cobbs <archie at freebsd.org>
*
- * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.137 2007/10/19 20:09:58 ru Exp $
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.138 2007/10/28 18:05:59 mav Exp $
* $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
*/
@@ -3281,7 +3281,7 @@
item->body.fn.fn_arg2);
break;
case NGQF_FN2:
- printf(" - fn@%p (%p, %p, %p, %d (%x))\n",
+ printf(" - fn2@%p (%p, %p, %p, %d (%x))\n",
_NGI_FN2(item),
_NGI_NODE(item),
_NGI_HOOK(item),
==== //depot/projects/dtrace/src/sys/netinet/if_ether.c#11 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.163 2007/10/26 13:18:37 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.164 2007/10/28 15:55:21 rwatson Exp $");
#include "opt_inet.h"
#include "opt_mac.h"
@@ -323,7 +323,7 @@
ah = mtod(m, struct arphdr *);
bzero((caddr_t)ah, m->m_len);
#ifdef MAC
- mac_mbuf_create_linklayer(ifp, m);
+ mac_netinet_arp_send(ifp, m);
#endif
ah->ar_pro = htons(ETHERTYPE_IP);
ah->ar_hln = ifp->if_addrlen; /* hardware address length */
==== //depot/projects/dtrace/src/sys/netinet/igmp.c#8 (text+ko) ====
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.55 2007/10/26 13:18:37 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.56 2007/10/28 15:55:21 rwatson Exp $");
#include "opt_mac.h"
@@ -471,7 +471,7 @@
m->m_pkthdr.rcvif = loif;
#ifdef MAC
- mac_mbuf_create_linklayer(inm->inm_ifp, m);
+ mac_netinet_igmp_send(inm->inm_ifp, m);
#endif
m->m_pkthdr.len = sizeof(struct ip) + IGMP_MINLEN;
MH_ALIGN(m, IGMP_MINLEN + sizeof(struct ip));
==== //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#23 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.177 2007/10/26 13:18:37 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.178 2007/10/28 17:12:47 rwatson Exp $");
#define DEB(x)
#define DDB(x) x
@@ -1619,7 +1619,7 @@
#ifdef MAC
if (replyto != NULL)
- mac_mbuf_create_netlayer(replyto, m);
+ mac_netinet_firewall_reply(replyto, m);
else
mac_netinet_firewall_send(m);
#else
==== //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#8 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_icmp.c,v 1.119 2007/10/24 19:03:58 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_icmp.c,v 1.120 2007/10/28 17:12:47 rwatson Exp $");
#include "opt_ipsec.h"
#include "opt_mac.h"
@@ -221,7 +221,7 @@
if (m == NULL)
goto freeit;
#ifdef MAC
- mac_mbuf_create_netlayer(n, m);
+ mac_netinet_icmp_reply(n, m);
#endif
icmplen = min(icmplen, M_TRAILINGSPACE(m) - sizeof(struct ip) - ICMP_MINLEN);
m_align(m, ICMP_MINLEN + icmplen);
@@ -699,7 +699,7 @@
}
match:
#ifdef MAC
- mac_netinet_icmp_reply(m);
+ mac_netinet_icmp_replyinplace(m);
#endif
t = IA_SIN(ia)->sin_addr;
ip->ip_src = t;
==== //depot/projects/dtrace/src/sys/netinet6/nd6.c#13 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/nd6.c,v 1.85 2007/10/26 13:18:37 rwatson Exp $ */
+/* $FreeBSD: src/sys/netinet6/nd6.c,v 1.86 2007/10/28 15:55:21 rwatson Exp $ */
/* $KAME: nd6.c,v 1.144 2001/05/24 07:44:00 itojun Exp $ */
/*-
@@ -2114,7 +2114,7 @@
}
#ifdef MAC
- mac_mbuf_create_linklayer(ifp, m);
+ mac_netinet6_nd6_send(ifp, m);
#endif
if ((ifp->if_flags & IFF_LOOPBACK) != 0) {
return ((*ifp->if_output)(origifp, m, (struct sockaddr *)dst,
==== //depot/projects/dtrace/src/sys/security/audit/audit_pipe.c#9 (text) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.12 2007/10/12 15:09:02 csjp Exp $
+ * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.13 2007/10/27 22:28:01 csjp Exp $
*/
#include <sys/param.h>
@@ -934,6 +934,7 @@
audit_pipe_entry_free(ape);
ap->ap_truncates++;
} while (1);
+ ap->ap_reads++;
mtx_unlock(&audit_pipe_mtx);
/*
==== //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#13 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
+ * Copyright (c) 1999-2002, 2007 Robert N. M. Watson
* Copyright (c) 2001-2005 Networks Associates Technology, Inc.
* Copyright (c) 2005-2006 SPARTA, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.92 2007/10/26 21:16:34 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.95 2007/10/28 17:55:55 rwatson Exp $
*/
/*
@@ -152,10 +152,6 @@
int mac_kld_check_stat(struct ucred *cred);
void mac_mbuf_copy(struct mbuf *, struct mbuf *);
-void mac_mbuf_create_linklayer(struct ifnet *ifp, struct mbuf *m);
-void mac_mbuf_create_multicast_encap(struct mbuf *m, struct ifnet *ifp,
- struct mbuf *mnew);
-void mac_mbuf_create_netlayer(struct mbuf *m, struct mbuf *mnew);
int mac_mbuf_init(struct mbuf *, int);
void mac_mbuf_tag_copy(struct m_tag *, struct m_tag *);
@@ -167,11 +163,19 @@
void mac_mount_destroy(struct mount *);
void mac_mount_init(struct mount *);
+void mac_netatalk_aarp_send(struct ifnet *ifp, struct mbuf *m);
+
+void mac_netinet_arp_send(struct ifnet *ifp, struct mbuf *m);
+void mac_netinet_firewall_reply(struct mbuf *mrecv, struct mbuf *msend);
void mac_netinet_firewall_send(struct mbuf *m);
void mac_netinet_fragment(struct mbuf *m, struct mbuf *frag);
-void mac_netinet_icmp_reply(struct mbuf *m);
+void mac_netinet_icmp_reply(struct mbuf *mrecv, struct mbuf *msend);
+void mac_netinet_icmp_replyinplace(struct mbuf *m);
+void mac_netinet_igmp_send(struct ifnet *ifp, struct mbuf *m);
void mac_netinet_tcp_reply(struct mbuf *m);
+void mac_netinet6_nd6_send(struct ifnet *ifp, struct mbuf *m);
+
int mac_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp,
unsigned long cmd, void *data);
int mac_pipe_check_poll(struct ucred *cred, struct pipepair *pp);
==== //depot/projects/dtrace/src/sys/security/mac/mac_inet.c#11 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
+ * Copyright (c) 1999-2002, 2007 Robert N. M. Watson
* Copyright (c) 2001 Ilmar S. Habibulin
* Copyright (c) 2001-2004 Networks Associates Technology, Inc.
* Copyright (c) 2006 SPARTA, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.14 2007/10/26 13:18:37 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.16 2007/10/28 17:12:47 rwatson Exp $");
#include "opt_mac.h"
@@ -222,13 +222,49 @@
}
void
-mac_netinet_icmp_reply(struct mbuf *m)
+mac_netinet_arp_send(struct ifnet *ifp, struct mbuf *m)
+{
+ struct label *mlabel;
+
+ mlabel = mac_mbuf_to_label(m);
+
+ MAC_IFNET_LOCK(ifp);
+ MAC_PERFORM(netinet_arp_send, ifp, ifp->if_label, m, mlabel);
+ MAC_IFNET_UNLOCK(ifp);
+}
+
+void
+mac_netinet_icmp_reply(struct mbuf *mrecv, struct mbuf *msend)
+{
+ struct label *mrecvlabel, *msendlabel;
+
+ mrecvlabel = mac_mbuf_to_label(mrecv);
+ msendlabel = mac_mbuf_to_label(msend);
+
+ MAC_PERFORM(netinet_icmp_reply, mrecv, mrecvlabel, msend,
+ msendlabel);
+}
+
+void
+mac_netinet_icmp_replyinplace(struct mbuf *m)
{
struct label *label;
label = mac_mbuf_to_label(m);
- MAC_PERFORM(netinet_icmp_reply, m, label);
+ MAC_PERFORM(netinet_icmp_replyinplace, m, label);
+}
+
+void
+mac_netinet_igmp_send(struct ifnet *ifp, struct mbuf *m)
+{
+ struct label *mlabel;
+
+ mlabel = mac_mbuf_to_label(m);
+
+ MAC_IFNET_LOCK(ifp);
+ MAC_PERFORM(netinet_igmp_send, ifp, ifp->if_label, m, mlabel);
+ MAC_IFNET_UNLOCK(ifp);
}
void
@@ -276,6 +312,21 @@
}
void
+mac_netinet_firewall_reply(struct mbuf *mrecv, struct mbuf *msend)
+{
+ struct label *mrecvlabel, *msendlabel;
+
+ M_ASSERTPKTHDR(mrecv);
+ M_ASSERTPKTHDR(msend);
+
+ mrecvlabel = mac_mbuf_to_label(mrecv);
+ msendlabel = mac_mbuf_to_label(msend);
+
+ MAC_PERFORM(netinet_firewall_reply, mrecv, mrecvlabel, msend,
+ msendlabel);
+}
+
+void
mac_netinet_firewall_send(struct mbuf *m)
{
struct label *label;
==== //depot/projects/dtrace/src/sys/security/mac/mac_internal.h#9 (text+ko) ====
@@ -41,7 +41,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/security/mac/mac_internal.h,v 1.122 2007/10/24 19:04:00 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac/mac_internal.h,v 1.123 2007/10/28 15:55:22 rwatson Exp $
*/
#ifndef _SYS_SECURITY_MAC_MAC_INTERNAL_H_
@@ -91,6 +91,7 @@
#ifndef MAC_ALWAYS_LABEL_MBUF
extern int mac_labelmbufs;
#endif
+extern struct mtx mac_ifnet_mtx;
/*
* MAC Framework infrastructure functions.
@@ -113,6 +114,9 @@
int mac_check_structmac_consistent(struct mac *mac);
int mac_allocate_slot(void);
+#define MAC_IFNET_LOCK(ifp) mtx_lock(&mac_ifnet_mtx)
+#define MAC_IFNET_UNLOCK(ifp) mtx_unlock(&mac_ifnet_mtx)
+
/*
* MAC Framework per-object type functions. It's not yet clear how the
* namespaces, etc, should work for these, so for now, sort by object type.
==== //depot/projects/dtrace/src/sys/security/mac/mac_net.c#11 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.128 2007/10/26 13:18:37 rwatson Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list