Date: Sun, 19 Apr 2020 21:37:18 +0200 From: Emmanuel Vadot <manu@bidouilliste.com> To: cy@freebsd.org Cc: cem@freebsd.org, src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: svn commit: r360102 - in head: libexec/rc/rc.d share/mk tools/build/mk Message-ID: <20200419213718.8c44dced2c4f67c8544f2434@bidouilliste.com> In-Reply-To: <CAG6CVpUmng%2BsCXobDUwFo_K2fj34mt5E5GP-MAO%2BE5JjFrDgeA@mail.gmail.com> References: <202004191701.03JH1LFA002938@repo.freebsd.org> <CAG6CVpUmng%2BsCXobDUwFo_K2fj34mt5E5GP-MAO%2BE5JjFrDgeA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
-- Emmanuel Vadot <manu@bidouilliste.com> On Sun, 19 Apr 2020 12:16:34 -0700 Conrad Meyer <cem@freebsd.org> wrote: > Hm, some of us just want kerberos to be completed excised. This > change makes WITHOUT_KERBEROS retain portions of kerberos? That seems > unfortunate. Agreed, It would be better to default MK_KERBEROS_SCRIPTS to yes and explicitly setting it to no when WITHOUT_KERBEROS=yes. One could then do WITHOUT_KERBEROS=yes and MK_KERBEROS_SCRIPTS=yes for such weird install. BTW, why would one want base script for ports utilities ? Couldn't the ports install some rc scripts with same functionnality as the base one ? Cheers, > On Sun, Apr 19, 2020 at 10:01 AM Cy Schubert <cy@freebsd.org> wrote: > > > > Author: cy > > Date: Sun Apr 19 17:01:21 2020 > > New Revision: 360102 > > URL: https://svnweb.freebsd.org/changeset/base/360102 > > > > Log: > > Conditionally install Kerberos rc files based on MK_KERBEROS_SCRIPTS > > instead of MK_KERBEROS. The reason for this change is some users > > prefer to build FreeBSD WITHOUT_KERBEROS, wanting to retain the > > Kerberos rc scripts to start/stop MIT Kerberos or Heimdal from ports. > > > > PR: 197337 > > Reported by: Adam McDougall <ebay at looksharp.net> > > Reviewed by: imp > > Differential Revision: https://reviews.freebsd.org/D24252 > > > > Modified: > > head/libexec/rc/rc.d/Makefile > > head/share/mk/bsd.opts.mk > > head/share/mk/src.opts.mk > > head/tools/build/mk/OptionalObsoleteFiles.inc > > > > Modified: head/libexec/rc/rc.d/Makefile > > ============================================================================== > > --- head/libexec/rc/rc.d/Makefile Sun Apr 19 17:01:17 2020 (r360101) > > +++ head/libexec/rc/rc.d/Makefile Sun Apr 19 17:01:21 2020 (r360102) > > @@ -242,14 +242,17 @@ CONFS+= lpd > > .if ${MK_KERBEROS} != "no" > > CONFS+= ipropd_master > > CONFS+= ipropd_slave > > -_kadmind= kadmind > > -_kdc= kdc > > -_kfd= kfd > > -_kpasswdd= kpasswdd > > > > DIRS+= VAR_HEMIDAL > > VAR_HEMIDAL= /var/heimdal > > VAR_HEMIDAL_MODE= 700 > > +.endif > > + > > +.if ${MK_KERBEROS_SCRIPTS} != "no" > > +_kadmind= kadmind > > +_kdc= kdc > > +_kfd= kfd > > +_kpasswdd= kpasswdd > > .endif > > > > .if ${MK_MAIL} != "no" > > > > Modified: head/share/mk/bsd.opts.mk > > ============================================================================== > > --- head/share/mk/bsd.opts.mk Sun Apr 19 17:01:17 2020 (r360101) > > +++ head/share/mk/bsd.opts.mk Sun Apr 19 17:01:21 2020 (r360102) > > @@ -55,6 +55,7 @@ __DEFAULT_YES_OPTIONS = \ > > INCLUDES \ > > INSTALLLIB \ > > KERBEROS \ > > + KERBEROS_SCRIPTS \ > > MAKE_CHECK_USE_SANDBOX \ > > MAN \ > > MANCOMPRESS \ > > > > Modified: head/share/mk/src.opts.mk > > ============================================================================== > > --- head/share/mk/src.opts.mk Sun Apr 19 17:01:17 2020 (r360101) > > +++ head/share/mk/src.opts.mk Sun Apr 19 17:01:21 2020 (r360102) > > @@ -237,6 +237,7 @@ __DEFAULT_DEPENDENT_OPTIONS= \ > > INET \ > > INET6 \ > > KERBEROS \ > > + KERBEROS_SCRIPTS \ > > KVM \ > > NETGRAPH \ > > PAM \ > > > > Modified: head/tools/build/mk/OptionalObsoleteFiles.inc > > ============================================================================== > > --- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Apr 19 17:01:17 2020 (r360101) > > +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Apr 19 17:01:21 2020 (r360102) > > @@ -3152,13 +3152,9 @@ OLD_FILES+=usr/libexec/hprop > > OLD_FILES+=usr/libexec/hpropd > > OLD_FILES+=usr/libexec/ipropd-master > > OLD_FILES+=usr/libexec/ipropd-slave > > -OLD_FILES+=usr/libexec/kadmind > > OLD_FILES+=usr/libexec/kcm > > -OLD_FILES+=usr/libexec/kdc > > OLD_FILES+=usr/libexec/kdigest > > -OLD_FILES+=usr/libexec/kfd > > OLD_FILES+=usr/libexec/kimpersonate > > -OLD_FILES+=usr/libexec/kpasswdd > > OLD_FILES+=usr/sbin/kstash > > OLD_FILES+=usr/sbin/ktutil > > OLD_FILES+=usr/sbin/iprop-log > > @@ -3878,6 +3874,13 @@ OLD_FILES+=usr/share/man/man8/pam_krb5.8.gz > > OLD_FILES+=usr/share/man/man8/pam_ksu.8.gz > > OLD_FILES+=usr/share/man/man8/string2key.8.gz > > OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz > > +.endif > > + > > +.if ${MK_KERBEROS_SCRIPTS} == no > > +OLD_FILES+=usr/libexec/kadmind > > +OLD_FILES+=usr/libexec/kdc > > +OLD_FILES+=usr/libexec/kfd > > +OLD_FILES+=usr/libexec/kpasswdd > > .endif > > > > .if ${MK_KERBEROS_SUPPORT} == no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200419213718.8c44dced2c4f67c8544f2434>