From owner-svn-src-stable-10@FreeBSD.ORG Sun Nov 9 19:56:26 2014 Return-Path: Delivered-To: svn-src-stable-10@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 E166029E; Sun, 9 Nov 2014 19:56:26 +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 CD2BDFB3; Sun, 9 Nov 2014 19:56:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA9JuQBN072471; Sun, 9 Nov 2014 19:56:26 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA9JuQjV072470; Sun, 9 Nov 2014 19:56:26 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201411091956.sA9JuQjV072470@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 9 Nov 2014 19:56:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r274323 - stable/10/usr.sbin/pw X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Nov 2014 19:56:27 -0000 Author: ian Date: Sun Nov 9 19:56:26 2014 New Revision: 274323 URL: https://svnweb.freebsd.org/changeset/base/274323 Log: Fix an apparent mis-merge that happened in r274082. Before that, on the 10-stable branch, this makefile had WARNS=2, and on head the value is still 2, but in the MFC done in r274082 it got changed to 3, causing build failures when building with gcc. This direct commit to 10 goes back to WARNS=2. Modified: stable/10/usr.sbin/pw/Makefile Modified: stable/10/usr.sbin/pw/Makefile ============================================================================== --- stable/10/usr.sbin/pw/Makefile Sun Nov 9 18:13:08 2014 (r274322) +++ stable/10/usr.sbin/pw/Makefile Sun Nov 9 19:56:26 2014 (r274323) @@ -8,7 +8,7 @@ SRCS= pw.c pw_conf.c pw_user.c pw_group. grupd.c pwupd.c fileupd.c psdate.c \ bitmap.c cpdir.c rm_r.c -WARNS?= 3 +WARNS?= 2 DPADD= ${LIBCRYPT} ${LIBUTIL} LDADD= -lcrypt -lutil