Fri Sep 14 16:44:09 2018 UTC ()
Actually generate the promised key sizes. Ride previous bump.


(schmonz)
diff -r1.52 -r1.53 pkgsrc/mail/qmail/options.mk
cvs diff -r1.52 -r1.53 pkgsrc/mail/qmail/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/qmail/options.mk 2018/09/14 09:01:53 1.52
+++ pkgsrc/mail/qmail/options.mk 2018/09/14 16:44:09 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.52 2018/09/14 09:01:53 schmonz Exp $ 1# $NetBSD: options.mk,v 1.53 2018/09/14 16:44:09 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail 3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
4PKG_SUPPORTED_OPTIONS+= eai inet6 pam sasl syncdir tls 4PKG_SUPPORTED_OPTIONS+= eai inet6 pam sasl syncdir tls
5PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-srs 5PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-srs
6PKG_SUGGESTED_OPTIONS+= eai sasl syncdir tls 6PKG_SUGGESTED_OPTIONS+= eai sasl syncdir tls
7PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-srs 7PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-srs
8 8
9# Formerly optional patches, now unconditionally applied: 9# Formerly optional patches, now unconditionally applied:
10QMAILPATCHES= netqmail:${DEFAULT_DISTFILES} 10QMAILPATCHES= netqmail:${DEFAULT_DISTFILES}
11 11
12QMAILPATCHES+= tls-smtpauth:${TLSSASL_PATCH} 12QMAILPATCHES+= tls-smtpauth:${TLSSASL_PATCH}
13TLSSASL_PATCH= netqmail-1.05-tls-smtpauth-20070417.patch 13TLSSASL_PATCH= netqmail-1.05-tls-smtpauth-20070417.patch
14PATCHFILES+= ${TLSSASL_PATCH} 14PATCHFILES+= ${TLSSASL_PATCH}
@@ -129,27 +129,29 @@ PLIST_VARS+= tls @@ -129,27 +129,29 @@ PLIST_VARS+= tls
129. if empty(PKG_OPTIONS:Msasl) 129. if empty(PKG_OPTIONS:Msasl)
130PKG_OPTIONS+= sasl 130PKG_OPTIONS+= sasl
131. endif 131. endif
132. include "../../security/openssl/buildlink3.mk" 132. include "../../security/openssl/buildlink3.mk"
133. if !empty(PKG_OPTIONS:Mtls) 133. if !empty(PKG_OPTIONS:Mtls)
134CFLAGS+= -DTLS=20070408nb1 # NOTE: match what's _in_ the patch 134CFLAGS+= -DTLS=20070408nb1 # NOTE: match what's _in_ the patch
135USE_TOOLS+= openssl 135USE_TOOLS+= openssl
136SUBST_CLASSES+= tmprsadh 136SUBST_CLASSES+= tmprsadh
137SUBST_STAGE.tmprsadh= do-configure 137SUBST_STAGE.tmprsadh= do-configure
138SUBST_FILES.tmprsadh= update_tmprsadh.sh 138SUBST_FILES.tmprsadh= update_tmprsadh.sh
139SUBST_SED.tmprsadh= -e 's|^export PATH=.*||' 139SUBST_SED.tmprsadh= -e 's|^export PATH=.*||'
140SUBST_SED.tmprsadh+= -e 's|^openssl |${OPENSSL} |' 140SUBST_SED.tmprsadh+= -e 's|^openssl |${OPENSSL} |'
141SUBST_SED.tmprsadh+= -e 's|rsa512|rsa2048|g' 141SUBST_SED.tmprsadh+= -e 's|rsa512|rsa2048|g'
 142SUBST_SED.tmprsadh+= -e 's|rsa2048\.new 512|rsa2048.new 2048|g'
142SUBST_SED.tmprsadh+= -e 's|dh1024|dh2048|g' 143SUBST_SED.tmprsadh+= -e 's|dh1024|dh2048|g'
 144SUBST_SED.tmprsadh+= -e 's|dh2048\.new 1024|dh2048.new 2048|g'
143SUBST_CLASSES+= keys 145SUBST_CLASSES+= keys
144SUBST_STAGE.keys= do-configure 146SUBST_STAGE.keys= do-configure
145SUBST_FILES.keys= qmail-smtpd.c 147SUBST_FILES.keys= qmail-smtpd.c
146SUBST_SED.keys= -e 's|\(keylen.* \)512|\12048|g' 148SUBST_SED.keys= -e 's|\(keylen.* \)512|\12048|g'
147SUBST_SED.keys+= -e 's|512\.pem|2048.pem|g' 149SUBST_SED.keys+= -e 's|512\.pem|2048.pem|g'
148SUBST_SED.keys+= -e 's|keylen = 1024|keylen = 2048|g' 150SUBST_SED.keys+= -e 's|keylen = 1024|keylen = 2048|g'
149SUBST_SED.keys+= -e 's|\(keylen == 1024\)|0 \&\& \1|g' 151SUBST_SED.keys+= -e 's|\(keylen == 1024\)|0 \&\& \1|g'
150SUBST_CLASSES+= mankeys 152SUBST_CLASSES+= mankeys
151SUBST_STAGE.mankeys= do-configure 153SUBST_STAGE.mankeys= do-configure
152SUBST_FILES.mankeys= qmail-smtpd.8 qmail-control.9 154SUBST_FILES.mankeys= qmail-smtpd.8 qmail-control.9
153SUBST_SED.mankeys= -e 's|dh1024\.pem|dh2048.pem|g' 155SUBST_SED.mankeys= -e 's|dh1024\.pem|dh2048.pem|g'
154SUBST_SED.mankeys+= -e 's|1024 bit|2048 bit|g' 156SUBST_SED.mankeys+= -e 's|1024 bit|2048 bit|g'
155SUBST_SED.mankeys+= -e 's|rsa512\.pem|rsa2048.pem|g' 157SUBST_SED.mankeys+= -e 's|rsa512\.pem|rsa2048.pem|g'