heimdal: Fix locating libedit. Fix linked libraries when using system sqlite3

heimdal/1.5.3-fix-detect-libedit.patch

@@ -0,0 +1,18 @@
+--- heimdal-1.5.3/configure.ac.orig	2016-01-12 12:08:18.406147300 +0300
++++ heimdal-1.5.3/configure.ac	2016-01-12 12:10:33.177960000 +0300
+@@ -292,12 +292,12 @@
+ 
+ rk_TEST_PACKAGE(libedit,
+ [#include <stdio.h>
+-#if defined(HAVE_READLINE_READLINE_H)
+-#include <readline/readline.h>
++#if defined(HAVE_EDITLINE_READLINE_H)
++#include <editline/readline.h>
+ #elif defined(HAVE_READLINE_H)
+ #include <readline.h>
+ #endif
+-],-ledit,,, READLINE,, [readline.h readline/readline.h])
++],-ledit,,, READLINE,, [readline.h editline/readline.h])
+ 
+ AC_CONFIG_SUBDIRS([lib/libedit])
+ 

heimdal/1.5.3-missing-libs-pkg-config.patch

@@ -0,0 +1,40 @@
+--- heimdal-1.5.3/tools/heimdal-gssapi.pc.in.orig	2016-01-12 11:49:57.225269700 +0300
++++ heimdal-1.5.3/tools/heimdal-gssapi.pc.in	2016-01-12 11:50:41.886294500 +0300
+@@ -10,5 +10,5 @@
+ URL: http://www.pdc.kth.se/heimdal/
+ #Requires: foo = 1.3.1
+ #Conflicts: bar <= 4.5
+-Libs: -L${libdir} -lgssapi -lheimntlm -lkrb5 @LIB_pkinit@ -lcom_err @LIB_hcrypto_appl@ -lasn1 -lwind -lroken @LIB_crypt@ @LIB_dlopen@ @LIB_door_create@ @LIBS@
++Libs: -L${libdir} -lgssapi -lheimntlm -lkrb5 @LIB_pkinit@ -lcom_err @LIB_hcrypto_appl@ -lasn1 -lwind -lroken @LIB_crypt@ @LIB_dlopen@ @LIB_door_create@ @LIB_sqlite3@ @LIBS@
+ Cflags: -I${includedir}
+--- heimdal-1.5.3/configure.ac.orig	2016-01-12 12:08:18.406147300 +0300
++++ heimdal-1.5.3/configure.ac	2016-01-12 12:10:33.177960000 +0300
+@@ -176,6 +176,7 @@
+ AM_CONDITIONAL(SQLITE3,  test "X$with_sqlite3" = Xyes)
+ 
+ AC_DEFINE(HAVE_SQLITE3, 1, [Define if you want support for sqlite in Heimdal.])
++AC_SUBST(LIB_sqlite3)
+ 
+ AC_ARG_ENABLE(sqlite-cache, 
+ 	AS_HELP_STRING([--disable-sqlite-cache],[if you want support for cache in sqlite]))
+--- heimdal-1.5.3/tools/Makefile.am.orig	2016-01-12 13:36:56.762307100 +0300
++++ heimdal-1.5.3/tools/Makefile.am	2016-01-12 13:37:26.440953200 +0300
+@@ -28,6 +28,7 @@
+ 		-e "s!@LIB_dlopen\@!$(LIB_dlopen)!g" \
+ 		-e "s!@LIB_door_create\@!$(LIB_door_create)!g" \
+ 		-e "s!@LIB_pkinit\@!$(LIB_pkinit)!g" \
++		-e "s!@LIB_sqlite3\@!$(LIB_sqlite3)!g" \
+ 		-e "s!@LIBS\@!$(LIBS)!g"
+ 
+ krb5-config: krb5-config.in
+--- heimdal-1.5.3/tools/krb5-config.in.orig	2016-01-12 14:24:54.526945800 +0300
++++ heimdal-1.5.3/tools/krb5-config.in	2016-01-12 14:25:46.205945800 +0300
+@@ -136,7 +136,7 @@
+ 	;;
+     esac
+     lib_flags="$lib_flags -lkrb5 @LIB_pkinit@ -lcom_err"
+-    lib_flags="$lib_flags @LIB_hcrypto_appl@ -lasn1 -lwind -lheimbase -lroken"
++    lib_flags="$lib_flags @LIB_hcrypto_appl@ -lasn1 -lwind -lheimbase -lroken @LIB_sqlite3@"
+     lib_flags="$lib_flags @LIB_crypt@ @PTHREAD_LIBADD@ @LIB_dlopen@"
+     lib_flags="$lib_flags @LIB_door_create@ @LIBS@"
+     echo $lib_flags

heimdal/PKGBUILD

@@ -1,13 +1,14 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
+pkgbase=heimdal
 pkgname=('heimdal' 'heimdal-libs' 'heimdal-devel')
 pkgver=1.5.3
-pkgrel=6
+pkgrel=7
 pkgdesc="Implementation of Kerberos V5 libraries"
 arch=('i686' 'x86_64')
 url="http://www.h5l.org/"
 license=('custom')
-makedepends=('libdb-devel' 'libcrypt-devel' 'libsqlite-devel' 'libreadline-devel' 'openssl-devel') #libldap-devel
+makedepends=('libdb-devel' 'libcrypt-devel' 'libedit-devel' 'libsqlite-devel' 'openssl-devel') #libldap-devel
 options=('!libtool' '!emptydirs' 'staticlibs')
 groups=('net-utils')
 source=(http://www.h5l.org/dist/src/heimdal-${pkgver}.tar.gz
@@ -15,6 +16,8 @@ source=(http://www.h5l.org/dist/src/heimdal-${pkgver}.tar.gz
         1.5.2-hdbdir.patch
         1.5.2-install-catman.patch
         1.5.2-roken-signal.patch
+        1.5.3-missing-libs-pkg-config.patch
+        1.5.3-fix-detect-libedit.patch
         heimdal-1.5.2-msys2.patch
         )
 md5sums=('30b379e3de12f332fbd201131f02ffca'
@@ -22,6 +25,8 @@ md5sums=('30b379e3de12f332fbd201131f02ffca'
          '1a7f12d2d147e0f0e75c8f74ca44ee9d'
          '6ad64b8dfc6360a5e2b9d84b8a86abf1'
          'f07e91c3df57d9fb03356dff98f45b82'
+         '0985547093eb0a607bda1c99dea63dcd'
+         'c2146cf45aa1dd590a8cbf8f882b8fbe'
          '4b3694cb496ca6f9b2bac802614c0b02')
 
 prepare() {
@@ -31,6 +36,8 @@ prepare() {
   patch -p2 -i ${srcdir}/1.5.2-hdbdir.patch
   patch -p2 -i ${srcdir}/1.5.2-install-catman.patch
   patch -p2 -i ${srcdir}/1.5.2-roken-signal.patch
+  patch -p1 -i ${srcdir}/1.5.3-missing-libs-pkg-config.patch
+  patch -p1 -i ${srcdir}/1.5.3-fix-detect-libedit.patch
   patch -p1 -i ${srcdir}/heimdal-1.5.2-msys2.patch
 
   autoreconf -fi
@@ -48,7 +55,7 @@ build() {
     --datadir=/var/lib/heimdal \
     --localstatedir=/var/lib/heimdal \
     --with-openssl=/usr \
-    --with-readline=/usr \
+    --with-libedit=/usr \
     --with-sqlite3=/usr \
     --enable-shared=yes \
     --enable-static \
@@ -111,7 +118,7 @@ package_heimdal() {
 }
 
 package_heimdal-libs() {
-  depends=('libdb' 'libcrypt' 'libsqlite' 'libopenssl' 'libreadline')
+  depends=('libdb' 'libcrypt' 'libedit' 'libsqlite' 'libopenssl')
   groups=('libraries')
 
   mkdir -p ${pkgdir}/usr/bin
@@ -121,7 +128,7 @@ package_heimdal-libs() {
 package_heimdal-devel() {
   pkgdesc="Heimdal headers and libraries"
   groups=('development')
-  depends=('heimdal-libs' 'libcrypt-devel' 'libdb-devel' 'libsqlite-devel' 'libreadline-devel')
+  depends=('heimdal-libs' 'libcrypt-devel' 'libedit-devel' 'libdb-devel' 'libsqlite-devel')
 
   mkdir -p ${pkgdir}/usr