[gsi-openssh/f16] Fix the man moduli page

[Mattias Ellert]

commit e477a15b69a626115dbb0bf4ea83107b7cef6fc9
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Dec 11 04:09:54 2012 +0100

    Fix the man moduli page

 gsi-openssh.spec               |    7 +++----
 openssh-5.8p2-man-moduli.patch |   24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/gsi-openssh.spec b/gsi-openssh.spec
index e85bead..a2535dd 100644
--- a/gsi-openssh.spec
+++ b/gsi-openssh.spec
@@ -146,10 +146,8 @@ Patch69: openssh-5.8p2-askpass-ld.patch
 Patch70: openssh-5.8p2-copy-id-restorecon.patch
 # warn users for unsupported UsePAM=no
 Patch71: openssh-5.8p2-log-usepam-no.patch
-#---
-#https://bugzilla.mindrot.org/show_bug.cgi?id=1604
-# sctp
-#https://bugzilla.mindrot.org/show_bug.cgi?id=1873 => https://bugzilla.redhat.com/show_bug.cgi?id=668993
+#https://bugzilla.redhat.com/show_bug.cgi?id=841065
+Patch72: openssh-5.8p2-man-moduli.patch
 
 # This is the patch that adds GSI support
 # Based on http://grid.ncsa.illinois.edu/ssh/dl/patch/openssh-5.8p2.patch
@@ -311,6 +309,7 @@ This version of OpenSSH has been modified to support GSI authentication.
 %patch69 -p1 -b .askpass-ld
 %patch70 -p1 -b .restorecon
 %patch71 -p1 -b .log-usepam-no
+%patch72 -p1 -b .man-moduli
 %patch98 -p1 -b .gsi
 
 sed 's/sshd.pid/gsisshd.pid/' -i pathnames.h
diff --git a/openssh-5.8p2-man-moduli.patch b/openssh-5.8p2-man-moduli.patch
new file mode 100644
index 0000000..840e3dd
--- /dev/null
+++ b/openssh-5.8p2-man-moduli.patch
@@ -0,0 +1,24 @@
+diff -up openssh-5.8p2/moduli.0.man-moduli openssh-5.8p2/moduli.0
+--- openssh-5.8p2/moduli.0.man-moduli	2011-05-05 03:58:10.000000000 +0200
++++ openssh-5.8p2/moduli.0	2012-11-06 10:18:11.301710631 +0100
+@@ -25,7 +25,7 @@ DESCRIPTION
+ 
+                         0     Unknown, not tested
+                         2     "Safe" prime; (p-1)/2 is also prime.
+-                        4     Sophie Germain; (p+1)*2 is also prime.
++                        4     Sophie Germain; (p*2)+1 is also prime.
+ 
+                         Moduli candidates initially produced by ssh-keygen(1)
+                         are Sophie Germain primes (type 4).  Futher primality
+diff -up openssh-5.8p2/moduli.5.man-moduli openssh-5.8p2/moduli.5
+--- openssh-5.8p2/moduli.5.man-moduli	2008-06-26 07:59:32.000000000 +0200
++++ openssh-5.8p2/moduli.5	2012-11-06 10:16:40.320224142 +0100
+@@ -62,7 +62,7 @@ Unknown, not tested
+ .It 2
+ "Safe" prime; (p-1)/2 is also prime.
+ .It 4
+-Sophie Germain; (p+1)*2 is also prime.
++Sophie Germain; (p*2)+1 is also prime.
+ .El
+ .Pp
+ Moduli candidates initially produced by