get rid of heimdal, no updates in a year, no time to care for two krb5 implementations

package/heimdal/Config.in.backend

@@ -1,23 +0,0 @@
-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
-       select ADK_PACKAGE_LIBNCURSES
-       select ADK_PACKAGE_LIBCOM_ERR
-       select ADK_COMPILE_HEIMDAL
-       help
-         Use OpenLDAP as kerberos database backend.
-         (Useful for SSO setup)
-
-endchoice
-

package/heimdal/Makefile

@@ -1,156 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		heimdal
-PKG_VERSION:=		1.5.3
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		30b379e3de12f332fbd201131f02ffca
-PKG_DESCR:=		kerberos server
-PKG_SECTION:=		app/crypto
-PKG_BUILDDEP:=		openssl ncurses e2fsprogs readline heimdal-host
-PKG_DEPENDS:=		libheimdal libncurses libcom-err libreadline libopenssl
-PKG_URL:=		http://www.h5l.org/
-PKG_SITES:=		http://www.h5l.org/dist/src/
-PKG_NOPARALLEL:=	1
-PKG_LIBNAME:=		libheimdal
-PKG_OPTS:=		dev
-
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-PKG_SUBPKGS:=		HEIMDAL_SERVER LIBHEIMDAL
-PKGSD_LIBHEIMDAL:=	kerberos libraries
-PKGSC_LIBHEIMDAL:=	libs/crypto
-
-PKG_FLAVOURS_HEIMDAL_SERVER:=	WITH_PKINIT
-PKGFD_WITH_PKINIT:		Enable PK-INIT
-
-PKG_CHOICES_HEIMDAL_SERVER:=	WITH_LDAP WITH_BDB
-PKGCD_WITH_LDAP:=		use OpenLDAP as database backend
-PKGCS_WITH_LDAP:=		libopenldap
-PKGCB_WITH_LDAP:=		openldap
-PKGCD_WITH_BDB:=		use Berkeley DB as database backend
-PKGCS_WITH_BDB:=		libdb
-PKGCB_WITH_BDB:=		db
-
-include $(ADK_TOPDIR)/mk/host.mk
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call HOST_template,HEIMDAL,heimdal,$(PKG_VERSION)-${PKG_RELEASE}))
-$(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBHEIMDAL,libheimdal,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBHEIMDAL},${PKGSC_LIBHEIMDAL},${PKG_OPTS}))
-
-AUTOTOOL_STYLE:=	autoreconf
-TARGET_LDFLAGS+=	-ltinfo
-CONFIGURE_OPTS:=	--with-hdbdir=/etc/heimdal \
-			--disable-otp \
-			--disable-ndbm-db \
-			--libdir=/usr/lib/heimdal \
-			--libexecdir=/usr/sbin \
-			--includedir=/usr/include/heimdal \
-			--without-sqlite3 \
-			--without-libedit \
-			--disable-sqlite-cache \
-			--with-openssl=${STAGING_TARGET_DIR}/usr \
-			--with-readline=${STAGING_TARGET_DIR}/usr \
-			--with-ipv6 \
-			--sysconfdir=/etc/heimdal
-
-ifeq ($(ADK_PACKAGE_HEIMDAL_SERVER_WITH_BDB),y)
-CONFIGURE_ARGS+=	--with-berkeley-db
-else
-CONFIGURE_ARGS+=	--without-berkeley-db
-endif
-
-ifeq ($(ADK_PACKAGE_HEIMDAL_SERVER_WITH_LDAP),y)
-CONFIGURE_ARGS+=	--with-openldap=yes
-CONFIGURE_ARGS+=	--with-openldap-include=${STAGING_TARGET_DIR}/usr
-CONFIGURE_ARGS+=	--with-openldap-lib=${STAGING_TARGET_DIR}/usr
-else
-CONFIGURE_ARGS+=        --without-openldap
-endif
-
-ifeq ($(ADK_PACKAGE_HEIMDAL_SERVER_WITH_PKINIT),y)
-CONFIGURE_OPTS+=	--enable-pk-init
-else
-CONFIGURE_OPTS+=	--disable-pk-init \
-			--disable-kx509
-endif
-
-TARGET_CFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/et -pthread
-
-CONFIGURE_ARGS+=	${CONFIGURE_OPTS} --with-cross-tools=${STAGING_HOST_DIR}/usr/libexec/heimdal
-CONFIGURE_ENV+=		ac_cv_func_getaddrinfo_numserv=yes
-
-HOST_CONFIGURE_ARGS+=	--disable-pk-init \
-			--without-openldap \
-			--disable-kcm \
-			--disable-kx509 \
-			--disable-ndbm-db \
-			--without-berkeley-db \
-			--disable-sqlite-cache \
-			--disable-otp
-
-heimdal-server-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/heimdal
-	${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/sbin
-	${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libkdc.so* \
-		${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libkadm5srv.so* \
-		${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libhdb.so* \
-		${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
-	${INSTALL_DATA} ./files/{krb5.conf,kdc.conf,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/
-
-libheimdal-install:
-	${INSTALL_DIR} ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
-	${CP} ${WRKINST}/usr/lib/heimdal/libhx509.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-endif
-	${CP} ${WRKINST}/usr/lib/heimdal/libheimsqlite.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libheimbase.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libheimntlm.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libwind.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libgssapi.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libkafs.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libkrb5.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libasn1.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libroken.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${INSTALL_DIR} ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libsl.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libkadm5clnt.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/heimdal/files/heimdal-server.postinst

@@ -1,8 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf 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

package/heimdal/files/kadmind.acl

@@ -1 +0,0 @@
-#principal       [priv1,priv2,...]       [glob-pattern]

package/heimdal/files/kdc.conf

@@ -1,4 +0,0 @@
-[kdc]
-	acl_file = FILE:/etc/heimdal/kadmind.acl
-	detach = yes
-	enable-kerberos4 = false

package/heimdal/files/kdc.init

@@ -1,32 +0,0 @@
-#!/bin/sh
-#PKG heimdal-server
-#INIT 70
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
-	test x"${kdc:-NO}" = x"NO" && exit 0
-	test x"$kdc" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
-	exec sh $0 start
-	;;
-start)
-	/usr/sbin/kdc
-	/usr/sbin/kadmind &
-	/usr/sbin/kpasswdd &
-	;;
-stop)
-	kill $(pgrep -f /usr/sbin/kdc)
-	kill $(pgrep -f /usr/sbin/kadmind)
-	kill $(pgrep -f /usr/sbin/kpasswdd)
-	;;
-restart)
-	sh $0 stop
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start | stop | restart}"
-	exit 1
-	;;
-esac
-exit $?

package/heimdal/files/krb5.conf

@@ -1,25 +0,0 @@
-[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
-

package/heimdal/patches/patch-cf_check-compile-et_m4

@@ -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)

package/heimdal/patches/patch-lib_com_err_Makefile_am

@@ -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
- 

package/heimdal/patches/patch-lib_roken_roken_h_in

@@ -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

package/heimdal/src/cf/roken-h-process.pl

@@ -1,184 +0,0 @@
-#!/usr/bin/perl
-
-require 'getopts.pl';
-
-my $debug = 0;
-
-Getopts('dc:p:o:') || die "foo";
-
-if ($opt_d) {
-    $debug = 1;
-}
-
-die "missing arg" if (!defined $opt_c || !defined $opt_p || !defined $opt_o);
-
-my %defines;
-my $IN;
-my $OUT;
-
-print "parse config.h\n" if ($debug);
-
-open IN, $opt_c || die "failed open ${opt_c}";
-
-my @nesting;
-
-push @nesting, 1;
-
-while (<IN>) {
-    if (m/\s*#ifdef\s+(.*)/) {
-	my $var = $1;
-	if (defined $defines{$var}) {
-	    push @nesting, 1;
-	} else {
-	    push @nesting, 0;
-	}
-	next;
-    } elsif (m/\s*#ifndef\s+(.*)/) {
-	my $var = $1;
-	if (defined $defines{$var}) {
-	    push @nesting, 0;
-	} else {
-	    push @nesting, 1;
-	}
-	next;
-    } elsif (m/\s*#else/) {
-	my $var = pop @nesting;
-	$var = !$var;
-	push @nesting, $var;
-	next;
-    } elsif ($nesting[$#nesting] and m/\s*#define\s+(\w+)\s+(\S+)/) {
-	my $res = $2;
-	$res = 1 if (!defined $res);
-	$defines{$1} = $res;
-    }
-}
-
-close IN;
-
-if ($debug) {
-    foreach my $i (keys %defines) {
-	print "k: $i v: $defines{$i}\n";
-    }
-}
-
-open IN, "$opt_p" || die "failed open ${opt_p}";
-open OUT, ">$opt_o" || die "failed open ${opt_o}";
-
-print "parse roken.h.in\n" if ($debug);
-
-print OUT "/* This is an OS dependent, generated file */\n";
-print OUT "\n";
-print OUT "\n";
-print OUT "#ifndef __ROKEN_H__\n";
-print OUT "#define __ROKEN_H__\n";
-print OUT "\n";
-
-@nesting = (1);
-
-while (<IN>) {
-    if (m/\s*#ifdef\s+(.*)/) {
-	my $var = $1;
-	if (defined $defines{$var}) {
-	    push @nesting, 1;
-	} else {
-	    push @nesting, 0;
-	}
-	next;
-    } elsif (m/\s*#ifndef\s+(.*)/) {
-	my $var = $1;
-	if (defined $defines{$var}) {
-	    push @nesting, 0;
-	} else {
-	    push @nesting, 1;
-	}
-	next;
-    } elsif (m/\s*#if\s+(.*)/) {
-	my $res = parse_if($1);
-	print "line = $res: $1\n" if ($debug);
-	push @nesting, $res;
-	next;
-    } elsif (m/\s*#elif\s+(.*)/) {
-	my $res = pop @nesting;
-	if ($res gt 0) {
-	    $res = -1;
-	} else {
-	    my $res = parse_if($1);
-	}
-	push @nesting, $res;
-	next;
-    } elsif (m/\s*#else/) {
-	my $var = pop @nesting;
-	$var = !$var;
-	push @nesting, $var;
-	next;
-    } elsif (m/\s*#endif/) {
-	pop @nesting;
-	next;
-    }
-    print "line: $_\n"  if ($debug);
-    print "nesting dep $#{nesting}\n"  if ($debug);
-    my $i = 0, $t = 1;
-    while ($i le $#nesting) {
-	$t = 0 if ($nesting[$i] le 0);
-	print "nesting $i val $nesting[$i] -> $t\n" if ($debug);
-	$i++;
-    }
-    if ($t) {
-	print OUT;
-    }
-}
-
-print OUT "\n";
-print OUT "#endif /* __ROKEN_H__ */\n";
-
-
-close IN;
-
-exit 0;
-
-sub parse_if
-{
-    my ($neg, $var);
-
-    $_ = shift;
-
-    if (m/^\s*$/) {
-	print "end $_\n" if ($debug);
-	return 1;
-    } elsif (m/^\(([^&]+)\&\&(.*)$/) {
-        print "$1 and $2\n" if ($debug);
-        return parse_if($1) and parse_if($2);
-    } elsif (m/^([^&]+)\&\&(.*)$/) {
-	print "$1 and $2\n" if ($debug);
-	return parse_if($1) and parse_if($2);
-    } elsif (m/^([^\|]+)\|\|(.*)$/) {
-	print "$1 or $2\n" if ($debug);
-	return parse_if($1) or parse_if($2);
-    } elsif (m/^\s*(\!)?\s*defined\((\w+)\)/) {
-	($neg, $var) = ($1, $2);
-	print "def: ${neg}-defined(${var})\n" if ($debug);
-	my $res = defined $defines{$var};
-	if ($neg eq "!") {
-	    if ($res) {
-		$res = 0;
-	    } else {
-		$res = 1;
-	    }
-	}
-	print "res: $res\n" if ($debug);
-	return $res;
-    } elsif (m/^\s*(\!)?(\w+)/) {
-	($neg, $var) = ($1, $2);
-	print "var: $neg $var\n" if ($debug);
-	my $res;
-	if (defined $defines{$var}) {
-	    $res = $defines{$var};
-	} else {
-	    $res = 0;
-	}
-	$res = ! $res if ($neg =~ m/!/);
-	print "res: $res\n" if ($debug);
-	return $res;
-    }
-    die "failed parse: $_\n";
-}

package/openssh/Makefile

@@ -30,14 +30,11 @@ PKGSN_OPENSSH_SFTP_CLIENT:=	openssh
 PKGSD_OPENSSH_SFTP_SERVER:=	sftp server
 PKGSN_OPENSSH_SFTP_SERVER:=	openssh
 
-PKG_CHOICES_OPENSSH:=	NOKRB WITH_KRB5 WITH_HEIMDAL
+PKG_CHOICES_OPENSSH:=	NOKRB WITH_KRB5
 PKGCD_NOKRB:=		no Kerberos support
 PKGCD_WITH_KRB5:=	with MIT Kerberos
 PKGCS_WITH_KRB5:=	libkrb5 libcom-err
 PKGCB_WITH_KRB5:=	krb5
-PKGCD_WITH_HEIMDAL:=	with Heimdal Kerberos
-PKGCS_WITH_HEIMDAL:=	libheimdal libcom-err
-PKGCB_WITH_HEIMDAL:=	heimdal
 
 include ${ADK_TOPDIR}/mk/package.mk
 
@@ -51,10 +48,6 @@ $(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION
 ifeq ($(ADK_PACKAGE_OPENSSH_WITH_KRB5),y)
 CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_TARGET_DIR}/usr"
 endif
-ifeq ($(ADK_PACKAGE_OPENSSH_WITH_HEIMDAL),y)
-CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_TARGET_DIR}/usr"
-TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal
-endif
 
 ifeq ($(ADK_TARGET_USE_SSP),y)
 CONFIGURE_ARGS+=	--with-stackprotect