From owner-svn-src-stable-7@FreeBSD.ORG Mon Dec 3 01:02:46 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1700FE5F; Mon, 3 Dec 2012 01:02:46 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EF3758FC16; Mon, 3 Dec 2012 01:02:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB312jYZ001360; Mon, 3 Dec 2012 01:02:45 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB312jLL001359; Mon, 3 Dec 2012 01:02:45 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201212030102.qB312jLL001359@svn.freebsd.org> From: Eitan Adler Date: Mon, 3 Dec 2012 01:02:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r243805 - stable/7/share/misc X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 03 Dec 2012 01:02:46 -0000 Author: eadler Date: Mon Dec 3 01:02:45 2012 New Revision: 243805 URL: http://svnweb.freebsd.org/changeset/base/243805 Log: MFC r243155: Correct spelling of "lily" [0] Correct spelling of Camellia PR: misc/173655 [0] Approved by: cperciva (implicit) Modified: stable/7/share/misc/flowers (contents, props changed) Directory Properties: stable/7/share/misc/ (props changed) Modified: stable/7/share/misc/flowers ============================================================================== --- stable/7/share/misc/flowers Mon Dec 3 01:02:29 2012 (r243804) +++ stable/7/share/misc/flowers Mon Dec 3 01:02:45 2012 (r243805) @@ -6,7 +6,7 @@ African violet:Such worth is rare. Apple blossom:Preference. Bachelor's button:Celibacy. Bay leaf:I change but in death. -Camelia:Reflected loveliness. +Camellia:Reflected loveliness. Chrysanthemum, other color:Slighted love. Chrysanthemum, red:I love. Chrysanthemum, white:Truth. @@ -21,8 +21,8 @@ Ivy:Friendship, fidelity, marriage. Jasmine:Amiability, transports of joy, sensuality. Leaves (dead):Melancholy. Lilac:Youthful innocence. -Lilly of the valley:Return of happiness. -Lilly:Purity, sweetness. +Lily of the valley:Return of happiness. +Lily:Purity, sweetness. Magnolia:Dignity, perseverance. Marigold:Jealousy. Mint:Virtue. From owner-svn-src-stable-7@FreeBSD.ORG Mon Dec 3 18:21:29 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CF68CB70; Mon, 3 Dec 2012 18:21:29 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id ACBCE8FC12; Mon, 3 Dec 2012 18:21:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB3ILTkZ001479; Mon, 3 Dec 2012 18:21:29 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB3ILTeE001478; Mon, 3 Dec 2012 18:21:29 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201212031821.qB3ILTeE001478@svn.freebsd.org> From: Xin LI Date: Mon, 3 Dec 2012 18:21:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r243817 - stable/7/share/man/man4 X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 03 Dec 2012 18:21:30 -0000 Author: delphij Date: Mon Dec 3 18:21:29 2012 New Revision: 243817 URL: http://svnweb.freebsd.org/changeset/base/243817 Log: MFC r242728: ICMPV6_FILTER should read ICMP6_FILTER. Submitted by: Frédéric Perrin Modified: stable/7/share/man/man4/icmp6.4 Directory Properties: stable/7/share/man/man4/ (props changed) Modified: stable/7/share/man/man4/icmp6.4 ============================================================================== --- stable/7/share/man/man4/icmp6.4 Mon Dec 3 18:20:52 2012 (r243816) +++ stable/7/share/man/man4/icmp6.4 Mon Dec 3 18:21:29 2012 (r243817) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 20, 2004 +.Dd November 7, 2012 .Dt ICMP6 4 .Os .Sh NAME @@ -234,7 +234,7 @@ calls may be used to obtain and install option level .Dv IPPROTO_ICMPV6 and name -.Dv ICMPV6_FILTER +.Dv ICMP6_FILTER with a pointer to the .Vt icmp6_filter structure as the option value. From owner-svn-src-stable-7@FreeBSD.ORG Mon Dec 3 18:31:34 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6EE4E888; Mon, 3 Dec 2012 18:31:34 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 361108FC08; Mon, 3 Dec 2012 18:31:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB3IVYLt004698; Mon, 3 Dec 2012 18:31:34 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB3IVY0v004696; Mon, 3 Dec 2012 18:31:34 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201212031831.qB3IVY0v004696@svn.freebsd.org> From: Xin LI Date: Mon, 3 Dec 2012 18:31:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r243822 - stable/7/usr.sbin/watchdogd X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 03 Dec 2012 18:31:34 -0000 Author: delphij Date: Mon Dec 3 18:31:33 2012 New Revision: 243822 URL: http://svnweb.freebsd.org/changeset/base/243822 Log: MFC r242519: Replace log(3) with flsll(3) for watchdogd(8) and drop libm dependency. Modified: stable/7/usr.sbin/watchdogd/Makefile stable/7/usr.sbin/watchdogd/watchdogd.c Directory Properties: stable/7/usr.sbin/watchdogd/ (props changed) Modified: stable/7/usr.sbin/watchdogd/Makefile ============================================================================== --- stable/7/usr.sbin/watchdogd/Makefile Mon Dec 3 18:30:52 2012 (r243821) +++ stable/7/usr.sbin/watchdogd/Makefile Mon Dec 3 18:31:33 2012 (r243822) @@ -5,8 +5,8 @@ LINKS= ${BINDIR}/watchdogd ${BINDIR}/wat MAN= watchdogd.8 watchdog.8 WARNS?= 6 -LDADD= -lm -lutil -DPADD= ${LIBM} ${LIBUTIL} +LDADD= -lutil +DPADD= ${LIBUTIL} .include Modified: stable/7/usr.sbin/watchdogd/watchdogd.c ============================================================================== --- stable/7/usr.sbin/watchdogd/watchdogd.c Mon Dec 3 18:30:52 2012 (r243821) +++ stable/7/usr.sbin/watchdogd/watchdogd.c Mon Dec 3 18:31:33 2012 (r243822) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -277,7 +278,7 @@ parseargs(int argc, char *argv[]) if (a == 0) timeout = WD_TO_NEVER; else - timeout = 1.0 + log(a * 1e9) / log(2.0); + timeout = flsll(a * 1e9); if (debugging) printf("Timeout is 2^%d nanoseconds\n", timeout); From owner-svn-src-stable-7@FreeBSD.ORG Sat Dec 8 00:25:52 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 930E7612; Sat, 8 Dec 2012 00:25:52 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 788BF8FC14; Sat, 8 Dec 2012 00:25:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB80PqqT021112; Sat, 8 Dec 2012 00:25:52 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB80PqsK021111; Sat, 8 Dec 2012 00:25:52 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201212080025.qB80PqsK021111@svn.freebsd.org> From: Eitan Adler Date: Sat, 8 Dec 2012 00:25:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r244006 - stable/7/etc/root X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 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: Sat, 08 Dec 2012 00:25:52 -0000 Author: eadler Date: Sat Dec 8 00:25:51 2012 New Revision: 244006 URL: http://svnweb.freebsd.org/changeset/base/244006 Log: MFC r243893: Remove hack to emulate effective uid and just use the EUID's name in the first place. I was unaware of this option when originally committing this change. Approved by: cperciva (implicit) Modified: stable/7/etc/root/dot.cshrc Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/root/dot.cshrc ============================================================================== --- stable/7/etc/root/dot.cshrc Sat Dec 8 00:25:51 2012 (r244005) +++ stable/7/etc/root/dot.cshrc Sat Dec 8 00:25:51 2012 (r244006) @@ -23,10 +23,7 @@ setenv BLOCKSIZE K if ($?prompt) then # An interactive shell -- set some stuff up - if ($uid == 0) then - set user = root - endif - set prompt = "%n@%m:%~ %# " + set prompt = "%N@%m:%~ %# " set promptchars = "%#" set filec From owner-svn-src-stable-7@FreeBSD.ORG Sat Dec 8 00:28:17 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8BCDEA53; Sat, 8 Dec 2012 00:28:17 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6FF8A8FC13; Sat, 8 Dec 2012 00:28:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB80SHZ2021973; Sat, 8 Dec 2012 00:28:17 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB80SHn2021972; Sat, 8 Dec 2012 00:28:17 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201212080028.qB80SHn2021972@svn.freebsd.org> From: Eitan Adler Date: Sat, 8 Dec 2012 00:28:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r244007 - in stable: 7/share/skel 8/share/skel 9/share/skel X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 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: Sat, 08 Dec 2012 00:28:17 -0000 Author: eadler Date: Sat Dec 8 00:28:16 2012 New Revision: 244007 URL: http://svnweb.freebsd.org/changeset/base/244007 Log: MFC r243893: Remove hack to emulate effective uid and just use the EUID's name in the first place. I was unaware of this option when originally committing this change. I accidently merged this to only one directory last time :( Approved by: cperciva (implicit) Modified: stable/7/share/skel/dot.cshrc Directory Properties: stable/7/share/skel/ (props changed) Changes in other areas also in this revision: Modified: stable/8/share/skel/dot.cshrc stable/9/share/skel/dot.cshrc Directory Properties: stable/8/share/skel/ (props changed) stable/9/share/skel/ (props changed) Modified: stable/7/share/skel/dot.cshrc ============================================================================== --- stable/7/share/skel/dot.cshrc Sat Dec 8 00:25:51 2012 (r244006) +++ stable/7/share/skel/dot.cshrc Sat Dec 8 00:28:16 2012 (r244007) @@ -23,10 +23,7 @@ setenv BLOCKSIZE K if ($?prompt) then # An interactive shell -- set some stuff up - if ($uid == 0) then - set user = root - endif - set prompt = "%n@%m:%~ %# " + set prompt = "%N@%m:%~ %# " set promptchars = "%#" set filec