update heimdal to latest upstream, not fully ready

33 files changed, 3 insertions, 703 deletions

diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 41cb87bd1..571936a2e 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		heimdal
-PKG_VERSION:=		1.2.1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		6e5028077e2a6b101a4a72801ba71b9e
+PKG_VERSION:=		1.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		31d08bbf47a77827fe97ef3f52b4c9c4
 PKG_DESCR:=		Kerberos 5 server
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libheimdal libheimdal-client libncurses libcom-err
diff --git a/package/heimdal/patches/patch-Makefile_am b/package/heimdal/patches/patch-Makefile_am
deleted file mode 100644
index a943323e0..000000000
--- a/package/heimdal/patches/patch-Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/Makefile.am	2008-07-28 14:04:51.000000000 +0200
-+++ heimdal-1.2.1/Makefile.am	2009-01-02 22:22:24.000000000 +0100
-@@ -7,7 +7,7 @@ kcm_dir = kcm
- endif
- 
- SUBDIRS=  include lib kuser kdc admin kadmin kpasswd 
--SUBDIRS+= $(kcm_dir) appl doc tools tests packages etc
-+SUBDIRS+= $(kcm_dir) doc tools etc
- 
- ## ACLOCAL = @ACLOCAL@ -I cf
- ACLOCAL_AMFLAGS = -I cf
diff --git a/package/heimdal/patches/patch-Makefile_in b/package/heimdal/patches/patch-Makefile_in
deleted file mode 100644
index 55a532f8b..000000000
--- a/package/heimdal/patches/patch-Makefile_in
+++ /dev/null
@@ -1,25 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/Makefile.in	2008-07-28 14:05:35.000000000 +0200
-+++ heimdal-1.2.1/Makefile.in	2009-01-02 22:22:24.000000000 +0100
-@@ -107,8 +107,8 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
-   distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm appl doc \
--	tools tests packages etc
-+DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm doc \
-+	tools etc
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -346,8 +346,8 @@ LIB_kafs = $(top_builddir)/lib/kafs/libk
- @KRB5_TRUE@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la
- @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
- @KCM_TRUE@kcm_dir = kcm
--SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) appl \
--	doc tools tests packages etc
-+SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) doc \
-+	tools etc
- ACLOCAL_AMFLAGS = -I cf
- EXTRA_DIST = \
- 	TODO \
diff --git a/package/heimdal/patches/patch-admin_Makefile_am b/package/heimdal/patches/patch-admin_Makefile_am
deleted file mode 100644
index ca557d203..000000000
--- a/package/heimdal/patches/patch-admin_Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/admin/Makefile.am	2008-07-28 14:04:49.000000000 +0200
-+++ heimdal-1.2.1/admin/Makefile.am	2009-01-02 22:22:24.000000000 +0100
-@@ -30,7 +30,7 @@ $(ktutil_OBJECTS): ktutil-commands.h
- CLEANFILES = ktutil-commands.h ktutil-commands.c
- 
- ktutil-commands.c ktutil-commands.h: ktutil-commands.in
--	$(SLC) $(srcdir)/ktutil-commands.in
-+	slc $(srcdir)/ktutil-commands.in
- 
- LDADD = \
- 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
diff --git a/package/heimdal/patches/patch-admin_Makefile_in b/package/heimdal/patches/patch-admin_Makefile_in
deleted file mode 100644
index 5baf7e5e5..000000000
--- a/package/heimdal/patches/patch-admin_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/admin/Makefile.in	2008-07-28 14:05:26.000000000 +0200
-+++ heimdal-1.2.1/admin/Makefile.in	2009-01-02 22:22:24.000000000 +0100
-@@ -898,7 +898,7 @@ distdir-in-tree: $(DISTFILES) $(INFO_DEP
- $(ktutil_OBJECTS): ktutil-commands.h
- 
- ktutil-commands.c ktutil-commands.h: ktutil-commands.in
--	$(SLC) $(srcdir)/ktutil-commands.in
-+	slc $(srcdir)/ktutil-commands.in
- # 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.
- .NOEXPORT:
diff --git a/package/heimdal/patches/patch-configure b/package/heimdal/patches/patch-configure
deleted file mode 100644
index 53601d6db..000000000
--- a/package/heimdal/patches/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/configure	2008-07-28 14:05:20.000000000 +0200
-+++ heimdal-1.2.1/configure	2009-11-19 21:01:07.000000000 +0100
-@@ -47096,9 +47096,6 @@ end
- EOF
- if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
-     save_CPPFLAGS="${CPPFLAGS}"
--  if test -d "/usr/include/et"; then
--    CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
--  fi
-     if test "$cross_compiling" = yes; then
-   krb_cv_compile_et="yes" krb_cv_compile_et_cross=yes
- else
-@@ -47183,7 +47180,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"
diff --git a/package/heimdal/patches/patch-include_Makefile_am b/package/heimdal/patches/patch-include_Makefile_am
deleted file mode 100644
index 9ad949c73..000000000
--- a/package/heimdal/patches/patch-include_Makefile_am
+++ /dev/null
@@ -1,22 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/include/Makefile.am	2008-07-28 14:04:49.000000000 +0200
-+++ heimdal-1.2.1/include/Makefile.am	2009-01-02 22:22:25.000000000 +0100
-@@ -7,11 +7,17 @@ SUBDIRS = kadm5 hcrypto gssapi
- noinst_PROGRAMS = bits make_crypto
- CHECK_LOCAL = no-check-local
- 
--AM_CPPFLAGS += -DHOST=\"$(CANONICAL_HOST)\"
-+AM_CPPFLAGS += -DHOST=\"$(CANONICAL_HOST)\" -DHAVE_CONFIG_H -I. -I..
- 
- nodist_include_HEADERS = krb5-types.h
- nodist_noinst_HEADERS = crypto-headers.h
- 
-+bits:
-+	$(HOSTCC) $(HOSTCFLAGS) $(AM_CPPFLAGS) -o $@ $(bits_SOURCES)
-+
-+make_crypto:
-+	$(HOSTCC) $(HOSTCFLAGS) $(AM_CPPFLAGS) -o $@ $(make_crypto_SOURCES)
-+
- krb5-types.h: bits$(EXEEXT)
- 	./bits$(EXEEXT) krb5-types.h
- 
diff --git a/package/heimdal/patches/patch-include_Makefile_in b/package/heimdal/patches/patch-include_Makefile_in
deleted file mode 100644
index d3f0667c3..000000000
--- a/package/heimdal/patches/patch-include_Makefile_in
+++ /dev/null
@@ -1,39 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/include/Makefile.in	2008-07-28 14:05:29.000000000 +0200
-+++ heimdal-1.2.1/include/Makefile.in	2009-01-02 22:22:25.000000000 +0100
-@@ -341,7 +341,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUFFIXES = .et .h .x .z .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
--AM_CPPFLAGS = $(INCLUDES_roken) -DHOST=\"$(CANONICAL_HOST)\"
-+AM_CPPFLAGS = $(INCLUDES_roken) -DHOST=\"$(CANONICAL_HOST)\" \
-+	-DHAVE_CONFIG_H -I. -I..
- @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
- AM_CFLAGS = $(WFLAGS)
- CP = cp
-@@ -492,12 +493,6 @@ clean-noinstPROGRAMS:
- 	  echo " rm -f $$p $$f"; \
- 	  rm -f $$p $$f ; \
- 	done
--bits$(EXEEXT): $(bits_OBJECTS) $(bits_DEPENDENCIES) 
--	@rm -f bits$(EXEEXT)
--	$(LINK) $(bits_OBJECTS) $(bits_LDADD) $(LIBS)
--make_crypto$(EXEEXT): $(make_crypto_OBJECTS) $(make_crypto_DEPENDENCIES) 
--	@rm -f make_crypto$(EXEEXT)
--	$(LINK) $(make_crypto_OBJECTS) $(make_crypto_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -1017,6 +1012,12 @@ distdir-in-tree: $(DISTFILES) $(INFO_DEP
- 	  fi ; \
- 	done
- 
-+bits:
-+	$(HOSTCC) $(HOSTCFLAGS) $(AM_CPPFLAGS) -o $@ $(bits_SOURCES)
-+
-+make_crypto:
-+	$(HOSTCC) $(HOSTCFLAGS) $(AM_CPPFLAGS) -o $@ $(make_crypto_SOURCES)
-+
- krb5-types.h: bits$(EXEEXT)
- 	./bits$(EXEEXT) krb5-types.h
- 
diff --git a/package/heimdal/patches/patch-kadmin_Makefile_am b/package/heimdal/patches/patch-kadmin_Makefile_am
deleted file mode 100644
index 6bcfe8483..000000000
--- a/package/heimdal/patches/patch-kadmin_Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/kadmin/Makefile.am	2008-07-28 14:04:51.000000000 +0200
-+++ heimdal-1.2.1/kadmin/Makefile.am	2009-01-02 22:22:25.000000000 +0100
-@@ -44,7 +44,7 @@ $(kadmin_OBJECTS): kadmin-commands.h
- CLEANFILES = kadmin-commands.h kadmin-commands.c
- 
- kadmin-commands.c kadmin-commands.h: kadmin-commands.in
--	$(SLC) $(srcdir)/kadmin-commands.in
-+	slc $(srcdir)/kadmin-commands.in
- 
- kadmind_SOURCES =				\
- 	kadmind.c				\
diff --git a/package/heimdal/patches/patch-kadmin_Makefile_in b/package/heimdal/patches/patch-kadmin_Makefile_in
deleted file mode 100644
index c989c1b11..000000000
--- a/package/heimdal/patches/patch-kadmin_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/kadmin/Makefile.in	2008-07-28 14:05:29.000000000 +0200
-+++ heimdal-1.2.1/kadmin/Makefile.in	2009-01-02 22:22:25.000000000 +0100
-@@ -1115,7 +1115,7 @@ distdir-in-tree: $(DISTFILES) $(INFO_DEP
- $(kadmin_OBJECTS): kadmin-commands.h
- 
- kadmin-commands.c kadmin-commands.h: kadmin-commands.in
--	$(SLC) $(srcdir)/kadmin-commands.in
-+	slc $(srcdir)/kadmin-commands.in
- # 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.
- .NOEXPORT:
diff --git a/package/heimdal/patches/patch-kadmin_kadm_conn_c b/package/heimdal/patches/patch-kadmin_kadm_conn_c
deleted file mode 100644
index b0c288404..000000000
--- a/package/heimdal/patches/patch-kadmin_kadm_conn_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/kadmin/kadm_conn.c	2008-07-28 14:04:51.000000000 +0200
-+++ heimdal-1.2.1/kadmin/kadm_conn.c	2009-01-06 14:21:32.674256091 +0100
-@@ -264,8 +264,9 @@ start_server(krb5_context context)
- 	    }
- 
- 	    socket_set_reuseaddr(s, 1);
-+#ifdef HAVE_IPV6
- 	    socket_set_ipv6only(s, 1);
--
-+#endif
- 	    if (bind (s, ap->ai_addr, ap->ai_addrlen) < 0) {
- 		krb5_warn(context, errno, "bind");
- 		close(s);
diff --git a/package/heimdal/patches/patch-kdc_kx509_c b/package/heimdal/patches/patch-kdc_kx509_c
deleted file mode 100644
index d3518d651..000000000
--- a/package/heimdal/patches/patch-kdc_kx509_c
+++ /dev/null
@@ -1,18 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/kdc/kx509.c	2008-07-28 14:04:51.000000000 +0200
-+++ heimdal-1.2.1/kdc/kx509.c	2009-01-04 18:43:21.853211573 +0100
-@@ -32,6 +32,9 @@
-  */
- 
- #include "kdc_locl.h"
-+
-+#ifdef PKINIT
-+
- #include <hex.h>
- #include <rfc2459_asn1.h>
- #include <hx509.h>
-@@ -454,3 +457,4 @@ out:
- 
-     return 0;
- }
-+#endif
diff --git a/package/heimdal/patches/patch-kdc_process_c b/package/heimdal/patches/patch-kdc_process_c
deleted file mode 100644
index b44d6e636..000000000
--- a/package/heimdal/patches/patch-kdc_process_c
+++ /dev/null
@@ -1,26 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/kdc/process.c	2008-07-28 14:04:51.000000000 +0200
-+++ heimdal-1.2.1/kdc/process.c	2009-01-04 19:04:06.899022107 +0100
-@@ -68,7 +68,9 @@ krb5_kdc_process_request(krb5_context co
-     KDC_REQ req;
-     Ticket ticket;
-     DigestREQ digestreq;
-+#ifdef PKINIT
-     Kx509Request kx509req;
-+#endif
-     krb5_error_code ret;
-     size_t i;
- 
-@@ -94,10 +96,12 @@ krb5_kdc_process_request(krb5_context co
- 	ret = _kdc_do_digest(context, config, &digestreq, reply, from, addr);
- 	free_DigestREQ(&digestreq);
- 	return ret;
-+#ifdef PKINIT
-     } else if (_kdc_try_kx509_request(buf, len, &kx509req, &i) == 0) {
- 	ret = _kdc_do_kx509(context, config, &kx509req, reply, from, addr);
- 	free_Kx509Request(&kx509req);
- 	return ret;
-+#endif
-     } else if(_kdc_maybe_version4(buf, len)){
- 	*prependlength = FALSE; /* elbitapmoc sdrawkcab XXX */
- 	_kdc_do_version4(context, config, buf, len, reply, from, 
diff --git a/package/heimdal/patches/patch-kuser_Makefile_am b/package/heimdal/patches/patch-kuser_Makefile_am
deleted file mode 100644
index 665c3554f..000000000
--- a/package/heimdal/patches/patch-kuser_Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/kuser/Makefile.am	2008-07-28 14:04:50.000000000 +0200
-+++ heimdal-1.2.1/kuser/Makefile.am	2009-01-02 22:22:25.000000000 +0100
-@@ -48,7 +48,7 @@ $(kdigest_OBJECTS): kdigest-commands.h
- CLEANFILES = kdigest-commands.h kdigest-commands.c
- 
- kdigest-commands.c kdigest-commands.h: kdigest-commands.in
--	$(SLC) $(srcdir)/kdigest-commands.in
-+	slc $(srcdir)/kdigest-commands.in
- 
- LDADD = \
- 	$(top_builddir)/lib/krb5/libkrb5.la \
diff --git a/package/heimdal/patches/patch-kuser_Makefile_in b/package/heimdal/patches/patch-kuser_Makefile_in
deleted file mode 100644
index 77c7206db..000000000
--- a/package/heimdal/patches/patch-kuser_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/kuser/Makefile.in	2008-07-28 14:05:30.000000000 +0200
-+++ heimdal-1.2.1/kuser/Makefile.in	2009-01-02 22:22:25.000000000 +0100
-@@ -1041,7 +1041,7 @@ distdir-in-tree: $(DISTFILES) $(INFO_DEP
- $(kdigest_OBJECTS): kdigest-commands.h
- 
- kdigest-commands.c kdigest-commands.h: kdigest-commands.in
--	$(SLC) $(srcdir)/kdigest-commands.in
-+	slc $(srcdir)/kdigest-commands.in
- 
- # make sure install-exec-hook doesn't have any commands in Makefile.am.common
- install-exec-hook:
diff --git a/package/heimdal/patches/patch-lib_asn1_Makefile_am b/package/heimdal/patches/patch-lib_asn1_Makefile_am
deleted file mode 100644
index 44ac46c5b..000000000
--- a/package/heimdal/patches/patch-lib_asn1_Makefile_am
+++ /dev/null
@@ -1,48 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/lib/asn1/Makefile.am	2008-07-28 14:04:43.000000000 +0200
-+++ heimdal-1.2.1/lib/asn1/Makefile.am	2009-01-02 22:22:25.000000000 +0100
-@@ -568,34 +568,34 @@ $(gen_files_cms) cms_asn1.h: cms_asn1_fi
- $(gen_files_test) test_asn1.h: test_asn1_files
- 
- rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1
--	./asn1_compile$(EXEEXT) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
- 
- cms_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/CMS.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/CMS.asn1 cms_asn1 || (rm -f cms_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/CMS.asn1 cms_asn1 || (rm -f cms_asn1_files ; exit 1)
- 
- krb5_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/k5.asn1
--	./asn1_compile$(EXEEXT) --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA --sequence=ETYPE-INFO --sequence=ETYPE-INFO2 $(srcdir)/k5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA --sequence=ETYPE-INFO --sequence=ETYPE-INFO2 $(srcdir)/k5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1)
- 
- pkinit_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1 pkinit_asn1 || (rm -f pkinit_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1 pkinit_asn1 || (rm -f pkinit_asn1_files ; exit 1)
- 
- pkcs8_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1 pkcs8_asn1 || (rm -f pkcs8_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1 pkcs8_asn1 || (rm -f pkcs8_asn1_files ; exit 1)
- 
- pkcs9_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1 pkcs9_asn1 || (rm -f pkcs9_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1 pkcs9_asn1 || (rm -f pkcs9_asn1_files ; exit 1)
- 
- pkcs12_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1 pkcs12_asn1 || (rm -f pkcs12_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1 pkcs12_asn1 || (rm -f pkcs12_asn1_files ; exit 1)
- 
- digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 digest_asn1 || (rm -f digest_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 digest_asn1 || (rm -f digest_asn1_files ; exit 1)
- 
- kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1)
- 
- test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1
--	./asn1_compile$(EXEEXT) --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1)
- 
- EXTRA_DIST =		\
- 	asn1_err.et	\
diff --git a/package/heimdal/patches/patch-lib_asn1_Makefile_in b/package/heimdal/patches/patch-lib_asn1_Makefile_in
deleted file mode 100644
index 07dc3af52..000000000
--- a/package/heimdal/patches/patch-lib_asn1_Makefile_in
+++ /dev/null
@@ -1,48 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/lib/asn1/Makefile.in	2008-07-28 14:05:30.000000000 +0200
-+++ heimdal-1.2.1/lib/asn1/Makefile.in	2009-01-02 22:22:25.000000000 +0100
-@@ -2239,34 +2239,34 @@ $(gen_files_cms) cms_asn1.h: cms_asn1_fi
- $(gen_files_test) test_asn1.h: test_asn1_files
- 
- rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1
--	./asn1_compile$(EXEEXT) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
- 
- cms_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/CMS.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/CMS.asn1 cms_asn1 || (rm -f cms_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/CMS.asn1 cms_asn1 || (rm -f cms_asn1_files ; exit 1)
- 
- krb5_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/k5.asn1
--	./asn1_compile$(EXEEXT) --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA --sequence=ETYPE-INFO --sequence=ETYPE-INFO2 $(srcdir)/k5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA --sequence=ETYPE-INFO --sequence=ETYPE-INFO2 $(srcdir)/k5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1)
- 
- pkinit_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1 pkinit_asn1 || (rm -f pkinit_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1 pkinit_asn1 || (rm -f pkinit_asn1_files ; exit 1)
- 
- pkcs8_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1 pkcs8_asn1 || (rm -f pkcs8_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1 pkcs8_asn1 || (rm -f pkcs8_asn1_files ; exit 1)
- 
- pkcs9_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1 pkcs9_asn1 || (rm -f pkcs9_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1 pkcs9_asn1 || (rm -f pkcs9_asn1_files ; exit 1)
- 
- pkcs12_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1 pkcs12_asn1 || (rm -f pkcs12_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1 pkcs12_asn1 || (rm -f pkcs12_asn1_files ; exit 1)
- 
- digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 digest_asn1 || (rm -f digest_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 digest_asn1 || (rm -f digest_asn1_files ; exit 1)
- 
- kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1
--	./asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1)
- 
- test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1
--	./asn1_compile$(EXEEXT) --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1)
-+	asn1_compile$(EXEEXT) --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1)
- 
- $(srcdir)/der-protos.h:
- 	cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -o der-protos.h $(dist_libasn1_la_SOURCES) || rm -f der-protos.h
diff --git a/package/heimdal/patches/patch-lib_gssapi_Makefile_am b/package/heimdal/patches/patch-lib_gssapi_Makefile_am
deleted file mode 100644
index 95c19a31d..000000000
--- a/package/heimdal/patches/patch-lib_gssapi_Makefile_am
+++ /dev/null
@@ -1,25 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/lib/gssapi/Makefile.am	2008-07-28 14:04:39.000000000 +0200
-+++ heimdal-1.2.1/lib/gssapi/Makefile.am	2009-01-02 22:22:25.000000000 +0100
-@@ -249,10 +249,10 @@ $(spnego_files) spnego_asn1.h: spnego_as
- $(gssapi_files) gssapi_asn1.h: gssapi_asn1_files
- 
- spnego_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/spnego/spnego.asn1
--	../asn1/asn1_compile$(EXEEXT) --sequence=MechTypeList $(srcdir)/spnego/spnego.asn1 spnego_asn1
-+	asn1_compile$(EXEEXT) --sequence=MechTypeList $(srcdir)/spnego/spnego.asn1 spnego_asn1
- 
- gssapi_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/mech/gssapi.asn1
--	../asn1/asn1_compile$(EXEEXT) $(srcdir)/mech/gssapi.asn1 gssapi_asn1
-+	asn1_compile$(EXEEXT) $(srcdir)/mech/gssapi.asn1 gssapi_asn1
- 
- $(srcdir)/krb5/gsskrb5-private.h:
- 	cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -p krb5/gsskrb5-private.h $(krb5src) || rm -f krb5/gsskrb5-private.h
-@@ -297,7 +297,7 @@ gss_LDADD = libgssapi.la \
- SLC = $(top_builddir)/lib/sl/slc
- 
- gss-commands.c gss-commands.h: gss-commands.in
--	$(SLC) $(srcdir)/gss-commands.in
-+	slc $(srcdir)/gss-commands.in
- 
- $(gss_OBJECTS): gss-commands.h
- 
diff --git a/package/heimdal/patches/patch-lib_gssapi_Makefile_in b/package/heimdal/patches/patch-lib_gssapi_Makefile_in
deleted file mode 100644
index 3ba5e1f92..000000000
--- a/package/heimdal/patches/patch-lib_gssapi_Makefile_in
+++ /dev/null
@@ -1,25 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/lib/gssapi/Makefile.in	2008-07-28 14:05:31.000000000 +0200
-+++ heimdal-1.2.1/lib/gssapi/Makefile.in	2009-01-02 22:22:25.000000000 +0100
-@@ -2254,10 +2254,10 @@ $(spnego_files) spnego_asn1.h: spnego_as
- $(gssapi_files) gssapi_asn1.h: gssapi_asn1_files
- 
- spnego_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/spnego/spnego.asn1
--	../asn1/asn1_compile$(EXEEXT) --sequence=MechTypeList $(srcdir)/spnego/spnego.asn1 spnego_asn1
-+	asn1_compile$(EXEEXT) --sequence=MechTypeList $(srcdir)/spnego/spnego.asn1 spnego_asn1
- 
- gssapi_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/mech/gssapi.asn1
--	../asn1/asn1_compile$(EXEEXT) $(srcdir)/mech/gssapi.asn1 gssapi_asn1
-+	asn1_compile$(EXEEXT) $(srcdir)/mech/gssapi.asn1 gssapi_asn1
- 
- $(srcdir)/krb5/gsskrb5-private.h:
- 	cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -p krb5/gsskrb5-private.h $(krb5src) || rm -f krb5/gsskrb5-private.h
-@@ -2266,7 +2266,7 @@ $(srcdir)/spnego/spnego-private.h:
- 	cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -p spnego/spnego-private.h $(spnegosrc) || rm -f spnego/spnego-private.h
- 
- gss-commands.c gss-commands.h: gss-commands.in
--	$(SLC) $(srcdir)/gss-commands.in
-+	slc $(srcdir)/gss-commands.in
- 
- $(gss_OBJECTS): gss-commands.h
- 
diff --git a/package/heimdal/patches/patch-lib_hdb_Makefile_am b/package/heimdal/patches/patch-lib_hdb_Makefile_am
deleted file mode 100644
index b18fafdf9..000000000
--- a/package/heimdal/patches/patch-lib_hdb_Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/lib/hdb/Makefile.am	2008-07-28 14:04:40.000000000 +0200
-+++ heimdal-1.2.1/lib/hdb/Makefile.am	2009-01-02 22:22:25.000000000 +0100
-@@ -98,7 +98,7 @@ $(srcdir)/hdb-private.h:
- $(gen_files_hdb) hdb_asn1.h: hdb_asn1_files
- 
- hdb_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/hdb.asn1
--	../asn1/asn1_compile$(EXEEXT) $(srcdir)/hdb.asn1 hdb_asn1
-+	asn1_compile$(EXEEXT) $(srcdir)/hdb.asn1 hdb_asn1
- 
- $(libhdb_la_OBJECTS): hdb_asn1.h hdb_err.h
- 
diff --git a/package/heimdal/patches/patch-lib_hdb_Makefile_in b/package/heimdal/patches/patch-lib_hdb_Makefile_in
deleted file mode 100644
index ea5a4a4a2..000000000
--- a/package/heimdal/patches/patch-lib_hdb_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/lib/hdb/Makefile.in	2008-07-28 14:05:31.000000000 +0200
-+++ heimdal-1.2.1/lib/hdb/Makefile.in	2009-01-02 22:22:25.000000000 +0100
-@@ -1015,7 +1015,7 @@ $(srcdir)/hdb-private.h:
- $(gen_files_hdb) hdb_asn1.h: hdb_asn1_files
- 
- hdb_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/hdb.asn1
--	../asn1/asn1_compile$(EXEEXT) $(srcdir)/hdb.asn1 hdb_asn1
-+	asn1_compile$(EXEEXT) $(srcdir)/hdb.asn1 hdb_asn1
- 
- $(libhdb_la_OBJECTS): hdb_asn1.h hdb_err.h
- 
diff --git a/package/heimdal/patches/patch-lib_hx509_Makefile_am b/package/heimdal/patches/patch-lib_hx509_Makefile_am
deleted file mode 100644
index 33643e14d..000000000
--- a/package/heimdal/patches/patch-lib_hx509_Makefile_am
+++ /dev/null
@@ -1,32 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/lib/hx509/Makefile.am	2008-07-28 14:04:48.000000000 +0200
-+++ heimdal-1.2.1/lib/hx509/Makefile.am	2009-01-02 22:22:25.000000000 +0100
-@@ -114,15 +114,15 @@ $(gen_files_ocsp) ocsp_asn1.h: ocsp_asn1
- $(gen_files_pkcs10) pkcs10_asn1.h: pkcs10_asn1_files
- $(gen_files_crmf) crmf_asn1.h: crmf_asn1_files
- 
--asn1_compile = ../asn1/asn1_compile$(EXEEXT)
-+asn1_compile = asn1_compile$(EXEEXT)
- 
--ocsp_asn1_files: $(asn1_compile) $(srcdir)/ocsp.asn1
-+ocsp_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/ocsp.asn1
- 	$(asn1_compile) --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData $(srcdir)/ocsp.asn1 ocsp_asn1 || (rm -f ocsp_asn1_files ; exit 1)
- 
--pkcs10_asn1_files: $(asn1_compile) $(srcdir)/pkcs10.asn1
-+pkcs10_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/pkcs10.asn1
- 	$(asn1_compile) --preserve-binary=CertificationRequestInfo $(srcdir)/pkcs10.asn1 pkcs10_asn1 || (rm -f pkcs10_asn1_files ; exit 1)
- 
--crmf_asn1_files: $(asn1_compile) $(srcdir)/crmf.asn1
-+crmf_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/crmf.asn1
- 	$(asn1_compile) $(srcdir)/crmf.asn1 crmf_asn1 || (rm -f crmf_asn1_files ; exit 1)
- 
- $(libhx509_la_OBJECTS): $(srcdir)/hx509-protos.h $(srcdir)/hx509-private.h $(srcdir)/hx_locl.h
-@@ -141,7 +141,7 @@ SLC = $(top_builddir)/lib/sl/slc
- bin_PROGRAMS = hxtool
- 
- hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC)
--	$(SLC) $(srcdir)/hxtool-commands.in
-+	slc $(srcdir)/hxtool-commands.in
- 
- dist_hxtool_SOURCES = hxtool.c
- nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h
diff --git a/package/heimdal/patches/patch-lib_hx509_Makefile_in b/package/heimdal/patches/patch-lib_hx509_Makefile_in
deleted file mode 100644
index 7cb6847e3..000000000
--- a/package/heimdal/patches/patch-lib_hx509_Makefile_in
+++ /dev/null
@@ -1,38 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heimdal-1.2.1.orig/lib/hx509/Makefile.in	2008-07-28 14:05:32.000000000 +0200
-+++ heimdal-1.2.1/lib/hx509/Makefile.in	2009-01-02 22:22:25.000000000 +0100
-@@ -527,7 +527,7 @@ libhx509_la_LIBADD = \
- 
- libhx509_la_CPPFLAGS = -I$(srcdir)/ref $(INCLUDE_hcrypto)
- nodist_libhx509_la_SOURCES = $(BUILT_SOURCES)
--asn1_compile = ../asn1/asn1_compile$(EXEEXT)
-+asn1_compile = asn1_compile$(EXEEXT)
- dist_include_HEADERS = hx509.h hx509-protos.h
- nodist_include_HEADERS = hx509_err.h
- SLC = $(top_builddir)/lib/sl/slc
-@@ -1781,13 +1781,13 @@ $(gen_files_ocsp) ocsp_asn1.h: ocsp_asn1
- $(gen_files_pkcs10) pkcs10_asn1.h: pkcs10_asn1_files
- $(gen_files_crmf) crmf_asn1.h: crmf_asn1_files
- 
--ocsp_asn1_files: $(asn1_compile) $(srcdir)/ocsp.asn1
-+ocsp_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/ocsp.asn1
- 	$(asn1_compile) --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData $(srcdir)/ocsp.asn1 ocsp_asn1 || (rm -f ocsp_asn1_files ; exit 1)
- 
--pkcs10_asn1_files: $(asn1_compile) $(srcdir)/pkcs10.asn1
-+pkcs10_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/pkcs10.asn1
- 	$(asn1_compile) --preserve-bin