Changeset 2195 for branches/fc17-dev/server/fedora/specs/krb5.spec.patch

Timestamp:

May 22, 2012, 10:52:35 PM (12 years ago)

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc17-dev

Files:

• . (modified) (1 prop)
• server/fedora/specs/krb5.spec.patch (modified) (3 diffs)

branches/fc17-dev/server/fedora/specs/krb5.spec.patch

@@ -1 @@
---- krb5.spec.orig      2011-11-16 12:37:32.246736120 -0500
-+++ krb5.spec   2011-11-16 12:42:47.134740975 -0500
+--- krb5.spec.~1~       2012-03-08 16:20:41.000000000 -0500
++++ krb5.spec   2012-04-01 22:07:14.834013302 -0400
 @@ -6,7 +6,7 @@
  Summary: The Kerberos network authentication system
  Name: krb5
- Version: 1.9.1
--Release: 14%{?dist}
-+Release: 14%{?dist}.scripts.%{scriptsversion}
+ Version: 1.9.3
+-Release: 1%{?dist}
++Release: 1%{?dist}.scripts.%{scriptsversion}
  # 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
-@@ -65,6 +65,8 @@
- Patch89: krb5-1.9.1-sendto_poll3.patch
- Patch90: krb5-1.9-MITKRB5-SA-2011-006.patch
+@@ -64,6 +64,8 @@
+ Patch102: krb5-1.9-7048.patch
+ Patch103: krb5-kvno-230379.patch
  
 +Patch1000: krb5-kuserok-scripts.patch
@@ -19 +19 @@
  URL: http://web.mit.edu/kerberos/www/
  Group: System Environment/Libraries
-@@ -114,6 +116,7 @@
+@@ -113,6 +115,7 @@
  %package libs
  Summary: The shared libraries used by Kerberos 5
@@ -27 +27 @@
  %description libs
  Kerberos is a network authentication system. The krb5-libs package
-@@ -221,6 +224,7 @@
- %patch88 -p1 -b .crossrealm
- %patch89 -p1 -b .sendto_poll3
- %patch90 -p1 -b .2011-006
+@@ -219,6 +222,7 @@
+ %patch101 -p1 -b .7047
+ %patch102 -p1 -b .7048
+ %patch103 -p1 -b .kvno
 +%patch1000 -p1 -b .kuserok
  gzip doc/*.ps