diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk index 46eea2d100..c556dde6f8 100644 --- a/Mk/Uses/gssapi.mk +++ b/Mk/Uses/gssapi.mk @@ -78,7 +78,11 @@ _MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:security/krb5 _HEADERS= sys/types.h sys/stat.h stdint.h . if empty(gssapi_ARGS) +. if (${OSVERSION} >= 1500047) +gssapi_ARGS= base-mit +. else gssapi_ARGS= base +. endif . endif . for _A in ${gssapi_ARGS} _local:= ${_A} @@ -86,15 +90,32 @@ _local:= ${_A} . if ${SSL_DEFAULT} != base IGNORE= You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value . endif +KRB5_TYPE= heimdal HEIMDAL_HOME= /usr GSSAPIBASEDIR= ${HEIMDAL_HOME} GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib GSSAPIINCDIR= ${GSSAPIBASEDIR}/include _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h -GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" +GSSAPICPPFLAGS= -I${GSSAPIINCDIR} GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 GSSAPILDFLAGS= +. elif ${_local} == "base-mit" +. if ${SSL_DEFAULT} != base +IGNORE= You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value +. endif +KRB5_TYPE= mit +KRB5_HOME= /usr +GSSAPIBASEDIR?= ${KRB5_HOME} +GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib +GSSAPIINCDIR= ${GSSAPIBASEDIR}/include +_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h +GSSAPICPPFLAGS= -I${GSSAPIINCDIR} -I${GSSAPIINCDIR}/krb5 -I${GSSAPIINCDIR}/gssapi_krb5 +GSSAPILIBS= -L${GSSAPILIBDIR} -lkrb5 -lgssapi_krb5 +GSSAPILDFLAGS= -L${GSSAPILIBDIR} +CFLAGS+= ${GSSAPICPPFLAGS} +CPPFLAGS+= ${GSSAPICPPFLAGS} . elif ${_local} == "heimdal" +KRB5_TYPE= heimdal HEIMDAL_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${HEIMDAL_HOME} GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib/heimdal @@ -106,11 +127,12 @@ RUN_DEPENDS+= ${_HEIMDAL_DEPENDS} . else PREFIX= ${HEIMDAL_HOME} . endif -GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" +GSSAPICPPFLAGS= -I${GSSAPIINCDIR} GSSAPILIBS= -lkrb5 -lgssapi -GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" +GSSAPILDFLAGS= -L${GSSAPILIBDIR} _RPATH= ${GSSAPILIBDIR} . elif ${_local} == "mit" +KRB5_TYPE= mit KRB5_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${KRB5_HOME} GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib @@ -123,8 +145,8 @@ RUN_DEPENDS+= ${_MITKRB5_DEPENDS} PREFIX= ${KRB5_HOME} . endif GSSAPILIBS= -lkrb5 -lgssapi_krb5 -GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" -GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" +GSSAPICPPFLAGS= -I${GSSAPIINCDIR} +GSSAPILDFLAGS= -L${GSSAPILIBDIR} _RPATH= ${GSSAPILIBDIR} . elif ${_local} == "bootstrap" _KRB_BOOTSTRAP= 1 diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 99d7156d2c..3b327ad24f 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -65,9 +65,10 @@ WEATHER_DESC= Weather calendar backend WEATHER_LIB_DEPENDS= libgweather-4.so:net/libgweather4 WEATHER_CMAKE_BOOL= ENABLE_WEATHER -KERBEROS_CMAKE_ON= -DWITH_KRB5=/usr +KERBEROS_CMAKE_ON= -DWITH_KRB5=${GSSAPIBASEDIR} KERBEROS_CMAKE_OFF= -DWITH_KRB5=OFF -KERBEROS_USES= ssl +KERBEROS_CFLAGS= ${GSSAPICPPFLAGS} +KERBEROS_USES= gssapi ssl LDAP_CMAKE_ON= -DWITH_OPENLDAP=${LOCALBASE} LDAP_CMAKE_OFF= -DWITH_OPENLDAP=OFF diff --git a/databases/mariadb-connector-c/Makefile b/databases/mariadb-connector-c/Makefile index feb1c25090..3cb6844c7a 100644 --- a/databases/mariadb-connector-c/Makefile +++ b/databases/mariadb-connector-c/Makefile @@ -37,6 +37,7 @@ GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} USES= cmake:insource compiler:c++11-lib iconv:translit ssl USE_LDCONFIG= ${PREFIX}/lib/mariadb diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index 93c3741194..153ccb86c1 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -132,6 +132,7 @@ GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} OPTIONS_SUB= yes SUB_LIST+= MARIADB_RUNDIR="${MARIADB_RUNDIR}" \ MARIADB_SOCK="${MARIADB_SOCK}" diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 55209c8230..eea2d61cf3 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -133,6 +133,7 @@ GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} OPTIONS_SUB= yes SUB_LIST+= MARIADB_RUNDIR="${MARIADB_RUNDIR}" \ MARIADB_SOCK="${MARIADB_SOCK}" diff --git a/databases/mariadb114-server/Makefile b/databases/mariadb114-server/Makefile index 5e58466692..027fb50399 100644 --- a/databases/mariadb114-server/Makefile +++ b/databases/mariadb114-server/Makefile @@ -142,6 +142,7 @@ GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} OPTIONS_SUB= yes SUB_LIST+= MARIADB_RUNDIR="${MARIADB_RUNDIR}" \ MARIADB_SOCK="${MARIADB_SOCK}" diff --git a/databases/mariadb118-server/Makefile b/databases/mariadb118-server/Makefile index 5f56cd090e..3205ebd760 100644 --- a/databases/mariadb118-server/Makefile +++ b/databases/mariadb118-server/Makefile @@ -142,6 +142,7 @@ GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} OPTIONS_SUB= yes SUB_LIST+= MARIADB_RUNDIR="${MARIADB_RUNDIR}" \ MARIADB_SOCK="${MARIADB_SOCK}" diff --git a/ftp/curl/files/extra-patch-gssapi b/ftp/curl/files/extra-patch-gssapi index d2b90d46c8..8304d8cc67 100644 --- a/ftp/curl/files/extra-patch-gssapi +++ b/ftp/curl/files/extra-patch-gssapi @@ -1,11 +1,14 @@ --- configure.orig 2024-12-11 07:08:12 UTC +++ configure -@@ -26210,7 +26210,7 @@ printf "%s\n" "found" >&6; } +@@ -25881,9 +25881,9 @@ printf "%s\n" "found" >&6; } if test -n "$gnu_gss"; then LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE gss" elif test "x$not_mit" = "x1"; then - LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE heimdal-gssapi" + LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE" else - LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE mit-krb5-gssapi" +- LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE mit-krb5-gssapi" ++ LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE" fi + fi + else diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile index 2fd853795e..7e95a993f6 100644 --- a/mail/cyrus-imapd25/Makefile +++ b/mail/cyrus-imapd25/Makefile @@ -93,13 +93,13 @@ OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit + --with-gss_impl=${KRB5_TYPE} MANDIRS= ${CYRUS_PREFIX}/man diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile index 1c9ad192cd..4603d0eb33 100644 --- a/mail/cyrus-imapd30/Makefile +++ b/mail/cyrus-imapd30/Makefile @@ -104,13 +104,13 @@ OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit + --with-gss_impl=${KRB5_TYPE} OPTIONS_RADIO_READLINE= READLINE_GNU READLINE_PERL READLINE_GNU_DESC= Use Term::Readline::GNU for cyradm diff --git a/mail/cyrus-imapd310/Makefile b/mail/cyrus-imapd310/Makefile index 0dd447f7c6..cbbab10457 100644 --- a/mail/cyrus-imapd310/Makefile +++ b/mail/cyrus-imapd310/Makefile @@ -141,13 +141,13 @@ OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit + --with-gss_impl=${KRB5_TYPE} OPTIONS_RADIO_READLINE= READLINE_GNU READLINE_PERL READLINE_GNU_DESC= Use Term::Readline::GNU for cyradm diff --git a/mail/cyrus-imapd312/Makefile b/mail/cyrus-imapd312/Makefile index d5a25305e4..d3607f3151 100644 --- a/mail/cyrus-imapd312/Makefile +++ b/mail/cyrus-imapd312/Makefile @@ -139,13 +139,13 @@ OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit + --with-gss_impl=${KRB5_TYPE} OPTIONS_RADIO_READLINE= READLINE_GNU READLINE_PERL READLINE_GNU_DESC= Use Term::Readline::GNU for cyradm diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile index f5589ebab3..bf6d961e21 100644 --- a/mail/cyrus-imapd32/Makefile +++ b/mail/cyrus-imapd32/Makefile @@ -113,13 +113,13 @@ OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit + --with-gss_impl=${KRB5_TYPE} OPTIONS_RADIO_READLINE= READLINE_GNU READLINE_PERL READLINE_GNU_DESC= Use Term::Readline::GNU for cyradm diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile index f061e0ac1c..4b3cce815d 100644 --- a/mail/cyrus-imapd34/Makefile +++ b/mail/cyrus-imapd34/Makefile @@ -128,13 +128,13 @@ OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit + --with-gss_impl=${KRB5_TYPE} OPTIONS_RADIO_READLINE= READLINE_GNU READLINE_PERL READLINE_GNU_DESC= Use Term::Readline::GNU for cyradm diff --git a/mail/cyrus-imapd36/Makefile b/mail/cyrus-imapd36/Makefile index 9ce077fa3a..32dd8243bd 100644 --- a/mail/cyrus-imapd36/Makefile +++ b/mail/cyrus-imapd36/Makefile @@ -133,13 +133,13 @@ OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit + --with-gss_impl=${KRB5_TYPE} OPTIONS_RADIO_READLINE= READLINE_GNU READLINE_PERL READLINE_GNU_DESC= Use Term::Readline::GNU for cyradm diff --git a/mail/cyrus-imapd38/Makefile b/mail/cyrus-imapd38/Makefile index 58a01f8f6f..056bb014e9 100644 --- a/mail/cyrus-imapd38/Makefile +++ b/mail/cyrus-imapd38/Makefile @@ -134,13 +134,13 @@ OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit + --with-gss_impl=${KRB5_TYPE} OPTIONS_RADIO_READLINE= READLINE_GNU READLINE_PERL READLINE_GNU_DESC= Use Term::Readline::GNU for cyradm diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile index cccbbd90fe..fcee73700b 100644 --- a/mail/dovecot-pigeonhole/Makefile +++ b/mail/dovecot-pigeonhole/Makefile @@ -55,6 +55,7 @@ GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_OFF= ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} BUILD_FAIL_MESSAGE= Ensure that ${PORTNAME}'s GSSAPI backend is the same as dovecot2 (make config). MANAGESIEVE_DESC= ManageSieve support diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 3e483772be..28c4b0c591 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -91,6 +91,7 @@ GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} ICU_LIB_DEPENDS= libicui18n.so:devel/icu \ libicuuc.so:devel/icu diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 4ab8c134bc..54987d1209 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -103,15 +103,13 @@ GPGME_CONFIGURE_ENABLE= gpgme # Handle GSSAPI from various places GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-gss=${GSSAPIBASEDIR} +GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_HEIMDAL_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-gss=${GSSAPIBASEDIR} GSSAPI_MIT_USES= gssapi:mit -GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-gss=${GSSAPIBASEDIR} GSSAPI_NONE_CONFIGURE_ON= --without-gss +GSSAPI_NONE_CONFIGURE_OFF= --with-gss=${GSSAPIBASEDIR} +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} +GSSAPI_NONE_CONFIGURE_ENV_OFF= ac_cv_path_KRB5CFGPATH="${KRB5CONFIG}" HCACHE_BDB_USES= bdb:18 HCACHE_BDB_CONFIGURE_WITH= bdb=${LOCALBASE} diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile index a4026ee45a..a12257fbf7 100644 --- a/mail/neomutt/Makefile +++ b/mail/neomutt/Makefile @@ -87,12 +87,12 @@ NOTMUCH_CONFIGURE_ENABLE= notmuch # GSSAPI GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ON= --gss GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gss=${LOCALBASE} GSSAPI_MIT_USES= gssapi:mit -GSSAPI_MIT_CONFIGURE_ON= --with-gss=${LOCALBASE} GSSAPI_NONE_CONFIGURE_ON= --disable-gss +GSSAPI_NONE_CONFIGURE_OFF= --with-gss=${GSSAPIBASEDIR} +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} +GSSAPI_NONE_CONFIGURE_ENV_OFF= ac_cv_path_KRB5CFGPATH="${KRB5CONFIG}" DOCS_CONFIGURE_OFF= --disable-doc DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 646fd4683f..479fc80089 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -141,7 +141,7 @@ MONGO_LIB_DEPENDS= libbson-1.0.so:devel/libbson \ MYSQL_USES?= mysql PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PGSQL_USES= pgsql -SASLKMIT_LIB_DEPENDS= libkrb5.so:security/krb5 +SASLKMIT_USES= gssapi:mit SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SQLITE_USES= sqlite TLSRPT_LIB_DEPENDS= libtlsrpt.so:mail/libtlsrpt diff --git a/net/ntp/Makefile b/net/ntp/Makefile index 2de4909c17..6b1a8b9497 100644 diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index 68ab7a2079..521cdc26f8 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -59,7 +59,8 @@ GSSAPI_DESC= With GSSAPI support FETCH_CONFIGURE_WITH= fetch -GSSAPI_RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi +GSSAPI_RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi +GSSAPI_USES= gssapi:flags .if defined(CLIENT_ONLY) OPTIONS_DEFINE+= DOCS diff --git a/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile b/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile index 0d1ccc97f6..5eaa0528ce 100644 --- a/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile +++ b/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile @@ -6,7 +6,7 @@ -HEIMDAL_INC = -I/usr/heimdal/include -HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv -+HEIMDAL_INC = -I/usr/include ++HEIMDAL_INC = -I/usr/include -I/usr/include/krb5 +HEIMDAL_LIB = -L/usr/lib -lkrb5 -lkadm5srv PLAT = UNIX diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index dfbb7f5c72..d69c671c1d 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -80,6 +80,7 @@ GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ENV_OFF= KRB5_CONFIG=${KRB5CONFIG} GSSAPI_NONE_CMAKE_BOOL= ENABLE_KERBEROS +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} GUI_USES= desktop-file-utils shared-mime-info qt:6 GUI_USE= qt=5compat,base,multimedia,tools diff --git a/security/cyrus-sasl2-gssapi/Makefile b/security/cyrus-sasl2-gssapi/Makefile index 48d2833741..341fcc840e 100644 --- a/security/cyrus-sasl2-gssapi/Makefile +++ b/security/cyrus-sasl2-gssapi/Makefile @@ -6,16 +6,16 @@ WWW= https://www.cyrusimap.org/sasl/ OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_DEFAULT= GSSAPI_BASE -GSSAPI_BASE_USES= gssapi:base +GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_HEIMDAL_PLIST_FILES= ${LIBGS2_PLIST_FILES} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit + --with-gss_impl=${KRB5_TYPE} GSSAPI_MIT_PLIST_FILES= ${LIBGS2_PLIST_FILES} LIBGS2_PLIST_FILES= lib/sasl2/libgs2.a \ diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile index 6c922264b1..4ed8fab426 100644 --- a/security/cyrus-sasl2-saslauthd/Makefile +++ b/security/cyrus-sasl2-saslauthd/Makefile @@ -51,15 +51,15 @@ OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE OPTIONS_DEFAULT+= GSSAPI_BASE .endif OPTIONS_RADIO_GSSAPI+= GSSAPI_HEIMDAL GSSAPI_MIT -GSSAPI_BASE_USES= gssapi:base +GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal + --with-gss_impl=${KRB5_TYPE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=mit + --with-gss_impl=${KRB5_TYPE} DOCS= COPYING ChangeLog LDAP_SASLAUTHD diff --git a/security/libgsasl/Makefile b/security/libgsasl/Makefile index 5ee7db3268..089aec3cb6 100644 --- a/security/libgsasl/Makefile +++ b/security/libgsasl/Makefile @@ -27,13 +27,14 @@ OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT=GSSAPI_BASE OPTIONS_SUB= yes -GSSAPI_BASE_CONFIGURE_ON= --with-gssapi-impl=heimdal ${GSSAPI_CONFIGURE_ARGS} GSSAPI_BASE_USES= gssapi -GSSAPI_HEIMDAL_CONFIGURE_WITH= --with-gssapi-impl=heimdal ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_MIT_CONFIGURE_ON=--with-gssapi-impl=mit ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --disable-gssapi +GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi-impl=${KRB5_TYPE} ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} +GSSAPI_NONE_CONFIGURE_ENV_OFF= ac_cv_path_KRB5CFGPATH="${KRB5CONFIG}" + NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext diff --git a/security/libssh/Makefile b/security/libssh/Makefile index ee1c508387..2618ea29b9 100644 --- a/security/libssh/Makefile +++ b/security/libssh/Makefile @@ -57,11 +57,12 @@ OPTIONS_DEFAULT=GSSAPI_BASE OPENSSL STATIC OPTIONS_SUB= yes GSSAPI_BASE_CMAKE_ON= -DKRB5_CONFIG=${KRB5CONFIG} -DWITH_GSSAPI=ON -GSSAPI_BASE_USES= gssapi:base,flags +GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_CMAKE_ON=-DKRB5_CONFIG=${KRB5CONFIG} -DWITH_GSSAPI=ON -GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags +GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_CMAKE_ON= -DKRB5_CONFIG=${KRB5CONFIG} -DWITH_GSSAPI=ON -GSSAPI_MIT_USES= gssapi:mit,flags +GSSAPI_MIT_USES= gssapi:mit +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} GSSAPI_NONE_CMAKE_BOOL_OFF= WITH_GSSAPI OPENSSL_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenSSL OPENSSL_USES= ssl diff --git a/security/p5-Authen-Krb5-Simple/Makefile b/security/p5-Authen-Krb5-Simple/Makefile index b9e8e6ab6c..5276f83f35 100644 --- a/security/p5-Authen-Krb5-Simple/Makefile +++ b/security/p5-Authen-Krb5-Simple/Makefile @@ -20,7 +20,7 @@ OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_DEFAULT= GSSAPI_BASE GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ENV= HAVE_HEIMDAL=1 +#GSSAPI_BASE_CONFIGURE_ENV= HAVE_HEIMDAL=1 GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ENV= HAVE_HEIMDAL=1 GSSAPI_MIT_USES= gssapi:mit diff --git a/security/p5-Authen-Krb5/Makefile b/security/p5-Authen-Krb5/Makefile index 634f1f9350..ef81171910 100644 --- a/security/p5-Authen-Krb5/Makefile +++ b/security/p5-Authen-Krb5/Makefile @@ -19,7 +19,7 @@ OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_DEFAULT= GSSAPI_BASE GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ENV= HAVE_HEIMDAL=1 +#GSSAPI_BASE_CONFIGURE_ENV= HAVE_HEIMDAL=1 GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ENV= HAVE_HEIMDAL=1 GSSAPI_MIT_USES= gssapi:mit diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile index 5b54b1e3e2..e74a58343a 100644 --- a/security/pam_krb5/Makefile +++ b/security/pam_krb5/Makefile @@ -36,7 +36,7 @@ PKGNAMESUFFIX= -mit USES+= gssapi:heimdal PKGNAMESUFFIX= -heimdal .elif ${FLAVOR:U} == heimdal_base -USES+= gssapi:base +USES+= gssapi .endif .include diff --git a/security/putty/Makefile b/security/putty/Makefile index 56f4499523..9252ba66df 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -74,7 +74,7 @@ CMAKE_ARGS+= -DPUTTY_GTK_VERSION:STRING=NONE .endif .if ${PORT_OPTIONS:MGSSAPI_BASE} # Heimdal-like in base system -USES+= gssapi:base,flags +USES+= gssapi:flags CMAKE_ARGS+= -DKRB5_CONFIG:PATH=${KRB5CONFIG} \ -DPUTTY_GSSAPI:STRING=STATIC .elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL} diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile index 0d4a0df8a6..ea922ff638 100644 --- a/www/mod_auth_kerb2/Makefile +++ b/www/mod_auth_kerb2/Makefile @@ -19,7 +19,7 @@ USES= apache GNU_CONFIGURE= yes CONFIGURE_ARGS= -with-krb5=${GSSAPIBASEDIR} --without-krb4 - +CONFIGURE_ENV+= KRB5_CPPFLAGS="${GSSAPICPPFLAGS}" PORTSCOUT= limit:^5.4 OPTIONS_DEFAULT= GSSAPI_BASE diff --git a/www/squid/Makefile b/www/squid/Makefile index 788c344ee5..782306398f 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -148,23 +148,18 @@ FS_DISKD_VARS= DISKIO_MODULES+=DiskDaemon \ STORAGE_SCHEMES+=diskd FS_ROCK_VARS= STORAGE_SCHEMES+=rock GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-heimdal-krb5=${GSSAPIBASEDIR} \ - krb5_config=${GSSAPIBASEDIR}/bin/krb5-config GSSAPI_BASE_PLIST_SUB= AUTH_KERB="" GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_HEIMDAL_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-heimdal-krb5=${GSSAPIBASEDIR} \ - krb5_config=${GSSAPIBASEDIR}/bin/krb5-config GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB="" GSSAPI_MIT_USES= gssapi:mit -GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-mit-krb5=${GSSAPIBASEDIR} \ - krb5_config=${GSSAPIBASEDIR}/bin/krb5-config GSSAPI_MIT_PLIST_SUB= AUTH_KERB="" +GSSAPI_NONE_CFLAGS_OFF= ${GSSAPICPPFLAGS} GSSAPI_NONE_CONFIGURE_ON= --without-gnugss \ --without-heimdal-krb5 \ --without-mit-krb5 +GSSAPI_NONE_CONFIGURE_OFF= ${GSSAPI_CONFIGURE_ARGS} \ + --with-${KRB5_TYPE}-krb5=${GSSAPIBASEDIR} \ + krb5_config=${GSSAPIBASEDIR}/bin/krb5-config HTCP_CONFIGURE_ENABLE= htcp ICAP_CONFIGURE_ENABLE= icap-client ICMP_CONFIGURE_ENABLE= icmp