CVS commit: pkgsrc/mail/qmail

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Sep 14 09:01:53 UTC 2018

Modified Files:
        pkgsrc/mail/qmail: Makefile options.mk

Log Message:
The latest upstream TLS patch (netqmail-1.06-tls-20160918.patch, not yet
in pkgsrc) has bumped key sizes to 2048 bits. Do likewise. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/mail/qmail/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.97 pkgsrc/mail/qmail/Makefile:1.98
--- pkgsrc/mail/qmail/Makefile:1.97     Wed Aug  1 07:10:27 2018
+++ pkgsrc/mail/qmail/Makefile  Fri Sep 14 09:01:53 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.97 2018/08/01 07:10:27 schmonz Exp $
+# $NetBSD: Makefile,v 1.98 2018/09/14 09:01:53 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.06
 PKGNAME=               qmail-1.03
-PKGREVISION=           36
+PKGREVISION=           37
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/
 

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.51 pkgsrc/mail/qmail/options.mk:1.52
--- pkgsrc/mail/qmail/options.mk:1.51   Wed Aug  1 07:10:27 2018
+++ pkgsrc/mail/qmail/options.mk        Fri Sep 14 09:01:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.51 2018/08/01 07:10:27 schmonz Exp $
+# $NetBSD: options.mk,v 1.52 2018/09/14 09:01:53 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=                eai inet6 pam sasl syncdir tls
@@ -131,13 +131,29 @@ PKG_OPTIONS+=                     sasl
 .  endif
 .  include "../../security/openssl/buildlink3.mk"
 .  if !empty(PKG_OPTIONS:Mtls)
-CFLAGS+=                       -DTLS=20070408  # NOTE: match what's _in_ the patch
+CFLAGS+=                       -DTLS=20070408nb1       # NOTE: match what's _in_ the patch
 USE_TOOLS+=                    openssl
 SUBST_CLASSES+=                        tmprsadh
 SUBST_STAGE.tmprsadh=          do-configure
 SUBST_FILES.tmprsadh=          update_tmprsadh.sh
 SUBST_SED.tmprsadh=            -e 's|^export PATH=.*||'
 SUBST_SED.tmprsadh+=           -e 's|^openssl |${OPENSSL} |'
+SUBST_SED.tmprsadh+=           -e 's|rsa512|rsa2048|g'
+SUBST_SED.tmprsadh+=           -e 's|dh1024|dh2048|g'
+SUBST_CLASSES+=                        keys
+SUBST_STAGE.keys=              do-configure
+SUBST_FILES.keys=              qmail-smtpd.c
+SUBST_SED.keys=                        -e 's|\(keylen.* \)512|\12048|g'
+SUBST_SED.keys+=               -e 's|512\.pem|2048.pem|g'
+SUBST_SED.keys+=               -e 's|keylen = 1024|keylen = 2048|g'
+SUBST_SED.keys+=               -e 's|\(keylen == 1024\)|0 \&\& \1|g'
+SUBST_CLASSES+=                        mankeys
+SUBST_STAGE.mankeys=           do-configure
+SUBST_FILES.mankeys=           qmail-smtpd.8 qmail-control.9
+SUBST_SED.mankeys=             -e 's|dh1024\.pem|dh2048.pem|g'
+SUBST_SED.mankeys+=            -e 's|1024 bit|2048 bit|g'
+SUBST_SED.mankeys+=            -e 's|rsa512\.pem|rsa2048.pem|g'
+SUBST_SED.mankeys+=            -e 's|512 bit RSA|2048 bit RSA|g'
 PLIST.tls=                     yes
 MESSAGE_SRC+=                  ${PKGDIR}/MESSAGE.tls
 MESSAGE_SUBST+=                        OPENSSL=${OPENSSL:Q}