Ignore:
Timestamp:
May 22, 2012, 10:52:35 PM (10 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc17-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fc17-dev

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

    r2066 r2195  
    1 --- krb5.spec.orig      2011-11-16 12:37:32.246736120 -0500
    2 +++ krb5.spec   2011-11-16 12:42:47.134740975 -0500
     1--- krb5.spec.~1~       2012-03-08 16:20:41.000000000 -0500
     2+++ krb5.spec   2012-04-01 22:07:14.834013302 -0400
    33@@ -6,7 +6,7 @@
    44 Summary: The Kerberos network authentication system
    55 Name: krb5
    6  Version: 1.9.1
    7 -Release: 14%{?dist}
    8 +Release: 14%{?dist}.scripts.%{scriptsversion}
     6 Version: 1.9.3
     7-Release: 1%{?dist}
     8+Release: 1%{?dist}.scripts.%{scriptsversion}
    99 # Maybe we should explode from the now-available-to-everybody tarball instead?
    10  # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.1-signed.tar
     10 # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.3-signed.tar
    1111 Source0: krb5-%{version}.tar.gz
    12 @@ -65,6 +65,8 @@
    13  Patch89: krb5-1.9.1-sendto_poll3.patch
    14  Patch90: krb5-1.9-MITKRB5-SA-2011-006.patch
     12@@ -64,6 +64,8 @@
     13 Patch102: krb5-1.9-7048.patch
     14 Patch103: krb5-kvno-230379.patch
    1515 
    1616+Patch1000: krb5-kuserok-scripts.patch
     
    1919 URL: http://web.mit.edu/kerberos/www/
    2020 Group: System Environment/Libraries
    21 @@ -114,6 +116,7 @@
     21@@ -113,6 +115,7 @@
    2222 %package libs
    2323 Summary: The shared libraries used by Kerberos 5
     
    2727 %description libs
    2828 Kerberos is a network authentication system. The krb5-libs package
    29 @@ -221,6 +224,7 @@
    30  %patch88 -p1 -b .crossrealm
    31  %patch89 -p1 -b .sendto_poll3
    32  %patch90 -p1 -b .2011-006
     29@@ -219,6 +222,7 @@
     30 %patch101 -p1 -b .7047
     31 %patch102 -p1 -b .7048
     32 %patch103 -p1 -b .kvno
    3333+%patch1000 -p1 -b .kuserok
    3434 gzip doc/*.ps
Note: See TracChangeset for help on using the changeset viewer.