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

Last change on this file since 2491 was 2450, checked in by tboning, 11 years ago
Removed mismerged comments from openssh.spec.patch
File size: 1.6 KB
RevLine 
[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
[2450]12@@ -220,7 +220,7 @@
[2449]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-
[1259]17+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
[2185]18 
[2246]19 License: BSD
20 Group: Applications/Internet
[2449]21@@ -271,6 +273,7 @@
[2246]22 Group: Applications/Internet
23 Requires: openssh = %{version}-%{release}
[2066]24 Requires: fipscheck-lib%{_isa} >= 1.3.0
[925]25+Provides: scripts-openssh-server
[760]26 
[2246]27 %package server
28 Summary: An open source SSH server daemon
[2449]29@@ -458,10 +461,12 @@
[2339]30 %patch714 -p0 -b .null-xcrypt
[925]31 
[2246]32 %patch800 -p1 -b .gsskex
33-%patch801 -p1 -b .force_krb
34+# Remove force_krb as it conflicts with admof
35+# %patch801 -p1 -b .force_krb
36 
37 %patch900 -p1 -b .canohost
38-%patch901 -p1 -b .kuserok
39+# Remove the kuserok patch as it won't apply without patch800
40+# %patch901 -p1 -b .kuserok
[2339]41 %patch902 -p1 -b .man-moduli
42 %patch903 -p1 -b .ipqos
[2449]43 %patch904 -p1 -b .max-startups
44@@ -471,6 +476,8 @@
[2246]45 # Nothing here yet
46 %endif
47 
[1259]48+%patch1001 -p1 -b .gssapi-env
[760]49+
[437]50 autoreconf
[2066]51 pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
52 autoreconf
Note: See TracBrowser for help on using the repository browser.