From owner-svn-src-projects@freebsd.org  Thu Jan 28 02:56:32 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 879FEA707C4
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu, 28 Jan 2016 02:56:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 37F0E1BB6;
 Thu, 28 Jan 2016 02:56:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0S2uV4w097699;
 Thu, 28 Jan 2016 02:56:31 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0S2uVc4097697;
 Thu, 28 Jan 2016 02:56:31 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201601280256.u0S2uVc4097697@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 28 Jan 2016 02:56:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r294972 - in projects/release-pkg/usr.bin: chpass passwd
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2016 02:56:32 -0000

Author: gjb
Date: Thu Jan 28 02:56:30 2016
New Revision: 294972
URL: https://svnweb.freebsd.org/changeset/base/294972

Log:
  Restore the 'beforeinstall' for chpass(1), so files with the
  schg flag are handled before being replaced by a symbolic link.
  
  Fix passwd(1)/yppasswd(1) schg issue similarly to chpass(1).
  
  Note:  These are likely temporary fixes while identifying any
  remaining files that are not marked as 'flags=schg' via mtree(8).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/usr.bin/chpass/Makefile
  projects/release-pkg/usr.bin/passwd/Makefile

Modified: projects/release-pkg/usr.bin/chpass/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/chpass/Makefile	Thu Jan 28 02:21:20 2016	(r294971)
+++ projects/release-pkg/usr.bin/chpass/Makefile	Thu Jan 28 02:56:30 2016	(r294972)
@@ -35,4 +35,11 @@ MLINKS=	chpass.1 chfn.1 chpass.1 chsh.1
 MLINKS+= chpass.1 ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1
 .endif
 
+beforeinstall:
+.for i in chpass chfn chsh ypchpass ypchfn ypchsh
+.if exists(${DESTDIR}${BINDIR}/$i)
+	-chflags noschg ${DESTDIR}${BINDIR}/$i
+.endif
+.endfor
+
 .include <bsd.prog.mk>

Modified: projects/release-pkg/usr.bin/passwd/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/passwd/Makefile	Thu Jan 28 02:21:20 2016	(r294971)
+++ projects/release-pkg/usr.bin/passwd/Makefile	Thu Jan 28 02:56:30 2016	(r294972)
@@ -6,9 +6,10 @@
 PROG	 = passwd
 BINOWN	 = root
 BINMODE	 = 4555
+PRECIOUSPROG=
 LIBADD   = pam
 .if ${MK_NIS} != "no"
-LINKS	 = ${BINDIR}/passwd ${BINDIR}/yppasswd
+SYMLINKS = ${BINDIR}/passwd ${BINDIR}/yppasswd
 MLINKS	 = passwd.1 yppasswd.1
 .endif
 
@@ -18,9 +19,4 @@ beforeinstall:
 		chflags noschg ${DESTDIR}${BINDIR}/$i || true
 .endfor
 
-.if !defined(NO_FSCHG)
-afterinstall:
-	-chflags schg ${DESTDIR}${BINDIR}/passwd
-.endif
-
 .include <bsd.prog.mk>