main/heimdal: upgrade to 1.6_rc2

rebase patches to use -p1, for consitency with rest of aports tree

13 files changed, 118 insertions, 138 deletions

diff --git a/main/heimdal/003_all_heimdal-rxapps.patch b/main/heimdal/003_all_heimdal-rxapps.patch
index 40fc05f083..a175faf21a 100644
--- a/main/heimdal/003_all_heimdal-rxapps.patch
+++ b/main/heimdal/003_all_heimdal-rxapps.patch
@@ -1,5 +1,5 @@
 --- appl/kx/rxtelnet.in	2005-06-16 18:29:10.000000000 +0200
-+++ appl/kx/rxtelnet.in	2005-06-27 23:21:34.000000000 +0200
++++ b/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 $
  #
@@ -10,7 +10,7 @@
  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
++++ b/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 $
  #
diff --git a/main/heimdal/005_all_heimdal-suid_fix.patch b/main/heimdal/005_all_heimdal-suid_fix.patch
index 35a9ed9f6b..0524db61ea 100644
--- a/main/heimdal/005_all_heimdal-suid_fix.patch
+++ b/main/heimdal/005_all_heimdal-suid_fix.patch
@@ -1,5 +1,5 @@
 --- appl/su/Makefile.am	2005-06-16 18:27:46.000000000 +0200
-+++ appl/su/Makefile.am	2005-06-27 23:25:21.000000000 +0200
++++ b/appl/su/Makefile.am	2005-06-27 23:25:21.000000000 +0200
 @@ -7,6 +7,7 @@
  bin_PROGRAMS = su
  bin_SUIDS = su
@@ -9,7 +9,7 @@
  
  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
++++ b/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
diff --git a/main/heimdal/014_all_heimdal-path.patch b/main/heimdal/014_all_heimdal-path.patch
index 36a86f1f93..cbe53aa4e5 100644
--- a/main/heimdal/014_all_heimdal-path.patch
+++ b/main/heimdal/014_all_heimdal-path.patch
@@ -1,5 +1,5 @@
 --- 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
++++ b/appl/rcp/rcp.c	2006-05-03 13:32:04.494485981 +0200
 @@ -34,7 +34,7 @@
  #include "rcp_locl.h"
  #include <getarg.h>
@@ -10,7 +10,7 @@
  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
++++ b/appl/rcp/rcp_locl.h	2006-05-03 02:30:35.886018983 +0200
 @@ -64,4 +64,4 @@
  #define	_PATH_CP	"/bin/cp"
  #endif
@@ -18,7 +18,7 @@
 -#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
++++ b/appl/telnet/telnetd/telnetd.h	2006-05-03 02:23:23.746667193 +0200
 @@ -192,7 +192,7 @@
  #endif
  
@@ -29,7 +29,7 @@
  /* 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
++++ b/appl/login/shadow.c	2006-05-05 06:32:26.433052741 +0200
 @@ -38,7 +38,7 @@
  #ifdef HAVE_SHADOW_H
  
diff --git a/main/heimdal/022_all_heimdal-as-needed.patch b/main/heimdal/022_all_heimdal-as-needed.patch
index 69c791778a..8c48685519 100644
--- a/main/heimdal/022_all_heimdal-as-needed.patch
+++ b/main/heimdal/022_all_heimdal-as-needed.patch
@@ -1,5 +1,5 @@
 --- 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
++++ b/lib/roken/Makefile.am	2007-11-05 19:43:12.000000000 +0100
 @@ -107,7 +107,7 @@
  	ifaddrs.hin		\
  	vis.hin	
@@ -10,7 +10,7 @@
  $(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
++++ b/lib/editline/Makefile.am	2007-11-05 20:06:54.000000000 +0100
 @@ -36,6 +36,8 @@
  	unix.h \
  	$(EXTRA_SOURCE)
diff --git a/main/heimdal/100-check-com_err-pthread.patch b/main/heimdal/100-check-com_err-pthread.patch
index f2a4b637b0..ca58da32d7 100644
--- a/main/heimdal/100-check-com_err-pthread.patch
+++ b/main/heimdal/100-check-com_err-pthread.patch
@@ -1,5 +1,5 @@
 --- heimdal-1.3.1/cf/check-compile-et.m4.orig
-+++ heimdal-1.3.1/cf/check-compile-et.m4
++++ b/heimdal-1.3.1/cf/check-compile-et.m4
 @@ -61,7 +61,7 @@
  elif test "${krb_cv_compile_et}" = "yes"; then
    dnl Since compile_et seems to work, let's check libcom_err
diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index ebc90dacf9..e15575ee4f 100644
--- a/main/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=heimdal
-pkgver=1.5.3
-pkgrel=1
+pkgver=1.6_rc2
+_ver=${pkgver/_rc/rc}
+pkgrel=0
 pkgdesc="An implementation of Kerberos 5"
 arch="all"
 url="http://www.h5l.org/"
@@ -16,7 +17,7 @@ options="suid"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs
 	$pkgname-ftp $pkgname-telnet $pkgname-su $pkgname-rsh $pkgname-rcp
 	$pkgname-pagsh $pkgname-kf"
-source="http://ftp4.de.freesbie.org/pub/misc/heimdal/src/$pkgname-$pkgver.tar.gz
+source="http://ftp4.de.freesbie.org/pub/misc/heimdal/src/$pkgname-$_ver.tar.gz
 	heimdal-kadmind.initd
 	heimdal-kdc.initd
 	heimdal-kpasswdd.initd
@@ -26,13 +27,11 @@ source="http://ftp4.de.freesbie.org/pub/misc/heimdal/src/$pkgname-$pkgver.tar.gz
 	014_all_heimdal-path.patch
 	telnetd.patch
 	heimdal_missing-include.patch
-	heimdal_missing_symbols.patch
-	heimdal-1.5-use-perl-Getopt_Std.patch
-	heimdal_texinfo-5.patch
 	heimdal-remove-broken-auth.patch
+	libkadm5clnt-version-script.patch
 	"
 
-_builddir="$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$_ver"
 
 prepare() {
 	[ -e /usr/lib/libasn1.so ] && echo "## remove old heimdal pkg first ##" && return 1
@@ -41,7 +40,7 @@ prepare() {
 
 	for i in $source; do
 		case $i in
-		*.patch) msg "Applying patch $i"; patch -p0 -i "$srcdir"/$i || return 1;;
+		*.patch) msg "Applying patch $i"; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
 
@@ -116,27 +115,20 @@ package() {
 	# Remove conflicts 
 	# e2fsprogs
 	rm -f "$pkgdir"/usr/bin/compile_et \
-		"$pkgdir"/usr/share/man/man1/compile_et.1
+		"$pkgdir"/usr/share/man/man1/compile_et.1 || return 1
 	# man-page
-	rm "$pkgdir"/usr/share/man/man5/ftpusers.5*
-	# openssl
-	rm "$pkgdir"/usr/share/man/man3/DES*
-	rm "$pkgdir"/usr/share/man/man3/DH*
-	rm "$pkgdir"/usr/share/man/man3/EVP*
-	rm "$pkgdir"/usr/share/man/man3/OpenSSL*
-	rm "$pkgdir"/usr/share/man/man3/RAND*
-	rm "$pkgdir"/usr/share/man/man3/RSA*
+	rm "$pkgdir"/usr/share/man/man5/ftpusers.5* || return 1
 	# erlang
-  	rm "$pkgdir"/usr/share/man/man3/os.3*
+	rm "$pkgdir"/usr/share/man/man3/os.3* || return 1
 
 	# Compress info pages
 	for page in heimdal hx509; do
-		gzip -9 "$pkgdir"/usr/share/info/${page}.info
+		gzip -9 "$pkgdir"/usr/share/info/${page}.info || return 1
 	done
 
 	# Install the license
 	install -d "$pkgdir"/usr/share/licenses/$pkgname
-	install -D -m644 "$srcdir"/$pkgname-$pkgver/LICENSE \
+	install -D -m644 "$srcdir"/$pkgname-$_ver/LICENSE \
 		"$pkgdir"/usr/share/licenses/$pkgname/ || return 1
 }
 
@@ -196,42 +188,36 @@ kf() {
         mv $pkgdir/usr/bin/kf $subpkgdir/usr/bin/kf
 }
 
-md5sums="30b379e3de12f332fbd201131f02ffca  heimdal-1.5.3.tar.gz
+md5sums="152ca82660864acf7f712ae1a57e6795  heimdal-1.6rc2.tar.gz
 43aa0e59d7c25aca2d362e1b980a90ee  heimdal-kadmind.initd
 2be6ab7b49a076e078f34913d65bcaad  heimdal-kdc.initd
 f4811d443f68fe11946a031ada8ce125  heimdal-kpasswdd.initd
-2feec3924ee5230b54175b4d4000c872  003_all_heimdal-rxapps.patch
-45aeb207f360f9f4e9e0fabc8bfeecbc  005_all_heimdal-suid_fix.patch
-8208ae8c0b6ff5ab4f64af1693e9e396  014_all_heimdal-path.patch
-f320b91692b872e28f446f9cf1bc68bf  telnetd.patch
-8e127440fe11380c65fda40283326a46  heimdal_missing-include.patch
-a14b9001271c3b794b083c25936ebe21  heimdal_missing_symbols.patch
-dbe4106d1ca938587c948ee34121c020  heimdal-1.5-use-perl-Getopt_Std.patch
-53201e2a953c47a7437ce0222c4fb80d  heimdal_texinfo-5.patch
-c66dd8d9dd6a2105ff8e49aca32315c8  heimdal-remove-broken-auth.patch"
-sha256sums="aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5  heimdal-1.5.3.tar.gz
+51b6af2072105b52c96a851a5bd1f461  003_all_heimdal-rxapps.patch
+efa764866eed4c589dc9d2aedfe1c140  005_all_heimdal-suid_fix.patch
+86f5afbba54fd6d3dcbe9dd8fbac9620  014_all_heimdal-path.patch
+c2c2bab875bb1d258c23c88b4c237857  telnetd.patch
+9a8db1ed3098a1b1073aa8b75b8084c8  heimdal_missing-include.patch
+5a0fd2107233391beb73907600918d25  heimdal-remove-broken-auth.patch
+d45444b92259e95a51d52145851d5206  libkadm5clnt-version-script.patch"
+sha256sums="8fe19e0f12ff0d0c2f20a6cf56727deaabd89db9c197288022fb489e103b730d  heimdal-1.6rc2.tar.gz
 0fb8800c421a0a129c9c23c74498a9fbaaaf89d5730b186795ce325d8fcfc294  heimdal-kadmind.initd
 ad51a116ec8a7d3cab7632335e76f99732b8115d929584c5fce6f0ed5b010d64  heimdal-kdc.initd
 2fa5e47a6a9cbaafa5689f1771b5aa68fd614114e7d6cc6724f003ce58cbccff  heimdal-kpasswdd.initd
-b9b3204bc533c5865eb12174004bd0b1bf70397c603bd51c0e4ba6b2e9b0591d  003_all_heimdal-rxapps.patch
-c83c04822f5178556b4c3b0973f56c9ede328378bc2bbbbf5e180d6798a38754  005_all_heimdal-suid_fix.patch
-e9b5ca5bab430500b25ff5191d3bb2fd85133c5b4649c21cbc51f6c7d9151e5e  014_all_heimdal-path.patch
-6efb369eb42dcaaf20b9d0fa267b09c3096b9a7403fb9ad5364ad588e4659a62  telnetd.patch
-1ad9d71d01776e2d2dd49da5951f6f02630ce137be910ff8484968e8327837c3  heimdal_missing-include.patch
-0620144d5f4c8a477276da487875e573c2bab4f5ea056c70b1eec2e13cffed58  heimdal_missing_symbols.patch
-1a3d06b306fb30e5ce947d612901b2b246d2b6af3e7234c6b10c13f29c376349  heimdal-1.5-use-perl-Getopt_Std.patch
-fb77b0c0dd4e5b55e65f16e2ddac99ece9bd20f505e2cef9c4d795224b6e0d86  heimdal_texinfo-5.patch
-75e6aeeaa91174c470cbb007cd89cf4f0f9bc4955bdc2062b4d3132d12ca481b  heimdal-remove-broken-auth.patch"
-sha512sums="5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431  heimdal-1.5.3.tar.gz
+c4f3550e3938b82e31a616b90fbe9fb2f2bd775e108e31cc355d29ac5ab6a25a  003_all_heimdal-rxapps.patch
+05b10444d50a3b4074b7539ea2ba39569b1e0704c061e9e93fdb6bd3fc59feb6  005_all_heimdal-suid_fix.patch
+7fa05b0a5a149ce852d7c61ae97a6ed99022010d6a8c5ed9fe6686527ac4c289  014_all_heimdal-path.patch
+6b78762077e6952e775b3e3471b8c53828d9b284866c4cdd2891acb26393f8ec  telnetd.patch
+1cd63bd7ecbcf502859c37777a6f64c043c6da298a24ac582490e7c0b06fc5c0  heimdal_missing-include.patch
+28d4828914f8ffcf940aaea54b1051caa4b9ae0618a24e82506c004bed8a1bdc  heimdal-remove-broken-auth.patch
+f23b413b444e4866c4cf3b516cff835cdd03ec438f8487ec8dae39bca489b854  libkadm5clnt-version-script.patch"
+sha512sums="18c1bdbb003c18535f19fcde4121c80544597d0409fcde83721f6489ef8f16bdd320a4dee0392cf57555dfd76ffe8b416b11b1086759bbfca112db959ed53f5f  heimdal-1.6rc2.tar.gz
 ce48a30fea02c630e94a25214fa792d107a66f4703c81fa924467f67e909d830732e92b3433b049bd4683591276b3e13e6637b8c217577fa1964fb152342539e  heimdal-kadmind.initd
 aecad5b194522d032ff56b65d878548d0f6502757f5e802f7f8616bc7686a540079f812f652b0c219c7514a04cec9e7dcaadecaa1666a325fa2f10d6f95f34bf  heimdal-kdc.initd
 784c1d8d08742509b1a074d623abd8f0e2d2a862ea1b76afd34e381d60b6510e0bc97d7d53c42e670657e29187809b1f19e4562fbd4dc8abc1a738b79f94bd65  heimdal-kpasswdd.initd
-cf5c785f33a7ee81f47c0a3b457deab0b65d0ccfb6eff51fd61ecc61706f515910351ed820eaba90715d4ce6ceb139cebe44bc4c0afd87dc4cdf927815090ffa  003_all_heimdal-rxapps.patch
-fc0b28aa34e1df1dd2d43628f460120311bbf242e00e7a978f8663fb9168e62e97a990f1ff045c3c2c440ac4db3eea9a0c9325dd69eaf5dd053a114923868c86  005_all_heimdal-suid_fix.patch
-45180ac9968491ddc1ea271a00befdf917dc48648ee38b192a849e4e878fd2845fc5ed8b8b7f09071de12661e17e570f67ad1b099e8e133422f6948270a36191  014_all_heimdal-path.patch
-eb6ec2606556c004d83cc52d3537f8a42dace7992c05dc474de44b66333442b218bbdd4408ee86b65692f8d8b10e37a51efb41cefd26a3db713b471217cd6bb8  telnetd.patch
-18f4a5b0c74ae11fbd8874d2954639f36d480655d978af2b2dd19a8ec2b206057ef4be5861d8daca0725926b295604daeaa895b6024b2098922cd189d3e4484b  heimdal_missing-include.patch
-af3ce21d6fe2e5b8902167a556bc48c29f544da2556ef0635308bdc0f9c9538b8afe7a6f3964c4a4f1d87db09da01a2d8c777e1339c28933b758f71d786b5bf7  heimdal_missing_symbols.patch
-07bfcc27dc7d15cdd282770ad1e91d0aeaecdb6f4c2463b75352550b7ec116399fca00445d800bfb6ce825e58c05ec0c81c0d3e92ffde037bf3d774b4a2f2500  heimdal-1.5-use-perl-Getopt_Std.patch
-12abf4837c0daff6e51e8728dcf55752407e3616c8d657409d159119d60133a268e664a7eb1a6ad8632f17ef194933fac035c2856299ba4c4fb6053208cd1608  heimdal_texinfo-5.patch
-db549d2f4293290a7a9c3a1a0df85c66d82e710acff5d86df0d272f7567f448200e00aee82ca6136ec58f69403a1a127b963683f7a25165dc41a751e10225f69  heimdal-remove-broken-auth.patch"
+9aaa09cdaddb958ee08f3341f6f72c4f8949680be4ebd489dc4a1e83308164674d46d9a3ba5254d23943650f26b67d0df01b6e5448e0d75d8fa773835728ac77  003_all_heimdal-rxapps.patch
+2a6b20588a86a9ea3c35209b96ef2da0b39bc3112aec1505e69a60efc9ffb9ddc1d0dbdfaf864142e9d2f81da3d2653de56d6ffa01871c20fde17e4642625c56  005_all_heimdal-suid_fix.patch
+b242cbdbd5e656e30b39fa88767d2024e9895ea6c047c061f15bbde003d02289f0fc8b63aaa7ab1e4166e2ce9adf6d2a361ae3f8ed6af7e338865be9ef909205  014_all_heimdal-path.patch
+cc8775c02197ee6dc60bd62a34a03b57bafbc8e040da62028c64832bb036c29b0664eb7d19c5ff8bcf3aeb10d413fd06b7cefac610a906dafa8c2f527a73195c  telnetd.patch
+e89efdc942c512363aac1d9797c6bf622324e9200e282bc5ed680300b9e1b39a4ea20f059cdac8f22f972eb0af0e625fd41f267ebcafcfec0aaa81192aff79c1  heimdal_missing-include.patch
+74be145d6ebffa275e9411f2dbb1c3ccac41935457cb3b9482a7346ade987696a037f41cebd2677274b4827777c88a07a5336f494923fc4715dfda026ed918d2  heimdal-remove-broken-auth.patch
+157e0a6f11688c93253aaae74f1ee3892e66413baa152bbc104ac0d61efc22ffcff53130ac897c4f5e49b4f160f260f159e68396d7cf1f3ca6dd72e3ac694ae3  libkadm5clnt-version-script.patch"
diff --git a/main/heimdal/heimdal-1.5-use-perl-Getopt_Std.patch b/main/heimdal/heimdal-1.5-use-perl-Getopt_Std.patch
deleted file mode 100644
index 4f89ed2090..0000000000
--- a/main/heimdal/heimdal-1.5-use-perl-Getopt_Std.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cf/make-proto.pl
-+++ cf/make-proto.pl
-@@ -1,8 +1,8 @@
- # Make prototypes from .c files
- # $Id$
- 
--##use Getopt::Std;
--require 'getopts.pl';
-+use Getopt::Std;
-+##require 'getopts.pl';
- 
- my $comment = 0;
- my $if_0 = 0;
-@@ -13,7 +13,7 @@
- my $private_func_re = "^_";
- my %depfunction = ();
- 
--Getopts('x:m:o:p:dqE:R:P:') || die "foo";
-+getopts('x:m:o:p:dqE:R:P:') || die "foo";
- 
- if($opt_d) {
-     $debug = 1;
diff --git a/main/heimdal/heimdal-remove-broken-auth.patch b/main/heimdal/heimdal-remove-broken-auth.patch
index 1affcba2c2..97e272bd06 100644
--- a/main/heimdal/heimdal-remove-broken-auth.patch
+++ b/main/heimdal/heimdal-remove-broken-auth.patch
@@ -1,5 +1,5 @@
 --- appl/rsh/rsh.c.orig
-+++ appl/rsh/rsh.c
++++ b/appl/rsh/rsh.c
 @@ -399,6 +399,8 @@
  
  #endif /* KRB5 */
@@ -113,7 +113,7 @@
      return ret;
  }
 --- appl/rsh/rshd.c.orig
-+++ appl/rsh/rshd.c
++++ b/appl/rsh/rshd.c
 @@ -131,6 +131,7 @@
      fatal(s, NULL, "%s too long", expl);
  }
diff --git a/main/heimdal/heimdal_missing-include.patch b/main/heimdal/heimdal_missing-include.patch
index e245cf8fff..8cca906a75 100644
--- a/main/heimdal/heimdal_missing-include.patch
+++ b/main/heimdal/heimdal_missing-include.patch
@@ -1,5 +1,5 @@
---- base/test_base.c	2011-09-30 15:58:45.000000000 +0300
-+++ base/test_base.c	2011-12-27 23:04:50.482955923 +0200
+--- lib/base/test_base.c	2011-09-30 15:58:45.000000000 +0300
++++ b/lib/base/test_base.c	2011-12-27 23:04:50.482955923 +0200
 @@ -39,6 +39,8 @@
  #include "heimbase.h"
  #include "heimbasepriv.h"
diff --git a/main/heimdal/heimdal_missing_symbols.patch b/main/heimdal/heimdal_missing_symbols.patch
deleted file mode 100644
index 21b6975a8b..0000000000
--- a/main/heimdal/heimdal_missing_symbols.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Add missing symbols.  Cherry picked from upstream master.
-Bug #420821.
-
---- lib/krb5/version-script.map	2012-01-10 21:53:51.000000000 +0000
-+++ lib/krb5/version-script.map	2012-06-13 16:23:26.000000000 +0000
-@@ -42,6 +42,7 @@
- 		krb5_auth_con_getrcache;
- 		krb5_auth_con_getremoteseqnumber;
- 		krb5_auth_con_getremotesubkey;
-+		krb5_auth_con_getsendsubkey;
- 		krb5_auth_con_init;
- 		krb5_auth_con_removeflags;
- 		krb5_auth_con_setaddrs;
-@@ -383,6 +384,14 @@
- 		krb5_h_errno_to_heim_errno;
- 		krb5_have_error_string;
- 		krb5_hmac;
-+		krb5_init_creds_init;
-+		krb5_init_creds_set_service;
-+		krb5_init_creds_set_keytab;
-+		krb5_init_creds_get;
-+		krb5_init_creds_set_password;
-+		krb5_init_creds_free;
-+		krb5_init_creds_get_creds;
-+		krb5_init_creds_get_error;
- 		krb5_init_context;
- 		krb5_init_ets;
- 		krb5_initlog;
diff --git a/main/heimdal/heimdal_texinfo-5.patch b/main/heimdal/heimdal_texinfo-5.patch
deleted file mode 100644
index 8f0ef099e0..0000000000
--- a/main/heimdal/heimdal_texinfo-5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- doc/whatis.texi	2012-12-10 00:06:44.000000000 +0200

-+++ doc/whatis.texi	2013-04-08 15:11:44.646165777 +0300

-@@ -36,8 +36,8 @@

- @end ifinfo

- 

- @tex

--@def@xsub#1{$_{#1}$}

--@global@let@sub=@xsub

-+@@def@@xsub#1@{$_@{#1@}$@}

-+@@global@@let@@sub=@@xsub

- @end tex

- 

- @ifhtml

---- doc/win2k.texi	2012-12-10 00:06:44.000000000 +0200

-+++ doc/win2k.texi	2013-04-08 16:17:21.316961234 +0300

-@@ -311,4 +311,5 @@

- 

- @itemize @bullet

- @item pwdump2

--@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize

-+@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}

-+@end itemize

diff --git a/main/heimdal/libkadm5clnt-version-script.patch b/main/heimdal/libkadm5clnt-version-script.patch
new file mode 100644
index 0000000000..6f0b94fc60
--- /dev/null
+++ b/main/heimdal/libkadm5clnt-version-script.patch
@@ -0,0 +1,66 @@
+taken from upstream:
+https://github.com/heimdal/heimdal/commit/60797fb20fcdb6f3234f52c0cbd3c5b37563c437
+
+diff --git a/lib/kadm5/version-script-client.map b/lib/kadm5/version-script-client.map
+new file mode 100644
+index 0000000..4cfb079
+--- /dev/null
++++ b/lib/kadm5/version-script-client.map
+@@ -0,0 +1,57 @@
++HEIMDAL_KADM5_CLIENT_1.0 {
++	global:
++		et_kadm5_error_table;
++		initialize_kadm5_error_table;
++		initialize_kadm5_error_table_r;
++		kadm5_ad_init_with_password;
++		kadm5_ad_init_with_password_ctx;
++		kadm5_c_chpass_principal;
++		kadm5_c_chpass_principal_with_key;
++		kadm5_c_create_principal;
++		kadm5_c_delete_principal;
++		kadm5_c_destroy;
++		kadm5_c_flush;
++		kadm5_c_get_principal;
++		kadm5_c_get_principals;
++		kadm5_c_get_privs;
++		kadm5_c_init_with_creds;
++		kadm5_c_init_with_creds_ctx;
++		kadm5_c_init_with_password;
++		kadm5_c_init_with_password_ctx;
++		kadm5_c_init_with_skey;
++		kadm5_c_init_with_skey_ctx;
++		kadm5_c_modify_principal;
++		kadm5_c_randkey_principal;
++		kadm5_c_rename_principal;
++		kadm5_chpass_principal;
++		kadm5_chpass_principal_with_key;
++		kadm5_create_principal;
++		kadm5_delete_principal;
++		kadm5_destroy;
++		kadm5_flush;
++		kadm5_free_key_data;
++		kadm5_free_name_list;
++		kadm5_free_principal_ent;
++		kadm5_get_principal;
++		kadm5_get_principals;
++		kadm5_get_privs;
++		kadm5_init_with_creds;
++		kadm5_init_with_creds_ctx;
++		kadm5_init_with_password;
++		kadm5_init_with_password_ctx;
++		kadm5_init_with_skey;
++		kadm5_init_with_skey_ctx;
++		kadm5_modify_principal;
++		kadm5_randkey_principal;
++		kadm5_rename_principal;
++		kadm5_ret_key_data;
++		kadm5_ret_principal_ent;
++		kadm5_ret_principal_ent_mask;
++		kadm5_ret_tl_data;
++		kadm5_store_key_data;
++		kadm5_store_principal_ent;
++		kadm5_store_principal_ent_mask;
++		kadm5_store_tl_data;
++	local:
++		*;
++};
diff --git a/main/heimdal/telnetd.patch b/main/heimdal/telnetd.patch
index 9c4d10386c..25116228b2 100644
--- a/main/heimdal/telnetd.patch
+++ b/main/heimdal/telnetd.patch
@@ -1,7 +1,7 @@
 Index: crypto/heimdal/appl/telnet/libtelnet/encrypt.c
 ===================================================================
 --- appl/telnet/libtelnet/encrypt.c	(revision 228798)
-+++ appl/telnet/libtelnet/encrypt.c	(working copy)
++++ b/appl/telnet/libtelnet/encrypt.c	(working copy)
 @@ -736,6 +736,9 @@
      int dir = kp->dir;
      int ret = 0;