diff --git a/trunk-fix-strncat.dif b/krb5-1.5.1-fix-strncat-warning.dif similarity index 100% rename from trunk-fix-strncat.dif rename to krb5-1.5.1-fix-strncat-warning.dif diff --git a/krb5-1.6-fix-passwd-tcp.dif b/krb5-1.6-fix-passwd-tcp.dif deleted file mode 100644 index 186c79f..0000000 --- a/krb5-1.6-fix-passwd-tcp.dif +++ /dev/null @@ -1,18 +0,0 @@ ---- src/lib/krb5/os/changepw.c -+++ src/lib/krb5/os/changepw.c 2007/01/18 13:23:37 -@@ -70,12 +70,14 @@ - locate_service_kadmin, sockType, 0); - if (!code) { - /* Success with admin_server but now we need to change the -- port number to use DEFAULT_KPASSWD_PORT. */ -+ port number to use DEFAULT_KPASSWD_PORT and the socktype. */ - int i; - for (i=0; inaddrs; i++) { - struct addrinfo *a = addrlist->addrs[i].ai; - if (a->ai_family == AF_INET) - sa2sin (a->ai_addr)->sin_port = htons(DEFAULT_KPASSWD_PORT); -+ if (sockType != SOCK_STREAM) -+ a->ai_socktype = sockType; - } - } - } diff --git a/krb5-1.6-fix-sendto_kdc-memset.dif b/krb5-1.6-fix-sendto_kdc-memset.dif deleted file mode 100644 index 2a07f5d..0000000 --- a/krb5-1.6-fix-sendto_kdc-memset.dif +++ /dev/null @@ -1,20 +0,0 @@ ---- src/lib/krb5/os/sendto_kdc.c -+++ src/lib/krb5/os/sendto_kdc.c 2007/01/17 14:17:10 -@@ -1100,7 +1100,7 @@ - struct sockaddr *remoteaddr, socklen_t *remoteaddrlen, - int *addr_used) - { -- int i, pass; -+ int i = 0, pass; - int delay_this_pass = 2; - krb5_error_code retval; - struct conn_state *conns; -@@ -1135,7 +1135,7 @@ - return ENOMEM; - } - -- memset(conns, 0, n_conns * sizeof(callback_data[i])); -+ memset(callback_data, 0, n_conns * sizeof(callback_data[i])); - } - - for (i = 0; i < n_conns; i++) { diff --git a/krb5-1.6-post.dif b/krb5-1.6-post.dif index 29fe697..75acc7c 100644 --- a/krb5-1.6-post.dif +++ b/krb5-1.6-post.dif @@ -1,7 +1,7 @@ Index: src/lib/gssapi/krb5/k5sealv3.c =================================================================== ---- src/lib/gssapi/krb5/k5sealv3.c (.../tags/krb5-1-6-final) (Revision 19102) -+++ src/lib/gssapi/krb5/k5sealv3.c (.../branches/krb5-1-6) (Revision 19102) +--- src/lib/gssapi/krb5/k5sealv3.c (.../tags/krb5-1-6-final) (Revision 19119) ++++ src/lib/gssapi/krb5/k5sealv3.c (.../branches/krb5-1-6) (Revision 19119) @@ -412,10 +412,16 @@ if (load_16_be(althdr) != 0x0504 || althdr[2] != ptr[2] @@ -20,10 +20,72 @@ Index: src/lib/gssapi/krb5/k5sealv3.c } else { /* no confidentiality */ if (conf_state) +Index: src/lib/krb5/keytab/kt_file.c +=================================================================== +--- src/lib/krb5/keytab/kt_file.c (.../tags/krb5-1-6-final) (Revision 19119) ++++ src/lib/krb5/keytab/kt_file.c (.../branches/krb5-1-6) (Revision 19119) +@@ -193,6 +193,7 @@ + + err = k5_mutex_init(&data->lock); + if (err) { ++ krb5_xfree(data); + krb5_xfree(*id); + return err; + } +@@ -791,6 +792,7 @@ + + err = k5_mutex_init(&data->lock); + if (err) { ++ krb5_xfree(data); + krb5_xfree(*id); + return err; + } +Index: src/lib/krb5/os/sendto_kdc.c +=================================================================== +--- src/lib/krb5/os/sendto_kdc.c (.../tags/krb5-1-6-final) (Revision 19119) ++++ src/lib/krb5/os/sendto_kdc.c (.../branches/krb5-1-6) (Revision 19119) +@@ -1127,7 +1127,7 @@ + return ENOMEM; + } + +- memset(conns, 0, n_conns * sizeof(conns[i])); ++ memset(conns, 0, n_conns * sizeof(struct conn_state)); + + if (callback_info) { + callback_data = malloc(n_conns * sizeof(krb5_data)); +@@ -1135,7 +1135,7 @@ + return ENOMEM; + } + +- memset(conns, 0, n_conns * sizeof(callback_data[i])); ++ memset(callback_data, 0, n_conns * sizeof(krb5_data)); + } + + for (i = 0; i < n_conns; i++) { +Index: src/lib/krb5/os/changepw.c +=================================================================== +--- src/lib/krb5/os/changepw.c (.../tags/krb5-1-6-final) (Revision 19119) ++++ src/lib/krb5/os/changepw.c (.../branches/krb5-1-6) (Revision 19119) +@@ -70,12 +70,14 @@ + locate_service_kadmin, SOCK_STREAM, 0); + if (!code) { + /* Success with admin_server but now we need to change the +- port number to use DEFAULT_KPASSWD_PORT. */ ++ port number to use DEFAULT_KPASSWD_PORT and the socktype. */ + int i; + for (i=0; inaddrs; i++) { + struct addrinfo *a = addrlist->addrs[i].ai; + if (a->ai_family == AF_INET) + sa2sin (a->ai_addr)->sin_port = htons(DEFAULT_KPASSWD_PORT); ++ if (sockType != SOCK_STREAM) ++ a->ai_socktype = sockType; + } + } + } Index: src/lib/krb5/ccache/ccapi/stdcc.c =================================================================== ---- src/lib/krb5/ccache/ccapi/stdcc.c (.../tags/krb5-1-6-final) (Revision 19102) -+++ src/lib/krb5/ccache/ccapi/stdcc.c (.../branches/krb5-1-6) (Revision 19102) +--- src/lib/krb5/ccache/ccapi/stdcc.c (.../tags/krb5-1-6-final) (Revision 19119) ++++ src/lib/krb5/ccache/ccapi/stdcc.c (.../branches/krb5-1-6) (Revision 19119) @@ -56,6 +56,7 @@ #ifdef USE_CCAPI_V3 @@ -182,7 +244,7 @@ Name: svk:merge 304ed8f4-7412-0410-a0db-8249d8f37659:/my-branches/kdb-config:339 dc483132-0cff-0310-8789-dd5450dbe970:/branches/ccapi:18199 dc483132-0cff-0310-8789-dd5450dbe970:/branches/referrals/trunk:18581 - + 122d7f7f-0217-0410-a6d0-d37b9a318acc:/local/krb5/branches/krb5-1-6:19367 + + 122d7f7f-0217-0410-a6d0-d37b9a318acc:/local/krb5/branches/krb5-1-6:19411 304ed8f4-7412-0410-a0db-8249d8f37659:/my-branches/kdb-config:339 dc483132-0cff-0310-8789-dd5450dbe970:/branches/ccapi:18199 dc483132-0cff-0310-8789-dd5450dbe970:/branches/referrals/trunk:18581 diff --git a/krb5-doc.spec b/krb5-doc.spec index 19a3e62..77ed7ef 100644 --- a/krb5-doc.spec +++ b/krb5-doc.spec @@ -13,7 +13,7 @@ Name: krb5-doc BuildRequires: ghostscript-library latex2html te_ams Version: 1.6 -Release: 4 +Release: 5 %define srcRoot krb5-1.6 Summary: MIT Kerberos5 Implementation--Documentation License: X11/MIT diff --git a/krb5-plugins.changes b/krb5-plugins.changes index 0aa0fd4..6a80aec 100644 --- a/krb5-plugins.changes +++ b/krb5-plugins.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Jan 29 17:47:22 CET 2007 - ro@suse.de + +- no main package, no debuginfo + +------------------------------------------------------------------- +Mon Jan 29 11:30:35 CET 2007 - mc@suse.de + +- krb5-1.6-fix-passwd-tcp.dif and krb5-1.6-fix-sendto_kdc-memset.dif + are now upstream. Remove patches. +- fix leak in krb5_kt_resolve and krb5_kt_wresolve + ------------------------------------------------------------------- Tue Jan 23 17:21:53 CET 2007 - mc@suse.de diff --git a/krb5-plugins.spec b/krb5-plugins.spec index 5060519..1b9c09f 100644 --- a/krb5-plugins.spec +++ b/krb5-plugins.spec @@ -9,10 +9,11 @@ # # norootforbuild +# nodebuginfo Name: krb5-plugins Version: 1.6 -Release: 4 +Release: 5 BuildRequires: krb5-devel openldap2-devel %define srcRoot krb5-1.6 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ @@ -41,9 +42,7 @@ Patch20: kprop-use-mkstemp.dif Patch21: krb5-1.5.1-fix-var-used-before-value-set.dif Patch22: krb5-1.5.1-fix-ftp-var-used-uninitialized.dif #Patch23: trunk-install-preauth-header.dif -Patch24: trunk-fix-strncat.dif -Patch25: krb5-1.6-fix-passwd-tcp.dif -Patch26: krb5-1.6-fix-sendto_kdc-memset.dif +Patch24: krb5-1.5.1-fix-strncat-warning.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -109,8 +108,6 @@ cd - %patch22 #%patch23 %patch24 -%patch25 -%patch26 cp %{_sourcedir}/EncryptWithMasterKey.c %{_builddir}/%{srcRoot}/src/kadmin/dbutil/EncryptWithMasterKey.c %build @@ -208,6 +205,12 @@ rm -rf %{buildroot} %{_mandir}/man8/* %changelog -n krb5-plugins +* Mon Jan 29 2007 - ro@suse.de +- no main package, no debuginfo +* Mon Jan 29 2007 - mc@suse.de +- krb5-1.6-fix-passwd-tcp.dif and krb5-1.6-fix-sendto_kdc-memset.dif + are now upstream. Remove patches. +- fix leak in krb5_kt_resolve and krb5_kt_wresolve * Tue Jan 23 2007 - mc@suse.de - fix "local variable used before set" in ftp.c [#237684] diff --git a/krb5.changes b/krb5.changes index 17d2f8c..fec48ae 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 29 11:27:23 CET 2007 - mc@suse.de + +- krb5-1.6-fix-passwd-tcp.dif and krb5-1.6-fix-sendto_kdc-memset.dif + are now upstream. Remove patches. +- fix leak in krb5_kt_resolve and krb5_kt_wresolve + ------------------------------------------------------------------- Tue Jan 23 17:21:12 CET 2007 - mc@suse.de diff --git a/krb5.spec b/krb5.spec index a6ab569..f751e63 100644 --- a/krb5.spec +++ b/krb5.spec @@ -12,7 +12,7 @@ Name: krb5 Version: 1.6 -Release: 4 +Release: 5 BuildRequires: libcom_err %if %{suse_version} > 1010 BuildRequires: keyutils keyutils-devel @@ -45,9 +45,7 @@ Patch20: kprop-use-mkstemp.dif Patch21: krb5-1.5.1-fix-var-used-before-value-set.dif Patch22: krb5-1.5.1-fix-ftp-var-used-uninitialized.dif #Patch23: trunk-install-preauth-header.dif -Patch24: trunk-fix-strncat.dif -Patch25: krb5-1.6-fix-passwd-tcp.dif -Patch26: krb5-1.6-fix-sendto_kdc-memset.dif +Patch24: krb5-1.5.1-fix-strncat-warning.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch @@ -200,8 +198,6 @@ cd - %patch22 #%patch23 %patch24 -%patch25 -%patch26 cp %{_sourcedir}/EncryptWithMasterKey.c %{_builddir}/%{srcRoot}/src/kadmin/dbutil/EncryptWithMasterKey.c %build @@ -492,6 +488,10 @@ rm -rf %{buildroot} %{_mandir}/man1/krb5-config.1* %changelog -n krb5 +* Mon Jan 29 2007 - mc@suse.de +- krb5-1.6-fix-passwd-tcp.dif and krb5-1.6-fix-sendto_kdc-memset.dif + are now upstream. Remove patches. +- fix leak in krb5_kt_resolve and krb5_kt_wresolve * Tue Jan 23 2007 - mc@suse.de - fix "local variable used before set" in ftp.c [#237684]