Date: Tue, 13 Apr 2010 21:25:03 GMT From: Rafal Jaworowski <raj@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 176879 for review Message-ID: <201004132125.o3DLP3I6005691@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@176879?ac=10 Change 176879 by raj@raj_fdt on 2010/04/13 21:24:41 IFC @176878 Affected files ... .. //depot/projects/fdt/MAINTAINERS#6 integrate .. //depot/projects/fdt/bin/ps/ps.1#4 integrate .. //depot/projects/fdt/bin/sh/mksyntax.c#4 integrate .. //depot/projects/fdt/bin/sh/parser.c#8 integrate .. //depot/projects/fdt/crypto/openssh/sshd.c#5 integrate .. //depot/projects/fdt/etc/defaults/rc.conf#9 integrate .. //depot/projects/fdt/etc/network.subr#4 integrate .. //depot/projects/fdt/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/fdt/etc/rc.d/netif#2 integrate .. //depot/projects/fdt/etc/rc.d/netoptions#2 integrate .. //depot/projects/fdt/etc/rc.d/ubthidhci#1 branch .. //depot/projects/fdt/etc/rc.firewall#6 integrate .. //depot/projects/fdt/gnu/usr.bin/gdb/Makefile#4 integrate .. //depot/projects/fdt/lib/libc/softfloat/softfloat-specialize#2 integrate .. //depot/projects/fdt/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/fdt/release/Makefile#3 integrate .. //depot/projects/fdt/release/Makefile.inc.docports#2 integrate .. //depot/projects/fdt/sbin/geom/class/Makefile#3 integrate .. //depot/projects/fdt/sbin/geom/class/sched/Makefile#1 branch .. //depot/projects/fdt/sbin/geom/class/sched/geom_sched.c#1 branch .. //depot/projects/fdt/sbin/geom/class/sched/gsched.8#1 branch .. //depot/projects/fdt/sbin/ipfw/main.c#3 integrate .. //depot/projects/fdt/share/man/man4/splash.4#2 integrate .. //depot/projects/fdt/share/man/man5/rc.conf.5#8 integrate .. //depot/projects/fdt/share/man/man9/stack.9#2 integrate .. //depot/projects/fdt/share/misc/committers-ports.dot#5 integrate .. //depot/projects/fdt/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/fdt/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/fdt/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/fdt/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/fdt/sys/amd64/include/md_var.h#4 integrate .. //depot/projects/fdt/sys/arm/include/bus.h#3 integrate .. //depot/projects/fdt/sys/boot/i386/efi/Makefile#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/autoload.c#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/bootinfo.c#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/conf.c#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/devicename.c#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/efimd.c#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/elf32_freebsd.c#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/exec.c#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/i386_copy.c#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/ldscript.amd64#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/ldscript.i386#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/main.c#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/reloc.c#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/start.S#1 branch .. //depot/projects/fdt/sys/boot/i386/efi/version#1 branch .. //depot/projects/fdt/sys/conf/files#23 integrate .. //depot/projects/fdt/sys/conf/files.sparc64#4 integrate .. //depot/projects/fdt/sys/contrib/dev/iwn/LICENSE#2 integrate .. //depot/projects/fdt/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#2 delete .. //depot/projects/fdt/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu#1 branch .. //depot/projects/fdt/sys/dev/aac/aac.c#7 integrate .. //depot/projects/fdt/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/fdt/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/fdt/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/fdt/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/fdt/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/fdt/sys/dev/aac/aacreg.h#4 integrate .. //depot/projects/fdt/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/fdt/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#3 integrate .. //depot/projects/fdt/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/fdt/sys/dev/bwi/if_bwi.c#4 integrate .. //depot/projects/fdt/sys/dev/e1000/if_em.c#9 integrate .. //depot/projects/fdt/sys/dev/e1000/if_em.h#6 integrate .. //depot/projects/fdt/sys/dev/e1000/if_igb.c#10 integrate .. //depot/projects/fdt/sys/dev/fb/vesa.c#9 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwn.c#7 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwnreg.h#4 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwnvar.h#5 integrate .. //depot/projects/fdt/sys/dev/mii/miidevs#7 integrate .. //depot/projects/fdt/sys/dev/mii/truephy.c#2 integrate .. //depot/projects/fdt/sys/dev/msk/if_msk.c#8 integrate .. //depot/projects/fdt/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/fdt/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/fdt/sys/dev/re/if_re.c#6 integrate .. //depot/projects/fdt/sys/dev/syscons/logo/beastie.c#1 branch .. //depot/projects/fdt/sys/dev/syscons/logo/logo.c#2 integrate .. //depot/projects/fdt/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/fdt/sys/dev/uart/uart.h#2 integrate .. //depot/projects/fdt/sys/dev/uart/uart_cpu_sparc64.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/serial/u3g.c#9 integrate .. //depot/projects/fdt/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_run.c#4 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_urtw.c#5 integrate .. //depot/projects/fdt/sys/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/fdt/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/fdt/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs.h#2 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs_ioctl.c#2 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs_mount.h#2 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs_node.h#2 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs_subr.h#2 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/fdt/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/fdt/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/fdt/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/fdt/sys/fs/smbfs/smbfs_node.h#2 integrate .. //depot/projects/fdt/sys/fs/smbfs/smbfs_smb.c#3 integrate .. //depot/projects/fdt/sys/fs/smbfs/smbfs_subr.c#2 integrate .. //depot/projects/fdt/sys/fs/smbfs/smbfs_subr.h#2 integrate .. //depot/projects/fdt/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/fdt/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/fdt/sys/geom/sched/README#1 branch .. //depot/projects/fdt/sys/geom/sched/g_sched.c#1 branch .. //depot/projects/fdt/sys/geom/sched/g_sched.h#1 branch .. //depot/projects/fdt/sys/geom/sched/gs_rr.c#1 branch .. //depot/projects/fdt/sys/geom/sched/gs_scheduler.h#1 branch .. //depot/projects/fdt/sys/geom/sched/subr_disk.c#1 branch .. //depot/projects/fdt/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/fdt/sys/i386/i386/mpboot.s#2 integrate .. //depot/projects/fdt/sys/i386/i386/trap.c#6 integrate .. //depot/projects/fdt/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/mp_machdep.c#6 integrate .. //depot/projects/fdt/sys/ia64/include/pal.h#2 integrate .. //depot/projects/fdt/sys/kern/init_main.c#3 integrate .. //depot/projects/fdt/sys/kern/kern_clock.c#3 integrate .. //depot/projects/fdt/sys/kern/tty_pts.c#5 integrate .. //depot/projects/fdt/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/fdt/sys/libkern/iconv.c#2 integrate .. //depot/projects/fdt/sys/libkern/iconv_converter_if.m#2 integrate .. //depot/projects/fdt/sys/libkern/iconv_xlat.c#2 integrate .. //depot/projects/fdt/sys/libkern/strcasecmp.c#2 integrate .. //depot/projects/fdt/sys/mips/atheros/if_arge.c#2 integrate .. //depot/projects/fdt/sys/mips/include/bus.h#4 integrate .. //depot/projects/fdt/sys/mips/mips/busdma_machdep.c#5 integrate .. //depot/projects/fdt/sys/modules/Makefile#9 integrate .. //depot/projects/fdt/sys/modules/geom/Makefile#3 integrate .. //depot/projects/fdt/sys/modules/geom/geom_sched/Makefile#1 branch .. //depot/projects/fdt/sys/modules/geom/geom_sched/Makefile.inc#1 branch .. //depot/projects/fdt/sys/modules/geom/geom_sched/gs_sched/Makefile#1 branch .. //depot/projects/fdt/sys/modules/geom/geom_sched/gsched_rr/Makefile#1 branch .. //depot/projects/fdt/sys/modules/iwnfw/iwn6000/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/syscons/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/syscons/beastie/Makefile#1 branch .. //depot/projects/fdt/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/fdt/sys/net/if.c#8 integrate .. //depot/projects/fdt/sys/net/if_clone.c#2 integrate .. //depot/projects/fdt/sys/net/if_llatbl.c#5 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_amrr.c#3 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_ratectl.h#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_rssadapt.c#3 integrate .. //depot/projects/fdt/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_pipe.h#2 integrate .. //depot/projects/fdt/sys/netinet/if_ether.c#3 integrate .. //depot/projects/fdt/sys/netinet/in.c#6 integrate .. //depot/projects/fdt/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_dn_glue.c#3 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_dn_io.c#4 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_dn_private.h#3 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_dummynet.c#10 integrate .. //depot/projects/fdt/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/fdt/sys/netinet6/in6.c#3 integrate .. //depot/projects/fdt/sys/netinet6/mld6.c#4 integrate .. //depot/projects/fdt/sys/netinet6/nd6.c#7 integrate .. //depot/projects/fdt/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_file.h#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_lib.h#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_login.c#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_ncp.c#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_ncp.h#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_nls.c#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_nls.h#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_rcfile.h#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_rq.h#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_sock.h#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_subr.c#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_subr.h#2 integrate .. //depot/projects/fdt/sys/netncp/ncp_user.h#2 integrate .. //depot/projects/fdt/sys/netsmb/netbios.h#2 integrate .. //depot/projects/fdt/sys/netsmb/smb.h#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_dev.h#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_rq.h#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_smb.c#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_subr.c#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_subr.h#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_tran.h#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_trantcp.h#2 integrate .. //depot/projects/fdt/sys/netsmb/smb_usr.c#2 integrate .. //depot/projects/fdt/sys/pc98/cbus/clock.c#5 integrate .. //depot/projects/fdt/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/fdt/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/fdt/sys/sparc64/conf/NOTES#4 integrate .. //depot/projects/fdt/sys/sparc64/include/dcr.h#3 integrate .. //depot/projects/fdt/sys/sparc64/include/lsu.h#2 integrate .. //depot/projects/fdt/sys/sparc64/pci/sbbc.c#1 branch .. //depot/projects/fdt/sys/sparc64/sparc64/ofw_machdep.c#3 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/fdt/sys/sys/iconv.h#2 integrate .. //depot/projects/fdt/sys/sys/mchain.h#2 integrate .. //depot/projects/fdt/sys/vm/memguard.c#2 integrate .. //depot/projects/fdt/sys/vm/memguard.h#2 integrate .. //depot/projects/fdt/sys/vm/vm_contig.c#2 integrate .. //depot/projects/fdt/sys/vm/vm_extern.h#3 integrate .. //depot/projects/fdt/sys/vm/vm_glue.c#2 integrate .. //depot/projects/fdt/sys/x86/isa/clock.c#3 integrate .. //depot/projects/fdt/tools/regression/bin/sh/parameters/pwd1.0#1 branch .. //depot/projects/fdt/usr.bin/gzip/gzip.1#2 integrate .. //depot/projects/fdt/usr.bin/gzip/gzip.c#3 integrate .. //depot/projects/fdt/usr.bin/gzip/unbzip2.c#4 integrate .. //depot/projects/fdt/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/fdt/usr.bin/tar/bsdtar.c#3 integrate .. //depot/projects/fdt/usr.bin/tar/bsdtar_platform.h#3 integrate .. //depot/projects/fdt/usr.bin/tar/matching.c#3 integrate .. //depot/projects/fdt/usr.bin/tar/subst.c#3 integrate .. //depot/projects/fdt/usr.bin/tar/tree.h#2 integrate .. //depot/projects/fdt/usr.bin/tar/write.c#3 integrate .. //depot/projects/fdt/usr.bin/xlint/lint1/decl.c#2 integrate .. //depot/projects/fdt/usr.bin/xlint/lint1/lint1.h#2 integrate .. //depot/projects/fdt/usr.bin/xlint/lint1/mem1.c#2 integrate .. //depot/projects/fdt/usr.sbin/lastlogin/lastlogin.8#3 integrate .. //depot/projects/fdt/usr.sbin/lastlogin/lastlogin.c#7 integrate .. //depot/projects/fdt/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/fdt/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate .. //depot/projects/fdt/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#2 integrate Differences ... ==== //depot/projects/fdt/MAINTAINERS#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.160 2010/03/26 12:59:15 des Exp $ +$FreeBSD: src/MAINTAINERS,v 1.162 2010/04/10 12:29:09 bms Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -123,6 +123,9 @@ maintained by a third party source. lib/libc/stdtime edwin Heads-up appreciated, since parts of this code is maintained by a third party source. +sysinstall randi Please contact about any major changes so that + they can be co-ordinated. +sbin/routed bms Pre-commit review; notify vendor at rhyolite.com Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/fdt/bin/ps/ps.1#4 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.94 2010/03/17 22:57:58 jmallett Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.95 2010/04/13 08:54:53 kib Exp $ .\" -.Dd March 17, 2010 +.Dd April 13, 2010 .Dt PS 1 .Os .Sh NAME @@ -298,6 +298,7 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" +.It Dv "P_WKILLED" Ta No "0x08000 Killed, shall go to kernel/user boundary ASAP" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/fdt/bin/sh/mksyntax.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.28 2010/04/03 21:01:01 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.29 2010/04/11 12:24:47 jilles Exp $"); /* * This program creates syntax.h and syntax.c. @@ -232,6 +232,7 @@ add("\n", "CNL"); add("\\", "CBACK"); add("`", "CBQUOTE"); + add("\"", "CDQUOTE"); add("$", "CVAR"); add("}", "CENDVAR"); add("(", "CLP"); ==== //depot/projects/fdt/bin/sh/parser.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.77 2010/04/03 21:01:01 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.78 2010/04/11 12:24:47 jilles Exp $"); #include <stdlib.h> #include <unistd.h> @@ -1223,7 +1223,10 @@ if (eofmark != NULL && newvarnest == 0) USTPUTC(c, out); else { - state[level].syntax = BASESYNTAX; + if (state[level].category == TSTATE_ARITH) + state[level].syntax = ARISYNTAX; + else + state[level].syntax = BASESYNTAX; quotef++; } break; ==== //depot/projects/fdt/crypto/openssh/sshd.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.52 2010/03/09 19:16:43 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.53 2010/04/08 12:07:40 kib Exp $"); #include <sys/types.h> #include <sys/ioctl.h> @@ -1330,10 +1330,6 @@ /* Initialize configuration options to their default values. */ initialize_server_options(&options); - /* Avoid killing the process in high-pressure swapping environments. */ - if (madvise(NULL, 0, MADV_PROTECT) != 0) - debug("madvise(): %.200s", strerror(errno)); - /* Parse command-line arguments. */ while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:C:dDeiqrtQRT46")) != -1) { switch (opt) { @@ -1749,6 +1745,10 @@ /* Reinitialize the log (because of the fork above). */ log_init(__progname, options.log_level, options.log_facility, log_stderr); + /* Avoid killing the process in high-pressure swapping environments. */ + if (!inetd_flag && madvise(NULL, 0, MADV_PROTECT) != 0) + debug("madvise(): %.200s", strerror(errno)); + /* Initialize the random number generator. */ arc4random_stir(); ==== //depot/projects/fdt/etc/defaults/rc.conf#9 (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.371 2010/03/05 14:34:33 netchild Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.373 2010/04/09 17:32:38 rpaulo Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -210,6 +210,7 @@ ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. #ifconfig_ed0_ipx="ipx 0x00010010" # Sample IPX address family entry. +#ifconfig_ed0_ipv6="RTADV" # Sample IPv6 entry for RA/rtsol(8) #ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64" # Sample IPv6 addr entry #ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64" # Sample IPv6 alias #ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0. @@ -435,12 +436,18 @@ #rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register #rfcomm_pppd_server_two_register_dun="NO" # for 'two' +#ubthidhci_enable="YES" # Switch an USB BT controller present on +#ubthidhci_busnum="3" # bus 3 and addr 2 from HID mode to HCI mode. +#ubthidhci_addr="2" # Check usbconfig list to find the correct + # numbers for your system. + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ### IPv6 options: ### -ipv6_network_interfaces="none" # List of IPv6 network interfaces - # (or "auto" or "none"). +ipv6_network_interfaces="AUTO" # List of IPv6 network interfaces +ipv6_prefer="YES" # Use IPv6 when both IPv4 and IPv6 can be used +ipv6_privacy="NO" # Use privacy addresses with RTADV (RFC 4193) ipv6_defaultrouter="NO" # Set to IPv6 default gateway (or NO). #ipv6_defaultrouter="2002:c058:6301::" # Use this for 6to4 (RFC 3068) ipv6_static_routes="" # Set to static route list (or leave empty). @@ -499,7 +506,6 @@ # for examples ip6addrctl_enable="YES" # Set to YES to enable default address selection ip6addrctl_verbose="NO" # Set to YES to enable verbose configuration messages -ipv6_prefer="NO" # Use IPv6 when both IPv4 and IPv6 can be used ############################################################## ### System console options ################################# ==== //depot/projects/fdt/etc/network.subr#4 (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.206 2010/02/03 16:18:42 ume Exp $ +# $FreeBSD: src/etc/network.subr,v 1.207 2010/04/09 01:35:09 dougb Exp $ # # @@ -96,45 +96,33 @@ # inet6 specific if afexists inet6; then if ipv6if $1; then - if checkyesno ipv6_gateway_enable; then - _ipv6_opts="-accept_rtadv" + # Implicitly handles ipv6_gateway_enable + _ipv6_opts='-ifdisabled -accept_rtadv' + + if ipv6_autoconfif $1; then + _ipv6_opts='-ifdisabled accept_rtadv' + fi + + ifconfig $1 inet6 $_ipv6_opts + + # ifconfig_IF_ipv6 + ifconfig_args=`ifconfig_getargs $1 ipv6` + + if [ -n "$ifconfig_args" ]; then + ifconfig $1 $ifconfig_args + _cfg=0 fi else - if checkyesno ipv6_prefer; then - _ipv6_opts="-ifdisabled" - else - _ipv6_opts="ifdisabled" - fi - - # backward compatibility: $ipv6_enable - case $ipv6_enable in - [Yy][Ee][Ss]) - _ipv6_opts="${_ipv6_opts} accept_rtadv" + # Remove in FreeBSD 10.x + # Explicit test is necessary here to avoid nonexistence error + case "$ipv6_enable" in + [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + warn "Interface $1 will NOT be configured for IPv6" ;; esac - fi - if [ -n "${_ipv6_opts}" ]; then - ifconfig $1 inet6 ${_ipv6_opts} + ifconfig $1 inet6 ifdisabled fi - - # ifconfig_IF_ipv6 - ifconfig_args=`ifconfig_getargs $1 ipv6` - if [ -n "${ifconfig_args}" ]; then - ifconfig $1 inet6 -ifdisabled - ifconfig $1 ${ifconfig_args} - _cfg=0 - fi - - # backward compatiblity: $ipv6_ifconfig_IF - ifconfig_args=`get_if_var $1 ipv6_ifconfig_IF` - if [ -n "${ifconfig_args}" ]; then - warn "\$ipv6_ifconfig_$1 is obsolete." \ - " Use ifconfig_$1_ipv6 instead." - ifconfig $1 inet6 -ifdisabled - ifconfig $1 inet6 ${ifconfig_args} - _cfg=0 - fi fi if [ ${_cfg} -eq 0 ]; then @@ -194,7 +182,7 @@ # $default if given. get_if_var() { - local _if _punct _var _default prefix suffix + local _if _punct _punct_c _var _default prefix suffix if [ $# -ne 2 -a $# -ne 3 ]; then err 3 'USAGE: get_if_var name var [default]' @@ -219,7 +207,7 @@ # outside this file. _ifconfig_getargs() { - local _ifn _af + local _ifn _af value _ifn=$1 _af=${2+_$2} @@ -227,7 +215,18 @@ return 1 fi - get_if_var $_ifn ifconfig_IF$_af "$ifconfig_DEFAULT" + value=`get_if_var $_ifn ifconfig_IF$_af "$ifconfig_DEFAULT"` + + # Remove in FreeBSD 10.x + if [ "$_af" = _ipv6 -a -z "$value" ]; then + value=`get_if_var $_ifn ipv6_ifconfig_IF "$ifconfig_DEFAULT"` + if [ -n "$value" ]; then + warn "\$ipv6_ifconfig_$1 is obsolete." \ + " Use ifconfig_$1_ipv6 instead." + fi + fi + + echo $value } # ifconfig_getargs if [af] @@ -249,6 +248,8 @@ [Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;; [Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;; [Ww][Pp][Aa]) ;; + [Rr][Tt][Aa][Dd][Vv]) ;; + [Nn][Oo][Rr][Tt][Aa][Dd][Vv]) ;; *) _args="$_args $_arg" ;; @@ -372,77 +373,45 @@ esac } -# noafif if -# Returns 0 if the interface has no af configuration and 1 otherwise. -noafif() -{ - local _if - _if=$1 - - case $_if in - pflog[0-9]*|\ - pfsync[0-9]*|\ - an[0-9]*|\ - ath[0-9]*|\ - ipw[0-9]*|\ - iwi[0-9]*|\ - iwn[0-9]*|\ - ral[0-9]*|\ - wi[0-9]*|\ - wl[0-9]*|\ - wpi[0-9]*) - return 0 - ;; - esac - - return 1 -} - # ipv6if if # Returns 0 if the interface should be configured for IPv6 and # 1 otherwise. ipv6if() { - local _if _tmpargs i - _if=$1 - if ! afexists inet6; then return 1 fi # lo0 is always IPv6-enabled - case $_if in + case $1 in lo0) return 0 ;; esac - # True if $ifconfig_IF_ipv6 is defined. - _tmpargs=`_ifconfig_getargs $_if ipv6` - if [ -n "${_tmpargs}" ]; then - return 0 - fi + local _if _tmpargs i + _if=$1 - # backward compatibility: True if $ipv6_ifconfig_IF is defined. - _tmpargs=`get_if_var $_if ipv6_ifconfig_IF` - if [ -n "${_tmpargs}" ]; then - return 0 - fi - - case "${ipv6_network_interfaces}" in - [Aa][Uu][Tt][Oo]) - return 0 - ;; + case "$ipv6_network_interfaces" in ''|[Nn][Oo][Nn][Ee]) return 1 ;; + $_if|"$_if "*|*" $_if"|*" $_if "*|[Aa][Uu][Tt][Oo]) + # True if $ifconfig_IF_ipv6 is defined. + _tmpargs=`_ifconfig_getargs $_if ipv6` + ;; esac - for i in ${ipv6_network_interfaces}; do - if [ "$i" = "$_if" ]; then - return 0 - fi - done + if [ -n "$_tmpargs" ]; then + # Remove in FreeBSD 10.x + # Explicit test is necessary here to avoid nonexistence error + case "$ipv6_enable" in + [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) + ;; + *) return 0 + ;; + esac + fi return 1 } @@ -452,15 +421,24 @@ # Stateless Address Configuration, 1 otherwise. ipv6_autoconfif() { + case $1 in + lo0|\ + stf[0-9]*|\ + faith[0-9]*|\ + lp[0-9]*|\ + sl[0-9]*|\ + pflog[0-9]*|\ + pfsync[0-9]*) + return 1 + ;; + esac + local _if _tmpargs _arg _if=$1 if ! ipv6if $_if; then return 1 fi - if noafif $_if; then - return 1 - fi if checkyesno ipv6_gateway_enable; then return 1 fi @@ -468,45 +446,24 @@ if [ -n "${_tmpargs}" ]; then return 1 fi + if ! is_wired_interface $_if; then + case $_if in + wlan[0-9]*) ;; # Allow test to continue + *) return 1 + ;; + esac + fi - case $_if in - lo0|\ - stf[0-9]*|\ - faith[0-9]*|\ - lp[0-9]*|\ - sl[0-9]*|\ - pflog[0-9]*|\ - pfsync[0-9]*) + _tmpargs=`_ifconfig_getargs $_if ipv6` + case "$_tmpargs" in + *inet6\ *|*[Nn][Oo][Rr][Tt][Aa][Dd][Vv]*|*-accept_rtadv*) return 1 ;; - esac - - # backward compatibility: $ipv6_enable - case $ipv6_enable in - [Yy][Ee][Ss]) + *[Rr][Tt][Aa][Dd][Vv]*|*accept_rtadv*) return 0 ;; esac - _tmpargs=`_ifconfig_getargs $_if ipv6` - for _arg in $_tmpargs; do - case $_arg in - accept_rtadv) - return 0 - ;; - esac - done - - # backward compatibility: $ipv6_ifconfig_IF - _tmpargs=`get_if_var $_if ipv6_ifconfig_IF` - for _arg in $_tmpargs; do - case $_arg in - accept_rtadv) - return 0 - ;; - esac - done - return 1 } ==== //depot/projects/fdt/etc/rc.d/ip6addrctl#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.8 2009/10/02 02:24:25 hrs Exp $ +# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.9 2010/04/09 01:35:09 dougb Exp $ # # PROVIDE: ip6addrctl @@ -20,8 +20,6 @@ prefer_ipv6_cmd="ip6addrctl_prefer_ipv6" prefer_ipv4_cmd="ip6addrctl_prefer_ipv4" -set_rcvar_obsolete ipv6_enable ipv6_prefer - ip6addrctl_prefer_ipv6() { afexists inet6 || return 0 ==== //depot/projects/fdt/etc/rc.d/netif#2 (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.35 2009/10/10 22:17:03 dougb Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.36 2010/04/09 01:35:09 dougb Exp $ # # PROVIDE: netif @@ -34,6 +34,7 @@ . /etc/network.subr name="network" +start_precmd="network_prestart" start_cmd="network_start" stop_cmd="network_stop" cloneup_cmd="clone_up" @@ -41,7 +42,13 @@ extra_commands="cloneup clonedown" cmdifn= -set_rcvar_obsolete ipv6_enable ipv6_prefer +network_prestart() +{ + if [ -n "$ipv6_enable" ]; then + warn 'The ipv6_enable option is deprecated.' + warn 'See rc.conf(5) for information on disabling IPv6.' + fi +} network_start() { ==== //depot/projects/fdt/etc/rc.d/netoptions#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/netoptions,v 1.151 2009/10/23 09:30:19 hrs Exp $ +# $FreeBSD: src/etc/rc.d/netoptions,v 1.152 2010/04/09 01:35:09 dougb Exp $ # # PROVIDE: netoptions @@ -99,6 +99,13 @@ else ${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null fi + + if checkyesno ipv6_privacy; then + netoptions_init + echo -n " IPv6 Privacy Addresses" + ${SYSCTL_W} net.inet6.ip6.use_tempaddr=1 >/dev/null + ${SYSCTL_W} net.inet6.ip6.prefer_tempaddr=1 >/dev/null + fi } load_rc_config $name ==== //depot/projects/fdt/etc/rc.firewall#6 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.65 2010/01/17 08:41:07 ume Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.68 2010/04/11 15:31:09 ume Exp $ # # @@ -424,24 +424,21 @@ # Configuration: # firewall_myservices: List of TCP ports on which this host # offers services. - # firewall_allowservices: List of IPs which has access to + # firewall_allowservices: List of IPv4 and/or IPv6 addresses + # that have access to # $firewall_myservices. - # firewall_trusted: List of IPv4s which has full access - # to this host. Be very carefull - # when setting this. This option can - # seriously degrade the level of - # protection provided by the firewall. + # firewall_trusted: List of IPv4 and/or IPv6 addresses + # that have full access to this host. + # Be very careful when setting this. + # This option can seriously degrade + # the level of protection provided by + # the firewall. # firewall_logdeny: Boolean (YES/NO) specifying if the # default denied packets should be # logged (in /var/log/security). # firewall_nologports: List of TCP/UDP ports for which # denied incomming packets are not # logged. - # firewall_trusted_ipv6: List of IPv6s which has full access - # to this host. Be very carefull - # when setting this. This option can - # seriously degrade the level of - # protection provided by the firewall. # Allow packets for which a state has been built. ${fwcmd} add check-state ==== //depot/projects/fdt/gnu/usr.bin/gdb/Makefile#4 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.16 2010/03/26 19:40:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.17 2010/04/12 23:35:58 imp Exp $ SUBDIR= doc libgdb gdb gdbtui kgdb TARGET_ARCH?= ${MACHINE_ARCH} -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "arm" || \ - ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "powerpc" +.if exists(${.CURDIR}/gdbserver/reg-${TARGET_ARCH}.c) SUBDIR+=gdbserver .endif ==== //depot/projects/fdt/lib/libc/softfloat/softfloat-specialize#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: softfloat-specialize,v 1.3 2002/05/12 13:12:45 bjh21 Exp $ */ -/* $FreeBSD: src/lib/libc/softfloat/softfloat-specialize,v 1.1 2004/05/14 12:13:04 cognet Exp $ */ +/* $FreeBSD: src/lib/libc/softfloat/softfloat-specialize,v 1.3 2010/04/11 21:22:02 marius Exp $ */ /* This is a derivative work. */ @@ -44,7 +44,11 @@ #ifdef SOFTFLOAT_FOR_GCC static #endif +#ifdef __sparc64__ +int8 float_detect_tininess = float_tininess_before_rounding; +#else int8 float_detect_tininess = float_tininess_after_rounding; +#endif /* ------------------------------------------------------------------------------- ==== //depot/projects/fdt/lib/libc/sys/sigaction.2#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)sigaction.2 8.2 (Berkeley) 4/3/94 -.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.58 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.59 2010/04/13 08:56:03 kib Exp $ .\" -.Dd June 7, 2004 +.Dd April 13, 2010 .Dt SIGACTION 2 .Os .Sh NAME @@ -42,7 +42,7 @@ struct sigaction { union { void (*__sa_handler)(int); - void (*__sa_sigaction)(int, struct __siginfo *, void *); + void (*__sa_sigaction)(int, siginfo_t *, void *); } __sigaction_u; /* signal handler */ int sa_flags; /* see signal options below */ sigset_t sa_mask; /* signal mask to apply */ ==== //depot/projects/fdt/release/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.951 2010/01/02 12:37:54 nyan Exp $ +# $FreeBSD: src/release/Makefile,v 1.953 2010/04/09 14:27:17 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] [SVNROOT=svn://svn.freebsd.org/base] \ @@ -171,7 +171,7 @@ # # Doing 'make index' in /usr/ports requires Perl. -MAKEINDEXPORTS= lang/perl5.8 +MAKEINDEXPORTS= lang/perl5.10 DOCPORTS= textproc/docproj # Set this to wherever the distfiles required by release procedures. .if defined(DOCDISTFILES) @@ -575,7 +575,7 @@ echo " for i in ${MAKEINDEXPORTS}" >> ${_MK} echo " do" >> ${_MK} echo " cd /usr/ports/\$${i}" >> ${_MK} - echo " env -i FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} \\" >> ${_MK} + echo " env -i HTTP_PROXY=$${HTTP_PROXY} FTP_PROXY=$${FTP_PROXY} FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} \\" >> ${_MK} echo " make all install clean BATCH=yes FORCE_PKG_REGISTER=yes" >> ${_MK} echo " done" >> ${_MK} echo " cd /usr/ports" >> ${_MK} ==== //depot/projects/fdt/release/Makefile.inc.docports#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile.inc.docports,v 1.28 2008/09/06 10:12:52 jhay Exp $ +# $FreeBSD: src/release/Makefile.inc.docports,v 1.29 2010/04/09 14:27:17 kensmith Exp $ # # List of (dependent) ports that are minimally required to be # checked out from CVS in order to get ${DOCPORTS} built and @@ -81,5 +81,5 @@ ports/textproc/p5-PodParser .else MINIMALDOCPORTS+= \ - ports/lang/perl5.8 + ports/lang/perl5.10 .endif ==== //depot/projects/fdt/sbin/geom/class/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/geom/class/Makefile,v 1.17 2010/01/16 09:52:49 trasz Exp $ +# $FreeBSD: src/sbin/geom/class/Makefile,v 1.18 2010/04/12 16:37:45 luigi Exp $ .include <bsd.own.mk> @@ -15,6 +15,7 @@ SUBDIR+=nop SUBDIR+=part SUBDIR+=raid3 +SUBDIR+=sched SUBDIR+=shsec SUBDIR+=stripe SUBDIR+=virstor ==== //depot/projects/fdt/sbin/ipfw/main.c#3 (text+ko) ==== @@ -17,7 +17,7 @@ * * Command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/main.c,v 1.5 2010/03/04 16:54:56 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/main.c,v 1.6 2010/04/12 08:27:53 luigi Exp $ */ #include <sys/wait.h> @@ -553,11 +553,11 @@ } while (fgets(buf, BUFSIZ, f)) { /* read commands */ - char linename[10]; + char linename[20]; char *args[2]; lineno++; - sprintf(linename, "Line %d", lineno); + snprintf(linename, sizeof(linename), "Line %d", lineno); setprogname(linename); /* XXX */ args[0] = progname; args[1] = buf; ==== //depot/projects/fdt/share/man/man4/splash.4#2 (text+ko) ==== @@ -24,9 +24,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/share/man/man4/splash.4,v 1.28 2006/05/17 09:33:06 phk Exp $ +.\" $FreeBSD: src/share/man/man4/splash.4,v 1.29 2010/04/07 18:04:25 jkim Exp $ .\" -.Dd January 15, 2006 +.Dd April 7, 2010 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004132125.o3DLP3I6005691>