3 files changed, 15 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index b80418653..0f313a92f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,7 @@ openssh (1:4.7p1-1) UNRELEASED; urgency=low
   * Refactor debian/rules configure and make invocations to make development
     easier.
   * Remove the hideously old /etc/ssh/primes on upgrade (closes: #123013).
+  * Update moduli(5) to revision 1.11 from OpenBSD CVS.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 23 Dec 2007 12:53:46 +0000
 
diff --git a/debian/moduli.5 b/debian/moduli.5
index b3997658b..3871e88ba 100644
--- a/debian/moduli.5
+++ b/debian/moduli.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: moduli.5,v 1.7 2003/03/06 20:48:35 jmc Exp $
+.\" $OpenBSD: moduli.5,v 1.11 2007/05/31 19:19:58 jmc Exp $
 .\"
 .\" Copyright 1997, 2000 William Allen Simpson <wsimpson@greendragon.com>
 .\" All rights reserved.
@@ -30,7 +30,7 @@
 .\"
 .\" Manual page, using -mandoc macros
 .\"
-.Dd July 28, 1997
+.Dd December 24 2007
 .Dt MODULI 5
 .Os
 .Sh NAME
@@ -68,7 +68,7 @@ meets basic structural requirements.
 .It 3 :
 Schnorr.
 .It 4 :
-Sophie-Germaine (q = (p-1)/2);
+Sophie-Germain (q = (p-1)/2);
 usually generated in the process of testing safe or strong primes.
 .It 5 :
 strong;
@@ -129,7 +129,7 @@ unused
 .El
 .Pp
 .Fa Size : decimal .
-Specifies the number of significant bits.
+Specifies the number of the most significant bit (0 to M).
 .Pp
 .Fa Generator : hex string .
 Specifies the best generator for a Diffie-Hellman exchange.
@@ -144,9 +144,14 @@ Time, Size and Generator criteria.
 When more than one meet the criteria,
 the selection should be weighted toward newer moduli,
 without completely disqualifying older moduli.
+.Pp
+New moduli may be generated using the
+.Xr ssh-keygen 1
+tool.
 .Sh FILES
 .Bl -tag -width /etc/ssh/moduli -compact
 .It Pa /etc/ssh/moduli
 .El
 .Sh SEE ALSO
+.Xr ssh-keygen 1 ,
 .Xr sshd 8
diff --git a/debian/rules b/debian/rules
index cbb119d23..9f86f44c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -396,6 +396,11 @@ binary: binary-indep binary-arch
 faq:
         wget -O debian/faq.html http://www.openssh.org/faq.html
 
+debian/moduli.5:
+        wget -q -O - 'http://www.openbsd.org/cgi-bin/cvsweb/~checkout~/src/share/man/man5/moduli.5?content-type=text/plain' | \
+                sed 's,/etc/moduli,/etc/ssh/moduli,g; s/\$$Mdocdate\$$/$(shell date +'%B %-d %Y')/' \
+                > debian/moduli.5
+
 .PHONY: build clean binary-indep binary-arch binary install
 .PHONY: build-deb build-udeb
 .PHONY: binary-openssh-client binary-openssh-server binary-ssh