From 09a8594db3473d009fdeca7db817306c61d95d56188bc4b5a9cec61712caab14 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Tue, 22 Jun 2010 07:49:38 +0000 Subject: [PATCH 1/2] Accepting request 41854 from home:leonardocf:branches:network Copy from home:leonardocf:branches:network/krb5 via accept of submit request 41854 revision 2. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/41854 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=25 --- krb5-1.8.1-gssapi-error-table.dif | 13 +++++++++++++ krb5-mini.changes | 6 ++++++ krb5-mini.spec | 2 ++ krb5.changes | 6 ++++++ krb5.spec | 2 ++ 5 files changed, 29 insertions(+) create mode 100644 krb5-1.8.1-gssapi-error-table.dif diff --git a/krb5-1.8.1-gssapi-error-table.dif b/krb5-1.8.1-gssapi-error-table.dif new file mode 100644 index 0000000..fddfc1e --- /dev/null +++ b/krb5-1.8.1-gssapi-error-table.dif @@ -0,0 +1,13 @@ +Index: krb5-1.8.1/src/lib/gssapi/krb5/gssapi_krb5.c +=================================================================== +--- krb5-1.8.1.orig/src/lib/gssapi/krb5/gssapi_krb5.c ++++ krb5-1.8.1/src/lib/gssapi/krb5/gssapi_krb5.c +@@ -740,7 +740,7 @@ int gss_krb5int_lib_init(void) + printf("gss_krb5int_lib_init\n"); + #endif + +- add_error_table(&et_ggss_error_table); ++ add_error_table(&et_k5g_error_table); + + #ifndef LEAN_CLIENT + err = k5_mutex_finish_init(&gssint_krb5_keytab_lock); diff --git a/krb5-mini.changes b/krb5-mini.changes index 6fc48ec..b57f654 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 21 21:31:53 UTC 2010 - lchiquitto@novell.com + +- add correct error table when initializing gss-krb5 (bnc#606584, + bnc#608295) + ------------------------------------------------------------------- Wed May 19 14:27:19 CEST 2010 - mc@suse.de diff --git a/krb5-mini.spec b/krb5-mini.spec index bc1ae48..23253b6 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -57,6 +57,7 @@ Patch7: krb5-1.6.3-ktutil-manpage.dif Patch8: krb5-1.6.3-fix-ipv6-query.dif Patch9: krb5-1.7-MITKRB5-SA-2010-004.dif Patch10: krb5-MITKRB5-SA-2010-005.dif +Patch11: krb5-1.8.1-gssapi-error-table.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %insserv_prereq %fillup_prereq @@ -206,6 +207,7 @@ Authors: %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 # Rename the man pages so that they'll get generated correctly. pushd src cat %{SOURCE10} | while read manpage ; do diff --git a/krb5.changes b/krb5.changes index 6fc48ec..b57f654 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 21 21:31:53 UTC 2010 - lchiquitto@novell.com + +- add correct error table when initializing gss-krb5 (bnc#606584, + bnc#608295) + ------------------------------------------------------------------- Wed May 19 14:27:19 CEST 2010 - mc@suse.de diff --git a/krb5.spec b/krb5.spec index 7fd6bdc..79e7bbb 100644 --- a/krb5.spec +++ b/krb5.spec @@ -57,6 +57,7 @@ Patch7: krb5-1.6.3-ktutil-manpage.dif Patch8: krb5-1.6.3-fix-ipv6-query.dif Patch9: krb5-1.7-MITKRB5-SA-2010-004.dif Patch10: krb5-MITKRB5-SA-2010-005.dif +Patch11: krb5-1.8.1-gssapi-error-table.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %insserv_prereq %fillup_prereq @@ -206,6 +207,7 @@ Authors: %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 # Rename the man pages so that they'll get generated correctly. pushd src cat %{SOURCE10} | while read manpage ; do From 8c6241f66298ed66d6391c4c3cba47fbe8dae981080a54394e124085f66faeee Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 22 Jun 2010 08:47:11 +0000 Subject: [PATCH 2/2] Updating link to change in openSUSE:Factory/krb5 revision 52.0 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=176eea552850b7589f9d3498b252b7a8 --- krb5-doc.spec | 2 +- krb5-mini.spec | 2 +- krb5.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/krb5-doc.spec b/krb5-doc.spec index 434bbeb..f8c27e2 100644 --- a/krb5-doc.spec +++ b/krb5-doc.spec @@ -21,7 +21,7 @@ Name: krb5-doc BuildRequires: ghostscript-library latex2html texlive Version: 1.8.1 -Release: 3 +Release: 4 %define srcRoot krb5-1.8.1 Summary: MIT Kerberos5 Implementation--Documentation License: MIT License (or similar) diff --git a/krb5-mini.spec b/krb5-mini.spec index 23253b6..15234ab 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -28,7 +28,7 @@ Url: http://web.mit.edu/kerberos/www/ BuildRequires: bison libcom_err-devel ncurses-devel BuildRequires: keyutils keyutils-devel Version: 1.8.1 -Release: 3 +Release: 4 %if ! 0%{?build_mini} BuildRequires: libopenssl-devel openldap2-devel # bug437293 diff --git a/krb5.spec b/krb5.spec index 79e7bbb..b1d0036 100644 --- a/krb5.spec +++ b/krb5.spec @@ -28,7 +28,7 @@ Url: http://web.mit.edu/kerberos/www/ BuildRequires: bison libcom_err-devel ncurses-devel BuildRequires: keyutils keyutils-devel Version: 1.8.1 -Release: 3 +Release: 4 %if ! 0%{?build_mini} BuildRequires: libopenssl-devel openldap2-devel # bug437293