Date: Tue, 7 May 2019 17:37:13 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r500972 - in branches/2019Q2/security: krb5-115/files krb5-116/files krb5-117/files krb5-devel/files Message-ID: <201905071737.x47HbDD9007149@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue May 7 17:37:13 2019 New Revision: 500972 URL: https://svnweb.freebsd.org/changeset/ports/500972 Log: MFH: r500725 Fix build with libressl 2.9.1. PR: 237621 Reported by: many Approved by: portmgr (joneum@) Modified: branches/2019Q2/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c branches/2019Q2/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c branches/2019Q2/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c branches/2019Q2/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c ============================================================================== --- branches/2019Q2/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue May 7 16:37:15 2019 (r500971) +++ branches/2019Q2/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue May 7 17:37:13 2019 (r500972) @@ -1,6 +1,6 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c -@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err); +--- 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 @@ (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif @@ -10,7 +10,18 @@ /* 1.1 standardizes constructor and destructor names, renaming * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ -@@ -3040,7 +3041,9 @@ cleanup: +@@ -249,6 +250,10 @@ + + #endif + ++#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; } Modified: branches/2019Q2/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c ============================================================================== --- branches/2019Q2/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue May 7 16:37:15 2019 (r500971) +++ branches/2019Q2/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue May 7 17:37:13 2019 (r500972) @@ -1,6 +1,6 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c -@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err); +--- 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 @@ (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif @@ -10,7 +10,18 @@ /* 1.1 standardizes constructor and destructor names, renaming * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ -@@ -3040,7 +3041,9 @@ cleanup: +@@ -249,6 +250,10 @@ + + #endif + ++#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; } Modified: branches/2019Q2/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c ============================================================================== --- branches/2019Q2/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue May 7 16:37:15 2019 (r500971) +++ branches/2019Q2/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue May 7 17:37:13 2019 (r500972) @@ -1,6 +1,6 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c -@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err); +--- 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 @@ (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif @@ -10,7 +10,18 @@ /* 1.1 standardizes constructor and destructor names, renaming * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ -@@ -3040,7 +3041,9 @@ cleanup: +@@ -249,6 +250,10 @@ + + #endif + ++#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; } Modified: branches/2019Q2/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c ============================================================================== --- branches/2019Q2/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue May 7 16:37:15 2019 (r500971) +++ branches/2019Q2/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue May 7 17:37:13 2019 (r500972) @@ -1,6 +1,6 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c -@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err); +--- 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 @@ (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif @@ -10,7 +10,18 @@ /* 1.1 standardizes constructor and destructor names, renaming * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ -@@ -3040,7 +3041,9 @@ cleanup: +@@ -249,6 +250,10 @@ + + #endif + ++#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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905071737.x47HbDD9007149>