krb5: updated to 1.13

6 files changed, 76 insertions, 106 deletions

diff --git a/krb5/.footprint b/krb5/.footprint
index 27e5b37dc..772d64a46 100644
--- a/krb5/.footprint
+++ b/krb5/.footprint
@@ -68,10 +68,13 @@ drwxr-xr-x	root/root	usr/lib/krb5/plugins/
 drwxr-xr-x	root/root	usr/lib/krb5/plugins/authdata/
 drwxr-xr-x	root/root	usr/lib/krb5/plugins/kdb/
 -rw-r--r--	root/root	usr/lib/krb5/plugins/kdb/db2.so
+-rw-r--r--	root/root	usr/lib/krb5/plugins/kdb/kldap.so
 drwxr-xr-x	root/root	usr/lib/krb5/plugins/libkrb5/
 drwxr-xr-x	root/root	usr/lib/krb5/plugins/preauth/
 -rw-r--r--	root/root	usr/lib/krb5/plugins/preauth/otp.so
 -rw-r--r--	root/root	usr/lib/krb5/plugins/preauth/pkinit.so
+drwxr-xr-x	root/root	usr/lib/krb5/plugins/tls/
+-rw-r--r--	root/root	usr/lib/krb5/plugins/tls/k5tls.so
 lrwxrwxrwx	root/root	usr/lib/libgssapi_krb5.so -> libgssapi_krb5.so.2.2
 lrwxrwxrwx	root/root	usr/lib/libgssapi_krb5.so.2 -> libgssapi_krb5.so.2.2
 -rw-r--r--	root/root	usr/lib/libgssapi_krb5.so.2.2
@@ -89,9 +92,12 @@ lrwxrwxrwx	root/root	usr/lib/libkadm5srv.so -> libkadm5srv_mit.so
 lrwxrwxrwx	root/root	usr/lib/libkadm5srv_mit.so -> libkadm5srv_mit.so.9.0
 lrwxrwxrwx	root/root	usr/lib/libkadm5srv_mit.so.9 -> libkadm5srv_mit.so.9.0
 -rw-r--r--	root/root	usr/lib/libkadm5srv_mit.so.9.0
-lrwxrwxrwx	root/root	usr/lib/libkdb5.so -> libkdb5.so.7.0
-lrwxrwxrwx	root/root	usr/lib/libkdb5.so.7 -> libkdb5.so.7.0
--rw-r--r--	root/root	usr/lib/libkdb5.so.7.0
+lrwxrwxrwx	root/root	usr/lib/libkdb5.so -> libkdb5.so.8.0
+lrwxrwxrwx	root/root	usr/lib/libkdb5.so.8 -> libkdb5.so.8.0
+-rw-r--r--	root/root	usr/lib/libkdb5.so.8.0
+lrwxrwxrwx	root/root	usr/lib/libkdb_ldap.so -> libkdb_ldap.so.1.0
+lrwxrwxrwx	root/root	usr/lib/libkdb_ldap.so.1 -> libkdb_ldap.so.1.0
+-rw-r--r--	root/root	usr/lib/libkdb_ldap.so.1.0
 lrwxrwxrwx	root/root	usr/lib/libkrad.so -> libkrad.so.0.0
 lrwxrwxrwx	root/root	usr/lib/libkrad.so.0 -> libkrad.so.0.0
 -rw-r--r--	root/root	usr/lib/libkrad.so.0.0
@@ -113,10 +119,46 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/krb5.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/mit-krb5-gssapi.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/mit-krb5.pc
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/cat1/
+drwxr-xr-x	root/root	usr/man/cat5/
+drwxr-xr-x	root/root	usr/man/cat8/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/k5srvutil.1.gz
+-rw-r--r--	root/root	usr/man/man1/kadmin.1.gz
+-rw-r--r--	root/root	usr/man/man1/kdestroy.1.gz
+-rw-r--r--	root/root	usr/man/man1/kinit.1.gz
+-rw-r--r--	root/root	usr/man/man1/klist.1.gz
+-rw-r--r--	root/root	usr/man/man1/kpasswd.1.gz
+-rw-r--r--	root/root	usr/man/man1/krb5-config.1.gz
+-rw-r--r--	root/root	usr/man/man1/ksu.1.gz
+-rw-r--r--	root/root	usr/man/man1/kswitch.1.gz
+-rw-r--r--	root/root	usr/man/man1/ktutil.1.gz
+-rw-r--r--	root/root	usr/man/man1/kvno.1.gz
+-rw-r--r--	root/root	usr/man/man1/sclient.1.gz
+drwxr-xr-x	root/root	usr/man/man5/
+-rw-r--r--	root/root	usr/man/man5/.k5identity.5.gz
+-rw-r--r--	root/root	usr/man/man5/.k5login.5.gz
+-rw-r--r--	root/root	usr/man/man5/k5identity.5.gz
+-rw-r--r--	root/root	usr/man/man5/k5login.5.gz
+-rw-r--r--	root/root	usr/man/man5/kadm5.acl.5.gz
+-rw-r--r--	root/root	usr/man/man5/kdc.conf.5.gz
+-rw-r--r--	root/root	usr/man/man5/krb5.conf.5.gz
+drwxr-xr-x	root/root	usr/man/man8/
+-rw-r--r--	root/root	usr/man/man8/kadmin.local.8.gz
+-rw-r--r--	root/root	usr/man/man8/kadmind.8.gz
+-rw-r--r--	root/root	usr/man/man8/kdb5_ldap_util.8.gz
+-rw-r--r--	root/root	usr/man/man8/kdb5_util.8.gz
+-rw-r--r--	root/root	usr/man/man8/kprop.8.gz
+-rw-r--r--	root/root	usr/man/man8/kpropd.8.gz
+-rw-r--r--	root/root	usr/man/man8/kproplog.8.gz
+-rw-r--r--	root/root	usr/man/man8/krb5kdc.8.gz
+-rw-r--r--	root/root	usr/man/man8/sserver.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/gss-server
 -rwxr-xr-x	root/root	usr/sbin/kadmin.local
 -rwxr-xr-x	root/root	usr/sbin/kadmind
+-rwxr-xr-x	root/root	usr/sbin/kdb5_ldap_util
 -rwxr-xr-x	root/root	usr/sbin/kdb5_util
 -rwxr-xr-x	root/root	usr/sbin/kprop
 -rwxr-xr-x	root/root	usr/sbin/kpropd
@@ -128,3 +170,5 @@ drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/uuserver
 drwxr-xr-x	root/root	usr/var/
 drwxr-xr-x	root/root	usr/var/krb5kdc/
+drwxr-xr-x	root/root	usr/var/run/
+drwxr-xr-x	root/root	usr/var/run/krb5kdc/
diff --git a/krb5/.md5sum b/krb5/.md5sum
index 759bf63ec..e539c74af 100644
--- a/krb5/.md5sum
+++ b/krb5/.md5sum
@@ -1,3 +1,2 @@
-357f1312b7720a0a591e22db0f7829fe  krb5-1.12.2-signed.tar
-72a3d9a42e8585fd2cf6b214318e5e10  mit-krb5-1.11_uninitialized.patch
-656e242de9b5ada1edf398983db51eef  mit-krb5_krb5-config_LDFLAGS.patch
+fa5d4dcd7b79e2165d0ec4affa0956ea  krb5-1.13-signed.tar
+0cf50c08eff19d8bd69f2f02a3d91c8a  krb5-config_LDFLAGS.patch
diff --git a/krb5/Pkgfile b/krb5/Pkgfile
index 1d9a0f562..98b3fe1e3 100644
--- a/krb5/Pkgfile
+++ b/krb5/Pkgfile
@@ -5,25 +5,29 @@
 # Depends on: openldap
 
 name=krb5
-version=1.12.2
+version=1.13
 release=1
-source=(http://web.mit.edu/kerberos/dist/$name/${version%.*}/$name-$version-signed.tar
-	mit-krb5-1.11_uninitialized.patch
-	mit-krb5_krb5-config_LDFLAGS.patch)
+source=(http://web.mit.edu/kerberos/dist/$name/$version/$name-$version-signed.tar \
+        $name-config_LDFLAGS.patch)
 
 build() {
 	bsdtar -p -o -xf $SRC/$name-$version.tar.gz
 
-    	cd $name-$version/src
+	cd $name-$version/src/build-tools
+	patch -p1 -i $SRC/$name-config_LDFLAGS.patch
 
-	#patch -p2 -i $SRC/mit-krb5-1.11_uninitialized.patch
-	#patch -p2 -i $SRC/mit-krb5_krb5-config_LDFLAGS.patch
-        #sed -e '/KRB5ROOT=/ s/\/local//' -i util/ac_check_krb5.m4
+	cd $SRC/$name-$version/src
+        sed -e '/KRB5ROOT=/ s/\/local//' -i util/ac_check_krb5.m4
 
-	#export CFLAGS="$CFLAGS -I/usr/include/et"
+	export CFLAGS="$CFLAGS -I/usr/include/et"
 
 	./configure --prefix=/usr \
-		    --with-system-et \
+                    --mandir=/usr/man \
+                    --enable-shared \
+                    --disable-rpath \
+                    --without-tcl \
+                    --with-ldap \
+                    --with-system-et \
                     --with-system-ss \
                     --without-system-verto
 
diff --git a/krb5/krb5-config_LDFLAGS.patch b/krb5/krb5-config_LDFLAGS.patch
new file mode 100644
index 000000000..826f721e5
--- /dev/null
+++ b/krb5/krb5-config_LDFLAGS.patch
@@ -0,0 +1,13 @@
+diff --git a/krb5-config.in b/krb5-config.in
+index c950b36..fb6520e 100755
+--- a/krb5-config.in
++++ b/krb5-config.in
+@@ -31,7 +31,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ includedir=@includedir@
+ libdir=@libdir@
+-CC_LINK='@CC_LINK@'
++CC_LINK='$(PROG_LIBPATH) $(PROG_RPATH_FLAGS)'
+ KDB5_DB_LIB=@KDB5_DB_LIB@
+ LDFLAGS='@LDFLAGS@'
+ RPATH_FLAG='@RPATH_FLAG@'
diff --git a/krb5/mit-krb5-1.11_uninitialized.patch b/krb5/mit-krb5-1.11_uninitialized.patch
deleted file mode 100644
index 16f07d742..000000000
--- a/krb5/mit-krb5-1.11_uninitialized.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/src/slave/kprop.c
-+++ b/src/slave/kprop.c
-@@ -91,7 +91,7 @@ main(argc, argv)
-     int     argc;
-     char    **argv;
- {
--    int     fd, database_fd, database_size;
-+    int     fd = -1, database_fd, database_size;
-     krb5_error_code retval;
-     krb5_context context;
-     krb5_creds *my_creds;
---- a/src/kadmin/ktutil/ktutil_funcs.c
-+++ b/src/kadmin/ktutil/ktutil_funcs.c
-@@ -64,7 +64,7 @@
-     krb5_kt_list *list;
-     int idx;
- {
--    krb5_kt_list lp, prev;
-+    krb5_kt_list lp, prev = NULL;
-     int i;
- 
-     for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
---- a/src/lib/kadm5/alt_prof.c
-+++ b/src/lib/kadm5/alt_prof.c
-@@ -164,7 +164,7 @@
-     char **values;
-     char *valp;
-     int idx;
--    krb5_boolean val;
-+    krb5_boolean val = 0;
- 
-     kret = krb5_aprof_getvals (acontext, hierarchy, &values);
-     if (kret)
---- a/src/lib/krb5/unicode/ucstr.c
-+++ b/src/lib/krb5/unicode/ucstr.c
-@@ -109,7 +109,7 @@
-             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;
-diff --git a/src/util/profile/prof_init.c b/src/util/profile/prof_init.c
-index 7dc5b47..cd90db8 100644
---- a/src/util/profile/prof_init.c
-+++ b/src/util/profile/prof_init.c
-@@ -255,7 +255,7 @@ copy_vtable_profile(profile_t profile, profile_t *ret_new_profile)
- {
-     errcode_t err;
-     void *cbdata;
--    profile_t new_profile;
-+    profile_t new_profile = NULL;
- 
-     *ret_new_profile = NULL;
- 
---- a/src/lib/krb5/krb/preauth2.c  2012-12-24 12:39:18.432678497 +0100
-+++ b/src/lib/krb5/krb/preauth2.c   2012-12-24 12:50:49.444099126 +0100
-@@ -956,7 +956,7 @@
-     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 };
-
---- a/src/tests/asn.1/trval.c	2013-04-12 12:51:36.000000000 -0500
-+++ b/src/tests/asn.1/trval.c	2013-05-24 04:31:14.077036380 -0500
-@@ -404,7 +404,7 @@
- {
-     int n;
-     int r = 0;
--    int rlen2;
-+    int rlen2 = 0;
-     int rlent;
-     int save_appl;
diff --git a/krb5/mit-krb5_krb5-config_LDFLAGS.patch b/krb5/mit-krb5_krb5-config_LDFLAGS.patch
deleted file mode 100644
index 0b300cb44..000000000
--- a/krb5/mit-krb5_krb5-config_LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Bug #448778
---- krb5-1.11/src/krb5-config.in	2012-12-18 02:47:04.000000000 +0000
-+++ krb5-1.11/src/krb5-config.in	2012-12-28 07:13:16.582693363 +0000
-@@ -217,7 +217,7 @@
- 	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
- 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
- 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
--	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
-+	    -e 's#\$(LDFLAGS)##' \
- 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- 	    -e 's#\$(CFLAGS)##'`
-