From owner-svn-src-head@FreeBSD.ORG Fri Feb 13 04:56:50 2015 Return-Path: Delivered-To: svn-src-head@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 06E592E6; Fri, 13 Feb 2015 04:56:50 +0000 (UTC) Received: from pmta2.delivery3.ore.mailhop.org (pmta2.delivery3.ore.mailhop.org [54.213.22.21]) by mx1.freebsd.org (Postfix) with ESMTP id DA4F81FE; Fri, 13 Feb 2015 04:56:49 +0000 (UTC) Received: from smtp6.ore.mailhop.org (172.31.18.134) by pmta2.delivery1.ore.mailhop.org id hrm21g20u50m; Fri, 13 Feb 2015 04:56:54 +0000 (envelope-from ) Received: from [73.34.117.227] (helo=ilsoft.org) by smtp6.ore.mailhop.org with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.82) (envelope-from ) id 1YM8J6-0005GN-SS; Fri, 13 Feb 2015 04:56:49 +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 t1D4ulbS002363; Thu, 12 Feb 2015 21:56:47 -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: U2FsdGVkX19wpa79PxqAaOIptyxuy1GC Message-ID: <1423803407.80968.126.camel@freebsd.org> Subject: Re: svn commit: r278642 - in head/usr.bin: chpass passwd From: Ian Lepore To: Baptiste Daroussin Date: Thu, 12 Feb 2015 21:56:47 -0700 In-Reply-To: <201502122308.t1CN8Sg0062438@svn.freebsd.org> References: <201502122308.t1CN8Sg0062438@svn.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-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Feb 2015 04:56:50 -0000 On Thu, 2015-02-12 at 23:08 +0000, Baptiste Daroussin wrote: > Author: bapt > Date: Thu Feb 12 23:08:27 2015 > New Revision: 278642 > URL: https://svnweb.freebsd.org/changeset/base/278642 > > Log: > Use PRECIOUSPROG instead of custom code to handle schg > > This allows to preserve schg when installed with -DNO_ROOT > > MFC after: 1 week > > Modified: > head/usr.bin/chpass/Makefile > head/usr.bin/passwd/Makefile > > Modified: head/usr.bin/chpass/Makefile > ============================================================================== > --- head/usr.bin/chpass/Makefile Thu Feb 12 23:00:31 2015 (r278641) > +++ head/usr.bin/chpass/Makefile Thu Feb 12 23:08:27 2015 (r278642) > @@ -9,6 +9,7 @@ PROG= chpass > SRCS= chpass.c edit.c field.c pw_scan.c table.c util.c > BINOWN= root > BINMODE=4555 > +PRECIOUSPROG= > .if ${MK_NIS} != "no" > CFLAGS+= -DYP > .endif > @@ -34,16 +35,4 @@ 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 > - It looks like the removal of this beforeinstall target is causing failure to re-install over an existing copy of the program. -- Ian