Changeset 2666 for trunk/server


Ignore:
Timestamp:
Feb 3, 2015, 7:17:16 PM (7 years ago)
Author:
andersk
Message:
Update openssh to 6.4p1-8.fc20

Fedora’s new patch openssh-6.4p1-GSSAPIEnablek5users.patch
(CVE-2014-9278) conflicts with r2232 but also obviates the need for
it, so this effectively reverts r2232.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/specs/openssh.spec.patch

    r2591 r2666  
    1 --- openssh.spec.orig   2014-05-25 19:03:45.308703615 -0400
    2 +++ openssh.spec        2014-05-25 19:05:57.593843283 -0400
     1--- openssh.spec.~1~    2015-01-15 09:30:33.000000000 -0500
     2+++ openssh.spec        2015-02-03 18:42:28.117828942 -0500
    33@@ -71,7 +71,7 @@
    44 Summary: An open source implementation of SSH protocol versions 1 and 2
     
    1010 #URL1: http://pamsshagentauth.sourceforge.net
    1111 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
     12@@ -225,6 +225,8 @@
     13 # Config parser shouldn't accept ip/port syntax (#1130733)
     14 Patch919: openssh-6.4p1-ip-port-config-parser.patch
    1515 
    1616+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
    17  
     17+
    1818 License: BSD
    1919 Group: Applications/Internet
    20 @@ -254,6 +255,7 @@
     20 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
     21@@ -282,6 +284,7 @@
    2122 Requires(pre): /usr/sbin/useradd
    2223 Requires: pam >= 1.0.1-3
     
    2627 Requires(preun): systemd-units
    2728 Requires(postun): systemd-units
    28 @@ -411,10 +413,12 @@
    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  %patch902 -p1 -b .ccache_name
    41  %patch903 -p1 -b .dh
    42  %patch904 -p1 -b .SP800-131A
    43 @@ -428,6 +432,8 @@
     29@@ -468,6 +471,8 @@
    4430 # Nothing here yet
    4531 %endif
Note: See TracChangeset for help on using the changeset viewer.