Fix build with libressl.

PR:		198749, 198750
This commit is contained in:
Cy Schubert 2015-03-23 19:04:23 +00:00
parent 01f8b6d7d7
commit 24695efe14
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=382023
4 changed files with 24 additions and 0 deletions

View File

@ -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

View File

@ -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 <openssl/cms.h>
#define pkinit_CMS_get0_content_signed(_cms) CMS_get0_content(_cms)

View File

@ -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

View File

@ -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 <openssl/cms.h>
#define pkinit_CMS_get0_content_signed(_cms) CMS_get0_content(_cms)