[2246] | 1 | --- openssh.spec.orig 2012-06-18 18:16:43.764813595 -0400 |
---|
| 2 | +++ openssh.spec 2012-06-18 18:24:40.478720527 -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 |
---|
[2339] | 12 | @@ -221,6 +221,7 @@ |
---|
[2246] | 13 | #https://bugzilla.mindrot.org/show_bug.cgi?id=1604 |
---|
| 14 | # sctp |
---|
| 15 | #https://bugzilla.mindrot.org/show_bug.cgi?id=1873 => https://bugzilla.redhat.com/show_bug.cgi?id=668993 |
---|
[1259] | 16 | +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch |
---|
[2185] | 17 | |
---|
[2246] | 18 | License: BSD |
---|
| 19 | Group: Applications/Internet |
---|
| 20 | @@ -271,6 +272,7 @@ |
---|
| 21 | Group: Applications/Internet |
---|
| 22 | Requires: openssh = %{version}-%{release} |
---|
[2066] | 23 | Requires: fipscheck-lib%{_isa} >= 1.3.0 |
---|
[925] | 24 | +Provides: scripts-openssh-server |
---|
[760] | 25 | |
---|
[2246] | 26 | %package server |
---|
| 27 | Summary: An open source SSH server daemon |
---|
[2339] | 28 | @@ -458,10 +460,12 @@ |
---|
| 29 | %patch714 -p0 -b .null-xcrypt |
---|
[925] | 30 | |
---|
[2246] | 31 | %patch800 -p1 -b .gsskex |
---|
| 32 | -%patch801 -p1 -b .force_krb |
---|
| 33 | +# Remove force_krb as it conflicts with admof |
---|
| 34 | +# %patch801 -p1 -b .force_krb |
---|
| 35 | |
---|
| 36 | %patch900 -p1 -b .canohost |
---|
| 37 | -%patch901 -p1 -b .kuserok |
---|
| 38 | +# Remove the kuserok patch as it won't apply without patch800 |
---|
| 39 | +# %patch901 -p1 -b .kuserok |
---|
[2339] | 40 | %patch902 -p1 -b .man-moduli |
---|
| 41 | %patch903 -p1 -b .ipqos |
---|
[2246] | 42 | |
---|
[2339] | 43 | @@ -469,6 +473,8 @@ |
---|
[2246] | 44 | # Nothing here yet |
---|
| 45 | %endif |
---|
| 46 | |
---|
[1259] | 47 | +%patch1001 -p1 -b .gssapi-env |
---|
[760] | 48 | + |
---|
[437] | 49 | autoreconf |
---|
[2066] | 50 | pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} |
---|
| 51 | autoreconf |
---|