[openssh/f16] repair broken man pages
Tomáš Mráz
tmraz at fedoraproject.org
Fri Nov 18 09:05:52 UTC 2011
commit 25b191d985d0f01cfbf68a648ac6ade2b3b75cc2
Author: Jan F. Chadima <jfch at fukusima15.jagda.eu>
Date: Mon Aug 8 11:57:43 2011 +0200
repair broken man pages
openssh-5.8p1-entropy.patch | 17 ++++++++++++-----
openssh-5.8p2-ipv6man.patch | 2 +-
openssh.spec | 11 +++++++----
3 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/openssh-5.8p1-entropy.patch b/openssh-5.8p1-entropy.patch
index c3acc7c..b19512d 100644
--- a/openssh-5.8p1-entropy.patch
+++ b/openssh-5.8p1-entropy.patch
@@ -89,10 +89,12 @@ diff -up openssh-5.8p2/openbsd-compat/port-linux-prng.c.entropy openssh-5.8p2/op
diff -up openssh-5.8p2/ssh.1.entropy openssh-5.8p2/ssh.1
--- openssh-5.8p2/ssh.1.entropy 2010-11-20 05:21:03.000000000 +0100
+++ openssh-5.8p2/ssh.1 2011-05-28 21:15:27.375920967 +0200
-@@ -1250,6 +1250,20 @@ For more information, see the
+@@ -1250,6 +1250,23 @@ For more information, see the
.Cm PermitUserEnvironment
option in
.Xr sshd_config 5 .
++.Sh ENVIRONMENT
++.Bl -tag -width Ds -compact
+.It Ev SSH_USE_STRONG_RNG
+The reseeding of the OpenSSL random generator is usually done from
+.Cm /dev/urandom .
@@ -107,6 +109,7 @@ diff -up openssh-5.8p2/ssh.1.entropy openssh-5.8p2/ssh.1
+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.
++.El
.Sh FILES
.Bl -tag -width Ds -compact
.It Pa ~/.rhosts
@@ -137,7 +140,7 @@ diff -up openssh-5.8p2/ssh-add.1.entropy openssh-5.8p2/ssh-add.1
diff -up openssh-5.8p2/ssh-agent.1.entropy openssh-5.8p2/ssh-agent.1
--- openssh-5.8p2/ssh-agent.1.entropy 2010-12-01 01:50:35.000000000 +0100
+++ openssh-5.8p2/ssh-agent.1 2011-05-28 21:13:10.086864993 +0200
-@@ -198,6 +198,23 @@ sockets used to contain the connection t
+@@ -198,6 +198,24 @@ sockets used to contain the connection t
These sockets should only be readable by the owner.
The sockets should get automatically removed when the agent exits.
.El
@@ -158,13 +161,14 @@ diff -up openssh-5.8p2/ssh-agent.1.entropy openssh-5.8p2/ssh-agent.1
+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.
++.El
.Sh SEE ALSO
.Xr ssh 1 ,
.Xr ssh-add 1 ,
diff -up openssh-5.8p2/sshd.8.entropy openssh-5.8p2/sshd.8
--- openssh-5.8p2/sshd.8.entropy 2010-11-05 00:20:14.000000000 +0100
+++ openssh-5.8p2/sshd.8 2011-05-28 21:13:10.241861760 +0200
-@@ -937,6 +937,23 @@ concurrently for different ports, this c
+@@ -937,6 +937,24 @@ concurrently for different ports, this c
started last).
The content of this file is not sensitive; it can be world-readable.
.El
@@ -185,13 +189,14 @@ diff -up openssh-5.8p2/sshd.8.entropy openssh-5.8p2/sshd.8
+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.
++.El
.Sh SEE ALSO
.Xr scp 1 ,
.Xr sftp 1 ,
diff -up openssh-5.8p2/ssh-keygen.1.entropy openssh-5.8p2/ssh-keygen.1
--- openssh-5.8p2/ssh-keygen.1.entropy 2010-11-05 00:20:14.000000000 +0100
+++ openssh-5.8p2/ssh-keygen.1 2011-05-28 21:13:10.389856432 +0200
-@@ -655,6 +655,23 @@ Contains Diffie-Hellman groups used for
+@@ -655,6 +655,24 @@ Contains Diffie-Hellman groups used for
The file format is described in
.Xr moduli 5 .
.El
@@ -212,13 +217,14 @@ diff -up openssh-5.8p2/ssh-keygen.1.entropy openssh-5.8p2/ssh-keygen.1
+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.
++.El
.Sh SEE ALSO
.Xr ssh 1 ,
.Xr ssh-add 1 ,
diff -up openssh-5.8p2/ssh-keysign.8.entropy openssh-5.8p2/ssh-keysign.8
--- openssh-5.8p2/ssh-keysign.8.entropy 2010-08-31 14:41:14.000000000 +0200
+++ openssh-5.8p2/ssh-keysign.8 2011-05-28 21:17:32.399856797 +0200
-@@ -78,6 +78,23 @@ must be set-uid root if host-based authe
+@@ -78,6 +78,24 @@ must be set-uid root if host-based authe
If these files exist they are assumed to contain public certificate
information corresponding with the private keys above.
.El
@@ -239,6 +245,7 @@ diff -up openssh-5.8p2/ssh-keysign.8.entropy openssh-5.8p2/ssh-keysign.8
+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.
++.El
.Sh SEE ALSO
.Xr ssh 1 ,
.Xr ssh-keygen 1 ,
diff --git a/openssh-5.8p2-ipv6man.patch b/openssh-5.8p2-ipv6man.patch
index addab23..16dc760 100644
--- a/openssh-5.8p2-ipv6man.patch
+++ b/openssh-5.8p2-ipv6man.patch
@@ -14,9 +14,9 @@ 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.
+ .El
+.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
diff --git a/openssh.spec b/openssh.spec
index 0e410bc..2872393 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -79,7 +79,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 16
+%define openssh_rel 17
%define pam_ssh_agent_ver 0.9.2
%define pam_ssh_agent_rel 31
@@ -190,9 +190,9 @@ 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
-#https://bugzilla.mindrot.org/show_bug.cgi?id=1919
-Patch66: openssh-5.8p2-ipv6man.patch
#?
+Patch66: openssh-5.8p2-ipv6man.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1919
Patch67: openssh-5.8p2-unconfined.patch
#---
#https://bugzilla.mindrot.org/show_bug.cgi?id=1604
@@ -768,8 +768,11 @@ fi
%endif
%changelog
+* Mon Aug 8 2011 Jan F. Chadima <jchadima at redhat.com> - 5.8p2-17 + 0.9.2-31
+- repair broken man pages
+
* Mon Jul 25 2011 Jan F. Chadima <jchadima at redhat.com> - 5.8p2-16 + 0.9.2-31
-- rebuild
+- rebuild due to broken rpmbiild
* Thu Jul 21 2011 Jan F. Chadima <jchadima at redhat.com> - 5.8p2-15 + 0.9.2-31
- Do not change context when run under unconfined_t
More information about the scm-commits
mailing list