diff options
| author | wiedi <wiedi> | 2016-12-12 23:54:12 +0000 |
|---|---|---|
| committer | wiedi <wiedi> | 2016-12-12 23:54:12 +0000 |
| commit | f4f8e5988b33a2e1c0d5f7954cb61079dadadb62 (patch) | |
| tree | b093507872f1a79f513647d9523684e33df36a1f /mail | |
| parent | 0ed074f5d9e1c6e58daa3893b161bc37dc0048fd (diff) | |
| download | pkgsrc-f4f8e5988b33a2e1c0d5f7954cb61079dadadb62.tar.gz | |
Add patch to fix RFC976 "From_ lines" issue
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/nullmailer/Makefile | 4 | ||||
| -rw-r--r-- | mail/nullmailer/distinfo | 3 | ||||
| -rw-r--r-- | mail/nullmailer/patches/patch-src_inject.cc | 25 |
3 files changed, 29 insertions, 3 deletions
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile index 90c5d1c6e3d..052bb4b7331 100644 --- a/mail/nullmailer/Makefile +++ b/mail/nullmailer/Makefile @@ -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} diff --git a/mail/nullmailer/distinfo b/mail/nullmailer/distinfo index 60503c90154..875bfb21228 100644 --- a/mail/nullmailer/distinfo +++ b/mail/nullmailer/distinfo @@ -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) = 6e8fb0269fcca08fd450b08b865f67ab3bfa1675 SHA1 (patch-ab) = cb6ed64a5cdf413837710a6f27ea22d1e37fd1b9 SHA1 (patch-ac) = c542bbf35dfc2148dd133837799b7f4634b66489 SHA1 (patch-lib_fdbuf_fdobuf.h) = 716854a1421ef2021f5383f3e63bd19ece900a23 +SHA1 (patch-src_inject.cc) = eaffa250d87bb9501e6ccac81c73c1efafb1ad54 diff --git a/mail/nullmailer/patches/patch-src_inject.cc b/mail/nullmailer/patches/patch-src_inject.cc new file mode 100644 index 00000000000..02ffe5a1433 --- /dev/null +++ b/mail/nullmailer/patches/patch-src_inject.cc @@ -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."); |