CVS commit: pkgsrc/security/heimdal

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Oct 21 16:21:44 UTC 2019

Modified Files:
        pkgsrc/security/heimdal: Makefile buildlink3.mk

Log Message:
heimdal: fix build on OpenSSL 1.1 systems by disabling OpenSSL.

heimdal includes a copy of the relevant functions itself.

Add a comment that the dependency should be re-enabled when updating
this package.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 pkgsrc/security/heimdal/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/security/heimdal/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/heimdal/Makefile
diff -u pkgsrc/security/heimdal/Makefile:1.132 pkgsrc/security/heimdal/Makefile:1.133
--- pkgsrc/security/heimdal/Makefile:1.132      Wed Apr  3 00:33:04 2019
+++ pkgsrc/security/heimdal/Makefile    Mon Oct 21 16:21:44 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.132 2019/04/03 00:33:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.133 2019/10/21 16:21:44 wiz Exp $
 
 DISTNAME=      heimdal-1.5.3
-PKGREVISION=   20
+PKGREVISION=   21
 CATEGORIES=    security
 MASTER_SITES=  http://www.h5l.org/dist/src/
 
@@ -34,7 +34,9 @@ CONFIGURE_ARGS+=      --enable-pthread-suppor
 CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/krb5
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-hdbdir=${HEIMDAL_HDB_DIR}
-CONFIGURE_ARGS+=       --with-openssl=${SSLBASE:Q}
+# not compatible to openssl 1.1
+# TODO: re-enable when updating from 1.5.3, also in buildlink3.mk
+CONFIGURE_ARGS+=       --without-openssl
 CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
 CONFIGURE_ARGS+=       --without-x
 CONFIGURE_ARGS+=       ${ABI:D--with-mips-abi=${ABI}}
@@ -97,15 +99,7 @@ pre-build:
        ${TOUCH} ${WRKSRC}/po/localefiles
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-CHECK_BUILTIN.openssl:=        yes
-.include "../../security/openssl/builtin.mk"
-CHECK_BUILTIN.openssl:=no
-.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" || \
-    (${OPSYS} == "SunOS" && !empty(USE_BUILTIN.openssl:Myes) &&        \
-               !empty(BUILTIN_LIB_FOUND.crypto:M[Nn][Oo]))
 PLIST.hcrypto=         yes
-.endif
 
 # Linux does not have include/vis.h and expected include/glob.h.
 .if ${OPSYS} == "Linux"
@@ -113,16 +107,9 @@ PLIST.vis= yes
 PLIST.glob=    yes
 # Without this I get undefined references to pthread_getspecific
 PTHREAD_AUTO_VARS=     yes
-.if !empty(USE_BUILTIN.openssl:Myes) && \
-       empty(BUILTIN_VERSION.openssl:M1.0*)
-PLIST.hcrypto=         yes
-.endif
 .endif
 
 .if ${OPSYS} == "MirBSD"
-.if !empty(USE_BUILTIN.openssl:Myes)
-PLIST.hcrypto=         yes
-.endif
 PLIST.vis=             yes
 # all of the tools need to link against pthread, force it.
 PTHREAD_AUTO_VARS=     yes

Index: pkgsrc/security/heimdal/buildlink3.mk
diff -u pkgsrc/security/heimdal/buildlink3.mk:1.58 pkgsrc/security/heimdal/buildlink3.mk:1.59
--- pkgsrc/security/heimdal/buildlink3.mk:1.58  Wed Apr  3 00:33:04 2019
+++ pkgsrc/security/heimdal/buildlink3.mk       Mon Oct 21 16:21:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.58 2019/04/03 00:33:04 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.59 2019/10/21 16:21:44 wiz Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -18,7 +18,6 @@ pkgbase := heimdal
 .if !empty(PKG_BUILD_OPTIONS.heimdal:Mldap)
 .  include "../../databases/openldap-client/buildlink3.mk"
 .endif
-.include "../../security/openssl/buildlink3.mk"
 
 CHECK_BUILTIN.heimdal:=        yes
 .include "../../security/heimdal/builtin.mk"