Changeset 2666 for trunk/server/fedora/specs/openssh.spec.patch

Timestamp:

Feb 3, 2015, 7:17:16 PM (9 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:

• trunk/server/fedora/specs/openssh.spec.patch (modified) (3 diffs)

trunk/server/fedora/specs/openssh.spec.patch

@@ -1 @@
---- openssh.spec.orig   2014-05-25 19:03:45.308703615 -0400
-+++ openssh.spec        2014-05-25 19:05:57.593843283 -0400
+--- openssh.spec.~1~    2015-01-15 09:30:33.000000000 -0500
++++ openssh.spec        2015-02-03 18:42:28.117828942 -0500
 @@ -71,7 +71,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
@@ -10 +10 @@
  #URL1: http://pamsshagentauth.sourceforge.net
  Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-@@ -196,6 +196,7 @@
- # ignore environment variables with embedded '=' or '\0' characters (#1077843)
- Patch909: openssh-6.4p1-ignore-bad-env-var.patch
+@@ -225,6 +225,8 @@
+ # Config parser shouldn't accept ip/port syntax (#1130733)
+ Patch919: openssh-6.4p1-ip-port-config-parser.patch
  
 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
- 
++
  License: BSD
  Group: Applications/Internet
-@@ -254,6 +255,7 @@
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+@@ -282,6 +284,7 @@
  Requires(pre): /usr/sbin/useradd
  Requires: pam >= 1.0.1-3
@@ -26 +27 @@
  Requires(preun): systemd-units
  Requires(postun): systemd-units
-@@ -411,10 +413,12 @@
- %patch713 -p1 -b .ctr-cavs
- 
- %patch800 -p1 -b .gsskex
--%patch801 -p1 -b .force_krb
-+# Remove force_krb as it conflicts with admof
-+# %patch801 -p1 -b .force_krb
- 
- %patch900 -p1 -b .canohost
--%patch901 -p1 -b .kuserok
-+# Remove the kuserok patch as it won't apply without patch800
-+# %patch901 -p1 -b .kuserok
- %patch902 -p1 -b .ccache_name
- %patch903 -p1 -b .dh
- %patch904 -p1 -b .SP800-131A
-@@ -428,6 +432,8 @@
+@@ -468,6 +471,8 @@
  # Nothing here yet
  %endif