From 0fcb25a8d258831fae50199229a4b1a10c3c12c9 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Fri, 14 Oct 2011 18:19:47 +0200
Subject: [PATCH] remove unnecessary requires on initscripts set
 VerifyHostKeyDNS to ask in the default configuration (#739856)

---
 openssh-5.6p1-redhat.patch | 4 +++-
 openssh.spec               | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/openssh-5.6p1-redhat.patch b/openssh-5.6p1-redhat.patch
index f4560a9..d1df8c1 100644
--- a/openssh-5.6p1-redhat.patch
+++ b/openssh-5.6p1-redhat.patch
@@ -1,7 +1,7 @@
 diff -up openssh-5.6p1/ssh_config.redhat openssh-5.6p1/ssh_config
 --- openssh-5.6p1/ssh_config.redhat	2010-01-12 09:40:27.000000000 +0100
 +++ openssh-5.6p1/ssh_config	2010-09-03 15:21:17.000000000 +0200
-@@ -45,3 +45,14 @@
+@@ -45,3 +45,16 @@
  #   PermitLocalCommand no
  #   VisualHostKey no
  #   ProxyCommand ssh -q -W %h:%p gateway.example.com
@@ -11,6 +11,8 @@ diff -up openssh-5.6p1/ssh_config.redhat openssh-5.6p1/ssh_config
 +# to the original X11 display. As virtually no X11 client supports the untrusted
 +# mode correctly we set this to yes.
 +	ForwardX11Trusted yes
++# Look up the host key SSHFP records
++	VerifyHostKeyDNS ask
 +# Send locale-related environment variables
 +	SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES 
 +	SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT 
diff --git a/openssh.spec b/openssh.spec
index 63cb64d..69fa755 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -75,7 +75,7 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %define openssh_ver 5.9p1
-%define openssh_rel 10
+%define openssh_rel 11
 %define pam_ssh_agent_ver 0.9.2
 %define pam_ssh_agent_rel 32
 
@@ -214,8 +214,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: /sbin/nologin
 %endif
 
-Requires: initscripts >= 5.20
-
 %if ! %{no_gnome_askpass}
 %if %{gtk2}
 BuildRequires: gtk2-devel
@@ -276,6 +274,7 @@ Requires(postun): systemd-units
 # is not valid.  We can use %post because this particular %triggerun script
 # should fire just after this package is installed.
 Requires(post): systemd-sysv
+Requires(post): chkconfig
 
 # Not yet ready
 # %package server-ondemand
@@ -783,6 +782,10 @@ fi
 %endif
 
 %changelog
+* Fri Oct 14 2011 Tomas Mraz <tmraz@redhat.com> - 5.9p1-11 + 0.9.2-32
+- remove unnecessary requires on initscripts
+- set VerifyHostKeyDNS to ask in the default configuration (#739856)
+
 * Mon Sep 19 2011 Jan F. Chadima <jchadima@redhat.com> - 5.9p1-10 + 0.9.2-32
 - selinux sandbox rewrite
 - two factor authentication tweaking