[arch-commits] Commit in procmail/repos/extra-x86_64 (5 files)

Andreas Radke andyrtr at archlinux.org
Tue Nov 21 18:51:24 UTC 2017


    Date: Tuesday, November 21, 2017 @ 18:51:24
  Author: andyrtr
Revision: 310521

archrelease: copy trunk to extra-x86_64

Added:
  procmail/repos/extra-x86_64/PKGBUILD
    (from rev 310520, procmail/trunk/PKGBUILD)
  procmail/repos/extra-x86_64/formisc.c.patch
    (from rev 310520, procmail/trunk/formisc.c.patch)
  procmail/repos/extra-x86_64/procmail-3.22-getline.patch
    (from rev 310520, procmail/trunk/procmail-3.22-getline.patch)
Deleted:
  procmail/repos/extra-x86_64/PKGBUILD
  procmail/repos/extra-x86_64/procmail-3.22-getline.patch

-----------------------------+
 PKGBUILD                    |   69 ++++++++++++++-----------
 formisc.c.patch             |   14 +++++
 procmail-3.22-getline.patch |  112 +++++++++++++++++++++---------------------
 3 files changed, 108 insertions(+), 87 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-21 18:51:11 UTC (rev 310520)
+++ PKGBUILD	2017-11-21 18:51:24 UTC (rev 310521)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=procmail
-pkgver=3.22
-pkgrel=7
-pkgdesc="Highly configurable auto mail processing."
-arch=('i686' 'x86_64')
-url="http://www.procmail.org"
-license=('GPL' 'custom:Artistic')
-depends=('glibc' 'sh')
-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')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 -i ${srcdir}/procmail-3.22-getline.patch
-  yes n | make CFLAGS0="${CFLAGS} ${LDFLAGS}" LOCKINGTEST="/tmp ."
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make BASENAME=${pkgdir}/usr MANDIR=${pkgdir}/usr/share/man install
-  install -D -m644 Artistic ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  install -d -m755 ${pkgdir}/usr/share/doc/${pkgname}/examples
-  install -m644 examples/* ${pkgdir}/usr/share/doc/${pkgname}/examples/
-}

Copied: procmail/repos/extra-x86_64/PKGBUILD (from rev 310520, procmail/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-11-21 18:51:24 UTC (rev 310521)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=procmail
+pkgver=3.22
+pkgrel=8
+pkgdesc="Highly configurable auto mail processing."
+arch=('x86_64')
+url="http://www.procmail.org"
+license=('GPL' 'custom:Artistic')
+depends=('glibc' 'sh')
+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 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 $pkgname-$pkgver
+  yes n | make CFLAGS0="${CFLAGS} ${LDFLAGS}" LOCKINGTEST="/tmp ."
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make BASENAME=${pkgdir}/usr MANDIR=${pkgdir}/usr/share/man install
+  install -D -m644 Artistic ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -d -m755 ${pkgdir}/usr/share/doc/${pkgname}/examples
+  install -m644 examples/* ${pkgdir}/usr/share/doc/${pkgname}/examples/
+}

Copied: procmail/repos/extra-x86_64/formisc.c.patch (from rev 310520, procmail/trunk/formisc.c.patch)
===================================================================
--- formisc.c.patch	                        (rev 0)
+++ formisc.c.patch	2017-11-21 18:51:24 UTC (rev 310521)
@@ -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;
+ }
+

Deleted: procmail-3.22-getline.patch
===================================================================
--- procmail-3.22-getline.patch	2017-11-21 18:51:11 UTC (rev 310520)
+++ procmail-3.22-getline.patch	2017-11-21 18:51:24 UTC (rev 310521)
@@ -1,56 +0,0 @@
-diff -up procmail-3.22/src/fields.c.getline procmail-3.22/src/fields.c
---- procmail-3.22/src/fields.c.getline	2001-09-11 06:57:08.000000000 +0200
-+++ procmail-3.22/src/fields.c	2009-06-30 16:10:36.000000000 +0200
-@@ -110,16 +110,16 @@ void dispfield(p)register const struct f
- 		    /* try and append one valid field to rdheader from stdin */
- int readhead P((void))
- { int idlen;
--  getline();
-+  get_line();
-   if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
-      return 0;
-   if(idlen==STRLEN(FROM)&&eqFrom_(buf))			/* it's a From_ line */
-    { if(rdheader)
- 	return 0;			       /* the From_ line was a fake! */
--     for(;buflast=='>';getline());	    /* gather continued >From_ lines */
-+     for(;buflast=='>';get_line());	    /* gather continued >From_ lines */
-    }
-   else
--     for(;;getline())		      /* get the rest of the continued field */
-+     for(;;get_line())		      /* get the rest of the continued field */
-       { switch(buflast)			     /* will this line be continued? */
- 	 { case ' ':case '\t':				  /* yep, it sure is */
- 	      continue;
-diff -up procmail-3.22/src/formail.c.getline procmail-3.22/src/formail.c
---- procmail-3.22/src/formail.c.getline	2009-06-30 16:00:40.000000000 +0200
-+++ procmail-3.22/src/formail.c	2009-06-30 16:10:49.000000000 +0200
-@@ -819,7 +819,7 @@ splitit:       { if(!lnl)   /* did the p
-       { if(split)		       /* gobble up the next start separator */
- 	 { buffilled=0;
- #ifdef sMAILBOX_SEPARATOR
--	   getline();buffilled=0;		 /* but only if it's defined */
-+	   get_line();buffilled=0;		 /* but only if it's defined */
- #endif
- 	   if(buflast!=EOF)					   /* if any */
- 	      goto splitit;
-diff -up procmail-3.22/src/formisc.c.getline procmail-3.22/src/formisc.c
---- procmail-3.22/src/formisc.c.getline	2001-06-29 04:20:45.000000000 +0200
-+++ procmail-3.22/src/formisc.c	2009-06-30 16:12:20.000000000 +0200
-@@ -115,7 +115,7 @@ void loadchar(c)const int c;		      /* a
-   buf[buffilled++]=c;
- }
- 
--int getline P((void))			   /* read a newline-terminated line */
-+int get_line P((void))			   /* read a newline-terminated line */
- { if(buflast==EOF)			 /* at the end of our Latin already? */
-    { loadchar('\n');					  /* fake empty line */
-      return EOF;					  /* spread the word */
-diff -up procmail-3.22/src/formisc.h.getline procmail-3.22/src/formisc.h
---- procmail-3.22/src/formisc.h.getline	1999-04-19 08:42:15.000000000 +0200
-+++ procmail-3.22/src/formisc.h	2009-06-30 16:10:02.000000000 +0200
-@@ -17,4 +17,4 @@ void
- char*
-  skipwords P((char*start));
- int
-- getline P((void));
-+ get_line P((void));

Copied: procmail/repos/extra-x86_64/procmail-3.22-getline.patch (from rev 310520, procmail/trunk/procmail-3.22-getline.patch)
===================================================================
--- procmail-3.22-getline.patch	                        (rev 0)
+++ procmail-3.22-getline.patch	2017-11-21 18:51:24 UTC (rev 310521)
@@ -0,0 +1,56 @@
+diff -up procmail-3.22/src/fields.c.getline procmail-3.22/src/fields.c
+--- procmail-3.22/src/fields.c.getline	2001-09-11 06:57:08.000000000 +0200
++++ procmail-3.22/src/fields.c	2009-06-30 16:10:36.000000000 +0200
+@@ -110,16 +110,16 @@ void dispfield(p)register const struct f
+ 		    /* try and append one valid field to rdheader from stdin */
+ int readhead P((void))
+ { int idlen;
+-  getline();
++  get_line();
+   if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
+      return 0;
+   if(idlen==STRLEN(FROM)&&eqFrom_(buf))			/* it's a From_ line */
+    { if(rdheader)
+ 	return 0;			       /* the From_ line was a fake! */
+-     for(;buflast=='>';getline());	    /* gather continued >From_ lines */
++     for(;buflast=='>';get_line());	    /* gather continued >From_ lines */
+    }
+   else
+-     for(;;getline())		      /* get the rest of the continued field */
++     for(;;get_line())		      /* get the rest of the continued field */
+       { switch(buflast)			     /* will this line be continued? */
+ 	 { case ' ':case '\t':				  /* yep, it sure is */
+ 	      continue;
+diff -up procmail-3.22/src/formail.c.getline procmail-3.22/src/formail.c
+--- procmail-3.22/src/formail.c.getline	2009-06-30 16:00:40.000000000 +0200
++++ procmail-3.22/src/formail.c	2009-06-30 16:10:49.000000000 +0200
+@@ -819,7 +819,7 @@ splitit:       { if(!lnl)   /* did the p
+       { if(split)		       /* gobble up the next start separator */
+ 	 { buffilled=0;
+ #ifdef sMAILBOX_SEPARATOR
+-	   getline();buffilled=0;		 /* but only if it's defined */
++	   get_line();buffilled=0;		 /* but only if it's defined */
+ #endif
+ 	   if(buflast!=EOF)					   /* if any */
+ 	      goto splitit;
+diff -up procmail-3.22/src/formisc.c.getline procmail-3.22/src/formisc.c
+--- procmail-3.22/src/formisc.c.getline	2001-06-29 04:20:45.000000000 +0200
++++ procmail-3.22/src/formisc.c	2009-06-30 16:12:20.000000000 +0200
+@@ -115,7 +115,7 @@ void loadchar(c)const int c;		      /* a
+   buf[buffilled++]=c;
+ }
+ 
+-int getline P((void))			   /* read a newline-terminated line */
++int get_line P((void))			   /* read a newline-terminated line */
+ { if(buflast==EOF)			 /* at the end of our Latin already? */
+    { loadchar('\n');					  /* fake empty line */
+      return EOF;					  /* spread the word */
+diff -up procmail-3.22/src/formisc.h.getline procmail-3.22/src/formisc.h
+--- procmail-3.22/src/formisc.h.getline	1999-04-19 08:42:15.000000000 +0200
++++ procmail-3.22/src/formisc.h	2009-06-30 16:10:02.000000000 +0200
+@@ -17,4 +17,4 @@ void
+ char*
+  skipwords P((char*start));
+ int
+- getline P((void));
++ get_line P((void));


More information about the arch-commits mailing list