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

Last change on this file since 2501 was 2450, checked in by tboning, 9 years ago
Removed mismerged comments from openssh.spec.patch
File size: 1.6 KB
  • openssh.spec

    old new  
    7474Summary: An open source implementation of SSH protocol versions 1 and 2
    7575Name: openssh
    7676Version: %{openssh_ver}
    77 Release: %{openssh_rel}%{?dist}%{?rescue_rel}
     77Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
    7878URL: http://www.openssh.com/portable.html
    7979#URL1: http://pamsshagentauth.sourceforge.net
    8080#Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
     
    220220Patch904: openssh-5.9p1-change-max-startups.patch
    221221# make sftp's libedit interface marginally multibyte aware (#841771)
    222222Patch908: openssh-5.9p1-sftp-multibyte.patch
    223 
     223Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
    224224
    225225License: BSD
    226226Group: Applications/Internet
     
    271273Group: Applications/Internet
    272274Requires: openssh = %{version}-%{release}
    273275Requires: fipscheck-lib%{_isa} >= 1.3.0
     276Provides: scripts-openssh-server
    274277
    275278%package server
    276279Summary: An open source SSH server daemon
     
    458461%patch714 -p0 -b .null-xcrypt
    459462
    460463%patch800 -p1 -b .gsskex
    461 %patch801 -p1 -b .force_krb
     464# Remove force_krb as it conflicts with admof
     465# %patch801 -p1 -b .force_krb
    462466
    463467%patch900 -p1 -b .canohost
    464 %patch901 -p1 -b .kuserok
     468# Remove the kuserok patch as it won't apply without patch800
     469# %patch901 -p1 -b .kuserok
    465470%patch902 -p1 -b .man-moduli
    466471%patch903 -p1 -b .ipqos
    467472%patch904 -p1 -b .max-startups
     
    471476# Nothing here yet
    472477%endif
    473478
     479%patch1001 -p1 -b .gssapi-env
     480
    474481autoreconf
    475482pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
    476483autoreconf
Note: See TracBrowser for help on using the repository browser.