<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3355fd35159996512e91a232ae2a08c9aa60cecb">https://github.com/macports/macports-ports/commit/3355fd35159996512e91a232ae2a08c9aa60cecb</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 3355fd3 procmail: add multiple patches from Debian
</span>3355fd3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3355fd35159996512e91a232ae2a08c9aa60cecb
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat Nov 25 17:25:28 2017 +0000
<span style='display:block; white-space:pre;color:#404040;'> procmail: add multiple patches from Debian
</span>---
mail/procmail/Portfile | 6 +-
mail/procmail/files/patch-security-fixes.diff | 103 ++++++++++++++++++++++++++
mail/procmail/files/patch-src-manconf.c.diff | 16 ++++
3 files changed, 123 insertions(+), 2 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 51155f7..2a180dd 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name procmail
version 3.22
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> categories mail
license {Artistic-1 GPL-2+}
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,9 @@ post-extract {
</span>
patchfiles getline.patch \
patch-CVE-2014-3618.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CVE-2017-16844.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CVE-2017-16844.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-security-fixes.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-manconf.c.diff
</span>
post-patch {
reinplace "s%^/\\*\\(#define\[ \t\]*DEF\[S\]*PATH\[ \t\]*\".*\\)\".*$%\\1:${prefix}/bin\"%" ${worksrcpath}/config.h
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bb119b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/procmail/files/patch-security-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,103 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Santiago Vila <sanvila@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Modified mailfold.c to fix a segfault problem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Debian-version: 3.22-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mailfold.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mailfold.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -378,7 +378,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dfilled=mailread=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(rhead) /* only read in a new header */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { memblk new;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dfilled=mailread=0;makeblock(&new,0);readdyn(&new,&dfilled,0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dfilled=mailread=0;makeblock(&new,0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ readdyn(&new,&dfilled,thebody-themail.p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(tobesent>dfilled&&isprivate) /* put it in place here */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { tmemmove(themail.p+dfilled,thebody,filled-=tobesent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmemmove(themail.p,new.p,dfilled);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Santiago Vila <sanvila@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Fix memory allocation bug in pipes.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: http://bugs.debian.org/171514
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Debian-version: 3.22-5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/pipes.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/pipes.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,7 +194,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ makeblock(&temp,Stdfilled);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmemmove(temp.p,Stdout,Stdfilled);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readdyn(&temp,&Stdfilled,Stdfilled+backlen+1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Stdout=realloc(Stdout,&Stdfilled+1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Stdout=realloc(Stdout,Stdfilled+1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmemmove(Stdout,temp.p,Stdfilled+1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ freeblock(&temp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ retStdout(Stdout,pwait&&pipw,!backblock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Santiago Vila <sanvila@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Fixed off-by-1 memory allocation error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: http://bugs.debian.org/474298
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: http://bugs.debian.org/484352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Debian-version: 3.22-17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mailfold.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mailfold.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -205,7 +205,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(linkfolder) /* any additional directories specified? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { size_t blen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(blen=Tmnate-linkfolder) /* copy the names into safety */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tmnate=(linkfolder=tmemmove(malloc(blen),linkfolder,blen))+blen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tmnate=(linkfolder=tmemmove(malloc(blen+1),linkfolder,blen))+blen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linkfolder=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Tero Marttila <terom@fixme.fi>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Fix off-by-one error that makes procmail to segfault on certain .procmailrc files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Debian-version: 3.22-23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cstdio.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cstdio.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,7 +144,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { case '\n':case EOF:*q='\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return overflow?-1:p!=q; /* did we read anything at all? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(q==end) /* check here so that a trailing backslash won't be lost */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(q>=end) /* check here so that a trailing backslash won't be lost */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ q=p,overflow=1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *q++=i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -199,7 +199,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(*(target=strchr(target,'\0')-1)=='\\')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { if(chp2!=target) /* non-empty line? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target++; /* then preserve the backslash */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(target>end-2) /* space enough for getbl? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(target>=end-2) /* space enough for getbl? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target=end-linebuf,overflow=1; /* toss what we have */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jan Darmochwal <jdarmochwal@gmx.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: formail memory corruption fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Debian-version: 3.22-24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/formail.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/formail.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,7 +219,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(i>=0&&(i!=maxindex(sest)||fldp==rdheader)) /* found anything? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { char*saddr;char*tmp; /* determine the weight */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nowm=areply&&headreply?headreply==1?sest[i].wrepl:sest[i].wrrepl:i;chp+=j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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:#e0ffe0;'>++ 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:#e0ffe0;'>+ if(sest[i].head==From_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { char*pastad;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(strchr(saddr=chp,'\n')) /* multiple From_ lines */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/formisc.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/formisc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ retz: *target='\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret: return start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(*start=='\\')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(*start=='\\' && *(start + 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *target++='\\',start++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hitspc=2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto normal; /* normal word */
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..13564af
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/procmail/files/patch-src-manconf.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Santiago Vila <sanvila@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Fixed typo in procmail(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: http://bugs.debian.org/142983
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Debian-version: 3.22-4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/manconf.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/manconf.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -233,7 +233,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \2-@PRESERVOPT@\1and\1.BR \2-@FROMWHOPT@ .\1");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pc("LMTPOPT",LMTPOPT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ps("LMTPOPTdesc","");ps("LMTPusage","");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ps("LMTPOPTdesc","");ps("LMTPusage","\1");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pname("INIT_UMASK",0);printf("0%lo/g\n",(unsigned long)INIT_UMASK);lines--;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pn("DEFlinebuf",DEFlinebuf);
</span></pre><pre style='margin:0'>
</pre>