qmail-dhparam.sh is not needed, because its functionality is in qmail-genrsacert.sh already.

Package-Manager: portage-2.1.1_pre1-r5

2 files changed, 8 insertions, 49 deletions

diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index 70f9d59de4a2..7d7840e77a68 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -190,10 +190,6 @@ AUX qmail-config-system 1073 RMD160 189151ad2b64f82e7da96d7da9a729b9b4b92734 SHA
 MD5 86afe93a8dea5d63c6642aea31bb7386 files/qmail-config-system 1073
 RMD160 189151ad2b64f82e7da96d7da9a729b9b4b92734 files/qmail-config-system 1073
 SHA256 3353c3154282833aade4e2dd3d5593bd32bfc4d4474991750627c65b723db38c files/qmail-config-system 1073
-AUX qmail-dhparam.sh 1323 RMD160 f8083d42c468d23254982a2dc38e67f439ee1a78 SHA1 4024427cbba852cea2f40df257abe7b3338ca173 SHA256 ae891b4bc89d2eb3407a677e1098131949150a1e8692fada43c9817658382e2c
-MD5 633d89998a2d597735717d3039436381 files/qmail-dhparam.sh 1323
-RMD160 f8083d42c468d23254982a2dc38e67f439ee1a78 files/qmail-dhparam.sh 1323
-SHA256 ae891b4bc89d2eb3407a677e1098131949150a1e8692fada43c9817658382e2c files/qmail-dhparam.sh 1323
 AUX qmail-genrsacert.sh 1561 RMD160 7c90c8d9d499bfd9098cf38b6543ea247e070d42 SHA1 8c54b02c18c3124e85eb6d5c7c1588525a29ed7b SHA256 d59321adc93d658f02916d0da31b248a32a77f43d33c60f679c949bb41b2afca
 MD5 23c2cb3e6b219b75bf7614a63bc052f0 files/qmail-genrsacert.sh 1561
 RMD160 7c90c8d9d499bfd9098cf38b6543ea247e070d42 files/qmail-genrsacert.sh 1561
@@ -302,14 +298,14 @@ EBUILD qmail-1.03-r15.ebuild 18747 RMD160 bd296b760947249ef2517be3048d2bc4189af7
 MD5 0d7852135a4316296951bbc86b1aa93a qmail-1.03-r15.ebuild 18747
 RMD160 bd296b760947249ef2517be3048d2bc4189af7d4 qmail-1.03-r15.ebuild 18747
 SHA256 ee8c41cb359a9272bf494eb3d172aa302bab40f56c898ef30fde6c4b6cd58c88 qmail-1.03-r15.ebuild 18747
-EBUILD qmail-1.03-r16.ebuild 21959 RMD160 98e6ebea9b0a1c6da8dd22b3f6b47d7454ebf09c SHA1 030330ce42a9d96464a6d569423743c18fae5fc6 SHA256 60166b5cc392443006de7858744326992b9052b31f20164c017bd6d871dc8e98
-MD5 ef72e2efd772564b4f2ad5df9b720b00 qmail-1.03-r16.ebuild 21959
-RMD160 98e6ebea9b0a1c6da8dd22b3f6b47d7454ebf09c qmail-1.03-r16.ebuild 21959
-SHA256 60166b5cc392443006de7858744326992b9052b31f20164c017bd6d871dc8e98 qmail-1.03-r16.ebuild 21959
-MISC ChangeLog 34026 RMD160 b20541e8789595f3ac5bdeed9cf2bf9aa91628cb SHA1 6e092aec38007e33b812b9a63061a62b6161ae91 SHA256 0cafe6a685facd16f37a3dfef6cf9512c75637eccf1bb2581677938750e060bf
-MD5 0dc1081d559914b276005a2f257c9941 ChangeLog 34026
-RMD160 b20541e8789595f3ac5bdeed9cf2bf9aa91628cb ChangeLog 34026
-SHA256 0cafe6a685facd16f37a3dfef6cf9512c75637eccf1bb2581677938750e060bf ChangeLog 34026
+EBUILD qmail-1.03-r16.ebuild 22148 RMD160 8a627c0fccd5e770e3c2e8891cfd96c1d575c0d7 SHA1 ea40aefecf3af4e099fadcbcdf1470ff54db60cb SHA256 04e77bbe873058280b446a0bb720dee0d3421c0772c9b7c616cc0f1a65a33221
+MD5 059709c8112b8caeacbaff9368af80ea qmail-1.03-r16.ebuild 22148
+RMD160 8a627c0fccd5e770e3c2e8891cfd96c1d575c0d7 qmail-1.03-r16.ebuild 22148
+SHA256 04e77bbe873058280b446a0bb720dee0d3421c0772c9b7c616cc0f1a65a33221 qmail-1.03-r16.ebuild 22148
+MISC ChangeLog 34228 RMD160 6f9e4382d0341f759a25caeec07d2f12c913682d SHA1 0496c66f43de0e8e91b51dbb06f2b406cb131c31 SHA256 59fa658a657431873f1e282230c851ed6f3929194e0da953e8649f8e9d0238cb
+MD5 ce50ff0c2b1506ccf8154abd4abfbd33 ChangeLog 34228
+RMD160 6f9e4382d0341f759a25caeec07d2f12c913682d ChangeLog 34228
+SHA256 59fa658a657431873f1e282230c851ed6f3929194e0da953e8649f8e9d0238cb ChangeLog 34228
 MISC metadata.xml 277 RMD160 ff3934a893d06e6b10a129469d8bdd7827de103d SHA1 848867d40baa89c695d92a19f95a7348ec118545 SHA256 e04f3f634b6d15f940639a415de9cf571b35189b3925f7fc59f0fe32bbbc9191
 MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
 RMD160 ff3934a893d06e6b10a129469d8bdd7827de103d metadata.xml 277
diff --git a/mail-mta/qmail/files/qmail-dhparam.sh b/mail-mta/qmail/files/qmail-dhparam.sh
deleted file mode 100755
index fcad8e69efe6..000000000000
--- a/mail-mta/qmail/files/qmail-dhparam.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/qmail-dhparam.sh,v 1.1 2006/06/15 00:54:51 robbat2 Exp $
-# Robin H. Johnson <robbat2@gentoo.org> - Sept 5, 2005
-# This file generates the static temporary DH parameter 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 dh512.pem/dh1024.pem, qmail will generate it on the fly for
-# each connection, which can be VERY slow.
-
-# this is the number of bits in the key
-# it should be a power of 2 ideally
-# and it must be more than 64!
-# set this to 512 only if you are using export grade encryption
-# and configure tls*ciphers for qmail
-bits="1024 512"
-
-for b in $bits ; do 
-	if [ -z "${ROOT}" -o "${ROOT}" = "/" ]; then
-	confdir=/var/qmail/control
-	else
-	confdir=${ROOT}/var/qmail/control
-	fi
-	pemfile="${confdir}/dh${b}.pem"
-	tmpfile="${confdir}/dh${b}.pem.tmp"
-	
-	# the key should be 0600
-	# which is readable by qmaild only!
-	umaskvalue="0077"
-	uid="qmaild"
-	gid="qmail"
-	
-	umask ${umaskvalue} ; 
-	# we need to make sure that all of the operations succeed
-	/usr/bin/openssl dhparam -out ${tmpfile} ${b} 2>/dev/null && \
-	/bin/chown ${uid}:${gid} ${tmpfile} && \
-	/bin/mv -f ${tmpfile} ${pemfile}
-done