Initial import

42 files changed, 916 insertions, 0 deletions

diff --git a/package/heimdal/Config.in b/package/heimdal/Config.in
new file mode 100644
index 000000000..449d4c5f3
--- /dev/null
+++ b/package/heimdal/Config.in
@@ -0,0 +1,63 @@
+config ADK_COMPILE_HEIMDAL
+	prompt "heimdal........................... Heimdal kerberos software"
+	bool
+	default n
+
+config ADK_COMPILE_HEIMDAL_WITH_PKINIT
+	prompt "Enable PK-INIT"
+	bool
+	depends on ADK_COMPILE_HEIMDAL
+	default n
+
+config ADK_PACKAGE_HEIMDAL_SERVER
+	prompt "heimdal-server.................... heimdal kerberos server"
+	tristate
+	depends on ADK_COMPILE_HEIMDAL
+	select ADK_PACKAGE_LIBPTHREAD
+	select ADK_PACKAGE_LIBOPENSSL
+	select ADK_PACKAGE_LIBNCURSES
+	select ADK_PACKAGE_HEIMDAL_LIBS
+	select ADK_PACKAGE_HEIMDAL_CLIENT_LIBS
+	default n
+	help
+	  http://www.h5l.org
+
+choice
+prompt "Database backend"
+depends on ADK_PACKAGE_HEIMDAL_SERVER
+default ADK_COMPILE_HEIMDAL_WITH_DB_BDB
+
+config ADK_COMPILE_HEIMDAL_WITH_DB_BDB
+	bool "Berkeley DB backend"
+	select ADK_PACKAGE_LIBDB
+	help
+	  Use Oracle Berkeley DB as kerberos database backend.
+
+config ADK_COMPILE_HEIMDAL_WITH_DB_LDAP
+	bool "LDAP backend"
+	select ADK_PACKAGE_LIBOPENLDAP
+	help
+	  Use OpenLDAP as kerberos database backend.
+	  (Useful for SSO setup)
+
+endchoice
+
+config ADK_PACKAGE_HEIMDAL_LIBS
+	prompt "heimdal-libs...................... heimdal kerberos libraries"
+	tristate
+	depends on ADK_COMPILE_HEIMDAL
+	select ADK_PACKAGE_LIBPTHREAD
+	select ADK_PACKAGE_LIBOPENSSL
+	default n
+	help
+	  http://www.h5l.org
+
+config ADK_PACKAGE_HEIMDAL_CLIENT_LIBS
+	prompt "heimdal-client-libs............... heimdal kerberos client libraries"
+	tristate
+	depends on ADK_COMPILE_HEIMDAL
+	select ADK_PACKAGE_LIBPTHREAD
+	select ADK_PACKAGE_LIBOPENSSL
+	default n
+	help
+	  http://www.h5l.org
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
new file mode 100644
index 000000000..40a750fc9
--- /dev/null
+++ b/package/heimdal/Makefile
@@ -0,0 +1,126 @@
+# $Id$
+#-
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		heimdal
+PKG_VERSION:=		1.2.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		6e5028077e2a6b101a4a72801ba71b9e
+MASTER_SITES:=		http://www.h5l.org/dist/src/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,HEIMDAL_LIBS,heimdal-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,HEIMDAL_CLIENT_LIBS,heimdal-client-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+PKG_DEPENDS:=		heimdal-libs, heimdal-client-libs, libncurses, 
+
+CONFIGURE_OPTS:=	--with-hdbdir=/etc/heimdal \
+			--disable-otp \
+			--disable-ndbm-db \
+			--libexecdir=/usr/sbin \
+			--sysconfdir=/etc/heimdal
+
+ifeq ($(ADK_IPV6),y)
+CONFIGURE_OPTS+=	--with-ipv6
+else
+CONFIGURE_OPTS+=	--without-ipv6
+endif
+
+ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_BDB),y)
+CONFIGURE_ARGS+=	--enable-berkeley-db
+PKG_DEPENDS+=		libdb
+else
+CONFIGURE_ARGS+=        --disable-berkeley-db
+endif
+
+ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_LDAP),y)
+CONFIGURE_ARGS+=	--with-openldap=yes
+CONFIGURE_ARGS+=	--with-openldap-include=${STAGING_DIR}/usr
+CONFIGURE_ARGS+=	--with-openldap-lib=${STAGING_DIR}/usr
+PKG_DEPENDS+=		libopenldap
+else
+CONFIGURE_ARGS+=        --without-openldap
+endif
+
+ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
+CONFIGURE_OPTS+=	--enable-pk-init
+else
+CONFIGURE_OPTS+=	--disable-pk-init
+endif
+
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	${CONFIGURE_OPTS}
+CONFIGURE_ENV+=		ac_cv_func_getaddrinfo_numserv=yes
+BUILD_STYLE=		auto
+INSTALL_STYLE=		auto confprog
+
+pre-configure:
+	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
+		CFLAGS="-static" \
+		./configure ${CONFIGURE_OPTS} \
+	);
+	${MAKE} -C ${WRKBUILD}/lib/roken
+	${MAKE} -C ${WRKBUILD}/lib/vers
+	${MAKE} -C ${WRKBUILD}/lib/editline
+	${MAKE} -C ${WRKBUILD}/lib/com_err compile_et
+	${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile
+	${MAKE} -C ${WRKBUILD}/lib/sl slc
+	${INSTALL_BIN} ${WRKBUILD}/lib/com_err/compile_et \
+		${STAGING_TOOLS}/bin
+	${INSTALL_BIN} ${WRKBUILD}/lib/asn1/asn1_compile \
+		${STAGING_TOOLS}/bin
+	${INSTALL_BIN} ${WRKBUILD}/lib/sl/slc \
+		${STAGING_TOOLS}/bin
+	${MAKE} -C ${WRKBUILD}/lib/com_err clean
+	${MAKE} -C ${WRKBUILD} clean
+
+post-install:
+ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
+	${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/openldap/schema
+	${INSTALL_DATA} ${WRKBUILD}/lib/hdb/hdb.schema \
+		${IDIR_HEIMDAL_SERVER}/etc/openldap/schema
+endif
+	${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/init.d
+	${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/heimdal
+	${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/sbin
+	${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libkdc.so* ${IDIR_HEIMDAL_SERVER}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libkadm5srv.so* ${IDIR_HEIMDAL_SERVER}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libhdb.so* ${IDIR_HEIMDAL_SERVER}/usr/lib
+	${INSTALL_DATA} ./files/krb5.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal
+	${INSTALL_DATA} ./files/heimdal.init \
+		${IDIR_HEIMDAL_SERVER}/etc/init.d/heimdal
+	${INSTALL_DATA} ./files/kdc.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal
+	${INSTALL_DATA} ./files/kadmind.acl ${IDIR_HEIMDAL_SERVER}/etc/heimdal
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/kdc ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmind ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/kpasswdd ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/kstash ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/ktutil ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmin ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	# heimdal libs
+	${INSTALL_DIR} ${IDIR_HEIMDAL_LIBS}/usr/lib
+ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
+	${CP} ${WRKINST}/usr/lib/libhx509.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+endif
+	${CP} ${WRKINST}/usr/lib/libheimntlm.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libwind.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgssapi.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libkafs.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libkrb5.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libcom_err.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libasn1.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libroken.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+	# heimdal client libs
+	${INSTALL_DIR} ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libeditline.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libsl.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libkadm5clnt.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
+	echo 'Depends: ${PKG_DEPENDS}' >> ${IDIR_HEIMDAL_SERVER}/CONTROL/control
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/heimdal/files/heimdal.init b/package/heimdal/files/heimdal.init
new file mode 100644
index 000000000..fad5a7818
--- /dev/null
+++ b/package/heimdal/files/heimdal.init
@@ -0,0 +1,30 @@
+#!/bin/sh
+#FWINIT 70
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${kdc:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	/usr/sbin/kdc
+	/usr/sbin/kadmind &
+	/usr/sbin/kpasswdd &
+	;;
+stop)
+	killall kdc
+	killall kadmind
+	killall kpasswdd
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/package/heimdal/files/kadmind.acl b/package/heimdal/files/kadmind.acl
new file mode 100644
index 000000000..e5da87fb5
--- /dev/null
+++ b/package/heimdal/files/kadmind.acl
@@ -0,0 +1 @@
+#principal       [priv1,priv2,...]       [glob-pattern]
diff --git a/package/heimdal/files/kdc.conf b/package/heimdal/files/kdc.conf
new file mode 100644
index 000000000..1adcb022e
--- /dev/null
+++ b/package/heimdal/files/kdc.conf
@@ -0,0 +1,4 @@
+[kdc]
+	acl_file = FILE:/etc/heimdal/kadmind.acl
+	detach = yes
+	enable-kerberos4 = false
diff --git a/package/heimdal/files/krb5.conf b/package/heimdal/files/krb5.conf
new file mode 100644
index 000000000..927ba24dc
--- /dev/null
+++ b/package/heimdal/files/krb5.conf
@@ -0,0 +1,25 @@
+[libdefaults]
+        default_realm = MY.REALM
+	clockskew = 300
+	
+[realms]
+	MY.REALM = {
+		kdc = my.hostname
+	}
+
+[domain_realm]
+	.my.domain = MY.REALM
+
+[kdc]
+        database = {
+                realm = MY.REALM
+                dbname = db:/etc/heimdal/krb5db
+		mkey_file = /etc/heimdal/m-key
+		acl_file = /etc/heimdal/kadmind.acl
+		log_file = /var/log/krb5db.log
+        }
+
+[logging]
+        kdc = SYSLOG:INFO
+        default = SYSLOG:INFO
+
diff --git a/package/heimdal/ipkg/heimdal-client-libs.control b/package/heimdal/ipkg/heimdal-client-libs.control
new file mode 100644
index 000000000..550a6bb16
--- /dev/null
+++ b/package/heimdal/ipkg/heimdal-client-libs.control
@@ -0,0 +1,5 @@
+Package: heimdal-client-libs
+Priority: optional
+Section: net
+Depends: libopenssl, libpthread
+Description: heimdal kerberos client tool libraries
diff --git a/package/heimdal/ipkg/heimdal-libs.control b/package/heimdal/ipkg/heimdal-libs.control
new file mode 100644
index 000000000..5a1612530
--- /dev/null
+++ b/package/heimdal/ipkg/heimdal-libs.control
@@ -0,0 +1,5 @@
+Package: heimdal-libs
+Priority: optional
+Section: net
+Depends: libopenssl, libpthread
+Description: heimdal kerberos libraries
diff --git a/package/heimdal/ipkg/heimdal-server.control b/package/heimdal/ipkg/heimdal-server.control
new file mode 100644
index 000000000..81c33a95a
--- /dev/null
+++ b/package/heimdal/ipkg/heimdal-server.control
@@ -0,0 +1,4 @@
+Package: heimdal-server
+Priority: optional
+Section: net
+Description: heimdal kerberos server
diff --git a/package/heimdal/ipkg/heimdal-server.postinst b/package/heimdal/ipkg/heimdal-server.postinst
new file mode 100644
index 000000000..401d7bfd8
--- /dev/null
+++ b/package/heimdal/ipkg/heimdal-server.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf "heimdal kdc" kdc NO
+add_service kerberos 88/tcp
+add_service kerberos 88/udp
+add_service kerberos-adm 749/tcp
+add_service kpasswd 464/tcp
+add_service kpasswd 464/udp
diff --git a/package/heimdal/patches/patch-Makefile_am b/package/heimdal/patches/patch-Makefile_am
new file mode 100644
index 000000000..a943323e0
--- /dev/null
+++ b/package/heimdal/patches/patch-Makefile_am
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 000000000..55a532f8b
--- /dev/null
+++ b/package/heimdal/patches/patch-Makefile_in
@@ -0,0 +1,25 @@
+$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
new file mode 100644
index 000000000..ca557d203
--- /dev/null
+++ b/package/heimdal/patches/patch-admin_Makefile_am
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 000000000..5baf7e5e5
--- /dev/null
+++ b/package/heimdal/patches/patch-admin_Makefile_in
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 000000000..d92f7cdbc
--- /dev/null
+++ b/package/heimdal/patches/patch-configure
@@ -0,0 +1,13 @@
+$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-01-04 18:24:14.421500455 +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
diff --git a/package/heimdal/patches/patch-include_Makefile_am b/package/heimdal/patches/patch-include_Makefile_am
new file mode 100644
index 000000000..9ad949c73
--- /dev/null
+++ b/package/heimdal/patches/patch-include_Makefile_am
@@ -0,0 +1,22 @@
+$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
new file mode 100644
index 000000000..d3f0667c3
--- /dev/null
+++ b/package/heimdal/patches/patch-include_Makefile_in
@@ -0,0 +1,39 @@
+$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
new file mode 100644
index 000000000..6bcfe8483
--- /dev/null
+++ b/package/heimdal/patches/patch-kadmin_Makefile_am
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 000000000..c989c1b11
--- /dev/null
+++ b/package/heimdal/patches/patch-kadmin_Makefile_in
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 000000000..b0c288404
--- /dev/null
+++ b/package/heimdal/patches/patch-kadmin_kadm_conn_c
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 000000000..d3518d651
--- /dev/null
+++ b/package/heimdal/patches/patch-kdc_kx509_c
@@ -0,0 +1,18 @@
+$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
new file mode 100644
index 000000000..b44d6e636
--- /dev/null
+++ b/package/heimdal/patches/patch-kdc_process_c
@@ -0,0 +1,26 @@
+$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
new file mode 100644
index 000000000..665c3554f
--- /dev/null
+++ b/package/heimdal/patches/patch-kuser_Makefile_am
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 000000000..77c7206db
--- /dev/null
+++ b/package/heimdal/patches/patch-kuser_Makefile_in
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 000000000..44ac46c5b
--- /dev/null
+++ b/package/heimdal/patches/patch-lib_asn1_Makefile_am
@@ -0,0 +1,48 @@
+$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)/C