From nobody Wed Nov 29 00:02:35 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfzzH6dcwz52lv9; Wed, 29 Nov 2023 00:02:35 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfzzH2FcKz3YNK; Wed, 29 Nov 2023 00:02:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701216155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWlp0riqzGU+77xkZuCYGGYpOWX86BjRIJPIv4jN58k=; b=oSMUb+oHGNOkpbtTQkTh4wjQDhdt56Js2R7tUkCJrPgVzb9ZF6anVD9m5uF2mz8gkiQHRX 4qtrTOMUNWkDfm3dTzZjQ1if1bdYoy5LlbXmRwmaxRkP9hkuEw+3tzlxn7MZqNg2zWNxgv WqnPSNIUZiXPfg/TUhHGnxo0oqGZuS9QZiAPElfrAIlAO0puskPW9wnWgxWWbH9p97ZhZ3 jGTJtxzK5Z83bhibBm5AQ/mW1eY56iyz09w++lpb5K2dQ2iv4By0NeK3OfIK4GfERMrEE/ cQjoAagNiVqxt4NMCL+pJ06cq+UVrKr67BPq2b3Scx/qHkg2EM/c0+/sMFeODw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701216155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWlp0riqzGU+77xkZuCYGGYpOWX86BjRIJPIv4jN58k=; b=QOEMomPpSOlb4d5+VhvYWPOffHpdDVlO/VRV1MqzHalEpQl3+4tVhOliQaa4hyqdXQSoC/ F9wSq7Ofpj5gccs4KhpD0AQfNOUHmpP7CVArNgWV3N1jE4RmuUCx3YHdV6vCTOqg05Ni+p eAnioxiF86SsVxIaRxcJrMWSuJ6KTQnFBQdX+199+fJliLhms4nCS3WRzMtxmQ8J1xTuMw ooOI2wE4zOMfJCAh5XH+eG3zsPim7i2jecusLp4ZX7CTdq76fd0+RAFBJLA+LX1D1CUuKx HRWJvBozuSJYA1ckxfOrQWgHh5eTyxLvLrxHv6GbL1L00aUAITKvVilYOrbKaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701216155; a=rsa-sha256; cv=none; b=sE/IDb8OQBQH9//jUH1k3yCaGuAhi/d9mcdAlevV7K04DDJSmCOBbLVKZRjjlAwvOCT9mv B6Atz4frxPKWuD3DKdJFo7oe/NzjdgMev/gYjU6DSWZA6l8yFKHNJW/lCKN9wOyFJzTOQA wPEEViIwIRhixdFZZ2CefW2N1+twLaiXjJEo2jOJuCZKntAzjUes3VuK2ULJ5QmlFx2t/V aWOkfTpDwHUO9PXjaTUxfVTP3ncL25m9r5W9srHVYlcT12t9javK3YqG3npz3EUxGmL113 GFs7eHhJtUAIVN+WxibHkpso2huTtRvTJwE0QCo7+e8O68ZNlvd7TXL8dNGs/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfzzH18yCzk0d; Wed, 29 Nov 2023 00:02:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AT02ZR3082142; Wed, 29 Nov 2023 00:02:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT02Zil082139; Wed, 29 Nov 2023 00:02:35 GMT (envelope-from git) Date: Wed, 29 Nov 2023 00:02:35 GMT Message-Id: <202311290002.3AT02Zil082139@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 743dbb8f6fce - main - security/krb5*: Allow the user to specify state directory locations List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 743dbb8f6fce110d31bff7ccf2652396cb53868a Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=743dbb8f6fce110d31bff7ccf2652396cb53868a commit 743dbb8f6fce110d31bff7ccf2652396cb53868a Author: Cy Schubert AuthorDate: 2023-11-28 03:58:58 +0000 Commit: Cy Schubert CommitDate: 2023-11-28 23:49:24 +0000 security/krb5*: Allow the user to specify state directory locations localstatedir and runstatedir are set to ${PREFIX}/var and ${PREFIX}/var/run respectively. Users who wish to put their KDC DB elsewhere can set the following in make.conf: KRB5_LOCALSTATEDIR=/va KRB5_RUNSTATEDIR=/var/run. Unfortunately defaulting to /var instead of the current default would result in MIT KDC not finding its KDC DB files. This would be disruptive to all MIT KDC users. But new users of MIT KRB5 KDC can set the pathname above as desired. PR: 267560 --- security/krb5-119/Makefile | 13 +++++++++++-- security/krb5-119/pkg-plist | 4 ++-- security/krb5-120/Makefile | 13 +++++++++++-- security/krb5-120/pkg-plist | 4 ++-- security/krb5-121/Makefile | 13 +++++++++++-- security/krb5-121/pkg-plist | 4 ++-- security/krb5-devel/Makefile | 13 +++++++++++-- security/krb5-devel/pkg-plist | 4 ++-- 8 files changed, 52 insertions(+), 16 deletions(-) diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile index c7b33c3304cb..d658070d68ce 100644 --- a/security/krb5-119/Makefile +++ b/security/krb5-119/Makefile @@ -34,8 +34,7 @@ USE_LDCONFIG= yes USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS?= --enable-shared --without-system-verto \ - --disable-rpath --localstatedir="${PREFIX}/var" \ - --runstatedir="${PREFIX}/var/run" + --disable-rpath CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" @@ -71,6 +70,16 @@ LIBEDIT_BASE_DESC= Use libedit in FreeBSD base .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} .endif +.if !defined(KRB5_LOCALSTATEDIR) +KRB5_LOCALSTATEDIR= "${PREFIX}/var" +.endif +.if !defined(KRB5_RUNSTATEDIR) +KRB5_RUNSTATEDIR= "${PREFIX}/var/run" +.endif +CONFIGURE_ARGS+= --runstatedir="${KRB5_RUNSTATEDIR}" +CONFIGURE_ARGS+= --localstatedir="${KRB5_LOCALSTATEDIR}" +PLIST_SUB+= KRB5_LOCALSTATEDIR=${KRB5_LOCALSTATEDIR} +PLIST_SUB+= KRB5_RUNSTATEDIR=${KRB5_RUNSTATEDIR} CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} diff --git a/security/krb5-119/pkg-plist b/security/krb5-119/pkg-plist index 550c5f235d41..82804651071e 100644 --- a/security/krb5-119/pkg-plist +++ b/security/krb5-119/pkg-plist @@ -174,5 +174,5 @@ share/et/et_h.awk %%LDAP%%%%DATADIR%%/kerberos.ldif @dir lib/krb5/plugins/authdata @dir lib/krb5/plugins/libkrb5 -@dir var/run/krb5kdc -@dir var/krb5kdc +@dir %%KRB5_RUNSTATEDIR%%/krb5kdc +@dir %%KRB5_LOCALSTATEDIR%%/krb5kdc diff --git a/security/krb5-120/Makefile b/security/krb5-120/Makefile index dd175bf24bd6..bf69ecfb7c2e 100644 --- a/security/krb5-120/Makefile +++ b/security/krb5-120/Makefile @@ -27,8 +27,7 @@ USE_LDCONFIG= yes USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS?= --enable-shared --without-system-verto \ - --disable-rpath --localstatedir="${PREFIX}/var" \ - --runstatedir="${PREFIX}/var/run" + --disable-rpath CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" @@ -64,6 +63,16 @@ LIBEDIT_BASE_DESC= Use libedit in FreeBSD base .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} .endif +.if !defined(KRB5_LOCALSTATEDIR) +KRB5_LOCALSTATEDIR= "${PREFIX}/var" +.endif +.if !defined(KRB5_RUNSTATEDIR) +KRB5_RUNSTATEDIR= "${PREFIX}/var/run" +.endif +CONFIGURE_ARGS+= --runstatedir="${KRB5_RUNSTATEDIR}" +CONFIGURE_ARGS+= --localstatedir="${KRB5_LOCALSTATEDIR}" +PLIST_SUB+= KRB5_LOCALSTATEDIR=${KRB5_LOCALSTATEDIR} +PLIST_SUB+= KRB5_RUNSTATEDIR=${KRB5_RUNSTATEDIR} CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} diff --git a/security/krb5-120/pkg-plist b/security/krb5-120/pkg-plist index f803ffb5ff2b..3b0695580d52 100644 --- a/security/krb5-120/pkg-plist +++ b/security/krb5-120/pkg-plist @@ -173,5 +173,5 @@ share/et/et_h.awk %%LDAP%%%%DATADIR%%/kerberos.ldif @dir lib/krb5/plugins/authdata @dir lib/krb5/plugins/libkrb5 -@dir var/run/krb5kdc -@dir var/krb5kdc +@dir %%KRB5_RUNSTATEDIR%%/krb5kdc +@dir %%KRB5_LOCALSTATEDIR%%/krb5kdc diff --git a/security/krb5-121/Makefile b/security/krb5-121/Makefile index a3b296eb8016..1d0a9a01d364 100644 --- a/security/krb5-121/Makefile +++ b/security/krb5-121/Makefile @@ -27,8 +27,7 @@ USE_LDCONFIG= yes USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS?= --enable-shared --without-system-verto \ - --disable-rpath --localstatedir="${PREFIX}/var" \ - --runstatedir="${PREFIX}/var/run" + --disable-rpath CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" @@ -64,6 +63,16 @@ LIBEDIT_BASE_DESC= Use libedit in FreeBSD base .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} .endif +.if !defined(KRB5_LOCALSTATEDIR) +KRB5_LOCALSTATEDIR= "${PREFIX}/var" +.endif +.if !defined(KRB5_RUNSTATEDIR) +KRB5_RUNSTATEDIR= "${PREFIX}/var/run" +.endif +CONFIGURE_ARGS+= --runstatedir="${KRB5_RUNSTATEDIR}" +CONFIGURE_ARGS+= --localstatedir="${KRB5_LOCALSTATEDIR}" +PLIST_SUB+= KRB5_LOCALSTATEDIR=${KRB5_LOCALSTATEDIR} +PLIST_SUB+= KRB5_RUNSTATEDIR=${KRB5_RUNSTATEDIR} CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} diff --git a/security/krb5-121/pkg-plist b/security/krb5-121/pkg-plist index 11b1e585bfa0..03e1256555cc 100644 --- a/security/krb5-121/pkg-plist +++ b/security/krb5-121/pkg-plist @@ -174,5 +174,5 @@ share/et/et_h.awk %%LDAP%%%%DATADIR%%/kerberos.ldif @dir lib/krb5/plugins/authdata @dir lib/krb5/plugins/libkrb5 -@dir var/run/krb5kdc -@dir var/krb5kdc +@dir %%KRB5_RUNSTATEDIR%%/krb5kdc +@dir %%KRB5_LOCALSTATEDIR%%/krb5kdc diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile index 4749d5892cf5..0f5584214bda 100644 --- a/security/krb5-devel/Makefile +++ b/security/krb5-devel/Makefile @@ -29,8 +29,7 @@ GNU_CONFIGURE= yes USES= autoreconf compiler:c11 cpe gmake localbase perl5 \ libtool:build gssapi:bootstrap,mit pkgconfig ssl CONFIGURE_ARGS?= --enable-shared --without-system-verto \ - --disable-rpath --localstatedir="${PREFIX}/var" \ - --runstatedir="${PREFIX}/var/run" + --disable-rpath CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" WARN_CFLAGS=-Wno-strict-prototypes MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" @@ -64,6 +63,16 @@ LIBEDIT_BASE_DESC= Use libedit in FreeBSD base .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} .endif +.if !defined(KRB5_LOCALSTATEDIR) +KRB5_LOCALSTATEDIR= "${PREFIX}/var" +.endif +.if !defined(KRB5_RUNSTATEDIR) +KRB5_RUNSTATEDIR= "${PREFIX}/var/run" +.endif +CONFIGURE_ARGS+= --runstatedir="${KRB5_RUNSTATEDIR}" +CONFIGURE_ARGS+= --localstatedir="${KRB5_LOCALSTATEDIR}" +PLIST_SUB+= KRB5_LOCALSTATEDIR=${KRB5_LOCALSTATEDIR} +PLIST_SUB+= KRB5_RUNSTATEDIR=${KRB5_RUNSTATEDIR} CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} diff --git a/security/krb5-devel/pkg-plist b/security/krb5-devel/pkg-plist index 5fb1326b4a6f..22a84701655c 100644 --- a/security/krb5-devel/pkg-plist +++ b/security/krb5-devel/pkg-plist @@ -174,5 +174,5 @@ share/et/et_h.awk %%LDAP%%%%DATADIR%%/kerberos.ldif @dir lib/krb5/plugins/authdata @dir lib/krb5/plugins/libkrb5 -@dir var/run/krb5kdc -@dir var/krb5kdc +@dir %%KRB5_RUNSTATEDIR%%/krb5kdc +@dir %%KRB5_LOCALSTATEDIR%%/krb5kdc