From owner-svn-src-head@freebsd.org Sun Apr 19 21:38:05 2020 Return-Path: Delivered-To: svn-src-head@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 4A1C22ABE26; Sun, 19 Apr 2020 21:38:05 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49538s15vlz43W8; Sun, 19 Apr 2020 21:38:05 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0262C4A80; Sun, 19 Apr 2020 21:38:05 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03JLc4YP078261; Sun, 19 Apr 2020 21:38:04 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03JLc4tr078257; Sun, 19 Apr 2020 21:38:04 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202004192138.03JLc4tr078257@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sun, 19 Apr 2020 21:38:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r360106 - in head: libexec/rc/rc.d share/mk tools/build/mk X-SVN-Group: head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head: libexec/rc/rc.d share/mk tools/build/mk X-SVN-Commit-Revision: 360106 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Apr 2020 21:38:05 -0000 Author: cy Date: Sun Apr 19 21:38:03 2020 New Revision: 360106 URL: https://svnweb.freebsd.org/changeset/base/360106 Log: Due to popular demand, revert r360102. Reported by: many 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:53:44 2020 (r360105) +++ head/libexec/rc/rc.d/Makefile Sun Apr 19 21:38:03 2020 (r360106) @@ -242,17 +242,14 @@ CONFS+= lpd .if ${MK_KERBEROS} != "no" CONFS+= ipropd_master CONFS+= ipropd_slave - -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 + +DIRS+= VAR_HEMIDAL +VAR_HEMIDAL= /var/heimdal +VAR_HEMIDAL_MODE= 700 .endif .if ${MK_MAIL} != "no" Modified: head/share/mk/bsd.opts.mk ============================================================================== --- head/share/mk/bsd.opts.mk Sun Apr 19 17:53:44 2020 (r360105) +++ head/share/mk/bsd.opts.mk Sun Apr 19 21:38:03 2020 (r360106) @@ -55,7 +55,6 @@ __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:53:44 2020 (r360105) +++ head/share/mk/src.opts.mk Sun Apr 19 21:38:03 2020 (r360106) @@ -237,7 +237,6 @@ __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:53:44 2020 (r360105) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Apr 19 21:38:03 2020 (r360106) @@ -3152,9 +3152,13 @@ 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 @@ -3874,13 +3878,6 @@ 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