The cronjob now also generated the Diffie-Hellman Parameters.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 22 insertions, 11 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index e058d9226746..1b08e4c5da71 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/qmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.42 2005/06/08 19:23:06 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.43 2005/06/12 19:35:43 hansmi Exp $
+
+  12 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  files/qmail-genrsacert.sh:
+  The cronjob now also generated the Diffie-Hellman Parameters.
 
   08 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   files/qmail-genrsacert.sh:
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index 70ce1f01dc36..fdb0f555ec8f 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -1,5 +1,5 @@
 MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
-MD5 57caf7da6f04a808eed96d49f2cc1bf2 ChangeLog 29144
+MD5 75fb2feea06209d4e72600fc02486aea ChangeLog 29292
 MD5 3a59517e6fec441ff7f7a8c62398d768 qmail-1.03-r16.ebuild 21224
 MD5 21fc9651e8bb292a5fbaa4fd0bdf5ac1 qmail-1.03-r15.ebuild 18081
 MD5 7db09ceb9337348431fb9f8418e5892e files/dot_qmail-log 276
@@ -26,7 +26,7 @@ MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
 MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
 MD5 fd098ab9ede9c74f209bf16e168ab185 files/conf-common 2328
 MD5 9867559d416bd731eed63709f5eef841 files/run-qmailpop3dlog 321
-MD5 5ab141836d53db27575900110088a19a files/qmail-genrsacert.sh 1247
+MD5 73db31418bb525a8a5653b435ea07315 files/qmail-genrsacert.sh 1464
 MD5 5d982dc0db68c72cde9ce03f0da37ce4 files/run-qmailpop3d 909
 MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
 MD5 60de9dacc5289d44d64603d76e5ebc99 files/run-qmailsendlog 320
diff --git a/mail-mta/qmail/files/qmail-genrsacert.sh b/mail-mta/qmail/files/qmail-genrsacert.sh
index 16d11e7578ba..7aa2d18070aa 100644
--- a/mail-mta/qmail/files/qmail-genrsacert.sh
+++ b/mail-mta/qmail/files/qmail-genrsacert.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/qmail-genrsacert.sh,v 1.3 2005/06/08 19:23:06 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/qmail-genrsacert.sh,v 1.4 2005/06/12 19:35:43 hansmi Exp $
 # Robin H. Johnson <robbat2@gentoo.org> - October 17, 2003
-# This file generates the static temporary RSA keys needed for qmail to encrypt messages
-# It should be run from a crontab, once a day is ok on low load machines, but
-# if you do lots of mail, once per hour is more reasonable
-# if you do NOT create the rsa512.pem, qmail will generate it on the fly for
-# each connection, which can be VERY slow.
+#
+# This file generates the static temporary RSA keys needed for qmail to encrypt
+# messages. It should be run from a crontab, once a day is ok on low load
+# machines, but if you do lots of mail, once per hour is more reasonable if you
+# do NOT create the rsa512.pem, qmail will generate it on the fly for each
+# connection, which can be VERY slow.
 
 if [ -z "${ROOT}" -o "${ROOT}" = "/" ]; then
 	confdir=/var/qmail/control
@@ -23,8 +24,7 @@ umask ${umaskvalue}
 
 # This is a list with bits of the generated keys. They should
 # be a power of 2 ideally and must be more than 64.
-# Sample: 128 256 512 1024
-keys="512"
+keys="512 1024"
 
 for bits in ${keys}
 do
@@ -35,4 +35,11 @@ do
 	/usr/bin/openssl genrsa -out ${tmpfile} ${bits} 2>/dev/null && \
 	/bin/chown ${uid}:${gid} ${tmpfile} && \
 	/bin/mv -f ${tmpfile} ${pemfile} || exit 1
+
+	dhfile="${confdir}/dh${bits}.pem"
+	dtmpfile="${confdir}/dh${bits}.pem.tmp"
+
+	/usr/bin/openssl dhparam -2 -out ${dtmpfile} ${bits} 2>/dev/null && \
+	/bin/chown ${uid}:${gid} ${dtmpfile} && \
+	/bin/mv -f ${dtmpfile} ${dhfile} || exit 1
 done