Changeset 1259 for trunk/server/fedora/specs/openssh.spec.patch

Timestamp:

Jul 9, 2009, 3:48:21 PM (16 years ago)

Author:

mitchb

Message:

Reintegrate branches/fc11-dev (r1121:1258) to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• server/fedora/specs/openssh.spec.patch (modified) (2 diffs)

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

@@ -1 @@
---- openssh.spec.orig   2009-01-01 21:06:01.000000000 -0500
-+++ openssh.spec        2009-01-01 22:52:02.000000000 -0500
+--- openssh.spec-pristine       2009-07-01 18:55:04.579034598 -0400
++++ openssh.spec        2009-07-01 18:49:33.068037580 -0400
 @@ -63,7 +63,7 @@
- Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
+ Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
- Version: 5.1p1
--Release: 3%{?dist}%{?rescue_rel}
-+Release: 3%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
+ Version: 5.2p1
+-Release: 2%{?dist}%{?rescue_rel}
++Release: 2%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
  URL: http://www.openssh.com/portable.html
  #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
  #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
-@@ -74,6 +74,7 @@
+@@ -74,6 +74,8 @@
  Source1: openssh-nukeacss.sh
  Source2: sshd.pam
  Source3: sshd.init
 +Patch1000: openssh-5.0p1-multihomed.patch
- Patch0: openssh-5.1p1-redhat.patch
++Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
+ Patch0: openssh-5.2p1-redhat.patch
  Patch2: openssh-5.1p1-skip-initial.patch
  Patch3: openssh-3.8.1p1-krb5-config.patch
-@@ -159,6 +160,7 @@
+@@ -160,6 +162,7 @@
  Requires(post): chkconfig >= 0.9, /sbin/service
  Requires(pre): /usr/sbin/useradd
@@ -26 +27 @@
  %package askpass
  Summary: A passphrase dialog for OpenSSH and X
-@@ -232,6 +234,8 @@
- %patch63 -p1 -b .bannerlen
- %patch64 -p1 -b .compat-sessions
+@@ -229,6 +232,9 @@
+ %patch62 -p1 -b .manpage
+ %patch65 -p1 -b .fips
  
 +%patch1000 -p1 -b .multihomed
++%patch1001 -p1 -b .gssapi-env
 +
  autoreconf