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

Timestamp:

Oct 23, 2010, 8:07:08 AM (14 years ago)

Author:

ezyang

Message:

Merge Fedora 13 development back to trunk.

Location:

trunk

Files:

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

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

@@ -1 @@
---- openssh.spec.orig   2010-03-30 02:27:53.000000000 -0400
-+++ openssh.spec        2010-03-30 02:30:09.000000000 -0400
-@@ -63,7 +63,7 @@
+--- openssh.spec.orig   2010-05-31 06:20:02.000000000 -0400
++++ openssh.spec        2010-09-06 21:53:21.000000000 -0400
+@@ -74,7 +74,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
- Version: 5.2p1
--Release: 6%{?dist}%{?rescue_rel}
-+Release: 6%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
+ Version: 5.4p1
+-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
  #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,8 @@
- Source1: openssh-nukeacss.sh
- Source2: sshd.pam
+@@ -88,6 +88,7 @@
  Source3: sshd.init
-+Patch1000: openssh-5.0p1-multihomed.patch
+ Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2
+ Source5: pam_ssh_agent-rmheaders
 +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
-@@ -161,6 +163,7 @@
+ Patch0: openssh-5.4p1-redhat.patch
+ Patch2: openssh-5.3p1-skip-initial.patch
+ Patch4: openssh-5.2p1-vendor.patch
+@@ -175,6 +177,7 @@
  Requires(post): chkconfig >= 0.9, /sbin/service
  Requires(pre): /usr/sbin/useradd
@@ -27 +26 @@
  %package askpass
  Summary: A passphrase dialog for OpenSSH and X
-@@ -231,6 +234,9 @@
- %patch65 -p1 -b .fips
- %patch67 -p1 -b .selabel
+@@ -267,6 +270,8 @@
+ %patch75 -p1 -b .dso
+ %patch76 -p1 -b .bz595935
  
-+%patch1000 -p1 -b .multihomed
 +%patch1001 -p1 -b .gssapi-env
 +