5 files changed, 23 insertions, 69 deletions
diff --git a/package/heimdal/patches/heimdal_tinfo.patch b/package/heimdal/patches/heimdal_tinfo.patch
new file mode 100644
index 000000000..cd64c7553
--- /dev/null
+++ b/package/heimdal/patches/heimdal_tinfo.patch
@@ -0,0 +1,23 @@
+	Found in Gentoo portage
+--- heimdal-1.5/configure.ac.orig	2011-08-01 12:49:33.554689000 +0200
++++ heimdal-1.5/configure.ac	2011-08-01 13:54:12.707009421 +0200
+@@ -444,7 +444,7 @@
+ #endif
+ ],[0,0,0,0,0])
+ 
+-AC_FIND_FUNC_NO_LIBS(tgetent, termcap ncurses curses,[
++AC_FIND_FUNC_NO_LIBS(tgetent, tinfo ncurses curses termcap,[
+ #ifdef HAVE_TERMCAP_H
+ #include <termcap.h>
+ #endif
+--- heimdal-1.5/lib/libedit/configure.ac~	2011-07-30 22:43:29.000000000 +0200
++++ heimdal-1.5/lib/libedit/configure.ac	2011-08-01 13:54:30.657009419 +0200
+@@ -33,7 +33,7 @@
+ EL_MANTYPE
+ 
+ 
+-AC_CHECK_LIB(curses, tgetent,,
++AC_CHECK_LIB(tinfo, tgetent,,
+    [AC_CHECK_LIB(ncurses, tgetent,,
+       [AC_MSG_ERROR([libcurses or libncurses are required!])] )] )
+ 
diff --git a/package/heimdal/patches/patch-cf_check-compile-et_m4 b/package/heimdal/patches/patch-cf_check-compile-et_m4
deleted file mode 100644
index 0211e2b8f..000000000
--- a/package/heimdal/patches/patch-cf_check-compile-et_m4
+++ /dev/null
@@ -1,17 +0,0 @@
---- heimdal-1.5.3.orig/cf/check-compile-et.m4	2012-12-09 23:06:44.000000000 +0100
-+++ heimdal-1.5.3/cf/check-compile-et.m4	2014-04-24 11:55:02.000000000 +0200
-@@ -3,12 +3,12 @@ dnl
- dnl CHECK_COMPILE_ET
- AC_DEFUN([CHECK_COMPILE_ET], [
- 
--AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et])
-+AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et],[no])
- 
- krb_cv_compile_et="no"
- krb_cv_com_err_need_r=""
- krb_cv_compile_et_cross=no
--if test "${COMPILE_ET}" = "compile_et"; then
-+if test "${COMPILE_ET}" != no; then
- 
- dnl We have compile_et.  Now let's see if it supports `prefix' and `index'.
- AC_MSG_CHECKING(whether compile_et has the features we need)
diff --git a/package/heimdal/patches/patch-lib_com_err_Makefile_am b/package/heimdal/patches/patch-lib_com_err_Makefile_am
deleted file mode 100644
index 9c2faa8d8..000000000
--- a/package/heimdal/patches/patch-lib_com_err_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- heimdal-1.5.3.orig/lib/com_err/Makefile.am	2012-12-09 23:06:44.000000000 +0100
-+++ heimdal-1.5.3/lib/com_err/Makefile.am	2014-05-27 11:51:26.000000000 +0200
-@@ -13,7 +13,7 @@ endif
- 
- libcom_err_la_LIBADD = $(LIB_libintl)
- 
--bin_PROGRAMS = compile_et
-+libexec_heimdal_PROGRAMS = compile_et
- 
- include_HEADERS = com_err.h com_right.h
- 
diff --git a/package/heimdal/patches/patch-lib_krb5_crypto-rand_c b/package/heimdal/patches/patch-lib_krb5_crypto-rand_c
deleted file mode 100644
index bb72effe0..000000000
--- a/package/heimdal/patches/patch-lib_krb5_crypto-rand_c
+++ /dev/null
@@ -1,30 +0,0 @@
---- heimdal-1.5.3.orig/lib/krb5/crypto-rand.c	2012-12-09 23:06:44.000000000 +0100
-+++ heimdal-1.5.3/lib/krb5/crypto-rand.c	2015-11-03 19:30:39.336954603 +0100
-@@ -59,27 +59,6 @@ seed_something(void)
-     } else
- 	seedfile[0] = '\0';
- 
--    /* Calling RAND_status() will try to use /dev/urandom if it exists so
--       we do not have to deal with it. */
--    if (RAND_status() != 1) {
--#ifndef _WIN32
--	krb5_context context;
--	const char *p;
--
--	/* Try using egd */
--	if (!krb5_init_context(&context)) {
--	    p = krb5_config_get_string(context, NULL, "libdefaults",
--				       "egd_socket", NULL);
--	    if (p != NULL)
--		RAND_egd_bytes(p, ENTROPY_NEEDED);
--	    krb5_free_context(context);
--	}
--#else
--	/* TODO: Once a Windows CryptoAPI RAND method is defined, we
--	   can use that and failover to another method. */
--#endif
--    }
--
-     if (RAND_status() == 1)	{
- 	/* Update the seed file */
- 	if (seedfile[0])
diff --git a/package/heimdal/patches/patch-lib_roken_roken_h_in b/package/heimdal/patches/patch-lib_roken_roken_h_in
deleted file mode 100644
index b571cc428..000000000
--- a/package/heimdal/patches/patch-lib_roken_roken_h_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- heimdal-1.5.3.orig/lib/roken/roken.h.in	2012-12-09 23:06:44.000000000 +0100
-+++ heimdal-1.5.3/lib/roken/roken.h.in	2014-04-24 10:36:35.000000000 +0200
-@@ -551,7 +551,7 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL ge
- ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL strerror(int);
- #endif
- 
--#if (!defined(HAVE_STRERROR_R) && !defined(strerror_r)) || (!defined(STRERROR_R_PROTO_COMPATIBLE) && defined(HAVE_STRERROR_R))
-+#if (defined(HAVE_STRERROR_R) && !defined(strerror_r)) || (!defined(STRERROR_R_PROTO_COMPATIBLE) && defined(HAVE_STRERROR_R))
- int ROKEN_LIB_FUNCTION rk_strerror_r(int, char *, size_t);
- #else
- #define rk_strerror_r strerror_r