Date: Wed, 7 May 2003 13:32:14 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30720 for review Message-ID: <200305072032.h47KWEMB063702@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30720 Change 30720 by rwatson@rwatson_tislabs on 2003/05/07 13:31:24 Integ TrustedBSD base tree--various rc.d fixes, libthr bug fixes, and loop back of several MAC bits, including removing of a now unneeded mbuf header label copy (m_tags merged), locking optimizations for the framework, and TCP bug fix for timewait. Affected files ... .. //depot/projects/trustedbsd/base/UPDATING#31 integrate .. //depot/projects/trustedbsd/base/bin/df/df.1#4 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#17 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.c#9 integrate .. //depot/projects/trustedbsd/base/bin/mv/pathnames.h#3 delete .. //depot/projects/trustedbsd/base/bin/sh/var.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/clparse.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tar/src/buffer.c#5 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#30 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#4 integrate .. //depot/projects/trustedbsd/base/etc/devfs.conf#1 branch .. //depot/projects/trustedbsd/base/etc/newsyslog.conf#9 integrate .. //depot/projects/trustedbsd/base/etc/pccard_ether#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/abi#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/apm#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/apmd#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/archdep#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cron#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devfs#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/kpasswdd#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/localdaemons#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/network3#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/securelevel#6 integrate .. //depot/projects/trustedbsd/base/etc/remote#3 integrate .. //depot/projects/trustedbsd/base/etc/services#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvs/Makefile#6 integrate .. //depot/projects/trustedbsd/base/include/paths.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/rfork_thread.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#17 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/trustedbsd/base/release/alpha/dokern.sh#9 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#18 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/readme/article.sgml#12 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#64 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#6 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/dump/main.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/dump/traverse.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/shutdown/pathnames.h#3 delete .. //depot/projects/trustedbsd/base/sbin/shutdown/shutdown.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/startslip/startslip.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/commands.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/vinum.8#8 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#22 integrate .. //depot/projects/trustedbsd/base/share/man/man4/geom.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/malloc.9#8 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#9 integrate .. //depot/projects/trustedbsd/base/share/sendmail/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/trustedbsd/base/sys/conf/NOTES#34 integrate .. //depot/projects/trustedbsd/base/sys/conf/newvers.sh#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midwayvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumrequest.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumrevive.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_aes.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#22 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/intr_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net/if_atm.h#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_atmsubr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#36 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#12 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_en_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/dkstat.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/signalvar.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#18 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#32 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pager.c#11 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#24 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#23 integrate .. //depot/projects/trustedbsd/base/usr.bin/vi/pathnames.h#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#15 integrate Differences ... ==== //depot/projects/trustedbsd/base/UPDATING#31 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20030505: + Kerberos 5 (Heimdal) is now built by default. Setting + MAKE_KERBEROS5 no longer has any effect. If you do NOT + want the "base" Kerberos 5, you need to set NO_KERBEROS. + 20030502: groff has been updated. If you try to do a buildworld and get an infinite loop in troff, update to May 4th or newer. If you @@ -1273,4 +1278,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ +$FreeBSD: src/UPDATING,v 1.251 2003/05/05 20:05:37 markm Exp $ ==== //depot/projects/trustedbsd/base/bin/df/df.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -81,11 +81,11 @@ .It Fl H "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 10 for sizes. +digits to four or fewer using base 10 for sizes. .It Fl h "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 2 for sizes. +digits to four or fewer using base 2 for sizes. .It Fl i Include statistics on the number of free inodes. .It Fl k ==== //depot/projects/trustedbsd/base/bin/ls/ls.1#17 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.73 2003/01/20 21:25:00 chris Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.74 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -175,7 +175,7 @@ When used with the .Fl l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte -and Petabyte in order to reduce the number of digits to three or less +and Petabyte in order to reduce the number of digits to four or fewer using base 2 for sizes. .It Fl i For each file, print the file's file serial number (inode number). ==== //depot/projects/trustedbsd/base/bin/mv/mv.c#9 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -67,8 +67,6 @@ #include <sysexits.h> #include <unistd.h> -#include "pathnames.h" - int fflg, iflg, nflg, vflg; int copy(char *, char *); ==== //depot/projects/trustedbsd/base/bin/sh/var.c#6 (text+ko) ==== @@ -40,10 +40,11 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.23 2002/10/01 00:54:14 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.24 2003/05/05 22:49:22 obrien Exp $"); #include <unistd.h> #include <stdlib.h> +#include <paths.h> /* * Shell variables. @@ -105,7 +106,7 @@ NULL }, { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=", NULL }, - { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=/bin:/usr/bin", + { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH, changepath }, { &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=", NULL }, ==== //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/clparse.c#5 (text+ko) ==== @@ -44,7 +44,7 @@ #ifndef lint static char copyright[] = "$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.9 2003/01/16 07:22:32 obrien Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.10 2003/05/05 22:49:22 obrien Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -53,7 +53,7 @@ struct client_config top_level_config; -char client_script_name [] = "/sbin/dhclient-script"; +char client_script_name [] = _PATH_DHCLIENT_SCRIPT; u_int32_t default_requested_options [] = { DHO_SUBNET_MASK, ==== //depot/projects/trustedbsd/base/contrib/tar/src/buffer.c#5 (text+ko) ==== @@ -19,12 +19,18 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.5 2002/10/09 07:33:29 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.6 2003/05/05 22:49:22 obrien Exp $ */ #include "system.h" #include <signal.h> +#if __FreeBSD__ +# include <paths.h> +#else +# define _PATH_BSHELL "/bin/sh" +#endif + #if MSDOS # include <process.h> #endif @@ -1549,7 +1555,7 @@ pid_t child; const char *shell = getenv ("SHELL"); if (! shell) - shell = "/bin/sh"; + shell = _PATH_BSHELL; child = xfork (); if (child == 0) { ==== //depot/projects/trustedbsd/base/etc/Makefile#30 (text+ko) ==== @@ -1,13 +1,13 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.312 2003/05/02 22:27:31 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.313 2003/05/06 07:25:17 dougb Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail .endif BIN1= amd.map apmd.conf auth.conf \ - crontab csh.cshrc csh.login csh.logout \ - devd.conf dhclient.conf disktab fbtab ftpusers gettytab group \ + crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ + dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ ==== //depot/projects/trustedbsd/base/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.3 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -64,9 +64,10 @@ }; # Don't even try to second guess what to do about drivers that don't -# match here. Instead, pass it off to a smart script to deal. +# match here. Instead, pass it off to syslog. Commented out for the +# moment, as pnpinfo isn't set in devd yet nomatch 0 { - action "logger Unknown device: $pnpinfo $location $bus"; + // action "logger Unknown device: $pnpinfo $location $bus"; }; /* EXAMPLES TO END OF FILE ==== //depot/projects/trustedbsd/base/etc/newsyslog.conf#9 (text+ko) ==== @@ -1,5 +1,14 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.44 2003/04/08 16:14:02 des Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.46 2003/05/05 19:08:33 gad Exp $ +# +# Entries which do not specify the '/pid_file' field will cause the +# syslogd process to be signalled when that log file is rotated. This +# action is only appropriate for log files which are written to by the +# syslogd process (ie, files listed in /etc/syslogd.conf). If there +# is no process which needs to be signalled when a given log file is +# rotated, then the entry for that file should include the 'N' flag. +# +# The 'flags' field is one or more of the letters: BCGJNUWZ or a '-'. # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 @@ -7,23 +16,23 @@ # contents of maillog, messages, and lpd-errs to be confidential. In the # future, these defaults may change to more conservative ones. # -# logfilename [owner:group] mode count size when [ZJB] [/pid_file] [sig_num] +# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] /var/log/all.log 600 7 * @T00 J /var/log/amd.log 644 7 100 * J /var/log/auth.log 600 7 100 * J /var/log/console.log 600 5 100 * J /var/log/cron 600 3 100 * J -/var/log/daily.log 640 7 * @T00 J +/var/log/daily.log 640 7 * @T00 JN /var/log/debug.log 600 7 100 * J /var/log/kerberos.log 600 7 100 * J /var/log/lpd-errs 644 7 100 * J /var/log/maillog 640 7 * @T00 J /var/log/messages 644 5 100 * J -/var/log/monthly.log 640 12 * $M1D0 J +/var/log/monthly.log 640 12 * $M1D0 JN /var/log/ppp.log root:network 640 3 100 * J /var/log/security 600 10 100 * J /var/log/sendmail.st 640 10 * 168 B /var/log/slip.log root:network 640 3 100 * J -/var/log/weekly.log 640 5 1 $W6D0 J +/var/log/weekly.log 640 5 1 $W6D0 JN /var/log/wtmp 644 3 * @01T05 B /var/log/xferlog 600 7 100 * J ==== //depot/projects/trustedbsd/base/etc/pccard_ether#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.28 2002/12/12 09:31:09 imp Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.29 2003/05/05 19:06:46 ume Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -134,8 +134,8 @@ # IPv6 setup case ${ipv6_enable} in [Yy][Ee][Ss]) - if [ -r /etc/rc.network6 ]; then - . /etc/rc.network6 + if [ -r /etc/rc.d/network_ipv6 ]; then + . /etc/rc.d/network_ipv6 network6_interface_setup ${interface} fi ;; ==== //depot/projects/trustedbsd/base/etc/rc.d/abi#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: abi # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/rc.d/apm#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/apm,v 1.2 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apm,v 1.3 2003/05/05 23:55:43 obrien Exp $ # # PROVIDE: apm @@ -19,7 +19,7 @@ apm_precmd() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) return 0 ;; esac ==== //depot/projects/trustedbsd/base/etc/rc.d/apmd#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.6 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.7 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: apmd @@ -24,7 +24,7 @@ apmd_prestart() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) # Start apm if it is not already running /etc/rc.d/apm forcestatus > /dev/null || /etc/rc.d/apm forcestart ;; ==== //depot/projects/trustedbsd/base/etc/rc.d/archdep#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.4 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: archdep @@ -56,7 +56,7 @@ _arch=`${SYSCTL_N} hw.machine` echo -n "Initial $_arch initialization:" case $_arch in -i386|amd64) +i386) ibcs2_compat ;; alpha) ==== //depot/projects/trustedbsd/base/etc/rc.d/cron#3 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: cron # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD NetBSD shutdown . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/rc.d/devfs#4 (text+ko) ==== @@ -1,27 +1,41 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.3 2003/05/02 08:10:58 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.5 2003/05/06 01:10:33 dougb Exp $ # # PROVIDE: devfs # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr name="devfs" +start_cmd='read_devfs_conf' +stop_cmd=':' + +read_devfs_conf() +{ + if [ -r /etc/devfs.conf ]; then + cd /dev + while read action device parameter; do + case "${action}" in + l*) if [ -c ${device} -a ! -e ${parameter} ]; then + ln -fs ${device} ${parameter} + fi + ;; + o*) if [ -c ${device} ]; then + chown ${parameter} ${device} + fi + ;; + p*) if [ -c ${device} ]; then + chmod ${parameter} ${device} + fi + ;; + esac + done < /etc/devfs.conf + fi +} load_rc_config $name - -# Setup DEVFS, ie permissions, links etc. -# -if [ -c /dev/ttyv0 -a ! -e /dev/vga ];then - ln -fs /dev/ttyv0 /dev/vga -fi - -# XXX - in case the user has a customized /etc/rc.devfs we need to keep -# pulling it in until we have a better way of doing this in rc.d. -# -if [ -r /etc/rc.devfs ]; then - sh /etc/rc.devfs -fi +run_rc_command "$1" ==== //depot/projects/trustedbsd/base/etc/rc.d/jail#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.3 2003/04/19 07:50:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.4 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: jail # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/rc.d/kpasswdd#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.1 2003/04/30 20:58:49 markm Exp $ +# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.2 2003/05/06 02:28:03 mtm Exp $ # # PROVIDE: kpasswdd -# REQUIRE: kadmind5 +# REQUIRE: kadmin # BEFORE: DAEMON # KEYWORD: FreeBSD ==== //depot/projects/trustedbsd/base/etc/rc.d/localdaemons#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localdaemons,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/localdaemons,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: localdaemons # REQUIRE: abi +# BEFORE: securelevel # KEYWORD: FreeBSD shutdown . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/rc.d/network3#4 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/network3,v 1.136 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/network3,v 1.137 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: network3 # REQUIRE: localdaemons +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/rc.d/securelevel#6 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # # $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/securelevel,v 1.5 2003/04/24 08:27:29 mtm Exp $ +# $FreeBSD: src/etc/rc.d/securelevel,v 1.6 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: securelevel -# REQUIRE: aftermountlkm ipnat mountd -# BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/remote#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.11 2001/02/21 19:45:47 nik Exp $ +# $FreeBSD: src/etc/remote,v 1.12 2003/05/05 21:37:43 dougb Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -52,7 +52,7 @@ cuaa0c|cua0c:dv=/dev/cuaa0:br#9600:pa=none: # Finger friendly shortcuts -com1:dv=/dev/cuaa0:br#9600:pa=none: -com2:dv=/dev/cuaa1:br#9600:pa=none: -com3:dv=/dev/cuaa2:br#9600:pa=none: -com4:dv=/dev/cuaa3:br#9600:pa=none: +sio0|com1:dv=/dev/cuaa0:br#9600:pa=none: +sio1|com2:dv=/dev/cuaa1:br#9600:pa=none: +sio2|com3:dv=/dev/cuaa2:br#9600:pa=none: +sio3|com4:dv=/dev/cuaa3:br#9600:pa=none: ==== //depot/projects/trustedbsd/base/etc/services#8 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.92 2003/04/29 09:54:06 mdodd Exp $ +# $FreeBSD: src/etc/services,v 1.93 2003/05/05 22:10:14 dougb Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -1198,6 +1198,7 @@ accessbuilder 888/tcp accessbuilder 888/udp swat 901/tcp # samba web configuration tool +rndc 953/tcp # named's rndc control socket ftps-data 989/tcp # ftp protocol, data, over TLS/SSL ftps-data 989/udp ftps 990/tcp # ftp protocol, control, over TLS/SSL @@ -1922,6 +1923,8 @@ dec-notes 3333/tcp #DEC Notes dec-notes 3333/udp #DEC Notes rsvp-encap 3455/udp #RSVP encapsulated in UDP +nut 3493/tcp #Network UPS Tools +nut 3493/udp #Network UPS Tools mapper-nodemgr 3984/tcp #MAPPER network node manager mapper-nodemgr 3984/udp #MAPPER network node manager mapper-mapethd 3985/tcp #MAPPER TCP/IP server ==== //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvs/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.40 2003/01/21 23:00:35 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.41 2003/05/05 16:50:42 nectar Exp $ MAINTAINER= peter@FreeBSD.org @@ -30,15 +30,12 @@ DPADD+= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} LDADD+= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz -.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT) -CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT -LDADD+= -lkrb -lcrypto -lcom_err -DPADD+= ${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR} -DISTRIBUTION= krb4 -# XXX do we want to mess with this? It's probably not really worth it for -# the public freebsd stuff, but others might want it. It's an optional -# feature anyway, the -x switch is needed to activate it. -CFLAGS+= -DENCRYPTION +.if !defined(NO_KERBEROS) && !defined(NO_OPENSSL) && !defined(NOCRYPT) +CFLAGS+= -DHAVE_GSSAPI -DHAVE_GSSAPI_H -DENCRYPTION +LDADD+= -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err +DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN} +DPADD+= ${LIBCRYPT} ${LIBCOM_ERR} +DISTRIBUTION= crypto .endif # ==== //depot/projects/trustedbsd/base/include/paths.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.18 2003/04/07 16:21:25 mdodd Exp $ + * $FreeBSD: src/include/paths.h,v 1.19 2003/05/05 22:49:22 obrien Exp $ */ #ifndef _PATHS_H_ @@ -59,6 +59,8 @@ #define _PATH_DRUM "/dev/drum" #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" +#define _PATH_HALT "/sbin/halt" +#define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" #define _PATH_LIBMAP_CONF "/etc/libmap.conf" #define _PATH_LOGIN "/usr/bin/login" @@ -67,7 +69,9 @@ #define _PATH_MEM "/dev/mem" #define _PATH_NOLOGIN "/var/run/nologin" #define _PATH_RCP "/bin/rcp" +#define _PATH_REBOOT "/sbin/reboot" #define _PATH_RLOGIN "/usr/bin/rlogin" +#define _PATH_RM "/bin/rm" #define _PATH_RSH "/usr/bin/rsh" #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHELLS "/etc/shells" ==== //depot/projects/trustedbsd/base/lib/libc/i386/gen/rfork_thread.S#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.4 2002/03/23 02:44:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $"); /* * With thanks to John Dyson for the original version of this. @@ -109,5 +109,9 @@ * Branch here if the thread creation fails: */ 2: + addl $8, %esp + popl %esi + movl %ebp, %esp + popl %ebp PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) ==== //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#17 (text+ko) ==== @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.43 2003/05/01 14:55:06 des Exp $ +# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.44 2003/05/05 21:15:35 des Exp $ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man @@ -127,7 +127,7 @@ pam_vprompt.3 CSTD?= c99 -WARNS?= 5 +WARNS?= 6 CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR} ==== //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard <d@openbsd.org>, 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.19 2003/04/28 23:56:11 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.20 2003/05/06 00:02:54 deischen Exp $ */ #include <sys/errno.h> #include <pthread.h> @@ -64,16 +64,7 @@ break; case PS_JOIN: - /* - * Disconnect the thread from the joinee: - */ - if (pthread->join_status.thread != NULL) { - pthread->join_status.thread->joiner - = NULL; - pthread->join_status.thread = NULL; - } pthread->cancelflags |= THR_CANCELLING; - _thr_setrunnable_unlocked(pthread); break; case PS_SUSPENDED: ==== //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/_setcurthread.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.3 2003/04/03 03:34:49 jake Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.4 2003/05/06 02:33:49 mtm Exp $ */ #include <sys/types.h> @@ -62,7 +62,10 @@ void _retire_thread(void *entry) { - *(void **)entry = *ldt_free; + if (ldt_free == NULL) + *(void **)entry = NULL; + else + *(void **)entry = *ldt_free; ldt_free = entry; } ==== //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.3 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.4 2003/05/06 02:30:52 mtm Exp $ */ #include <stdlib.h> #include <errno.h> @@ -471,7 +471,7 @@ int ret = 0; PTHREAD_ASSERT((mutex != NULL) && (*mutex != NULL), - "Uninitialized mutex in pthread_mutex_trylock_basic"); + "Uninitialized mutex in mutex_lock_common"); /* * Enter a loop waiting to become the mutex owner. We need a ==== //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sig.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.3 2003/05/06 02:30:52 mtm Exp $ */ #include <sys/param.h> @@ -124,28 +124,25 @@ curthread->state = psd.psd_state; curthread->flags = psd.psd_flags; - /* Check the threads previous state: */ - if (psd.psd_state != PS_RUNNING) { - /* - * Do a little cleanup handling for those threads in - * queues before calling the signal handler. Signals - * for these threads are temporarily blocked until - * after cleanup handling. - */ - switch (psd.psd_state) { - case PS_COND_WAIT: - _cond_wait_backout(curthread); - psd.psd_state = PS_RUNNING; - break; + /* + * Do a little cleanup handling for those threads in + * queues before calling the signal handler. Signals + * for these threads are temporarily blocked until + * after cleanup handling. + */ + switch (psd.psd_state) { + case PS_COND_WAIT: + _cond_wait_backout(curthread); + psd.psd_state = PS_RUNNING; + break; - case PS_MUTEX_WAIT: - /* _mutex_lock_backout(curthread); XXXTHR */ - psd.psd_state = PS_RUNNING; - break; + case PS_MUTEX_WAIT: + /* _mutex_lock_backout(curthread); XXXTHR */ + psd.psd_state = PS_RUNNING; + break; - default: - break; - } + default: + break; } if (_thread_sigact[sig -1].sa_handler != NULL) { ==== //depot/projects/trustedbsd/base/release/alpha/dokern.sh#9 (text+ko) ==== @@ -1,60 +1,64 @@ #!/bin/sh # -# $FreeBSD: src/release/alpha/dokern.sh,v 1.66 2003/03/22 14:23:23 ru Exp $ +# $FreeBSD: src/release/alpha/dokern.sh,v 1.68 2003/05/07 18:14:00 obrien Exp $ # +# XXX sort by order in GENERIC, not alphabetical + sed \ - -e '/DDB/d' \ + -e 's/ident.*GENERIC/ident BOOTMFS/g' -e '/DEBUG/d' \ -e '/DEC_KN8AE/d' \ - -e '/INVARIANTS/d' \ - -e '/INVARIANT_SUPPORT/d' \ - -e '/KTRACE/d' \ - -e '/MSDOSFS/d' \ + -e '/SOFTUPDATES/d' \ + -e '/UFS_ACL/d' \ + -e '/UFS_DIRHASH/d' \ -e '/NFSSERVER/d' \ -e '/NFS_ROOT/d' \ + -e '/MSDOSFS/d' \ -e '/PROCFS/d' \ -e '/PSEUDOFS/d' \ - -e '/SMP/d' \ - -e '/SOFTUPDATES/d' \ + -e '/KTRACE/d' \ -e '/SYSV/d' \ - -e '/UFS_ACL/d' \ - -e '/UFS_DIRHASH/d' \ -e '/_KPOSIX_PRIORITY_SCHEDULING/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ + -e '/SMP/d' \ -e '/ atapifd /d' \ -e '/ atapist /d' \ - -e '/ aue /d' \ -e '/ ch /d' \ - -e '/ cue /d' \ - -e '/ faith /d' \ - -e '/ gif /d' \ - -e '/ kue /d' \ - -e '/ lpt /d' \ - -e '/ ohci /d' \ -e '/ pass /d' \ + -e '/ sa /d' \ + -e '/ ses /d' \ + -e '/ splash /d' \ + -e '/ ppc$/d' \ -e '/ ppbus /d' \ - -e '/ ppc$/d' \ + -e '/ lpt /d' \ -e '/ ppi /d' \ - -e '/ ppp /d' \ - -e '/ pty /d' \ - -e '/ random /d' \ - -e '/ sa /d' \ - -e '/ ses /d' \ -e '/ sf /d' \ -e '/ sis /d' \ + -e '/ ste /d' \ + -e '/ wb /d' \ + -e '/ random /d' \ -e '/ sl /d' \ - -e '/ splash /d' \ - -e '/ ste /d' \ + -e '/ ppp /d' \ + -e '/ pty /d' \ + -e '/ gif /d' \ + -e '/ faith /d' \ + -e '/ uhci /d' \ + -e '/ ohci /d' \ + -e '/ usb /d' \ -e '/ ugen /d' \ - -e '/ uhci /d' \ -e '/ uhid /d' \ -e '/ ukbd /d' \ -e '/ ulpt /d' \ -e '/ umass /d' \ -e '/ ums /d' \ - -e '/ usb /d' \ - -e '/ wb /d' \ - -e 's/ident.*GENERIC/ident BOOTMFS/g' + -e '/ aue /d' \ + -e '/ axe /d' \ + -e '/ cue /d' \ + -e '/ kue /d' \ echo "options SCSI_NO_OP_STRINGS" >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305072032.h47KWEMB063702>