update to latest stable upstream version

11 files changed, 29 insertions, 103 deletions

diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index c20a09ce5..2af556c9e 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -4,16 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		krb5
-PKG_VERSION:=		1.11.3
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		56f0ae274b285320b8a597cb89442449
+PKG_VERSION:=		1.12.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		524b1067b619cb5bf780759b6884c3f5
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libkrb5 libncurses libss libcom-err keyutils
 PKG_DEPENDS+=		libpthread
 PKG_BUILDDEP:=		ncurses e2fsprogs gettext-tiny bison-host
 PKG_URL:=		http://web.mit.edu/kerberos/
-PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.11/
+PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.12/
 PKG_NOPARALLEL:=	1
 PKG_LIBNAME:=		libkrb5
 PKG_OPTS:=		dev
diff --git a/package/krb5/patches/patch-src_include_k5-int_h b/package/krb5/patches/patch-src_include_k5-int_h
index 1c6dd8e05..65bd936e6 100644
--- a/package/krb5/patches/patch-src_include_k5-int_h
+++ b/package/krb5/patches/patch-src_include_k5-int_h
@@ -1,6 +1,6 @@
---- krb5-1.11.3.orig/src/include/k5-int.h	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/include/k5-int.h	2013-08-14 14:05:17.000000000 +0200
-@@ -1156,7 +1156,7 @@ void k5_free_pa_otp_challenge(krb5_conte
+--- krb5-1.12.1.orig/src/include/k5-int.h	2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/include/k5-int.h	2014-02-11 18:55:39.000000000 +0100
+@@ -904,7 +904,7 @@ void k5_free_pa_otp_challenge(krb5_conte
  void k5_free_pa_otp_req(krb5_context context, krb5_pa_otp_req *val);
  
  /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */
diff --git a/package/krb5/patches/patch-src_include_osconf_hin b/package/krb5/patches/patch-src_include_osconf_hin
deleted file mode 100644
index cd22cccf4..000000000
--- a/package/krb5/patches/patch-src_include_osconf_hin
+++ /dev/null
@@ -1,21 +0,0 @@
---- krb5-1.11.3.orig/src/include/osconf.hin	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/include/osconf.hin	2013-08-14 14:05:17.000000000 +0200
-@@ -58,14 +58,14 @@
- #define DEFAULT_PLUGIN_BASE_DIR "@LIBDIR/krb5/plugins"
- #define PLUGIN_EXT              "@DYNOBJEXT"
- 
--#define DEFAULT_KDB_FILE        "@LOCALSTATEDIR/krb5kdc/principal"
--#define DEFAULT_KEYFILE_STUB    "@LOCALSTATEDIR/krb5kdc/.k5."
--#define KRB5_DEFAULT_ADMIN_ACL  "@LOCALSTATEDIR/krb5kdc/krb5_adm.acl"
-+#define DEFAULT_KDB_FILE        "@SYSCONFDIR/krb5kdc/principal"
-+#define DEFAULT_KEYFILE_STUB    "@SYSCONFDIR/krb5kdc/.k5."
-+#define KRB5_DEFAULT_ADMIN_ACL  "@SYSCONFDIR/krb5kdc/krb5_adm.acl"
- /* Used by old admin server */
- #define DEFAULT_ADMIN_ACL       "@LOCALSTATEDIR/krb5kdc/kadm_old.acl"
- 
- /* Location of KDC profile */
--#define DEFAULT_KDC_PROFILE     "@LOCALSTATEDIR/krb5kdc/kdc.conf"
-+#define DEFAULT_KDC_PROFILE     "@SYSCONFDIR/krb5kdc/kdc.conf"
- #define KDC_PROFILE_ENV         "KRB5_KDC_PROFILE"
- 
- #if TARGET_OS_MAC
diff --git a/package/krb5/patches/patch-src_kdc_main_c b/package/krb5/patches/patch-src_kdc_main_c
deleted file mode 100644
index 5b2e32607..000000000
--- a/package/krb5/patches/patch-src_kdc_main_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- krb5-1.11.3.orig/src/kdc/main.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/kdc/main.c	2013-08-14 14:05:17.000000000 +0200
-@@ -34,7 +34,6 @@
- #include <sys/wait.h>
- 
- #include "k5-int.h"
--#include "com_err.h"
- #include "adm.h"
- #include "adm_proto.h"
- #include "kdc_util.h"
diff --git a/package/krb5/patches/patch-src_krb5-config_in b/package/krb5/patches/patch-src_krb5-config_in
deleted file mode 100644
index cfbe7b475..000000000
--- a/package/krb5/patches/patch-src_krb5-config_in
+++ /dev/null
@@ -1,22 +0,0 @@
---- krb5-1.11.3.orig/src/krb5-config.in	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/krb5-config.in	2013-08-14 14:05:17.000000000 +0200
-@@ -34,8 +34,6 @@ libdir=@libdir@
- CC_LINK='@CC_LINK@'
- KDB5_DB_LIB=@KDB5_DB_LIB@
- LDFLAGS='@LDFLAGS@'
--RPATH_FLAG='@RPATH_FLAG@'
--PROG_RPATH_FLAGS='@PROG_RPATH_FLAGS@'
- PTHREAD_CFLAGS='@PTHREAD_CFLAGS@'
- DL_LIB='@DL_LIB@'
- DEFCCNAME='@DEFCCNAME@'
-@@ -213,10 +211,7 @@ if test -n "$do_libs"; then
-     # Ugly gross hack for our build tree
-     lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \
- 	    -e 's/\$(PURE)//' \
--	    -e 's#\$(PROG_RPATH_FLAGS)#'"$PROG_RPATH_FLAGS"'#' \
--	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
- 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
--	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
- 	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
- 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- 	    -e 's#\$(CFLAGS)##'`
diff --git a/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c
index dd47baea6..e29061185 100644
--- a/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c
+++ b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c
@@ -1,11 +1,11 @@
---- krb5-1.11.3.orig/src/lib/kadm5/alt_prof.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/lib/kadm5/alt_prof.c	2013-10-09 09:42:35.000000000 +0200
-@@ -164,7 +164,7 @@ krb5_aprof_get_boolean(krb5_pointer acon
-     char **values;
-     char *valp;
+--- krb5-1.12.1.orig/src/lib/kadm5/alt_prof.c	2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/lib/kadm5/alt_prof.c	2014-02-11 18:55:39.000000000 +0100
+@@ -155,7 +155,7 @@ krb5_aprof_get_boolean(krb5_pointer acon
+     krb5_error_code ret;
+     char **values, *valp;
      int idx;
 -    krb5_boolean val;
 +    krb5_boolean val = 0;
  
-     kret = krb5_aprof_getvals (acontext, hierarchy, &values);
-     if (kret)
+     ret = krb5_aprof_getvals(acontext, hierarchy, &values);
+     if (ret)
diff --git a/package/krb5/patches/patch-src_lib_krad_packet_c b/package/krb5/patches/patch-src_lib_krad_packet_c
new file mode 100644
index 000000000..71d3c53e1
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_krad_packet_c
@@ -0,0 +1,12 @@
+--- krb5-1.12.1.orig/src/lib/krad/packet.c	2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/lib/krad/packet.c	2014-02-11 19:01:06.000000000 +0100
+@@ -253,8 +253,8 @@ krad_packet_new_request(krb5_context ctx
+ {
+     krb5_error_code retval;
+     krad_packet *pkt;
+-    uchar id;
+     size_t attrset_len;
++    uchar id = NULL;
+ 
+     pkt = packet_new();
+     if (pkt == NULL) {
diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c b/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c
index a451a2710..f121d4b37 100644
--- a/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c
+++ b/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c
@@ -1,5 +1,5 @@
---- krb5-1.11.3.orig/src/lib/krb5/krb/gic_pwd.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/lib/krb5/krb/gic_pwd.c	2013-08-14 14:05:17.000000000 +0200
+--- krb5-1.12.1.orig/src/lib/krb5/krb/gic_pwd.c	2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/lib/krb5/krb/gic_pwd.c	2014-02-11 18:55:39.000000000 +0100
 @@ -1,6 +1,6 @@
  /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
  #include "k5-int.h"
@@ -7,4 +7,4 @@
 +#include <et/com_err.h>
  #include "init_creds_ctx.h"
  #include "int-proto.h"
- 
+ #include "os-proto.h"
diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c b/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c
deleted file mode 100644
index c2d8a1a0e..000000000
--- a/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- krb5-1.11.3.orig/src/lib/krb5/krb/preauth2.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/lib/krb5/krb/preauth2.c	2013-10-09 09:30:28.000000000 +0200
-@@ -957,7 +957,7 @@ krb5_do_preauth(krb5_context context, kr
-     size_t i, h;
-     int out_pa_list_size = 0;
-     krb5_pa_data **out_pa_list = NULL;
--    krb5_error_code ret, module_ret;
-+    krb5_error_code ret, module_ret = 0;
-     krb5_responder_fn responder = opte->opt_private->responder;
-     static const int paorder[] = { PA_INFO, PA_REAL };
- 
diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c b/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c
deleted file mode 100644
index 21f503a99..000000000
--- a/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- krb5-1.11.3.orig/src/lib/krb5/krb/sendauth.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/lib/krb5/krb/sendauth.c	2013-08-14 14:05:18.000000000 +0200
-@@ -25,7 +25,7 @@
-  */
- 
- #include "k5-int.h"
--#include "com_err.h"
-+#include <et/com_err.h>
- #include "auth_con.h"
- #include <errno.h>
- #include <stdio.h>
diff --git a/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c b/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c
deleted file mode 100644
index 1651c4df7..000000000
--- a/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- krb5-1.11.3.orig/src/lib/krb5/unicode/ucstr.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/lib/krb5/unicode/ucstr.c	2013-10-09 09:34:54.000000000 +0200
-@@ -109,7 +109,7 @@ krb5int_utf8_normalize(
- 		       krb5_data ** newdataptr,
- 		       unsigned flags)
- {
--    int i, j, len, clen, outpos, ucsoutlen, outsize;
-+    int i, j, len, clen, outpos = 0, ucsoutlen, outsize;
-     char *out = NULL, *outtmp, *s;
-     krb5_ucs4 *ucs = NULL, *p, *ucsout = NULL;
-     krb5_data *newdata;