svn commit: r472227 - in head/security: krb5-115 krb5-115/files krb5-116 krb5-116/files krb5-devel krb5-devel/files

[Cy Schubert]

Author: cy
Date: Tue Jun 12 03:42:18 2018
New Revision: 472227
URL: https://svnweb.freebsd.org/changeset/ports/472227

Log:
  Fix logic from patch supplied in PR 217027, committed in
  r433966 and r433967.
  
  PR:		228900

Modified:
  head/security/krb5-115/Makefile   (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.h   (contents, props changed)
  head/security/krb5-devel/Makefile   (contents, props changed)
  head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h   (contents, props changed)

Modified: head/security/krb5-115/Makefile
==============================================================================
--- head/security/krb5-115/Makefile	Tue Jun 12 03:09:23 2018	(r472226)
+++ head/security/krb5-115/Makefile	Tue Jun 12 03:42:18 2018	(r472227)
@@ -3,6 +3,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.15.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//}/
 .if !defined(MASTERDIR)

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	Tue Jun 12 03:09:23 2018	(r472226)
+++ head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h	Tue Jun 12 03:42:18 2018	(r472227)
@@ -5,7 +5,7 @@
  #include <openssl/pem.h>
  
 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(OPENSSL_VERSION_NUMBER)
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L 
  #include <openssl/asn1t.h>
  #else
  #include <openssl/asn1_mac.h>

Modified: head/security/krb5-116/Makefile
==============================================================================
--- head/security/krb5-116/Makefile	Tue Jun 12 03:09:23 2018	(r472226)
+++ head/security/krb5-116/Makefile	Tue Jun 12 03:42:18 2018	(r472227)
@@ -3,6 +3,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.16.1
+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//}/
 .if !defined(MASTERDIR)
@@ -16,9 +17,6 @@ MAINTAINER=		cy at FreeBSD.org
 COMMENT=		MIT implementation of RFC 4120 network authentication service
 
 LICENSE=		MIT
-
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	error: "This file is obsolete; please update your software."
 
 CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-11[34]-[0-9]* \
 			krb5-1.[0-9]* krb5-devel-*

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	Tue Jun 12 03:09:23 2018	(r472226)
+++ head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h	Tue Jun 12 03:42:18 2018	(r472227)
@@ -5,7 +5,7 @@
  #include <openssl/pem.h>
  
 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(OPENSSL_VERSION_NUMBER)
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L 
  #include <openssl/asn1t.h>
  #else
  #include <openssl/asn1_mac.h>

Modified: head/security/krb5-devel/Makefile
==============================================================================
--- head/security/krb5-devel/Makefile	Tue Jun 12 03:09:23 2018	(r472226)
+++ head/security/krb5-devel/Makefile	Tue Jun 12 03:42:18 2018	(r472227)
@@ -3,6 +3,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.17.${MIT_COMMIT_DATE}
+PORTREVISION=		1
 CATEGORIES=		security
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=		-devel

Modified: head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h
==============================================================================
--- head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h	Tue Jun 12 03:09:23 2018	(r472226)
+++ head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h	Tue Jun 12 03:42:18 2018	(r472227)
@@ -5,7 +5,7 @@
  #include <openssl/pem.h>
  
 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(OPENSSL_VERSION_NUMBER)
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L 
  #include <openssl/asn1t.h>
  #else
  #include <openssl/asn1_mac.h>