update to latest upstream

6 files changed, 28 insertions, 100 deletions

diff --git a/package/heimdal/patches/patch-Makefile_in b/package/heimdal/patches/patch-Makefile_in
deleted file mode 100644
index d0c4cf0e3..000000000
--- a/package/heimdal/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- heimdal-1.5.2.orig/Makefile.in	2012-01-11 14:04:33.000000000 +0100
-+++ heimdal-1.5.2/Makefile.in	2013-04-29 16:39:03.000000000 +0200
-@@ -116,7 +116,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = include base lib kuser kdc admin kadmin kpasswd kcm \
--	appl tools tests packages etc po doc
-+	tools tests packages etc po doc
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -400,7 +400,7 @@ LIB_heimbase = $(top_builddir)/base/libh
- @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
- @KCM_TRUE@kcm_dir = kcm
- SUBDIRS = include base lib kuser kdc admin kadmin kpasswd $(kcm_dir) \
--	appl tools tests packages etc po $(am__append_1)
-+	tools tests packages etc po $(am__append_1)
- ACLOCAL_AMFLAGS = -I cf
- EXTRA_DIST = \
- 	NTMakefile \
diff --git a/package/heimdal/patches/patch-cf_check-compile-et_m4 b/package/heimdal/patches/patch-cf_check-compile-et_m4
new file mode 100644
index 000000000..0211e2b8f
--- /dev/null
+++ b/package/heimdal/patches/patch-cf_check-compile-et_m4
@@ -0,0 +1,17 @@
+--- 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-configure b/package/heimdal/patches/patch-configure
deleted file mode 100644
index 6a8d652d3..000000000
--- a/package/heimdal/patches/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- heimdal-1.5.2.orig/configure	2012-01-11 14:04:10.000000000 +0100
-+++ heimdal-1.5.2/configure	2013-04-29 16:35:46.000000000 +0200
-@@ -28318,7 +28318,7 @@ rm -fr conftest*
- fi
- 
- if test "${krb_cv_compile_et_cross}" = yes ; then
--  krb_cv_com_err="cross"
-+  krb_cv_com_err="yes"
- elif test "${krb_cv_compile_et}" = "yes"; then
-     krb_cv_save_LIBS="${LIBS}"
-   LIBS="${LIBS} -lcom_err"
-@@ -28354,6 +28354,7 @@ else
-     krb_cv_com_err="no"
- fi
- 
-+krb_cv_com_err="yes"
- if test "${krb_cv_com_err}" = "yes"; then
-     DIR_com_err=""
-     LIB_com_err="-lcom_err"
diff --git a/package/heimdal/patches/patch-lib_roken_Makefile_in b/package/heimdal/patches/patch-lib_roken_Makefile_in
deleted file mode 100644
index 38ad2996b..000000000
--- a/package/heimdal/patches/patch-lib_roken_Makefile_in
+++ /dev/null
@@ -1,41 +0,0 @@
---- heimdal-1.5.2.orig/lib/roken/Makefile.in	2012-01-11 14:04:30.000000000 +0100
-+++ heimdal-1.5.2/lib/roken/Makefile.in	2013-04-29 16:35:46.000000000 +0200
-@@ -747,9 +747,6 @@ getifaddrs-test$(EXEEXT): $(getifaddrs_t
- hex-test$(EXEEXT): $(hex_test_OBJECTS) $(hex_test_DEPENDENCIES) 
- 	@rm -f hex-test$(EXEEXT)
- 	$(LINK) $(hex_test_OBJECTS) $(hex_test_LDADD) $(LIBS)
--make-roken$(EXEEXT): $(make_roken_OBJECTS) $(make_roken_DEPENDENCIES) 
--	@rm -f make-roken$(EXEEXT)
--	$(LINK) $(make_roken_OBJECTS) $(make_roken_LDADD) $(LIBS)
- parse_bytes-test$(EXEEXT): $(parse_bytes_test_OBJECTS) $(parse_bytes_test_DEPENDENCIES) 
- 	@rm -f parse_bytes-test$(EXEEXT)
- 	$(LINK) $(parse_bytes_test_OBJECTS) $(parse_bytes_test_LDADD) $(LIBS)
-@@ -2033,18 +2030,18 @@ $(LTLIBOBJS) $(libroken_la_OBJECTS): rok
- .hin.h:
- 	cp $< $@
- 
--@CROSS_COMPILE_FALSE@roken.h: make-roken$(EXEEXT)
--@CROSS_COMPILE_FALSE@	@./make-roken$(EXEEXT) > tmp.h ;\
--@CROSS_COMPILE_FALSE@	if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \
--@CROSS_COMPILE_FALSE@	else rm -f roken.h; mv tmp.h roken.h; fi
-+roken.h: make-roken$(EXEEXT)
-+	./make-roken$(EXEEXT) > tmp.h ;\
-+	if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \
-+	else rm -f roken.h; mv tmp.h roken.h; fi
- 
--@CROSS_COMPILE_FALSE@make-roken.c: roken.h.in roken.awk
--@CROSS_COMPILE_FALSE@	$(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c
-+make-roken.c: roken.h.in roken.awk
-+	$(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c
-+
-+make-roken$(EXEEXT): make-roken.c
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I$(top_builddir)/include -DHAVE_CONFIG_H \
-+		-o $@ $<
- 
--@CROSS_COMPILE_TRUE@roken.h: $(top_srcdir)/cf/roken-h-process.pl roken.h.in
--@CROSS_COMPILE_TRUE@	perl $(top_srcdir)/cf/roken-h-process.pl \
--@CROSS_COMPILE_TRUE@	-c $(top_builddir)/include/config.h  \
--@CROSS_COMPILE_TRUE@	-p $(srcdir)/roken.h.in -o roken.h
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/package/heimdal/patches/patch-lib_roken_roken_h_in b/package/heimdal/patches/patch-lib_roken_roken_h_in
new file mode 100644
index 000000000..b571cc428
--- /dev/null
+++ b/package/heimdal/patches/patch-lib_roken_roken_h_in
@@ -0,0 +1,11 @@
+--- 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
diff --git a/package/heimdal/patches/patch-tools_krb5-config.in b/package/heimdal/patches/patch-tools_krb5-config.in
deleted file mode 100644
index 76f1ac7e5..000000000
--- a/package/heimdal/patches/patch-tools_krb5-config.in
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur heimdal-1.5.2.orig/tools/krb5-config.in heimdal-1.5.2/tools/krb5-config.in
---- heimdal-1.5.2.orig/tools/krb5-config.in	2012-01-10 22:53:51.000000000 +0100
-+++ heimdal-1.5.2/tools/krb5-config.in	2013-08-20 09:44:59.580220171 +0200
-@@ -120,7 +120,6 @@
- fi
- 
- if test "$do_libs" = "yes"; then
--    lib_flags="-L${libdir}"
-     case $library in
-     gssapi)
- 	lib_flags="$lib_flags -lgssapi -lheimntlm"
-@@ -142,7 +141,7 @@
-     echo $lib_flags
- fi
- if test "$do_cflags" = "yes"; then
--    echo "-I${includedir} @INCLUDE_hcrypto@"
-+    echo "@INCLUDE_hcrypto@"
- fi
- 
- exit 0