From 312752b5bd8f457730afa421330dff5da25f8faa Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Tue, 17 Jan 2017 09:32:50 +0000 Subject: main/heimdal: upgrade to 7.1.0 --- main/heimdal/003_all_heimdal-rxapps.patch | 22 ---- main/heimdal/014_all_heimdal-path.patch | 50 -------- main/heimdal/022_all_heimdal-as-needed.patch | 22 ---- main/heimdal/100-check-com_err-pthread.patch | 11 -- main/heimdal/APKBUILD | 105 ++-------------- main/heimdal/heimdal-remove-broken-auth.patch | 163 ------------------------- main/heimdal/libkadm5clnt-version-script.patch | 66 ---------- main/heimdal/telnetd.patch | 14 --- 8 files changed, 11 insertions(+), 442 deletions(-) delete mode 100644 main/heimdal/003_all_heimdal-rxapps.patch delete mode 100644 main/heimdal/014_all_heimdal-path.patch delete mode 100644 main/heimdal/022_all_heimdal-as-needed.patch delete mode 100644 main/heimdal/100-check-com_err-pthread.patch delete mode 100644 main/heimdal/heimdal-remove-broken-auth.patch delete mode 100644 main/heimdal/libkadm5clnt-version-script.patch delete mode 100644 main/heimdal/telnetd.patch (limited to 'main') diff --git a/main/heimdal/003_all_heimdal-rxapps.patch b/main/heimdal/003_all_heimdal-rxapps.patch deleted file mode 100644 index a175faf21a..0000000000 --- a/main/heimdal/003_all_heimdal-rxapps.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- appl/kx/rxtelnet.in 2005-06-16 18:29:10.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 $ - # - 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 -+++ 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 $ - # - 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/main/heimdal/014_all_heimdal-path.patch b/main/heimdal/014_all_heimdal-path.patch deleted file mode 100644 index cbe53aa4e5..0000000000 --- a/main/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 -+++ b/appl/rcp/rcp.c 2006-05-03 13:32:04.494485981 +0200 -@@ -34,7 +34,7 @@ - #include "rcp_locl.h" - #include - --#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 -+++ b/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 -+++ b/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 -+++ b/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/main/heimdal/022_all_heimdal-as-needed.patch b/main/heimdal/022_all_heimdal-as-needed.patch deleted file mode 100644 index 8c48685519..0000000000 --- a/main/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 -+++ b/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 -+++ b/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/main/heimdal/100-check-com_err-pthread.patch b/main/heimdal/100-check-com_err-pthread.patch deleted file mode 100644 index ca58da32d7..0000000000 --- a/main/heimdal/100-check-com_err-pthread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- heimdal-1.3.1/cf/check-compile-et.m4.orig -+++ 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 - krb_cv_save_LIBS="${LIBS}" -- LIBS="${LIBS} -lcom_err" -+ LIBS="${LIBS} -lcom_err -lpthread" - AC_MSG_CHECKING(for com_err) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],[[ - const char *p; diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD index cf69e57b3a..1a58f7810e 100644 --- a/main/heimdal/APKBUILD +++ b/main/heimdal/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Leonardo Arena # Contributor: Natanael Copa pkgname=heimdal -pkgver=1.6_rc2 +pkgver=7.1.0 _ver=${pkgver/_rc/rc} -pkgrel=5 +pkgrel=0 pkgdesc="An implementation of Kerberos 5" arch="all" url="http://www.h5l.org/" @@ -14,21 +14,14 @@ makedepends="$depends_dev autoconf automake bash gawk libtool ncurses-dev perl readline-dev sqlite-dev texinfo perl-json" install= 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-$_ver.tar.gz +subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" +source="http://www.h5l.org/dist/src/heimdal-$pkgver.tar.gz heimdal-kadmind.initd heimdal-kdc.initd heimdal-kpasswdd.initd - 003_all_heimdal-rxapps.patch 005_all_heimdal-suid_fix.patch - 014_all_heimdal-path.patch - telnetd.patch heimdal_missing-include.patch - heimdal-remove-broken-auth.patch - libkadm5clnt-version-script.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -44,9 +37,6 @@ prepare() { esac done - # name clash with ruserpass in netdb.h - sed -i -e 's/ruserpass/ruserpw/g' appl/ftp/ftp/*.[ch] || return 1 - sh ./autogen.sh || return 1 } @@ -94,31 +84,14 @@ package() { install -m755 -D "$srcdir"/heimdal-kpasswdd.initd \ "$pkgdir"/etc/init.d/heimdal-kpasswdd || 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 for i in 1 3 5 8; do - rm -rf "$pkgdir"/usr/share/man/cat$i + rm -rf "$pkgdir"/usr/share/man/cat$i || return 1 done # Remove conflicts # e2fsprogs rm -f "$pkgdir"/usr/bin/compile_et \ "$pkgdir"/usr/share/man/man1/compile_et.1 || return 1 - # man-page - rm "$pkgdir"/usr/share/man/man5/ftpusers.5* || return 1 - # erlang - rm "$pkgdir"/usr/share/man/man3/os.3* || return 1 # Compress info pages for page in heimdal hx509; do @@ -146,77 +119,21 @@ libs() { } -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="152ca82660864acf7f712ae1a57e6795 heimdal-1.6rc2.tar.gz +md5sums="bbeedb8eae6f81b12cbbaada4faaeb47 heimdal-7.1.0.tar.gz 872a6de29fc4dd2d4001d66f9e2206f7 heimdal-kadmind.initd 823a47e3bfc9530f19353dc02c96c290 heimdal-kdc.initd ba4ecfbd48cd59b6a239835a501a0c36 heimdal-kpasswdd.initd -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 +9a8db1ed3098a1b1073aa8b75b8084c8 heimdal_missing-include.patch" +sha256sums="cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d heimdal-7.1.0.tar.gz a69218c8320b730b884631aa4a2548ddc0dbd864b458e26314c22bf903d6ddbd heimdal-kadmind.initd 4cb005716e195116421d9fbf021d6d6178e487232610854f9c9a1d0aaf798d56 heimdal-kdc.initd 0bbe7c4231ba8126f6cac2869da5c8b074b987c23a3940b9bda8caa269fc6bfd heimdal-kpasswdd.initd -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 +1cd63bd7ecbcf502859c37777a6f64c043c6da298a24ac582490e7c0b06fc5c0 heimdal_missing-include.patch" +sha512sums="5afc9d183ff0db6e82e83d47955cc77e775bc60569e2905f9106c31b8a33e8d67fbc042dd4836ebae094db38bf70ba858c224189fed8d55f277738ee6e76352e heimdal-7.1.0.tar.gz 0ae0fec4bdb3907d9e82e788e12ef185dd00e6db4c17f55758da5600fedd72ed1118b6b492d039f91cc54d54bf2f79f624ea38a68067e424b737b128494a4bbd heimdal-kadmind.initd 4dca69bb1c1c6dfce8c0fc1da84855e4549be478ab09511fa5143ee61d1609fed7f3303179bc1e499b0f20445e04c41eda132dd1c5f72e2fea4fcf60a35ad2a9 heimdal-kdc.initd abee8390632fa775e74900d09e5c72b02fe4f9616b43cc8d0a76175486ed6d4707fb3ce4d06ceb09b0e8d1384e037c3cff6525e11def0122c35c32eebd0d196f heimdal-kpasswdd.initd -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" +e89efdc942c512363aac1d9797c6bf622324e9200e282bc5ed680300b9e1b39a4ea20f059cdac8f22f972eb0af0e625fd41f267ebcafcfec0aaa81192aff79c1 heimdal_missing-include.patch" diff --git a/main/heimdal/heimdal-remove-broken-auth.patch b/main/heimdal/heimdal-remove-broken-auth.patch deleted file mode 100644 index 97e272bd06..0000000000 --- a/main/heimdal/heimdal-remove-broken-auth.patch +++ /dev/null @@ -1,163 +0,0 @@ ---- appl/rsh/rsh.c.orig -+++ b/appl/rsh/rsh.c -@@ -399,6 +399,8 @@ - - #endif /* KRB5 */ - -+#ifdef BROKEN_AUTH -+ - static int - send_broken_auth(int s, - struct sockaddr *thisaddr, -@@ -428,6 +430,8 @@ - return 0; - } - -+#endif /* BROKEN_AUTH */ -+ - static int - proto (int s, int errsock, - const char *hostname, const char *local_user, const char *remote_user, -@@ -629,6 +633,8 @@ - return res; - } - -+#ifdef BROKEN_AUTH -+ - static int - doit_broken (int argc, - char **argv, -@@ -702,6 +708,8 @@ - } - } - -+#endif -+ - #if defined(KRB5) - static int - doit (const char *hostname, -@@ -796,7 +804,9 @@ - { "protocol", 'P', arg_string, &protocol_version_str, - "Protocol version [krb5]", "protocol" }, - #endif -+#ifdef BROKEN_AUTH - { "broken", 'K', arg_flag, &use_only_broken, "Use only priv port" }, -+#endif - #if defined(KRB5) - { "encrypt", 'x', arg_flag, &do_encrypt, "Encrypt connection" }, - { NULL, 'z', arg_negative_flag, &do_encrypt, -@@ -831,8 +841,10 @@ - int - main(int argc, char **argv) - { -+#ifdef BROKEN_AUTH - int priv_port1, priv_port2; - int priv_socket1, priv_socket2; -+#endif - int argindex = 0; - int error; - struct addrinfo hints, *ai; -@@ -848,9 +860,11 @@ - #endif - uid_t uid; - -+#ifdef BROKEN_AUTH - priv_port1 = priv_port2 = IPPORT_RESERVED-1; - priv_socket1 = rresvport(&priv_port1); - priv_socket2 = rresvport(&priv_port2); -+#endif - uid = getuid (); - if (setuid (uid) || (uid != 0 && setuid(0) == 0)) - err (1, "setuid"); -@@ -907,6 +921,7 @@ - - #endif - -+#ifdef BROKEN_AUTH - if (use_only_broken) { - #ifdef KRB5 - use_v5 = 0; -@@ -918,6 +933,7 @@ - errx (1, "unable to bind reserved port: is rsh setuid root?"); - use_broken = 0; - } -+#endif - - #if defined(KRB5) - if (do_encrypt == 1 && use_only_broken) -@@ -956,8 +972,10 @@ - } - - if (argindex == argc) { -+#ifdef BROKEN_AUTH - close (priv_socket1); - close (priv_socket2); -+#endif - argv[0] = "rlogin"; - execvp ("rlogin", argv); - err (1, "execvp rlogin"); -@@ -1004,6 +1022,7 @@ - freeaddrinfo(ai); - } - #endif -+#ifdef BROKEN_AUTH - if (ret && use_broken) { - memset (&hints, 0, sizeof(hints)); - hints.ai_socktype = SOCK_STREAM; -@@ -1027,6 +1046,7 @@ - cmd, cmd_len); - freeaddrinfo(ai); - } -+#endif - free(cmd); - return ret; - } ---- appl/rsh/rshd.c.orig -+++ b/appl/rsh/rshd.c -@@ -131,6 +131,7 @@ - fatal(s, NULL, "%s too long", expl); - } - -+#ifdef BROKEN_AUTH - static int - recv_bsd_auth (int s, u_char *buf, - struct sockaddr_in *thisaddr, -@@ -152,6 +153,7 @@ - fatal(s, NULL, "Login incorrect."); - return 0; - } -+#endif - - #ifdef KRB5 - static int -@@ -658,10 +660,11 @@ - /* - * we only do reserved port for IPv4 - */ -- -+#ifdef BROKEN_AUTH - if (erraddr->sa_family == AF_INET) - errsock = rresvport (&priv_port); - else -+#endif - errsock = socket (erraddr->sa_family, SOCK_STREAM, 0); - if (errsock < 0) - syslog_and_die ("socket: %s", strerror(errno)); -@@ -689,6 +692,7 @@ - syslog_and_die ("unrecognized auth protocol: %x %x %x %x", - buf[0], buf[1], buf[2], buf[3]); - } else { -+#ifdef BROKEN_AUTH - if(recv_bsd_auth (s, buf, - (struct sockaddr_in *)thisaddr, - (struct sockaddr_in *)thataddr, -@@ -702,6 +706,9 @@ - } - } else - syslog_and_die("recv_bsd_auth failed"); -+#else -+ syslog_and_die("recv_bsd_auth is disabled for security reasons"); -+#endif - } - - if (client_user == NULL || server_user == NULL || cmd == NULL) diff --git a/main/heimdal/libkadm5clnt-version-script.patch b/main/heimdal/libkadm5clnt-version-script.patch deleted file mode 100644 index 6f0b94fc60..0000000000 --- a/main/heimdal/libkadm5clnt-version-script.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 deleted file mode 100644 index 25116228b2..0000000000 --- a/main/heimdal/telnetd.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: crypto/heimdal/appl/telnet/libtelnet/encrypt.c -=================================================================== ---- appl/telnet/libtelnet/encrypt.c (revision 228798) -+++ b/appl/telnet/libtelnet/encrypt.c (working copy) -@@ -736,6 +736,9 @@ - int dir = kp->dir; - int ret = 0; - -+ if (len > MAXKEYLEN) -+ len = MAXKEYLEN; -+ - if (!(ep = (*kp->getcrypt)(*kp->modep))) { - if (len == 0) - return; -- cgit v1.2.3