From 56a647f5e319afdc89a46ccd36231ab116341f06 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Wed, 3 Dec 2014 18:08:20 +0100
Subject: [PATCH] the .local domain example should be in ssh_config, not in
 sshd_config

---
 openssh-5.8p1-localdomain.patch   | 14 --------------
 openssh-6.6.1p1-localdomain.patch | 12 ++++++++++++
 openssh-6.6p1-redhat.patch        | 11 ++++++-----
 openssh.spec                      |  2 +-
 4 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 openssh-5.8p1-localdomain.patch
 create mode 100644 openssh-6.6.1p1-localdomain.patch

diff --git a/openssh-5.8p1-localdomain.patch b/openssh-5.8p1-localdomain.patch
deleted file mode 100644
index 2f21658..0000000
--- a/openssh-5.8p1-localdomain.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up openssh-5.8p1/sshd_config.localdomain openssh-5.8p1/sshd_config
---- openssh-5.8p1/sshd_config.localdomain	2011-04-22 11:37:49.273648812 +0200
-+++ openssh-5.8p1/sshd_config	2011-04-22 11:39:31.758648401 +0200
-@@ -130,6 +130,10 @@ X11Forwarding yes
- # override default of no subsystems
- Subsystem	sftp	/usr/libexec/sftp-server
- 
-+# Uncomment this if you want to use .local domain
-+#Host *.local
-+#	CheckHostIP no
-+
- # Example of overriding settings on a per-user basis
- #Match User anoncvs
- #	X11Forwarding no
diff --git a/openssh-6.6.1p1-localdomain.patch b/openssh-6.6.1p1-localdomain.patch
new file mode 100644
index 0000000..4995171
--- /dev/null
+++ b/openssh-6.6.1p1-localdomain.patch
@@ -0,0 +1,12 @@
+diff --git a/ssh_config b/ssh_config
+index 03a228f..49a4f6c 100644
+--- a/ssh_config
++++ b/ssh_config
+@@ -46,3 +46,7 @@
+ #   VisualHostKey no
+ #   ProxyCommand ssh -q -W %h:%p gateway.example.com
+ #   RekeyLimit 1G 1h
++#
++# Uncomment this if you want to use .local domain
++# Host *.local
++#   CheckHostIP no
diff --git a/openssh-6.6p1-redhat.patch b/openssh-6.6p1-redhat.patch
index a87d9bf..12f4a9f 100644
--- a/openssh-6.6p1-redhat.patch
+++ b/openssh-6.6p1-redhat.patch
@@ -1,11 +1,12 @@
 diff --git a/ssh_config b/ssh_config
-index 03a228f..6d1abaf 100644
+index 49a4f6c..3f83c40 100644
 --- a/ssh_config
 +++ b/ssh_config
-@@ -46,3 +46,14 @@
- #   VisualHostKey no
- #   ProxyCommand ssh -q -W %h:%p gateway.example.com
- #   RekeyLimit 1G 1h
+@@ -50,3 +50,15 @@
+ # Uncomment this if you want to use .local domain
+ # Host *.local
+ #   CheckHostIP no
++
 +Host *
 +	GSSAPIAuthentication yes
 +# If this option is set to yes then remote X11 clients will have full access
diff --git a/openssh.spec b/openssh.spec
index a0d8b88..14effb1 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -152,7 +152,7 @@ Patch703: openssh-4.3p2-askpass-grab-info.patch
 #?
 Patch705: openssh-5.1p1-scp-manpage.patch
 #?
-Patch706: openssh-5.8p1-localdomain.patch
+Patch706: openssh-6.6.1p1-localdomain.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1635 (WONTFIX)
 Patch707: openssh-6.6p1-redhat.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1890 (WONTFIX) need integration to prng helper which is discontinued :)