From owner-svn-ports-all@FreeBSD.ORG Mon Mar 23 19:04:25 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6CE349CD; Mon, 23 Mar 2015 19:04:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 571F1CB8; Mon, 23 Mar 2015 19:04:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2NJ4PTR042564; Mon, 23 Mar 2015 19:04:25 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2NJ4OT9042559; Mon, 23 Mar 2015 19:04:24 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201503231904.t2NJ4OT9042559@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 23 Mar 2015 19:04:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382023 - in head/security: krb5-111 krb5-111/files krb5-112 krb5-112/files X-SVN-Group: ports-head 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.18-1 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: Mon, 23 Mar 2015 19:04:25 -0000 Author: cy Date: Mon Mar 23 19:04:23 2015 New Revision: 382023 URL: https://svnweb.freebsd.org/changeset/ports/382023 QAT: https://qat.redports.org/buildarchive/r382023/ Log: Fix build with libressl. PR: 198749, 198750 Added: head/security/krb5-111/files/patch-plugins__preauth__pkinit__pkinit_crypto_openssl.c (contents, props changed) head/security/krb5-112/files/patch-plugins__preauth__pkinit__pkinit_crypto_openssl.c (contents, props changed) Modified: head/security/krb5-111/Makefile head/security/krb5-112/Makefile Modified: head/security/krb5-111/Makefile ============================================================================== --- head/security/krb5-111/Makefile Mon Mar 23 18:56:10 2015 (r382022) +++ head/security/krb5-111/Makefile Mon Mar 23 19:04:23 2015 (r382023) @@ -3,6 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.11.6 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PKGNAMESUFFIX= -111 Added: head/security/krb5-111/files/patch-plugins__preauth__pkinit__pkinit_crypto_openssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/krb5-111/files/patch-plugins__preauth__pkinit__pkinit_crypto_openssl.c Mon Mar 23 19:04:23 2015 (r382023) @@ -0,0 +1,11 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2015-02-24 23:19:36.000000000 +0100 ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2015-02-28 22:10:11.277738117 +0100 +@@ -173,7 +173,7 @@ + pkinit_pkcs11_code_to_text(int err); + + +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L && !defined(OPENSSL_NO_CMS) + /* Use CMS support present in OpenSSL 1.0 and later. */ + #include + #define pkinit_CMS_get0_content_signed(_cms) CMS_get0_content(_cms) Modified: head/security/krb5-112/Makefile ============================================================================== --- head/security/krb5-112/Makefile Mon Mar 23 18:56:10 2015 (r382022) +++ head/security/krb5-112/Makefile Mon Mar 23 19:04:23 2015 (r382023) @@ -3,6 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.12.3 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PKGNAMESUFFIX= -112 Added: head/security/krb5-112/files/patch-plugins__preauth__pkinit__pkinit_crypto_openssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/krb5-112/files/patch-plugins__preauth__pkinit__pkinit_crypto_openssl.c Mon Mar 23 19:04:23 2015 (r382023) @@ -0,0 +1,11 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2015-02-18 23:31:13.000000000 +0100 ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2015-02-28 22:05:52.151654774 +0100 +@@ -172,7 +172,7 @@ + pkinit_pkcs11_code_to_text(int err); + + +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L && !defined(OPENSSL_NO_CMS) + /* Use CMS support present in OpenSSL 1.0 and later. */ + #include + #define pkinit_CMS_get0_content_signed(_cms) CMS_get0_content(_cms)