[krb5/f16] - update to 1.9.3 - drop patch for CVE-2011-1530, incorporated upstream - drop patch for #756139

Nalin Dahyabhai nalin at fedoraproject.org
Thu Mar 8 21:16:26 UTC 2012


commit fa9575cc7aba31b2224d504ebd0d886809307d1f
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Thu Mar 8 16:15:57 2012 -0500

    - update to 1.9.3
      - drop patch for CVE-2011-1530, incorporated upstream
      - drop patch for #756139, incorporated into 1.9 as RT#7007
    - when removing -workstation, remove our files from the info index while
      the file is still there, in %%preun, rather than %%postun, and use the
      compressed file's name (#801035)

 .gitignore              |    3 +++
 2011-007-patch.txt      |   40 ----------------------------------------
 krb5-1.9-aes-hmac.patch |   12 ------------
 krb5.spec               |   22 +++++++++++++---------
 sources                 |    6 +++---
 5 files changed, 19 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d483900..2f044c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,6 @@ krb5-1.8.3-pdf.tar.gz
 /krb5-1.9.2.tar.gz
 /krb5-1.9.2.tar.gz.asc
 /krb5-1.9.2-pdf.tar.bz2
+/krb5-1.9.3.tar.gz
+/krb5-1.9.3.tar.gz.asc
+/krb5-1.9.3-pdf.tar.bz2
diff --git a/krb5.spec b/krb5.spec
index 482702f..6666382 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -5,10 +5,10 @@
 
 Summary: The Kerberos network authentication system
 Name: krb5
-Version: 1.9.2
-Release: 6%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
-# http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.1-signed.tar
+# http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.3-signed.tar
 Source0: krb5-%{version}.tar.gz
 Source1: krb5-%{version}.tar.gz.asc
 Source2: kprop.service
@@ -59,8 +59,6 @@ Patch84: krb5-1.9.1-sendto_poll.patch
 Patch86: krb5-1.9-debuginfo.patch
 Patch87: krb5-1.9.1-sendto_poll2.patch
 Patch89: krb5-1.9.1-sendto_poll3.patch
-Patch90: krb5-1.9-aes-hmac.patch
-Patch91: http://web.mit.edu/kerberos/advisories/2011-007-patch.txt
 Patch100: krb5-1.9-7046.patch
 Patch101: krb5-trunk-7047.patch
 Patch102: krb5-1.9-7048.patch
@@ -221,8 +219,6 @@ ln -s NOTICE LICENSE
 %patch86 -p0 -b .debuginfo
 %patch87 -p1 -b .sendto_poll2
 %patch89 -p1 -b .sendto_poll3
-%patch90 -p1 -b .aes-hmac
-%patch91 -p1 -b .2011-007
 %patch100 -p1 -b .7046
 %patch101 -p1 -b .7047
 %patch102 -p1 -b .7048
@@ -504,9 +500,9 @@ exit 0
 /sbin/install-info %{_infodir}/krb5-user.info %{_infodir}/dir
 exit 0
 
-%postun workstation
+%preun workstation
 if [ "$1" -eq "0" ] ; then
-	/sbin/install-info --delete %{_infodir}/krb5-user.info %{_infodir}/dir
+	/sbin/install-info --delete %{_infodir}/krb5-user.info.gz %{_infodir}/dir
 fi
 exit 0
 
@@ -705,6 +701,14 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Thu Mar  8 2012 Nalin Dahyabhai <nalin at redhat.com> 1.9.3-1
+- update to 1.9.3
+  - drop patch for CVE-2011-1530, incorporated upstream
+  - drop patch for #756139, incorporated into 1.9 as RT#7007
+- when removing -workstation, remove our files from the info index while
+  the file is still there, in %%preun, rather than %%postun, and use the
+  compressed file's name (#801035)
+
 * Mon Jan 30 2012 Nalin Dahyabhai <nalin at redhat.com> 1.9.2-6
 - add patch to accept keytab entries with vno==0 as matches when we're
   searching for an entry with a specific name/kvno (#230382/#782211,RT#3349)
diff --git a/sources b/sources
index 9c9e46f..3716639 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-178dc5707db4139cbdf34b324dfbafb2  krb5-1.9.2.tar.gz
-687aa6ae280e6bded82f8c81eb12928b  krb5-1.9.2.tar.gz.asc
-016f9f00cd2426eb0c83077aa47bfae2  krb5-1.9.2-pdf.tar.bz2
+880b69df9efc2921c6749b3adf66af66  krb5-1.9.3.tar.gz
+cb1b7e87ebc9d40725d14caf1bbb2bb9  krb5-1.9.3.tar.gz.asc
+e776e7c50bbb7681224387f783b49b98  krb5-1.9.3-pdf.tar.bz2


More information about the scm-commits mailing list