Ignore:
Timestamp:
Jul 9, 2009, 3:48:21 PM (13 years ago)
Author:
mitchb
Message:
Reintegrate branches/fc11-dev (r1121:1258) to trunk
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/server/fedora/specs/openssh.spec.patch

    r926 r1259  
    1 --- openssh.spec.orig   2009-01-01 21:06:01.000000000 -0500
    2 +++ openssh.spec        2009-01-01 22:52:02.000000000 -0500
     1--- openssh.spec-pristine       2009-07-01 18:55:04.579034598 -0400
     2+++ openssh.spec        2009-07-01 18:49:33.068037580 -0400
    33@@ -63,7 +63,7 @@
    4  Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
     4 Summary: An open source implementation of SSH protocol versions 1 and 2
    55 Name: openssh
    6  Version: 5.1p1
    7 -Release: 3%{?dist}%{?rescue_rel}
    8 +Release: 3%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
     6 Version: 5.2p1
     7-Release: 2%{?dist}%{?rescue_rel}
     8+Release: 2%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
    99 URL: http://www.openssh.com/portable.html
    1010 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
    1111 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
    12 @@ -74,6 +74,7 @@
     12@@ -74,6 +74,8 @@
    1313 Source1: openssh-nukeacss.sh
    1414 Source2: sshd.pam
    1515 Source3: sshd.init
    1616+Patch1000: openssh-5.0p1-multihomed.patch
    17  Patch0: openssh-5.1p1-redhat.patch
     17+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
     18 Patch0: openssh-5.2p1-redhat.patch
    1819 Patch2: openssh-5.1p1-skip-initial.patch
    1920 Patch3: openssh-3.8.1p1-krb5-config.patch
    20 @@ -159,6 +160,7 @@
     21@@ -160,6 +162,7 @@
    2122 Requires(post): chkconfig >= 0.9, /sbin/service
    2223 Requires(pre): /usr/sbin/useradd
     
    2627 %package askpass
    2728 Summary: A passphrase dialog for OpenSSH and X
    28 @@ -232,6 +234,8 @@
    29  %patch63 -p1 -b .bannerlen
    30  %patch64 -p1 -b .compat-sessions
     29@@ -229,6 +232,9 @@
     30 %patch62 -p1 -b .manpage
     31 %patch65 -p1 -b .fips
    3132 
    3233+%patch1000 -p1 -b .multihomed
     34+%patch1001 -p1 -b .gssapi-env
    3335+
    3436 autoreconf
Note: See TracChangeset for help on using the changeset viewer.