From owner-svn-ports-all@freebsd.org Wed Jun 13 05:45:00 2018 Return-Path: Delivered-To: svn-ports-all@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 7FE781005AEA; Wed, 13 Jun 2018 05:45:00 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2F8AD6D1E8; Wed, 13 Jun 2018 05:45:00 +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 08FFE154BA; Wed, 13 Jun 2018 05:45:00 +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 w5D5ix7A096928; Wed, 13 Jun 2018 05:44:59 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5D5iwap096923; Wed, 13 Jun 2018 05:44:58 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201806130544.w5D5iwap096923@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 13 Jun 2018 05:44:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472286 - in head/security: krb5-115 krb5-115/files krb5-116 krb5-116/files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head/security: krb5-115 krb5-115/files krb5-116 krb5-116/files X-SVN-Commit-Revision: 472286 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2018 05:45:00 -0000 Author: cy Date: Wed Jun 13 05:44:58 2018 New Revision: 472286 URL: https://svnweb.freebsd.org/changeset/ports/472286 Log: Fix build with libressl and bearssl. PR: 228970 Modified: head/security/krb5-115/Makefile (contents, props changed) head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c (contents, props changed) head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h (contents, props changed) head/security/krb5-116/Makefile (contents, props changed) head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c (contents, props changed) head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h (contents, props changed) Modified: head/security/krb5-115/Makefile ============================================================================== --- head/security/krb5-115/Makefile Wed Jun 13 05:24:27 2018 (r472285) +++ head/security/krb5-115/Makefile Wed Jun 13 05:44:58 2018 (r472286) @@ -3,7 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.15.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ .if !defined(MASTERDIR) Modified: head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c ============================================================================== --- head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Wed Jun 13 05:24:27 2018 (r472285) +++ head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Wed Jun 13 05:44:58 2018 (r472286) @@ -1,20 +1,22 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2016-12-01 22:31:25 UTC -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c -@@ -191,7 +191,7 @@ pkinit_pkcs11_code_to_text(int err); +--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-05-03 07:34:47.000000000 -0700 ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2018-06-12 18:38:30.978823000 -0700 +@@ -188,7 +188,8 @@ (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#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. */ -@@ -3059,7 +3059,7 @@ cleanup: +@@ -3040,7 +3041,8 @@ return retval; } -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER) /* * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would Modified: head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h ============================================================================== --- head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Wed Jun 13 05:24:27 2018 (r472285) +++ head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Wed Jun 13 05:44:58 2018 (r472286) @@ -1,11 +1,12 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2016-12-01 22:31:25 UTC -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.h -@@ -46,7 +46,7 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2018-05-03 07:34:47.000000000 -0700 ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.h 2018-06-12 18:35:23.603366000 -0700 +@@ -46,7 +46,8 @@ #include #include -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER) #include #else #include Modified: head/security/krb5-116/Makefile ============================================================================== --- head/security/krb5-116/Makefile Wed Jun 13 05:24:27 2018 (r472285) +++ head/security/krb5-116/Makefile Wed Jun 13 05:44:58 2018 (r472286) @@ -3,7 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.16.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ .if !defined(MASTERDIR) Modified: head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c ============================================================================== --- head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Wed Jun 13 05:24:27 2018 (r472285) +++ head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Wed Jun 13 05:44:58 2018 (r472286) @@ -1,20 +1,22 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2016-12-01 22:31:25 UTC -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c -@@ -191,7 +191,7 @@ pkinit_pkcs11_code_to_text(int err); +--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-05-03 07:34:47.000000000 -0700 ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2018-06-12 18:38:30.978823000 -0700 +@@ -188,7 +188,8 @@ (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#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. */ -@@ -3059,7 +3059,7 @@ cleanup: +@@ -3040,7 +3041,8 @@ return retval; } -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER) /* * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would Modified: head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h ============================================================================== --- head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Wed Jun 13 05:24:27 2018 (r472285) +++ head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Wed Jun 13 05:44:58 2018 (r472286) @@ -1,11 +1,12 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2016-12-01 22:31:25 UTC -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.h -@@ -46,7 +46,7 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2018-05-03 07:34:47.000000000 -0700 ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.h 2018-06-12 18:35:23.603366000 -0700 +@@ -46,7 +46,8 @@ #include #include -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER) #include #else #include