kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 1.03nb32. pkgsrc changes:

Browse source 
- Apply the qbiff-utmpx patch to (probably) fix build on FreeBSD
- Enable "qmail-srs" by default
- Add "qmail-customerror", enabled by default
- Move TLS config steps from INSTALL to MESSAGE.tls
This commit is contained in:
schmonz 2017-08-13 23:42:55 +00:00
parent 7b07e947fc
commit 0401ca3d9d
5 changed files with 52 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
mail/qmail/INSTALL
View file

@ -1,12 +1,9 @@
# $NetBSD: INSTALL,v 1.9 2017/07/21 04:07:01 schmonz Exp $
# $NetBSD: INSTALL,v 1.10 2017/08/13 23:42:55 schmonz Exp $
DOCDIR=@DOCDIR@
EGDIR=@EGDIR@
OPENSSL=@OPENSSL@
PKGMANDIR=@PKGMANDIR@
QMAILDIR=@QMAILDIR@
QMAIL_DAEMON_USER=@QMAIL_DAEMON_USER@
QMAIL_QMAIL_GROUP=@QMAIL_QMAIL_GROUP@
QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@
QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
@ -95,27 +92,6 @@ NOTE: Before using qmail, create a .qmail file corresponding with the local
user or alias "${QMAIL_QUEUE_EXTRA}" that meets the requirements for
QUEUE_EXTRA.
===========================================================================
EOF
fi
SERVERCERT=${PKG_SYSCONFDIR}/control/servercert.pem
if ! [ -z ${OPENSSL} ] && ! [ -s ${SERVERCERT} ]; then
${CAT} <<EOF
===========================================================================
NOTE: If you don't already have an SSL certificate for qmail:
# ${OPENSSL} req -new -x509 -nodes -days 366 -out ${SERVERCERT} -keyout ${SERVERCERT}
# chmod 640 ${SERVERCERT}
# chown ${QMAIL_DAEMON_USER}:${QMAIL_QMAIL_GROUP} ${SERVERCERT}
# ln -s ${SERVERCERT} ${PKG_SYSCONFDIR}/control/clientcert.pem
# update_tmprsadh
Once you have a certificate, regularly regenerate DH params from cron(8):
01 01 * * * ${PREFIX}/bin/update_tmprsadh > /dev/null 2>&1
===========================================================================
EOF
fi

16
mail/qmail/MESSAGE.tls Normal file
View file

@ -0,0 +1,16 @@
===========================================================================
$NetBSD: MESSAGE.tls,v 1.1 2017/08/13 23:42:55 schmonz Exp $
If you don't already have an SSL certificate for qmail:
# ${OPENSSL} req -new -x509 -nodes -days 366 -out ${SERVERCERT} -keyout ${SERVERCERT}
# chmod 640 ${SERVERCERT}
# chown ${QMAIL_DAEMON_USER}:${QMAIL_QMAIL_GROUP} ${SERVERCERT}
# ln -s ${SERVERCERT} ${CLIENTCERT}
# update_tmprsadh
Once you have a certificate, regularly regenerate DH params from cron(8):
01 01 * * * update_tmprsadh > /dev/null 2>&1
===========================================================================

5
mail/qmail/Makefile
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.91 2017/08/03 03:20:57 schmonz Exp $
# $NetBSD: Makefile,v 1.92 2017/08/13 23:42:55 schmonz Exp $
#
DISTNAME= netqmail-1.06
PKGNAME= qmail-1.03
PKGREVISION= 31
PKGREVISION= 32
CATEGORIES= mail
MASTER_SITES= http://qmail.org/
@ -51,7 +51,6 @@ SHAREDIR= ${PREFIX}/share/qmail
MESSAGE_SRC+= ${PKGDIR}/MESSAGE
MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q}
FILES_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q}
FILES_SUBST+= OPENSSL=${OPENSSL:Q}
FILES_SUBST+= PKGMANDIR=${PKGMANDIR:Q} SHAREDIR=${SHAREDIR:Q}
FILES_SUBST+= QMAILDIR=${QMAILDIR:Q}
FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}

10
mail/qmail/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.35 2017/07/21 04:07:01 schmonz Exp $
$NetBSD: distinfo,v 1.36 2017/08/13 23:42:55 schmonz Exp $
SHA1 (netqmail-1.05-tls-smtpauth-20070417.patch) = d24cb13cf1371044fc2dfe20471478f59b5524e5
RMD160 (netqmail-1.05-tls-smtpauth-20070417.patch) = 81a00e06fa67a4073b1a5bf5195fbbac675cd46b
@ -8,6 +8,10 @@ SHA1 (netqmail-1.06-destdir-20170716.patch) = 92b3fe539d7863792e951723e26f6cfb60
RMD160 (netqmail-1.06-destdir-20170716.patch) = bad1976ba87e0af934a50d02bd38eebb3b22cf03
SHA512 (netqmail-1.06-destdir-20170716.patch) = 00dc4d90f52332784900d5c8b1142d5517d639115e1da4e1cf4880635d10107816981892f22847f682a71b7a15c348789bce20701d9bec20a2315c0fd1f2bf73
Size (netqmail-1.06-destdir-20170716.patch) = 12871 bytes
SHA1 (netqmail-1.06-qbiffutmpx-20170813.patch) = c28a14fbb94632e8ec4d398d8cdad5a41d8e8f77
RMD160 (netqmail-1.06-qbiffutmpx-20170813.patch) = 0be498b9b0a9e7b5f790759d83a35b71b1d3e089
SHA512 (netqmail-1.06-qbiffutmpx-20170813.patch) = 7f8ee6d6e76a427210b3139c66f678de504dfa7f1a1e66303bdc0b851196ba788de5f4de1954b0730af94738d7b52089125853f8673c636d38123f28ee1659ac
Size (netqmail-1.06-qbiffutmpx-20170813.patch) = 3128 bytes
SHA1 (netqmail-1.06-qmailremote-20170716.patch) = cf7fa5aaf74a5b7d48b2cf0e5f46f7c124de83c7
RMD160 (netqmail-1.06-qmailremote-20170716.patch) = c26d7f8510cab92bcf5d5fbb861ec62ff593196a
SHA512 (netqmail-1.06-qmailremote-20170716.patch) = de77c1b01ab88199b3f096e64a733dd86867001dfbcea1cf0d6b20e99d448638e0294440ef48fabc309355440834a8747b4c476cf47b89e6ddb3b7250008dd8e
@ -36,6 +40,10 @@ SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f
RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c
SHA512 (qmail-103.patch) = b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
Size (qmail-103.patch) = 2104 bytes
SHA1 (qmail-queue-custom-error-v2.netqmail-1.05.patch) = 639d052ca9e46b9a63daadde819467b5b4259dba
RMD160 (qmail-queue-custom-error-v2.netqmail-1.05.patch) = e40fe48e048a41d92c052a12aafa1fccf8becba2
SHA512 (qmail-queue-custom-error-v2.netqmail-1.05.patch) = c3710a87cee5458fee7708166afd0d591b58b071eeea8d551c38c2d59c739865478cb1a0fbb8b592933f9bb85b865da6cdb8973fa0d93259605d01347600176c
Size (qmail-queue-custom-error-v2.netqmail-1.05.patch) = 3873 bytes
SHA1 (qmail-smtputf8.patch) = 909cb9d5f77e9b85973ad5d9daf821287950bf56
RMD160 (qmail-smtputf8.patch) = bbed2ca7167937f6a38caf375a7e1e9bc490bd96
SHA512 (qmail-smtputf8.patch) = 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4

27
mail/qmail/options.mk
View file

@ -1,8 +1,10 @@
# $NetBSD: options.mk,v 1.44 2017/08/01 02:53:59 schmonz Exp $
# $NetBSD: options.mk,v 1.45 2017/08/13 23:42:55 schmonz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
PKG_SUPPORTED_OPTIONS+= eai qmail-rejectutils qmail-srs sasl syncdir tls
PKG_SUGGESTED_OPTIONS+= eai qmail-rejectutils sasl syncdir tls
PKG_SUPPORTED_OPTIONS+= eai sasl syncdir tls
PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-rejectutils qmail-srs
PKG_SUGGESTED_OPTIONS+= eai sasl syncdir tls
PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-rejectutils qmail-srs
# For users migrating from 2017Q2; remove compatibility after 2017Q3 is branched
QMAIL_PATCHES_ALWAYS_ON= netqmail bigdns maildiruniq outgoingip rcptcheck remote
@ -42,6 +44,11 @@ OUTGOINGIP_PATCH= outgoingip.patch
PATCHFILES+= ${OUTGOINGIP_PATCH}
SITES.${OUTGOINGIP_PATCH}= http://www.qmail.org/
QMAILPATCHES+= qbiffutmpx:${QBIFFUTMPX_PATCH}
QBIFFUTMPX_PATCH= netqmail-1.06-qbiffutmpx-20170813.patch
PATCHFILES+= ${QBIFFUTMPX_PATCH}
SITES.${QBIFFUTMPX_PATCH}= https://schmonz.com/qmail/qbiffutmpx/
QMAILPATCHES+= rcptcheck:${RCPTCHECK_PATCH}
RCPTCHECK_PATCH= netqmail-1.06-tls-smtpauth-20070417-rcptcheck-20170716.patch
PATCHFILES+= ${RCPTCHECK_PATCH}
@ -81,6 +88,14 @@ PATCH_DIST_CAT.${EAI_PATCH}= ${SED} \
PATCH_DIST_STRIP.${EAI_PATCH}= -p1
.endif
.if !empty(PKG_OPTIONS:Mqmail-customerror)
QMAILPATCHES+= customerror:${CUSTOMERROR_PATCH}
CUSTOMERROR_PATCH= qmail-queue-custom-error-v2.netqmail-1.05.patch
PATCHFILES+= ${CUSTOMERROR_PATCH}
SITES.${CUSTOMERROR_PATCH}= https://notes.sagredo.eu/files/qmail/patches/
PATCH_DIST_STRIP.${CUSTOMERROR_PATCH}=-p1
.endif
PLIST_VARS+= rejectutils
.if !empty(PKG_OPTIONS:Mqmail-rejectutils)
QMAILPATCHES+= rejectutils:${REJECTUTILS_PATCH}
@ -158,6 +173,12 @@ SUBST_FILES.tmprsadh= update_tmprsadh.sh
SUBST_SED.tmprsadh= -e 's|^export PATH=.*||'
SUBST_SED.tmprsadh+= -e 's|^openssl |${OPENSSL} |'
PLIST.tls= yes
MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls
MESSAGE_SUBST+= OPENSSL=${OPENSSL:Q}
MESSAGE_SUBST+= SERVERCERT=${PKG_SYSCONFDIR:Q}/control/servercert.pem
MESSAGE_SUBST+= CLIENTCERT=${PKG_SYSCONFDIR:Q}/control/clientcert.pem
MESSAGE_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
MESSAGE_SUBST+= QMAIL_QMAIL_GROUP=${QMAIL_QMAIL_GROUP:Q}
. endif
.else
BUILDLINK_TRANSFORM+= rm:-lssl