diff --git a/krb5-1.6.3-fix-ipv6-query.dif b/krb5-1.6.3-fix-ipv6-query.dif new file mode 100644 index 0000000..f31fbdd --- /dev/null +++ b/krb5-1.6.3-fix-ipv6-query.dif @@ -0,0 +1,53 @@ +Index: krb5-1.6.3/src/lib/krb5/os/hostaddr.c +=================================================================== +--- krb5-1.6.3.orig/src/lib/krb5/os/hostaddr.c ++++ krb5-1.6.3/src/lib/krb5/os/hostaddr.c +@@ -43,7 +43,7 @@ krb5_os_hostaddr(krb5_context context, c + return KRB5_ERR_BAD_HOSTNAME; + + memset (&hints, 0, sizeof (hints)); +- hints.ai_flags = AI_NUMERICHOST; ++ hints.ai_flags = AI_NUMERICHOST | AI_ADDRCONFIG; + /* We don't care what kind at this point, really, but without + this, we can get back multiple sockaddrs per address, for + SOCK_DGRAM, SOCK_STREAM, and SOCK_RAW. I haven't checked if +Index: krb5-1.6.3/src/lib/krb5/os/hst_realm.c +=================================================================== +--- krb5-1.6.3.orig/src/lib/krb5/os/hst_realm.c ++++ krb5-1.6.3/src/lib/krb5/os/hst_realm.c +@@ -167,7 +167,7 @@ krb5int_get_fq_hostname (char *buf, size + int err; + + memset (&hints, 0, sizeof (hints)); +- hints.ai_flags = AI_CANONNAME; ++ hints.ai_flags = AI_CANONNAME | AI_ADDRCONFIG; + err = getaddrinfo (name, 0, &hints, &ai); + if (err) + return krb5int_translate_gai_error (err); +Index: krb5-1.6.3/src/lib/krb5/os/locate_kdc.c +=================================================================== +--- krb5-1.6.3.orig/src/lib/krb5/os/locate_kdc.c ++++ krb5-1.6.3/src/lib/krb5/os/locate_kdc.c +@@ -254,8 +254,9 @@ krb5int_add_host_to_list (struct addrlis + memset(&hint, 0, sizeof(hint)); + hint.ai_family = family; + hint.ai_socktype = socktype; ++ hint.ai_flags = AI_ADDRCONFIG; + #ifdef AI_NUMERICSERV +- hint.ai_flags = AI_NUMERICSERV; ++ hint.ai_flags |= AI_NUMERICSERV; + #endif + sprintf(portbuf, "%d", ntohs(port)); + sprintf(secportbuf, "%d", ntohs(secport)); +Index: krb5-1.6.3/src/lib/krb5/os/sn2princ.c +=================================================================== +--- krb5-1.6.3.orig/src/lib/krb5/os/sn2princ.c ++++ krb5-1.6.3/src/lib/krb5/os/sn2princ.c +@@ -107,6 +107,7 @@ krb5_sname_to_principal(krb5_context con + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_INET; ++ hints.ai_flags = AI_ADDRCONFIG; + try_getaddrinfo_again: + err = getaddrinfo(hostname, 0, &hints, &ai); + if (err) { diff --git a/krb5-doc.spec b/krb5-doc.spec index 2b4bed7..d54bbd6 100644 --- a/krb5-doc.spec +++ b/krb5-doc.spec @@ -21,7 +21,7 @@ Name: krb5-doc BuildRequires: ghostscript-library latex2html texlive Version: 1.6.3 -Release: 131 +Release: 132 %define srcRoot krb5-1.6.3 Summary: MIT Kerberos5 Implementation--Documentation License: X11/MIT diff --git a/krb5-plugins.spec b/krb5-plugins.spec index a8e3536..daab456 100644 --- a/krb5-plugins.spec +++ b/krb5-plugins.spec @@ -21,7 +21,7 @@ Name: krb5-plugins Version: 1.6.3 -Release: 14 +Release: 15 BuildRequires: bison krb5-devel ncurses-devel openldap2-devel %define srcRoot krb5-1.6.3 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ @@ -68,6 +68,7 @@ Patch42: krb5-trunk-seqnum.patch Patch43: krb5-1.6.3-case-insensitive.dif Patch44: krb5-1.6.3-ktutil-manpage.dif Patch45: krb5-1.6.3-post.dif +Patch46: krb5-1.6.3-fix-ipv6-query.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -166,6 +167,7 @@ fi %patch43 %patch44 -p1 %patch45 +%patch46 -p1 cp %{_sourcedir}/EncryptWithMasterKey.c %{_builddir}/%{srcRoot}/src/kadmin/dbutil/EncryptWithMasterKey.c # Rename the man pages so that they'll get generated correctly. pushd src diff --git a/krb5.changes b/krb5.changes index 4abfee0..1163172 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Dec 11 14:12:57 CET 2008 - mc@suse.de + +- do not query IPv6 addresses if no IPv6 address exists on this host + [bnc#449143] + +------------------------------------------------------------------- +Wed Dec 10 12:34:56 CET 2008 - olh@suse.de + +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) + ------------------------------------------------------------------- Thu Oct 30 12:34:56 CET 2008 - olh@suse.de diff --git a/krb5.spec b/krb5.spec index fba1d50..8f1289d 100644 --- a/krb5.spec +++ b/krb5.spec @@ -20,7 +20,7 @@ Name: krb5 Version: 1.6.3 -Release: 83 +Release: 84 BuildRequires: bison libcom_err-devel ncurses-devel %if %{suse_version} > 1010 BuildRequires: keyutils keyutils-devel @@ -34,9 +34,6 @@ Obsoletes: heimdal-lib %ifarch ppc64 Obsoletes: krb5-64bit %endif -%ifarch %ix86 ppc -Obsoletes: krb5-32bit -%endif # Summary: MIT Kerberos5 Implementation--Libraries License: X11/MIT @@ -79,6 +76,7 @@ Patch42: krb5-trunk-seqnum.patch Patch43: krb5-1.6.3-case-insensitive.dif Patch44: krb5-1.6.3-ktutil-manpage.dif Patch45: krb5-1.6.3-post.dif +Patch46: krb5-1.6.3-fix-ipv6-query.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %insserv_prereq %fillup_prereq @@ -159,9 +157,6 @@ Obsoletes: heimdal-tools-devel, heimdal-devel %ifarch ppc64 Obsoletes: krb5-devel-64bit %endif -%ifarch %ix86 ppc -Obsoletes: krb5-devel-32bit -%endif # %description devel @@ -259,6 +254,7 @@ fi %patch43 %patch44 -p1 %patch45 +%patch46 -p1 cp %{_sourcedir}/EncryptWithMasterKey.c %{_builddir}/%{srcRoot}/src/kadmin/dbutil/EncryptWithMasterKey.c # Rename the man pages so that they'll get generated correctly. pushd src @@ -577,6 +573,12 @@ rm -rf %{buildroot} %{_mandir}/man1/krb5-config.1* %changelog +* Thu Dec 11 2008 mc@suse.de +- do not query IPv6 addresses if no IPv6 address exists on this host + [bnc#449143] +* Wed Dec 10 2008 olh@suse.de +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) * Thu Oct 30 2008 olh@suse.de - obsolete old -XXbit packages (bnc#437293) * Fri Sep 26 2008 mc@suse.de