<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/183903be0d3f021a72ea0f510203734a8688390a">https://github.com/macports/macports-ports/commit/183903be0d3f021a72ea0f510203734a8688390a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 183903be0d3 procmail: update to maintained fork
</span>183903be0d3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 183903be0d3f021a72ea0f510203734a8688390a
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat Mar 5 11:36:30 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> procmail: update to maintained fork
</span>---
mail/procmail/Portfile | 48 ++----------
mail/procmail/files/getline.patch | 52 -------------
mail/procmail/files/patch-CVE-2014-3618.diff | 16 ----
mail/procmail/files/patch-CVE-2017-16844.diff | 11 ---
mail/procmail/files/patch-security-fixes.diff | 103 --------------------------
mail/procmail/files/patch-src-foldinfo.c.diff | 10 ---
mail/procmail/files/patch-src-manconf.c.diff | 16 ----
7 files changed, 7 insertions(+), 249 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/Portfile b/mail/procmail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0c3eaebb482..c132bff4992 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/procmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/procmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name procmail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup BuGlessRB procmail 3.24 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories mail
license {Artistic-1 GPL-2+}
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,45 +37,15 @@ long_description The procmail mail processing program can be used \
</span> header-munging/extraction, or force mail into \
mail-format (with leading From line).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.procmail.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ftp://ftp.procmail.org/pub/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.psg.com/pub/unix/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.net.ohio-state.edu/pub/networking/mail/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.fdt.net/pub/unix/packages/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.tamu.edu/pub/mirrors/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.kfki.hu/pub/packages/mail/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://giswitch.sggw.waw.pl/pub/unix/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.solarisguide.com/pub/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.win.ne.jp/pub/network/mail/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.ring.gr.jp/archives/net/mail/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.ring.gr.jp/pub/net/mail/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.ayamura.org/pub/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://sunsite.cnlab-switch.ch/mirror/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.gigabell.net/pub/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.linja.net/pub/mirrors/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.stealth.net/pub/mirrors/ftp.procmail.org/pub/procmail/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.mirror.ac.uk/sites/ftp.procmail.org/pub/procmail/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 1678ea99b973eb77eda4ecf6acae53f1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 cd4e44c15559816453fd60349e5a32289f6f2965 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e609ec94ea9ab3b93629c62b3e29add497806483 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 226817
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c688a01fc1cecb61becec6b5471deac8caf8aac4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0804c719b5fc491aeec86f16646cb8588afa4adbc3cdf15e7cceb679dc76e596 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 299851
</span>
post-extract {
move ${worksrcpath}/INSTALL ${worksrcpath}/INSTALL.README
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles getline.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CVE-2014-3618.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CVE-2017-16844.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-security-fixes.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-foldinfo.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-manconf.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Makefile.0.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-Makefile.0.diff \
</span> patch-avoid-strlcat-strlcpy.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +63,3 @@ build.env "CC=${configure.cc} [get_canonical_archflags cc]"
</span>
build.args BASENAME=${prefix} LOCKINGTEST=/tmp
destroot.args BASENAME=${destroot}${prefix} LOCKINGTEST=/tmp install-suid
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/files/getline.patch b/mail/procmail/files/getline.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 137e62c275a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/procmail/files/getline.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,52 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/fields.c.orig 2001-09-11 14:57:08.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/fields.c 2012-05-04 10:24:17.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,16 +110,16 @@ void dispfield(p)register const struct f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* try and append one valid field to rdheader from stdin */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int readhead P((void))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { int idlen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- getline();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ procmail_getline();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { if(rdheader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0; /* the From_ line was a fake! */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for(;buflast=='>';getline()); /* gather continued >From_ lines */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for(;buflast=='>';procmail_getline()); /* gather continued >From_ lines */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for(;;getline()) /* get the rest of the continued field */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for(;;procmail_getline()) /* get the rest of the continued field */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { switch(buflast) /* will this line be continued? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { case ' ':case '\t': /* yep, it sure is */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/formail.c.orig 2001-09-11 14:57:32.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/formail.c 2012-05-04 10:24:35.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -819,7 +819,7 @@ splitit: { if(!lnl) /* did the p
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { if(split) /* gobble up the next start separator */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { buffilled=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef sMAILBOX_SEPARATOR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- getline();buffilled=0; /* but only if it's defined */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ procmail_getline();buffilled=0; /* but only if it's defined */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(buflast!=EOF) /* if any */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto splitit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/formisc.c.orig 2001-06-29 12:20:45.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/formisc.c 2012-05-04 10:24:55.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -115,7 +115,7 @@ void loadchar(c)const int c; /* a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buf[buffilled++]=c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--int getline P((void)) /* read a newline-terminated line */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int procmail_getline P((void)) /* read a newline-terminated line */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { if(buflast==EOF) /* at the end of our Latin already? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { loadchar('\n'); /* fake empty line */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return EOF; /* spread the word */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/formisc.h.orig 1999-04-19 16:42:15.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/formisc.h 2012-05-04 10:27:11.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,4 +17,4 @@ void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skipwords P((char*start));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- getline P((void));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ procmail_getline P((void));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/files/patch-CVE-2014-3618.diff b/mail/procmail/files/patch-CVE-2014-3618.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2743d6c5f94..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/procmail/files/patch-CVE-2014-3618.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/formisc.c.orig 2001-06-29 10:20:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/formisc.c 2014-09-12 00:58:12.989105253 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,12 +84,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case '"':*target++=delim='"';start++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;{ int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while(*start)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if((i= *target++= *start++)==delim) /* corresponding delimiter? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(i=='\\'&&*start) /* skip quoted character */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *target++= *start++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while(*start); /* anything? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hitspc=2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/files/patch-CVE-2017-16844.diff b/mail/procmail/files/patch-CVE-2017-16844.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5e3f1a97287..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/procmail/files/patch-CVE-2017-16844.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/formisc.c.orig 2017-11-22 07:00:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/formisc.c 2017-11-22 07:00:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,7 +103,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* append to buf */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void loadbuf(text,len)const char*const text;const size_t len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ if(buffilled+len>buflen) /* buf can't hold the text */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ while(buffilled+len>buflen) /* buf can't hold the text */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buf=realloc(buf,buflen+=Bsize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmemmove(buf+buffilled,text,len);buffilled+=len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/files/patch-security-fixes.diff b/mail/procmail/files/patch-security-fixes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bb119b8dfb4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/procmail/files/patch-security-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,103 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Santiago Vila <sanvila@debian.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Modified mailfold.c to fix a segfault problem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Debian-version: 3.22-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mailfold.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mailfold.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -378,7 +378,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dfilled=mailread=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(rhead) /* only read in a new header */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { memblk new;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dfilled=mailread=0;makeblock(&new,0);readdyn(&new,&dfilled,0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dfilled=mailread=0;makeblock(&new,0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ readdyn(&new,&dfilled,thebody-themail.p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(tobesent>dfilled&&isprivate) /* put it in place here */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { tmemmove(themail.p+dfilled,thebody,filled-=tobesent);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmemmove(themail.p,new.p,dfilled);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Santiago Vila <sanvila@debian.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fix memory allocation bug in pipes.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug-Debian: http://bugs.debian.org/171514
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Debian-version: 3.22-5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pipes.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pipes.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -194,7 +194,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- makeblock(&temp,Stdfilled);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmemmove(temp.p,Stdout,Stdfilled);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- readdyn(&temp,&Stdfilled,Stdfilled+backlen+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Stdout=realloc(Stdout,&Stdfilled+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Stdout=realloc(Stdout,Stdfilled+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmemmove(Stdout,temp.p,Stdfilled+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- freeblock(&temp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- retStdout(Stdout,pwait&&pipw,!backblock);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Santiago Vila <sanvila@debian.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fixed off-by-1 memory allocation error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug-Debian: http://bugs.debian.org/474298
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug-Debian: http://bugs.debian.org/484352
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Debian-version: 3.22-17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mailfold.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mailfold.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -205,7 +205,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(linkfolder) /* any additional directories specified? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { size_t blen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(blen=Tmnate-linkfolder) /* copy the names into safety */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Tmnate=(linkfolder=tmemmove(malloc(blen),linkfolder,blen))+blen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Tmnate=(linkfolder=tmemmove(malloc(blen+1),linkfolder,blen))+blen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- linkfolder=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Tero Marttila <terom@fixme.fi>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fix off-by-one error that makes procmail to segfault on certain .procmailrc files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Debian-version: 3.22-23
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/cstdio.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/cstdio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,7 +144,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { case '\n':case EOF:*q='\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return overflow?-1:p!=q; /* did we read anything at all? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(q==end) /* check here so that a trailing backslash won't be lost */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(q>=end) /* check here so that a trailing backslash won't be lost */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- q=p,overflow=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *q++=i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -199,7 +199,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(*(target=strchr(target,'\0')-1)=='\\')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { if(chp2!=target) /* non-empty line? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target++; /* then preserve the backslash */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(target>end-2) /* space enough for getbl? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(target>=end-2) /* space enough for getbl? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target=end-linebuf,overflow=1; /* toss what we have */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jan Darmochwal <jdarmochwal@gmx.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: formail memory corruption fixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Debian-version: 3.22-24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/formail.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/formail.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,7 +219,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(i>=0&&(i!=maxindex(sest)||fldp==rdheader)) /* found anything? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { char*saddr;char*tmp; /* determine the weight */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nowm=areply&&headreply?headreply==1?sest[i].wrepl:sest[i].wrrepl:i;chp+=j;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tmp=malloc(j=fldp->Tot_len-j);tmemmove(tmp,chp,j);(chp=tmp)[j-1]='\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp=malloc((j=fldp->Tot_len-j) + 1);tmemmove(tmp,chp,j);(chp=tmp)[j-1]='\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(sest[i].head==From_)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { char*pastad;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(strchr(saddr=chp,'\n')) /* multiple From_ lines */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/formisc.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/formisc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- retz: *target='\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret: return start;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(*start=='\\')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(*start=='\\' && *(start + 1))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *target++='\\',start++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hitspc=2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto normal; /* normal word */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/files/patch-src-foldinfo.c.diff b/mail/procmail/files/patch-src-foldinfo.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3ecf05c4268..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/procmail/files/patch-src-foldinfo.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/foldinfo.c.orig 2001-09-10 21:57:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/foldinfo.c 2021-02-05 16:30:06.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$Id: foldinfo.c,v 1.11 2001/08/04 07:07:42 guenther Exp $";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "procmail.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "acommon.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "misc.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "lastdirsep.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "robust.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/files/patch-src-manconf.c.diff b/mail/procmail/files/patch-src-manconf.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 13564af4fe4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/procmail/files/patch-src-manconf.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Santiago Vila <sanvila@debian.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fixed typo in procmail(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug-Debian: http://bugs.debian.org/142983
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Debian-version: 3.22-4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/manconf.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/manconf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -233,7 +233,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \2-@PRESERVOPT@\1and\1.BR \2-@FROMWHOPT@ .\1");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pc("LMTPOPT",LMTPOPT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ps("LMTPOPTdesc","");ps("LMTPusage","");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ps("LMTPOPTdesc","");ps("LMTPusage","\1");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pname("INIT_UMASK",0);printf("0%lo/g\n",(unsigned long)INIT_UMASK);lines--;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pn("DEFlinebuf",DEFlinebuf);
</span></pre><pre style='margin:0'>
</pre>