diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-03 13:57:40 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-03 13:57:40 -0300 |
commit | cdd88c937bb1fd3bf6de0b847101524a2d5c9022 (patch) | |
tree | 3eeb67878db60db79eb21dc2232377e6b56a3add /core/krb5 | |
parent | b2e7dca27f9de046feecd59ecfc93cd17bca8356 (diff) | |
parent | b618c3d0693aec564c6746238fd05d94e31d3b76 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/asciijump/PKGBUILD
community/cairo-compmgr/PKGBUILD
community/cwiid/PKGBUILD
community/darcs/PKGBUILD
community/gadmin-samba/PKGBUILD
community/gstm/PKGBUILD
community/haskell-dbus/PKGBUILD
community/haskell-mmap/PKGBUILD
community/lastfm-client/PKGBUILD
community/libtar/PKGBUILD
community/mget/PKGBUILD
community/nexuiz/PKGBUILD
community/pstreams/PKGBUILD
community/pyglet/PKGBUILD
community/python-html5lib/PKGBUILD
community/python-pychm/PKGBUILD
community/qoauth/PKGBUILD
community/quilt/PKGBUILD
community/stormbaancoureur/PKGBUILD
community/winegame/PKGBUILD
community/winestuff/PKGBUILD
community/xdg-user-dirs/PKGBUILD
core/libfetch/PKGBUILD
extra/acpi/PKGBUILD
extra/alex/PKGBUILD
extra/allegro/PKGBUILD
extra/capi4k-utils/PKGBUILD
extra/erlang/PKGBUILD
extra/ettercap/PKGBUILD
extra/gftp/PKGBUILD
extra/gimp-refocus/PKGBUILD
extra/happy/PKGBUILD
extra/haskell-cgi/PKGBUILD
extra/haskell-deepseq/PKGBUILD
extra/haskell-fgl/PKGBUILD
extra/haskell-glut/PKGBUILD
extra/haskell-haskell-src/PKGBUILD
extra/haskell-html/PKGBUILD
extra/haskell-hunit/PKGBUILD
extra/haskell-opengl/PKGBUILD
extra/haskell-parallel/PKGBUILD
extra/haskell-platform/PKGBUILD
extra/haskell-quickcheck/PKGBUILD
extra/haskell-regex-base/PKGBUILD
extra/haskell-regex-compat/PKGBUILD
extra/haskell-regex-posix/PKGBUILD
extra/haskell-stm/PKGBUILD
extra/haskell-syb/PKGBUILD
extra/haskell-xhtml/PKGBUILD
extra/libnet/PKGBUILD
extra/linux_logo/PKGBUILD
extra/mailman/PKGBUILD
extra/midori/PKGBUILD
extra/ntrack/PKGBUILD
extra/pwgen/PKGBUILD
extra/qtcurve-gtk2/PKGBUILD
extra/qtcurve-kde4/PKGBUILD
extra/ristretto/PKGBUILD
extra/rxvt-unicode/PKGBUILD
extra/telepathy-sofiasip/PKGBUILD
extra/tightvnc/PKGBUILD
extra/vsftpd/PKGBUILD
extra/windowmaker-crm-git/PKGBUILD
libre/aufs2-libre/PKGBUILD
libre/calibre-libre/PKGBUILD
libre/calibre-libre/calibre-mount-helper
libre/calibre-libre/calibre.install
libre/calibre-libre/desktop_integration.patch
libre/ffmpeg-libre/PKGBUILD
mozilla-testing/iceweasel-libre/PKGBUILD
mozilla-testing/iceweasel-libre/libre.patch
mozilla-testing/iceweasel-libre/mozconfig
~lukeshu/openni-unstable/PKGBUILD
Diffstat (limited to 'core/krb5')
-rw-r--r-- | core/krb5/krb5-1.9.1-2011-007.patch | 40 | ||||
-rw-r--r-- | core/krb5/krb5-1.9.1-canonicalize-fallback.patch | 58 | ||||
-rw-r--r-- | core/krb5/krb5-1.9.1-config-script.patch | 27 |
3 files changed, 0 insertions, 125 deletions
diff --git a/core/krb5/krb5-1.9.1-2011-007.patch b/core/krb5/krb5-1.9.1-2011-007.patch deleted file mode 100644 index 336a4ad31..000000000 --- a/core/krb5/krb5-1.9.1-2011-007.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in -index f46cad3..102fbaa 100644 ---- a/src/kdc/Makefile.in -+++ b/src/kdc/Makefile.in -@@ -67,6 +67,7 @@ check-unix:: rtest - - check-pytests:: - $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS) -+ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS) - - install:: - $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc -diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c -index c169c54..840a2ef 100644 ---- a/src/kdc/do_tgs_req.c -+++ b/src/kdc/do_tgs_req.c -@@ -243,7 +243,8 @@ tgt_again: - if (!tgs_1 || !data_eq(*server_1, *tgs_1)) { - errcode = find_alternate_tgs(request, &server); - firstpass = 0; -- goto tgt_again; -+ if (errcode == 0) -+ goto tgt_again; - } - } - status = "UNKNOWN_SERVER"; -diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py -new file mode 100644 -index 0000000..1760bcd ---- /dev/null -+++ b/src/kdc/t_emptytgt.py -@@ -0,0 +1,8 @@ -+#!/usr/bin/python -+from k5test import * -+ -+realm = K5Realm(start_kadmind=False, create_host=False) -+output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1) -+if 'not found in Kerberos database' not in output: -+ fail('TGT lookup for empty realm failed in unexpected way') -+success('Empty tgt lookup.') diff --git a/core/krb5/krb5-1.9.1-canonicalize-fallback.patch b/core/krb5/krb5-1.9.1-canonicalize-fallback.patch deleted file mode 100644 index e5a38498f..000000000 --- a/core/krb5/krb5-1.9.1-canonicalize-fallback.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c ---- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c 2011-02-09 16:55:36.000000000 -0500 -+++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c 2011-09-26 18:42:01.465190278 -0400 -@@ -470,13 +470,10 @@ - - /***** STATE_REFERRALS *****/ - --/* -- * Possibly retry a request in the fallback realm after a referral request -- * failure in the local realm. Expects ctx->reply_code to be set to the error -- * from a referral request. -- */ -+/* Possibly try a non-referral request after a referral request failure. -+ * Expects ctx->reply_code to be set to the error from a referral request. */ - static krb5_error_code --try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx) -+try_fallback(krb5_context context, krb5_tkt_creds_context ctx) - { - krb5_error_code code; - char **hrealms; -@@ -485,9 +482,10 @@ - if (ctx->referral_count > 1) - return ctx->reply_code; - -- /* Only fall back if the original request used the referral realm. */ -+ /* If the request used a specified realm, make a non-referral request to -+ * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */ - if (!krb5_is_referral_realm(&ctx->req_server->realm)) -- return ctx->reply_code; -+ return begin_non_referral(context, ctx); - - if (ctx->server->length < 2) { - /* We need a type/host format principal to find a fallback realm. */ -@@ -500,10 +498,10 @@ - if (code != 0) - return code; - -- /* Give up if the fallback realm isn't any different. */ -+ /* If the fallback realm isn't any different, use the existing TGT. */ - if (data_eq_string(ctx->server->realm, hrealms[0])) { - krb5_free_host_realm(context, hrealms); -- return ctx->reply_code; -+ return begin_non_referral(context, ctx); - } - - /* Rewrite server->realm to be the fallback realm. */ -@@ -540,9 +538,9 @@ - krb5_error_code code; - const krb5_data *referral_realm; - -- /* Possibly retry with the fallback realm on error. */ -+ /* Possibly try a non-referral fallback request on error. */ - if (ctx->reply_code != 0) -- return try_fallback_realm(context, ctx); -+ return try_fallback(context, ctx); - - if (krb5_principal_compare(context, ctx->reply_creds->server, - ctx->server)) { diff --git a/core/krb5/krb5-1.9.1-config-script.patch b/core/krb5/krb5-1.9.1-config-script.patch deleted file mode 100644 index a72a75edf..000000000 --- a/core/krb5/krb5-1.9.1-config-script.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in ---- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500 -+++ krb5-1.9.1/src/krb5-config.in 2011-09-26 18:27:09.018487087 -0400 -@@ -186,7 +186,7 @@ - -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ - -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ - -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ -- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` -+ -e 's#\$(CFLAGS)##'` - - if test $library = 'kdb'; then - lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB" -@@ -214,9 +214,13 @@ - fi - - if test $library = 'krb5'; then -- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB" -+ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err" - fi - -+ # If we ever support a flag to generate output suitable for static -+ # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB" -+ # here. -+ - echo $lib_flags - fi - |