14 files changed, 0 insertions, 456 deletions
diff --git a/extra/heimdal/001_all_heimdal-no_libedit.patch b/extra/heimdal/001_all_heimdal-no_libedit.patch
deleted file mode 100644
index a551bdce1..000000000
--- a/extra/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/extra/heimdal/002_all_heimdal-fPIC.patch b/extra/heimdal/002_all_heimdal-fPIC.patch
deleted file mode 100644
index c67dbae76..000000000
--- a/extra/heimdal/002_all_heimdal-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/extra/heimdal/003_all_heimdal-rxapps.patch b/extra/heimdal/003_all_heimdal-rxapps.patch
deleted file mode 100644
index 40fc05f08..000000000
--- a/extra/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/extra/heimdal/005_all_heimdal-suid_fix.patch b/extra/heimdal/005_all_heimdal-suid_fix.patch
deleted file mode 100644
index 35a9ed9f6..000000000
--- a/extra/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/extra/heimdal/013_all_heimdal-pthread-lib.patch b/extra/heimdal/013_all_heimdal-pthread-lib.patch
deleted file mode 100644
index 19f879407..000000000
--- a/extra/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/extra/heimdal/014_all_heimdal-path.patch b/extra/heimdal/014_all_heimdal-path.patch
deleted file mode 100644
index 36a86f1f9..000000000
--- a/extra/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/extra/heimdal/022_all_heimdal-as-needed.patch b/extra/heimdal/022_all_heimdal-as-needed.patch
deleted file mode 100644
index 69c791778..000000000
--- a/extra/heimdal/022_all_heimdal-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/roken/Makefile.am.old	2007-11-05 19:42:53.000000000 +0100
-+++ lib/roken/Makefile.am	2007-11-05 19:43:12.000000000 +0100
-@@ -107,7 +107,7 @@
- 	ifaddrs.hin		\
- 	vis.hin	
- 
--libroken_la_LIBADD = @LTLIBOBJS@
-+libroken_la_LIBADD = @LTLIBOBJS@ $(LIB_crypt)
- 
- $(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h $(XHEADERS)
- 
---- lib/editline/Makefile.am.old	2007-11-05 19:46:08.000000000 +0100
-+++ lib/editline/Makefile.am	2007-11-05 20:06:54.000000000 +0100
-@@ -36,6 +36,8 @@
- 	unix.h \
- 	$(EXTRA_SOURCE)
- 
-+libeditline_la_LIBADD = $(LIB_tgetent)
-+
- EXTRA_SOURCE = $(ES) 
- 
- libel_compat_la_SOURCES = edit_compat.c edit_compat.h
diff --git a/extra/heimdal/APKBUILD b/extra/heimdal/APKBUILD
deleted file mode 100644
index a494e201a..000000000
--- a/extra/heimdal/APKBUILD
+++ /dev/null
@@ -1,161 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@gmail.com>
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=heimdal
-pkgver=1.2.1
-pkgrel=3
-pkgdesc="An implementation of Kerberos 5"
-url="http://www.h5l.org/"
-license="BSD"
-depends=
-makedepends="gawk readline-dev e2fsprogs-dev sqlite-dev autoconf automake
-	libtool pkgconfig"
-install=
-subpackages="$pkgname-doc $pkgname-dev $pkgname-ftp $pkgname-telnet \
-$pkgname-su $pkgname-rsh $pkgname-rcp $pkgname-pagsh $pkgname-kf"
-source="http://www.h5l.org/dist/src/$pkgname-$pkgver.tar.gz
-001_all_heimdal-no_libedit.patch
-002_all_heimdal-fPIC.patch
-003_all_heimdal-rxapps.patch
-005_all_heimdal-suid_fix.patch
-013_all_heimdal-pthread-lib.patch
-014_all_heimdal-path.patch
-022_all_heimdal-as-needed.patch
-heimdal-system_sqlite.patch
-heimdal-r23235-kb5-libwind_la.patch
-heimdal-r23238-kb5_locl_h-wind_h.patch
-"
-
-# krb5.h needs com_err.h
-depends_dev="e2fsprogs-dev"
-
-build() {
-	[ -e /usr/lib/libasn1.so ] && echo "## remove old heimdal pkg first ##" && return 1
-
-	cd "$srcdir/$pkgname-$pkgver"
-	
-	patch -Np0 -i ../../001_all_heimdal-no_libedit.patch || return 1
-	patch -Np0 -i ../../002_all_heimdal-fPIC.patch || return 1
-	patch -Np0 -i ../../003_all_heimdal-rxapps.patch || return 1
-	patch -Np0 -i ../../005_all_heimdal-suid_fix.patch || return 1
-	patch -Np1 -i ../../013_all_heimdal-pthread-lib.patch || return 1
-	patch -Np0 -i ../../014_all_heimdal-path.patch || return 1
-	patch -Np0 -i ../../022_all_heimdal-as-needed.patch || return 1
-	patch -Np0 -i ../../heimdal-system_sqlite.patch || return 1
-	patch -Np2 -i ../../heimdal-r23235-kb5-libwind_la.patch || return 1
-	patch -Np2 -i ../../heimdal-r23238-kb5_locl_h-wind_h.patch || return 1
-
-	# name clash with ruserpass in netdb.h
-	sed -i -e 's/ruserpass/ruserpw/g' appl/ftp/ftp/*.[ch] || 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
-
-	sh ./autogen.sh || return 1
-
-	export LDFLAGS="${LDFLAGS} -Wl,--as-needed"
-
-	./configure --prefix=/usr \
-		--enable-shared=yes --without-x \
-		--disable-berkeley-db \
-		--disable-netinfo \
-		--with-readline-lib=/usr/lib \
-		--with-readline-include=/usr/include/readline \
-		--with-openssl=/usr
-
-	make || return 1
-	make DESTDIR="$pkgdir" exec_prefix=/usr sysconfdir=/etc \
-	mandir=/usr/share/man infodir=/usr/share/info datadir=/var/lib/heimdal \
-	localstatedir=/var/lib/heimdal libexecdir=/usr/sbin install
-
-	install -m644 -D krb5.conf ${pkgdir}/etc/krb5.conf || return 1
-	install -m755 -D ../../heimdal-kadmind.init ${pkgdir}/etc/init.d/heimdal-kadmind
-	install -m755 -D ../../heimdal-kdc.init ${pkgdir}/etc/init.d/heimdal-kdc
-	install -m755 -D ../../heimdal-kpasswdd.init ${pkgdir}/etc/init.d/heimdal-kpasswdd
-
-	# Remove editline, we use libreadline
-	rm ${pkgdir}/usr/lib/libeditline.* || return 1
-	rm ${pkgdir}/usr/include/editline.h || return 1
-	rm ${pkgdir}/usr/share/man/man3/editline.* || return 1
-
-	# Rename daemons and their manpages
-	for i in telnetd ftpd rshd; do
-		mv ${pkgdir}/usr/share/man/man8/${i}.8 ${pkgdir}/usr/share/man/man8/k${i}.8 || return 1
-		mv ${pkgdir}/usr/sbin/${i} ${pkgdir}/usr/sbin/k${i} || return 1
-	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/${i}.1 ${pkgdir}/usr/share/man/man1/k${i}.1 || return 1
-		fi
-		mv ${pkgdir}/usr/bin/${i} ${pkgdir}/usr/bin/k${i} || return 1
-	done
-	rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8}
-
-	# Remove conflicts 
-	rm ${pkgdir}/usr/share/man/man5/ftpusers.5*
-
-	# Compress info pages
-	for page in heimdal hx509; do
-		gzip -9 ${pkgdir}/usr/share/info/${page}.info
-	done
-
-	# Install the license
-	install -d ${pkgdir}/usr/share/licenses/${pkgname}
-	install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \
-	${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-}
-
-ftp() {
-	mkdir -p $subpkgdir/usr/bin/
-	mv $pkgdir/usr/bin/kftp $subpkgdir/usr/bin/kftp
-	mkdir -p $subpkgdir/usr/sbin/
-	mv $pkgdir/usr/sbin/kftpd $subpkgdir/usr/sbin/kftpd
-}
-
-telnet() {
-	mkdir -p $subpkgdir/usr/bin/
-	mv $pkgdir/usr/bin/ktelnet $subpkgdir/usr/bin/ktelnet
-	mkdir -p $subpkgdir/usr/sbin/
-	mv $pkgdir/usr/sbin/ktelnetd $subpkgdir/usr/sbin/ktelnetd
-}
-
-su() {
-	mkdir -p $subpkgdir/usr/bin/
-	mv $pkgdir/usr/bin/ksu $subpkgdir/usr/bin/ksu
-}
-
-rsh() {
-	mkdir -p $subpkgdir/usr/bin/
-	mv $pkgdir/usr/bin/krsh $subpkgdir/usr/bin/krsh
-	mkdir -p $subpkgdir/usr/sbin/
-	mv $pkgdir/usr/sbin/krshd $subpkgdir/usr/sbin/krshd
-}
-
-rcp() {
-        mkdir -p $subpkgdir/usr/bin/
-	mv $pkgdir/usr/bin/krcp $subpkgdir/usr/bin/krcp
-}
-
-pagsh() {
-        mkdir -p $subpkgdir/usr/bin/
-        mv $pkgdir/usr/bin/pagsh $subpkgdir/usr/bin/pagsh
-}
-
-kf() {
-        mkdir -p $subpkgdir/usr/bin/
-        mv $pkgdir/usr/bin/kf $subpkgdir/usr/bin/kf
-}
-
-md5sums="6e5028077e2a6b101a4a72801ba71b9e  heimdal-1.2.1.tar.gz
-98e28f11f906c967aac22d6184102c9e  001_all_heimdal-no_libedit.patch
-6d5571bdedba2e2423b90bccdbac2c0a  002_all_heimdal-fPIC.patch
-2feec3924ee5230b54175b4d4000c872  003_all_heimdal-rxapps.patch
-45aeb207f360f9f4e9e0fabc8bfeecbc  005_all_heimdal-suid_fix.patch
-1b8665b771c4eb6b56ea8582c96e56e3  013_all_heimdal-pthread-lib.patch
-8208ae8c0b6ff5ab4f64af1693e9e396  014_all_heimdal-path.patch
-d7649e078c87d2ca997080f0deb527c0  022_all_heimdal-as-needed.patch
-949a389ebe7652861b2e178a7e0f1ed9  heimdal-system_sqlite.patch
-072f6b2550693adb30117394b1dd354e  heimdal-r23235-kb5-libwind_la.patch
-7b4537b0e8bde95214211091e55eacf5  heimdal-r23238-kb5_locl_h-wind_h.patch"
diff --git a/extra/heimdal/heimdal-kadmind.init b/extra/heimdal/heimdal-kadmind.init
deleted file mode 100755
index b58ac994d..000000000
--- a/extra/heimdal/heimdal-kadmind.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kadmind,v 1.3 2004/09/13 22:44:54 solar Exp $
-
-depend() {
-	need net
-	use heimdal-kdc
-	after logger
-}
-
-start() {
-	ebegin "Starting heimdal kadmind"
-		/usr/sbin/kadmind  &
-		echo $! > /var/run/heimdal-kadmind.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping heimdal kadmind"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kadmind
-	eend $?
-}
diff --git a/extra/heimdal/heimdal-kdc.init b/extra/heimdal/heimdal-kdc.init
deleted file mode 100755
index 753a101c3..000000000
--- a/extra/heimdal/heimdal-kdc.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc,v 1.2 2004/09/13 15:40:34 dragonheart Exp $
-
-depend() {
-	need net
-	after logger
-}
-
-start() {
-	ebegin "Starting heimdal kdc"
-	start-stop-daemon --start --quiet --exec \
-		/usr/sbin/kdc -- --detach
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping heimdal kdc"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kdc
-	eend $?
-}
diff --git a/extra/heimdal/heimdal-kpasswdd.init b/extra/heimdal/heimdal-kpasswdd.init
deleted file mode 100755
index 517cb8621..000000000
--- a/extra/heimdal/heimdal-kpasswdd.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kpasswdd,v 1.3 2004/09/13 22:44:54 solar Exp $
-
-depend() {
-	need net
-	use heimdal-kdc
-	after logger
-}
-
-start() {
-	ebegin "Starting heimdal kpasswdd"
-	start-stop-daemon --background --start --quiet --exec \
-		/usr/sbin/kpasswdd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping heimdal kpasswdd"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kpasswdd
-	eend $?
-}
diff --git a/extra/heimdal/heimdal-r23235-kb5-libwind_la.patch b/extra/heimdal/heimdal-r23235-kb5-libwind_la.patch
deleted file mode 100644
index 88c02e598..000000000
--- a/extra/heimdal/heimdal-r23235-kb5-libwind_la.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- trunk/heimdal/lib/krb5/Makefile.am	2008-06-01 22:25:41 UTC (rev 23234)
-+++ trunk/heimdal/lib/krb5/Makefile.am	2008-06-01 22:25:53 UTC (rev 23235)
-@@ -57,6 +57,7 @@
- 	$(LIB_com_err) \
- 	$(LIB_hcrypto) \
- 	$(top_builddir)/lib/asn1/libasn1.la \
-+	../wind/libwind.la \
- 	$(LIBADD_roken) \
- 	$(LIB_door_create) \
- 	$(LIB_dlopen)
diff --git a/extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch b/extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
deleted file mode 100644
index 5390b2cf6..000000000
--- a/extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/heimdal/lib/krb5/krb5_locl.h	2008-06-01 22:26:24 UTC (rev 23237)
-+++ trunk/heimdal/lib/krb5/krb5_locl.h	2008-06-01 22:26:43 UTC (rev 23238)
-@@ -131,6 +131,8 @@
- #include <parse_time.h>
- #include <base64.h>
- 
-+#include <wind.h>
-+
- #include "crypto-headers.h"
-
-
diff --git a/extra/heimdal/heimdal-system_sqlite.patch b/extra/heimdal/heimdal-system_sqlite.patch
deleted file mode 100644
index 2f8254e4d..000000000
--- a/extra/heimdal/heimdal-system_sqlite.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur tmp-old/configure.in tmp-new/configure.in
---- configure.in	2008-06-08 08:06:38.000000000 +0000
-+++ configure.in	2008-06-08 08:15:29.000000000 +0000
-@@ -104,6 +104,8 @@
- 
- KRB_PTHREADS
- 
-+PKG_CHECK_MODULES([sqlite], [sqlite3])
-+
- AC_ARG_ENABLE(dce, 
- 	AS_HELP_STRING([--enable-dce],[if you want support for DCE/DFS PAG's]))
- if test "$enable_dce" = yes; then
-diff -Naur tmp-old/lib/Makefile.am tmp-new/lib/Makefile.am
---- lib/Makefile.am	2008-06-07 16:53:11.000000000 +0000
-+++ lib/Makefile.am	2008-06-07 16:55:58.000000000 +0000
-@@ -18,6 +18,6 @@
- dir_hcrypto = hcrypto
- endif
- 
--SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 sqlite \
-+SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 \
- 	$(dir_hcrypto) hx509 krb5 ntlm kafs gssapi hdb kadm5 \
- 	auth $(dir_45) $(dir_otp) $(dir_dce)
-diff -Naur tmp-old/lib/krb5/Makefile.am tmp-new/lib/krb5/Makefile.am
---- lib/krb5/Makefile.am	2008-06-07 16:54:02.000000000 +0000
-+++ lib/krb5/Makefile.am	2008-06-08 08:17:00.000000000 +0000
-@@ -2,7 +2,7 @@
- 
- include $(top_srcdir)/Makefile.am.common
- 
--AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err -I$(srcdir)/../sqlite
-+AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err $(sqlite_CFLAGS)
- 
- bin_PROGRAMS = verify_krb5_conf
- 
-@@ -53,7 +53,7 @@
- 
- libkrb5_la_LIBADD = \
- 	$(LIB_pkinit) \
--	../sqlite/libsqlite.la \
-+	$(sqlite_LIBS) \
- 	$(LIB_com_err) \
- 	$(LIB_hcrypto) \
- 	$(top_builddir)/lib/asn1/libasn1.la \
-diff -Naur tmp-old/lib/krb5/scache.c tmp-new/lib/krb5/scache.c
---- lib/krb5/scache.c	2008-06-07 16:54:30.000000000 +0000
-+++ lib/krb5/scache.c	2008-06-07 17:01:43.000000000 +0000
-@@ -32,7 +32,7 @@
-  */
- 
- #include "krb5_locl.h"
--#include "sqlite3.h"
-+#include <sqlite3.h>
- 
- RCSID("$Id: heimdal-system_sqlite.patch,v 1.1 2008/06/11 07:27:47 mueli Exp $");
-