From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 13 10:24:36 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89790106566B; Sun, 13 Feb 2011 10:24:36 +0000 (UTC) (envelope-from simon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 779528FC0C; Sun, 13 Feb 2011 10:24:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1DAOa7S033961; Sun, 13 Feb 2011 10:24:36 GMT (envelope-from simon@svn.freebsd.org) Received: (from simon@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1DAOap4033959; Sun, 13 Feb 2011 10:24:36 GMT (envelope-from simon@svn.freebsd.org) Message-Id: <201102131024.p1DAOap4033959@svn.freebsd.org> From: "Simon L. Nielsen" Date: Sun, 13 Feb 2011 10:24:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218634 - stable/7/crypto/openssl/ssl X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Feb 2011 10:24:36 -0000 Author: simon Date: Sun Feb 13 10:24:36 2011 New Revision: 218634 URL: http://svn.freebsd.org/changeset/base/218634 Log: MFC 218625: Fix Incorrectly formatted ClientHello SSL/TLS handshake messages could cause OpenSSL to parse past the end of the message. Note: Applications are only affected if they act as a server and call SSL_CTX_set_tlsext_status_cb on the server's SSL_CTX. This includes Apache httpd >= 2.3.3, if configured with "SSLUseStapling On". The very quick MFC is done to get this fix into 7.4 / 8.2. Discussed with: re Approved by: so (simon, for "instant" MFC) Obtained from: OpenSSL CVS Security: http://www.openssl.org/news/secadv_20110208.txt Security: CVE-2011-0014 Modified: stable/7/crypto/openssl/ssl/t1_lib.c Directory Properties: stable/7/crypto/openssl/ (props changed) Modified: stable/7/crypto/openssl/ssl/t1_lib.c ============================================================================== --- stable/7/crypto/openssl/ssl/t1_lib.c Sun Feb 13 10:22:43 2011 (r218633) +++ stable/7/crypto/openssl/ssl/t1_lib.c Sun Feb 13 10:24:36 2011 (r218634) @@ -521,6 +521,7 @@ int ssl_parse_clienthello_tlsext(SSL *s, } n2s(data, idsize); dsize -= 2 + idsize; + size -= 2 + idsize; if (dsize < 0) { *al = SSL_AD_DECODE_ERROR; @@ -559,9 +560,14 @@ int ssl_parse_clienthello_tlsext(SSL *s, } /* Read in request_extensions */ + if (size < 2) + { + *al = SSL_AD_DECODE_ERROR; + return 0; + } n2s(data,dsize); size -= 2; - if (dsize > size) + if (dsize != size) { *al = SSL_AD_DECODE_ERROR; return 0; From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 13 16:18:22 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C50B7106564A; Sun, 13 Feb 2011 16:18:22 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B30A78FC1B; Sun, 13 Feb 2011 16:18:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1DGIMok044021; Sun, 13 Feb 2011 16:18:22 GMT (envelope-from jpaetzel@svn.freebsd.org) Received: (from jpaetzel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1DGIMIs044019; Sun, 13 Feb 2011 16:18:22 GMT (envelope-from jpaetzel@svn.freebsd.org) Message-Id: <201102131618.p1DGIMIs044019@svn.freebsd.org> From: Josh Paetzel Date: Sun, 13 Feb 2011 16:18:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218644 - stable/7/share/man/man4 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Feb 2011 16:18:22 -0000 Author: jpaetzel Date: Sun Feb 13 16:18:22 2011 New Revision: 218644 URL: http://svn.freebsd.org/changeset/base/218644 Log: MFC 218523: Netgear renamed the WG311 to the WG311v1 after they released a second version of it. There is also a WG311v3 which uses a chipset covered by malo(4). Along the way add the WG311T to the list which is also an atheros chipset. Approved by: kib (mentor) Modified: stable/7/share/man/man4/ath_hal.4 Directory Properties: stable/7/share/man/man4/ (props changed) Modified: stable/7/share/man/man4/ath_hal.4 ============================================================================== --- stable/7/share/man/man4/ath_hal.4 Sun Feb 13 15:15:47 2011 (r218643) +++ stable/7/share/man/man4/ath_hal.4 Sun Feb 13 16:18:22 2011 (r218644) @@ -82,7 +82,9 @@ module: .It "Netgear WAG311 AR5212 PCI a/b/g" .It "Netgear WAB501 AR5211 CardBus a/b" .It "Netgear WAG511 AR5212 CardBus a/b/g" -.It "Netgear WG311 AR5212 PCI b/g" +.It "Netgear WG311 (aka WG311v1) AR5212 PCI b/g" +.It "Netgear WG311v2 AR5212 PCI b/g" +.It "Netgear WG311T AR5212 PCI b/g" .It "Netgear WG511T AR5212 CardBus b/g" .It "Orinoco 8480 AR5212 CardBus a/b/g" .It "Orinoco 8470WD AR5212 CardBus a/b/g" From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 13 18:00:06 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7532A106564A; Sun, 13 Feb 2011 18:00:05 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 535A08FC08; Sun, 13 Feb 2011 18:00:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1DI05qZ046388; Sun, 13 Feb 2011 18:00:05 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1DI05bI046386; Sun, 13 Feb 2011 18:00:05 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102131800.p1DI05bI046386@svn.freebsd.org> From: Bruce Cran Date: Sun, 13 Feb 2011 18:00:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218647 - stable/7/share/man/man9 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Feb 2011 18:00:06 -0000 Author: brucec Date: Sun Feb 13 18:00:05 2011 New Revision: 218647 URL: http://svn.freebsd.org/changeset/base/218647 Log: MFC r216156: Document the fact that passing in a count of zero to the bus_space functions will result in undefined behaviour. Taken from NetBSD's bus_space(9). PR: kern/80980 Modified: stable/7/share/man/man9/bus_space.9 Directory Properties: stable/7/share/man/man9/ (props changed) Modified: stable/7/share/man/man9/bus_space.9 ============================================================================== --- stable/7/share/man/man9/bus_space.9 Sun Feb 13 17:56:22 2011 (r218646) +++ stable/7/share/man/man9/bus_space.9 Sun Feb 13 18:00:05 2011 (r218647) @@ -719,6 +719,9 @@ or which return data read from bus space do not obviously return an error code) do not fail. They could only fail if given invalid arguments, and in that case their behaviour is undefined. +Functions which take a count of bytes have undefined results if the specified +.Fa count +is zero. .Sh TYPES Several types are defined in .In machine/bus.h From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 13 19:07:17 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E476810656C0; Sun, 13 Feb 2011 19:07:17 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B81B08FC08; Sun, 13 Feb 2011 19:07:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1DJ7HFQ048619; Sun, 13 Feb 2011 19:07:17 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1DJ7Hpa048617; Sun, 13 Feb 2011 19:07:17 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201102131907.p1DJ7Hpa048617@svn.freebsd.org> From: Ulrich Spoerlein Date: Sun, 13 Feb 2011 19:07:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218657 - stable/7/usr.bin/getopt X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Feb 2011 19:07:18 -0000 Author: uqs Date: Sun Feb 13 19:07:17 2011 New Revision: 218657 URL: http://svn.freebsd.org/changeset/base/218657 Log: MFH r209772,217890 Fix an error in the EXAMPLES section of getopt(1), which is based on the same fix present in NetBSD. Fix typo in example getopt(1) script: $i vs $1 [1] While here apply style hammer. PR: docs/133118, docs/154289 [1] Submitted by: Oleg A. Mamontov, Jamie Landeg Jones Modified: stable/7/usr.bin/getopt/getopt.1 Directory Properties: stable/7/usr.bin/getopt/ (props changed) Modified: stable/7/usr.bin/getopt/getopt.1 ============================================================================== --- stable/7/usr.bin/getopt/getopt.1 Sun Feb 13 19:02:26 2011 (r218656) +++ stable/7/usr.bin/getopt/getopt.1 Sun Feb 13 19:07:17 2011 (r218657) @@ -1,6 +1,6 @@ .\" $FreeBSD$ .\" -.Dd April 3, 1999 +.Dd January 26, 2011 .Dt GETOPT 1 .Os .Sh NAME @@ -55,8 +55,7 @@ which requires an argument. args=\`getopt abo: $*\` # you should not use \`getopt abo: "$@"\` since that would parse # the arguments differently from what the set command below does. -if [ $? -ne 0 ] -then +if [ $? -ne 0 ]; then echo 'Usage: ...' exit 2 fi @@ -64,22 +63,23 @@ set \-\- $args # You cannot use the set command with a backquoted getopt directly, # since the exit code from getopt would be shadowed by those of set, # which is zero by definition. -for i -do - case "$i" - in - \-a|\-b) - echo flag $i set; sflags="${i#-}$sflags"; - shift;; - \-o) - echo oarg is "'"$2"'"; oarg="$2"; shift; - shift;; - \-\-) - shift; break;; +while true; do + case "$1" in + \-a|\-b) + echo "flag $1 set"; sflags="${1#-}$sflags" + shift + ;; + \-o) + echo "oarg is '$2'"; oarg="$2" + shift; shift + ;; + \-\-) + shift; break + ;; esac done -echo single-char flags: "'"$sflags"'" -echo oarg is "'"$oarg"'" +echo "single-char flags: '$sflags'" +echo "oarg is '$oarg'" .Ed .Pp This code will accept any of the following as equivalent: From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 13 22:09:33 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D531E106564A; Sun, 13 Feb 2011 22:09:33 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BFED68FC19; Sun, 13 Feb 2011 22:09:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1DM9XbR063448; Sun, 13 Feb 2011 22:09:33 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1DM9XdB063439; Sun, 13 Feb 2011 22:09:33 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201102132209.p1DM9XdB063439@svn.freebsd.org> From: Ulrich Spoerlein Date: Sun, 13 Feb 2011 22:09:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218671 - in stable/7: contrib/groff/font/devutf8 contrib/groff/tmac gnu/usr.bin/groff/tmac X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Feb 2011 22:09:33 -0000 Author: uqs Date: Sun Feb 13 22:09:33 2011 New Revision: 218671 URL: http://svn.freebsd.org/changeset/base/218671 Log: MFH r202358,217595: Pull up vendor changes. The following local changes made obsolete: - Addition of several FreeBSD versions. - r192561 that attempted to fix UTF-8 issues. Update groff manpage and symbols with what has been submitted upstream. Also remove local overrides that are now in the contrib tree. Modified: stable/7/contrib/groff/font/devutf8/R.proto stable/7/contrib/groff/tmac/an-old.tmac stable/7/contrib/groff/tmac/doc-common stable/7/contrib/groff/tmac/doc-old.tmac stable/7/contrib/groff/tmac/doc-syms stable/7/contrib/groff/tmac/doc.tmac stable/7/contrib/groff/tmac/groff_mdoc.man stable/7/gnu/usr.bin/groff/tmac/mdoc.local (contents, props changed) Directory Properties: stable/7/contrib/groff/ (props changed) stable/7/gnu/usr.bin/groff/ (props changed) Modified: stable/7/contrib/groff/font/devutf8/R.proto ============================================================================== --- stable/7/contrib/groff/font/devutf8/R.proto Sun Feb 13 21:52:26 2011 (r218670) +++ stable/7/contrib/groff/font/devutf8/R.proto Sun Feb 13 22:09:33 2011 (r218671) @@ -726,7 +726,7 @@ st 24 0 0x220B product 24 0 0x220F coproduct 24 0 0x2210 sum 24 0 0x2211 -\- 24 0 0x002D +\- 24 0 0x2212 mi " -+ 24 0 0x2213 ** 24 0 0x2217 Modified: stable/7/contrib/groff/tmac/an-old.tmac ============================================================================== --- stable/7/contrib/groff/tmac/an-old.tmac Sun Feb 13 21:52:26 2011 (r218670) +++ stable/7/contrib/groff/tmac/an-old.tmac Sun Feb 13 22:09:33 2011 (r218671) @@ -630,6 +630,18 @@ . hy \n[HY] .\} . +.\" For UTF-8, map some characters conservatively for the sake +.\" of easy cut and paste. +. +.if '\*[.T]'utf8' \{\ +. rchar \- - ' ` +. +. char \- \N'45' +. char - \N'45' +. char ' \N'39' +. char ` \N'96' +.\} +. .\" Load local modifications. .mso man.local . Modified: stable/7/contrib/groff/tmac/doc-common ============================================================================== --- stable/7/contrib/groff/tmac/doc-common Sun Feb 13 21:52:26 2011 (r218670) +++ stable/7/contrib/groff/tmac/doc-common Sun Feb 13 22:09:33 2011 (r218671) @@ -46,6 +46,7 @@ .nr %Q 1 .nr %R 1 .nr %T 1 +.nr %U 1 .nr %V 1 .nr Ac 3 .nr Ad 12n @@ -77,6 +78,7 @@ .nr Dq 12n .nr Ds 6n\" many manpages still use this as a -width value .nr Dv 12n +.nr Dx 1 .nr Ec 3 .nr Ef 8n\" ? .nr Ek 8n\" ? @@ -219,6 +221,7 @@ .\" NS doc-document-title .\" NS doc-section .\" NS doc-volume +.\" NS doc-command-name .\" NS .\" NS local variables: .\" NS doc-volume-as-XXX @@ -319,6 +322,7 @@ . ds doc-document-title UNTITLED . ds doc-volume LOCAL . ds doc-section Null +. ds doc-command-name . . if !"\$1"" \ . ds doc-document-title "\$1 @@ -357,6 +361,12 @@ . if !"\$3"" \ . if "\*[doc-volume]"LOCAL" \ . ds doc-volume \$3 +. +. if !\n[cR] \ +. if \n[nl] \{\ + . doc-setup-header +. bp +. \} .. . . @@ -379,6 +389,7 @@ .\" NS .\" NS modifies: .\" NS doc-operating-system +.\" NS doc-command-name .\" NS .\" NS local variables: .\" NS doc-operating-system-XXX-XXX @@ -435,9 +446,47 @@ .ds doc-operating-system-NetBSD-2.0 2.0 .ds doc-operating-system-NetBSD-2.0.1 2.0.1 .ds doc-operating-system-NetBSD-2.0.2 2.0.2 +.ds doc-operating-system-NetBSD-2.0.3 2.0.3 .ds doc-operating-system-NetBSD-2.1 2.1 .ds doc-operating-system-NetBSD-3.0 3.0 +.ds doc-operating-system-NetBSD-3.0.1 3.0.1 +.ds doc-operating-system-NetBSD-3.0.2 3.0.2 +.ds doc-operating-system-NetBSD-3.1 3.1 .ds doc-operating-system-NetBSD-4.0 4.0 +.ds doc-operating-system-NetBSD-4.0.1 4.0.1 +.ds doc-operating-system-NetBSD-5.0 5.0 +.ds doc-operating-system-NetBSD-5.0.1 5.0.1 +.ds doc-operating-system-NetBSD-5.0.2 5.0.2 +. +.ds doc-operating-system-OpenBSD-2.0 2.0 +.ds doc-operating-system-OpenBSD-2.1 2.1 +.ds doc-operating-system-OpenBSD-2.2 2.2 +.ds doc-operating-system-OpenBSD-2.3 2.3 +.ds doc-operating-system-OpenBSD-2.4 2.4 +.ds doc-operating-system-OpenBSD-2.5 2.5 +.ds doc-operating-system-OpenBSD-2.6 2.6 +.ds doc-operating-system-OpenBSD-2.7 2.7 +.ds doc-operating-system-OpenBSD-2.8 2.8 +.ds doc-operating-system-OpenBSD-2.9 2.9 +.ds doc-operating-system-OpenBSD-3.0 3.0 +.ds doc-operating-system-OpenBSD-3.1 3.1 +.ds doc-operating-system-OpenBSD-3.2 3.2 +.ds doc-operating-system-OpenBSD-3.3 3.3 +.ds doc-operating-system-OpenBSD-3.4 3.4 +.ds doc-operating-system-OpenBSD-3.5 3.5 +.ds doc-operating-system-OpenBSD-3.6 3.6 +.ds doc-operating-system-OpenBSD-3.7 3.7 +.ds doc-operating-system-OpenBSD-3.8 3.8 +.ds doc-operating-system-OpenBSD-3.9 3.9 +.ds doc-operating-system-OpenBSD-4.0 4.0 +.ds doc-operating-system-OpenBSD-4.1 4.1 +.ds doc-operating-system-OpenBSD-4.2 4.2 +.ds doc-operating-system-OpenBSD-4.3 4.3 +.ds doc-operating-system-OpenBSD-4.4 4.4 +.ds doc-operating-system-OpenBSD-4.5 4.5 +.ds doc-operating-system-OpenBSD-4.6 4.6 +.ds doc-operating-system-OpenBSD-4.7 4.7 +.ds doc-operating-system-OpenBSD-4.8 4.8 . .ds doc-operating-system-FreeBSD-1.0 1.0 .ds doc-operating-system-FreeBSD-1.1 1.1 @@ -486,23 +535,56 @@ .ds doc-operating-system-FreeBSD-6.0 6.0 .ds doc-operating-system-FreeBSD-6.1 6.1 .ds doc-operating-system-FreeBSD-6.2 6.2 +.ds doc-operating-system-FreeBSD-6.3 6.3 +.ds doc-operating-system-FreeBSD-6.4 6.4 .ds doc-operating-system-FreeBSD-7.0 7.0 -. -.ds doc-operating-system-Darwin-8.0.0 8.0.0 -.ds doc-operating-system-Darwin-8.1.0 8.1.0 -.ds doc-operating-system-Darwin-8.2.0 8.2.0 -.ds doc-operating-system-Darwin-8.3.0 8.3.0 -.ds doc-operating-system-Darwin-8.4.0 8.4.0 -.ds doc-operating-system-Darwin-8.5.0 8.5.0 -. -.ds doc-operating-system-DragonFly-1.0 1.0 -.ds doc-operating-system-DragonFly-1.1 1.1 -.ds doc-operating-system-DragonFly-1.2 1.2 -.ds doc-operating-system-DragonFly-1.3 1.3 -.ds doc-operating-system-DragonFly-1.4 1.4 -.ds doc-operating-system-DragonFly-1.5 1.5 +.ds doc-operating-system-FreeBSD-7.1 7.1 +.ds doc-operating-system-FreeBSD-7.2 7.2 +.ds doc-operating-system-FreeBSD-7.3 7.3 +.ds doc-operating-system-FreeBSD-8.0 8.0 +.ds doc-operating-system-FreeBSD-8.1 8.1 +. +.ds doc-operating-system-Darwin-8.0.0 8.0.0 +.ds doc-operating-system-Darwin-8.1.0 8.1.0 +.ds doc-operating-system-Darwin-8.2.0 8.2.0 +.ds doc-operating-system-Darwin-8.3.0 8.3.0 +.ds doc-operating-system-Darwin-8.4.0 8.4.0 +.ds doc-operating-system-Darwin-8.5.0 8.5.0 +.ds doc-operating-system-Darwin-8.6.0 8.6.0 +.ds doc-operating-system-Darwin-8.7.0 8.7.0 +.ds doc-operating-system-Darwin-8.8.0 8.8.0 +.ds doc-operating-system-Darwin-8.9.0 8.9.0 +.ds doc-operating-system-Darwin-8.10.0 8.10.0 +.ds doc-operating-system-Darwin-8.11.0 8.11.0 +.ds doc-operating-system-Darwin-9.0.0 9.0.0 +.ds doc-operating-system-Darwin-9.1.0 9.1.0 +.ds doc-operating-system-Darwin-9.2.0 9.2.0 +.ds doc-operating-system-Darwin-9.3.0 9.3.0 +.ds doc-operating-system-Darwin-9.4.0 9.4.0 +.ds doc-operating-system-Darwin-9.5.0 9.5.0 +.ds doc-operating-system-Darwin-9.6.0 9.6.0 +. +.ds doc-operating-system-DragonFly-1.0 1.0 +.ds doc-operating-system-DragonFly-1.1 1.1 +.ds doc-operating-system-DragonFly-1.2 1.2 +.ds doc-operating-system-DragonFly-1.3 1.3 +.ds doc-operating-system-DragonFly-1.4 1.4 +.ds doc-operating-system-DragonFly-1.5 1.5 +.ds doc-operating-system-DragonFly-1.6 1.6 +.ds doc-operating-system-DragonFly-1.8 1.8 +.ds doc-operating-system-DragonFly-1.8.1 1.8.1 +.ds doc-operating-system-DragonFly-1.10 1.10 +.ds doc-operating-system-DragonFly-1.12 1.12 +.ds doc-operating-system-DragonFly-1.12.2 1.12.2 +.ds doc-operating-system-DragonFly-2.0 2.0 +.ds doc-operating-system-DragonFly-2.2 2.2 +.ds doc-operating-system-DragonFly-2.4 2.4 +.ds doc-operating-system-DragonFly-2.6 2.6 +.ds doc-operating-system-DragonFly-2.8 2.8 . .de Os +. ds doc-command-name +. . ie "\$1"" \ . ds doc-operating-system "\*[doc-default-operating-system] . el \{ .ie "\$1"ATT" \{\ @@ -528,6 +610,14 @@ . el \ . tm mdoc warning: .Os: Unknown FreeBSD version `\$2' (#\n[.c]) . \}\} +. el \{ .ie "\$1"DragonFly" \{\ +. ds doc-operating-system DragonFly +. if \A\$2 \{\ +. ie d doc-operating-system-DragonFly-\$2 \ +. as doc-operating-system \~\*[doc-operating-system-DragonFly-\$2] +. el \ +. tm mdoc warning: .Os: Unknown DragonFly version `\$2' (#\n[.c]) +. \}\} . el \{ .ie "\$1"NetBSD" \{\ . ds doc-operating-system NetBSD . if \A\$2 \{\ @@ -536,6 +626,14 @@ . el \ . tm mdoc warning: .Os: Unknown NetBSD version `\$2' (#\n[.c]) . \}\} +. el \{ .ie "\$1"OpenBSD" \{\ +. ds doc-operating-system OpenBSD +. if \A\$2 \{\ +. ie d doc-operating-system-OpenBSD-\$2 \ +. as doc-operating-system \~\*[doc-operating-system-OpenBSD-\$2] +. el \ +. tm mdoc warning: .Os: Unknown OpenBSD version `\$2' (#\n[.c]) +. \}\} . el \{ .ie "\$1"Darwin" \{\ . ds doc-operating-system Darwin . if \A\$2 \{\ @@ -548,7 +646,7 @@ . ds doc-operating-system \$1 . if !"\$2"" \ . as doc-operating-system " \$2 -. \}\}\}\}\}\} +. \}\}\}\}\}\}\}\} .. . . @@ -563,6 +661,7 @@ .\" NS .\" NS modifies: .\" NS doc-date-string +.\" NS doc-command-name .\" NS .\" NS local variables: .\" NS doc-date-XXX @@ -583,6 +682,8 @@ .ds doc-date-12 December . .de Dd +. ds doc-command-name +. . ie \n[.$] \{\ . ie (\n[.$] == 3) \ . ds doc-date-string \$1\~\$2 \$3 @@ -1128,6 +1229,8 @@ . tm doc-reference-title-count == \n[doc-reference-title-count] . tm doc-reference-title-name == `\*[doc-reference-title-name]' . tm doc-reference-title-name-for-book == `\*[doc-reference-title-name-for-book]' +. tm doc-url-count == \n[doc-url-count] +. tm doc-url-name == `\*[doc-url-name]' . tm doc-volume-count == \n[doc-volume-count] . tm doc-volume-name == `\*[doc-volume-name]' . tm doc-have-author == \n[doc-have-author] Modified: stable/7/contrib/groff/tmac/doc-old.tmac ============================================================================== --- stable/7/contrib/groff/tmac/doc-old.tmac Sun Feb 13 21:52:26 2011 (r218670) +++ stable/7/contrib/groff/tmac/doc-old.tmac Sun Feb 13 22:09:33 2011 (r218671) @@ -40,7 +40,7 @@ .ds aD \fI .\" Argument Reference Style .ds aR \f(CO -.\" Interactive Comand Modifier (flag) +.\" Interactive Command Modifier (flag) .ds cM \f(CB .\" Emphasis (in the English sense - usually italics) .ds eM \fI Modified: stable/7/contrib/groff/tmac/doc-syms ============================================================================== --- stable/7/contrib/groff/tmac/doc-syms Sun Feb 13 21:52:26 2011 (r218670) +++ stable/7/contrib/groff/tmac/doc-syms Sun Feb 13 22:09:33 2011 (r218671) @@ -637,6 +637,8 @@ .as doc-str-St--p1003.1-2001 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) .ds doc-str-St--p1003.1-2004 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2004 .as doc-str-St--p1003.1-2004 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +.ds doc-str-St--p1003.1-2008 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008 +.as doc-str-St--p1003.1-2008 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) . .\" POSIX Part 2: Shell and Utilities .ds doc-str-St--p1003.2 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2 @@ -651,6 +653,8 @@ .\" X/Open .ds doc-str-St--susv2 Version\~2 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification .as doc-str-St--susv2 " (\*[Lq]\*[doc-Tn-font-size]SUSv2\*[doc-str-St]\*[Rq]) +.ds doc-str-St--susv3 Version\~3 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification +.as doc-str-St--susv3 " (\*[Lq]\*[doc-Tn-font-size]SUSv3\*[doc-str-St]\*[Rq]) .ds doc-str-St--svid4 System\~V Interface Definition, Fourth Edition .as doc-str-St--svid4 " (\*[Lq]\*[doc-Tn-font-size]SVID\*[doc-str-St]\^4\*[Rq]) .ds doc-str-St--xbd5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] System Interface Definitions Issue\~5 Modified: stable/7/contrib/groff/tmac/doc.tmac ============================================================================== --- stable/7/contrib/groff/tmac/doc.tmac Sun Feb 13 21:52:26 2011 (r218670) +++ stable/7/contrib/groff/tmac/doc.tmac Sun Feb 13 22:09:33 2011 (r218671) @@ -356,10 +356,10 @@ . ds doc-macro-name Fl . doc-parse-args \$@ . -. if !\n[.$] \{\ -. \" no arguments +. \" no arguments +. if !\n[.$] \ . nop \|\-\|\f[]\s[0] -. \}\} +. \} . . if !\n[doc-arg-limit] \ . return @@ -481,8 +481,8 @@ . el \{\ . nr doc-reg-dpr \n[doc-arg-ptr] . +. \" the `\%' prevents hyphenation on a dash (`-') . ie (\n[doc-reg-dpr1] == 2) \ -. \" the `\%' prevents hyphenation on a dash (`-') . nop \%\*[doc-str-dpr]\&\c . el \{\ . \" punctuation character @@ -595,10 +595,10 @@ . ds doc-macro-name Ar . doc-parse-args \$@ . -. if !\n[.$] \{\ -. \" no argument +. \" no argument +. if !\n[.$] \ . nop \)\*[doc-str-Ar-default]\&\f[]\s[0] -. \}\} +. \} . . if !\n[doc-arg-limit] \ . return @@ -1034,10 +1034,10 @@ . ds doc-macro-name Pa . doc-parse-args \$@ . -. if !\n[.$] \{\ -. \" default value +. \" default value +. if !\n[.$] \ . nop \*[doc-Pa-font]~\f[]\s[0] -. \}\} +. \} . . if !\n[doc-arg-limit] \ . return @@ -3430,6 +3430,8 @@ . nr doc-reference-title-count-saved \n[doc-reference-title-count] . ds doc-reference-title-name-saved "\*[doc-reference-title-name] . ds doc-reference-title-name-for-book-saved "\*[doc-reference-title-name-for-book] +. nr doc-url-count-saved \n[doc-url-count] +. ds doc-url-name-saved "\*[doc-url-name] . nr doc-volume-count-saved \n[doc-volume-count] . ds doc-volume-name-saved "\*[doc-volume-name] . nr doc-have-author-saved \n[doc-have-author] @@ -3570,6 +3572,8 @@ . nr doc-reference-title-count \n[doc-reference-title-count-saved] . ds doc-reference-title-name "\*[doc-reference-title-name-saved] . ds doc-reference-title-name-for-book "\*[doc-reference-title-name-for-book-saved] +. nr doc-url-count \n[doc-url-count-saved] +. ds doc-url-name "\*[doc-url-name-saved] . nr doc-volume-count \n[doc-volume-count-saved] . ds doc-volume-name "\*[doc-volume-name-saved] . nr doc-have-author \n[doc-have-author-saved] @@ -5194,6 +5198,8 @@ .\" NS doc-reference-title-name-for-book .\" NS doc-report-count .\" NS doc-report-name +.\" NS doc-url-count +.\" NS doc-url-name .\" NS doc-volume-count .\" NS doc-volume-name . @@ -5208,6 +5214,7 @@ . nr doc-corporate-count 0 . nr doc-report-count 0 . nr doc-reference-title-count 0 +. nr doc-url-count 0 . nr doc-volume-count 0 . nr doc-date-count 0 . nr doc-page-number-count 0 @@ -5222,6 +5229,7 @@ . ds doc-report-name . ds doc-reference-title-name . ds doc-reference-title-name-for-book +. ds doc-url-name . ds doc-volume-name . ds doc-date . ds doc-page-number-string @@ -5316,6 +5324,13 @@ . doc-finish-reference \n[doc-volume-count] . \} . +. if \n[doc-url-count] \{\ +. unformat doc-url-name +. chop doc-url-name +. nop \*[doc-url-name]\c +. doc-finish-reference \n[doc-url-count] +. \} +. . if \n[doc-page-number-count] \{\ . unformat doc-page-number-string . chop doc-page-number-string @@ -6019,6 +6034,18 @@ .. . . +.\" NS doc-url-count global register +.\" NS counter of hypertext references +. +.nr doc-url-count 0 +. +. +.\" NS doc-url-name global box +.\" NS string of collected hypertext references +. +.ds doc-url-name +. +. .\" NS doc-volume-count global register .\" NS counter of reference title references . @@ -6031,6 +6058,48 @@ .ds doc-volume-name . . +.\" NS %U user macro +.\" NS hypertext reference +.\" NS +.\" NS modifies: +.\" NS doc-arg-ptr +.\" NS doc-curr-font +.\" NS doc-curr-size +.\" NS doc-macro-name +.\" NS doc-reference-count +.\" NS doc-url-count +.\" NS +.\" NS local variables: +.\" NS doc-env-%U +.\" NS +.\" NS width register `%U' set in doc-common +. +.de %U +. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +. tm Usage: .%U URL ... (#\n[.c]) +. return +. \} +. +. nr doc-url-count +1 +. nr doc-reference-count +1 +. +. ds doc-macro-name %U +. doc-parse-args \$@ +. +. nr doc-arg-ptr +1 +. nr doc-curr-font \n[.f] +. nr doc-curr-size \n[.ps] +. +. \" append to reference box +. boxa doc-url-name +. ev doc-env-%U +. evc 0 +. in 0 +. nf +. doc-do-references +.. +. +. .\" NS %V user macro .\" NS reference volume .\" NS @@ -6039,7 +6108,7 @@ .\" NS doc-curr-font .\" NS doc-curr-size .\" NS doc-macro-name -.\" NS doc-reference-title-count +.\" NS doc-reference-count .\" NS doc-volume-count .\" NS .\" NS local variables: @@ -6428,6 +6497,19 @@ .ec . . +.\" For UTF-8, map some characters conservatively for the sake +.\" of easy cut and paste. +. +.if '\*[.T]'utf8' \{\ +. rchar \- - ' ` +. +. char \- \N'45' +. char - \N'45' +. char ' \N'39' +. char ` \N'96' +.\} +. +. .\" load local modifications .mso mdoc.local . Modified: stable/7/contrib/groff/tmac/groff_mdoc.man ============================================================================== --- stable/7/contrib/groff/tmac/groff_mdoc.man Sun Feb 13 21:52:26 2011 (r218670) +++ stable/7/contrib/groff/tmac/groff_mdoc.man Sun Feb 13 22:09:33 2011 (r218671) @@ -44,9 +44,9 @@ .\" for an already extremely slow package. .\" . -.Dd January 5, 2006 -.Os +.Dd November 2, 2010 .Dt GROFF_MDOC 7 +.Os . . .Sh NAME @@ -563,8 +563,8 @@ The body of a man page is easily constru .Bd -literal -offset indent \&.\e" The following commands are required for all man pages. \&.Dd Month day, year -\&.Os [OPERATING_SYSTEM] [version/release] \&.Dt DOCUMENT_TITLE [section number] [architecture/volume] +\&.Os [OPERATING_SYSTEM] [version/release] \&.Sh NAME \&.Nm name \&.Nd one line description of name @@ -600,9 +600,9 @@ The body of a man page is easily constru . The first items in the template are the commands .Ql .Dd , -.Ql .Os , +.Ql .Dt , and -.Ql .Dt ; +.Ql .Os ; the document date, the operating system the man page or subject source is developed or modified for, and the man page title (in .Em upper case ) @@ -856,7 +856,7 @@ is the acronym for the operating system the release ID. . .Bd -ragged -compact -.Bl -tag -width ".No FreeBSD" -offset indent +.Bl -tag -width ".No DragonFly" -offset indent .It ATT 7th, 7, III, 3, V, V.2, V.3, V.4 .It BSD @@ -864,16 +864,23 @@ the release ID. .It NetBSD 0.8, 0.8a, 0.9, 0.9a, 1.0, 1.0a, 1.1, 1.2, 1.2a, 1.2b, 1.2c, 1.2d, 1.2e, 1.3, 1.3a, 1.4, 1.4.1, 1.4.2, 1.4.3, 1.5, 1.5.1, 1.5.2, 1.5.3, 1.6, 1.6.1, -1.6.2, 2.0, 2.0.1, 2.0.2, 2.1, 3.0 +1.6.2, 1.6.3, 2.0, 2.0.1, 2.0.2, 2.0.3, 2.1, 3.0, 3.0.1, 3.0.2, 3.1, 4.0, +4.0.1, 5.0, 5.0.1, 5.0.2 .It FreeBSD 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1, 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1, -5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 7.0 +5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1, 7.2, 7.3, 8.0, +8.1 +.It OpenBSD +2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4, +3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8 .It DragonFly -1.0, 1.1, 1.2, 1.3, 1.4, 1.5 +1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0, 2.2, +2.4, 2.6, 2.8 .It Darwin -8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0 +8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0, 8.6.0, 8.7.0, 8.8.0, 8.9.0, +8.10.0, 8.11.0, 9.0.0, 9.1.0, 9.2.0, 9.3.0, 9.4.0, 9.5.0, 9.6.0 .El .Ed .Pp @@ -1586,7 +1593,7 @@ For example, .Ql ".Rv \-std atexit" produces: . -.Bd -ragged -offset -indent +.Bd -ragged -offset indent \# a small hack to suppress a warning message .ds section-old "\*[section] .ds section 3 @@ -1616,7 +1623,7 @@ For example, .Ql ".Ex \-std cat" produces: . -.Bd -ragged -offset -indent +.Bd -ragged -offset indent \# a small hack to suppress a warning message .ds section-old "\*[section] .ds section 1 @@ -1784,6 +1791,11 @@ When called without arguments, .Ql .Nm regurgitates this initial name for the sole purpose of making less work for the author. +.Ql .Nm +causes a line break within the +.Sx SYNOPSIS +section. +.Pp Note: A section two or three document function name is addressed with the .Ql .Nm in the @@ -1972,6 +1984,8 @@ Part 1: System API .St -p1003.1-2001 .It Li \-p1003.1\-2004 .St -p1003.1-2004 +.It Li \-p1003.1\-2008 +.St -p1003.1-2008 .El .Pp . @@ -1991,10 +2005,12 @@ Part 2: Shell and Utilities .Pp . X/Open -.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent .Pp +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent .It Li \-susv2 .St -susv2 +.It Li \-susv3 +.St -susv3 .It Li \-svid4 .St -svid4 .It Li \-xbd5 @@ -2552,6 +2568,8 @@ Corporate or foreign author. Report name. .It Li .%T Title of article. +.It Li .%U +Optional hypertext reference. .It Li .%V Volume. .El @@ -4086,11 +4104,12 @@ Definitions used for all other devices. .It Pa mdoc.local Local additions and customizations. .It Pa andoc.tmac -This file checks whether the +Use this file if you don't know whether the .Nm \-mdoc or the .Nm \-man package should be used. +Multiple man pages (in either format) can be handled. .El . . Modified: stable/7/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- stable/7/gnu/usr.bin/groff/tmac/mdoc.local Sun Feb 13 21:52:26 2011 (r218670) +++ stable/7/gnu/usr.bin/groff/tmac/mdoc.local Sun Feb 13 22:09:33 2011 (r218671) @@ -67,14 +67,6 @@ .ds doc-default-operating-system FreeBSD\~7.4 . .\" FreeBSD releases not found in doc-common -.ds doc-operating-system-FreeBSD-6.3 6.3 -.ds doc-operating-system-FreeBSD-6.4 6.4 -.ds doc-operating-system-FreeBSD-7.1 7.1 -.ds doc-operating-system-FreeBSD-7.2 7.2 -.ds doc-operating-system-FreeBSD-7.3 7.3 -.ds doc-operating-system-FreeBSD-7.4 7.4 -.ds doc-operating-system-FreeBSD-8.0 8.0 -.ds doc-operating-system-FreeBSD-8.1 8.1 .ds doc-operating-system-FreeBSD-8.2 8.2 .ds doc-operating-system-FreeBSD-9.0 9.0 . From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 13 22:17:50 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 383E41065675; Sun, 13 Feb 2011 22:17:50 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 24ACC8FC1D; Sun, 13 Feb 2011 22:17:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1DMHoA6064362; Sun, 13 Feb 2011 22:17:50 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1DMHoPW064360; Sun, 13 Feb 2011 22:17:50 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201102132217.p1DMHoPW064360@svn.freebsd.org> From: Ulrich Spoerlein Date: Sun, 13 Feb 2011 22:17:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218672 - head/gnu/usr.bin/groff/tmac stable/7/gnu/usr.bin/groff/tmac stable/8/gnu/usr.bin/groff/tmac X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Feb 2011 22:17:50 -0000 Author: uqs Date: Sun Feb 13 22:17:49 2011 New Revision: 218672 URL: http://svn.freebsd.org/changeset/base/218672 Log: Add back soon-to-be-release FreeBSD 7.4 which got clobbered in the previous merges. Modified: stable/7/gnu/usr.bin/groff/tmac/mdoc.local Changes in other areas also in this revision: Modified: head/gnu/usr.bin/groff/tmac/mdoc.local stable/8/gnu/usr.bin/groff/tmac/mdoc.local Modified: stable/7/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- stable/7/gnu/usr.bin/groff/tmac/mdoc.local Sun Feb 13 22:09:33 2011 (r218671) +++ stable/7/gnu/usr.bin/groff/tmac/mdoc.local Sun Feb 13 22:17:49 2011 (r218672) @@ -67,6 +67,7 @@ .ds doc-default-operating-system FreeBSD\~7.4 . .\" FreeBSD releases not found in doc-common +.ds doc-operating-system-FreeBSD-7.4 7.4 .ds doc-operating-system-FreeBSD-8.2 8.2 .ds doc-operating-system-FreeBSD-9.0 9.0 . From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 15 01:34:46 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AEC08106566B; Tue, 15 Feb 2011 01:34:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9CB428FC0A; Tue, 15 Feb 2011 01:34:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1F1YkO5012736; Tue, 15 Feb 2011 01:34:46 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1F1YkVl012734; Tue, 15 Feb 2011 01:34:46 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102150134.p1F1YkVl012734@svn.freebsd.org> From: Glen Barber Date: Tue, 15 Feb 2011 01:34:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218693 - stable/7/lib/libc/sys X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Feb 2011 01:34:46 -0000 Author: gjb (doc committer) Date: Tue Feb 15 01:34:46 2011 New Revision: 218693 URL: http://svn.freebsd.org/changeset/base/218693 Log: MFC 212438: Add EINVAL to list of possible return values for cpuset_getaffinity(2). PR: 149978 Approved by: keramida (mentor) Modified: stable/7/lib/libc/sys/cpuset_getaffinity.2 Directory Properties: stable/7/lib/libc/ (props changed) stable/7/lib/libc/stdtime/ (props changed) Modified: stable/7/lib/libc/sys/cpuset_getaffinity.2 ============================================================================== --- stable/7/lib/libc/sys/cpuset_getaffinity.2 Tue Feb 15 01:33:59 2011 (r218692) +++ stable/7/lib/libc/sys/cpuset_getaffinity.2 Tue Feb 15 01:34:46 2011 (r218693) @@ -121,6 +121,12 @@ The or .Fa which argument was not a valid value. +.It Bq Er EINVAL +The +.Fa mask +argument specified when calling +.Fn cpuset_setaffinity +was not a valid value. .It Bq Er EDEADLK The .Fn cpuset_setaffinity From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 15 06:34:30 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD7ED1065673; Tue, 15 Feb 2011 06:34:30 +0000 (UTC) (envelope-from keramida@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9C5E38FC1A; Tue, 15 Feb 2011 06:34:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1F6YUgi020361; Tue, 15 Feb 2011 06:34:30 GMT (envelope-from keramida@svn.freebsd.org) Received: (from keramida@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1F6YUx7020359; Tue, 15 Feb 2011 06:34:30 GMT (envelope-from keramida@svn.freebsd.org) Message-Id: <201102150634.p1F6YUx7020359@svn.freebsd.org> From: Giorgos Keramidas Date: Tue, 15 Feb 2011 06:34:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218696 - stable/7/usr.bin/top X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Feb 2011 06:34:30 -0000 Author: keramida (doc committer) Date: Tue Feb 15 06:34:30 2011 New Revision: 218696 URL: http://svn.freebsd.org/changeset/base/218696 Log: MFC 217746 from /head/usr.bin/top Touch up the sample memory usage numbers a bit, to avoid wrapping on terminal boundary. While here add definition for ’G’ and fix the indentation of ’K’ units. Submitted by: plunket PR: docs/153614 Modified: stable/7/usr.bin/top/top.local.1 Directory Properties: stable/7/usr.bin/top/ (props changed) Modified: stable/7/usr.bin/top/top.local.1 ============================================================================== --- stable/7/usr.bin/top/top.local.1 Tue Feb 15 06:33:35 2011 (r218695) +++ stable/7/usr.bin/top/top.local.1 Tue Feb 15 06:34:30 2011 (r218696) @@ -5,16 +5,19 @@ The '-H' option will toggle the display of kernel visible thread contexts. At runtime the 'H' key will toggle this mode. The default is OFF. -.SH DESCRIPTION OF MEMORY -Mem: 9220K Active, 1032K Inact, 3284K Wired, 1M Cache, 2M Buf, 1320K Free +.SH DESCRIPTION OF MEMORY +Mem: 9220K Active, 1M Inact, 3284K Wired, 1M Cache, 2M Buf, 1320K Free Swap: 91M Total, 79M Free, 13% Inuse, 80K In, 104K Out - +.TP .B K: Kilobyte .TP .B M: Megabyte .TP +.B G: +Gigabyte +.TP .B %: 1/100 .TP From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 15 07:12:17 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51815106566B; Tue, 15 Feb 2011 07:12:17 +0000 (UTC) (envelope-from keramida@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4062A8FC08; Tue, 15 Feb 2011 07:12:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1F7CHjZ021310; Tue, 15 Feb 2011 07:12:17 GMT (envelope-from keramida@svn.freebsd.org) Received: (from keramida@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1F7CHD7021308; Tue, 15 Feb 2011 07:12:17 GMT (envelope-from keramida@svn.freebsd.org) Message-Id: <201102150712.p1F7CHD7021308@svn.freebsd.org> From: Giorgos Keramidas Date: Tue, 15 Feb 2011 07:12:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218697 - stable/7/usr.bin/mail X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Feb 2011 07:12:17 -0000 Author: keramida (doc committer) Date: Tue Feb 15 07:12:16 2011 New Revision: 218697 URL: http://svn.freebsd.org/changeset/base/218697 Log: MFC 216698 by maxim from /head Fix -u flag description: it takes a username as an argument. PR: docs/153416 Submitted by: Eitan Adler Modified: stable/7/usr.bin/mail/mail.1 Directory Properties: stable/7/usr.bin/mail/ (props changed) Modified: stable/7/usr.bin/mail/mail.1 ============================================================================== --- stable/7/usr.bin/mail/mail.1 Tue Feb 15 06:34:30 2011 (r218696) +++ stable/7/usr.bin/mail/mail.1 Tue Feb 15 07:12:16 2011 (r218697) @@ -156,7 +156,7 @@ line in the mail header. Overrides the .Va record variable, if set. -.It Fl u +.It Fl u Ar user Is equivalent to: .Pp .Dl "mail -f /var/mail/user" From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 15 09:28:07 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6936106564A; Tue, 15 Feb 2011 09:28:07 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D585D8FC0C; Tue, 15 Feb 2011 09:28:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1F9S7al024588; Tue, 15 Feb 2011 09:28:07 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1F9S7CD024586; Tue, 15 Feb 2011 09:28:07 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201102150928.p1F9S7CD024586@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Tue, 15 Feb 2011 09:28:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218703 - stable/7/sys/netinet X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Feb 2011 09:28:08 -0000 Author: bz Date: Tue Feb 15 09:28:07 2011 New Revision: 218703 URL: http://svn.freebsd.org/changeset/base/218703 Log: MFC r218078: Remove duplicate printing of TF_NOPUSH in db_print_tflags(). Modified: stable/7/sys/netinet/tcp_usrreq.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/netinet/tcp_usrreq.c ============================================================================== --- stable/7/sys/netinet/tcp_usrreq.c Tue Feb 15 09:17:51 2011 (r218702) +++ stable/7/sys/netinet/tcp_usrreq.c Tue Feb 15 09:28:07 2011 (r218703) @@ -1679,10 +1679,6 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_NOPUSH", comma ? ", " : ""); comma = 1; } - if (t_flags & TF_NOPUSH) { - db_printf("%sTF_NOPUSH", comma ? ", " : ""); - comma = 1; - } if (t_flags & TF_MORETOCOME) { db_printf("%sTF_MORETOCOME", comma ? ", " : ""); comma = 1; From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 15 09:30:32 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B2AD106566B; Tue, 15 Feb 2011 09:30:32 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F36848FC1F; Tue, 15 Feb 2011 09:30:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1F9UVuO024699; Tue, 15 Feb 2011 09:30:31 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1F9UVMT024696; Tue, 15 Feb 2011 09:30:31 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201102150930.p1F9UVMT024696@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Tue, 15 Feb 2011 09:30:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218704 - stable/7/sys/compat/linprocfs X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Feb 2011 09:30:32 -0000 Author: bz Date: Tue Feb 15 09:30:31 2011 New Revision: 218704 URL: http://svn.freebsd.org/changeset/base/218704 Log: MFC r218114: Update interface stats counters to match the current format in linux and try to export as much information as we can match. Requested on: Debian GNU/kFreeBSD list (debian-bsd lists.debian.org) 2010-12 Tested by: Mats Erik Andersson (mats.andersson gisladisker.se) Modified: stable/7/sys/compat/linprocfs/linprocfs.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/compat/linprocfs/linprocfs.c ============================================================================== --- stable/7/sys/compat/linprocfs/linprocfs.c Tue Feb 15 09:28:07 2011 (r218703) +++ stable/7/sys/compat/linprocfs/linprocfs.c Tue Feb 15 09:30:31 2011 (r218704) @@ -1008,19 +1008,42 @@ linprocfs_donetdev(PFS_FILL_ARGS) char ifname[16]; /* XXX LINUX_IFNAMSIZ */ struct ifnet *ifp; - sbuf_printf(sb, "%6s|%58s|%s\n%6s|%58s|%58s\n", - "Inter-", " Receive", " Transmit", " face", - "bytes packets errs drop fifo frame compressed", - "bytes packets errs drop fifo frame compressed"); + sbuf_printf(sb, "%6s|%58s|%s\n" + "%6s|%58s|%58s\n", + "Inter-", " Receive", " Transmit", + " face", + "bytes packets errs drop fifo frame compressed multicast", + "bytes packets errs drop fifo colls carrier compressed"); IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) { linux_ifname(ifp, ifname, sizeof ifname); - sbuf_printf(sb, "%6.6s:", ifname); - sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu ", - 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL); + sbuf_printf(sb, "%6.6s: ", ifname); + sbuf_printf(sb, "%7lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu ", + ifp->if_ibytes, /* rx_bytes */ + ifp->if_ipackets, /* rx_packets */ + ifp->if_ierrors, /* rx_errors */ + ifp->if_iqdrops, /* rx_dropped + + * rx_missed_errors */ + 0UL, /* rx_fifo_errors */ + 0UL, /* rx_length_errors + + * rx_over_errors + + * rx_crc_errors + + * rx_frame_errors */ + 0UL, /* rx_compressed */ + ifp->if_imcasts); /* multicast, XXX-BZ rx only? */ sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n", - 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL); + ifp->if_obytes, /* tx_bytes */ + ifp->if_opackets, /* tx_packets */ + ifp->if_oerrors, /* tx_errors */ + 0UL, /* tx_dropped */ + 0UL, /* tx_fifo_errors */ + ifp->if_collisions, /* collisions */ + 0UL, /* tx_carrier_errors + + * tx_aborted_errors + + * tx_window_errors + + * tx_heartbeat_errors */ + 0UL); /* tx_compressed */ } IFNET_RUNLOCK(); From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 16 15:18:28 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94247106564A; Wed, 16 Feb 2011 15:18:28 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 847468FC1B; Wed, 16 Feb 2011 15:18:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1GFISJ1074137; Wed, 16 Feb 2011 15:18:28 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1GFISoc074135; Wed, 16 Feb 2011 15:18:28 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201102161518.p1GFISoc074135@svn.freebsd.org> From: Ken Smith Date: Wed, 16 Feb 2011 15:18:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218735 - stable/7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Feb 2011 15:18:28 -0000 Author: kensmith Date: Wed Feb 16 15:18:28 2011 New Revision: 218735 URL: http://svn.freebsd.org/changeset/base/218735 Log: Guess when all the bits will be in place for announcing 7.4-RELEASE. Modified: stable/7/UPDATING Modified: stable/7/UPDATING ============================================================================== --- stable/7/UPDATING Wed Feb 16 15:04:00 2011 (r218734) +++ stable/7/UPDATING Wed Feb 16 15:18:28 2011 (r218735) @@ -8,6 +8,9 @@ Items affecting the ports and packages s /usr/ports/UPDATING. Please read that file before running portupgrade. +20110221: + FreeBSD 7.4-RELEASE + 20101126: New version of minidump format for amd64 architecture was introduced in r215874. To analyze vmcore files produced by From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 16 21:13:04 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B80D1065697; Wed, 16 Feb 2011 21:13:04 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 893AF8FC13; Wed, 16 Feb 2011 21:13:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1GLD4Ju083946; Wed, 16 Feb 2011 21:13:04 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1GLD2Zo083941; Wed, 16 Feb 2011 21:13:02 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102162113.p1GLD2Zo083941@svn.freebsd.org> From: Bruce Cran Date: Wed, 16 Feb 2011 21:13:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218751 - stable/7/games/fortune/datfiles X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Feb 2011 21:13:04 -0000 Author: brucec Date: Wed Feb 16 21:13:02 2011 New Revision: 218751 URL: http://svn.freebsd.org/changeset/base/218751 Log: MFC r218650: Move potentially offensive fortune to fortunes-o. PR: bin/137702 Modified: stable/7/games/fortune/datfiles/fortunes stable/7/games/fortune/datfiles/fortunes-o.real Directory Properties: stable/7/games/fortune/ (props changed) Modified: stable/7/games/fortune/datfiles/fortunes ============================================================================== --- stable/7/games/fortune/datfiles/fortunes Wed Feb 16 21:10:50 2011 (r218750) +++ stable/7/games/fortune/datfiles/fortunes Wed Feb 16 21:13:02 2011 (r218751) @@ -38136,10 +38136,6 @@ couldn't compete successfully with poets -- Kilgore Trout (Philip J. Farmer) "Venus on the Half Shell" % -PLATONIC FRIENDSHIP: - What develops when two people get - tired of making love to each other. -% Play Rogue, visit exotic locations, meet strange creatures and kill them. % Modified: stable/7/games/fortune/datfiles/fortunes-o.real ============================================================================== --- stable/7/games/fortune/datfiles/fortunes-o.real Wed Feb 16 21:10:50 2011 (r218750) +++ stable/7/games/fortune/datfiles/fortunes-o.real Wed Feb 16 21:13:02 2011 (r218751) @@ -10487,6 +10487,10 @@ Pile driver, n.: Planned Parenthood: The emission Control Center. % +PLATONIC FRIENDSHIP: + What develops when two people get + tired of making love to each other. +% Playing poker with busty Ms. Ware, He announced as he folded with flair, "I had four of a kind, From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 16 21:24:09 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4DB21065674; Wed, 16 Feb 2011 21:24:09 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9331E8FC23; Wed, 16 Feb 2011 21:24:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1GLO97n084359; Wed, 16 Feb 2011 21:24:09 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1GLO9TP084357; Wed, 16 Feb 2011 21:24:09 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102162124.p1GLO9TP084357@svn.freebsd.org> From: Bruce Cran Date: Wed, 16 Feb 2011 21:24:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218754 - stable/7/sbin/mdconfig X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Feb 2011 21:24:09 -0000 Author: brucec Date: Wed Feb 16 21:24:09 2011 New Revision: 218754 URL: http://svn.freebsd.org/changeset/base/218754 Log: MFC r218652, r218677: Only print the unit number when invoked with the -n flag. PR: bin/144300 Submitted by: arundel Modified: stable/7/sbin/mdconfig/mdconfig.c Directory Properties: stable/7/sbin/mdconfig/ (props changed) Modified: stable/7/sbin/mdconfig/mdconfig.c ============================================================================== --- stable/7/sbin/mdconfig/mdconfig.c Wed Feb 16 21:23:09 2011 (r218753) +++ stable/7/sbin/mdconfig/mdconfig.c Wed Feb 16 21:24:09 2011 (r218754) @@ -363,7 +363,11 @@ md_list(char *units, int opt) found = 1; } gc = &pp->lg_config; - printf("%s", pp->lg_name); + if (nflag && strncmp(pp->lg_name, "md", 2) == 0) + printf("%s", pp->lg_name + 2); + else + printf("%s", pp->lg_name); + if (opt & OPT_VERBOSE || opt & OPT_UNIT) { type = geom_config_get(gc, "type"); if (strcmp(type, "vnode") == 0) From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 16 21:29:05 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC1CC106566B; Wed, 16 Feb 2011 21:29:05 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BA6D98FC17; Wed, 16 Feb 2011 21:29:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1GLT5Ng084582; Wed, 16 Feb 2011 21:29:05 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1GLT5AU084580; Wed, 16 Feb 2011 21:29:05 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102162129.p1GLT5AU084580@svn.freebsd.org> From: Bruce Cran Date: Wed, 16 Feb 2011 21:29:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218756 - stable/7/bin/ed X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Feb 2011 21:29:05 -0000 Author: brucec Date: Wed Feb 16 21:29:05 2011 New Revision: 218756 URL: http://svn.freebsd.org/changeset/base/218756 Log: MFC r218619: Fix typos. PR: docs/131625 Submitted by: Andrew Wright Modified: stable/7/bin/ed/ed.1 Directory Properties: stable/7/bin/ed/ (props changed) Modified: stable/7/bin/ed/ed.1 ============================================================================== --- stable/7/bin/ed/ed.1 Wed Feb 16 21:27:19 2011 (r218755) +++ stable/7/bin/ed/ed.1 Wed Feb 16 21:29:05 2011 (r218756) @@ -231,7 +231,7 @@ The current line (address) in the buffer The last line in the buffer. .It n The -.Em n Ns th, +.Em n Ns th line in the buffer where .Em n @@ -649,7 +649,7 @@ The mark is not cleared until the line i deleted or otherwise modified. .It (.,.)l Print the addressed lines unambiguously. -If a single line fills for than one screen (as might be the case +If a single line fills more than one screen (as might be the case when viewing a binary file, for instance), a .Dq Li --More-- prompt is printed on the last line. From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 16 21:46:03 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78495106566B; Wed, 16 Feb 2011 21:46:03 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 652498FC08; Wed, 16 Feb 2011 21:46:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1GLk3nx085146; Wed, 16 Feb 2011 21:46:03 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1GLk3T6085144; Wed, 16 Feb 2011 21:46:03 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102162146.p1GLk3T6085144@svn.freebsd.org> From: Bruce Cran Date: Wed, 16 Feb 2011 21:46:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218759 - stable/7/share/examples/pf X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Feb 2011 21:46:03 -0000 Author: brucec Date: Wed Feb 16 21:46:03 2011 New Revision: 218759 URL: http://svn.freebsd.org/changeset/base/218759 Log: MFC r218620: If the pf.conf(5) example file is copied when setting up a firewall it's easy to forget about icmp. Update the file to show allowing icmp through the firewall. PR: docs/144986 Modified: stable/7/share/examples/pf/pf.conf Directory Properties: stable/7/share/examples/ (props changed) Modified: stable/7/share/examples/pf/pf.conf ============================================================================== --- stable/7/share/examples/pf/pf.conf Wed Feb 16 21:41:44 2011 (r218758) +++ stable/7/share/examples/pf/pf.conf Wed Feb 16 21:46:03 2011 (r218759) @@ -32,3 +32,4 @@ #pass in on $ext_if proto tcp to ($ext_if) port ssh #pass in log on $ext_if proto tcp to ($ext_if) port smtp #pass out log on $ext_if proto tcp from ($ext_if) to port smtp +#pass in on $ext_if proto icmp to ($ext_if) From owner-svn-src-stable-7@FreeBSD.ORG Fri Feb 18 17:42:30 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B5CA1065672; Fri, 18 Feb 2011 17:42:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC08A8FC1E; Fri, 18 Feb 2011 17:42:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1IHgTfQ066712; Fri, 18 Feb 2011 17:42:29 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1IHgTQB066710; Fri, 18 Feb 2011 17:42:29 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102181742.p1IHgTQB066710@svn.freebsd.org> From: Glen Barber Date: Fri, 18 Feb 2011 17:42:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218814 - stable/7/lib/libc/sys X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Feb 2011 17:42:31 -0000 Author: gjb (doc committer) Date: Fri Feb 18 17:42:29 2011 New Revision: 218814 URL: http://svn.freebsd.org/changeset/base/218814 Log: MFC 212492: Bump date in cpuset_getaffinity(2). Note, the original commit also affects dbopen(3), however that change is not needed here. Modified: stable/7/lib/libc/sys/cpuset_getaffinity.2 Directory Properties: stable/7/lib/libc/ (props changed) stable/7/lib/libc/stdtime/ (props changed) Modified: stable/7/lib/libc/sys/cpuset_getaffinity.2 ============================================================================== --- stable/7/lib/libc/sys/cpuset_getaffinity.2 Fri Feb 18 17:41:39 2011 (r218813) +++ stable/7/lib/libc/sys/cpuset_getaffinity.2 Fri Feb 18 17:42:29 2011 (r218814) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 8, 2010 +.Dd September 10, 2010 .Dt CPUSET 2 .Os .Sh NAME