diff options
| -rw-r--r-- | krb5/.md5sum | 4 | ||||
| -rw-r--r-- | krb5/Pkgfile | 13 | ||||
| -rw-r--r-- | krb5/mit-krb5-1.11_uninitialized.patch | 78 | ||||
| -rw-r--r-- | krb5/mit-krb5_krb5-config_LDFLAGS.patch | 12 |
4 files changed, 102 insertions, 5 deletions
diff --git a/krb5/.md5sum b/krb5/.md5sum index f26762e63..a442876a4 100644 --- a/krb5/.md5sum +++ b/krb5/.md5sum @@ -1 +1,3 @@ -1a13c53899806c4da99a798a04d25545 krb5-1.11-signed.tar +56f0ae274b285320b8a597cb89442449 krb5-1.11.3-signed.tar +72a3d9a42e8585fd2cf6b214318e5e10 mit-krb5-1.11_uninitialized.patch +656e242de9b5ada1edf398983db51eef mit-krb5_krb5-config_LDFLAGS.patch diff --git a/krb5/Pkgfile b/krb5/Pkgfile index c1742b475..42c590688 100644 --- a/krb5/Pkgfile +++ b/krb5/Pkgfile @@ -5,18 +5,23 @@ # Depends on: openldap name=krb5 -version=1.11 +version=1.11.3 release=1 -source=(http://web.mit.edu/kerberos/dist/$name/$version/$name-$version-signed.tar) +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) build() { - tar -xzf $SRC/$name-$version.tar.gz + bsdtar -p -o -xf $SRC/$name-$version.tar.gz cd $name-$version/src + 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 - export CFLAGS="-I/usr/include/et" + export CFLAGS="$CFLAGS -I/usr/include/et" + ./configure --prefix=/usr \ --with-system-et \ --with-system-ss \ diff --git a/krb5/mit-krb5-1.11_uninitialized.patch b/krb5/mit-krb5-1.11_uninitialized.patch new file mode 100644 index 000000000..16f07d742 --- /dev/null +++ b/krb5/mit-krb5-1.11_uninitialized.patch @@ -0,0 +1,78 @@ +--- 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 new file mode 100644 index 000000000..0b300cb44 --- /dev/null +++ b/krb5/mit-krb5_krb5-config_LDFLAGS.patch @@ -0,0 +1,12 @@ +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)##'` + |