pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

heimdal: remove openssl dependency



Hi!

heimdal does not build against the openssl 1.1 API.

It includes its own crypto (stripped down openssl code IIUC) called
hcrypto.

The attached patch switches heimdal to use that instead of an openssl
package (which might be 1.1 e.g. on NetBSD-current).

Comments?
 Thomas
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/heimdal/Makefile,v
retrieving revision 1.132
diff -u -r1.132 Makefile
--- Makefile	3 Apr 2019 00:33:04 -0000	1.132
+++ Makefile	27 Sep 2019 15:03:09 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.132 2019/04/03 00:33:04 ryoon Exp $
 
 DISTNAME=	heimdal-1.5.3
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	security
 MASTER_SITES=	http://www.h5l.org/dist/src/
 
@@ -34,7 +34,8 @@
 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
+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 +98,7 @@
 	${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 +106,9 @@
 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: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/heimdal/buildlink3.mk,v
retrieving revision 1.58
diff -u -r1.58 buildlink3.mk
--- buildlink3.mk	3 Apr 2019 00:33:04 -0000	1.58
+++ buildlink3.mk	27 Sep 2019 15:03:09 -0000
@@ -18,7 +18,6 @@
 .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"


Home | Main Index | Thread Index | Old Index