PERFORCE change 141824 for review
Sam Leffler
sam at FreeBSD.org
Sun May 18 22:07:14 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=141824
Change 141824 by sam at sam_ebb on 2008/05/18 22:06:30
IFC @ 141823
Affected files ...
.. //depot/projects/vap/bin/sh/expand.c#4 integrate
.. //depot/projects/vap/bin/sh/parser.c#3 integrate
.. //depot/projects/vap/bin/sh/parser.h#3 integrate
.. //depot/projects/vap/etc/defaults/rc.conf#13 integrate
.. //depot/projects/vap/etc/network.subr#11 integrate
.. //depot/projects/vap/etc/portsnap.conf#3 integrate
.. //depot/projects/vap/etc/rc.d/netif#8 integrate
.. //depot/projects/vap/etc/rc.d/ntpd#3 integrate
.. //depot/projects/vap/etc/rc.d/routing#3 integrate
.. //depot/projects/vap/etc/rc.initdiskless#3 integrate
.. //depot/projects/vap/gnu/usr.bin/man/TODO#3 integrate
.. //depot/projects/vap/gnu/usr.bin/man/lib/util.c#3 integrate
.. //depot/projects/vap/gnu/usr.bin/man/man/man.c#4 integrate
.. //depot/projects/vap/include/gssapi/gssapi.h#4 integrate
.. //depot/projects/vap/kerberos5/lib/libkrb5/Makefile#5 integrate
.. //depot/projects/vap/lib/libc/stdlib/rb.h#3 integrate
.. //depot/projects/vap/lib/libc/stdtime/strftime.3#3 integrate
.. //depot/projects/vap/lib/libpam/modules/pam_ksu/Makefile#3 integrate
.. //depot/projects/vap/libexec/rtld-elf/rtld.1#3 integrate
.. //depot/projects/vap/release/pc98/fixit-small_crunch.conf#3 integrate
.. //depot/projects/vap/sbin/atacontrol/atacontrol.c#5 integrate
.. //depot/projects/vap/share/man/man4/iwn.4#4 integrate
.. //depot/projects/vap/share/man/man4/termios.4#4 integrate
.. //depot/projects/vap/share/man/man5/portsnap.conf.5#3 integrate
.. //depot/projects/vap/share/man/man5/rc.conf.5#10 integrate
.. //depot/projects/vap/share/timedef/hu_HU.ISO8859-2.src#4 integrate
.. //depot/projects/vap/share/timedef/hu_HU.UTF-8.src#4 integrate
.. //depot/projects/vap/sys/amd64/amd64/genassym.c#6 integrate
.. //depot/projects/vap/sys/amd64/amd64/pmap.c#16 integrate
.. //depot/projects/vap/sys/amd64/conf/GENERIC#15 integrate
.. //depot/projects/vap/sys/amd64/linux32/linux32_dummy.c#8 integrate
.. //depot/projects/vap/sys/amd64/linux32/linux32_proto.h#9 integrate
.. //depot/projects/vap/sys/amd64/linux32/linux32_syscall.h#9 integrate
.. //depot/projects/vap/sys/amd64/linux32/linux32_sysent.c#9 integrate
.. //depot/projects/vap/sys/amd64/linux32/syscalls.master#9 integrate
.. //depot/projects/vap/sys/arm/arm/pmap.c#11 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/lock.h#2 integrate
.. //depot/projects/vap/sys/compat/linux/linux_emul.c#3 integrate
.. //depot/projects/vap/sys/compat/linux/linux_emul.h#3 integrate
.. //depot/projects/vap/sys/compat/linux/linux_futex.c#5 integrate
.. //depot/projects/vap/sys/compat/linux/linux_futex.h#4 integrate
.. //depot/projects/vap/sys/compat/linux/linux_misc.c#11 integrate
.. //depot/projects/vap/sys/compat/ndis/subr_ndis.c#8 integrate
.. //depot/projects/vap/sys/conf/NOTES#20 integrate
.. //depot/projects/vap/sys/conf/files#41 integrate
.. //depot/projects/vap/sys/conf/options#23 integrate
.. //depot/projects/vap/sys/dev/bge/if_bge.c#15 integrate
.. //depot/projects/vap/sys/dev/bge/if_bgereg.h#11 integrate
.. //depot/projects/vap/sys/dev/ciss/ciss.c#8 integrate
.. //depot/projects/vap/sys/dev/coretemp/coretemp.c#6 integrate
.. //depot/projects/vap/sys/dev/ixgbe/LICENSE#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/README#1 branch
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe.c#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe.h#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_82598.c#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_api.c#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_api.h#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_common.c#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_common.h#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_osdep.h#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_phy.c#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_phy.h#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_type.h#3 integrate
.. //depot/projects/vap/sys/dev/ixgbe/tcp_lro.c#1 branch
.. //depot/projects/vap/sys/dev/ixgbe/tcp_lro.h#1 branch
.. //depot/projects/vap/sys/dev/k8temp/k8temp.c#5 integrate
.. //depot/projects/vap/sys/dev/mfi/mfi.c#7 integrate
.. //depot/projects/vap/sys/dev/mfi/mfi_ioctl.h#3 integrate
.. //depot/projects/vap/sys/dev/puc/pucdata.c#7 integrate
.. //depot/projects/vap/sys/dev/speaker/spkr.c#4 integrate
.. //depot/projects/vap/sys/dev/sym/sym_defs.h#3 integrate
.. //depot/projects/vap/sys/dev/sym/sym_fw.h#3 integrate
.. //depot/projects/vap/sys/dev/sym/sym_fw1.h#5 integrate
.. //depot/projects/vap/sys/dev/sym/sym_fw2.h#5 integrate
.. //depot/projects/vap/sys/dev/sym/sym_hipd.c#7 integrate
.. //depot/projects/vap/sys/dev/usb/ehci.c#11 integrate
.. //depot/projects/vap/sys/dev/usb/if_axe.c#7 integrate
.. //depot/projects/vap/sys/dev/usb/ohci.c#7 integrate
.. //depot/projects/vap/sys/dev/usb/umass.c#8 integrate
.. //depot/projects/vap/sys/dev/usb/usbdevs#19 integrate
.. //depot/projects/vap/sys/dev/usb/uscanner.c#7 integrate
.. //depot/projects/vap/sys/dev/wpi/if_wpi.c#26 integrate
.. //depot/projects/vap/sys/dev/wpi/if_wpivar.h#9 integrate
.. //depot/projects/vap/sys/fs/ntfs/ntfs_subr.c#9 integrate
.. //depot/projects/vap/sys/fs/udf/udf_vnops.c#7 integrate
.. //depot/projects/vap/sys/geom/geom_subr.c#8 integrate
.. //depot/projects/vap/sys/i386/conf/GENERIC#17 integrate
.. //depot/projects/vap/sys/i386/i386/genassym.c#6 integrate
.. //depot/projects/vap/sys/i386/i386/pmap.c#15 integrate
.. //depot/projects/vap/sys/i386/linux/linux_dummy.c#8 integrate
.. //depot/projects/vap/sys/i386/linux/linux_proto.h#9 integrate
.. //depot/projects/vap/sys/i386/linux/linux_syscall.h#9 integrate
.. //depot/projects/vap/sys/i386/linux/linux_sysent.c#9 integrate
.. //depot/projects/vap/sys/i386/linux/syscalls.master#9 integrate
.. //depot/projects/vap/sys/ia64/ia64/pmap.c#11 integrate
.. //depot/projects/vap/sys/kern/imgact_elf.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_conf.c#9 integrate
.. //depot/projects/vap/sys/kern/kern_dtrace.c#1 branch
.. //depot/projects/vap/sys/kern/kern_sdt.c#1 branch
.. //depot/projects/vap/sys/kern/kern_switch.c#10 integrate
.. //depot/projects/vap/sys/kern/kern_sx.c#7 integrate
.. //depot/projects/vap/sys/kern/subr_bus.c#11 integrate
.. //depot/projects/vap/sys/kern/subr_lock.c#5 integrate
.. //depot/projects/vap/sys/kern/subr_witness.c#14 integrate
.. //depot/projects/vap/sys/kern/uipc_sem.c#7 integrate
.. //depot/projects/vap/sys/kern/uipc_sockbuf.c#6 integrate
.. //depot/projects/vap/sys/kern/vfs_subr.c#18 integrate
.. //depot/projects/vap/sys/mips/mips/pmap.c#4 integrate
.. //depot/projects/vap/sys/modules/cyclic/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/Makefile.inc#1 branch
.. //depot/projects/vap/sys/modules/dtrace/dtmalloc/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/dtrace/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/dtrace_test/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/dtraceall/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/dtraceall/dtraceall.c#1 branch
.. //depot/projects/vap/sys/modules/dtrace/fasttrap/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/fbt/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/lockstat/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/profile/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/prototype/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/sdt/Makefile#1 branch
.. //depot/projects/vap/sys/modules/dtrace/systrace/Makefile#1 branch
.. //depot/projects/vap/sys/modules/ixgbe/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/opensolaris/Makefile#1 branch
.. //depot/projects/vap/sys/net/ethernet.h#5 integrate
.. //depot/projects/vap/sys/net/if.c#13 integrate
.. //depot/projects/vap/sys/netipsec/ipsec.h#6 integrate
.. //depot/projects/vap/sys/netipsec/ipsec_osdep.h#5 delete
.. //depot/projects/vap/sys/nfsclient/bootp_subr.c#7 integrate
.. //depot/projects/vap/sys/pc98/conf/GENERIC#13 integrate
.. //depot/projects/vap/sys/pci/intpm.c#6 integrate
.. //depot/projects/vap/sys/powerpc/booke/pmap.c#3 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/genassym.c#7 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/mmu_if.m#3 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/pmap_dispatch.c#5 integrate
.. //depot/projects/vap/sys/sparc64/conf/GENERIC#14 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/pmap.c#9 integrate
.. //depot/projects/vap/sys/sun4v/sun4v/pmap.c#5 integrate
.. //depot/projects/vap/sys/sys/_lock.h#6 integrate
.. //depot/projects/vap/sys/sys/_lockmgr.h#2 integrate
.. //depot/projects/vap/sys/sys/_mutex.h#5 integrate
.. //depot/projects/vap/sys/sys/_rwlock.h#3 integrate
.. //depot/projects/vap/sys/sys/_sx.h#3 integrate
.. //depot/projects/vap/sys/sys/dtrace_bsd.h#1 branch
.. //depot/projects/vap/sys/sys/lock.h#8 integrate
.. //depot/projects/vap/sys/sys/lockmgr.h#13 integrate
.. //depot/projects/vap/sys/sys/mutex.h#6 integrate
.. //depot/projects/vap/sys/sys/param.h#21 integrate
.. //depot/projects/vap/sys/sys/proc.h#17 integrate
.. //depot/projects/vap/sys/sys/rwlock.h#7 integrate
.. //depot/projects/vap/sys/sys/sdt.h#1 branch
.. //depot/projects/vap/sys/sys/socketvar.h#10 integrate
.. //depot/projects/vap/sys/vm/device_pager.c#5 integrate
.. //depot/projects/vap/sys/vm/pmap.h#7 integrate
.. //depot/projects/vap/sys/vm/vm_mmap.c#10 integrate
.. //depot/projects/vap/sys/vm/vm_page.c#10 integrate
.. //depot/projects/vap/tools/regression/aio/aiop/aiop.c#2 integrate
.. //depot/projects/vap/tools/regression/bin/sh/builtins/lineno.0#1 branch
.. //depot/projects/vap/tools/regression/bin/sh/builtins/lineno.0.stdout#1 branch
.. //depot/projects/vap/tools/regression/doat/Makefile#1 branch
.. //depot/projects/vap/tools/regression/doat/README#1 branch
.. //depot/projects/vap/tools/regression/doat/doat.c#1 branch
.. //depot/projects/vap/tools/test/README#3 integrate
.. //depot/projects/vap/tools/test/dtrace/Makefile#1 branch
.. //depot/projects/vap/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#3 integrate
.. //depot/projects/vap/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#3 integrate
.. //depot/projects/vap/usr.bin/calendar/calendars/calendar.freebsd#8 integrate
.. //depot/projects/vap/usr.bin/cksum/cksum.c#3 integrate
.. //depot/projects/vap/usr.bin/getopt/README#3 delete
.. //depot/projects/vap/usr.bin/getopt/getopt.c#3 integrate
.. //depot/projects/vap/usr.bin/ldd/ldd.1#3 integrate
.. //depot/projects/vap/usr.bin/netstat/inet.c#4 integrate
.. //depot/projects/vap/usr.bin/netstat/main.c#4 integrate
.. //depot/projects/vap/usr.bin/netstat/netstat.1#3 integrate
.. //depot/projects/vap/usr.bin/netstat/netstat.h#5 integrate
.. //depot/projects/vap/usr.bin/tar/Makefile#5 integrate
.. //depot/projects/vap/usr.bin/tar/bsdtar.1#7 integrate
.. //depot/projects/vap/usr.bin/tar/bsdtar.c#7 integrate
.. //depot/projects/vap/usr.bin/tar/bsdtar.h#5 integrate
.. //depot/projects/vap/usr.bin/tar/read.c#5 integrate
.. //depot/projects/vap/usr.bin/tar/siginfo.c#1 branch
.. //depot/projects/vap/usr.bin/tar/write.c#6 integrate
.. //depot/projects/vap/usr.bin/truss/Makefile#5 integrate
.. //depot/projects/vap/usr.bin/truss/amd64-fbsd32.c#1 branch
.. //depot/projects/vap/usr.bin/truss/amd64-linux32.c#1 branch
.. //depot/projects/vap/usr.bin/truss/amd64linux32.conf#1 branch
.. //depot/projects/vap/usr.bin/truss/extern.h#3 integrate
.. //depot/projects/vap/usr.bin/truss/fbsd32.conf#1 branch
.. //depot/projects/vap/usr.bin/truss/main.c#3 integrate
.. //depot/projects/vap/usr.bin/xstr/xstr.c#3 integrate
.. //depot/projects/vap/usr.sbin/fifolog/fifolog_create/fifolog_create.c#2 integrate
.. //depot/projects/vap/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#3 integrate
.. //depot/projects/vap/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#2 integrate
.. //depot/projects/vap/usr.sbin/moused/moused.8#3 integrate
.. //depot/projects/vap/usr.sbin/moused/moused.c#4 integrate
.. //depot/projects/vap/usr.sbin/portsnap/portsnap/portsnap.sh#3 integrate
.. //depot/projects/vap/usr.sbin/pstat/pstat.c#3 integrate
.. //depot/projects/vap/usr.sbin/syslogd/syslogd.8#3 integrate
.. //depot/projects/vap/usr.sbin/syslogd/syslogd.c#5 integrate
Differences ...
==== //depot/projects/vap/bin/sh/expand.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.52 2008/04/28 07:26:34 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.53 2008/05/15 19:55:27 stefanf Exp $");
#include <sys/types.h>
#include <sys/time.h>
@@ -638,7 +638,13 @@
special = 1;
p = strchr(p, '=') + 1;
again: /* jump here after setting a variable with ${var=text} */
- if (special) {
+ if (varflags & VSLINENO) {
+ set = 1;
+ special = 0;
+ val = var;
+ p[-1] = '\0'; /* temporarily overwrite '=' to have \0
+ terminated string */
+ } else if (special) {
set = varisset(var, varflags & VSNUL);
val = NULL;
} else {
@@ -768,6 +774,7 @@
default:
abort();
}
+ p[-1] = '='; /* recover overwritten '=' */
if (subtype != VSNORMAL) { /* skip to end of alternative */
int nesting = 1;
==== //depot/projects/vap/bin/sh/parser.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.58 2006/11/05 18:36:05 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.59 2008/05/15 19:55:27 stefanf Exp $");
#include <stdlib.h>
#include <unistd.h>
@@ -94,6 +94,7 @@
STATIC struct heredoc *heredoc;
STATIC int quoteflag; /* set if (part of) last token was quoted */
STATIC int startlinno; /* line # where last token started */
+STATIC int funclinno; /* line # where the current function started */
/* XXX When 'noaliases' is set to one, no alias expansion takes place. */
static int noaliases = 0;
@@ -567,12 +568,14 @@
/* We have a function */
if (readtoken() != TRP)
synexpect(TRP);
+ funclinno = plinno;
#ifdef notdef
if (! goodname(n->narg.text))
synerror("Bad function name");
#endif
n->type = NDEFUN;
n->narg.next = command();
+ funclinno = 0;
goto checkneg;
} else {
tokpushback++;
@@ -1176,12 +1179,15 @@
*/
parsesub: {
+ char buf[10];
int subtype;
int typeloc;
int flags;
char *p;
static const char types[] = "}-+?=";
- int bracketed_name = 0; /* used to handle ${[0-9]*} variables */
+ int bracketed_name = 0; /* used to handle ${[0-9]*} variables */
+ int i;
+ int linno;
c = pgetc();
if (c != '(' && c != '{' && (is_eof(c) || !is_name(c)) &&
@@ -1200,6 +1206,7 @@
typeloc = out - stackblock();
USTPUTC(VSNORMAL, out);
subtype = VSNORMAL;
+ flags = 0;
if (c == '{') {
bracketed_name = 1;
c = pgetc();
@@ -1213,10 +1220,23 @@
subtype = 0;
}
if (!is_eof(c) && is_name(c)) {
+ p = out;
do {
STPUTC(c, out);
c = pgetc();
} while (!is_eof(c) && is_in_name(c));
+ if (out - p == 6 && strncmp(p, "LINENO", 6) == 0) {
+ /* Replace the variable name with the
+ * current line number. */
+ linno = plinno;
+ if (funclinno != 0)
+ linno -= funclinno - 1;
+ snprintf(buf, sizeof(buf), "%d", linno);
+ STADJUST(-6, out);
+ for (i = 0; buf[i] != '\0'; i++)
+ STPUTC(buf[i], out);
+ flags |= VSLINENO;
+ }
} else if (is_digit(c)) {
if (bracketed_name) {
do {
@@ -1239,11 +1259,10 @@
c = pgetc();
}
}
- flags = 0;
if (subtype == 0) {
switch (c) {
case ':':
- flags = VSNUL;
+ flags |= VSNUL;
c = pgetc();
/*FALLTHROUGH*/
default:
==== //depot/projects/vap/bin/sh/parser.h#3 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)parser.h 8.3 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/parser.h,v 1.11 2006/11/05 18:36:05 stefanf Exp $
+ * $FreeBSD: src/bin/sh/parser.h,v 1.12 2008/05/15 19:55:27 stefanf Exp $
*/
/* control characters in argument strings */
@@ -45,9 +45,11 @@
#define CTLQUOTEMARK '\210'
/* variable substitution byte (follows CTLVAR) */
-#define VSTYPE 0x0f /* type of variable substitution */
-#define VSNUL 0x10 /* colon--treat the empty string as unset */
-#define VSQUOTE 0x80 /* inside double quotes--suppress splitting */
+#define VSTYPE 0x0f /* type of variable substitution */
+#define VSNUL 0x10 /* colon--treat the empty string as unset */
+#define VSLINENO 0x20 /* expansion of $LINENO, the line number \
+ follows immediately */
+#define VSQUOTE 0x80 /* inside double quotes--suppress splitting */
/* values of VSTYPE field */
#define VSNORMAL 0x1 /* normal variable: $var or ${var} */
==== //depot/projects/vap/etc/defaults/rc.conf#13 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.334 2008/05/03 07:06:48 brooks Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.335 2008/05/15 01:06:10 brooks Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -103,7 +103,7 @@
#dhclient_flags_fxp0="" # Extra dhclient flags for fxp0 only
background_dhclient="NO" # Start dhcp client in the background.
#background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background.
-synchronous_dhclient="YES" # Start dhclient directly on configured
+synchronous_dhclient="NO" # Start dhclient directly on configured
# interfaces during startup.
wpa_supplicant_program="/usr/sbin/wpa_supplicant"
wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant
@@ -178,6 +178,7 @@
icmp_drop_redirect="NO" # Set to YES to ignore ICMP REDIRECT packets
icmp_log_redirect="NO" # Set to YES to log ICMP REDIRECT packets
network_interfaces="auto" # List of network interfaces (or "auto").
+if_up_delay="30" # Time to wait for interfaces to come up.
cloned_interfaces="" # List of cloned network interfaces to create.
#cloned_interfaces="gif0 gif1 gif2 gif3" # Pre-cloning GENERIC config.
ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration.
==== //depot/projects/vap/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.185 2008/04/30 16:29:15 brooks Exp $
+# $FreeBSD: src/etc/network.subr,v 1.188 2008/05/15 01:06:09 brooks Exp $
#
#
@@ -46,7 +46,7 @@
ifconfig_up ${ifn} && cfg=0
ipv4_up ${ifn} && cfg=0
ipx_up ${ifn} && cfg=0
- childif_create ${ifn} && cfg=0
+ childif_create ${ifn}
if [ "$cfg" -eq 0 ]; then
ifconfig ${ifn}
@@ -71,7 +71,7 @@
ipv4_down ${ifn} && cfg=0
ifconfig_down ${ifn} && cfg=0
ifscript_down ${ifn} && cfg=0
- childif_destroy ${ifn} && cfg=0
+ childif_destroy ${ifn}
if [ "$cfg" -eq 0 ]; then
echo -n " ${ifn}"
@@ -532,7 +532,7 @@
ifn_start $child
done
- return
+ return ${cfg}
}
# Destroy child interfaces.
@@ -768,6 +768,29 @@
return 0
}
+# get_default_if -address_family
+# Get the interface of the default route for the given address family.
+# The -address_family argument must be suitable passing to route(8).
+#
+get_default_if()
+{
+ routeget="`route -n get $1 default 2>/dev/null`"
+ oldifs="$IFS"
+ IFS="
+"
+ defif=
+ for line in $routeget ; do
+ case $line in
+ *interface:*)
+ defif=${line##*: }
+ ;;
+ esac
+ done
+ IFS=${oldifs}
+
+ echo $defif
+}
+
hexdigit()
{
if [ $1 -lt 10 ]; then
==== //depot/projects/vap/etc/portsnap.conf#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/portsnap.conf,v 1.3 2006/01/18 03:40:57 cperciva Exp $
+# $FreeBSD: src/etc/portsnap.conf,v 1.4 2008/05/17 16:26:27 cperciva Exp $
# Default directory where compressed snapshots are stored.
# WORKDIR=/var/db/portsnap
@@ -28,3 +28,8 @@
#
# REFUSE arabic chinese french german hebrew hungarian japanese
# REFUSE korean polish portuguese russian ukrainian vietnamese
+
+# List of INDEX files to build and the DESCRIBE file to use for each
+INDEX INDEX-5 DESCRIBE.5
+INDEX INDEX-6 DESCRIBE.6
+INDEX INDEX-7 DESCRIBE.7
==== //depot/projects/vap/etc/rc.d/netif#8 (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.26 2008/04/20 20:37:20 sam Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.28 2008/05/18 02:57:54 brooks Exp $
#
# PROVIDE: netif
==== //depot/projects/vap/etc/rc.d/ntpd#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ntpd,v 1.13 2006/04/18 15:02:24 flz Exp $
+# $FreeBSD: src/etc/rc.d/ntpd,v 1.14 2008/05/12 11:49:16 flz Exp $
#
# PROVIDE: ntpd
@@ -18,8 +18,6 @@
load_rc_config $name
-required_files="${ntpd_config}"
-
ntpd_precmd()
{
rc_flags="-c ${ntpd_config} ${ntpd_flags}"
==== //depot/projects/vap/etc/rc.d/routing#3 (text+ko) ====
@@ -2,14 +2,15 @@
#
# Configure routing and miscellaneous network tunables
#
-# $FreeBSD: src/etc/rc.d/routing,v 1.143 2007/05/02 15:49:30 mtm Exp $
+# $FreeBSD: src/etc/rc.d/routing,v 1.144 2008/05/18 02:57:54 brooks Exp $
#
# PROVIDE: routing
-# REQUIRE: netif ppp
+# REQUIRE: devd netif ppp
# KEYWORD: nojail
. /etc/rc.subr
+. /etc/network.subr
name="routing"
start_cmd="routing_start"
@@ -22,6 +23,31 @@
{
static_start
options_start
+
+ # Return without waiting if we don't have dhcp interfaces.
+ # Once we can test that the link is actually up, we should
+ # remove this test and always wait.
+ dhcp_interfaces=`list_net_interfaces dhcp`
+ [ -z "`list_net_interfaces dhcp`" ] && return
+
+ # Wait for a default route
+ delay=${if_up_delay}
+ while [ ${delay} -gt 0 ]; do
+ defif=`get_default_if -inet`
+ if [ -n "${defif}" ]; then
+ if [ ${delay} -ne ${if_up_delay} ]; then
+ echo "($defif)"
+ fi
+ break
+ fi
+ if [ ${delay} -eq ${if_up_delay} ]; then
+ echo -n "Waiting ${delay}s for an interface to come up: "
+ else
+ echo -n .
+ fi
+ sleep 1
+ delay=`expr $delay - 1`
+ done
}
routing_stop()
==== //depot/projects/vap/etc/rc.initdiskless#3 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.initdiskless,v 1.52 2006/12/03 23:50:29 luigi Exp $
+# $FreeBSD: src/etc/rc.initdiskless,v 1.53 2008/05/15 11:00:23 bms Exp $
# On entry to this script the entire system consists of a read-only root
# mounted via NFS. The kernel has run BOOTP and configured an interface
@@ -69,6 +69,10 @@
# /conf/1.2.3.4/foo/remount contains "mount -o ro /dev/ad0s3",
# then /dev/ad0s3 will be be mounted on /conf/1.2.3.4/foo/
#
+# /conf/T/M/remount_optional
+# If this file exists, then failure to execute the mount
+# command contained in /conf/T/M/remount is non-fatal.
+#
# /conf/T/M/diskless_remount
# The contents of the file points to an NFS filesystem,
# possibly followed by mount_nfs options. If the server name
@@ -147,8 +151,12 @@
#
# checks error code and drops into shell on failure.
# if shell exits, terminates script as well as /etc/rc.
+# if remount_optional exists under the mountpoint, skip this check.
#
chkerr() {
+ lastitem () ( n=$(($# - 1)) ; shift $n ; echo $1 )
+ mountpoint="$(lastitem $2)"
+ [ -r $mountpoint/remount_optional ] && ( echo "$2 failed: ignoring due to remount_optional" ; return )
case $1 in
0)
;;
==== //depot/projects/vap/gnu/usr.bin/man/TODO#3 (text+ko) ====
@@ -1,3 +1,5 @@
+$FreeBSD: src/gnu/usr.bin/man/TODO,v 1.2 2008/05/14 17:08:31 ru Exp $
+
Things that would be nice but aren't really necessary:
0. Update the documentation.
@@ -105,7 +107,7 @@
file names used by Motif. Maybe there's a better way to handle
this?
-15. Add ability to run man on a local file
+XX Add ability to run man on a local file
16. Handle per-tree tmac macros
==== //depot/projects/vap/gnu/usr.bin/man/lib/util.c#3 (text+ko) ====
@@ -14,6 +14,8 @@
* Austin, Texas 78712
*/
+/* $FreeBSD: src/gnu/usr.bin/man/lib/util.c,v 1.9 2008/05/14 17:08:31 ru Exp $ */
+
#include <stdio.h>
#include <string.h>
#include <ctype.h>
@@ -120,6 +122,24 @@
}
/*
+ * Is path a regular file?
+ */
+int
+is_file (path)
+ char *path;
+{
+ struct stat sb;
+ register int status;
+
+ status = stat (path, &sb);
+
+ if (status != 0)
+ return -1;
+
+ return ((sb.st_mode & S_IFREG) == S_IFREG);
+}
+
+/*
* Attempt a system () call. Return 1 for success and 0 for failure
* (handy for counting successes :-).
*/
==== //depot/projects/vap/gnu/usr.bin/man/man/man.c#4 (text+ko) ====
@@ -16,7 +16,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.66 2008/02/19 07:09:17 ru Exp $";
+ "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.68 2008/05/14 17:18:12 ru Exp $";
#endif /* not lint */
#define MAN_MAIN
@@ -30,6 +30,7 @@
#ifdef __FreeBSD__
#include <locale.h>
#include <langinfo.h>
+#include <libgen.h>
#endif
#include <stdio.h>
#include <string.h>
@@ -70,6 +71,7 @@
extern char **glob_filename ();
extern int is_newer ();
extern int is_directory ();
+extern int is_file ();
extern int do_system_command ();
char *prognam;
@@ -87,6 +89,7 @@
static int whatis;
static int findall;
static int print_where;
+static char *ultimate_source ();
#ifdef __FreeBSD__
static char *locale, *locale_opts, *locale_nroff, *locale_codeset;
@@ -201,6 +204,11 @@
do_whatis (nextarg);
status = (status ? 0 : 1); /* reverts status, see below */
}
+ else if (strchr (nextarg, '/') != NULL && is_file (nextarg) == 1)
+ {
+ format_and_display (NULL, ultimate_source(nextarg, dirname(nextarg)),
+ NULL);
+ }
else
{
status = man (nextarg);
@@ -825,7 +833,7 @@
return YCAT;
#endif /* YCAT */
#ifdef ZCAT
- if (*end == 'Z' || !strcmp(end, "gz"))
+ if (*end == 'Z' || !strcmp(end, "gz") || !strcmp(end, "bz2"))
return ZCAT;
#endif /* ZCAT */
return NULL;
@@ -1409,13 +1417,15 @@
if (access (man_file, R_OK) != 0)
return 0;
- if (troff)
+ if (troff || path == NULL)
{
roff_command = make_roff_command (man_file);
if (roff_command == NULL)
return 0;
+ if (troff)
+ snprintf (command, sizeof(command), "(cd %s ; %s)", path, roff_command);
else
- snprintf (command, sizeof(command), "(cd %s ; %s)", path, roff_command);
+ snprintf (command, sizeof(command), "%s | %s", roff_command, pager);
found = do_system_command (command);
}
==== //depot/projects/vap/include/gssapi/gssapi.h#4 (text+ko) ====
@@ -25,7 +25,7 @@
* HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD: src/include/gssapi/gssapi.h,v 1.2 2008/05/07 13:53:02 dfr Exp $
+ * $FreeBSD: src/include/gssapi/gssapi.h,v 1.4 2008/05/16 02:06:10 dfr Exp $
*/
#ifndef _GSSAPI_GSSAPI_H_
@@ -89,6 +89,7 @@
*/
typedef gss_uint32 OM_uint32;
+typedef uint64_t OM_uint64;
typedef struct gss_OID_desc_struct {
OM_uint32 length;
@@ -419,6 +420,8 @@
#define GSS_S_GAP_TOKEN \
(1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 4))
+__BEGIN_DECLS
+
/*
* Finally, function prototypes for the GSS-API routines.
*/
@@ -834,4 +837,6 @@
gss_buffer_t /* buffer for result */
);
+__END_DECLS
+
#endif /* _GSSAPI_GSSAPI_H_ */
==== //depot/projects/vap/kerberos5/lib/libkrb5/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.20 2008/05/11 10:32:37 dfr Exp $
+# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.21 2008/05/15 08:53:31 dfr Exp $
LIB= krb5
VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
@@ -372,6 +372,8 @@
SRCS+= heim_err.c \
heim_err.h \
+ hx509_err.c \
+ hx509_err.h \
k524_err.c \
k524_err.h \
krb5_err.c \
==== //depot/projects/vap/lib/libc/stdlib/rb.h#3 (text+ko) ====
@@ -29,10 +29,21 @@
*
******************************************************************************
*
- * cpp macro implementation of left-leaning red-black trees. All operations
- * are done non-recursively. Parent pointers are not used, and color bits are
- * stored in the least significant bit of right-child pointers, thus making
- * node linkage as compact as is possible for red-black trees.
+ * cpp macro implementation of left-leaning red-black trees.
+ *
+ * Usage:
+ *
+ * (Optional, see assert(3).)
+ * #define NDEBUG
+ *
+ * (Required.)
+ * #include <assert.h>
+ * #include <rb.h>
+ * ...
+ *
+ * All operations are done non-recursively. Parent pointers are not used, and
+ * color bits are stored in the least significant bit of right-child pointers,
+ * thus making node linkage as compact as is possible for red-black trees.
*
* Some macros use a comparison function pointer, which is expected to have the
* following prototype:
@@ -53,12 +64,12 @@
*
******************************************************************************/
+#ifndef RB_H_
+#define RB_H_
+
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/rb.h,v 1.3 2008/05/03 17:49:16 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/rb.h,v 1.4 2008/05/14 18:33:13 jasone Exp $");
-/* To disable assertions, #define NDEBUG before #include'ing rb.h. */
-#include <assert.h>
-
/* Node structure. */
#define rb_node(a_type) \
struct { \
@@ -756,7 +767,7 @@
* effort.
*/
-#define rb_foreach_begin(a_type, a_field, a_tree, a_var) { \
+#define rb_foreach_begin(a_type, a_field, a_tree, a_var) { \
/* Compute the maximum possible tree depth (3X the black height). */\
unsigned rbp_f_height; \
rbp_black_height(a_type, a_field, a_tree, rbp_f_height); \
@@ -932,3 +943,5 @@
} \
} \
}
+
+#endif /* RB_H_ */
==== //depot/projects/vap/lib/libc/stdtime/strftime.3#3 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)strftime.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.39 2007/01/09 00:28:11 imp Exp $
+.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.40 2008/05/16 04:33:04 grog Exp $
.\"
.Dd November 4, 2004
.Dt STRFTIME 3
@@ -154,9 +154,9 @@
.Cm %E* .
.It Cm %p
is replaced by national representation of either
-"ante meridiem"
+"ante meridiem" (a.m.)
or
-"post meridiem"
+"post meridiem" (p.m.)
as appropriate.
.It Cm \&%R
is equivalent to
==== //depot/projects/vap/lib/libpam/modules/pam_ksu/Makefile#3 (text+ko) ====
@@ -22,13 +22,13 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/lib/libpam/modules/pam_ksu/Makefile,v 1.6 2004/08/06 07:27:04 cperciva Exp $
+# $FreeBSD: src/lib/libpam/modules/pam_ksu/Makefile,v 1.7 2008/05/15 15:28:18 dfr Exp $
LIB= pam_ksu
SRCS= pam_ksu.c
MAN= pam_ksu.8
-DPADD= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO}
-LDADD= -lkrb5 -lasn1 -lroken -lcom_err -lcrypt -lcrypto
+DPADD= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO}
+LDADD= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto
.include <bsd.lib.mk>
==== //depot/projects/vap/libexec/rtld-elf/rtld.1#3 (text+ko) ====
@@ -26,9 +26,9 @@
.\" (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/libexec/rtld-elf/rtld.1,v 1.46 2007/05/17 19:14:25 csjp Exp $
+.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.47 2008/05/15 10:47:14 bms Exp $
.\"
-.Dd March 27, 2006
+.Dd May 15, 2008
.Dt RTLD 1
.Os
.Sh NAME
@@ -174,7 +174,10 @@
.Dq __progname ) .
.It Li \&%A
The value of the environment variable
-.Ev LD_TRACE_LOADED_OBJECTS_PROGNAME
+.Ev LD_TRACE_LOADED_OBJECTS_PROGNAME .
+Typically used to print both the names of programs and shared libraries
+being inspected using
+.Xr ldd 1 .
.It Li %o
The library name.
.It Li %p
==== //depot/projects/vap/release/pc98/fixit-small_crunch.conf#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.9 2007/05/22 11:32:55 nyan Exp $
+# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.10 2008/05/13 11:51:19 nyan Exp $
buildopts -DRELEASE_CRUNCH
@@ -9,6 +9,7 @@
progs dd
progs df
progs echo
+progs ed
progs expr
progs kill
progs ln
@@ -37,9 +38,7 @@
special fdisk srcdir /usr/src/sbin/fdisk_pc98
srcdirs /usr/src/usr.bin
-progs ee
progs ftp
-ln ee edit
srcdirs /usr/src/usr.sbin
progs chown
==== //depot/projects/vap/sbin/atacontrol/atacontrol.c#5 (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/sbin/atacontrol/atacontrol.c,v 1.47 2008/03/17 10:33:23 phk Exp $
+ * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.48 2008/05/15 01:25:29 phk Exp $
*/
#include <sys/types.h>
@@ -265,9 +265,11 @@
devices.channel = channel;
- if (ioctl(fd, IOCATADEVICES, &devices) < 0)
- err(1, "ioctl(IOCATADEVICES)");
-
+ if (ioctl(fd, IOCATADEVICES, &devices) < 0) {
+ if (!prchan)
+ err(1, "ioctl(IOCATADEVICES)");
+ return;
+ }
if (prchan)
printf("ATA channel %d:\n", channel);
printf("%sMaster: ", prchan ? " " : "");
==== //depot/projects/vap/share/man/man4/iwn.4#4 (text+ko) ====
@@ -23,14 +23,14 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.19 2007/11/13 16:42:22 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.2 2008/05/12 08:53:02 brueffer Exp $
.\"
-.Dd Apri 13, 2008
+.Dd April 13, 2008
.Os
.Dt IWN 4
.Sh NAME
.Nm iwn
-.Nd "Intel Wireless WiFI Link 4965AGN IEEE 802.11n driver"
+.Nd "Intel Wireless WiFi Link 4965AGN IEEE 802.11n driver"
.Sh SYNOPSIS
To compile this driver into the kernel,
include the following lines in your
@@ -61,7 +61,7 @@
.Nm
driver provides support for
.Tn Intel
-Wireless WiFI Link 4965AGN PCI-Express network adapters.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list