From 780ae7713f72b471859c0997295ac0c59695c7b4 Mon Sep 17 00:00:00 2001 From: gjb Date: Thu, 28 Jan 2016 01:15:57 +0000 Subject: [PATCH] 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 --- usr.bin/chpass/Makefile | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index 9b3e878d8656..96bbd4be6eaa 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -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