Date: Mon, 12 Sep 2016 15:14:14 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421928 - in head/security/heimdal: . files Message-ID: <201609121514.u8CFEEGh067656@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Sep 12 15:14:14 2016 New Revision: 421928 URL: https://svnweb.freebsd.org/changeset/ports/421928 Log: security/heimdal: Fix build when EGD is not available (e.g. LibreSSL) Approved by: SSL blanket Added: head/security/heimdal/files/patch-lib_hcrypto_rand-egd.c (contents, props changed) head/security/heimdal/files/patch-lib_krb5_crypto-rand.c (contents, props changed) Modified: head/security/heimdal/Makefile Modified: head/security/heimdal/Makefile ============================================================================== --- head/security/heimdal/Makefile Mon Sep 12 15:08:19 2016 (r421927) +++ head/security/heimdal/Makefile Mon Sep 12 15:14:14 2016 (r421928) @@ -20,9 +20,8 @@ CONFLICTS= krb4-[0-9]* krb5-[0-9]* krb5- wu-ftpd-[0-9]* wu-ftpd+ipv6-[0-9]* USES= gettext gssapi:bootstrap,heimdal libtool pathfix pkgconfig \ - readline makeinfo + readline makeinfo ssl USE_LDCONFIG= ${GSSAPILIBDIR} -USE_OPENSSL= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip CONFIGURE_ENV= ac_cv_header_fnmatch_h=yes \ Added: head/security/heimdal/files/patch-lib_hcrypto_rand-egd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/heimdal/files/patch-lib_hcrypto_rand-egd.c Mon Sep 12 15:14:14 2016 (r421928) @@ -0,0 +1,16 @@ +--- lib/hcrypto/rand-egd.c.orig 2012-12-09 22:06:44 UTC ++++ lib/hcrypto/rand-egd.c +@@ -54,6 +54,7 @@ static const char *egd_path = "/var/run/ + + #define MAX_EGD_DATA 255 + ++#ifndef OPENSSL_NO_EGD + static int + connect_egd(const char *path) + { +@@ -258,3 +259,5 @@ RAND_egd_bytes(const char *filename, int + + return 1; + } ++ ++#endif Added: head/security/heimdal/files/patch-lib_krb5_crypto-rand.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/heimdal/files/patch-lib_krb5_crypto-rand.c Mon Sep 12 15:14:14 2016 (r421928) @@ -0,0 +1,13 @@ +--- lib/krb5/crypto-rand.c.orig 2012-12-09 22:06:44 UTC ++++ lib/krb5/crypto-rand.c +@@ -70,8 +70,10 @@ seed_something(void) + if (!krb5_init_context(&context)) { + p = krb5_config_get_string(context, NULL, "libdefaults", + "egd_socket", NULL); ++# ifndef OPENSSL_NO_EGD + if (p != NULL) + RAND_egd_bytes(p, ENTROPY_NEEDED); ++# endif + krb5_free_context(context); + } + #else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609121514.u8CFEEGh067656>