CVS commit: pkgsrc/mail/nullmailer

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Sun Jan 28 23:31:16 UTC 2018

Modified Files:
        pkgsrc/mail/nullmailer: Makefile distinfo
        pkgsrc/mail/nullmailer/patches: patch-src_sendmail.cc

Log Message:
nullmailer: avoid uninitialized memory, same fix as upstream


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/mail/nullmailer/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mail/nullmailer/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/nullmailer/patches/patch-src_sendmail.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/nullmailer/Makefile
diff -u pkgsrc/mail/nullmailer/Makefile:1.41 pkgsrc/mail/nullmailer/Makefile:1.42
--- pkgsrc/mail/nullmailer/Makefile:1.41        Sat Oct 28 04:51:06 2017
+++ pkgsrc/mail/nullmailer/Makefile     Sun Jan 28 23:31:16 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2017/10/28 04:51:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.42 2018/01/28 23:31:16 wiedi Exp $
 
 DISTNAME=              nullmailer-2.1
+PKGREVISION=           1
 CATEGORIES=            mail
 MASTER_SITES=          ${HOMEPAGE:Q}
 

Index: pkgsrc/mail/nullmailer/distinfo
diff -u pkgsrc/mail/nullmailer/distinfo:1.19 pkgsrc/mail/nullmailer/distinfo:1.20
--- pkgsrc/mail/nullmailer/distinfo:1.19        Sat Oct 28 04:51:06 2017
+++ pkgsrc/mail/nullmailer/distinfo     Sun Jan 28 23:31:16 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2017/10/28 04:51:06 schmonz Exp $
+$NetBSD: distinfo,v 1.20 2018/01/28 23:31:16 wiedi Exp $
 
 SHA1 (nullmailer-2.1.tar.gz) = 79322908cb242a80f72f8e2888ac870f2f311bcf
 RMD160 (nullmailer-2.1.tar.gz) = 834f7d5c8ee387c5d7b15663f0aa00c7f04f795f
@@ -9,7 +9,7 @@ SHA1 (patch-doc_nullmailer-queue.8) = 6d
 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) = 442e2324e082cd6d36057ec1d13ebe5a74a66b77
+SHA1 (patch-src_sendmail.cc) = 0b5414d5d7fe8c152b08bd30561aa224a8f78bd3
 SHA1 (patch-test_Makefile.am) = 744771972ca47f154fbc4d8a59dc0fc9b3c616f8
 SHA1 (patch-test_Makefile.in) = 5250f65a0758a9442aa6aec076b67af18ea2444c
 SHA1 (patch-test_functions.in) = 5c8d10eb57fd1fda2bd904b85a0895104525a7a4

Index: pkgsrc/mail/nullmailer/patches/patch-src_sendmail.cc
diff -u pkgsrc/mail/nullmailer/patches/patch-src_sendmail.cc:1.1 pkgsrc/mail/nullmailer/patches/patch-src_sendmail.cc:1.2
--- pkgsrc/mail/nullmailer/patches/patch-src_sendmail.cc:1.1    Sat Oct 28 04:51:06 2017
+++ pkgsrc/mail/nullmailer/patches/patch-src_sendmail.cc        Sun Jan 28 23:31:16 2018
@@ -1,18 +1,17 @@
-$NetBSD: patch-src_sendmail.cc,v 1.1 2017/10/28 04:51:06 schmonz Exp $
+$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,9 +111,10 @@ int do_exec(const char* program, const c
+@@ -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);
  
-+  extra_args[0] = 0;
    switch (o_mode) {
    case mode_smtp:
-     return do_exec("nullmailer-smtpd", extra_args);