PERFORCE change 108964 for review

John Birrell jb at FreeBSD.org
Wed Nov 1 21:48:01 UTC 2006 

http://perforce.freebsd.org/chv.cgi?CH=108964

Change 108964 by jb at jb_freebsd8 on 2006/11/01 21:47:04

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#31 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#11 integrate
.. //depot/projects/dtrace/ports/GIDs#6 integrate
.. //depot/projects/dtrace/ports/MOVED#28 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/rmport#6 integrate
.. //depot/projects/dtrace/ports/UIDs#7 integrate
.. //depot/projects/dtrace/ports/UPDATING#21 integrate
.. //depot/projects/dtrace/src/Makefile#11 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/send-pr/send-pr.sh#4 integrate
.. //depot/projects/dtrace/src/sbin/fsck_ffs/gjournal.c#2 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/journal/geom_journal.c#2 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifbridge.c#4 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#8 integrate
.. //depot/projects/dtrace/src/share/man/man3/pthread_create.3#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_sony.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/g_bio.9#4 integrate
.. //depot/projects/dtrace/src/share/misc/bsd-family-tree#8 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.own.mk#11 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/elf_trampoline.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/em/if_em.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/md/md.c#4 integrate
.. //depot/projects/dtrace/src/sys/geom/eli/g_eli.c#10 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_gpt.c#7 integrate
.. //depot/projects/dtrace/src/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/shsec/g_shsec.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_pts.c#6 integrate
.. //depot/projects/dtrace/src/sys/sparc64/conf/NOTES#7 integrate
.. //depot/projects/dtrace/src/sys/sun4v/include/hypervisorvar.h#7 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_softdep.c#8 integrate
.. //depot/projects/dtrace/src/tools/tools/tinybsd/README#4 integrate
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/bridge/tinybsd.localfiles#2 delete
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/bridge/tinybsd.ports#1 branch
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/default/tinybsd.localfiles#2 delete
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/default/tinybsd.ports#1 branch
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/firewall/tinybsd.localfiles#2 delete
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/firewall/tinybsd.ports#1 branch
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/minimal/tinybsd.localfiles#2 delete
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/minimal/tinybsd.ports#1 branch
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/vpn/tinybsd.localfiles#2 delete
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/vpn/tinybsd.ports#1 branch
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/wireless/tinybsd.localfiles#2 delete
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/wireless/tinybsd.ports#1 branch
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/wrap/tinybsd.localfiles#2 delete
.. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/wrap/tinybsd.ports#1 branch
.. //depot/projects/dtrace/src/tools/tools/tinybsd/tinybsd#6 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#31 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.629 2006/10/31 18:03:41 alepulver Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.630 2006/11/01 20:31:47 alepulver Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -6357,6 +6357,11 @@
     </listitem>
 
     <listitem>
+      <para>Morten Slot Kristensen
+	<email>ontherenth at gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Mostyn Lewis
 	<email>mostyn at mrl.com</email></para>
     </listitem>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#11 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.303 2006/10/14 03:50:18 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.304 2006/11/01 18:38:59 remko Exp $
 -->
 
 <chapter id="security">
@@ -3429,7 +3429,7 @@
         following commands to configure the tunnel.</para>
  
       <screen>&prompt.root; <userinput>ifconfig <replaceable>gif0</replaceable> create</userinput>
-&prompt.root; <userinput>ifconfig tunnel <replaceable>gif0</replaceable> <replaceable>A.B.C.D</replaceable> <replaceable>W.X.Y.Z</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>gif0</replaceable> tunnel <replaceable>A.B.C.D</replaceable> <replaceable>W.X.Y.Z</replaceable></userinput>
 &prompt.root; <userinput>ifconfig <replaceable>gif0</replaceable> inet <replaceable>192.168.1.1</replaceable> <replaceable>192.168.2.1</replaceable> netmask <replaceable>0xffffffff</replaceable></userinput>
       </screen>
 
@@ -3437,7 +3437,7 @@
         but with the order of the IP addresses reversed.</para>
 
       <screen>&prompt.root; <userinput>ifconfig <replaceable>gif0</replaceable> create</userinput>
-&prompt.root; <userinput>ifconfig tunnel <replaceable>gif0</replaceable> <replaceable>W.X.Y.Z</replaceable> <replaceable>A.B.C.D</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>gif0</replaceable> tunnel <replaceable>W.X.Y.Z</replaceable> <replaceable>A.B.C.D</replaceable></userinput>
 &prompt.root; <userinput>ifconfig <replaceable>gif0</replaceable> inet <replaceable>192.168.2.1</replaceable> <replaceable>192.168.1.1</replaceable> netmask <replaceable>0xffffffff</replaceable></userinput>
       </screen>
  

==== //depot/projects/dtrace/ports/GIDs#6 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: ports/GIDs,v 1.11 2006/08/28 20:15:56 pav Exp $
+$FreeBSD: ports/GIDs,v 1.13 2006/11/01 20:22:48 marcus Exp $
 # Please keep this file sorted by GID!
 bind:*:53:
 rdfdb:*:55:
@@ -67,6 +67,7 @@
 smxc:*:262:
 smxm:*:263:
 smx:*:264:
+haclient:*:275:
 mrtg:*:279:
 dkfilter:*:325:
 ldap:*:389:
@@ -81,6 +82,7 @@
 messagebus:*:556:
 realtime:*:557:
 avahi:*:558:
+tacacs:*:559:
 bnetd:*:700:
 bopm:*:717:
 openxpki:*:777:

==== //depot/projects/dtrace/ports/MOVED#28 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1170 2006/10/31 21:39:53 edwin Exp $
+# $FreeBSD: ports/MOVED,v 1.1174 2006/11/01 15:36:54 leeym Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -2497,3 +2497,20 @@
 lang/pdss||2006-10-31|Has expired: fails to compile on recent FreeBSD versions
 multimedia/slideshow||2006-10-31|Has expired: dead project and doesn't work with recent sdl
 dns/queryperf|dns/dnsperf|2006-11-01|Project was improved and renamed
+x11-toolkits/etox||2006-11-01|Has expired: doesn't work with recent e17 and obsoleted
+x11-themes/e17-theme-blokkie||2006-11-01|Has expired: doesn't work with recent e17
+x11-themes/e17-theme-blue_default||2006-11-01|Has expired: doesn't work with recent e17
+x11-themes/e17-theme-carbon||2006-11-01|Has expired: doesn't work with recent e17
+x11-themes/e17-theme-detour||2006-11-01|Has expired: doesn't work with recent e17
+x11-themes/e17-theme-gant||2006-11-01|Has expired: doesn't work with recent e17
+x11-themes/e17-theme-japan2007||2006-11-01|Has expired: doesn't work with recent e17
+x11-themes/e17-theme-milky||2006-11-01|Has expired: doesn't work with recent e17
+x11-themes/e17-theme-neptun||2006-11-01|Has expired: doesn't work with recent e17
+x11-themes/e17-theme-simply_white||2006-11-01|Has expired: doesn't work with recent e17
+x11-themes/e17-theme-winter||2006-11-01|Has expired: doesn't work with recent e17
+x11-themes/e17-theme-mclaren||2006-11-01|Has expired: doesn't work with recent e17
+x11-themes/e17-theme-grey||2006-11-01|Has expired: doesn't work with recent e17
+devel/ac-archive|devel/autoconf-archive|2006-11-01|Replace broken ac-archive with working autoconf-archive
+www/firefox-devel|www/firefox|2006-11-01|Firefox 2.0 is now stable
+graphics/php4-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion
+graphics/php5-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion

==== //depot/projects/dtrace/ports/Tools/scripts/rmport#6 (text+ko) ====

@@ -30,7 +30,7 @@
 # Originally written by Vasil Dimov <vd at FreeBSD.org>
 # Others:
 #
-# $FreeBSD: ports/Tools/scripts/rmport,v 1.9 2006/10/05 10:40:29 vd Exp $
+# $FreeBSD: ports/Tools/scripts/rmport,v 1.10 2006/11/01 09:57:36 vd Exp $
 #
 # MAINTAINER=	vd at FreeBSD.org
 #
@@ -100,6 +100,13 @@
 {
 	log "creating temporary directory"
 	d=`mktemp -d -t rmport`
+	mkdir ${d}/CVS
+	cat > ${d}/CVS/Repository <<REPOSITORY
+We need ./CVS directory in order to create a custom commit message template
+(and put it in ./CVS/Template). Anyway cvs insists on CVS/Repository existence
+although it (hopefully) does not care about its contents.
+REPOSITORY
+	touch ${d}/CVS/Template
 	log "created ${d}"
 	echo "${d}"
 }
@@ -145,7 +152,8 @@
 
 		# check if some Makefiles mention the port to be deleted
 		portdir_grep="^[^#].*/`basename ${catport}`([[:space:]]|/|$)"
-		r="`find ${PORTSDIR} -mindepth 2 -maxdepth 3 \( -name "Makefile*" -or -path "*Mk/*.mk" \) \
+		r="`find ${PORTSDIR} -mindepth 2 -maxdepth 3 \
+			\( -name "Makefile*" -or -path "*Mk/*.mk" \) \
 			|xargs grep -EH "${portdir_grep}" \
 			|grep -vE "^(${rmcatports})" || :`"
 		if [ -n "${r}" ] ; then
@@ -162,7 +170,7 @@
 			break
 		fi
 
-		read -p 'deal with the above issues and hit <enter> when ready' answer
+		read -p 'deal with the above issues and hit <enter> when ready' dummy
 	done
 }
 
@@ -186,7 +194,7 @@
 		msg="${catport}: checking if ${checkstr} is in ports/LEGAL"
 		log "${msg}"
 		while grep -i ${checkstr} ports/LEGAL ; do
-			read -p "${checkstr} is in ports/LEGAL, remove it and hit <enter> when ready" answer
+			read -p "${checkstr} is in ports/LEGAL, remove it and hit <enter> when ready" dummy
 			log "${msg}"
 		done
 	done
@@ -213,7 +221,11 @@
 
 	DEPRECATED="`make -C ${PORTSDIR}/${catport} -V DEPRECATED`"
 	DEPRECATED=${DEPRECATED:+: ${DEPRECATED}}
-	REASON="Has expired${DEPRECATED}"
+	if [ -n "`make -C ${PORTSDIR}/${catport} -V EXPIRATION_DATE`" ] ; then
+		REASON="Has expired${DEPRECATED}"
+	else
+		REASON="Removed${DEPRECATED}"
+	fi
 
 	log "${catport}: adding entry to ports/MOVED"
 
@@ -244,6 +256,27 @@
 	${PCVS} rm `find ports/${catport} -type f -not -path "*/CVS/*" -delete -print`
 }
 
+append_Template()
+{
+	catport=${1}
+
+	msg=${catport}
+
+	EXPIRATION_DATE=`make -C ${PORTSDIR}/${catport} -V EXPIRATION_DATE`
+	if [ -n "${EXPIRATION_DATE}" ] ; then
+		msg="${EXPIRATION_DATE} ${msg}"
+	fi
+
+	DEPRECATED="`make -C ${PORTSDIR}/${catport} -V DEPRECATED`"
+	if [ -n "${DEPRECATED}" ] ; then
+		msg="${msg}: ${DEPRECATED}"
+	fi
+
+	log "${catport}: adding entry to commit message template"
+
+	echo "${msg}" >> ./CVS/Template
+}
+
 # diff
 diff()
 {
@@ -251,23 +284,34 @@
 
 	diffout=${codir}/diff
 
-	${PCVS} diff -u CVSROOT/modules ports/MOVED ports/LEGAL \
-	ports > ${diffout} 2>&1 || :
+	${PCVS} diff -u CVSROOT/modules ports > ${diffout} 2>&1 || :
 
-	read -p "hit <enter> to view cvs diff output" answer
+	read -p "hit <enter> to view cvs diff output" dummy
 
-	# give this to the outside world so it can be removed when we are done
+	# give this to the outside world so it can be showed to the committer
+	# and removed when we are done
 	echo ${diffout}
 }
 
+ask()
+{
+	question=${1}
+
+	answer=x
+	while [ "${answer}" != "y" -a "${answer}" != "n" ] ; do
+		read -p "${question} [yn] " answer
+	done
+
+	echo ${answer}
+}
+
 # ask for confirmation and commit
 commit()
 {
-	read -p "do you want to commit? [yn] " answer
+	answer=`ask "do you want to commit?"`
 
-	if [ "${answer}" = "y" -o "${answer}" = "Y" ] ; then
-		${PCVS} ci CVSROOT/modules ports/MOVED ports/LEGAL \
-		ports
+	if [ "${answer}" = "y" ] ; then
+		${PCVS} ci CVSROOT/modules ports
 	fi
 }
 
@@ -280,6 +324,9 @@
 
 	rm ${diffout}
 
+	rm CVS/Entries.Log CVS/Repository CVS/Template
+	rmdir CVS
+
 	# release cvs directories
 	${PCVS} rel -d CVSROOT ports
 
@@ -290,12 +337,19 @@
 usage()
 {
 	echo "Usage:" >&2
+	echo "" >&2
 	echo "find expired ports:" >&2
 	echo "${0} -F" >&2
+	echo "" >&2
 	echo "remove port(s):" >&2
 	echo "${0} category1/port1 [ category2/port2 ... ]" >&2
+	echo "" >&2
+	echo "remove all expired ports (as returned by -F):" >&2
+	echo "${0} -a" >&2
+	echo "" >&2
 	echo "just check dependencies:" >&2
 	echo "${0} -d category/port" >&2
+
 	exit 64
 }
 
@@ -322,6 +376,14 @@
 	exit
 fi
 
+if [ ${1} = "-a" ] ; then
+	if [ ${#} -ne 1 ] ; then
+		usage
+	fi
+	${0} `find_expired |cut -f 2 -d ' '`
+	exit
+fi
+
 codir=`mkcodir`
 cd ${codir}
 
@@ -334,7 +396,7 @@
 	port=`basename ${catport}`
 	# remove any trailing slashes
 	catport="${cat}/${port}"
-	pkgname=`pkgname ${cat}/${port}`
+	pkgname=`pkgname ${catport}`
 
 	check_dep ${catport} 1 "${*}"
 
@@ -351,12 +413,22 @@
 	edit_Makefile ${cat} ${port}
 
 	rm_port ${catport}
+
+	append_Template ${catport}
 done
 
-diffout=`diff`
+# give a chance to the committer to edit files by hand and recreate/review
+# the diff afterwards
+answer=y
+while [ "${answer}" = "y" ] ; do
+	diffout=`diff`
+
+	# EDITOR instead of PAGER because vim has nice syntax highlighting ;-)
+	${EDITOR} ${diffout}
 
-# EDITOR instead of PAGER because vim has nice syntax highlighting ;-)
-${EDITOR} ${diffout}
+	echo "you can now edit files under ${codir}/ by hand"
+	answer=`ask "do you want to recreate the diff?"`
+done
 
 commit
 

==== //depot/projects/dtrace/ports/UIDs#7 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: ports/UIDs,v 1.14 2006/10/31 02:43:54 marcus Exp $
+$FreeBSD: ports/UIDs,v 1.15 2006/11/01 20:06:03 alepulver Exp $
 # Please keep this file sorted by UID!
 bind:*:53:53:Bind Sandbox:/:/sbin/nologin
 majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent
@@ -79,6 +79,7 @@
 smxc:*:262:262:Sendmail X SMTPC:/nonexistent:/sbin/nologin
 smxm:*:263:263:Sendmail X misc:/nonexistent:/sbin/nologin
 smx:*:264:264:Sendmail X other:/nonexistent:/sbin/nologin
+hacluster:*:275:275:Heartbeat cluster user:/nonexistent:/sbin/nologin
 mrtg:*:279:279:MRTG daemon:/nonexistent:/sbin/nologin
 dkfilter:*:325:325:DK Filter Owner:/nonexistent:/sbin/nologin
 ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin

==== //depot/projects/dtrace/ports/UPDATING#21 (text+ko) ====

@@ -6,6 +6,20 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20061101:
+  AFFECTS: Users of mail/dovecot
+  AUTHOR: shaun at FreeBSD.org
+
+  Dovecot now requires the mail root to be set explicitly in the the
+  default_mail_env variable, where it could previously be omitted.
+  Using the old-style syntax may result in dovecot being unable to find
+  mailboxes. Installations using the example/default configuration
+  settings should not be affected.
+
+  This is noted in the release announcement:
+
+  http://dovecot.org/list/dovecot-news/2006-October/000016.html
+
 20061031:
   AFFECTS: Users of math/rkward
   AUTHOR: thierry at FreeBSD.org
@@ -4309,4 +4323,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.417 2006/10/31 22:04:07 thierry Exp $
+$FreeBSD: ports/UPDATING,v 1.418 2006/11/01 19:23:29 shaun Exp $

==== //depot/projects/dtrace/src/Makefile#11 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.336 2006/10/16 22:18:59 jb Exp $
+# $FreeBSD: src/Makefile,v 1.337 2006/11/01 09:05:40 jb Exp $
 #
 # The user-driven targets are:
 #

==== //depot/projects/dtrace/src/gnu/usr.bin/send-pr/send-pr.sh#4 (text+ko) ====

@@ -20,7 +20,7 @@
 # along with GNU GNATS; see the file COPYING.  If not, write to
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.37 2005/10/24 01:36:16 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.38 2006/11/01 12:13:08 philip Exp $
 
 # The version of this send-pr.
 VERSION=3.113
@@ -300,7 +300,7 @@
     for file in $TEMP $REF ; do
       cat  > $file << '__EOF__'
 SEND-PR: -*- send-pr -*-
-SEND-PR: vim: syntax=send-pr (needed for vim syntax highlighting)
+SEND-PR: vim: syntax=sendpr
 SEND-PR:
 SEND-PR: Lines starting with `SEND-PR' will be removed automatically, as
 SEND-PR: will all comments (text enclosed in `<' and `>').

==== //depot/projects/dtrace/src/sbin/fsck_ffs/gjournal.c#2 (text+ko) ====

@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/fsck_ffs/gjournal.c,v 1.1 2006/10/31 22:21:01 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/gjournal.c,v 1.2 2006/11/01 10:56:33 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
@@ -663,6 +663,7 @@
 gjournal_check(const char *filesys)
 {
 	struct ufs2_dinode *dino;
+	void *p;
 	struct cgchain *cgc;
 	struct cg *cgp;
 	uint8_t *inosused, *blksfree;
@@ -714,8 +715,9 @@
 			/* Unallocated? Skip it. */
 			if (isclr(inosused, cino))
 				continue;
-			if (getino(disk, (void **)&dino, ino, &mode) == -1)
+			if (getino(disk, &p, ino, &mode) == -1)
 				err(1, "getino(cg=%d ino=%d)", cg, ino);
+			dino = p;
 			/* Not a regular file nor directory? Skip it. */
 			if (!S_ISREG(dino->di_mode) && !S_ISDIR(dino->di_mode))
 				continue;

==== //depot/projects/dtrace/src/sbin/geom/class/journal/geom_journal.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/journal/geom_journal.c,v 1.1 2006/10/31 21:32:54 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/journal/geom_journal.c,v 1.2 2006/11/01 09:22:33 pjd Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
@@ -145,6 +145,7 @@
 	int error, force, i, nargs, checksum, hardcode;
 
 	nargs = gctl_get_int(req, "nargs");
+	str = NULL;	/* gcc */
 
 	strlcpy(md.md_magic, G_JOURNAL_MAGIC, sizeof(md.md_magic));
 	md.md_version = G_JOURNAL_VERSION;

==== //depot/projects/dtrace/src/sbin/ifconfig/ifbridge.c#4 (text+ko) ====

@@ -35,7 +35,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sbin/ifconfig/ifbridge.c,v 1.3 2005/12/14 02:52:12 thompsa Exp $";
+  "$FreeBSD: src/sbin/ifconfig/ifbridge.c,v 1.4 2006/11/01 09:07:47 thompsa Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -61,6 +61,27 @@
 
 #include "ifconfig.h"
 
+static const char *stpstates[] = {
+	"disabled",
+	"listening",
+	"learning",
+	"forwarding",
+	"blocking",
+	"discarding"
+};
+static const char *stpproto[] = {
+	"stp",
+	"-",
+	"rstp"
+};
+static const char *stproles[] = {
+	"disabled",
+	"root",
+	"designated",
+	"alternate",
+	"backup"
+};
+
 static int
 get_val(const char *cp, u_long *valp)
 {
@@ -113,13 +134,6 @@
 static void
 bridge_interfaces(int s, const char *prefix)
 {
-	static const char *stpstates[] = {
-		"disabled",
-		"listening",
-		"learning",
-		"forwarding",
-		"blocking",
-	};
 	struct ifbifconf bifc;
 	struct ifbreq *req;
 	char *inbuf = NULL, *ninbuf;
@@ -159,12 +173,35 @@
 			printf("port %u priority %u",
 			    req->ifbr_portno, req->ifbr_priority);
 			printf(" path cost %u", req->ifbr_path_cost);
+			if (req->ifbr_proto <
+			    sizeof(stpproto) / sizeof(stpproto[0]))
+				printf(" proto %s", stpproto[req->ifbr_proto]);
+			else
+				printf(" <unknown proto %d>",
+				    req->ifbr_proto);
+
+			printf("\n%s", pad);
+			if (req->ifbr_role <
+			    sizeof(stproles) / sizeof(stproles[0]))
+				printf("role %s", stproles[req->ifbr_role]);
+			else
+				printf("<unknown role %d>",
+				    req->ifbr_role);
 			if (req->ifbr_state <
 			    sizeof(stpstates) / sizeof(stpstates[0]))
-				printf(" %s", stpstates[req->ifbr_state]);
+				printf(" state %s", stpstates[req->ifbr_state]);
 			else
 				printf(" <unknown state %d>",
 				    req->ifbr_state);
+
+			if (req->ifbr_p2p)
+				printf(" p2p");
+			else
+				printf(" shared");
+			if (req->ifbr_edge)
+				printf(" edge");
+			if (req->ifbr_autoedge)
+				printf(" autoedge");
 			printf("\n");
 		}
 	}
@@ -210,29 +247,23 @@
 static void
 bridge_status(int s)
 {
-	struct ifbrparam param;
+	struct ifbropreq param;
 	u_int16_t pri;
-	u_int8_t ht, fd, ma;
+	u_int8_t ht, fd, ma, hc, pro;
 
-	if (do_cmd(s, BRDGGPRI, &param, sizeof(param), 0) < 0)
+	if (do_cmd(s, BRDGPARAM, &param, sizeof(param), 0) < 0)
 		return;
-	pri = param.ifbrp_prio;
+	pri = param.ifbop_priority;
+	pro = param.ifbop_protocol;
+	ht = param.ifbop_hellotime;
+	fd = param.ifbop_fwddelay;
+	hc = param.ifbop_holdcount;
+	ma = param.ifbop_maxage;
 
-	if (do_cmd(s, BRDGGHT, &param, sizeof(param), 0) < 0)
-		return;
-	ht = param.ifbrp_hellotime;
-
-	if (do_cmd(s, BRDGGFD, &param, sizeof(param), 0) < 0)
-		return;
-	fd = param.ifbrp_fwddelay;
-
-	if (do_cmd(s, BRDGGMA, &param, sizeof(param), 0) < 0)
-		return;
-	ma = param.ifbrp_maxage;
+	printf("\tpriority %u hellotime %u fwddelay %u"
+	    " maxage %u hc %u proto %s\n",
+	    pri, ht, fd, ma, hc, stpproto[pro]);
 
-	printf("\tpriority %u hellotime %u fwddelay %u maxage %u\n",
-	    pri, ht, fd, ma);
-
 	bridge_interfaces(s, "\tmember: ");
 
 	return;
@@ -326,6 +357,54 @@
 }
 
 static void
+setbridge_edge(const char *val, int d, int s, const struct afswtch *afp)
+{
+	struct ifbreq req;
+
+	memset(&req, 0, sizeof(req));
+	strlcpy(req.ifbr_ifsname, val, sizeof(req.ifbr_ifsname));
+	req.ifbr_edge = 1;
+	if (do_cmd(s, BRDGSEDGE, &req, sizeof(req), 1) < 0)
+		err(1, "BRDGSEDGE %s",  val);
+}
+
+static void
+unsetbridge_edge(const char *val, int d, int s, const struct afswtch *afp)
+{
+	struct ifbreq req;
+
+	memset(&req, 0, sizeof(req));
+	strlcpy(req.ifbr_ifsname, val, sizeof(req.ifbr_ifsname));
+	req.ifbr_edge = 0;
+	if (do_cmd(s, BRDGSEDGE, &req, sizeof(req), 1) < 0)
+		err(1, "BRDGSEDGE %s",  val);
+}
+
+static void
+setbridge_autoedge(const char *val, int d, int s, const struct afswtch *afp)
+{
+	struct ifbreq req;
+
+	memset(&req, 0, sizeof(req));
+	strlcpy(req.ifbr_ifsname, val, sizeof(req.ifbr_ifsname));
+	req.ifbr_autoedge = 1;
+	if (do_cmd(s, BRDGSAEDGE, &req, sizeof(req), 1) < 0)
+		err(1, "BRDGSAEDGE %s",  val);
+}
+
+static void
+unsetbridge_autoedge(const char *val, int d, int s, const struct afswtch *afp)
+{
+	struct ifbreq req;
+
+	memset(&req, 0, sizeof(req));
+	strlcpy(req.ifbr_ifsname, val, sizeof(req.ifbr_ifsname));
+	req.ifbr_autoedge = 0;
+	if (do_cmd(s, BRDGSAEDGE, &req, sizeof(req), 1) < 0)
+		err(1, "BRDGSAEDGE %s",  val);
+}
+
+static void
 setbridge_flush(const char *val, int d, int s, const struct afswtch *afp)
 {
 	struct ifbreq req;
@@ -469,6 +548,38 @@
 }
 
 static void
+setbridge_protocol(const char *arg, int d, int s, const struct afswtch *afp)
+{
+	struct ifbrparam param;
+
+	if (strcasecmp(arg, "stp") == 0) {
+		param.ifbrp_proto = 0;
+	} else if (strcasecmp(arg, "rstp") == 0) {
+		param.ifbrp_proto = 2;
+	} else {
+		errx(1, "unknown stp protocol");
+	}
+
+	if (do_cmd(s, BRDGSPROTO, &param, sizeof(param), 1) < 0)
+		err(1, "BRDGSPROTO %s",  arg);
+}
+
+static void
+setbridge_holdcount(const char *arg, int d, int s, const struct afswtch *afp)
+{
+	struct ifbrparam param;
+	u_long val;
+
+	if (get_val(arg, &val) < 0 || (val & ~0xff) != 0)
+		errx(1, "invalid value: %s",  arg);
+
+	param.ifbrp_txhc = val & 0xff;
+
+	if (do_cmd(s, BRDGSTXHC, &param, sizeof(param), 1) < 0)
+		err(1, "BRDGSTXHC %s",  arg);
+}
+
+static void
 setbridge_ifpriority(const char *ifn, const char *pri, int s,
     const struct afswtch *afp)
 {
@@ -496,11 +607,11 @@
 
 	memset(&req, 0, sizeof(req));
 
-	if (get_val(cost, &val) < 0 || (val & ~0xff) != 0)
+	if (get_val(cost, &val) < 0)
 		errx(1, "invalid value: %s",  cost);
 
 	strlcpy(req.ifbr_ifsname, ifn, sizeof(req.ifbr_ifsname));
-	req.ifbr_path_cost = val & 0xffff;
+	req.ifbr_path_cost = val;
 
 	if (do_cmd(s, BRDGSIFCOST, &req, sizeof(req), 1) < 0)
 		err(1, "BRDGSIFCOST %s",  cost);
@@ -532,6 +643,10 @@
 	DEF_CMD_ARG("-span",		unsetbridge_span),
 	DEF_CMD_ARG("stp",		setbridge_stp),
 	DEF_CMD_ARG("-stp",		unsetbridge_stp),
+	DEF_CMD_ARG("edge",		setbridge_edge),
+	DEF_CMD_ARG("-edge",		unsetbridge_edge),
+	DEF_CMD_ARG("autoedge",		setbridge_autoedge),
+	DEF_CMD_ARG("-autoedge",	unsetbridge_autoedge),
 	DEF_CMD("flush", 0,		setbridge_flush),
 	DEF_CMD("flushall", 0,		setbridge_flushall),
 	DEF_CMD_ARG2("static",		setbridge_static),
@@ -542,6 +657,8 @@
 	DEF_CMD_ARG("fwddelay",		setbridge_fwddelay),
 	DEF_CMD_ARG("maxage",		setbridge_maxage),
 	DEF_CMD_ARG("priority",		setbridge_priority),
+	DEF_CMD_ARG("proto",		setbridge_protocol),
+	DEF_CMD_ARG("holdcount",	setbridge_holdcount),
 	DEF_CMD_ARG2("ifpriority",	setbridge_ifpriority),
 	DEF_CMD_ARG2("ifpathcost",	setbridge_ifpathcost),
 	DEF_CMD_ARG("timeout",		setbridge_timeout),

==== //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#8 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.124 2006/10/10 09:44:08 ru Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.125 2006/11/01 09:07:47 thompsa Exp $
 .\"
 .Dd October 9, 2006
 .Dt IFCONFIG 8
@@ -1267,38 +1267,67 @@
 Disable Spanning Tree protocol on
 .Ar interface .
 This is the default for all interfaces added to a bridge.
+.It Cm edge Ar interface
+Set
+.Ar interface
+as an edge port.
+An edge port connects directly to end stations cannot create bridging
+loops in the network, this allows it to transition straight to forwarding.
+.It Cm -edge Ar interface
+Disable edge status on
+.Ar interface .
+.It Cm autoedge Ar interface
+Allow
+.Ar interface
+to automatically detect edge status.
+This is the default for all interfaces added to a bridge.
+.It Cm -autoedge Ar interface
+Disable automatic edge status on 
+.Ar interface .
 .It Cm maxage Ar seconds
 Set the time that a Spanning Tree protocol configuration is valid.
 The default is 20 seconds.
-The minimum is 1 second and the maximum is 255 seconds.
+The minimum is 6 seconds and the maximum is 40 seconds.
 .It Cm fwddelay Ar seconds
 Set the time that must pass before an interface begins forwarding
 packets when Spanning Tree is enabled.
 The default is 15 seconds.
-The minimum is 1 second and the maximum is 255 seconds.
+The minimum is 4 seconds and the maximum is 30 seconds.
 .It Cm hellotime Ar seconds
 Set the time between broadcasting of Spanning Tree protocol
 configuration messages.
+The hello time may only be changed when operating in legacy stp mode.
 The default is 2 seconds.
-The minimum is 1 second and the maximum is 255 seconds.
+The minimum is 1 second and the maximum is 2 seconds.
 .It Cm priority Ar value
 Set the bridge priority for Spanning Tree.
 The default is 32768.
-The minimum is 0 and the maximum is 65536.
+The minimum is 0 and the maximum is 61440.
+.It Cm protocol Ar value
+Set the Spanning Tree protocol.
+The default is rstp.
+The available options are stp and rstp.
+.It Cm holdcount Ar value
+Set the transmit hold count for Spanning Tree.
+This is the number of packets transmitted before being rate limited.
+The default is 6.
+The minimum is 1 and the maximum is 10.
 .It Cm ifpriority Ar interface Ar value
 Set the Spanning Tree priority of
 .Ar interface
 to
 .Ar value .
 The default is 128.
-The minimum is 0 and the maximum is 255.
+The minimum is 0 and the maximum is 240.
 .It Cm ifpathcost Ar interface Ar value
 Set the Spanning Tree path cost of
 .Ar interface
 to
 .Ar value .
-The default is 55.
-The minimum is 0 and the maximum is 65535.
+The default is calculated from the link speed.
+To change a previously selected path cost back to automatic, set the
+cost to 0.
+The minimum is 1 and the maximum is 200000000.
 .El
 .Pp
 The following parameters are specific to IP tunnel interfaces,

==== //depot/projects/dtrace/src/share/man/man3/pthread_create.3#5 (text+ko) ====

@@ -28,9 +28,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.20 2006/09/30 11:22:25 ru Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.22 2006/11/01 04:46:06 maxim Exp $
 .\"
-.Dd April 4, 1996
+.Dd November 1, 2006
 .Dt PTHREAD_CREATE 3
 .Os
 .Sh NAME
@@ -108,6 +108,9 @@
 The system lacked the necessary resources to create another thread, or
 the system-imposed limit on the total number of threads in a process
 [PTHREAD_THREADS_MAX] would be exceeded.
+.It Bq Er EPERM
+The caller does not have appropriate permission to set the required scheduling
+parameters or scheduling policy.
 .It Bq Er EINVAL
 The value specified by
 .Fa attr

==== //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_sony.4#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/share/man/man4/man4.i386/acpi_sony.4,v 1.3 2006/04/01 11:21:00 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_sony.4,v 1.4 2006/11/01 03:45:24 kevlo Exp $
 .\"
 .Dd September 14, 2005
 .Dt ACPI_SONY 4 i386
@@ -53,6 +53,8 @@
 .Bl -tag -width indent
 .It Va dev.acpi_sony.0.brightness
 Current brightness level of the display.
+.It Va dev.acpi_sony.0.cdp
+Turns the CD power on or off.
 .El
 .Sh SEE ALSO
 .Xr acpi 4 ,

==== //depot/projects/dtrace/src/share/man/man9/g_bio.9#4 (text+ko) ====

@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2004 Pawel Jakub Dawidek <pjd at FreeBSD.org>
+.\" Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd at FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -22,9 +22,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/man9/g_bio.9,v 1.9 2004/08/04 21:35:05 pjd Exp $
+.\" $FreeBSD: src/share/man/man9/g_bio.9,v 1.12 2006/11/01 12:44:28 pjd Exp $
 .\"
-.Dd January 16, 2004
+.Dd November 1, 2006
 .Dt G_BIO 9
 .Os
 .Sh NAME
@@ -39,7 +39,11 @@
 .Ft "struct bio *"
 .Fn g_new_bio void
 .Ft "struct bio *"
+.Fn g_alloc_bio void
+.Ft "struct bio *"
 .Fn g_clone_bio "struct bio *bp"
+.Ft "struct bio *"
+.Fn g_duplicate_bio "struct bio *bp"
 .Ft void
 .Fn g_destroy_bio "struct bio *bp"
 .Ft void
@@ -71,6 +75,8 @@
 Attributes are named by ascii strings and are stored in the
 .Va bio_attribute
 field.
+.It Dv BIO_FLUSH
+Tells underlying providers to flush their write caches.
 .El
 .It Va bio_flags
 Available flags:
@@ -138,6 +144,13 @@
 .Vt bio
 structure.
 .Pp
+.Fn g_alloc_bio
+- same as
+.Fn g_new_bio ,
+but always succeeds (allocates bio with the
+.Dv M_WAITOK
+malloc flag).
+.Pp
 The
 .Fn g_clone_bio
 function allocates a new
@@ -174,6 +187,13 @@
 Schedule the clone on its own consumer.
 .El
 .Pp
+.Fn g_duplicate_bio
+- same as
+.Fn g_clone_bio ,
+but always succeeds (allocates bio with the
+.Dv M_WAITOK
+malloc flag).
+.Pp
 The
 .Fn g_destroy_bio
 function deallocates and destroys the given

==== //depot/projects/dtrace/src/share/misc/bsd-family-tree#8 (text+ko) ====

@@ -203,7 +203,9 @@
  |  FreeBSD  |        |      |    |            |                       |
  |    6.1    |        |      |    |            |                       |
  |     |  FreeBSD 5.5 |      |    |            |                       |
- |     V              |      |   NetBSD 3.0.1  |                 DragonFly 1.6.0
+ |     |              |      |   NetBSD 3.0.1  |                 DragonFly 1.6.0
+ |     |              |      |                 |                       |
+ |     V              |      |             OpenBSD 4.0                 |
  |                    |      |                 |                       |
 FreeBSD 7 -current    |  NetBSD -current  OpenBSD -current             |
  |                    |      |                 |                       |
@@ -451,6 +453,7 @@
 FreeBSD 5.5		2006-05-25 [FBD]
 NetBSD 3.0.1		2006-07-24 [NBD] (security/critical release)
 DragonFly 1.6.0		2006-07-24 [DFB]
+OpenBSD 4.0		2006-11-01 [OBD]
 
 Bibliography
 ------------------------
@@ -511,4 +514,4 @@
 Copyright (c) 1997-2004 Wolfram Schneider <wosch at FreeBSD.ORG>
 URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

More information about the p4-projects mailing list