From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukas Gradl Subject: [PATCH] Add procmail Date: Sat, 27 Feb 2016 03:16:38 -0600 Message-ID: <87io1aqzrd.wl-lgradl@openmailbox.org> Mime-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: multipart/mixed; boundary="Multipart_Sat_Feb_27_03:16:38_2016-1" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZbeh-0002BM-Et for guix-devel@gnu.org; Sat, 27 Feb 2016 04:59:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZbed-0006V2-Hz for guix-devel@gnu.org; Sat, 27 Feb 2016 04:59:19 -0500 Received: from smtp20.openmailbox.org ([62.4.1.54]:57495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZbed-0006Uu-68 for guix-devel@gnu.org; Sat, 27 Feb 2016 04:59:15 -0500 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --Multipart_Sat_Feb_27_03:16:38_2016-1 Content-Type: text/plain; charset=US-ASCII Hello Guix! Attached is a patch to add the mail delivery agent Procmail. I am new to Guix and Scheme, so I would very much welcome any comments you might have. Thanks in advance! Best, Lukas --Multipart_Sat_Feb_27_03:16:38_2016-1 Content-Type: text/plain; type=patch; name="0001-gnu-Add-procmail.patch"; charset=US-ASCII Content-Disposition: attachment; filename="0001-gnu-Add-procmail.patch" Content-Transfer-Encoding: quoted-printable =46rom 862c540938cd16ed20ce8107ff9729e5f24dae09 Mon Sep 17 00:00:00 2001 From: Lukas Gradl Date: Sat, 27 Feb 2016 02:43:57 -0600 Subject: [PATCH] gnu: Add procmail. * gnu/packages/patches/procmail-ambiguous-getline-debian.patch: New file * gnu-system.am: Add patch * gnu/packages/mail.scm (procmail): New variable --- gnu-system.am | 1 + gnu/packages/mail.scm | 50 ++++++++++++++++++= +++ .../procmail-ambiguous-getline-debian.patch | 52 ++++++++++++++++++= ++++ 3 files changed, 103 insertions(+) create mode 100644 gnu/packages/patches/procmail-ambiguous-getline-debian.= patch diff --git a/gnu-system.am b/gnu-system.am index 7727bad..c484031 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -658,6 +658,7 @@ dist_patch_DATA =3D \ gnu/packages/patches/plotutils-libpng-jmpbuf.patch \ gnu/packages/patches/polkit-drop-test.patch \ gnu/packages/patches/portaudio-audacity-compat.patch \ + gnu/packages/patches/procmail-ambiguous-getline-debian.patch \ gnu/packages/patches/pt-scotch-build-parallelism.patch \ gnu/packages/patches/pulseaudio-fix-mult-test.patch \ gnu/packages/patches/pulseaudio-longer-test-timeout.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 5a9f420..31b23a1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1085,4 +1085,54 @@ deliver it in various ways.") ;; with that information. (non-copyleft "https://github.com/nicm/fdm/blob/master/command.c")))) =20 + +(define-public procmail + (package + (name "procmail") + (version "3.22") + (source + (origin + (method url-fetch) + (uri (string-append + "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-" + version + ".tar.gz")) + (sha256 + (base32 + "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08")) + ;; the following patch fixes an ambiguous definition of + ;; getline() in formail.c. The patch is provided by Debian as + ;; patch 24 + (patches + (list + (search-patch "procmail-ambiguous-getline-debian.patch"))))) + (arguments + `(#:phases (alist-replace + 'configure + (lambda _ + (substitute* "Makefile" + (("/bin/sh") + (which "sh"))) + (substitute* "Makefile" + (("/usr") + (assoc-ref %outputs "out"))) + (substitute* "Makefile" + (("/bin/rm") + (which "rm")))) + %standard-phases) + #:tests? #f)) ; no tests + (build-system gnu-build-system) + (inputs `(("glibc" ,glibc) + ("exim" ,exim))) + (home-page "http://www.procmail.org/") + (synopsis "Versatile mail delivery agent (MDA)") + (description "Procmail is a mail delivery agent (MDA) featuring support +for a variety of mailbox formats such as mbox, mh and maildir. Incoming m= ail +can be sorted into separate files/directories and arbitrary commands can be +executed on mail arrival. Procmail is considered stable, but is no longer +maintained.") + (license gpl2+))) ; procmail allows to choose the + ; nonfree Artistic License 1.0 + ; as alternative to the GPL2+. + ; This option is not listed here. ;;; mail.scm ends here diff --git a/gnu/packages/patches/procmail-ambiguous-getline-debian.patch b= /gnu/packages/patches/procmail-ambiguous-getline-debian.patch new file mode 100644 index 0000000..63bf258 --- /dev/null +++ b/gnu/packages/patches/procmail-ambiguous-getline-debian.patch @@ -0,0 +1,52 @@ +--- a/src/fields.c ++++ b/src/fields.c +@@ -110,16 +110,16 @@ + /* try and append one valid field to rdheader from stdin */ + int readhead P((void)) + { int idlen; +- getline(); ++ procmail_getline(); + if((idlen=3Dbreakfield(buf,buffilled))<=3D0) /* not the start of a vali= d field */ + return 0; + if(idlen=3D=3DSTRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */ + { if(rdheader) + return 0; /* the From_ line was a fake! */ +- for(;buflast=3D=3D'>';getline()); /* gather continued >From_ lin= es */ ++ for(;buflast=3D=3D'>';procmail_getline()); /* gather continued >= From_ lines */ + } + else +- for(;;getline()) /* get the rest of the continued field */ ++ for(;;procmail_getline()) /* get the rest of the continued fi= eld */ + { switch(buflast) /* will this line be continued? */ + { case ' ':case '\t': /* yep, it sure is */ + continue; +--- a/src/formail.c ++++ b/src/formail.c +@@ -819,7 +819,7 @@ + { if(split) /* gobble up the next start separator */ + { buffilled=3D0; + #ifdef sMAILBOX_SEPARATOR +- getline();buffilled=3D0; /* but only if it's defined */ ++ procmail_getline();buffilled=3D0; /* but only if it's defined */ + #endif + if(buflast!=3DEOF) /* if any */ + goto splitit; +--- a/src/formisc.c ++++ b/src/formisc.c +@@ -115,7 +115,7 @@ + buf[buffilled++]=3Dc; + } +=20 +-int getline P((void)) /* read a newline-terminated line */ ++int procmail_getline P((void)) /* read a newline-terminated line */ + { if(buflast=3D=3DEOF) /* at the end of our Latin already? */ + { loadchar('\n'); /* fake empty line */ + return EOF; /* spread the word */ +--- a/src/formisc.h ++++ b/src/formisc.h +@@ -17,4 +17,4 @@ + char* + skipwords P((char*start)); + int +- getline P((void)); ++ procmail_getline P((void)); --=20 2.6.3 --Multipart_Sat_Feb_27_03:16:38_2016-1--