heimdal: update to 1.5.2. refs #961

20 files changed, 123 insertions, 460 deletions

diff --git a/abs/core/heimdal/001_all_heimdal-no_libedit.patch b/abs/core/heimdal/001_all_heimdal-no_libedit.patch
deleted file mode 100644
index a551bdc..0000000
--- a/abs/core/heimdal/001_all_heimdal-no_libedit.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cf/krb-readline.m4	2005-06-16 18:28:32.000000000 +0200
-+++ cf/krb-readline.m4	2005-06-27 23:17:06.000000000 +0200
-@@ -6,7 +6,6 @@
- dnl el_init
- 
- AC_DEFUN([KRB_READLINE],[
--AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
- if test "$ac_cv_func_el_init" = yes ; then
- 	AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
- 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
diff --git a/abs/core/heimdal/002_all_heimal-fPIC.patch b/abs/core/heimdal/002_all_heimal-fPIC.patch
deleted file mode 100644
index c67dbae..0000000
--- a/abs/core/heimdal/002_all_heimal-fPIC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/editline/Makefile.am	2005-06-16 18:28:44.000000000 +0200
-+++ lib/editline/Makefile.am	2005-06-27 23:21:02.000000000 +0200
-@@ -41,6 +41,9 @@
- 
- EXTRA_DIST = $(man_MANS)
- 
-+$(libeditline_la_OBJECTS): %.lo: %.c
-+	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
- snprintf.c:
- 	$(LN_S) $(srcdir)/../roken/snprintf.c .
- strdup.c:
diff --git a/abs/core/heimdal/002_all_heimdal-no_libedit.patch b/abs/core/heimdal/002_all_heimdal-no_libedit.patch
deleted file mode 100644
index 7806597..0000000
--- a/abs/core/heimdal/002_all_heimdal-no_libedit.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cf/krb-readline.m4	2004-09-15 13:24:15.000000000 +0000
-+++ cf/krb-readline.m4	2004-09-17 16:11:39.610756024 +0000
-@@ -6,7 +6,6 @@
- dnl el_init
- 
- AC_DEFUN([KRB_READLINE],[
--AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
- if test "$ac_cv_func_el_init" = yes ; then
- 	AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
- 		AC_TRY_COMPILE([#include <stdio.h>
diff --git a/abs/core/heimdal/003_all_heimdal-fPIC.patch b/abs/core/heimdal/003_all_heimdal-fPIC.patch
deleted file mode 100644
index ee01e34..0000000
--- a/abs/core/heimdal/003_all_heimdal-fPIC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/editline/Makefile.am	2004-05-10 09:27:21.442490749 +0000
-+++ lib/editline/Makefile.am	2004-05-10 09:27:38.876209101 +0000
-@@ -47,6 +47,9 @@
- 
- EXTRA_DIST = $(man_MANS)
- 
-+$(libeditline_la_OBJECTS): %.lo: %.c
-+	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
- snprintf.c:
- 	$(LN_S) $(srcdir)/../roken/snprintf.c .
- strdup.c:
diff --git a/abs/core/heimdal/003_all_heimdal-rxapps.patch b/abs/core/heimdal/003_all_heimdal-rxapps.patch
deleted file mode 100644
index 40fc05f..0000000
--- a/abs/core/heimdal/003_all_heimdal-rxapps.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- appl/kx/rxtelnet.in	2005-06-16 18:29:10.000000000 +0200
-+++ appl/kx/rxtelnet.in	2005-06-27 23:21:34.000000000 +0200
-@@ -2,7 +2,7 @@
- # $Id: rxtelnet.in,v 1.31 2004/03/07 17:22:06 lha Exp $
- #
- usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
--binary=telnet
-+binary=ktelnet
- term=
- kx_args=-P
- while true
---- appl/kx/rxterm.in	2005-06-16 18:29:10.000000000 +0200
-+++ appl/kx/rxterm.in	2005-06-27 23:21:55.000000000 +0200
-@@ -2,7 +2,7 @@
- # $Id: rxterm.in,v 1.23 2002/03/18 17:37:34 joda Exp $
- #
- usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
--binary=rsh
-+binary=krsh
- term=xterm
- while true
- do
diff --git a/abs/core/heimdal/004_all_heimdal-rxapps.patch b/abs/core/heimdal/004_all_heimdal-rxapps.patch
deleted file mode 100644
index d6142a7..0000000
--- a/abs/core/heimdal/004_all_heimdal-rxapps.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- appl/kx/rxterm.in	2004-02-21 21:49:23.893934354 +0000
-+++ appl/kx/rxterm.in	2004-02-21 21:49:34.617299076 +0000
-@@ -2,6 +2,6 @@
- #
- usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
--binary=rsh
-+binary=krsh
- term=xterm
- while true
- do
---- appl/kx/rxtelnet.in	2005-06-16 16:29:10.000000000 +0000
-+++ appl/kx/rxtelnet.in	2005-07-11 20:33:10.000000000 +0000
-@@ -2,7 +2,7 @@
- #
- usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
--binary=telnet
-+binary=ktelnet
- term=
- kx_args=-P
diff --git a/abs/core/heimdal/005_all_heimdal-suid_fix.patch b/abs/core/heimdal/005_all_heimdal-suid_fix.patch
deleted file mode 100644
index 35a9ed9..0000000
--- a/abs/core/heimdal/005_all_heimdal-suid_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- appl/su/Makefile.am	2005-06-16 18:27:46.000000000 +0200
-+++ appl/su/Makefile.am	2005-06-27 23:25:21.000000000 +0200
-@@ -7,6 +7,7 @@
- bin_PROGRAMS = su
- bin_SUIDS = su
- su_SOURCES = su.c supaths.h
-+su_LDFLAGS = -Wl,-z,now
- man_MANS = su.1
- 
- LDADD = $(LIB_kafs) \
---- appl/otp/Makefile.am	2005-06-16 18:28:46.000000000 +0200
-+++ appl/otp/Makefile.am	2005-06-27 23:25:40.000000000 +0200
-@@ -8,6 +8,7 @@
- bin_SUIDS = otp
- otp_SOURCES = otp.c otp_locl.h
- otpprint_SOURCES = otpprint.c otp_locl.h
-+otp_LDFLAGS = -Wl,-z,now
- 
- man_MANS = otp.1  otpprint.1
- 
diff --git a/abs/core/heimdal/006_all_heimdal-suid_fix.patch b/abs/core/heimdal/006_all_heimdal-suid_fix.patch
deleted file mode 100644
index 0f7d281..0000000
--- a/abs/core/heimdal/006_all_heimdal-suid_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- appl/otp/Makefile.am	2004-09-17 22:22:54.046301075 +0000
-+++ appl/otp/Makefile.am	2004-09-17 22:23:15.293145945 +0000
-@@ -8,6 +8,7 @@
- bin_SUIDS = otp
- otp_SOURCES = otp.c otp_locl.h
- otpprint_SOURCES = otpprint.c otp_locl.h
-+otp_LDFLAGS = -Wl,-z,now
- 
- man_MANS = otp.1  otpprint.1
- 
---- appl/su/Makefile.am	2005-06-16 16:27:46.000000000 +0000
-+++ appl/su/Makefile.am	2005-07-11 20:34:21.000000000 +0000
-@@ -7,6 +7,7 @@
- bin_PROGRAMS = su
- bin_SUIDS = su
- su_SOURCES = su.c
-+su_LDFLAGS = -Wl,-z,now
- man_MANS = su.1
- 
- LDADD = $(LIB_kafs) \
diff --git a/abs/core/heimdal/010_all_heimdal-system-libss.patch b/abs/core/heimdal/010_all_heimdal-system-libss.patch
deleted file mode 100644
index 5cd4d9d..0000000
--- a/abs/core/heimdal/010_all_heimdal-system-libss.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- lib/sl/Makefile.am~	2007-06-01 09:48:09.000000000 +0200
-+++ lib/sl/Makefile.am	2007-06-01 09:49:30.000000000 +0200
-@@ -12,36 +12,24 @@
- 
- include_HEADERS = sl.h
- 
--lib_LTLIBRARIES = libsl.la libss.la
-+lib_LTLIBRARIES = libsl.la
- libsl_la_LDFLAGS = -version-info 2:0:2
--libss_la_LDFLAGS = -version-info 1:5:1
- 
- libsl_la_LIBADD = @LIB_readline@
--libss_la_LIBADD = @LIB_readline@ @LIB_com_err@
- 
- libsl_la_SOURCES = sl_locl.h sl.c $(ES)
--libss_la_SOURCES = $(libsl_la_SOURCES) ss.c ss.h
- 
- TESTS = test_sl
- check_PROGRAMS = $(TESTS)	
- 
- # install these?
- 
--bin_PROGRAMS = mk_cmds
- noinst_PROGRAMS = slc
- 
--mk_cmds_SOURCES = make_cmds.c make_cmds.h parse.y lex.l
--mk_cmds_LDADD = libsl.la $(LDADD)
--
- slc_SOURCES = slc-gram.y slc-lex.l slc.h
- 
--ssincludedir = $(includedir)/ss
--ssinclude_HEADERS = ss.h
--
- CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c strdup.c strupr.c getprogname.c
- 
--$(mk_cmds_OBJECTS): parse.h parse.c
--
- LDADD =						\
- 	libsl.la				\
- 	$(LIB_roken)				\
diff --git a/abs/core/heimdal/012_all_heimdal-berkdb.patch b/abs/core/heimdal/012_all_heimdal-berkdb.patch
deleted file mode 100644
index 46762c2..0000000
--- a/abs/core/heimdal/012_all_heimdal-berkdb.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Binary files heimdal-0.7-old/cf/.find-func-no-libs2.m4.swp and heimdal-0.7/cf/.find-func-no-libs2.m4.swp differ
-Index: heimdal/cf/db.m4
-===================================================================
---- heimdal.orig/cf/db.m4
-+++ heimdal/cf/db.m4
-@@ -18,24 +18,13 @@ db_type=unknown
- 
- if test "$enable_berkeley_db" != no; then
- 
--  AC_CHECK_HEADERS([				\
--	db4/db.h				\
--	db3/db.h				\
--	db.h					\
--	db_185.h				\
--  ])
-+  AC_CHECK_HEADERS([db.h])
- 
- dnl db_create is used by db3 and db4
- 
--  AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [
-+  AC_FIND_FUNC_NO_LIBS(db_create, db, [
-   #include <stdio.h>
--  #ifdef HAVE_DB4_DB_H
--  #include <db4/db.h>
--  #elif defined(HAVE_DB3_DB_H)
--  #include <db3/db.h>
--  #else
-   #include <db.h>
--  #endif
-   ],[NULL, NULL, 0])
- 
-   if test "$ac_cv_func_db_create" = "yes"; then
-@@ -50,17 +39,9 @@ dnl db_create is used by db3 and db4
- 
- dnl dbopen is used by db1/db2
- 
--    AC_FIND_FUNC_NO_LIBS(dbopen, db2 db, [
-+    AC_FIND_FUNC_NO_LIBS(dbopen, db, [
-     #include <stdio.h>
--    #if defined(HAVE_DB2_DB_H)
--    #include <db2/db.h>
--    #elif defined(HAVE_DB_185_H)
--    #include <db_185.h>
--    #elif defined(HAVE_DB_H)
-     #include <db.h>
--    #else
--    #error no db.h
--    #endif
-     ],[NULL, 0, 0, 0, NULL])
- 
-     if test "$ac_cv_func_dbopen" = "yes"; then
-Index: heimdal/lib/hdb/db.c
-===================================================================
---- heimdal.orig/lib/hdb/db.c
-+++ heimdal/lib/hdb/db.c
-@@ -37,11 +37,7 @@ RCSID("$Id: db.c 20215 2007-02-09 21:59:
- 
- #if HAVE_DB1
- 
--#if defined(HAVE_DB_185_H)
--#include <db_185.h>
--#elif defined(HAVE_DB_H)
- #include <db.h>
--#endif
- 
- static krb5_error_code
- DB_close(krb5_context context, HDB *db)
-Index: heimdal/lib/hdb/db3.c
-===================================================================
---- heimdal.orig/lib/hdb/db3.c
-+++ heimdal/lib/hdb/db3.c
-@@ -37,13 +37,7 @@ RCSID("$Id: db3.c 21610 2007-07-17 07:10
- 
- #if HAVE_DB3
- 
--#ifdef HAVE_DB4_DB_H
--#include <db4/db.h>
--#elif defined(HAVE_DB3_DB_H)
--#include <db3/db.h>
--#else
- #include <db.h>
--#endif
- 
- static krb5_error_code
- DB_close(krb5_context context, HDB *db)
-Index: heimdal/lib/roken/getcap.c
-===================================================================
---- heimdal.orig/lib/roken/getcap.c
-+++ heimdal/lib/roken/getcap.c
-@@ -38,11 +38,13 @@
- #include "roken.h"
- RCSID("$Id: getcap.c 16561 2006-01-13 14:25:32Z lha $");
- 
-+#if defined(HAVE_DBOPEN) && defined(HAVE_DB_H)
-+#define USE_DB
-+#endif
-+
- #include <sys/types.h>
- #include <ctype.h>
--#if defined(HAVE_DB_185_H)
--#include <db_185.h>
--#elif defined(HAVE_DB_H)
-+#ifdef USE_DB
- #include <db.h>
- #endif
- #include <errno.h>	
-Index: heimdal/lib/roken/ndbm_wrap.c
-===================================================================
---- heimdal.orig/lib/roken/ndbm_wrap.c
-+++ heimdal/lib/roken/ndbm_wrap.c
-@@ -37,13 +37,7 @@ RCSID("$Id: ndbm_wrap.c 21634 2007-07-17
- #endif
- 
- #include "ndbm_wrap.h"
--#if defined(HAVE_DB4_DB_H)
--#include <db4/db.h>
--#elif defined(HAVE_DB3_DB_H)
--#include <db3/db.h>
--#else
- #include <db.h>
--#endif
- 
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/abs/core/heimdal/013_all_heimdal-pthread-lib.patch b/abs/core/heimdal/013_all_heimdal-pthread-lib.patch
deleted file mode 100644
index 19f8794..0000000
--- a/abs/core/heimdal/013_all_heimdal-pthread-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- heimdal-0.7.1/cf/pthreads.m4.old	2005-09-09 12:12:28.000000000 +0000
-+++ heimdal-0.7.1/cf/pthreads.m4	2005-09-17 22:23:23.000000000 +0000
-@@ -32,7 +32,7 @@
- 	2.*)
- 		native_pthread_support=yes
- 		PTHREADS_CFLAGS=-pthread
--		PTHREADS_LIBS=-pthread
-+		PTHREADS_LIBS=-lpthread
- 		;;
- 	esac
- 	;;
diff --git a/abs/core/heimdal/014_all_heimdal-path.patch b/abs/core/heimdal/014_all_heimdal-path.patch
deleted file mode 100644
index 36a86f1..0000000
--- a/abs/core/heimdal/014_all_heimdal-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- appl/rcp/rcp.c.old	2006-05-03 13:31:59.398493625 +0200
-+++ appl/rcp/rcp.c	2006-05-03 13:32:04.494485981 +0200
-@@ -34,7 +34,7 @@
- #include "rcp_locl.h"
- #include <getarg.h>
- 
--#define RSH_PROGRAM "rsh"
-+#define RSH_PROGRAM "krsh"
- 
- struct  passwd *pwd;
- uid_t	userid;
---- appl/rcp/rcp_locl.h.old	2006-05-03 02:30:31.602025409 +0200
-+++ appl/rcp/rcp_locl.h	2006-05-03 02:30:35.886018983 +0200
-@@ -64,4 +64,4 @@
- #define	_PATH_CP	"/bin/cp"
- #endif
- #undef _PATH_RSH
--#define	_PATH_RSH	BINDIR "/rsh"
-+#define	_PATH_RSH	BINDIR "/krsh"
---- appl/telnet/telnetd/telnetd.h.old	2006-05-03 02:23:14.582680939 +0200
-+++ appl/telnet/telnetd/telnetd.h	2006-05-03 02:23:23.746667193 +0200
-@@ -192,7 +192,7 @@
- #endif
- 
- #undef _PATH_LOGIN
--#define _PATH_LOGIN	BINDIR "/login"
-+#define _PATH_LOGIN	BINDIR "/klogin"
- 
- /* fallbacks */
- 
---- appl/login/shadow.c.old	2006-05-05 06:31:29.517138115 +0200
-+++ appl/login/shadow.c	2006-05-05 06:32:26.433052741 +0200
-@@ -38,7 +38,7 @@
- #ifdef HAVE_SHADOW_H
- 
- #ifndef _PATH_CHPASS
--#define _PATH_CHPASS "/usr/bin/passwd"
-+#define _PATH_CHPASS "/usr/bin/kpasswd"
- #endif
- 
- static int
-@@ -52,7 +52,7 @@
-         printf("fork /bin/passwd");
-         exit(1);
-     case 0:
--        execlp(_PATH_CHPASS, "passwd", who->pw_name, (char *) 0);
-+        execlp(_PATH_CHPASS, "kpasswd", who->pw_name, (char *) 0);
-         exit(1);
-     default:
-         waitpid(pid, &status, 0);
diff --git a/abs/core/heimdal/PKGBUILD b/abs/core/heimdal/PKGBUILD
index ae21f30..1457c39 100644
--- a/abs/core/heimdal/PKGBUILD
+++ b/abs/core/heimdal/PKGBUILD
@@ -1,66 +1,48 @@
-# $Id: PKGBUILD 81228 2010-05-27 15:14:39Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-#
-### Attention: remove old pkg before building - it links against itself! ###
-#
+# Maintainer: xhochy <uwelk@xhochy.org>
 
+# need to choose anonther name since heimdal is still blacklisted
 pkgname=heimdal
-pkgver=1.3.3
-pkgrel=3
+# Do not install the config as this will conflict with krb5
+pkgver=1.5.2
+pkgrel=1
 pkgdesc="Implementation of Kerberos V5 libraries"
 arch=('i686' 'x86_64')
 url="http://www.h5l.org/"
 license=('custom')
-depends=('db' 'openssl' 'sqlite3' 'e2fsprogs')
-backup=(etc/krb5.conf)
+depends=('sqlite3' 'libldap')
+# Do not install the config as this will conflict with krb5
+# backup=(etc/krb5/krb5.conf)
 options=('!libtool' '!emptydirs')
-install=heimdal.install
-source=(http://www.h5l.org/dist/src/${pkgname}-${pkgver}.tar.gz
-	001_all_heimdal-no_libedit.patch
-	002_all_heimal-fPIC.patch
-	003_all_heimdal-rxapps.patch
-	005_all_heimdal-suid_fix.patch
-	012_all_heimdal-berkdb.patch
-	013_all_heimdal-pthread-lib.patch
-	014_all_heimdal-path.patch
-	heimdal-kdc.rc
-	kadmind.rc
-	kpasswd.rc)
-md5sums=('963c09f1b14c41660be70b55fae9f163'
-         '98e28f11f906c967aac22d6184102c9e'
-         '6d5571bdedba2e2423b90bccdbac2c0a'
-         '2feec3924ee5230b54175b4d4000c872'
-         '45aeb207f360f9f4e9e0fabc8bfeecbc'
-         '56f5d10d0ec40f2fda82ef144ffac1e0'
-         '1b8665b771c4eb6b56ea8582c96e56e3'
-         '8208ae8c0b6ff5ab4f64af1693e9e396'
-         'e59650992b9541a30dfce727a194f6e0'
-         '1f2f86a67bbfddb7af581d35fdca9627'
-         'f8f1eca95b9d3f2b4ebf2417b71b81cf')
+source=(http://www.h5l.org/dist/src/heimdal-${pkgver}.tar.gz
+	heimdal-kdc
+	heimdal-kadmind
+	heimdal-kpasswd
+	base-version-script.map
+	heimdal.sh
+	heimdal-aur.install
+)
+md5sums=('bb23d9dbdafd395d816f7abc598481a1'  # heimdal-1.5.tar.gz
+         '16c3a485ef7c6d6c83ad9cd225cd88aa'  # heimdal-kdc
+         '22213df54d72df0ee949d3dc13b4cc47'  # heimdal-kadmind
+         '3c0aa4790eed0b75db4160d4442452e2'  # heimdal-kpasswd
+         '8dfdaa919df2be48fa181db646cd8a9b'  # base-version-script.map
+         'a222ad606aadfdceb6816da0551628fe'  # heimdal.sh
+         '132eb74789d83dbd623ba7b5dd14c792'  # heimdal-aur.install
+)
+install='heimdal-aur.install'
 
 build() {
+  cp base-version-script.map ${srcdir}/heimdal-${pkgver}/base/version-script.map
   cd ${srcdir}/heimdal-${pkgver}
-  patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch || return 1
-  patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch || return 1
-  patch -Np0 -i ${srcdir}/003_all_heimdal-rxapps.patch || return 1
-  patch -Np0 -i ${srcdir}/005_all_heimdal-suid_fix.patch || return 1
-  patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch || return 1
-  patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch || return 1
-  patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch || return 1
-
-  sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \
-	doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
-	lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5
 
-  libtoolize --force || return 1
-  aclocal -I cf || return 1
-  autoconf || return 1
-  automake || return 1
+  sed -i 's|$(LIB_NDBM)|$(LIB_NDBM) $(LIB_db_create)|' lib/otp/Makefile.am
 
-  ./configure --prefix=/usr --enable-shared=yes --without-x \
-	--sysconfdir=/etc --mandir=/usr/share/man \
+  # TODO Include man pages in /usr/share/man but add a heimdal suffix
+  ./configure --prefix=/opt/heimdal --enable-shared=yes --without-x \
+	--sysconfdir=/etc/krb5 \
+	--libdir=/usr/heimdal/lib \
+	--includedir=/usr/heimdal/include \
+	--mandir=/opt/heimdal/share/man \
 	--datadir=/var/lib/heimdal \
 	--localstatedir=/var/lib/heimdal \
 	--with-openssl=/usr \
@@ -68,39 +50,51 @@ build() {
 	--with-readline-include=/usr/include/readline \
 	--with-sqlite3-lib=/usr/lib \
 	--with-sqlite3-include=/usr/include \
-	--libexecdir=/usr/sbin
-	
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+	--with-openldap=/usr \
+	--libexecdir=/opt/heimdal/sbin \
+	--enable-kcm \
+	--disable-heimdal-documentation
+  make
+}
+
+package() {
+  cd ${srcdir}/heimdal-${pkgver}
+  make DESTDIR=${pkgdir} install
 
   # Rename daemons and their manpages
   for i in telnetd ftpd rshd; do
-    mv ${pkgdir}/usr/share/man/man8/{,k}${i}.8 || return 1
-    mv ${pkgdir}/usr/sbin/{,k}${i} || return 1
+    mv ${pkgdir}/opt/heimdal/share/man/man8/{,k}${i}.8
+    mv ${pkgdir}/opt/heimdal/sbin/{,k}${i}
   done
-  
+
   # Rename clients and their manpages
   for i in rcp rsh telnet ftp su login; do
-    if [ -f ${pkgdir}/usr/share/man/man1/${i}.1 ]; then
-      mv ${pkgdir}/usr/share/man/man1/{,k}${i}.1 || return 1
+    if [ -f ${pkgdir}/opt/heimdal/share/man/man1/${i}.1 ]; then
+      mv ${pkgdir}/opt/heimdal/share/man/man1/{,k}${i}.1
     fi
-    mv ${pkgdir}/usr/bin/{,k}${i} || return 1
-  done
-  rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8}
-  
-  # Arch could be a KDC too
-  install -d ${pkgdir}/etc/rc.d
-  install -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${pkgdir}/etc/ || return 1
-  for i in heimdal-kdc kadmind kpasswd; do
-    install -m755 ${srcdir}/${i}.rc ${pkgdir}/etc/rc.d/${i} || return 1
+    mv ${pkgdir}/opt/heimdal/bin/{,k}${i}
   done
+  rm -rf ${pkgdir}/opt/heimdal/share/man/cat{1,3,5,8}
+
+  # install config
+  # Do not install the config as this will conflict with krb5
+  # install -D -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${pkgdir}/etc/krb5/krb5.conf
+
+  # install init scripts
+  mkdir -p ${pkgdir}/etc/rc.d/
+  install -m755 ${srcdir}/heimdal-kdc ${pkgdir}/etc/rc.d/heimdal-kdc
+  install -m755 ${srcdir}/heimdal-kadmind ${pkgdir}/etc/rc.d/heimdal-kadmind
+  install -m755 ${srcdir}/heimdal-kpasswd ${pkgdir}/etc/rc.d/heimdal-kpasswd
+
+  mkdir -p ${pkgdir}/etc/profile.d/
+  install -m755 ${srcdir}/heimdal.sh ${pkgdir}/etc/profile.d/heimdal.sh
 
   # Remove conflicts
-  rm ${pkgdir}/usr/share/man/man5/ftpusers.5*		          # man-pages
-  rm ${pkgdir}/usr/share/man/man3/{DES,DH,EVP,OpenSSL,RAND,RSA}*  # openssl (a bit overzealous...)
-  rm ${pkgdir}/usr/share/man/man3/os.3*                           # erlang
+  rm -rf ${pkgdir}/opt/heimdal/share/man/man5/ftpusers.5*		          # man-pages
+  rm -rf ${pkgdir}/opt/heimdal/share/man/man3/{DES,DH,EVP,OpenSSL,RAND,RSA}*  # openssl
+  rm -rf ${pkgdir}/opt/heimdal/share/man/man3/os.3*                           # erlang
 
   # Install the license
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \
-  	${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+  install -Dm644 ${srcdir}/heimdal-${pkgver}/LICENSE \
+  	${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/abs/core/heimdal/base-version-script.map b/abs/core/heimdal/base-version-script.map
new file mode 100644
index 0000000..007052b
--- /dev/null
+++ b/abs/core/heimdal/base-version-script.map
@@ -0,0 +1,28 @@
+HEIMDAL_BASE_1.0 {
+	global:
+		heim_abort;
+		heim_alloc;
+		heim_array_append_value;
+		heim_array_copy_value;
+		heim_array_create;
+		heim_array_delete_value;
+		heim_array_get_length;
+		heim_array_iterate_f;
+		heim_auto_release;
+		heim_auto_release_create;
+		heim_auto_release_drain;
+		heim_base_once_f;
+		heim_cmp;
+		heim_dict_add_value;
+		heim_dict_copy_value;
+		heim_dict_create;
+		heim_dict_delete_key;
+		heim_dict_iterate_f;
+		heim_release;
+		heim_retain;
+		heim_string_create;
+		heim_string_get_utf8;
+		heim_number_create;
+	local:
+		*;
+};
diff --git a/abs/core/heimdal/heimdal-aur.install b/abs/core/heimdal/heimdal-aur.install
new file mode 100644
index 0000000..31ccd95
--- /dev/null
+++ b/abs/core/heimdal/heimdal-aur.install
@@ -0,0 +1,4 @@
+post_install() {
+  echo "Run `source /etc/profile.d/heimdal.sh` to source environment variables"
+  echo "needed to run heimdal and use heimdal libraries."
+}
diff --git a/abs/core/heimdal/kadmind.rc b/abs/core/heimdal/heimdal-kadmind
index 0f3b8c7..9479b63 100644
--- a/abs/core/heimdal/kadmind.rc
+++ b/abs/core/heimdal/heimdal-kadmind
@@ -4,27 +4,27 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/kadmind`
+PID=`pidof -o %PPID /opt/heimdal/sbin/kadmind`
 case "$1" in
     start)
-        stat_busy "Starting heimdal admin server"
+        stat_busy "Starting Heimdal KDC"
         if [ -z "$PID" ]; then
-		/usr/sbin/kadmind &
+           /opt/heimdal/sbin/kadmind &
         fi
         if [ ! -z "$PID" -o $? -gt 0 ]; then
             stat_fail
         else
-            add_daemon kadmind
+            add_daemon heimdal-kadmind
             stat_done
         fi
         ;;
     stop)
-        stat_busy "Stopping heimdal admin server"
+        stat_busy "Stopping Heimdal KDC"
 	    [ ! -z "$PID" ] && kill $PID &> /dev/null
         if [ $? -gt 0 ]; then
             stat_fail
         else
-            rm_daemon kadmind
+            rm_daemon heimdal-kadmind
             stat_done
         fi
         ;;
@@ -38,3 +38,4 @@ case "$1" in
 	;;
 esac
 exit 0
+
diff --git a/abs/core/heimdal/heimdal-kdc.rc b/abs/core/heimdal/heimdal-kdc
index b2a3b5f..82a11b9 100644
--- a/abs/core/heimdal/heimdal-kdc.rc
+++ b/abs/core/heimdal/heimdal-kdc
@@ -4,12 +4,12 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/kdc`
+PID=`pidof -o %PPID /opt/heimdal/sbin/kdc`
 case "$1" in
     start)
-        stat_busy "Starting heimdal kdc"
+        stat_busy "Starting Heimdal KDC"
         if [ -z "$PID" ]; then
-		/usr/sbin/kdc --detach
+           /opt/heimdal/sbin/kdc --detach
         fi
         if [ ! -z "$PID" -o $? -gt 0 ]; then
             stat_fail
@@ -19,7 +19,7 @@ case "$1" in
         fi
         ;;
     stop)
-        stat_busy "Stopping heimdal kdc"
+        stat_busy "Stopping Heimdal KDC"
 	    [ ! -z "$PID" ] && kill $PID &> /dev/null
         if [ $? -gt 0 ]; then
             stat_fail
@@ -38,3 +38,4 @@ case "$1" in
 	;;
 esac
 exit 0
+
diff --git a/abs/core/heimdal/kpasswd.rc b/abs/core/heimdal/heimdal-kpasswd
index 3697322..9a7766d 100644
--- a/abs/core/heimdal/kpasswd.rc
+++ b/abs/core/heimdal/heimdal-kpasswd
@@ -4,27 +4,27 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/kpasswdd`
+PID=`pidof -o %PPID /opt/heimdal/sbin/kpasswdd`
 case "$1" in
     start)
-        stat_busy "Starting heimdal kpasswdd"
+        stat_busy "Starting Heimdal KDC"
         if [ -z "$PID" ]; then
-		/usr/sbin/kpasswdd &
+           /opt/heimdal/sbin/kpasswdd &
         fi
         if [ ! -z "$PID" -o $? -gt 0 ]; then
             stat_fail
         else
-            add_daemon kpasswd
+            add_daemon heimdal-kpasswdd
             stat_done
         fi
         ;;
     stop)
-        stat_busy "Stopping heimdal kpasswdd"
+        stat_busy "Stopping Heimdal KDC"
 	    [ ! -z "$PID" ] && kill $PID &> /dev/null
         if [ $? -gt 0 ]; then
             stat_fail
         else
-            rm_daemon kpasswd
+            rm_daemon heimdal-kpasswdd
             stat_done
         fi
         ;;
diff --git a/abs/core/heimdal/heimdal.install b/abs/core/heimdal/heimdal.install
deleted file mode 100644
index 499d216..0000000
--- a/abs/core/heimdal/heimdal.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(heimdal hx509)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.info.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.info.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/core/heimdal/heimdal.sh b/abs/core/heimdal/heimdal.sh
new file mode 100755
index 0000000..574fd4b
--- /dev/null
+++ b/abs/core/heimdal/heimdal.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export LD_LIBRARY_PATH=/usr/heimdal/lib:$LD_LIBRARY_PATH
+export PATH=/opt/heimdal/bin:/opt/heimdal/sbin:$PATH
+