[arch-commits] Commit in procmail/trunk (PKGBUILD formisc.c.patch)

[Andreas Radke]

    Date: Tuesday, November 21, 2017 @ 18:51:11
  Author: andyrtr
Revision: 310520

upgpkg: procmail 3.22-8

FS#56398; CVE-2017-16844

Added:
  procmail/trunk/formisc.c.patch
Modified:
  procmail/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   19 +++++++++++++------
 formisc.c.patch |   14 ++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-21 17:06:12 UTC (rev 310519)
+++ PKGBUILD	2017-11-21 18:51:11 UTC (rev 310520)
@@ -3,7 +3,7 @@
 
 pkgname=procmail
 pkgver=3.22
-pkgrel=7
+pkgrel=8
 pkgdesc="Highly configurable auto mail processing."
 arch=('x86_64')
 url="http://www.procmail.org"
@@ -12,13 +12,20 @@
 makedepends=('smtp-server')
 source=(#"http://www.procmail.org/${pkgname}-${pkgver}.tar.gz" # currently down
         "ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/${pkgname}-${pkgver}.tar.gz"
-        'procmail-3.22-getline.patch')
-md5sums=('1678ea99b973eb77eda4ecf6acae53f1'
-         'cf8e5d4854050ab0c836e07406a3dfa9')
+        procmail-3.22-getline.patch formisc.c.patch)
+sha256sums=('087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117'
+            'aaa5ce562e5ef65f56a0225eedda3fcc7ab2938da6097ed4d9b11abf861929de'
+            'b7d983e5eba1d1869871a6ebb97404c511d0705673b0e59646b5c074c6ba34d8')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ${srcdir}/procmail-3.22-getline.patch
+  # FS#56398 / https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876511
+  patch -p1 -i ${srcdir}/formisc.c.patch
+}
+
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 -i ${srcdir}/procmail-3.22-getline.patch
+  cd $pkgname-$pkgver
   yes n | make CFLAGS0="${CFLAGS} ${LDFLAGS}" LOCKINGTEST="/tmp ."
 }
 

Added: formisc.c.patch
===================================================================
--- formisc.c.patch	                        (rev 0)
+++ formisc.c.patch	2017-11-21 18:51:11 UTC (rev 310520)
@@ -0,0 +1,14 @@
+diff --git a/src/formisc.c b/src/formisc.c
+index d91b227..6c7594b 100644
+--- a/src/formisc.c
++++ b/src/formisc.c
+@@ -103,7 +103,7 @@ void loadsaved(sp)const struct saved*const sp;	     /* load some saved text */
+ }
+ 							    /* append to buf */
+ void loadbuf(text,len)const char*const text;const size_t len;
+-{ if(buffilled+len>buflen)			  /* buf can't hold the text */
++{ while(buffilled+len>buflen)			  /* buf can't hold the text */
+      buf=realloc(buf,buflen+=Bsize);
+   tmemmove(buf+buffilled,text,len);buffilled+=len;
+ }
+