source: trunk/server/fedora/specs/openssh.spec.patch @ 2644

Last change on this file since 2644 was 2591, checked in by achernya, 10 years ago
Reintegrate fc20-dev into trunk
File size: 1.6 KB
RevLine 
[2591]1--- openssh.spec.orig   2014-05-25 19:03:45.308703615 -0400
2+++ openssh.spec        2014-05-25 19:05:57.593843283 -0400
3@@ -71,7 +71,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
[2591]11 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
12@@ -196,6 +196,7 @@
13 # ignore environment variables with embedded '=' or '\0' characters (#1077843)
14 Patch909: openssh-6.4p1-ignore-bad-env-var.patch
15 
[1259]16+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
[2185]17 
[2246]18 License: BSD
19 Group: Applications/Internet
[2591]20@@ -254,6 +255,7 @@
21 Requires(pre): /usr/sbin/useradd
22 Requires: pam >= 1.0.1-3
[2066]23 Requires: fipscheck-lib%{_isa} >= 1.3.0
[925]24+Provides: scripts-openssh-server
[2591]25 Requires(post): systemd-units
26 Requires(preun): systemd-units
27 Requires(postun): systemd-units
28@@ -411,10 +413,12 @@
29 %patch713 -p1 -b .ctr-cavs
[760]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
[2591]40 %patch902 -p1 -b .ccache_name
41 %patch903 -p1 -b .dh
42 %patch904 -p1 -b .SP800-131A
43@@ -428,6 +432,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
Note: See TracBrowser for help on using the repository browser.