Changeset 2246 for trunk/server/fedora/specs/openssh.spec.patch
- Timestamp:
- Jun 27, 2012, 10:29:47 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/fc17-dev (added) merged: 2081,2195-2198,2202,2204-2208,2210-2212,2215-2226,2230-2232,2235-2236,2238-2243,2245
- Property svn:mergeinfo changed
-
trunk/server/fedora/specs/openssh.spec.patch
r2185 r2246 1 --- openssh.spec. ~1~ 2012-02-14 11:06:13.000000000 -05002 +++ openssh.spec 2012-0 2-25 13:02:28.660616538 -05003 @@ - 78,7 +78,7 @@1 --- openssh.spec.orig 2012-06-18 18:16:43.764813595 -0400 2 +++ openssh.spec 2012-06-18 18:24:40.478720527 -0400 3 @@ -82,7 +82,7 @@ 4 4 Summary: An open source implementation of SSH protocol versions 1 and 2 5 5 Name: openssh … … 10 10 #URL1: http://pamsshagentauth.sourceforge.net 11 11 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz 12 @@ - 92,6 +92,7 @@13 Source3: sshd.init14 Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz215 Source5: pam_ssh_agent-rmheaders12 @@ -218,6 +218,7 @@ 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 16 16 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch 17 17 18 Patch100: openssh-5.6p1-wIm.patch19 Patch0: openssh-5.6p1-redhat.patch20 @@ -2 14,6 +215,7 @@21 Requires(pre): /usr/sbin/useradd22 Requires: pam >= 1.0.1-318 License: BSD 19 Group: Applications/Internet 20 @@ -271,6 +272,7 @@ 21 Group: Applications/Internet 22 Requires: openssh = %{version}-%{release} 23 23 Requires: fipscheck-lib%{_isa} >= 1.3.0 24 24 +Provides: scripts-openssh-server 25 25 26 %if %{ldap} 27 %package ldap 28 @@ -333,6 +335,8 @@ 29 %patch83 -p0 -b .oomkiller 30 %patch84 -p1 -b .legacy 26 %package server 27 Summary: An open source SSH server daemon 28 @@ -456,15 +458,19 @@ 29 %patch713 -p1 -b .ctr-cavs 30 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 40 41 %if 0 42 # Nothing here yet 43 %endif 31 44 32 45 +%patch1001 -p1 -b .gssapi-env
Note: See TracChangeset
for help on using the changeset viewer.