Existing passwd and group files overwritten by pkgbase upgrade

[Ashley Chase]

On Sat, May 11, 2019 at 03:44:10PM +0200, Emmanuel Vadot wrote:
> On Sat, 11 May 2019 15:23:21 +0200
> mj-mailinglist at gmx.de wrote:
> 
> > Hi Ashley,
> > 
> > I guess this change is the cause: https://reviews.freebsd.org/D20173
> > It marks the group and the master.passwd file for inclusion in the 
> > FreebSD-runtime package.
> > I tried this change on my 12 system, the files are included in the
> > package. You also see them in the runtime.plist file, but as regular file,
> > not marked as a config file, like the motd file for example.
> >  
> > ...
> > @(root,wheel,0644,) /etc/group
> > @(root,wheel,0600,) /etc/master.passwd
> > @config(root,wheel,0644,) /etc/motd
> > ...
> >  
> > i guess now the existing file is replaced by the new file, instead of beeing
> > merged with it.
> > i think, the tag "config" must be added to the above patch. But i am not sure,
> > what the sytnax looks like for this.
> >  
> > --
> > Martin
> >  
> > > After building and installing -CURRENT r347469 using in-tree pkgbase, I
> > > discovered that my /etc/group, /etc/passwd, /etc/master.passwd,
> > > /etc/pwd.db and /etc/spwd.db had been overwritten.
> > > 
> > > I encountered this after running 'make packages', installing into a
> > > ZFS Boot Environment using bectl to create and mount a new BE, running
> > > 'pkg -r $mounpoint upgrade -y' and 'pkg -r $mountpoint -yg "FreeBSD-*"'
> > > to upgrade the packages and insure that new base packages got installed,
> > > and finally unmounting and activating the BE.
> > > 
> > > ~Ashley Chase
> > > _______________________________________________
> > > freebsd-pkgbase at freebsd.org mailing list
> > > https://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase[https://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase]
> > > To unsubscribe, send any mail to "freebsd-pkgbase-unsubscribe at freebsd.org"
> > > 
> > _______________________________________________
> > freebsd-pkgbase at freebsd.org mailing list
> > https://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase
> > To unsubscribe, send any mail to "freebsd-pkgbase-unsubscribe at freebsd.org"
> 
>  Yes sorry that's my fault.
>  I beleive the included patch should work but I don't have time to test
> right now.
> 
>  diff --git a/etc/Makefile b/etc/Makefile
> index ab70a94bc761..4b60868fe3dc 100644
> --- a/etc/Makefile
> +++ b/etc/Makefile
> @@ -69,9 +69,9 @@ distribution:
>  		rc.firewall ${DESTDIR}/etc;
>  .endif
>  	cd ${.CURDIR}; \
> -	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T
> "tags=package=runtime"\
> +	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T
> "tags=package=runtime,config"\ ${BIN1} ${DESTDIR}/etc; \
> -	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 -T
> "tags=package=runtime"\
> +	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 -T
> "tags=package=runtime,config"\ master.passwd ${DESTDIR}/etc;
>  
>  .if ${MK_TCSH} == "no"
> 
>  I'll try to test soon and commit.

This resolved the issue. Thank you.