diff options
| author | schmonz <schmonz@pkgsrc.org> | 2019-04-10 22:24:57 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2019-04-10 22:24:57 +0000 |
| commit | 4f21b71a83670c6602e768c5336db8dbc3968189 (patch) | |
| tree | 48779f9f7466a4af69e35f4badffc76896333ce0 /mail | |
| parent | 9dfef22560728df081715b37f9c6095ac800e7ad (diff) | |
| download | pkgsrc-4f21b71a83670c6602e768c5336db8dbc3968189.tar.gz | |
Update to tlsonlyremote 20190408, cut from upstream TLS patch with the
same date. Fixes build with OpenSSL 1.1 and includes pkgsrc's #ifdef
guards for non-TLS builds. Bump PKGREVISION.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/qmail/Makefile | 13 | ||||
| -rw-r--r-- | mail/qmail/distinfo | 10 | ||||
| -rw-r--r-- | mail/qmail/options.mk | 6 |
3 files changed, 10 insertions, 19 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index c91c2867c35..8ac018c3ebb 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.109 2019/01/17 22:49:12 schmonz Exp $ +# $NetBSD: Makefile,v 1.110 2019/04/10 22:24:57 schmonz Exp $ # DISTNAME= netqmail-1.06 PKGNAME= qmail-1.03 -PKGREVISION= 44 +PKGREVISION= 45 CATEGORIES= mail MASTER_SITES= http://qmail.org/ @@ -147,7 +147,7 @@ READMES= README.pkgsrc QMAILPATCHES= netqmail:${DEFAULT_DISTFILES} QMAILPATCHES+= tls:${TLSREMOTE_PATCH} -TLSREMOTE_PATCH= netqmail-1.06-tls-20160918-onlyremote-20181107.patch +TLSREMOTE_PATCH= netqmail-1.06-tls-20190408-onlyremote-20190408.patch PATCHFILES+= ${TLSREMOTE_PATCH} SITES.${TLSREMOTE_PATCH}= https://schmonz.com/qmail/tlsonlyremote/ @@ -209,13 +209,6 @@ post-extract: ${MV} ${WRKSRC}/$$i ${WRKSRC}/doc/$$i; \ done -post-patch: - cd ${WRKSRC}; \ - for i in ssl_timeoutio.c tls.c; do \ - ( ${ECHO} '#ifdef TLS'; ${CAT} $$i; ${ECHO} '#endif' ) > $$i.new; \ - mv $$i.new $$i; \ - done - post-build: cd ${WRKSRC}; \ ${SED} -e 's|${QMAILDIR}/control/|${PKG_SYSCONFDIR}/.pkgsrc-defaults-do-not-edit/|' < config-fast > config-fast-pkgsrc diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo index aa535a68543..4004dea1a78 100644 --- a/mail/qmail/distinfo +++ b/mail/qmail/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.43 2019/01/09 19:32:07 schmonz Exp $ +$NetBSD: distinfo,v 1.44 2019/04/10 22:24:57 schmonz Exp $ SHA1 (netqmail-1.05-TAI-leapsecs.patch) = 2c21cd7e20b241c1a82b79379f2c7ee3da5519f7 RMD160 (netqmail-1.05-TAI-leapsecs.patch) = 9fd59001be5a07d914c66127236ebe8c33f64675 @@ -20,10 +20,10 @@ SHA1 (netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181 RMD160 (netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch) = 1ad6791996f8741917e2b2980c7e5f6a9449e00f SHA512 (netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch) = a02cad7ef0f57a9eee8a12444a30df4d112ba256fa581124d7f0fb78acee4da53d0211d98de5822f058518d6a872e01e737f28e437b8ed5f8fa392ae8808468b Size (netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch) = 6962 bytes -SHA1 (netqmail-1.06-tls-20160918-onlyremote-20181107.patch) = 054c4c66648ecc4f0c079e4f805668fae601b84d -RMD160 (netqmail-1.06-tls-20160918-onlyremote-20181107.patch) = 686d1694a29a3c4ebd40b0f9509470c76f0a6ecd -SHA512 (netqmail-1.06-tls-20160918-onlyremote-20181107.patch) = 7db6024f0554d1c5be6357aea23d920bee064180c9dde67ce0a01777523b88c10468300d31aa8108ebcb0bfa232a8930c3d50395b6bd77488c47418192dbc35f -Size (netqmail-1.06-tls-20160918-onlyremote-20181107.patch) = 26155 bytes +SHA1 (netqmail-1.06-tls-20190408-onlyremote-20190408.patch) = e8f57536ef0d65f03b6494fc0ced023cfadb5661 +RMD160 (netqmail-1.06-tls-20190408-onlyremote-20190408.patch) = c6b013a6474f278ee111075112b0361c5f4b1305 +SHA512 (netqmail-1.06-tls-20190408-onlyremote-20190408.patch) = dcf0df01637c42780eb0a454b1cf25eeb516c693e8d11aef498c59cee44e69317d6c84013196352a8435a094343331b3231b2d8437c8309b5599a625459e4990 +Size (netqmail-1.06-tls-20190408-onlyremote-20190408.patch) = 27028 bytes SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2 SHA512 (netqmail-1.06.tar.gz) = de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk index 4ee1965ee4d..c872520cafc 100644 --- a/mail/qmail/options.mk +++ b/mail/qmail/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.62 2019/01/17 22:49:12 schmonz Exp $ +# $NetBSD: options.mk,v 1.63 2019/04/10 22:24:57 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail PKG_SUPPORTED_OPTIONS+= eai inet6 pam syncdir tai-system-clock tls @@ -105,10 +105,8 @@ MAKEVARS+= PKG_SYSCONFDIR.libtai PLIST_VARS+= tls .if !empty(PKG_OPTIONS:Mtls) PLIST.tls= yes -BUILDLINK_API_DEPENDS.openssl+= openssl<1.1 -BUILDLINK_ABI_DEPENDS.openssl+= openssl<1.1 . include "../../security/openssl/buildlink3.mk" -CFLAGS+= -DTLS=20160918 # NOTE: match what's _in_ the patch +CFLAGS+= -DTLS=20190408 # NOTE: match what's _in_ the patch USE_TOOLS+= openssl SUBST_CLASSES+= tmprsadh SUBST_STAGE.tmprsadh= do-configure |