diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index b411c15c0e8..5896d3b0fd6 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.20 2016/12/17 14:58:31 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2016/12/22 09:20:19 ajacoutot Exp $ COMMENT-main= Kerberos 5 implementation COMMENT-devel-docs= Heimdal C functions documentation COMMENT-libs= Heimdal libraries and headers -V= 7.0.3 +V= 7.1.0 DISTNAME= heimdal-${V} PKGNAME-main= ${DISTNAME} diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo index bcd801e73d7..b0c4dce99ae 100644 --- a/security/heimdal/distinfo +++ b/security/heimdal/distinfo @@ -1,2 +1,2 @@ -SHA256 (heimdal-7.0.3.tar.gz) = Ux77cSPv60YU1Nj4zSFSmJF4KHrkly+GJUn4fwA1lIY= -SIZE (heimdal-7.0.3.tar.gz) = 9925280 +SHA256 (heimdal-7.1.0.tar.gz) = zuWKs6TOefJDo+c/Rl2sGf4rk+8cX/JE1vHWif7b3i0= +SIZE (heimdal-7.1.0.tar.gz) = 9925587 diff --git a/security/heimdal/patches/patch-lib_hcrypto_evp-openssl_c b/security/heimdal/patches/patch-lib_hcrypto_evp-openssl_c deleted file mode 100644 index fd1e02fd9d5..00000000000 --- a/security/heimdal/patches/patch-lib_hcrypto_evp-openssl_c +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-lib_hcrypto_evp-openssl_c,v 1.2 2016/12/18 09:01:07 ajacoutot Exp $ - -From 586e5f6d9dbac24680c479b737351edd675ff0b4 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Sat, 17 Dec 2016 09:54:41 +0100 -Subject: [PATCH] Fix build with LibreSSL. - ---- lib/hcrypto/evp-openssl.c.orig Fri Dec 16 11:03:01 2016 -+++ lib/hcrypto/evp-openssl.c Fri Dec 16 11:03:48 2016 -@@ -75,7 +75,7 @@ - /* Now it's safe to include OpenSSL headers */ - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define EVP_MD_CTX_new EVP_MD_CTX_create - #define EVP_MD_CTX_free EVP_MD_CTX_destroy - #endif diff --git a/security/heimdal/patches/patch-lib_roken_Makefile_in b/security/heimdal/patches/patch-lib_roken_Makefile_in deleted file mode 100644 index e81fec9f3ac..00000000000 --- a/security/heimdal/patches/patch-lib_roken_Makefile_in +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-lib_roken_Makefile_in,v 1.1 2016/12/17 14:58:31 ajacoutot Exp $ - -From 33e4cc0fe272b3479b324fd9cb08d47a0f40940f Mon Sep 17 00:00:00 2001 -From: Nicolas Williams -Date: Fri, 16 Dec 2016 12:05:51 -0600 -Subject: [PATCH] Fix lib/roken can't find pidfile() (#230) - ---- lib/roken/Makefile.in.orig Fri Dec 16 23:41:18 2016 -+++ lib/roken/Makefile.in Fri Dec 16 23:41:36 2016 -@@ -918,7 +918,7 @@ EXTRA_libroken_la_SOURCES = \ - search.hin \ - vis.hin - --libroken_la_LIBADD = @LTLIBOBJS@ $(LIB_crypt) -+libroken_la_LIBADD = @LTLIBOBJS@ $(LIB_crypt) $(LIB_pidfile) - BUILT_SOURCES = roken.h $(am__append_6) - @have_err_h_FALSE@err_h = err.h - @have_err_h_TRUE@err_h =