pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/nullmailer Update to 2.1. From the changelog:
details: https://anonhg.NetBSD.org/pkgsrc/rev/adccf5c6d735
branches: trunk
changeset: 370919:adccf5c6d735
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Sat Oct 28 04:51:06 2017 +0000
description:
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.
diffstat:
mail/nullmailer/Makefile | 28 +++++++----------
mail/nullmailer/PLIST | 5 +-
mail/nullmailer/distinfo | 23 ++++++++------
mail/nullmailer/files/nullmailer-daemon | 13 --------
mail/nullmailer/files/nullmailer.sh | 32 +++++++++++++++-----
mail/nullmailer/options.mk | 5 +-
mail/nullmailer/patches/patch-Makefile.in | 20 ++++++++++++
mail/nullmailer/patches/patch-aa | 18 -----------
mail/nullmailer/patches/patch-ab | 25 ---------------
mail/nullmailer/patches/patch-ac | 21 -------------
mail/nullmailer/patches/patch-doc_nullmailer-queue.8 | 23 ++++++++++++++
mail/nullmailer/patches/patch-doc_nullmailer-send.8 | 31 +++++++++++++++++++
mail/nullmailer/patches/patch-lib_selfpipe.cc | 4 +-
mail/nullmailer/patches/patch-src_inject.cc | 25 ---------------
mail/nullmailer/patches/patch-src_sendmail.cc | 18 +++++++++++
mail/nullmailer/patches/patch-test_Makefile.am | 14 ++++++++
mail/nullmailer/patches/patch-test_Makefile.in | 17 ++++++++++
mail/nullmailer/patches/patch-test_functions.in | 25 +++++++++++++++
18 files changed, 206 insertions(+), 141 deletions(-)
diffs (truncated from 511 to 300 lines):
diff -r eb33fa31c303 -r adccf5c6d735 mail/nullmailer/Makefile
--- a/mail/nullmailer/Makefile Sat Oct 28 04:46:35 2017 +0000
+++ b/mail/nullmailer/Makefile Sat Oct 28 04:51:06 2017 +0000
@@ -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@localhost
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_USER=${NULLMAILER_USER}
FILES_SUBST+= VARBASE=${VARBASE} \
+ PKGNAME=${PKGNAME} \
NULLMAILER_GROUP=${NULLMAILER_GROUP} \
NULLMAILER_USER=${NULLMAILER_USER}
@@ -50,11 +50,10 @@
${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 @@
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"
diff -r eb33fa31c303 -r adccf5c6d735 mail/nullmailer/PLIST
--- a/mail/nullmailer/PLIST Sat Oct 28 04:46:35 2017 +0000
+++ b/mail/nullmailer/PLIST Sat Oct 28 04:51:06 2017 +0000
@@ -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/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
diff -r eb33fa31c303 -r adccf5c6d735 mail/nullmailer/distinfo
--- a/mail/nullmailer/distinfo Sat Oct 28 04:46:35 2017 +0000
+++ b/mail/nullmailer/distinfo Sat Oct 28 04:51:06 2017 +0000
@@ -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
diff -r eb33fa31c303 -r adccf5c6d735 mail/nullmailer/files/nullmailer-daemon
--- a/mail/nullmailer/files/nullmailer-daemon Sat Oct 28 04:46:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# ensure that the trigger fifo exists and we own it, then start up
-# nullmailer-send with logging and detach
-
-trigger="@VARBASE@/spool/nullmailer/trigger"
-
-if [ ! -p ${trigger} -o ! -O ${trigger} -o ! -G ${trigger} ]; then
- rm -f ${trigger}
- mkfifo -m 0600 ${trigger}
-fi
-
-@PREFIX@/libexec/nullmailer/nullmailer-send 2>&1 | logger -t nullmailer -p mail.info &
diff -r eb33fa31c303 -r adccf5c6d735 mail/nullmailer/files/nullmailer.sh
--- a/mail/nullmailer/files/nullmailer.sh Sat Oct 28 04:46:35 2017 +0000
+++ b/mail/nullmailer/files/nullmailer.sh Sat Oct 28 04:51:06 2017 +0000
@@ -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
diff -r eb33fa31c303 -r adccf5c6d735 mail/nullmailer/options.mk
--- a/mail/nullmailer/options.mk Sat Oct 28 04:46:35 2017 +0000
+++ b/mail/nullmailer/options.mk Sat Oct 28 04:51:06 2017 +0000
@@ -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 @@
.if !empty(PKG_OPTIONS:Mgnutls)
. include "../../security/gnutls/buildlink3.mk"
CONFIGURE_ARGS+= --enable-tls
+.else
+CONFIGURE_ARGS+= --disable-tls
.endif # option gnutls
-
diff -r eb33fa31c303 -r adccf5c6d735 mail/nullmailer/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/nullmailer/patches/patch-Makefile.in Sat Oct 28 04:51:06 2017 +0000
@@ -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:
diff -r eb33fa31c303 -r adccf5c6d735 mail/nullmailer/patches/patch-aa
--- a/mail/nullmailer/patches/patch-aa Sat Oct 28 04:46:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2015/01/02 04:38:20 schmonz Exp $
-
---- Makefile.in.orig 2013-04-15 14:48:25.000000000 +0000
-+++ Makefile.in
-@@ -632,10 +632,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:
diff -r eb33fa31c303 -r adccf5c6d735 mail/nullmailer/patches/patch-ab
--- a/mail/nullmailer/patches/patch-ab Sat Oct 28 04:46:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2015/01/02 04:38:20 schmonz Exp $
-
---- doc/nullmailer-send.8.orig 2013-03-28 23:08:05.000000000 +0000
-+++ doc/nullmailer-send.8
-@@ -115,16 +115,16 @@ If this is set to
- will wait forever for messages to complete sending.
- .SH FILES
- .TP
--.B /var/nullmailer/queue
-+.B @VARBASE@/spool/nullmailer/queue
- The message queue.
- .TP
--.B /var/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-queue(8),
diff -r eb33fa31c303 -r adccf5c6d735 mail/nullmailer/patches/patch-ac
--- a/mail/nullmailer/patches/patch-ac Sat Oct 28 04:46:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2013/09/03 17:50:28 shattered Exp $
-
Home |
Main Index |
Thread Index |
Old Index