From 29b683c1d2d97951af40e689190ca4b88aab8c1c Mon Sep 17 00:00:00 2001
From: Jan F <jfch@zwingli.jagda.eu>
Date: Tue, 21 Jun 2011 11:01:06 +0200
Subject: [PATCH] Mention IPv6 usage in man pages

---
 openssh-5.8p2-ipv6man.patch | 24 ++++++++++++++++++++++++
 openssh.spec                |  8 +++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 openssh-5.8p2-ipv6man.patch

diff --git a/openssh-5.8p2-ipv6man.patch b/openssh-5.8p2-ipv6man.patch
new file mode 100644
index 0000000..addab23
--- /dev/null
+++ b/openssh-5.8p2-ipv6man.patch
@@ -0,0 +1,24 @@
+diff -up openssh-5.8p2/ssh.1.ipv6man openssh-5.8p2/ssh.1
+--- openssh-5.8p2/ssh.1.ipv6man	2011-06-21 10:39:57.000000000 +0200
++++ openssh-5.8p2/ssh.1	2011-06-21 10:46:24.060457248 +0200
+@@ -1409,6 +1409,8 @@ manual page for more information.
+ .Nm
+ exits with the exit status of the remote command or with 255
+ if an error occurred.
++.Sh IPV6
++IPv6 address can be used everywhere where IPv4 address. In all entries must be the IPv6 address enclosed in square brackets. Note: The square brackets are metacharacters for the shell and must be escaped in shell.
+ .Sh SEE ALSO
+ .Xr scp 1 ,
+ .Xr sftp 1 ,
+diff -up openssh-5.8p2/sshd.8.ipv6man openssh-5.8p2/sshd.8
+--- openssh-5.8p2/sshd.8.ipv6man	2011-06-21 10:40:04.623457378 +0200
++++ openssh-5.8p2/sshd.8	2011-06-21 10:40:05.289467631 +0200
+@@ -961,6 +961,8 @@ Minimum is 6 bytes.
+ This setting is not recommended on the computers without the hardware
+ random generator because insufficient entropy causes the connection to 
+ be blocked until enough entropy is available.
++.Sh IPV6
++IPv6 address can be used everywhere where IPv4 address. In all entries must be the IPv6 address enclosed in square brackets. Note: The square brackets are metacharacters for the shell and must be escaped in shell.
+ .Sh SEE ALSO
+ .Xr scp 1 ,
+ .Xr sftp 1 ,
diff --git a/openssh.spec b/openssh.spec
index 8bdcecd..c158677 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -82,7 +82,7 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %define openssh_ver 5.8p2
-%define openssh_rel 9
+%define openssh_rel 10
 %define pam_ssh_agent_ver 0.9.2
 %define pam_ssh_agent_rel 31
 
@@ -193,6 +193,8 @@ Patch63: openssh-5.8p2-force_krb.patch
 Patch64: openssh-5.8p2-kuserok.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1329 (WONTFIX)
 Patch65: openssh-5.8p2-remove-stale-control-socket.patch
+#?
+Patch66: openssh-5.8p2-ipv6man.patch
 #---
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
 # sctp
@@ -398,6 +400,7 @@ popd
 %patch63 -p1 -b .force_krb
 %patch64 -p1 -b .kuserok
 %patch65 -p1 -b .remove_stale
+%patch66 -p1 -b .ipv6man
 
 autoreconf
 pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
@@ -750,6 +753,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Jun 21 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p2-10 + 0.9.2-31
+- Mention IPv6 usage in man pages
+
 * Mon Jun 20 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p2-9 + 0.9.2-31
 - Improve init script