From owner-svn-ports-branches@freebsd.org Tue May 7 17:37:15 2019 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42141158E8D5; Tue, 7 May 2019 17:37:15 +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 DE3936CA80; Tue, 7 May 2019 17:37:14 +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 B74CF218E3; Tue, 7 May 2019 17:37:14 +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 x47HbEds007153; Tue, 7 May 2019 17:37:14 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x47HbDD9007149; Tue, 7 May 2019 17:37:13 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201905071737.x47HbDD9007149@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Tue, 7 May 2019 17:37:13 +0000 (UTC) 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 X-SVN-Group: ports-branches X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in branches/2019Q2/security: krb5-115/files krb5-116/files krb5-117/files krb5-devel/files X-SVN-Commit-Revision: 500972 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DE3936CA80 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 May 2019 17:37:15 -0000 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; }