| [2449] | 1 | --- openssh.spec.orig   2013-07-15 21:14:52.452894092 -0400 | 
|---|
|  | 2 | +++ openssh.spec        2013-07-15 21:18:59.494168115 -0400 | 
|---|
| [2339] | 3 | @@ -74,7 +74,7 @@ | 
|---|
| [1259] | 4 | Summary: An open source implementation of SSH protocol versions 1 and 2 | 
|---|
| [926] | 5 | Name: openssh | 
|---|
| [2066] | 6 | Version: %{openssh_ver} | 
|---|
| [2144] | 7 | -Release: %{openssh_rel}%{?dist}%{?rescue_rel} | 
|---|
|  | 8 | +Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion} | 
|---|
| [926] | 9 | URL: http://www.openssh.com/portable.html | 
|---|
| [1693] | 10 | #URL1: http://pamsshagentauth.sourceforge.net | 
|---|
| [926] | 11 | #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz | 
|---|
| [2449] | 12 | @@ -220,7 +220,9 @@ | 
|---|
|  | 13 | Patch904: openssh-5.9p1-change-max-startups.patch | 
|---|
|  | 14 | # make sftp's libedit interface marginally multibyte aware (#841771) | 
|---|
|  | 15 | Patch908: openssh-5.9p1-sftp-multibyte.patch | 
|---|
|  | 16 | - | 
|---|
|  | 17 | +# sctp | 
|---|
|  | 18 | +#https://bugzilla.mindrot.org/show_bug.cgi?id=1873 => https://bugzilla.redhat.com/show_bug.cgi?id=668993 | 
|---|
| [1259] | 19 | +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch | 
|---|
| [2185] | 20 |  | 
|---|
| [2246] | 21 | License: BSD | 
|---|
|  | 22 | Group: Applications/Internet | 
|---|
| [2449] | 23 | @@ -271,6 +273,7 @@ | 
|---|
| [2246] | 24 | Group: Applications/Internet | 
|---|
|  | 25 | Requires: openssh = %{version}-%{release} | 
|---|
| [2066] | 26 | Requires: fipscheck-lib%{_isa} >= 1.3.0 | 
|---|
| [925] | 27 | +Provides: scripts-openssh-server | 
|---|
| [760] | 28 |  | 
|---|
| [2246] | 29 | %package server | 
|---|
|  | 30 | Summary: An open source SSH server daemon | 
|---|
| [2449] | 31 | @@ -458,10 +461,12 @@ | 
|---|
| [2339] | 32 | %patch714 -p0 -b .null-xcrypt | 
|---|
| [925] | 33 |  | 
|---|
| [2246] | 34 | %patch800 -p1 -b .gsskex | 
|---|
|  | 35 | -%patch801 -p1 -b .force_krb | 
|---|
|  | 36 | +# Remove force_krb as it conflicts with admof | 
|---|
|  | 37 | +# %patch801 -p1 -b .force_krb | 
|---|
|  | 38 |  | 
|---|
|  | 39 | %patch900 -p1 -b .canohost | 
|---|
|  | 40 | -%patch901 -p1 -b .kuserok | 
|---|
|  | 41 | +# Remove the kuserok patch as it won't apply without patch800 | 
|---|
|  | 42 | +# %patch901 -p1 -b .kuserok | 
|---|
| [2339] | 43 | %patch902 -p1 -b .man-moduli | 
|---|
|  | 44 | %patch903 -p1 -b .ipqos | 
|---|
| [2449] | 45 | %patch904 -p1 -b .max-startups | 
|---|
|  | 46 | @@ -471,6 +476,8 @@ | 
|---|
| [2246] | 47 | # Nothing here yet | 
|---|
|  | 48 | %endif | 
|---|
|  | 49 |  | 
|---|
| [1259] | 50 | +%patch1001 -p1 -b .gssapi-env | 
|---|
| [760] | 51 | + | 
|---|
| [437] | 52 | autoreconf | 
|---|
| [2066] | 53 | pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} | 
|---|
|  | 54 | autoreconf | 
|---|