Changeset 2525 for branches/fc20-dev/server/fedora/specs/openssh.spec.patch

Timestamp:

May 26, 2014, 3:16:42 AM (10 years ago)

Author:

achernya

Message:

Modernize spec files for F20

File:

• branches/fc20-dev/server/fedora/specs/openssh.spec.patch (modified) (4 diffs)

branches/fc20-dev/server/fedora/specs/openssh.spec.patch

@@ -1 @@
---- openssh.spec.orig   2013-05-01 19:02:52.961058569 -0400
-+++ openssh.spec        2013-05-01 19:15:58.952058569 -0400
-@@ -74,7 +74,7 @@
+--- openssh.spec.orig   2014-05-25 19:03:45.308703615 -0400
++++ openssh.spec        2014-05-25 19:05:57.593843283 -0400
+@@ -71,7 +71,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
@@ -10 +10 @@
  #URL1: http://pamsshagentauth.sourceforge.net
  Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-@@ -187,6 +187,7 @@
- # add latest config.{sub,guess} to support aarch64 (#926284)
- Patch907: openssh-6.2p1-aarch64.patch
+@@ -196,6 +196,7 @@
+ # ignore environment variables with embedded '=' or '\0' characters (#1077843)
+ Patch909: openssh-6.4p1-ignore-bad-env-var.patch
  
 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
@@ -18 +18 @@
  License: BSD
  Group: Applications/Internet
-@@ -238,6 +239,7 @@
- Group: Applications/Internet
- Requires: openssh = %{version}-%{release}
+@@ -254,6 +255,7 @@
+ Requires(pre): /usr/sbin/useradd
+ Requires: pam >= 1.0.1-3
  Requires: fipscheck-lib%{_isa} >= 1.3.0
 +Provides: scripts-openssh-server
- 
- %package server
- Summary: An open source SSH server daemon
-@@ -407,10 +409,12 @@
+ Requires(post): systemd-units
+ Requires(preun): systemd-units
+ Requires(postun): systemd-units
+@@ -411,10 +413,12 @@
  %patch713 -p1 -b .ctr-cavs
  
@@ -36 +36 @@
  %patch900 -p1 -b .canohost
 -%patch901 -p1 -b .kuserok
-+# Remove the kuserok patch as it won't apply without patch800  
++# Remove the kuserok patch as it won't apply without patch800
 +# %patch901 -p1 -b .kuserok
- %patch905 -p1 -b .modpipe-cflags
- %patch906 -p1 -b .identityfile
- %patch907 -p1 -b .aarch64
-@@ -419,6 +423,8 @@
+ %patch902 -p1 -b .ccache_name
+ %patch903 -p1 -b .dh
+ %patch904 -p1 -b .SP800-131A
+@@ -428,6 +432,8 @@
  # Nothing here yet
  %endif