From owner-svn-ports-all@freebsd.org Tue Jun 12 03:42:20 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 84158100E852; Tue, 12 Jun 2018 03:42:20 +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 35A81698ED; Tue, 12 Jun 2018 03:42:20 +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 172DB25001; Tue, 12 Jun 2018 03:42:20 +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 w5C3gJ02097887; Tue, 12 Jun 2018 03:42:19 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5C3gIY5097879; Tue, 12 Jun 2018 03:42:18 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201806120342.w5C3gIY5097879@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Tue, 12 Jun 2018 03:42:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472227 - in head/security: krb5-115 krb5-115/files krb5-116 krb5-116/files krb5-devel krb5-devel/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 krb5-devel krb5-devel/files X-SVN-Commit-Revision: 472227 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: Tue, 12 Jun 2018 03:42:20 -0000 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 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(OPENSSL_VERSION_NUMBER) ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L #include #else #include 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@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 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(OPENSSL_VERSION_NUMBER) ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L #include #else #include 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 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(OPENSSL_VERSION_NUMBER) ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L #include #else #include