From owner-svn-src-stable-7@FreeBSD.ORG Mon Oct 22 10:30:05 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 26F81457; Mon, 22 Oct 2012 10:30:05 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 055138FC12; Mon, 22 Oct 2012 10:30:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9MAU43Z089727; Mon, 22 Oct 2012 10:30:04 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9MAU46K089724; Mon, 22 Oct 2012 10:30:04 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201210221030.q9MAU46K089724@svn.freebsd.org> From: Edwin Groothuis Date: Mon, 22 Oct 2012 10:30:04 +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: r241871 - stable/7/share/zoneinfo 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, 22 Oct 2012 10:30:05 -0000 Author: edwin Date: Mon Oct 22 10:30:04 2012 New Revision: 241871 URL: http://svn.freebsd.org/changeset/base/241871 Log: Merge of 241869 Import of tzdata2012g - Fix end of DST in Gaza and Hebron - Western Samoa: DST start at 30 Septembet 2012 and finished at 7 April 2013. Modified: stable/7/share/zoneinfo/asia stable/7/share/zoneinfo/australasia Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/asia ============================================================================== --- stable/7/share/zoneinfo/asia Mon Oct 22 10:29:26 2012 (r241870) +++ stable/7/share/zoneinfo/asia Mon Oct 22 10:30:04 2012 (r241871) @@ -2293,6 +2293,8 @@ Rule Palestine 2010 only - Aug 11 0:00 0 # From Arthur David Olson (2011-09-20): # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +# From Paul Eggert (2012-10-12): +# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2303,7 +2305,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:00 1:00 EEST 2011 Aug 1 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2318,7 +2320,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00 - EET 2011 Aug 30 2:00 1:00 EEST 2011 Sep 30 3:00 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 28 3:00 + 2:00 1:00 EEST 2012 Sep 21 1:00 2:00 - EET # Paracel Is Modified: stable/7/share/zoneinfo/australasia ============================================================================== --- stable/7/share/zoneinfo/australasia Mon Oct 22 10:29:26 2012 (r241870) +++ stable/7/share/zoneinfo/australasia Mon Oct 22 10:30:04 2012 (r241871) @@ -628,6 +628,23 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 # seasons, there is not yet any indication that this trend will continue on # a regular basis. For now, we have explicitly listed the transitions below. +# +# From Nicky (2012-09-10): +# Daylight Saving Time commences on Sunday 30th September 2012 and +# ends on Sunday 7th of April 2013. +# +# Please find link below for more information. +# http://www.mcil.gov.ws/mcil_publications.html +# +# That publication also includes dates for Summer of 2013/4 as well +# which give the impression of a pattern in selecting dates for the +# future, so for now, we will guess this will continue. + +# Western Samoa +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule WS 2012 max - Sep lastSun 3:00 1 D +Rule WS 2012 max - Apr Sun>=1 4:00 0 - +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -635,8 +652,8 @@ Zone Pacific/Apia 12:33:04 - LMT 1879 J -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 -11:00 1:00 WSDT 2011 Dec 30 - 13:00 1:00 WSDT 2012 Apr 1 4:00 - 13:00 - WST + 13:00 1:00 WSDT 2012 Apr Sun>=1 4:00 + 13:00 WS WS%sT # Solomon Is # excludes Bougainville, for which see Papua New Guinea From owner-svn-src-stable-7@FreeBSD.ORG Thu Oct 25 01:20:21 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 09E1571F; Thu, 25 Oct 2012 01:20:21 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E4D208FC08; Thu, 25 Oct 2012 01:20:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9P1KKBe039433; Thu, 25 Oct 2012 01:20:20 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9P1KK76039431; Thu, 25 Oct 2012 01:20:20 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210250120.q9P1KK76039431@svn.freebsd.org> From: Eitan Adler Date: Thu, 25 Oct 2012 01:20:20 +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: r242023 - stable/7/usr.sbin/memcontrol 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: Thu, 25 Oct 2012 01:20:21 -0000 Author: eadler Date: Thu Oct 25 01:20:20 2012 New Revision: 242023 URL: http://svn.freebsd.org/changeset/base/242023 Log: MFC r241829: Fix conditional expression: previously a bit vector was being operated on by a logical not instead of the entire expression. Approved by: cperciva (implicit) Modified: stable/7/usr.sbin/memcontrol/memcontrol.c Directory Properties: stable/7/usr.sbin/memcontrol/ (props changed) Modified: stable/7/usr.sbin/memcontrol/memcontrol.c ============================================================================== --- stable/7/usr.sbin/memcontrol/memcontrol.c Thu Oct 25 01:20:19 2012 (r242022) +++ stable/7/usr.sbin/memcontrol/memcontrol.c Thu Oct 25 01:20:20 2012 (r242023) @@ -235,7 +235,7 @@ setfunc(int memfd, int argc, char *argv[ while(argc--) { for (i = 0; attrnames[i].name != NULL; i++) { if (!strcmp(attrnames[i].name, argv[0])) { - if (!attrnames[i].kind & MDF_SETTABLE) + if (!(attrnames[i].kind & MDF_SETTABLE)) help("flags"); mrd.mr_flags |= attrnames[i].val; break; From owner-svn-src-stable-7@FreeBSD.ORG Thu Oct 25 01:23:42 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 B2EF7B89; Thu, 25 Oct 2012 01:23:42 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9B8828FC0A; Thu, 25 Oct 2012 01:23:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9P1NgZS040055; Thu, 25 Oct 2012 01:23:42 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9P1NgbU040053; Thu, 25 Oct 2012 01:23:42 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210250123.q9P1NgbU040053@svn.freebsd.org> From: Eitan Adler Date: Thu, 25 Oct 2012 01:23:42 +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: r242026 - stable/7/usr.bin/netstat 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: Thu, 25 Oct 2012 01:23:42 -0000 Author: eadler Date: Thu Oct 25 01:23:42 2012 New Revision: 242026 URL: http://svn.freebsd.org/changeset/base/242026 Log: MFC r241838: Remove unused variable. Newer versions of gcc care. Approved by: cperciva (implicit) Modified: stable/7/usr.bin/netstat/route.c Directory Properties: stable/7/usr.bin/netstat/ (props changed) Modified: stable/7/usr.bin/netstat/route.c ============================================================================== --- stable/7/usr.bin/netstat/route.c Thu Oct 25 01:23:41 2012 (r242025) +++ stable/7/usr.bin/netstat/route.c Thu Oct 25 01:23:42 2012 (r242026) @@ -1111,10 +1111,8 @@ ipx_phost(struct sockaddr *sa) struct sockaddr_ipx work; static union ipx_net ipx_zeronet; char *p; - struct ipx_addr in; work = *sipx; - in = work.sipx_addr; work.sipx_addr.x_port = 0; work.sipx_addr.x_net = ipx_zeronet; From owner-svn-src-stable-7@FreeBSD.ORG Thu Oct 25 03:11:19 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 7873AF03; Thu, 25 Oct 2012 03:11:19 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5E4AE8FC17; Thu, 25 Oct 2012 03:11:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9P3BJjF057779; Thu, 25 Oct 2012 03:11:19 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9P3BJa0057774; Thu, 25 Oct 2012 03:11:19 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210250311.q9P3BJa0057774@svn.freebsd.org> From: Eitan Adler Date: Thu, 25 Oct 2012 03:11:19 +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: r242033 - stable/7/lib/libfetch 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: Thu, 25 Oct 2012 03:11:19 -0000 Author: eadler Date: Thu Oct 25 03:11:18 2012 New Revision: 242033 URL: http://svn.freebsd.org/changeset/base/242033 Log: MFC r241839: Be a bit more lenient in the maximum number of redirects allowed. Chrome and Firefox have a limit of 20. IE has a limit of 8. Approved by: cperciva (implicit) Modified: stable/7/lib/libfetch/http.c Directory Properties: stable/7/lib/libfetch/ (props changed) Modified: stable/7/lib/libfetch/http.c ============================================================================== --- stable/7/lib/libfetch/http.c Thu Oct 25 03:11:18 2012 (r242032) +++ stable/7/lib/libfetch/http.c Thu Oct 25 03:11:18 2012 (r242033) @@ -86,7 +86,7 @@ __FBSDID("$FreeBSD$"); #include "httperr.h" /* Maximum number of redirects to follow */ -#define MAX_REDIRECT 5 +#define MAX_REDIRECT 20 /* Symbolic names for reply codes we care about */ #define HTTP_OK 200 From owner-svn-src-stable-7@FreeBSD.ORG Thu Oct 25 03:12:35 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 2F6A2507; Thu, 25 Oct 2012 03:12:35 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1769F8FC16; Thu, 25 Oct 2012 03:12:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9P3CYRU058129; Thu, 25 Oct 2012 03:12:34 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9P3CYh7058127; Thu, 25 Oct 2012 03:12:34 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210250312.q9P3CYh7058127@svn.freebsd.org> From: Eitan Adler Date: Thu, 25 Oct 2012 03:12: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: r242037 - stable/7/games/fortune/tools 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: Thu, 25 Oct 2012 03:12:35 -0000 Author: eadler Date: Thu Oct 25 03:12:34 2012 New Revision: 242037 URL: http://svn.freebsd.org/changeset/base/242037 Log: MFC r241834: Make do_uniq work with python3 Approved by: cperciva (implicit) Modified: stable/7/games/fortune/tools/do_uniq.py Directory Properties: stable/7/games/fortune/ (props changed) Modified: stable/7/games/fortune/tools/do_uniq.py ============================================================================== --- stable/7/games/fortune/tools/do_uniq.py Thu Oct 25 03:12:31 2012 (r242036) +++ stable/7/games/fortune/tools/do_uniq.py Thu Oct 25 03:12:34 2012 (r242037) @@ -34,26 +34,26 @@ def edit(datfile): for line in file(datfile): if line == "%\n": key = hash(fortune) - if not dups.has_key(key): + if key not in dups: dups[key] = [] dups[key].append(fortune) fortunes.append(fortune) fortune = "" else: fortune += line - for key in dups.keys(): + for key in list(dups.keys()): if len(dups[key]) == 1: del dups[key] o = file(datfile + '~', "w") for fortune in fortunes: key = hash(fortune) if key in dups: - print '\n' * 50 + print('\n' * 50) for f in dups[key]: if f != fortune: - print f, '%' - print fortune, '%' - if raw_input("Remove last fortune? ") == 'y': + print(f, '%') + print(fortune, '%') + if input("Remove last fortune? ") == 'y': del dups[key] continue o.write(fortune + "%\n") From owner-svn-src-stable-7@FreeBSD.ORG Thu Oct 25 03:14:18 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 8008C7E8; Thu, 25 Oct 2012 03:14:18 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 67AFC8FC12; Thu, 25 Oct 2012 03:14:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9P3EImm058575; Thu, 25 Oct 2012 03:14:18 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9P3EIb8058573; Thu, 25 Oct 2012 03:14:18 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210250314.q9P3EIb8058573@svn.freebsd.org> From: Eitan Adler Date: Thu, 25 Oct 2012 03:14:18 +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: r242040 - stable/7/usr.sbin/nfsd 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: Thu, 25 Oct 2012 03:14:18 -0000 Author: eadler Date: Thu Oct 25 03:14:17 2012 New Revision: 242040 URL: http://svn.freebsd.org/changeset/base/242040 Log: MFC r241849: Fix typo in error when unable to create TCP socket PR: bin/172490 Approved by: cperciva (implicit) Modified: stable/7/usr.sbin/nfsd/nfsd.c Directory Properties: stable/7/usr.sbin/nfsd/ (props changed) Modified: stable/7/usr.sbin/nfsd/nfsd.c ============================================================================== --- stable/7/usr.sbin/nfsd/nfsd.c Thu Oct 25 03:14:17 2012 (r242039) +++ stable/7/usr.sbin/nfsd/nfsd.c Thu Oct 25 03:14:17 2012 (r242040) @@ -496,7 +496,7 @@ main(int argc, char **argv) if ((tcpsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) { syslog(LOG_ERR, - "can't create tpc socket"); + "can't create tcp socket"); nfsd_exit(1); } if (setsockopt(tcpsock, SOL_SOCKET, From owner-svn-src-stable-7@FreeBSD.ORG Thu Oct 25 03:17:04 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 1CAA679; Thu, 25 Oct 2012 03:17:04 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 048028FC12; Thu, 25 Oct 2012 03:17:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9P3H3dw059254; Thu, 25 Oct 2012 03:17:03 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9P3H3rg059252; Thu, 25 Oct 2012 03:17:03 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210250317.q9P3H3rg059252@svn.freebsd.org> From: Eitan Adler Date: Thu, 25 Oct 2012 03:17:03 +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: r242045 - 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: Thu, 25 Oct 2012 03:17:04 -0000 Author: eadler Date: Thu Oct 25 03:17:03 2012 New Revision: 242045 URL: http://svn.freebsd.org/changeset/base/242045 Log: MFC r241893: Update re members to reality Approved by: cperciva (implicit) Modified: stable/7/share/misc/organization.dot Directory Properties: stable/7/share/misc/ (props changed) Modified: stable/7/share/misc/organization.dot ============================================================================== --- stable/7/share/misc/organization.dot Thu Oct 25 03:17:02 2012 (r242044) +++ stable/7/share/misc/organization.dot Thu Oct 25 03:17:03 2012 (r242045) @@ -32,7 +32,7 @@ doceng [label="Documentation Engineering portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] portmgr [label="Port Management Team\nportmgr@FreeBSD.org\ntabthorpe, marcus, bapt, beat,\nerwin, linimon, pav,\nitetcu, miwi"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\ntabthorpe"] -re [label="Primary Release Engineering Team\nre@FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith,\nrwatson, bz"] +re [label="Primary Release Engineering Team\nre@FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith"] secteam [label="Security Team\nsecteam@FreeBSD.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"] portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\nmiwi, rea, swills, wxs,\njgh, sbz, eadler, zi, remko, simon"] secteamsecretary [label="Security Team Secretary\nsecteam-secretary@FreeBSD.org\nremko"] From owner-svn-src-stable-7@FreeBSD.ORG Thu Oct 25 03:20:02 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 2B7055A5; Thu, 25 Oct 2012 03:20:02 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 133D68FC08; Thu, 25 Oct 2012 03:20:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9P3K1pU059996; Thu, 25 Oct 2012 03:20:01 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9P3K1Hh059992; Thu, 25 Oct 2012 03:20:01 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210250320.q9P3K1Hh059992@svn.freebsd.org> From: Eitan Adler Date: Thu, 25 Oct 2012 03:20:01 +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: r242048 - in stable/7/games: bcd caesar 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: Thu, 25 Oct 2012 03:20:02 -0000 Author: eadler Date: Thu Oct 25 03:20:01 2012 New Revision: 242048 URL: http://svn.freebsd.org/changeset/base/242048 Log: MFC r241846: bcd isn't installed setuid. caesar isn't installed setuid. For the archaeologists: it seems this call originally came from NetBSD PR 5970 and 5945 PR: 172566 Approved by: cperciva (implicit) Modified: stable/7/games/bcd/bcd.c stable/7/games/caesar/caesar.c Directory Properties: stable/7/games/bcd/ (props changed) stable/7/games/caesar/ (props changed) Modified: stable/7/games/bcd/bcd.c ============================================================================== --- stable/7/games/bcd/bcd.c Thu Oct 25 03:20:00 2012 (r242047) +++ stable/7/games/bcd/bcd.c Thu Oct 25 03:20:01 2012 (r242048) @@ -133,9 +133,6 @@ main(int argc, char **argv) { char cardline[80]; - /* revoke setgid privileges */ - setgid(getgid()); - /* * The original bcd prompts with a "%" when reading from stdin, * but this seems kind of silly. So this one doesn't. Modified: stable/7/games/caesar/caesar.c ============================================================================== --- stable/7/games/caesar/caesar.c Thu Oct 25 03:20:00 2012 (r242047) +++ stable/7/games/caesar/caesar.c Thu Oct 25 03:20:01 2012 (r242048) @@ -86,9 +86,6 @@ main(int argc, char **argv) char *inbuf; int obs[26], try, winner; - /* revoke setgid privileges */ - setgid(getgid()); - if (argc > 1) printit(argv[1]); From owner-svn-src-stable-7@FreeBSD.ORG Thu Oct 25 03:27:54 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 995BFEAB; Thu, 25 Oct 2012 03:27:54 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 814028FC12; Thu, 25 Oct 2012 03:27:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9P3RsQC061502; Thu, 25 Oct 2012 03:27:54 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9P3RsdI061498; Thu, 25 Oct 2012 03:27:54 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210250327.q9P3RsdI061498@svn.freebsd.org> From: Eitan Adler Date: Thu, 25 Oct 2012 03:27:54 +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: r242054 - stable/7/games/random 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: Thu, 25 Oct 2012 03:27:54 -0000 Author: eadler Date: Thu Oct 25 03:27:53 2012 New Revision: 242054 URL: http://svn.freebsd.org/changeset/base/242054 Log: MFC r241847: Free buf when its no longer used. This helps eliminate a static analysis warning. PR: ports/172566 Approved by: cperciva (implicit) Modified: stable/7/games/random/randomize_fd.c Directory Properties: stable/7/games/random/ (props changed) Modified: stable/7/games/random/randomize_fd.c ============================================================================== --- stable/7/games/random/randomize_fd.c Thu Oct 25 03:27:53 2012 (r242053) +++ stable/7/games/random/randomize_fd.c Thu Oct 25 03:27:53 2012 (r242054) @@ -201,6 +201,8 @@ randomize_fd(int fd, int type, int uniqu goto make_token; } + free(buf); + for (i = numnode; i > 0; i--) { selected = ((int)denom * random())/(((double)RAND_MAX + 1) / numnode); From owner-svn-src-stable-7@FreeBSD.ORG Fri Oct 26 00:32:28 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 E3C087F4; Fri, 26 Oct 2012 00:32:28 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C96CD8FC0A; Fri, 26 Oct 2012 00:32:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9Q0WS0o081951; Fri, 26 Oct 2012 00:32:28 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9Q0WSa1081949; Fri, 26 Oct 2012 00:32:28 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201210260032.q9Q0WSa1081949@svn.freebsd.org> From: Xin LI Date: Fri, 26 Oct 2012 00:32:28 +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: r242108 - stable/7/sys/dev/hptmv 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: Fri, 26 Oct 2012 00:32:29 -0000 Author: delphij Date: Fri Oct 26 00:32:28 2012 New Revision: 242108 URL: http://svn.freebsd.org/changeset/base/242108 Log: MFC r240210: It seems that what the code really meant is that when a write is completed, do a BUS_DMASYNC_POSTWRITE over the DMA map. The way it currently is would only do POSTREAD for read transactions. Submitted by: Sascha Wildner Modified: stable/7/sys/dev/hptmv/entry.c Directory Properties: stable/7/sys/ (props changed) Modified: stable/7/sys/dev/hptmv/entry.c ============================================================================== --- stable/7/sys/dev/hptmv/entry.c Fri Oct 26 00:31:25 2012 (r242107) +++ stable/7/sys/dev/hptmv/entry.c Fri Oct 26 00:32:28 2012 (r242108) @@ -3047,7 +3047,7 @@ fOsCommandDone(_VBUS_ARG PCommand pCmd) if (pCmd->cf_data_in) { bus_dmamap_sync(pAdapter->io_dma_parent, pmap->dma_map, BUS_DMASYNC_POSTREAD); } - else if (pCmd->cf_data_in) { + else if (pCmd->cf_data_out) { bus_dmamap_sync(pAdapter->io_dma_parent, pmap->dma_map, BUS_DMASYNC_POSTWRITE); } From owner-svn-src-stable-7@FreeBSD.ORG Fri Oct 26 00:35:30 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 E8AD6B44; Fri, 26 Oct 2012 00:35:30 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D076A8FC16; Fri, 26 Oct 2012 00:35:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9Q0ZUJB082517; Fri, 26 Oct 2012 00:35:30 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9Q0ZUft082515; Fri, 26 Oct 2012 00:35:30 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210260035.q9Q0ZUft082515@svn.freebsd.org> From: Eitan Adler Date: Fri, 26 Oct 2012 00:35:30 +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: r242111 - stable/7/games/fortune/datfiles 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: Fri, 26 Oct 2012 00:35:31 -0000 Author: eadler Date: Fri Oct 26 00:35:30 2012 New Revision: 242111 URL: http://svn.freebsd.org/changeset/base/242111 Log: MFC r241845,r241934: Sysinstall has been removed from base. MFC farther back to maintain consistency Approved by: cperciva (implicit) Modified: stable/7/games/fortune/datfiles/freebsd-tips Directory Properties: stable/7/games/fortune/ (props changed) Modified: stable/7/games/fortune/datfiles/freebsd-tips ============================================================================== --- stable/7/games/fortune/datfiles/freebsd-tips Fri Oct 26 00:35:28 2012 (r242110) +++ stable/7/games/fortune/datfiles/freebsd-tips Fri Oct 26 00:35:30 2012 (r242111) @@ -40,7 +40,7 @@ Having trouble using fetch through a fir variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. % If other operating systems have damaged your Master Boot Record, you can -reinstall it either with /usr/sbin/sysinstall or with boot0cfg(8). See +reinstall it with boot0cfg(8). See "man boot0cfg" for details. % If you accidentally end up inside vi, you can quit it by pressing Escape, colon From owner-svn-src-stable-7@FreeBSD.ORG Sat Oct 27 01:20:49 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 613FA1CC; Sat, 27 Oct 2012 01:20:49 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3E8308FC19; Sat, 27 Oct 2012 01:20:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9R1KnJL051342; Sat, 27 Oct 2012 01:20:49 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9R1Kmh2051327; Sat, 27 Oct 2012 01:20:48 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210270120.q9R1Kmh2051327@svn.freebsd.org> From: Eitan Adler Date: Sat, 27 Oct 2012 01:20:48 +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: r242165 - in stable/7: libexec/tftpd sbin/ccdconfig sbin/restore usr.bin/lock usr.bin/msgs usr.bin/wall usr.sbin/edquota usr.sbin/kgmon 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, 27 Oct 2012 01:20:49 -0000 Author: eadler Date: Sat Oct 27 01:20:48 2012 New Revision: 242165 URL: http://svn.freebsd.org/changeset/base/242165 Log: MFC r241848: Check the return error of set[e][ug]id. While this can never fail in the current version of FreeBSD, this isn't guarenteed by the API. Custom security modules, or future implementations of the setuid and setgid may fail. Approved by: cperciva (implicit) Modified: stable/7/libexec/tftpd/tftpd.c stable/7/sbin/ccdconfig/ccdconfig.c stable/7/sbin/restore/tape.c stable/7/usr.bin/lock/lock.c stable/7/usr.bin/msgs/msgs.c stable/7/usr.bin/wall/wall.c stable/7/usr.sbin/edquota/edquota.c stable/7/usr.sbin/kgmon/kgmon.c Directory Properties: stable/7/libexec/tftpd/ (props changed) stable/7/sbin/ccdconfig/ (props changed) stable/7/sbin/restore/ (props changed) stable/7/usr.bin/lock/ (props changed) stable/7/usr.bin/msgs/ (props changed) stable/7/usr.bin/wall/ (props changed) stable/7/usr.sbin/edquota/ (props changed) stable/7/usr.sbin/kgmon/ (props changed) Modified: stable/7/libexec/tftpd/tftpd.c ============================================================================== --- stable/7/libexec/tftpd/tftpd.c Sat Oct 27 01:20:48 2012 (r242164) +++ stable/7/libexec/tftpd/tftpd.c Sat Oct 27 01:20:48 2012 (r242165) @@ -371,7 +371,10 @@ main(int argc, char *argv[]) } chdir("/"); setgroups(1, &nobody->pw_gid); - setuid(nobody->pw_uid); + if (setuid(nobody->pw_uid) != 0) { + tftp_log(LOG_ERR, "setuid failed"); + exit(1); + } } len = sizeof(me_sock); Modified: stable/7/sbin/ccdconfig/ccdconfig.c ============================================================================== --- stable/7/sbin/ccdconfig/ccdconfig.c Sat Oct 27 01:20:48 2012 (r242164) +++ stable/7/sbin/ccdconfig/ccdconfig.c Sat Oct 27 01:20:48 2012 (r242165) @@ -289,13 +289,16 @@ do_all(int action) rval = 0; egid = getegid(); - setegid(getgid()); + if (setegid(getgid()) != 0) + err(1, "setegid failed"); if ((f = fopen(ccdconf, "r")) == NULL) { - setegid(egid); + if (setegid(egid) != 0) + err(1, "setegid failed"); warn("fopen: %s", ccdconf); return (1); } - setegid(egid); + if (setegid(egid) != 0) + err(1, "setegid failed"); while (fgets(line, sizeof(line), f) != NULL) { argc = 0; Modified: stable/7/sbin/restore/tape.c ============================================================================== --- stable/7/sbin/restore/tape.c Sat Oct 27 01:20:48 2012 (r242164) +++ stable/7/sbin/restore/tape.c Sat Oct 27 01:20:48 2012 (r242165) @@ -164,7 +164,11 @@ setinput(char *source, int ispipecommand } pipein++; } - setuid(getuid()); /* no longer need or want root privileges */ + /* no longer need or want root privileges */ + if (setuid(getuid()) != 0) { + fprintf(stderr, "setuid failed\n"); + done(1); + } magtape = strdup(source); if (magtape == NULL) { fprintf(stderr, "Cannot allocate space for magtape buffer\n"); Modified: stable/7/usr.bin/lock/lock.c ============================================================================== --- stable/7/usr.bin/lock/lock.c Sat Oct 27 01:20:48 2012 (r242164) +++ stable/7/usr.bin/lock/lock.c Sat Oct 27 01:20:48 2012 (r242165) @@ -130,7 +130,9 @@ main(int argc, char **argv) } timeout.tv_sec = sectimeout * 60; - setuid(getuid()); /* discard privs */ + /* discard privs */ + if (setuid(getuid()) != 0) + errx(1, "setuid failed"); if (tcgetattr(0, &tty)) /* get information for header */ exit(1); Modified: stable/7/usr.bin/msgs/msgs.c ============================================================================== --- stable/7/usr.bin/msgs/msgs.c Sat Oct 27 01:20:48 2012 (r242164) +++ stable/7/usr.bin/msgs/msgs.c Sat Oct 27 01:20:48 2012 (r242165) @@ -178,7 +178,8 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); time(&t); - setuid(uid = getuid()); + if (setuid(uid = getuid()) != 0) + err(1, "setuid failed"); ruptible = (signal(SIGINT, SIG_IGN) == SIG_DFL); if (ruptible) signal(SIGINT, SIG_DFL); Modified: stable/7/usr.bin/wall/wall.c ============================================================================== --- stable/7/usr.bin/wall/wall.c Sat Oct 27 01:20:48 2012 (r242164) +++ stable/7/usr.bin/wall/wall.c Sat Oct 27 01:20:48 2012 (r242165) @@ -249,7 +249,8 @@ makemsg(char *fname) setegid(getgid()); if (freopen(fname, "r", stdin) == NULL) err(1, "can't read %s", fname); - setegid(egid); + if (setegid(egid) != 0) + err(1, "setegid failed"); } cnt = 0; while (fgets(lbuf, sizeof(lbuf), stdin)) { Modified: stable/7/usr.sbin/edquota/edquota.c ============================================================================== --- stable/7/usr.sbin/edquota/edquota.c Sat Oct 27 01:20:48 2012 (r242164) +++ stable/7/usr.sbin/edquota/edquota.c Sat Oct 27 01:20:48 2012 (r242165) @@ -524,8 +524,10 @@ editit(tmpf) register const char *ed; sigsetmask(omask); - setgid(getgid()); - setuid(getuid()); + if (setgid(getgid()) != 0) + err(1, "setgid failed"); + if (setuid(getuid()) != 0) + err(1, "setuid failed"); if ((ed = getenv("EDITOR")) == (char *)0) ed = _PATH_VI; execlp(ed, ed, tmpf, (char *)0); Modified: stable/7/usr.sbin/kgmon/kgmon.c ============================================================================== --- stable/7/usr.sbin/kgmon/kgmon.c Sat Oct 27 01:20:48 2012 (r242164) +++ stable/7/usr.sbin/kgmon/kgmon.c Sat Oct 27 01:20:48 2012 (r242165) @@ -90,7 +90,9 @@ main(int argc, char **argv) struct kvmvars kvmvars; char *system, *kmemf; - seteuid(getuid()); + if (seteuid(getuid()) != 0) { + err(1, "seteuid failed\n"); + } kmemf = NULL; system = NULL; while ((ch = getopt(argc, argv, "M:N:Bbhpr")) != -1) {