From owner-svn-src-stable-9@freebsd.org Sun Jul 12 15:24:06 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 79634999478; Sun, 12 Jul 2015 15:24:06 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6487B1624; Sun, 12 Jul 2015 15:24:06 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6CFO6X5053546; Sun, 12 Jul 2015 15:24:06 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6CFO6OS053545; Sun, 12 Jul 2015 15:24:06 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201507121524.t6CFO6OS053545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sun, 12 Jul 2015 15:24:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r285419 - stable/9/usr.bin/grep/regex X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jul 2015 15:24:06 -0000 Author: pfg Date: Sun Jul 12 15:24:05 2015 New Revision: 285419 URL: https://svnweb.freebsd.org/changeset/base/285419 Log: bsdgrep: Work-around for segmentation fault. Fix by: David Carlier. Obtained from: HardenedBSD PR: 167921 Modified: stable/9/usr.bin/grep/regex/tre-fastmatch.c Directory Properties: stable/9/usr.bin/grep/ (props changed) Modified: stable/9/usr.bin/grep/regex/tre-fastmatch.c ============================================================================== --- stable/9/usr.bin/grep/regex/tre-fastmatch.c Sun Jul 12 09:42:10 2015 (r285418) +++ stable/9/usr.bin/grep/regex/tre-fastmatch.c Sun Jul 12 15:24:05 2015 (r285419) @@ -727,7 +727,7 @@ badpat: for (unsigned int i = 0; i < fg->len; i++) if (fg->pattern[i] == '\\') escaped = !escaped; - else if (fg->pattern[i] == '.' && escaped) + else if (fg->pattern[i] == '.' && fg->escmap && escaped) { fg->escmap[i] = true; escaped = false; From owner-svn-src-stable-9@freebsd.org Mon Jul 13 11:59:30 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B51C99BB7C; Mon, 13 Jul 2015 11:59:30 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 23BCCE42; Mon, 13 Jul 2015 11:59:30 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6DBxTQJ075220; Mon, 13 Jul 2015 11:59:29 GMT (envelope-from brueffer@FreeBSD.org) Received: (from brueffer@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6DBxTf6075218; Mon, 13 Jul 2015 11:59:29 GMT (envelope-from brueffer@FreeBSD.org) Message-Id: <201507131159.t6DBxTf6075218@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brueffer set sender to brueffer@FreeBSD.org using -f From: Christian Brueffer Date: Mon, 13 Jul 2015 11:59:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r285447 - stable/9/sys/x86/isa X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jul 2015 11:59:30 -0000 Author: brueffer Date: Mon Jul 13 11:59:28 2015 New Revision: 285447 URL: https://svnweb.freebsd.org/changeset/base/285447 Log: MFC: r284931 Set the initial system time to a sane (as in: not end of 21st century) value when booting on a PC with CMOS clock set to a year before 2000. This uses 1980 (instead of 1970 as in the initial patch) as pivot year as suggested by imp in the PR followup. PR: 195703 Submitted by: cs@soi.spb.ru Reviewed by: imp Modified: stable/9/sys/x86/isa/atrtc.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/x86/isa/atrtc.c ============================================================================== --- stable/9/sys/x86/isa/atrtc.c Mon Jul 13 11:58:08 2015 (r285446) +++ stable/9/sys/x86/isa/atrtc.c Mon Jul 13 11:59:28 2015 (r285447) @@ -354,7 +354,7 @@ atrtc_gettime(device_t dev, struct times #ifdef USE_RTC_CENTURY ct.year += readrtc(RTC_CENTURY) * 100; #else - ct.year += 2000; + ct.year += (ct.year < 80 ? 2000 : 1900); #endif /* Set dow = -1 because some clocks don't set it correctly. */ ct.dow = -1; From owner-svn-src-stable-9@freebsd.org Mon Jul 13 12:07:53 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AEE0D999399; Mon, 13 Jul 2015 12:07:53 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F44B19D3; Mon, 13 Jul 2015 12:07:53 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6DC7rHx080190; Mon, 13 Jul 2015 12:07:53 GMT (envelope-from brueffer@FreeBSD.org) Received: (from brueffer@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6DC7rGC080188; Mon, 13 Jul 2015 12:07:53 GMT (envelope-from brueffer@FreeBSD.org) Message-Id: <201507131207.t6DC7rGC080188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brueffer set sender to brueffer@FreeBSD.org using -f From: Christian Brueffer Date: Mon, 13 Jul 2015 12:07:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r285449 - stable/9/share/examples/csh X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jul 2015 12:07:53 -0000 Author: brueffer Date: Mon Jul 13 12:07:52 2015 New Revision: 285449 URL: https://svnweb.freebsd.org/changeset/base/285449 Log: MFC: r284929 Fix issues that kept some of the examples from actually working. PR: 144534 Submitted by: Nicolas Edel Modified: stable/9/share/examples/csh/dot.cshrc Directory Properties: stable/9/share/examples/ (props changed) stable/9/share/examples/csh/ (props changed) Modified: stable/9/share/examples/csh/dot.cshrc ============================================================================== --- stable/9/share/examples/csh/dot.cshrc Mon Jul 13 12:04:40 2015 (r285448) +++ stable/9/share/examples/csh/dot.cshrc Mon Jul 13 12:07:52 2015 (r285449) @@ -9,11 +9,11 @@ # has multiple ssh-agent(1) processes running, this will very likely # set SSH_AUTH_SOCK to point to the wrong file/domain socket. if (${?SSH_AUTH_SOCK} != "1") then - setenv SSH_AUTH_SOCK `sockstat -u | awk '/^${USER}.+ ssh-agent/ { print $6 }' + setenv SSH_AUTH_SOCK `sockstat -u | awk '/^${USER}.+ ssh-agent/ { print $6 }'` endif # Change only root's prompt -if (`id -g` == 0) +if (`id -g` == 0) then set prompt="root@%m# " endif @@ -70,7 +70,7 @@ complete grep 'c/-*A/x:<#_lines_after>/ 'n/-*f/f/' \ 'n/*/f/' complete ifconfig 'p@1@`ifconfig -l`@' \ - 'n/*/(range phase link netmask mtu vlandev vlan metric mediaopt down delete broadcast arp debug)/' + 'n/*/(range phase link netmask mtu vlandev vlan metric mediaopt down delete broadcast arp debug)/' \ 'c/%/j/' \ 'n/*/`ps -ax | awk '"'"'{print $1}'"'"'`/' complete kill 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $1}'"'"'`/' From owner-svn-src-stable-9@freebsd.org Mon Jul 13 12:31:02 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE19C999A68; Mon, 13 Jul 2015 12:31:02 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DB65C9C; Mon, 13 Jul 2015 12:31:02 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6DCV23X093189; Mon, 13 Jul 2015 12:31:02 GMT (envelope-from brueffer@FreeBSD.org) Received: (from brueffer@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6DCV2On093188; Mon, 13 Jul 2015 12:31:02 GMT (envelope-from brueffer@FreeBSD.org) Message-Id: <201507131231.t6DCV2On093188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brueffer set sender to brueffer@FreeBSD.org using -f From: Christian Brueffer Date: Mon, 13 Jul 2015 12:31:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r285452 - stable/9/etc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jul 2015 12:31:02 -0000 Author: brueffer Date: Mon Jul 13 12:31:01 2015 New Revision: 285452 URL: https://svnweb.freebsd.org/changeset/base/285452 Log: MFC: r284930 Add CouchDB ports (5984 TCP/UDP). PR: 193268 Submitted by: yuri@rawbw.com Modified: stable/9/etc/services Directory Properties: stable/9/etc/ (props changed) Modified: stable/9/etc/services ============================================================================== --- stable/9/etc/services Mon Jul 13 12:28:18 2015 (r285451) +++ stable/9/etc/services Mon Jul 13 12:31:01 2015 (r285452) @@ -2363,6 +2363,8 @@ prosharerequest 5716/tcp #proshare con prosharerequest 5716/udp #proshare conf request prosharenotify 5717/tcp #proshare conf notify prosharenotify 5717/udp #proshare conf notify +couchdb 5984/tcp #CouchDB database server +couchdb 5984/udp #CouchDB database server cvsup 5999/tcp #CVSup file transfer/John Polstra/FreeBSD x11 6000/tcp #6000-6063 are assigned to X Window System x11 6000/udp From owner-svn-src-stable-9@freebsd.org Mon Jul 13 13:43:58 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3308099B96C; Mon, 13 Jul 2015 13:43:58 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1C6C81D5D; Mon, 13 Jul 2015 13:43:58 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6DDhvWf030249; Mon, 13 Jul 2015 13:43:57 GMT (envelope-from brueffer@FreeBSD.org) Received: (from brueffer@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6DDhv1q030248; Mon, 13 Jul 2015 13:43:57 GMT (envelope-from brueffer@FreeBSD.org) Message-Id: <201507131343.t6DDhv1q030248@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brueffer set sender to brueffer@FreeBSD.org using -f From: Christian Brueffer Date: Mon, 13 Jul 2015 13:43:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r285456 - stable/9/usr.bin/calendar/calendars X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jul 2015 13:43:58 -0000 Author: brueffer Date: Mon Jul 13 13:43:57 2015 New Revision: 285456 URL: https://svnweb.freebsd.org/changeset/base/285456 Log: MFC: r285028 Add the year to the VAX-11/780 announcement entry. PR: 200961 Submitted by: John Marshall Modified: stable/9/usr.bin/calendar/calendars/calendar.computer Directory Properties: stable/9/usr.bin/calendar/ (props changed) stable/9/usr.bin/calendar/calendars/ (props changed) Modified: stable/9/usr.bin/calendar/calendars/calendar.computer ============================================================================== --- stable/9/usr.bin/calendar/calendars/calendar.computer Mon Jul 13 13:42:05 2015 (r285455) +++ stable/9/usr.bin/calendar/calendars/calendar.computer Mon Jul 13 13:43:57 2015 (r285456) @@ -69,7 +69,7 @@ 10/14 British Computer Society founded, 1957 10/15 First FORTRAN Programmer's Reference Manual published, 1956 10/20 Zurich ALGOL report published, 1958 -10/25 DEC announces VAX-11/780 +10/25 DEC announces VAX-11/780, 1977 11/04 UNIVAC I program predicts Eisenhower victory based on 7% of votes, 1952 12/08 First Ph.D. awarded by Computer Science Dept, Univ. of Penna, 1965 From owner-svn-src-stable-9@freebsd.org Thu Jul 16 09:08:37 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A327F9A20CF; Thu, 16 Jul 2015 09:08:37 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9297E1029; Thu, 16 Jul 2015 09:08:37 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6G98bRQ088349; Thu, 16 Jul 2015 09:08:37 GMT (envelope-from brueffer@FreeBSD.org) Received: (from brueffer@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6G98boT088348; Thu, 16 Jul 2015 09:08:37 GMT (envelope-from brueffer@FreeBSD.org) Message-Id: <201507160908.t6G98boT088348@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brueffer set sender to brueffer@FreeBSD.org using -f From: Christian Brueffer Date: Thu, 16 Jul 2015 09:08:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r285624 - stable/9/sys/compat/ndis X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jul 2015 09:08:37 -0000 Author: brueffer Date: Thu Jul 16 09:08:36 2015 New Revision: 285624 URL: https://svnweb.freebsd.org/changeset/base/285624 Log: MFC: r232509 by brucec Fix race condition in KfRaiseIrql(). After getting the current irql, if the kthread gets preempted and subsequently runs on a different CPU, the saved irql could be wrong. Also, correct the panic string. PR: kern/165630 Submitted by: Vladislav Movchan Modified: stable/9/sys/compat/ndis/subr_hal.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/compat/ndis/subr_hal.c ============================================================================== --- stable/9/sys/compat/ndis/subr_hal.c Thu Jul 16 08:03:23 2015 (r285623) +++ stable/9/sys/compat/ndis/subr_hal.c Thu Jul 16 09:08:36 2015 (r285624) @@ -392,16 +392,18 @@ KfRaiseIrql(uint8_t irql) { uint8_t oldirql; + sched_pin(); oldirql = KeGetCurrentIrql(); /* I am so going to hell for this. */ if (oldirql > irql) - panic("IRQL_NOT_LESS_THAN"); + panic("IRQL_NOT_LESS_THAN_OR_EQUAL"); - if (oldirql != DISPATCH_LEVEL) { - sched_pin(); + if (oldirql != DISPATCH_LEVEL) mtx_lock(&disp_lock[curthread->td_oncpu]); - } + else + sched_unpin(); + /*printf("RAISE IRQL: %d %d\n", irql, oldirql);*/ return (oldirql);