From owner-svn-src-all@freebsd.org Sun Apr 19 20:07:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 217402A8935; Sun, 19 Apr 2020 20:07:48 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49518h02Fzz3Q9S; Sun, 19 Apr 2020 20:07:48 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id E3E22100C; Sun, 19 Apr 2020 20:07:47 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f176.google.com with SMTP id s63so8484347qke.4; Sun, 19 Apr 2020 13:07:47 -0700 (PDT) X-Gm-Message-State: AGi0Puag6RQNKY0IwsfLEuBB8F+tiQ8rOUW2zDv3s1DNNUeJ2/z0Acw2 nNZGPQXnftRSr8fs/5sXW4kKunDWNjzumLIJBzk= X-Google-Smtp-Source: APiQypIFGh6Eu1ttxGhIynoYx7/R77/11W4moroVObqsfcFcHgX0W8MXKLKk2aySGmTHg4ThnnOFBdFy/J2RoFqqNVc= X-Received: by 2002:a37:6287:: with SMTP id w129mr12846760qkb.34.1587326867428; Sun, 19 Apr 2020 13:07:47 -0700 (PDT) MIME-Version: 1.0 References: <202004191701.03JH1LFA002938@repo.freebsd.org> <202004192005.03JK5bIP005781@slippy.cwsent.com> In-Reply-To: <202004192005.03JK5bIP005781@slippy.cwsent.com> From: Kyle Evans Date: Sun, 19 Apr 2020 15:07:36 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r360102 - in head: libexec/rc/rc.d share/mk tools/build/mk To: Cy Schubert Cc: Cy Schubert , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Apr 2020 20:07:48 -0000 On Sun, Apr 19, 2020 at 3:05 PM Cy Schubert wrote: > > In message om> > , Kyle Evans writes: > > On Sun, Apr 19, 2020 at 12:01 PM Cy Schubert 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 > > > Reviewed by: imp > > > Differential Revision: https://reviews.freebsd.org/D24252 > > > > > > [... snip ...] > > > 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 \ > > > > > > > This hunk seems to be wrong, looking at more context. It's setting up > > a MK_KERBEROS_SCRIPTS_SUPPORT option... I'm kinda guessing what you > > intended is what the other commentary on this has been about -- > > defaulting KERBEROS_SCRIPTS to ON unless KERBEROS is OFF. Just moving > > it up to the __DEFAULT_DEPENDENT_OPTIONS block doesn't seem to do the > > trick, though, I guess kerberos is weird. > > The point is to leave KERBEROS_SCRIPTS on while disabling KERBEROS to allow > those who choose not to install Heimdal in base to use one of the ports > instead. > > The other option might be to revert this and install conflicting scripts in > ports, which I'm not enamoured with. This would be the source of additional > PRs from people who attempt to enable one while not disabling the other. I > have no tolerance for those types of PRs, as my coworkers at $JOB can > attest to. > The keyword is default; to default it to off if KERBEROS is off, which assumes the absence of any user-specified WITH_/WITHOUT_ KERBEROS_SCRIPTS. As soon as the user specifies one way or the other, the relationship is broken.