svn commit: r382023 - in head/security: krb5-111 krb5-111/files krb5-112 krb5-112/files

[Cy Schubert]

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