From owner-svn-src-stable-8@FreeBSD.ORG Tue Feb 17 19:15:08 2015 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8EE10AB0; Tue, 17 Feb 2015 19:15:08 +0000 (UTC) Received: from svn.freebsd.org (svn.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 6EE2C3A0; Tue, 17 Feb 2015 19:15:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1HJF82S083267; Tue, 17 Feb 2015 19:15:08 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1HJF8ru083266; Tue, 17 Feb 2015 19:15:08 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201502171915.t1HJF8ru083266@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 17 Feb 2015 19:15:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r278912 - stable/8/lib/libc/regex X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Feb 2015 19:15:08 -0000 Author: delphij Date: Tue Feb 17 19:15:07 2015 New Revision: 278912 URL: https://svnweb.freebsd.org/changeset/base/278912 Log: MFC r278739: Disallow pattern spaces which would cause intermediate calculations to overflow size_t. Obtained from: DragonFly (2841837793bd095a82f477e9c370cfe6cfb3862c dillon) Security: CERT VU#695940 Modified: stable/8/lib/libc/regex/regcomp.c Directory Properties: stable/8/lib/libc/ (props changed) Modified: stable/8/lib/libc/regex/regcomp.c ============================================================================== --- stable/8/lib/libc/regex/regcomp.c Tue Feb 17 19:14:41 2015 (r278911) +++ stable/8/lib/libc/regex/regcomp.c Tue Feb 17 19:15:07 2015 (r278912) @@ -187,6 +187,7 @@ regcomp(regex_t * __restrict preg, struct parse *p = &pa; int i; size_t len; + size_t maxlen; #ifdef REDEBUG # define GOODFLAGS(f) (f) #else @@ -208,7 +209,23 @@ regcomp(regex_t * __restrict preg, g = (struct re_guts *)malloc(sizeof(struct re_guts)); if (g == NULL) return(REG_ESPACE); + /* + * Limit the pattern space to avoid a 32-bit overflow on buffer + * extension. Also avoid any signed overflow in case of conversion + * so make the real limit based on a 31-bit overflow. + * + * Likely not applicable on 64-bit systems but handle the case + * generically (who are we to stop people from using ~715MB+ + * patterns?). + */ + maxlen = ((size_t)-1 >> 1) / sizeof(sop) * 2 / 3; + if (len >= maxlen) { + free((char *)g); + return(REG_ESPACE); + } p->ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */ + assert(p->ssize >= len); + p->strip = (sop *)malloc(p->ssize * sizeof(sop)); p->slen = 0; if (p->strip == NULL) { From owner-svn-src-stable-8@FreeBSD.ORG Wed Feb 18 22:29:53 2015 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5C8F5DC; Wed, 18 Feb 2015 22:29:53 +0000 (UTC) Received: from svn.freebsd.org (svn.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 CFDEC944; Wed, 18 Feb 2015 22:29:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1IMTrBC043780; Wed, 18 Feb 2015 22:29:53 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1IMTrY0043779; Wed, 18 Feb 2015 22:29:53 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201502182229.t1IMTrY0043779@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 18 Feb 2015 22:29:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r278973 - stable/8/contrib/bind9/lib/dns X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Feb 2015 22:29:54 -0000 Author: delphij Date: Wed Feb 18 22:29:52 2015 New Revision: 278973 URL: https://svnweb.freebsd.org/changeset/base/278973 Log: Fix CVE-2015-1349. This is a direct commit to stable/8 because BIND is removed from HEAD. Modified: stable/8/contrib/bind9/lib/dns/zone.c Modified: stable/8/contrib/bind9/lib/dns/zone.c ============================================================================== --- stable/8/contrib/bind9/lib/dns/zone.c Wed Feb 18 22:20:19 2015 (r278972) +++ stable/8/contrib/bind9/lib/dns/zone.c Wed Feb 18 22:29:52 2015 (r278973) @@ -7931,6 +7931,12 @@ keyfetch_done(isc_task_t *task, isc_even namebuf, tag); trustkey = ISC_TRUE; } + } else { + /* + * No previously known key, and the key is not + * secure, so skip it. + */ + continue; } /* Delete old version */ @@ -7979,7 +7985,7 @@ keyfetch_done(isc_task_t *task, isc_even trust_key(zone, keyname, &dnskey, mctx); } - if (!deletekey) + if (secure && !deletekey) set_refreshkeytimer(zone, &keydata, now); } From owner-svn-src-stable-8@FreeBSD.ORG Fri Feb 20 00:55:39 2015 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC8DD411; Fri, 20 Feb 2015 00:55:39 +0000 (UTC) Received: from svn.freebsd.org (svn.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 C7123F6B; Fri, 20 Feb 2015 00:55:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1K0td7Y009795; Fri, 20 Feb 2015 00:55:39 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1K0tdaQ009794; Fri, 20 Feb 2015 00:55:39 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201502200055.t1K0tdaQ009794@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Fri, 20 Feb 2015 00:55:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r279034 - stable/8/tools/build/make_check X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Feb 2015 00:55:40 -0000 Author: ian Date: Fri Feb 20 00:55:38 2015 New Revision: 279034 URL: https://svnweb.freebsd.org/changeset/base/279034 Log: MFC r270190: Don't stop other parallel build legs on failure of make_check. Modified: stable/8/tools/build/make_check/Makefile Directory Properties: stable/8/tools/build/make_check/ (props changed) Modified: stable/8/tools/build/make_check/Makefile ============================================================================== --- stable/8/tools/build/make_check/Makefile Fri Feb 20 00:40:26 2015 (r279033) +++ stable/8/tools/build/make_check/Makefile Fri Feb 20 00:55:38 2015 (r279034) @@ -1,5 +1,8 @@ # $FreeBSD$ +# Failure is handled by the invoker, don't kill other legs of a parallel build. +MAKE_JOB_ERROR_TOKEN=no + # Test for broken LHS expansion. # This *must* cause make(1) to detect a recursive variable, and fail as such. .if make(lhs_expn) From owner-svn-src-stable-8@FreeBSD.ORG Fri Feb 20 01:03:45 2015 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B323BB0D; Fri, 20 Feb 2015 01:03:45 +0000 (UTC) Received: from svn.freebsd.org (svn.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 83418112; Fri, 20 Feb 2015 01:03:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1K13jAK014404; Fri, 20 Feb 2015 01:03:45 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1K13ikG014398; Fri, 20 Feb 2015 01:03:44 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201502200103.t1K13ikG014398@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Fri, 20 Feb 2015 01:03:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r279036 - in stable/8/gnu/usr.bin: diff diff3 sdiff X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Feb 2015 01:03:45 -0000 Author: ian Date: Fri Feb 20 01:03:44 2015 New Revision: 279036 URL: https://svnweb.freebsd.org/changeset/base/279036 Log: MFC r204227: Remove -b .orig from patch commands, since it's the default. This allows an 8-stable build to work on a system with newer tools that don't have the old -b option. Modified: stable/8/gnu/usr.bin/diff/Makefile stable/8/gnu/usr.bin/diff3/Makefile stable/8/gnu/usr.bin/sdiff/Makefile Directory Properties: stable/8/gnu/usr.bin/diff/ (props changed) stable/8/gnu/usr.bin/diff3/ (props changed) stable/8/gnu/usr.bin/sdiff/ (props changed) Modified: stable/8/gnu/usr.bin/diff/Makefile ============================================================================== --- stable/8/gnu/usr.bin/diff/Makefile Fri Feb 20 01:02:32 2015 (r279035) +++ stable/8/gnu/usr.bin/diff/Makefile Fri Feb 20 01:03:44 2015 (r279036) @@ -29,7 +29,7 @@ LDADD= -lgnuregex .for f in diff.c context.c ${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff - patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} + patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} CLEANFILES+= ${f} .endfor Modified: stable/8/gnu/usr.bin/diff3/Makefile ============================================================================== --- stable/8/gnu/usr.bin/diff3/Makefile Fri Feb 20 01:02:32 2015 (r279035) +++ stable/8/gnu/usr.bin/diff3/Makefile Fri Feb 20 01:03:44 2015 (r279036) @@ -20,7 +20,7 @@ CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bi .for f in diff3.c ${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff - patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} + patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} CLEANFILES+= ${f} .endfor Modified: stable/8/gnu/usr.bin/sdiff/Makefile ============================================================================== --- stable/8/gnu/usr.bin/sdiff/Makefile Fri Feb 20 01:02:32 2015 (r279035) +++ stable/8/gnu/usr.bin/sdiff/Makefile Fri Feb 20 01:03:44 2015 (r279036) @@ -21,7 +21,7 @@ CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bi .for f in sdiff.c ${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff - patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} + patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} CLEANFILES+= ${f} .endfor From owner-svn-src-stable-8@FreeBSD.ORG Fri Feb 20 05:23:54 2015 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1970F21; Fri, 20 Feb 2015 05:23:53 +0000 (UTC) Received: from svn.freebsd.org (svn.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 C31B099; Fri, 20 Feb 2015 05:23:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1K5NrH4038834; Fri, 20 Feb 2015 05:23:53 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1K5NqSt038826; Fri, 20 Feb 2015 05:23:52 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201502200523.t1K5NqSt038826@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Fri, 20 Feb 2015 05:23:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r279041 - in stable/8: sbin/hastctl sbin/hastd usr.bin/mklocale usr.sbin/bsnmpd/modules usr.sbin/config X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Feb 2015 05:23:54 -0000 Author: ian Date: Fri Feb 20 05:23:51 2015 New Revision: 279041 URL: https://svnweb.freebsd.org/changeset/base/279041 Log: Lower some WARNS from 6 to 5 to eliminate redundant redeclaration errors on yylex(). This allows stable-8 to build on machines running 10 or later (with a newer yacc that emits its own declaration) and also keep building on older machines with a yacc that doesn't do so. This is a direct commit to stable-8 because it fixes a problem that doesn't exist on later branches. Modified: stable/8/sbin/hastctl/Makefile stable/8/sbin/hastd/Makefile stable/8/usr.bin/mklocale/Makefile stable/8/usr.sbin/bsnmpd/modules/Makefile.inc stable/8/usr.sbin/config/Makefile Modified: stable/8/sbin/hastctl/Makefile ============================================================================== --- stable/8/sbin/hastctl/Makefile Fri Feb 20 05:17:24 2015 (r279040) +++ stable/8/sbin/hastctl/Makefile Fri Feb 20 05:23:51 2015 (r279041) @@ -17,7 +17,9 @@ SRCS+= proto.c proto_common.c proto_uds. SRCS+= token.l SRCS+= subr.c SRCS+= y.tab.h -WARNS?= 6 +.warning WARNS is ${WARNS} +WARNS?= 5 +.warning WARNS is now ${WARNS} MAN= hastctl.8 NO_WFORMAT= Modified: stable/8/sbin/hastd/Makefile ============================================================================== --- stable/8/sbin/hastd/Makefile Fri Feb 20 05:17:24 2015 (r279040) +++ stable/8/sbin/hastd/Makefile Fri Feb 20 05:23:51 2015 (r279041) @@ -17,7 +17,9 @@ SRCS+= rangelock.c SRCS+= subr.c SRCS+= token.l SRCS+= y.tab.h -WARNS?= 6 +.warning WARNS is ${WARNS} +WARNS?= 5 +.warning WARNS is now ${WARNS} MAN= hastd.8 hast.conf.5 NO_WFORMAT= Modified: stable/8/usr.bin/mklocale/Makefile ============================================================================== --- stable/8/usr.bin/mklocale/Makefile Fri Feb 20 05:17:24 2015 (r279040) +++ stable/8/usr.bin/mklocale/Makefile Fri Feb 20 05:23:51 2015 (r279041) @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= mklocale -WARNS?= 6 +WARNS?= 5 SRCS= yacc.y lex.l y.tab.h CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale Modified: stable/8/usr.sbin/bsnmpd/modules/Makefile.inc ============================================================================== --- stable/8/usr.sbin/bsnmpd/modules/Makefile.inc Fri Feb 20 05:17:24 2015 (r279040) +++ stable/8/usr.sbin/bsnmpd/modules/Makefile.inc Fri Feb 20 05:23:51 2015 (r279041) @@ -1,7 +1,7 @@ # $FreeBSD$ SHLIB_MAJOR= 6 -WARNS?= 6 +WARNS?= 5 MANFILTER= sed -e 's%@MODPATH@%${LIBDIR}/%g' \ -e 's%@DEFPATH@%${DEFSDIR}/%g' \ Modified: stable/8/usr.sbin/config/Makefile ============================================================================== --- stable/8/usr.sbin/config/Makefile Fri Feb 20 05:17:24 2015 (r279040) +++ stable/8/usr.sbin/config/Makefile Fri Feb 20 05:23:51 2015 (r279041) @@ -9,7 +9,7 @@ SRCS= config.y main.c lang.l mkmakefile. kernconf.c: kernconf.tmpl file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c -WARNS?= 6 +WARNS?= 5 CFLAGS+= -I. -I${.CURDIR} DPADD= ${LIBL} ${LIBSBUF} From owner-svn-src-stable-8@FreeBSD.ORG Fri Feb 20 10:12:00 2015 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AAC49997; Fri, 20 Feb 2015 10:12:00 +0000 (UTC) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 30680208; Fri, 20 Feb 2015 10:11:56 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::9cf5:e7d5:14b6:53b3] (unknown [IPv6:2001:7b8:3a7:0:9cf5:e7d5:14b6:53b3]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id D5A9D5C47; Fri, 20 Feb 2015 11:11:47 +0100 (CET) Subject: Re: svn commit: r279041 - in stable/8: sbin/hastctl sbin/hastd usr.bin/mklocale usr.sbin/bsnmpd/modules usr.sbin/config Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2070.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_776A3507-B391-4367-84D9-94F35260F828"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5b5 From: Dimitry Andric In-Reply-To: <201502200523.t1K5NqSt038826@svn.freebsd.org> Date: Fri, 20 Feb 2015 11:11:42 +0100 Message-Id: <543CCF29-E1D6-42D8-AB3F-B2D20C761A6D@FreeBSD.org> References: <201502200523.t1K5NqSt038826@svn.freebsd.org> To: Ian Lepore X-Mailer: Apple Mail (2.2070.6) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Feb 2015 10:12:00 -0000 --Apple-Mail=_776A3507-B391-4367-84D9-94F35260F828 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 20 Feb 2015, at 06:23, Ian Lepore wrote: >=20 > Author: ian > Date: Fri Feb 20 05:23:51 2015 > New Revision: 279041 > URL: https://svnweb.freebsd.org/changeset/base/279041 >=20 > Log: > Lower some WARNS from 6 to 5 to eliminate redundant redeclaration = errors > on yylex(). This allows stable-8 to build on machines running 10 or = later > (with a newer yacc that emits its own declaration) and also keep = building > on older machines with a yacc that doesn't do so. >=20 > This is a direct commit to stable-8 because it fixes a problem that = doesn't > exist on later branches. >=20 > Modified: > stable/8/sbin/hastctl/Makefile > stable/8/sbin/hastd/Makefile > stable/8/usr.bin/mklocale/Makefile > stable/8/usr.sbin/bsnmpd/modules/Makefile.inc > stable/8/usr.sbin/config/Makefile >=20 > Modified: stable/8/sbin/hastctl/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- stable/8/sbin/hastctl/Makefile Fri Feb 20 05:17:24 2015 = (r279040) > +++ stable/8/sbin/hastctl/Makefile Fri Feb 20 05:23:51 2015 = (r279041) > @@ -17,7 +17,9 @@ SRCS+=3D proto.c proto_common.c proto_uds. > SRCS+=3D token.l > SRCS+=3D subr.c > SRCS+=3D y.tab.h > -WARNS?=3D 6 > +.warning WARNS is ${WARNS} > +WARNS?=3D 5 > +.warning WARNS is now ${WARNS} > MAN=3D hastctl.8 >=20 > NO_WFORMAT=3D >=20 > Modified: stable/8/sbin/hastd/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- stable/8/sbin/hastd/Makefile Fri Feb 20 05:17:24 2015 = (r279040) > +++ stable/8/sbin/hastd/Makefile Fri Feb 20 05:23:51 2015 = (r279041) > @@ -17,7 +17,9 @@ SRCS+=3D rangelock.c > SRCS+=3D subr.c > SRCS+=3D token.l > SRCS+=3D y.tab.h > -WARNS?=3D 6 > +.warning WARNS is ${WARNS} > +WARNS?=3D 5 > +.warning WARNS is now ${WARNS} > MAN=3D hastd.8 hast.conf.5 Hi Ian, Did you really intend for these .warning directives to go in? :) -Dimitry --Apple-Mail=_776A3507-B391-4367-84D9-94F35260F828 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.26 iEYEARECAAYFAlTnCGIACgkQsF6jCi4glqOsQgCg9OlTB6Nl/w/3mtz1nzDqpSbp uzQAoO/+G+7bXX9HZUn8lY1+y9sFWzw7 =H8lg -----END PGP SIGNATURE----- --Apple-Mail=_776A3507-B391-4367-84D9-94F35260F828-- From owner-svn-src-stable-8@FreeBSD.ORG Fri Feb 20 13:34:13 2015 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 95025A29; Fri, 20 Feb 2015 13:34:13 +0000 (UTC) Received: from svn.freebsd.org (svn.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 7FDB8AE3; Fri, 20 Feb 2015 13:34:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1KDYDTc069217; Fri, 20 Feb 2015 13:34:13 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1KDYDvX069215; Fri, 20 Feb 2015 13:34:13 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201502201334.t1KDYDvX069215@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Fri, 20 Feb 2015 13:34:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r279053 - in stable/8/sbin: hastctl hastd X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Feb 2015 13:34:13 -0000 Author: ian Date: Fri Feb 20 13:34:12 2015 New Revision: 279053 URL: https://svnweb.freebsd.org/changeset/base/279053 Log: Remove leftover debugging output, accidentally committed. Pointy hat: ian Noticed by: dim Modified: stable/8/sbin/hastctl/Makefile stable/8/sbin/hastd/Makefile Modified: stable/8/sbin/hastctl/Makefile ============================================================================== --- stable/8/sbin/hastctl/Makefile Fri Feb 20 11:52:46 2015 (r279052) +++ stable/8/sbin/hastctl/Makefile Fri Feb 20 13:34:12 2015 (r279053) @@ -17,9 +17,7 @@ SRCS+= proto.c proto_common.c proto_uds. SRCS+= token.l SRCS+= subr.c SRCS+= y.tab.h -.warning WARNS is ${WARNS} WARNS?= 5 -.warning WARNS is now ${WARNS} MAN= hastctl.8 NO_WFORMAT= Modified: stable/8/sbin/hastd/Makefile ============================================================================== --- stable/8/sbin/hastd/Makefile Fri Feb 20 11:52:46 2015 (r279052) +++ stable/8/sbin/hastd/Makefile Fri Feb 20 13:34:12 2015 (r279053) @@ -17,9 +17,7 @@ SRCS+= rangelock.c SRCS+= subr.c SRCS+= token.l SRCS+= y.tab.h -.warning WARNS is ${WARNS} WARNS?= 5 -.warning WARNS is now ${WARNS} MAN= hastd.8 hast.conf.5 NO_WFORMAT= From owner-svn-src-stable-8@FreeBSD.ORG Fri Feb 20 13:35:00 2015 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9FB4ABCA; Fri, 20 Feb 2015 13:35:00 +0000 (UTC) Received: from pmta2.delivery2.ore.mailhop.org (pmta2.delivery2.ore.mailhop.org [54.69.130.42]) by mx1.freebsd.org (Postfix) with ESMTP id 7A6D9AEF; Fri, 20 Feb 2015 13:35:00 +0000 (UTC) Received: from smtp2.ore.mailhop.org (172.31.18.134) by pmta2.delivery1.ore.mailhop.org id hsss1g20u505; Fri, 20 Feb 2015 13:35:13 +0000 (envelope-from ) Received: from c-73-34-117-227.hsd1.co.comcast.net ([73.34.117.227] helo=ilsoft.org) by smtp2.ore.mailhop.org with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.82) (envelope-from ) id 1YOnjI-0001JN-EP; Fri, 20 Feb 2015 13:34:52 +0000 Received: from revolution.hippie.lan (revolution.hippie.lan [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id t1KDYoEG001869; Fri, 20 Feb 2015 06:34:50 -0700 (MST) (envelope-from ian@freebsd.org) X-Mail-Handler: DuoCircle Outbound SMTP X-Originating-IP: 73.34.117.227 X-Report-Abuse-To: abuse@duocircle.com (see https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information for abuse reporting information) X-MHO-User: U2FsdGVkX1+nia3JSjQKG0Vx9qLWrdWA Message-ID: <1424439290.1108.58.camel@freebsd.org> Subject: Re: svn commit: r279041 - in stable/8: sbin/hastctl sbin/hastd usr.bin/mklocale usr.sbin/bsnmpd/modules usr.sbin/config From: Ian Lepore To: Dimitry Andric Date: Fri, 20 Feb 2015 06:34:50 -0700 In-Reply-To: <543CCF29-E1D6-42D8-AB3F-B2D20C761A6D@FreeBSD.org> References: <201502200523.t1K5NqSt038826@svn.freebsd.org> <543CCF29-E1D6-42D8-AB3F-B2D20C761A6D@FreeBSD.org> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.12.8 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Feb 2015 13:35:00 -0000 On Fri, 2015-02-20 at 11:11 +0100, Dimitry Andric wrote: > On 20 Feb 2015, at 06:23, Ian Lepore wrote: > > > > Author: ian > > Date: Fri Feb 20 05:23:51 2015 > > New Revision: 279041 > > URL: https://svnweb.freebsd.org/changeset/base/279041 > > > > Log: > > Lower some WARNS from 6 to 5 to eliminate redundant redeclaration errors > > on yylex(). This allows stable-8 to build on machines running 10 or later > > (with a newer yacc that emits its own declaration) and also keep building > > on older machines with a yacc that doesn't do so. > > > > This is a direct commit to stable-8 because it fixes a problem that doesn't > > exist on later branches. > > > > Modified: > > stable/8/sbin/hastctl/Makefile > > stable/8/sbin/hastd/Makefile > > stable/8/usr.bin/mklocale/Makefile > > stable/8/usr.sbin/bsnmpd/modules/Makefile.inc > > stable/8/usr.sbin/config/Makefile > > > > Modified: stable/8/sbin/hastctl/Makefile > > ============================================================================== > > --- stable/8/sbin/hastctl/Makefile Fri Feb 20 05:17:24 2015 (r279040) > > +++ stable/8/sbin/hastctl/Makefile Fri Feb 20 05:23:51 2015 (r279041) > > @@ -17,7 +17,9 @@ SRCS+= proto.c proto_common.c proto_uds. > > SRCS+= token.l > > SRCS+= subr.c > > SRCS+= y.tab.h > > -WARNS?= 6 > > +.warning WARNS is ${WARNS} > > +WARNS?= 5 > > +.warning WARNS is now ${WARNS} > > MAN= hastctl.8 > > > > NO_WFORMAT= > > > > Modified: stable/8/sbin/hastd/Makefile > > ============================================================================== > > --- stable/8/sbin/hastd/Makefile Fri Feb 20 05:17:24 2015 (r279040) > > +++ stable/8/sbin/hastd/Makefile Fri Feb 20 05:23:51 2015 (r279041) > > @@ -17,7 +17,9 @@ SRCS+= rangelock.c > > SRCS+= subr.c > > SRCS+= token.l > > SRCS+= y.tab.h > > -WARNS?= 6 > > +.warning WARNS is ${WARNS} > > +WARNS?= 5 > > +.warning WARNS is now ${WARNS} > > MAN= hastd.8 hast.conf.5 > > Hi Ian, > > Did you really intend for these .warning directives to go in? :) > > -Dimitry > Doh! No, of course not. Fixed in r279053, thanks. -- Ian