diff options
| -rw-r--r-- | mail/nullmailer/Makefile | 5 | ||||
| -rw-r--r-- | mail/nullmailer/distinfo | 13 | ||||
| -rw-r--r-- | mail/nullmailer/options.mk | 4 | ||||
| -rw-r--r-- | mail/nullmailer/patches/patch-src_sendmail.cc | 17 | ||||
| -rw-r--r-- | mail/nullmailer/patches/patch-test_functions.in | 8 |
5 files changed, 14 insertions, 33 deletions
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile index b91bd1eddb5..df0f975095c 100644 --- a/mail/nullmailer/Makefile +++ b/mail/nullmailer/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.45 2018/07/18 00:06:20 joerg Exp $ +# $NetBSD: Makefile,v 1.46 2018/10/13 14:38:54 schmonz Exp $ -DISTNAME= nullmailer-2.1 -PKGREVISION= 2 +DISTNAME= nullmailer-2.2 CATEGORIES= mail MASTER_SITES= ${HOMEPAGE:Q} diff --git a/mail/nullmailer/distinfo b/mail/nullmailer/distinfo index e3637a4d8dc..6c0886e8548 100644 --- a/mail/nullmailer/distinfo +++ b/mail/nullmailer/distinfo @@ -1,15 +1,14 @@ -$NetBSD: distinfo,v 1.20 2018/01/28 23:31:16 wiedi Exp $ +$NetBSD: distinfo,v 1.21 2018/10/13 14:38:54 schmonz Exp $ -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 (nullmailer-2.2.tar.gz) = c19202fbd8b348b9e0fe9664d538fe35e1dcc9c0 +RMD160 (nullmailer-2.2.tar.gz) = e50701d5477c57136282ecc87618165057ec76a4 +SHA512 (nullmailer-2.2.tar.gz) = 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268 +Size (nullmailer-2.2.tar.gz) = 257740 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) = a5d7e24bfbf3fa823cbd4e696a1c6488586e3512 -SHA1 (patch-src_sendmail.cc) = 0b5414d5d7fe8c152b08bd30561aa224a8f78bd3 SHA1 (patch-test_Makefile.am) = 744771972ca47f154fbc4d8a59dc0fc9b3c616f8 SHA1 (patch-test_Makefile.in) = 5250f65a0758a9442aa6aec076b67af18ea2444c -SHA1 (patch-test_functions.in) = 5c8d10eb57fd1fda2bd904b85a0895104525a7a4 +SHA1 (patch-test_functions.in) = 35b5c9b2a8794ac59f0450fdae4e30e9b9d61ce0 diff --git a/mail/nullmailer/options.mk b/mail/nullmailer/options.mk index fb6ef5b313e..2f65097f664 100644 --- a/mail/nullmailer/options.mk +++ b/mail/nullmailer/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2017/10/28 04:51:06 schmonz Exp $ +# $NetBSD: options.mk,v 1.3 2018/10/13 14:38:54 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nullmailer PKG_SUPPORTED_OPTIONS= gnutls @@ -11,4 +11,4 @@ PKG_SUGGESTED_OPTIONS= gnutls CONFIGURE_ARGS+= --enable-tls .else CONFIGURE_ARGS+= --disable-tls -.endif # option gnutls +.endif diff --git a/mail/nullmailer/patches/patch-src_sendmail.cc b/mail/nullmailer/patches/patch-src_sendmail.cc deleted file mode 100644 index 6c45e0c320f..00000000000 --- a/mail/nullmailer/patches/patch-src_sendmail.cc +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_sendmail.cc,v 1.2 2018/01/28 23:31:16 wiedi 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,8 +111,9 @@ 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; -+ memset(extra_args, 0, sizeof extra_args); - - switch (o_mode) { - case mode_smtp: diff --git a/mail/nullmailer/patches/patch-test_functions.in b/mail/nullmailer/patches/patch-test_functions.in index d72e40548bb..650d1841a70 100644 --- a/mail/nullmailer/patches/patch-test_functions.in +++ b/mail/nullmailer/patches/patch-test_functions.in @@ -1,8 +1,8 @@ -$NetBSD: patch-test_functions.in,v 1.1 2017/10/28 04:51:06 schmonz Exp $ +$NetBSD: patch-test_functions.in,v 1.2 2018/10/13 14:38:54 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.orig 2018-10-11 23:55:29.000000000 +0000 +++ test/functions.in @@ -10,7 +10,8 @@ mkdir -p \ $tmpdir/protocols \ @@ -14,8 +14,8 @@ Find and use mkfifo(8) and svc(8) for tests. ln -s $builddir/src $tmpdir/sbin ln -s $builddir/src $tmpdir/bin ln -s $builddir/protocols/* $tmpdir/protocols/ -@@ -128,7 +129,7 @@ splitblank() { - done +@@ -148,7 +149,7 @@ Just testing, please ignore + EOF } -export PATH=/bin:/usr/bin:/usr/local/bin |