diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile index f7cf442ce478..aaccec6b7e8b 100644 --- a/security/krb5-devel/Makefile +++ b/security/krb5-devel/Makefile @@ -1,111 +1,111 @@ # Created by: nectar@FreeBSD.org PORTNAME= krb5 PORTVERSION= 1.19.${MIT_COMMIT_DATE} CATEGORIES= security .if !defined(MASTERDIR) PKGNAMESUFFIX= -devel .endif -HASH= d22ed9b92 -MIT_COMMIT_DATE= 2021.10.28 +HASH= b0e74f60b +MIT_COMMIT_DATE= 2021.11.05 PATCH_SITES= http://web.mit.edu/kerberos/advisories/ PATCH_DIST_STRIP= -p2 MAINTAINER= cy@FreeBSD.org COMMENT= MIT implementation of RFC 4120 network authentication service LICENSE= MIT USE_GITHUB= yes GH_TAGNAME= ${HASH} CONFLICTS= heimdal srp krb5-11[345] \ krb5-1.[0-9]* KERBEROSV_URL= http://web.mit.edu/kerberos/ USE_PERL5= build USE_LDCONFIG= yes USE_CSTD= gnu99 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" CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" CPE_VENDOR= mit CPE_VERSION= 5-${PORTVERSION} CPE_PRODUCT= kerberos OPTIONS_DEFINE= EXAMPLES NLS DNS_FOR_REALM LDAP LMDB OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML READLINE OPTIONS_RADIO= CMD_LINE_EDITING OPTIONS_RADIO_CMD_LINE_EDITING= READLINE LIBEDIT CMD_LINE_EDITING_DESC= Command line editing for kadmin and ktutil DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm LDAP= Enable LDAP support LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support LMDB_CONFIGURE_WITH= lmdb LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb LMDB_IMPLIES= LDAP NLS_USES= gettext READLINE_USES= readline READLINE_CONFIGURE_WITH=readline LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_WITH= libedit .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} .endif CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} USE_RC_SUBR= kpropd OPTIONS_SUB= yes WRKSRC_SUBDIR= src PORTEXAMPLES= kdc.conf krb5.conf services.append .include # Fix up -Wl,-rpath in LDFLAGS .if !empty(KRB5_HOME) _RPATH= ${KRB5_HOME}/lib: .else _RPATH= ${LOCALBASE}/lib: .endif .if !empty(LDFLAGS:M-Wl,-rpath,*) .for F in ${LDFLAGS:M-Wl,-rpath,*} LDFLAGS:= -Wl,-rpath,${_RPATH}${F:S/-Wl,-rpath,//} \ ${LDFLAGS:N-Wl,-rpath,*} .endfor .endif .if defined(KRB5_HOME) && ${KRB5_HOME} != ${LOCALBASE} BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" .endif .include post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 ${ECHO_CMD} @dir share/doc/krb5 >> ${TMPPLIST} @${SED} "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/kdc.in > ${STAGEDIR}${PREFIX}/sbin/kdc; \ ${CHMOD} +x ${STAGEDIR}${PREFIX}/sbin/kdc post-install-LDAP-on: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema \ ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif \ ${STAGEDIR}${DATADIR} .include diff --git a/security/krb5-devel/distinfo b/security/krb5-devel/distinfo index 41ab73cb895d..73b96cefbd06 100644 --- a/security/krb5-devel/distinfo +++ b/security/krb5-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635782046 -SHA256 (krb5-krb5-1.19.2021.10.28-d22ed9b92_GH0.tar.gz) = a5a6f8e51d157467ea7bbe86790f9a3065e562933f0c9999ff29596d116d4d32 -SIZE (krb5-krb5-1.19.2021.10.28-d22ed9b92_GH0.tar.gz) = 5078135 +TIMESTAMP = 1636394583 +SHA256 (krb5-krb5-1.19.2021.11.05-b0e74f60b_GH0.tar.gz) = 84eb7ed99abe1fbb4e4743a4ed4ca558dab68d9696b5de60c009c80ee1358a96 +SIZE (krb5-krb5-1.19.2021.11.05-b0e74f60b_GH0.tar.gz) = 5078486 diff --git a/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c b/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c index bb8ac5b8d049..a26d295ebf75 100644 --- a/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c +++ b/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c @@ -1,34 +1,23 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2019-01-08 08:02:37.000000000 -0800 -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-02 12:18:53.494194000 -0700 -@@ -189,7 +189,8 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2021-11-05 16:24:07.000000000 -0700 ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2021-11-08 10:10:45.431325000 -0800 +@@ -178,7 +178,8 @@ (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || \ + defined(LIBRESSL_VERSION_NUMBER) /* 1.1 standardizes constructor and destructor names, renaming * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ -@@ -249,6 +250,10 @@ - - #endif - +@@ -722,6 +723,10 @@ + DH_free(dh); + return pkey; + } ++ +#if defined(LIBRESSL_VERSION_NUMBER) && !defined(static_ASN1_SEQUENCE_END_name) +#define static_ASN1_SEQUENCE_END_name ASN1_SEQUENCE_END_name +#endif -+ + static struct pkcs11_errstrings { short code; - char *text; -@@ -3053,7 +3058,9 @@ - return retval; - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER)) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L) - - /* - * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would diff --git a/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h b/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h deleted file mode 100644 index 0cc2e38a4f59..000000000000 --- a/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2018-11-01 23:51:07 UTC -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.h -@@ -46,7 +46,9 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER)) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L) - #include - #else - #include