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

diff --git a/chpass/Makefile b/chpass/Makefile
index 96bbd4be6eaa07ec4793f1863726f0a78f5b6afb..16974e211d923bdbaa24c4aa14420de8f3301644 100644 (file)
--- a/chpass/Makefile
+++ b/chpass/Makefile
@@ -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>