From owner-svn-src-releng@freebsd.org Tue Jul 21 23:43:00 2015 Return-Path: Delivered-To: svn-src-releng@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 C5E3E9A7EAF; Tue, 21 Jul 2015 23:43:00 +0000 (UTC) (envelope-from delphij@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 B4F031B05; Tue, 21 Jul 2015 23:43:00 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6LNh0wK019367; Tue, 21 Jul 2015 23:43:00 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6LNgvRF019352; Tue, 21 Jul 2015 23:42:57 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201507212342.t6LNgvRF019352@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 21 Jul 2015 23:42:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r285780 - in releng: 10.1 10.1/sys/conf 10.1/sys/netinet 8.4 8.4/sys/conf 8.4/sys/netinet 9.3 9.3/sys/conf 9.3/sys/netinet X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jul 2015 23:43:00 -0000 Author: delphij Date: Tue Jul 21 23:42:56 2015 New Revision: 285780 URL: https://svnweb.freebsd.org/changeset/base/285780 Log: Fix resource exhaustion due to sessions stuck in LAST_ACK state. Security: CVE-2015-5358 Security: SA-15:13.tcp Submitted by: Jonathan Looney (Juniper SIRT) Approved by: so Modified: releng/10.1/UPDATING releng/10.1/sys/conf/newvers.sh releng/10.1/sys/netinet/tcp_output.c releng/8.4/UPDATING releng/8.4/sys/conf/newvers.sh releng/8.4/sys/netinet/tcp_output.c releng/9.3/UPDATING releng/9.3/sys/conf/newvers.sh releng/9.3/sys/netinet/tcp_output.c Modified: releng/10.1/UPDATING ============================================================================== --- releng/10.1/UPDATING Tue Jul 21 23:42:20 2015 (r285779) +++ releng/10.1/UPDATING Tue Jul 21 23:42:56 2015 (r285780) @@ -16,6 +16,11 @@ from older versions of FreeBSD, try WITH stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20150721: p15 FreeBSD-SA-15:13.tcp + + Fix resource exhaustion due to sessions stuck in LAST_ACK state. + [SA-15:13] + 20150630: p14 FreeBSD-EN-15:08.sendmail [revised] FreeBSD-EN-15:09.xlocale FreeBSD-EN-15:10.iconv Modified: releng/10.1/sys/conf/newvers.sh ============================================================================== --- releng/10.1/sys/conf/newvers.sh Tue Jul 21 23:42:20 2015 (r285779) +++ releng/10.1/sys/conf/newvers.sh Tue Jul 21 23:42:56 2015 (r285780) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.1" -BRANCH="RELEASE-p14" +BRANCH="RELEASE-p15" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/10.1/sys/netinet/tcp_output.c ============================================================================== --- releng/10.1/sys/netinet/tcp_output.c Tue Jul 21 23:42:20 2015 (r285779) +++ releng/10.1/sys/netinet/tcp_output.c Tue Jul 21 23:42:56 2015 (r285780) @@ -400,7 +400,7 @@ after_sack_rexmit: flags &= ~TH_FIN; } - if (len < 0) { + if (len <= 0) { /* * If FIN has been sent but not acked, * but we haven't been called to retransmit, @@ -410,9 +410,16 @@ after_sack_rexmit: * to (closed) window, and set the persist timer * if it isn't already going. If the window didn't * close completely, just wait for an ACK. + * + * We also do a general check here to ensure that + * we will set the persist timer when we have data + * to send, but a 0-byte window. This makes sure + * the persist timer is set even if the packet + * hits one of the "goto send" lines below. */ len = 0; - if (sendwin == 0) { + if ((sendwin == 0) && (TCPS_HAVEESTABLISHED(tp->t_state)) && + (off < (int) so->so_snd.sb_cc)) { tcp_timer_activate(tp, TT_REXMT, 0); tp->t_rxtshift = 0; tp->snd_nxt = tp->snd_una; Modified: releng/8.4/UPDATING ============================================================================== --- releng/8.4/UPDATING Tue Jul 21 23:42:20 2015 (r285779) +++ releng/8.4/UPDATING Tue Jul 21 23:42:56 2015 (r285780) @@ -15,6 +15,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20150721: p34 FreeBSD-SA-15:13.tcp + + Fix resource exhaustion due to sessions stuck in LAST_ACK state. + [SA-15:13] + 20150707: p33 FreeBSD-SA-15:11.bind Fix BIND resolver remote denial of service when validating. Modified: releng/8.4/sys/conf/newvers.sh ============================================================================== --- releng/8.4/sys/conf/newvers.sh Tue Jul 21 23:42:20 2015 (r285779) +++ releng/8.4/sys/conf/newvers.sh Tue Jul 21 23:42:56 2015 (r285780) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.4" -BRANCH="RELEASE-p33" +BRANCH="RELEASE-p34" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/8.4/sys/netinet/tcp_output.c ============================================================================== --- releng/8.4/sys/netinet/tcp_output.c Tue Jul 21 23:42:20 2015 (r285779) +++ releng/8.4/sys/netinet/tcp_output.c Tue Jul 21 23:42:56 2015 (r285780) @@ -398,7 +398,7 @@ after_sack_rexmit: flags &= ~TH_FIN; } - if (len < 0) { + if (len <= 0) { /* * If FIN has been sent but not acked, * but we haven't been called to retransmit, @@ -408,9 +408,16 @@ after_sack_rexmit: * to (closed) window, and set the persist timer * if it isn't already going. If the window didn't * close completely, just wait for an ACK. + * + * We also do a general check here to ensure that + * we will set the persist timer when we have data + * to send, but a 0-byte window. This makes sure + * the persist timer is set even if the packet + * hits one of the "goto send" lines below. */ len = 0; - if (sendwin == 0) { + if ((sendwin == 0) && (TCPS_HAVEESTABLISHED(tp->t_state)) && + (off < (int) so->so_snd.sb_cc)) { tcp_timer_activate(tp, TT_REXMT, 0); tp->t_rxtshift = 0; tp->snd_nxt = tp->snd_una; Modified: releng/9.3/UPDATING ============================================================================== --- releng/9.3/UPDATING Tue Jul 21 23:42:20 2015 (r285779) +++ releng/9.3/UPDATING Tue Jul 21 23:42:56 2015 (r285780) @@ -11,6 +11,11 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20150721: p20 FreeBSD-SA-15:13.tcp + + Fix resource exhaustion due to sessions stuck in LAST_ACK state. + [SA-15:13] + 20150707: p19 FreeBSD-SA-15:11.bind Fix BIND resolver remote denial of service when validating. Modified: releng/9.3/sys/conf/newvers.sh ============================================================================== --- releng/9.3/sys/conf/newvers.sh Tue Jul 21 23:42:20 2015 (r285779) +++ releng/9.3/sys/conf/newvers.sh Tue Jul 21 23:42:56 2015 (r285780) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.3" -BRANCH="RELEASE-p19" +BRANCH="RELEASE-p20" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/9.3/sys/netinet/tcp_output.c ============================================================================== --- releng/9.3/sys/netinet/tcp_output.c Tue Jul 21 23:42:20 2015 (r285779) +++ releng/9.3/sys/netinet/tcp_output.c Tue Jul 21 23:42:56 2015 (r285780) @@ -397,7 +397,7 @@ after_sack_rexmit: flags &= ~TH_FIN; } - if (len < 0) { + if (len <= 0) { /* * If FIN has been sent but not acked, * but we haven't been called to retransmit, @@ -407,9 +407,16 @@ after_sack_rexmit: * to (closed) window, and set the persist timer * if it isn't already going. If the window didn't * close completely, just wait for an ACK. + * + * We also do a general check here to ensure that + * we will set the persist timer when we have data + * to send, but a 0-byte window. This makes sure + * the persist timer is set even if the packet + * hits one of the "goto send" lines below. */ len = 0; - if (sendwin == 0) { + if ((sendwin == 0) && (TCPS_HAVEESTABLISHED(tp->t_state)) && + (off < (int) so->so_snd.sb_cc)) { tcp_timer_activate(tp, TT_REXMT, 0); tp->t_rxtshift = 0; tp->snd_nxt = tp->snd_una; From owner-svn-src-releng@freebsd.org Thu Jul 23 23:31:42 2015 Return-Path: Delivered-To: svn-src-releng@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 6BA799A9A0A; Thu, 23 Jul 2015 23:31:42 +0000 (UTC) (envelope-from gjb@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 3A0F5106D; Thu, 23 Jul 2015 23:31:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6NNVgTM025093; Thu, 23 Jul 2015 23:31:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6NNVfAZ025090; Thu, 23 Jul 2015 23:31:41 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201507232331.t6NNVfAZ025090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 23 Jul 2015 23:31:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r285830 - in releng/10.2: . etc/pkg sys/conf sys/sys X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jul 2015 23:31:42 -0000 Author: gjb Date: Thu Jul 23 23:31:40 2015 New Revision: 285830 URL: https://svnweb.freebsd.org/changeset/base/285830 Log: - Copy stable/10@285827 to releng/10.2 in preparation for 10.2-RC1 builds. - Update newvers.sh to reflect RC1. - Update __FreeBSD_version to reflect 10.2. - Update default pkg(8) configuration to use the quarterly branch.[1] Discussed with: re, portmgr [1] Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Added: releng/10.2/ - copied from r285827, stable/10/ Modified: releng/10.2/etc/pkg/FreeBSD.conf releng/10.2/sys/conf/newvers.sh releng/10.2/sys/sys/param.h Modified: releng/10.2/etc/pkg/FreeBSD.conf ============================================================================== --- stable/10/etc/pkg/FreeBSD.conf Thu Jul 23 20:01:56 2015 (r285827) +++ releng/10.2/etc/pkg/FreeBSD.conf Thu Jul 23 23:31:40 2015 (r285830) @@ -8,7 +8,7 @@ # FreeBSD: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", Modified: releng/10.2/sys/conf/newvers.sh ============================================================================== --- stable/10/sys/conf/newvers.sh Thu Jul 23 20:01:56 2015 (r285827) +++ releng/10.2/sys/conf/newvers.sh Thu Jul 23 23:31:40 2015 (r285830) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.2" -BRANCH="BETA2" +BRANCH="RC1" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/10.2/sys/sys/param.h ============================================================================== --- stable/10/sys/sys/param.h Thu Jul 23 20:01:56 2015 (r285827) +++ releng/10.2/sys/sys/param.h Thu Jul 23 23:31:40 2015 (r285830) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1001519 /* Master, propagated to newvers */ +#define __FreeBSD_version 1002000 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-releng@freebsd.org Thu Jul 23 23:37:04 2015 Return-Path: Delivered-To: svn-src-releng@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 6DFDB9A9B9B; Thu, 23 Jul 2015 23:37:04 +0000 (UTC) (envelope-from gjb@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 453FA1684; Thu, 23 Jul 2015 23:37:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6NNb4PF026224; Thu, 23 Jul 2015 23:37:04 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6NNb4UW026223; Thu, 23 Jul 2015 23:37:04 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201507232337.t6NNb4UW026223@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 23 Jul 2015 23:37:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r285832 - in releng/10.2: . sys/gnu/dts X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jul 2015 23:37:04 -0000 Author: gjb Date: Thu Jul 23 23:37:03 2015 New Revision: 285832 URL: https://svnweb.freebsd.org/changeset/base/285832 Log: Prune svn:mergeinfo after branching stable/10 -> releng/10.2 Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: Directory Properties: releng/10.2/ (props changed) releng/10.2/sys/gnu/dts/ (props changed) From owner-svn-src-releng@freebsd.org Fri Jul 24 19:16:16 2015 Return-Path: Delivered-To: svn-src-releng@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 E820A9A9907; Fri, 24 Jul 2015 19:16:16 +0000 (UTC) (envelope-from gjb@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 D4BAB1643; Fri, 24 Jul 2015 19:16:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6OJGG53074466; Fri, 24 Jul 2015 19:16:16 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6OJGGll074465; Fri, 24 Jul 2015 19:16:16 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201507241916.t6OJGGll074465@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 24 Jul 2015 19:16:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r285850 - releng/10.2/release/pkg_repos X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2015 19:16:17 -0000 Author: gjb Date: Fri Jul 24 19:16:16 2015 New Revision: 285850 URL: https://svnweb.freebsd.org/changeset/base/285850 Log: Update the pkg.conf(5) for the dvd1.iso packages to use the 'quarterly' branch, which was missed in r285830. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/pkg_repos/release-dvd.conf Modified: releng/10.2/release/pkg_repos/release-dvd.conf ============================================================================== --- releng/10.2/release/pkg_repos/release-dvd.conf Fri Jul 24 19:09:11 2015 (r285849) +++ releng/10.2/release/pkg_repos/release-dvd.conf Fri Jul 24 19:16:16 2015 (r285850) @@ -1,6 +1,6 @@ # $FreeBSD$ release: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", From owner-svn-src-releng@freebsd.org Fri Jul 24 19:37:31 2015 Return-Path: Delivered-To: svn-src-releng@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 7DC7F9A9DEC; Fri, 24 Jul 2015 19:37:31 +0000 (UTC) (envelope-from emaste@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 6A0D812A3; Fri, 24 Jul 2015 19:37:31 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6OJbVio085651; Fri, 24 Jul 2015 19:37:31 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6OJbVBY085649; Fri, 24 Jul 2015 19:37:31 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201507241937.t6OJbVBY085649@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 24 Jul 2015 19:37:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r285853 - releng/10.2/usr.sbin/pmcstudy X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2015 19:37:31 -0000 Author: emaste Date: Fri Jul 24 19:37:30 2015 New Revision: 285853 URL: https://svnweb.freebsd.org/changeset/base/285853 Log: MFS r285849: Fix minor errors found by coverity. PR: 201594 Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/usr.sbin/pmcstudy/pmcstudy.c Directory Properties: releng/10.2/ (props changed) Modified: releng/10.2/usr.sbin/pmcstudy/pmcstudy.c ============================================================================== --- releng/10.2/usr.sbin/pmcstudy/pmcstudy.c Fri Jul 24 19:26:06 2015 (r285852) +++ releng/10.2/usr.sbin/pmcstudy/pmcstudy.c Fri Jul 24 19:37:30 2015 (r285853) @@ -1808,6 +1808,9 @@ process_file(char *filename) if (cnts == NULL) { /* Nothing we can do */ printf("Nothing to do -- no counters built\n"); + if (io) { + fclose(io); + } return; } lace_cpus_together(); @@ -2044,7 +2047,7 @@ get_cpuid_set(void) printf("No memory3 allocation fails at startup?\n"); exit(-1); } - memset(more, sz, 0); + memset(more, 0, sz); memcpy(more, valid_pmcs, sz); pmc_allocated_cnt *= 2; free(valid_pmcs); From owner-svn-src-releng@freebsd.org Fri Jul 24 19:50:57 2015 Return-Path: Delivered-To: svn-src-releng@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 32DC29AA254; Fri, 24 Jul 2015 19:50:57 +0000 (UTC) (envelope-from gjb@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 2269A112F; Fri, 24 Jul 2015 19:50:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6OJovke092569; Fri, 24 Jul 2015 19:50:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6OJoua8092567; Fri, 24 Jul 2015 19:50:56 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201507241950.t6OJoua8092567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 24 Jul 2015 19:50:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r285855 - in releng/10.2/release/doc: en_US.ISO8859-1/readme share/xml X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2015 19:50:57 -0000 Author: gjb Date: Fri Jul 24 19:50:55 2015 New Revision: 285855 URL: https://svnweb.freebsd.org/changeset/base/285855 Log: Fix rendering of a URL. Update entities to reflect 10.2-RELEASE in preparation for adding the hardware, relnotes, and installation pages to the website. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/en_US.ISO8859-1/readme/article.xml releng/10.2/release/doc/share/xml/release.ent Modified: releng/10.2/release/doc/en_US.ISO8859-1/readme/article.xml ============================================================================== --- releng/10.2/release/doc/en_US.ISO8859-1/readme/article.xml Fri Jul 24 19:43:18 2015 (r285854) +++ releng/10.2/release/doc/en_US.ISO8859-1/readme/article.xml Fri Jul 24 19:50:55 2015 (r285855) @@ -349,8 +349,9 @@ other copies are kept updated on the Internet and should be consulted as the current errata for this release. These other copies of the errata are located at - &url.base;/releases/ + the &os; &release.current; + page (as well as any sites which keep up-to-date mirrors of this location). Modified: releng/10.2/release/doc/share/xml/release.ent ============================================================================== --- releng/10.2/release/doc/share/xml/release.ent Fri Jul 24 19:43:18 2015 (r285854) +++ releng/10.2/release/doc/share/xml/release.ent Fri Jul 24 19:50:55 2015 (r285855) @@ -6,7 +6,7 @@ - + - + - + - + - + @@ -37,10 +37,10 @@ or "release" --> - - + + - + From owner-svn-src-releng@freebsd.org Fri Jul 24 22:00:45 2015 Return-Path: Delivered-To: svn-src-releng@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 A14F09AAB06; Fri, 24 Jul 2015 22:00:45 +0000 (UTC) (envelope-from gjb@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 8E4761976; Fri, 24 Jul 2015 22:00:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6OM0j7b055762; Fri, 24 Jul 2015 22:00:45 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6OM0jCD055761; Fri, 24 Jul 2015 22:00:45 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201507242200.t6OM0jCD055761@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 24 Jul 2015 22:00:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r285860 - releng/10.2/release/doc/share/xml X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2015 22:00:45 -0000 Author: gjb Date: Fri Jul 24 22:00:44 2015 New Revision: 285860 URL: https://svnweb.freebsd.org/changeset/base/285860 Log: Add a local entity for the pms(4) driver. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/release/doc/share/xml/release.ent Modified: releng/10.2/release/doc/share/xml/release.ent ============================================================================== --- releng/10.2/release/doc/share/xml/release.ent Fri Jul 24 21:55:16 2015 (r285859) +++ releng/10.2/release/doc/share/xml/release.ent Fri Jul 24 22:00:44 2015 (r285860) @@ -76,3 +76,6 @@ + + +pms4"> From owner-svn-src-releng@freebsd.org Fri Jul 24 22:08:58 2015 Return-Path: Delivered-To: svn-src-releng@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 DF3D19AACDC; Fri, 24 Jul 2015 22:08:58 +0000 (UTC) (envelope-from delphij@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 B59C91CCF; Fri, 24 Jul 2015 22:08:58 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6OM8w1n056691; Fri, 24 Jul 2015 22:08:58 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6OM8w1l056689; Fri, 24 Jul 2015 22:08:58 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201507242208.t6OM8w1l056689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 24 Jul 2015 22:08:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r285861 - in releng/10.2/usr.sbin/ntp: . ntpd X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2015 22:08:59 -0000 Author: delphij Date: Fri Jul 24 22:08:57 2015 New Revision: 285861 URL: https://svnweb.freebsd.org/changeset/base/285861 Log: MFS r285856: MFC r285701: Use fixed date/time (the time choosen was the time the import was done on -HEAD) in libntp so we can make reproducible build. PR: bin/201661 Differential Revision: https://reviews.freebsd.org/D3122 While I'm there also remove libmd from linkage as reported in bin/201738 PR: bin/201738 Submitted by: John Marshall Approved by: re (gjb) Modified: releng/10.2/usr.sbin/ntp/config.h releng/10.2/usr.sbin/ntp/ntpd/Makefile Directory Properties: releng/10.2/ (props changed) Modified: releng/10.2/usr.sbin/ntp/config.h ============================================================================== --- releng/10.2/usr.sbin/ntp/config.h Fri Jul 24 22:00:44 2015 (r285860) +++ releng/10.2/usr.sbin/ntp/config.h Fri Jul 24 22:08:57 2015 (r285861) @@ -1785,3 +1785,8 @@ typedef union mpinfou { # endif #endif /* !defined(_KERNEL) && !defined(PARSESTREAM) */ +/* + * FreeBSD specific: Explicitly specify date/time for reproducible build. + */ +#define MKREPRO_DATE "Jul 04 2015" +#define MKREPRO_TIME "15:42:16" Modified: releng/10.2/usr.sbin/ntp/ntpd/Makefile ============================================================================== --- releng/10.2/usr.sbin/ntp/ntpd/Makefile Fri Jul 24 22:00:44 2015 (r285860) +++ releng/10.2/usr.sbin/ntp/ntpd/Makefile Fri Jul 24 22:08:57 2015 (r285861) @@ -27,8 +27,8 @@ SRCS= cmd_args.c ntp_config.c ntp_contro refclock_tt560.c refclock_ulink.c refclock_wwv.c refclock_wwvb.c \ refclock_zyfer.c version.c -DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} ${LIBPTHREAD} -LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd ${LIBOPTS} -lpthread +DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBOPTS} ${LIBPTHREAD} +LDADD= ${LIBPARSE} ${LIBNTP} -lm ${LIBOPTS} -lpthread CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/ntpd \ -I${.CURDIR}/../../../contrib/ntp/include \