Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1481586853142940"
MIME-Version: 1.0
Date: Mon, 12 Dec 2016 23:54:13 +0000
From: "Sebastian Wiedenroth" <wiedi@netbsd.org>
Subject: CVS commit: pkgsrc/mail/nullmailer
To: pkgsrc-changes@NetBSD.org
Reply-To: wiedi@netbsd.org
Message-Id: <20161212235413.1C985FBA6@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1481586853142940
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiedi
Date:		Mon Dec 12 23:54:13 UTC 2016

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

Log Message:
Add patch to fix RFC976 "From_ lines" issue


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/mail/nullmailer/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/nullmailer/distinfo
cvs rdiff -u -r0 -r1.1 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.


--_----------=_1481586853142940
Content-Disposition: inline
Content-Length: 2583
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.39 pkgsrc/mail/nullmailer/Makefile:1.40
--- pkgsrc/mail/nullmailer/Makefile:1.39	Mon Sep 19 13:04:24 2016
+++ pkgsrc/mail/nullmailer/Makefile	Mon Dec 12 23:54:12 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2016/09/19 13:04:24 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2016/12/12 23:54:12 wiedi Exp $
 
 DISTNAME=		nullmailer-1.13
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE:Q}
 DIST_SUBDIR=		${PKGNAME_NOREV}

Index: pkgsrc/mail/nullmailer/distinfo
diff -u pkgsrc/mail/nullmailer/distinfo:1.16 pkgsrc/mail/nullmailer/distinfo:1.17
--- pkgsrc/mail/nullmailer/distinfo:1.16	Tue Nov  3 23:27:11 2015
+++ pkgsrc/mail/nullmailer/distinfo	Mon Dec 12 23:54:12 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2015/11/03 23:27:11 agc Exp $
+$NetBSD: distinfo,v 1.17 2016/12/12 23:54:12 wiedi Exp $
 
 SHA1 (nullmailer-1.13/nullmailer-1.13.tar.gz) = e1178fff0395abee2bb6e77c3ddb8a0a7efcc791
 RMD160 (nullmailer-1.13/nullmailer-1.13.tar.gz) = d9f4663351122826299b04a46ffbb2bf51f41687
@@ -8,3 +8,4 @@ SHA1 (patch-aa) = 6e8fb0269fcca08fd450b0
 SHA1 (patch-ab) = cb6ed64a5cdf413837710a6f27ea22d1e37fd1b9
 SHA1 (patch-ac) = c542bbf35dfc2148dd133837799b7f4634b66489
 SHA1 (patch-lib_fdbuf_fdobuf.h) = 716854a1421ef2021f5383f3e63bd19ece900a23
+SHA1 (patch-src_inject.cc) = eaffa250d87bb9501e6ccac81c73c1efafb1ad54

Added files:

Index: pkgsrc/mail/nullmailer/patches/patch-src_inject.cc
diff -u /dev/null pkgsrc/mail/nullmailer/patches/patch-src_inject.cc:1.1
--- /dev/null	Mon Dec 12 23:54:13 2016
+++ pkgsrc/mail/nullmailer/patches/patch-src_inject.cc	Mon Dec 12 23:54:12 2016
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_inject.cc,v 1.1 2016/12/12 23:54:12 wiedi Exp $
+
+Add support for RFC976 "From_ lines".
+Some systems (e.g. Sun cron) generate UUCP "From_ lines" breaking header parsing.
+Upstream bug: https://github.com/bruceg/nullmailer/pull/39
+
+--- src/inject.cc.orig	2013-03-27 21:22:39.000000000 +0000
++++ src/inject.cc
+@@ -347,11 +347,16 @@ bool read_header()
+ {
+   mystring cur_line;
+   mystring whole;
++  bool first = true;
+   for (;;) {
+     if (!fin.getline(cur_line))
+       cur_line = "";
+     if(!cur_line || cur_line == "\r")
+       break;
++    if(first && (cur_line.find_first_of("From ", 0) == 0 ||
++       cur_line.find_first_of(">From ", 0) == 0))
++      continue;
++    first = false;
+     if(!!whole && is_continuation(cur_line)) {
+       //if(!whole)
+       //bad_hdr(cur_line, "First line cannot be a continuation line.");


--_----------=_1481586853142940--