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

Timestamp:

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

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc17-dev

Files:

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

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

@@ -1 @@
---- openssh.spec.orig   2010-05-31 06:20:02.000000000 -0400
-+++ openssh.spec        2010-09-06 21:53:21.000000000 -0400
+--- openssh.spec.~1~    2012-02-14 11:06:13.000000000 -0500
++++ openssh.spec        2012-02-25 13:02:28.660616538 -0500
 @@ -78,7 +78,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
  Version: %{openssh_ver}
--Release: %{openssh_rel}%{?dist}%{?rescue_rel}.1
-+Release: %{openssh_rel}%{?dist}%{?rescue_rel}.1.scripts.%{scriptsversion}
+-Release: %{openssh_rel}%{?dist}%{?rescue_rel}
++Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
  URL: http://www.openssh.com/portable.html
  #URL1: http://pamsshagentauth.sourceforge.net
@@ -15 +15 @@
  Source5: pam_ssh_agent-rmheaders
 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
-
+ 
  Patch100: openssh-5.6p1-wIm.patch
  Patch0: openssh-5.6p1-redhat.patch
-@@ -207,6 +209,7 @@
+@@ -214,6 +215,7 @@
  Requires(pre): /usr/sbin/useradd
  Requires: pam >= 1.0.1-3
@@ -26 +26 @@
  %if %{ldap}
  %package ldap
-@@ -323,6 +326,8 @@
- %patch80 -p1 -b .biguid
- %patch81 -p1 -b .clientloop
+@@ -333,6 +335,8 @@
+ %patch83 -p0 -b .oomkiller
+ %patch84 -p1 -b .legacy
  
 +%patch1001 -p1 -b .gssapi-env
@@ -35 +35 @@
  pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
  autoreconf
-