Date: Wed, 15 Aug 2018 09:52:30 -0600 From: Brad Davis <brd@FreeBSD.org> To: Oliver Pinter <oliver.pinter@hardenedbsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r337849 - in head: bin/csh bin/sh etc etc/root Message-ID: <1534348350.561748.1475140704.59C82FD0@webmail.messagingengine.com> In-Reply-To: <CAPQ4fftA0j0kbtHKxn3Q80k=pnr1uXZjY_pWX5RUZfHX8uQj8w@mail.gmail.com> References: <201808151441.w7FEfP2u071943@repo.freebsd.org> <CAPQ4fftA0j0kbtHKxn3Q80k=pnr1uXZjY_pWX5RUZfHX8uQj8w@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Aug 15, 2018, at 9:27 AM, Oliver Pinter wrote: >=20 >=20 > On Wednesday, August 15, 2018, Brad Davis <brd@freebsd.org> wrote: >> Author: brd >> Date: Wed Aug 15 14:41:24 2018 >> New Revision: 337849 >> URL: https://svnweb.freebsd.org/changeset/base/337849 >>=20=20 >> Log: >> =C2=A0 Move all sh and csh files into bin/sh/ or bin/csh/ >>=20=20 >> =C2=A0 This simplifies pkgbase by migrating these to CONFS so they are = properly >> =C2=A0 tagged as config files. >>=20=20 >> =C2=A0 Approved by:=C2=A0 will (mentor) >> =C2=A0 Differential Revision:=C2=A0 =C2=A0 =C2=A0 =C2=A0 https://review= s.freebsd.org/D16708 >>=20=20 >> Added: >> =C2=A0 head/bin/csh/csh.cshrc >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r337848, head/etc/csh.cshrc >> =C2=A0 head/bin/csh/csh.login >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r337848, head/etc/csh.login >> =C2=A0 head/bin/csh/csh.logout >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r337848, head/etc/csh.logout >> =C2=A0 head/bin/csh/dot.cshrc >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r337848, head/etc/root/dot.= cshrc >> =C2=A0 head/bin/csh/dot.login >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r337848, head/etc/root/dot.= login >> =C2=A0 head/bin/sh/dot.profile >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r337848, head/etc/root/dot.= profile >> =C2=A0 head/bin/sh/profile >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r337848, head/etc/profile >> Deleted: >> =C2=A0 head/etc/csh.cshrc >> =C2=A0 head/etc/csh.login >> =C2=A0 head/etc/csh.logout >> =C2=A0 head/etc/profile >> =C2=A0 head/etc/root/dot.cshrc >> =C2=A0 head/etc/root/dot.login >> =C2=A0 head/etc/root/dot.profile >> Modified: >> =C2=A0 head/bin/csh/Makefile >> =C2=A0 head/bin/sh/Makefile >> =C2=A0 head/etc/Makefile >>=20=20 >> Modified: head/bin/csh/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >> --- head/bin/csh/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0Wed Aug 15 14:29:04= 2018=C2=A0 =C2=A0 =C2=A0 =C2=A0 (r337848) >> +++ head/bin/csh/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0Wed Aug 15 14:41:24= 2018=C2=A0 =C2=A0 =C2=A0 =C2=A0 (r337849) >> @@ -8,6 +8,11 @@ >>=20=20 >> =C2=A0.include <src.opts.mk> >>=20=20 >> +CONFGROUPS=3D=C2=A0 =C2=A0 ETC ROOT >> +ETC=3D=C2=A0 =C2=A0csh.cshrc csh.login csh.logout >> +ROOT=3D=C2=A0 dot.cshrc >> +ROOTDIR=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0/root >> +ROOTNAME=3D=C2=A0 =C2=A0 =C2=A0 .cshrc >> =C2=A0PACKAGE=3Druntime >> =C2=A0TCSHDIR=3D ${SRCTOP}/contrib/tcsh >> =C2=A0.PATH: ${TCSHDIR} >> @@ -44,7 +49,8 @@ MLINKS=3D csh.1 tcsh.1 >>=20=20 >> =C2=A0LIBADD=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 termcapw crypt >>=20=20 >> -LINKS=3D ${BINDIR}/csh ${BINDIR}/tcsh >> +LINKS=3D ${BINDIR}/csh ${BINDIR}/tcsh \ >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0/root/.cshrc /.cshrc >>=20=20 >> =C2=A0CLEANFILES=3D ${GENHDRS} gethost csh.1 >>=20=20 >> @@ -147,5 +153,12 @@ tc.const.h: tc.const.c sh.char.h config.h config_f= .h s >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sed -e 's/Char \([a-zA-Z0-9_]= *\)\(.*\)/extern Char \1[];/' | \ >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sort >> ${.TARGET} >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 @echo '#endif /* _h_tc_const */' >> ${.TARG= ET} >> + >> +beforeinstall: >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0rm -f ${DESTDIR}/.cshrc >> + >> +afterinstallconfig: >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDI= R}/etc/master.passwd >=20 > Why? If afterinstallconfig called unconditionally after install, then why= changing all of the csh entries to sh? >=20 > The old behavior was almost the same, but only when WITHOUT_CSH was speci= fied.=C2=A0 >=20 > Fixme if I'm wrong.=C2=A0 You are correct, I have opened: https://reviews.freebsd.org/D16725 Regards, Brad Davis
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1534348350.561748.1475140704.59C82FD0>