Received: by mail.netbsd.org (Postfix, from userid 605) id AF7D284D64; Sat, 28 Oct 2017 04:51:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3895884D31 for ; Sat, 28 Oct 2017 04:51:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id C89JT0zq_Vui for ; Sat, 28 Oct 2017 04:51:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id DF5AE84D22 for ; Sat, 28 Oct 2017 04:51:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D8BDDFBDE; Sat, 28 Oct 2017 04:51:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1509166266350" MIME-Version: 1.0 Date: Sat, 28 Oct 2017 04:51:06 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/nullmailer To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20171028045106.D8BDDFBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1509166266350 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sat Oct 28 04:51:06 UTC 2017 Modified Files: pkgsrc/mail/nullmailer: Makefile PLIST distinfo options.mk pkgsrc/mail/nullmailer/files: nullmailer.sh pkgsrc/mail/nullmailer/patches: patch-lib_selfpipe.cc Added Files: pkgsrc/mail/nullmailer/patches: patch-Makefile.in patch-doc_nullmailer-queue.8 patch-doc_nullmailer-send.8 patch-src_sendmail.cc patch-test_Makefile.am patch-test_Makefile.in patch-test_functions.in Removed Files: pkgsrc/mail/nullmailer/files: nullmailer-daemon pkgsrc/mail/nullmailer/patches: patch-aa patch-ab patch-ac patch-src_inject.cc Log Message: Update to 2.1. From the changelog: - Added support for TLS anonymous authentication. Thanks Uffe Jakobsen. - Fixed sendmail wrapper handling of empty sender on command line. Thanks Sebastian Wiedenroth. - Fixed handling of quoted strings in the "remotes" file. Thanks Mihai Moldovan. - Fixed nullmailer-inject handling of leading "From " lines. - Some build fixes. - Fixed bogus temporary gethostbyname error message when the protocol source address was incorrect. - Fixed potential race condition in tests. Thanks Felix Lechner. - Fixed handling of time values on 32-bit big-endian systems. Thanks Felix Lechner. - Added support to nullmailer-send to move permanently failing messages out of the queue, and to generate bounce messages. - Added support for IPv6. - Added program to generate bounce/delay messages. - Added an "allmailfrom" control file to nullmailer-queue, causing all messages to share a hard-coded envelope sender. - Added logging the message sender/recipient in nullmailer-send. - Improved handling of system errors when reading config files. - Secured handling of password options for protocol modules. - Support standard shell quoting for options in the "remotes" file. - Added protocol option to set a separate TLS client private key file. - Added protocol option to bind the source address on connections. - Fixed nullmailer-inject to report errors to stderr. - Fixed gnutls cast to pointer from integer of different size warning. - Fixed nullmailer-inject and -queue to handle the null (empty) sender address. Needed for RFC 3798 (Message Disposition Notification). - Moved spool directory to /var/spool/nullmailer like other MTAs. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 pkgsrc/mail/nullmailer/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/nullmailer/PLIST cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/nullmailer/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/nullmailer/options.mk cvs rdiff -u -r1.1 -r0 pkgsrc/mail/nullmailer/files/nullmailer-daemon cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/nullmailer/files/nullmailer.sh cvs rdiff -u -r0 -r1.1 pkgsrc/mail/nullmailer/patches/patch-Makefile.in \ pkgsrc/mail/nullmailer/patches/patch-doc_nullmailer-queue.8 \ pkgsrc/mail/nullmailer/patches/patch-doc_nullmailer-send.8 \ pkgsrc/mail/nullmailer/patches/patch-src_sendmail.cc \ pkgsrc/mail/nullmailer/patches/patch-test_Makefile.am \ pkgsrc/mail/nullmailer/patches/patch-test_Makefile.in \ pkgsrc/mail/nullmailer/patches/patch-test_functions.in cvs rdiff -u -r1.6 -r0 pkgsrc/mail/nullmailer/patches/patch-aa \ pkgsrc/mail/nullmailer/patches/patch-ac cvs rdiff -u -r1.8 -r0 pkgsrc/mail/nullmailer/patches/patch-ab cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/nullmailer/patches/patch-lib_selfpipe.cc cvs rdiff -u -r1.1 -r0 pkgsrc/mail/nullmailer/patches/patch-src_inject.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1509166266350 Content-Disposition: inline Content-Length: 15944 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/nullmailer/Makefile diff -u pkgsrc/mail/nullmailer/Makefile:1.40 pkgsrc/mail/nullmailer/Makefile:1.41 --- pkgsrc/mail/nullmailer/Makefile:1.40 Mon Dec 12 23:54:12 2016 +++ pkgsrc/mail/nullmailer/Makefile Sat Oct 28 04:51:06 2017 @@ -1,30 +1,29 @@ -# $NetBSD: Makefile,v 1.40 2016/12/12 23:54:12 wiedi Exp $ +# $NetBSD: Makefile,v 1.41 2017/10/28 04:51:06 schmonz Exp $ -DISTNAME= nullmailer-1.13 -PKGREVISION= 4 +DISTNAME= nullmailer-2.1 CATEGORIES= mail MASTER_SITES= ${HOMEPAGE:Q} -DIST_SUBDIR= ${PKGNAME_NOREV} MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://untroubled.org/nullmailer/ COMMENT= Simple relay-only mail transport agent - LICENSE= gnu-gpl-v2 -PKG_DESTDIR_SUPPORT= destdir +DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools USE_LANGUAGES= c c++ +USE_TOOLS+= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --localstatedir=${VARBASE}/spool +CONFIGURE_ARGS+= --localstatedir=${VARBASE} CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec/nullmailer CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/nullmailer +TEST_TARGET= check +USE_TOOLS+= bash + .include "../../mk/bsd.prefs.mk" -NULLMAILER_GROUP?= nullmail -NULLMAILER_USER?= nullmail PKG_GROUPS= ${NULLMAILER_GROUP} PKG_USERS= ${NULLMAILER_USER}:${NULLMAILER_GROUP} PKG_GROUPS_VARS= NULLMAILER_GROUP @@ -34,6 +33,7 @@ MAKE_ENV+= NULLMAILER_GROUP=${NULLMAILE MAKE_ENV+= NULLMAILER_USER=${NULLMAILER_USER} FILES_SUBST+= VARBASE=${VARBASE} \ + PKGNAME=${PKGNAME} \ NULLMAILER_GROUP=${NULLMAILER_GROUP} \ NULLMAILER_USER=${NULLMAILER_USER} @@ -50,11 +50,10 @@ SPECIAL_PERMS+= libexec/nullmailer/null ${NULLMAILER_USER} ${NULLMAILER_GROUP} 4555 SUBST_CLASSES+= paths -SUBST_FILES.paths= ${WRKDIR}/mailer.conf ${WRKDIR}/nullmailer-daemon +SUBST_FILES.paths= ${WRKDIR}/mailer.conf SUBST_FILES.paths+= doc/nullmailer-send.8 doc/nullmailer-queue.8 -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@VARBASE@,${VARBASE},g' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' +SUBST_FILES.paths+= test/functions.in +SUBST_VARS.paths= PREFIX VARBASE PKG_SYSCONFDIR SUBST_STAGE.paths= post-configure INSTALLATION_DIRS= share/doc/${PKGBASE} share/examples/${PKGBASE} @@ -64,14 +63,11 @@ BUILD_DEFS+= VARBASE post-extract: ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf - ${CP} ${FILESDIR}/nullmailer-daemon ${WRKDIR}/nullmailer-daemon post-install: cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS COPYING ChangeLog \ HOWTO NEWS README TODO ${DESTDIR}${PREFIX}/share/doc/nullmailer ${INSTALL_DATA} ${WRKDIR}/mailer.conf \ ${DESTDIR}${PREFIX}/share/examples/nullmailer/ - ${INSTALL_SCRIPT} ${WRKDIR}/nullmailer-daemon \ - ${DESTDIR}${PREFIX}/libexec/nullmailer/ .include "../../mk/bsd.pkg.mk" Index: pkgsrc/mail/nullmailer/PLIST diff -u pkgsrc/mail/nullmailer/PLIST:1.12 pkgsrc/mail/nullmailer/PLIST:1.13 --- pkgsrc/mail/nullmailer/PLIST:1.12 Tue Mar 11 14:05:04 2014 +++ pkgsrc/mail/nullmailer/PLIST Sat Oct 28 04:51:06 2017 @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.12 2014/03/11 14:05:04 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.13 2017/10/28 04:51:06 schmonz Exp $ libexec/nullmailer/mailq -libexec/nullmailer/nullmailer-daemon +libexec/nullmailer/nullmailer-dsn libexec/nullmailer/nullmailer-inject libexec/nullmailer/nullmailer-queue libexec/nullmailer/nullmailer-send @@ -8,6 +8,7 @@ libexec/nullmailer/nullmailer-smtpd libexec/nullmailer/qmqp libexec/nullmailer/sendmail libexec/nullmailer/smtp +man/man1/nullmailer-dsn.1 man/man1/nullmailer-inject.1 man/man1/sendmail.1 man/man7/nullmailer.7 Index: pkgsrc/mail/nullmailer/distinfo diff -u pkgsrc/mail/nullmailer/distinfo:1.18 pkgsrc/mail/nullmailer/distinfo:1.19 --- pkgsrc/mail/nullmailer/distinfo:1.18 Fri Feb 17 17:08:32 2017 +++ pkgsrc/mail/nullmailer/distinfo Sat Oct 28 04:51:06 2017 @@ -1,12 +1,15 @@ -$NetBSD: distinfo,v 1.18 2017/02/17 17:08:32 joerg Exp $ +$NetBSD: distinfo,v 1.19 2017/10/28 04:51:06 schmonz Exp $ -SHA1 (nullmailer-1.13/nullmailer-1.13.tar.gz) = e1178fff0395abee2bb6e77c3ddb8a0a7efcc791 -RMD160 (nullmailer-1.13/nullmailer-1.13.tar.gz) = d9f4663351122826299b04a46ffbb2bf51f41687 -SHA512 (nullmailer-1.13/nullmailer-1.13.tar.gz) = 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7 -Size (nullmailer-1.13/nullmailer-1.13.tar.gz) = 205431 bytes -SHA1 (patch-aa) = 6e8fb0269fcca08fd450b08b865f67ab3bfa1675 -SHA1 (patch-ab) = cb6ed64a5cdf413837710a6f27ea22d1e37fd1b9 -SHA1 (patch-ac) = c542bbf35dfc2148dd133837799b7f4634b66489 +SHA1 (nullmailer-2.1.tar.gz) = 79322908cb242a80f72f8e2888ac870f2f311bcf +RMD160 (nullmailer-2.1.tar.gz) = 834f7d5c8ee387c5d7b15663f0aa00c7f04f795f +SHA512 (nullmailer-2.1.tar.gz) = 5219e251f6648258247913fcb7036075a482b0800a98cde0d731aa4a6b514baae4d8a340b6757b8d532c4b8343b718642c0f519292e3660f8c04671ac274944b +Size (nullmailer-2.1.tar.gz) = 255269 bytes +SHA1 (patch-Makefile.in) = 56ce789f85f4feccce623c540dfb41d84e655c1a +SHA1 (patch-doc_nullmailer-queue.8) = 6d2651b4ebc2500504ce4f5620842ffc6bf0c2f6 +SHA1 (patch-doc_nullmailer-send.8) = 1ab434a1a3293c11db87781217a1694798ba6f23 SHA1 (patch-lib_fdbuf_fdobuf.h) = 716854a1421ef2021f5383f3e63bd19ece900a23 -SHA1 (patch-lib_selfpipe.cc) = e20596f785a8b6f6621f47408f4a594fc2758ee2 -SHA1 (patch-src_inject.cc) = eaffa250d87bb9501e6ccac81c73c1efafb1ad54 +SHA1 (patch-lib_selfpipe.cc) = a5d7e24bfbf3fa823cbd4e696a1c6488586e3512 +SHA1 (patch-src_sendmail.cc) = 442e2324e082cd6d36057ec1d13ebe5a74a66b77 +SHA1 (patch-test_Makefile.am) = 744771972ca47f154fbc4d8a59dc0fc9b3c616f8 +SHA1 (patch-test_Makefile.in) = 5250f65a0758a9442aa6aec076b67af18ea2444c +SHA1 (patch-test_functions.in) = 5c8d10eb57fd1fda2bd904b85a0895104525a7a4 Index: pkgsrc/mail/nullmailer/options.mk diff -u pkgsrc/mail/nullmailer/options.mk:1.1 pkgsrc/mail/nullmailer/options.mk:1.2 --- pkgsrc/mail/nullmailer/options.mk:1.1 Wed Mar 11 15:18:51 2015 +++ pkgsrc/mail/nullmailer/options.mk Sat Oct 28 04:51:06 2017 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2015/03/11 15:18:51 wiedi Exp $ +# $NetBSD: options.mk,v 1.2 2017/10/28 04:51:06 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nullmailer PKG_SUPPORTED_OPTIONS= gnutls @@ -9,5 +9,6 @@ PKG_SUGGESTED_OPTIONS= gnutls .if !empty(PKG_OPTIONS:Mgnutls) . include "../../security/gnutls/buildlink3.mk" CONFIGURE_ARGS+= --enable-tls +.else +CONFIGURE_ARGS+= --disable-tls .endif # option gnutls - Index: pkgsrc/mail/nullmailer/files/nullmailer.sh diff -u pkgsrc/mail/nullmailer/files/nullmailer.sh:1.4 pkgsrc/mail/nullmailer/files/nullmailer.sh:1.5 --- pkgsrc/mail/nullmailer/files/nullmailer.sh:1.4 Wed Oct 14 21:13:41 2009 +++ pkgsrc/mail/nullmailer/files/nullmailer.sh Sat Oct 28 04:51:06 2017 @@ -1,28 +1,44 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: nullmailer.sh,v 1.4 2009/10/14 21:13:41 plunky Exp $ +# $NetBSD: nullmailer.sh,v 1.5 2017/10/28 04:51:06 schmonz Exp $ # +# @PKGNAME@ script to control nullmailer (simple relay-only MTA). +# + # PROVIDE: mail -# REQUIRE: LOGIN + +name="nullmailer" + +# User-settable rc.conf variables and their default values: +: ${nullmailer_postenv:=""} +: ${nullmailer_logcmd:="logger -t nb${name} -p mail.info"} if [ -f /etc/rc.subr ]; then . /etc/rc.subr fi -name="nullmailer" rcvar=${name} required_files="@PKG_SYSCONFDIR@/nullmailer/remotes" required_dirs="@VARBASE@/spool/nullmailer/queue @VARBASE@/spool/nullmailer/tmp" -command="@PREFIX@/libexec/nullmailer/nullmailer-daemon" -procname="@PREFIX@/libexec/nullmailer/nullmailer-send" +command="@PREFIX@/libexec/nullmailer/nullmailer-send" +start_precmd="nullmailer_prestart" -nullmailer_user="@NULLMAILER_USER@" -nullmailer_group="@NULLMAILER_GROUP@" +nullmailer_prestart() +{ + command="@PREFIX@/bin/pgrphack @SETENV@ - ${nullmailer_postenv} +@PREFIX@/bin/setuidgid @NULLMAILER_USER@ @PREFIX@/libexec/nullmailer/nullmailer-send +2>&1 | +@PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @NULLMAILER_USER@ ${nullmailer_logcmd}" + command_args="&" + rc_flags="" +} if [ -f /etc/rc.subr ]; then load_rc_config $name run_rc_command "$1" else @ECHO_N@ " ${name}" - ${command} ${nullmailer_flags} ${command_args} + nullmailer_prestart + eval ${command} ${nullmailer_flags} ${command_args} + nullmailer_poststart fi Index: pkgsrc/mail/nullmailer/patches/patch-lib_selfpipe.cc diff -u pkgsrc/mail/nullmailer/patches/patch-lib_selfpipe.cc:1.1 pkgsrc/mail/nullmailer/patches/patch-lib_selfpipe.cc:1.2 --- pkgsrc/mail/nullmailer/patches/patch-lib_selfpipe.cc:1.1 Fri Feb 17 17:08:32 2017 +++ pkgsrc/mail/nullmailer/patches/patch-lib_selfpipe.cc Sat Oct 28 04:51:06 2017 @@ -1,4 +1,6 @@ -$NetBSD: patch-lib_selfpipe.cc,v 1.1 2017/02/17 17:08:32 joerg Exp $ +$NetBSD: patch-lib_selfpipe.cc,v 1.2 2017/10/28 04:51:06 schmonz Exp $ + +Add missing include. --- lib/selfpipe.cc.orig 2017-02-17 10:54:28.240596810 +0000 +++ lib/selfpipe.cc Added files: Index: pkgsrc/mail/nullmailer/patches/patch-Makefile.in diff -u /dev/null pkgsrc/mail/nullmailer/patches/patch-Makefile.in:1.1 --- /dev/null Sat Oct 28 04:51:06 2017 +++ pkgsrc/mail/nullmailer/patches/patch-Makefile.in Sat Oct 28 04:51:06 2017 @@ -0,0 +1,20 @@ +$NetBSD: patch-Makefile.in,v 1.1 2017/10/28 04:51:06 schmonz Exp $ + +Override hard-coded user and group. + +--- Makefile.in.orig 2017-10-24 00:12:35.000000000 +0000 ++++ Makefile.in +@@ -790,10 +790,10 @@ install-data-local: + chmod 600 $(DESTDIR)$(localstatedir)/trigger + + install-root: +- chown nullmail $(DESTDIR)$(localstatedir)/* +- chown nullmail $(DESTDIR)$(sbindir)/nullmailer-queue ++ chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(localstatedir)/* ++ chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(sbindir)/nullmailer-queue + chmod u+s $(DESTDIR)$(sbindir)/nullmailer-queue +- chown nullmail $(DESTDIR)$(bindir)/mailq ++ chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(bindir)/mailq + chmod u+s $(DESTDIR)$(bindir)/mailq + + dist-hook: Index: pkgsrc/mail/nullmailer/patches/patch-doc_nullmailer-queue.8 diff -u /dev/null pkgsrc/mail/nullmailer/patches/patch-doc_nullmailer-queue.8:1.1 --- /dev/null Sat Oct 28 04:51:06 2017 +++ pkgsrc/mail/nullmailer/patches/patch-doc_nullmailer-queue.8 Sat Oct 28 04:51:06 2017 @@ -0,0 +1,23 @@ +$NetBSD: patch-doc_nullmailer-queue.8,v 1.1 2017/10/28 04:51:06 schmonz Exp $ + +Override hard-coded paths. + +--- doc/nullmailer-queue.8.orig 2017-10-24 00:12:30.000000000 +0000 ++++ doc/nullmailer-queue.8 +@@ -35,13 +35,13 @@ If this file is not empty, its contents + sender on all messages. + .SH OTHER FILES + .TP +-.B /var/spool/nullmailer/queue ++.B @VARBASE@/spool/nullmailer/queue + The directory into which the completed messages are moved. + .TP +-.B /var/spool/nullmailer/tmp ++.B @VARBASE@/spool/nullmailer/tmp + The directory in which messages are formed temporarily. + .TP +-.B /var/spool/nullmailer/trigger ++.B @VARBASE@/spool/nullmailer/trigger + A pipe used to trigger + .BR nullmailer-send + to immediately start sending the message from the queue. Index: pkgsrc/mail/nullmailer/patches/patch-doc_nullmailer-send.8 diff -u /dev/null pkgsrc/mail/nullmailer/patches/patch-doc_nullmailer-send.8:1.1 --- /dev/null Sat Oct 28 04:51:06 2017 +++ pkgsrc/mail/nullmailer/patches/patch-doc_nullmailer-send.8 Sat Oct 28 04:51:06 2017 @@ -0,0 +1,31 @@ +$NetBSD: patch-doc_nullmailer-send.8,v 1.1 2017/10/28 04:51:06 schmonz Exp $ + +Override hard-coded paths. + +--- doc/nullmailer-send.8.orig 2017-10-24 00:12:30.000000000 +0000 ++++ doc/nullmailer-send.8 +@@ -182,19 +182,19 @@ However, the data are integrity protecte + This option must be used with the insecure option - to acknowledge that you know what you are doing. + .SH FILES + .TP +-.B /var/spool/nullmailer/failed ++.B @VARBASE@/spool/nullmailer/failed + The failed message queue. + .TP +-.B /var/spool/nullmailer/queue ++.B @VARBASE@/spool/nullmailer/queue + The outgoing message queue. + .TP +-.B /var/spool/nullmailer/trigger ++.B @VARBASE@/spool/nullmailer/trigger + A trigger file to cause immediate delivery. + .TP +-.B /usr/local/etc/nullmailer ++.B @PKG_SYSCONFDIR@/nullmailer + The configuration directory. + .TP +-.B /usr/local/libexec/nullmailer ++.B @PREFIX@/libexec/nullmailer + The protocol program directory. + .SH SEE ALSO + nullmailer-dsn(1), Index: pkgsrc/mail/nullmailer/patches/patch-src_sendmail.cc diff -u /dev/null pkgsrc/mail/nullmailer/patches/patch-src_sendmail.cc:1.1 --- /dev/null Sat Oct 28 04:51:06 2017 +++ pkgsrc/mail/nullmailer/patches/patch-src_sendmail.cc Sat Oct 28 04:51:06 2017 @@ -0,0 +1,18 @@ +$NetBSD: patch-src_sendmail.cc,v 1.1 2017/10/28 04:51:06 schmonz Exp $ + +Avoid "variable-sized object may not be initialized". + +--- src/sendmail.cc.orig 2017-10-25 23:36:35.000000000 +0000 ++++ src/sendmail.cc +@@ -111,9 +111,10 @@ int do_exec(const char* program, const c + + int cli_main(int argc, char* argv[]) + { +- const char* extra_args[argc + 5] = {0}; ++ const char* extra_args[argc + 5]; + int extra_argc = 1; + ++ extra_args[0] = 0; + switch (o_mode) { + case mode_smtp: + return do_exec("nullmailer-smtpd", extra_args); Index: pkgsrc/mail/nullmailer/patches/patch-test_Makefile.am diff -u /dev/null pkgsrc/mail/nullmailer/patches/patch-test_Makefile.am:1.1 --- /dev/null Sat Oct 28 04:51:06 2017 +++ pkgsrc/mail/nullmailer/patches/patch-test_Makefile.am Sat Oct 28 04:51:06 2017 @@ -0,0 +1,14 @@ +$NetBSD: patch-test_Makefile.am,v 1.1 2017/10/28 04:51:06 schmonz Exp $ + +Use bash explicitly, and avoid GNUism in find(1). + +--- test/Makefile.am.orig 2017-10-24 00:12:30.000000000 +0000 ++++ test/Makefile.am +@@ -31,5 +31,5 @@ dist-hook: + check: all + ./address-test + ./argparse-test +- sh $(srcdir)/clitest.sh +- $(srcdir)/runtests `find $(abs_srcdir)/tests -type f -not -name '.*'` ++ bash $(srcdir)/clitest.sh ++ $(srcdir)/runtests `find $(abs_srcdir)/tests -type f \! -name '.*'` Index: pkgsrc/mail/nullmailer/patches/patch-test_Makefile.in diff -u /dev/null pkgsrc/mail/nullmailer/patches/patch-test_Makefile.in:1.1 --- /dev/null Sat Oct 28 04:51:06 2017 +++ pkgsrc/mail/nullmailer/patches/patch-test_Makefile.in Sat Oct 28 04:51:06 2017 @@ -0,0 +1,17 @@ +$NetBSD: patch-test_Makefile.in,v 1.1 2017/10/28 04:51:06 schmonz Exp $ + +Use bash explicitly, and avoid GNUism in find(1). + +--- test/Makefile.in.orig 2017-10-24 00:12:35.000000000 +0000 ++++ test/Makefile.in +@@ -612,8 +612,8 @@ dist-hook: + check: all + ./address-test + ./argparse-test +- sh $(srcdir)/clitest.sh +- $(srcdir)/runtests `find $(abs_srcdir)/tests -type f -not -name '.*'` ++ bash $(srcdir)/clitest.sh ++ $(srcdir)/runtests `find $(abs_srcdir)/tests -type f \! -name '.*'` + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Index: pkgsrc/mail/nullmailer/patches/patch-test_functions.in diff -u /dev/null pkgsrc/mail/nullmailer/patches/patch-test_functions.in:1.1 --- /dev/null Sat Oct 28 04:51:06 2017 +++ pkgsrc/mail/nullmailer/patches/patch-test_functions.in Sat Oct 28 04:51:06 2017 @@ -0,0 +1,25 @@ +$NetBSD: patch-test_functions.in,v 1.1 2017/10/28 04:51:06 schmonz Exp $ + +Find and use mkfifo(8) and svc(8) for tests. + +--- test/functions.in.orig 2017-10-24 02:56:07.000000000 +0000 ++++ test/functions.in +@@ -10,7 +10,8 @@ mkdir -p \ + $tmpdir/protocols \ + $QUEUEDIR/{failed,queue,tmp} \ + $SYSCONFDIR +-mknod $QUEUEDIR/trigger p ++export PATH=/sbin:$PATH ++mkfifo $QUEUEDIR/trigger + ln -s $builddir/src $tmpdir/sbin + ln -s $builddir/src $tmpdir/bin + ln -s $builddir/protocols/* $tmpdir/protocols/ +@@ -128,7 +129,7 @@ splitblank() { + done + } + +-export PATH=/bin:/usr/bin:/usr/local/bin ++export PATH=/bin:/usr/bin:/usr/local/bin:@PREFIX@/bin + rm -f $SYSCONFDIR/* + echo f.q.d.n >$SYSCONFDIR/me + echo q.d.n >$SYSCONFDIR/defaultdomain --_----------=_1509166266350--