Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Jan 2016 01:15:57 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r294966 - projects/release-pkg/usr.bin/chpass
Message-ID:  <201601280115.u0S1Fv5v068629@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Thu Jan 28 01:15:57 2016
New Revision: 294966
URL: https://svnweb.freebsd.org/changeset/base/294966

Log:
  Ensure mtree(8) recognizes chpass(1) is schg.
  
  Convert hard links to symbolic links, and remove the
  'beforeinstall' and 'afterinstall' chflags(8) execution.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/release-pkg/usr.bin/chpass/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/chpass/Makefile	Thu Jan 28 00:51:17 2016	(r294965)
+++ projects/release-pkg/usr.bin/chpass/Makefile	Thu Jan 28 01:15:57 2016	(r294966)
@@ -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
@@ -21,12 +22,12 @@ LIBADD=	crypt util
 LIBADD+=	ypclnt
 .endif 
 
-LINKS=	${BINDIR}/chpass ${BINDIR}/chfn
-LINKS+=	${BINDIR}/chpass ${BINDIR}/chsh
+SYMLINKS=	${BINDIR}/chpass ${BINDIR}/chfn
+SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/chsh
 .if ${MK_NIS} != "no"
-LINKS+=	${BINDIR}/chpass ${BINDIR}/ypchpass
-LINKS+=	${BINDIR}/chpass ${BINDIR}/ypchfn
-LINKS+=	${BINDIR}/chpass ${BINDIR}/ypchsh
+SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchpass
+SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchfn
+SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchsh
 .endif
 
 MLINKS=	chpass.1 chfn.1 chpass.1 chsh.1
@@ -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
-
-.if !defined(NO_FSCHG)
-afterinstall:
-	-chflags schg ${DESTDIR}${BINDIR}/chpass
-.endif
-
 .include <bsd.prog.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601280115.u0S1Fv5v068629>