From: Leo Famulari <leo@famulari.name>
To: Lukas Gradl <lgradl@openmailbox.org>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] Add procmail
Date: Wed, 2 Mar 2016 20:46:05 -0500 [thread overview]
Message-ID: <20160303014605.GA14850@jasmine> (raw)
In-Reply-To: <20160301044111.GB607@serenity.lan>
On Mon, Feb 29, 2016 at 10:41:12PM -0600, Lukas Gradl wrote:
[...]
> > > * gnu/packages/patches/procmail-ambiguous-getline-debian.patch: New file
> > > * gnu-system.am: Add patch
> > > * gnu/packages/mail.scm (procmail): New variable
[...]
> A new patch is attached. Thanks for the review!
I added a copyright line for you and some context for the patch, and
pushed as e90819c40af.
Thank you!
>
> Best,
> Lukas
>
> >
> > > ---
> > > 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 = \
> > > 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"))))
> > >
> > > +
> > > +(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 mail
> > > +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=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=='>';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 field */
> > > + { 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=0;
> > > + #ifdef sMAILBOX_SEPARATOR
> > > +- getline();buffilled=0; /* but only if it's defined */
> > > ++ procmail_getline();buffilled=0; /* but only if it's defined */
> > > + #endif
> > > + if(buflast!=EOF) /* if any */
> > > + goto splitit;
> > > +--- a/src/formisc.c
> > > ++++ b/src/formisc.c
> > > +@@ -115,7 +115,7 @@
> > > + buf[buffilled++]=c;
> > > + }
> > > +
> > > +-int getline P((void)) /* read a newline-terminated line */
> > > ++int procmail_getline 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 */
> > > +--- 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));
> > > --
> > > 2.6.3
> > >
> >
>
> --
> Lukas Gradl
> Email: lgradl@openmailbox.org
> fingerprint:
> 2F07 6B84 2704 B631 B8D3 6C0E A49D 050F AC97 11C1
> You won't find me on Facebook
> From 959dbec07bb2509c9c997ac02cef55bedc53e005 Mon Sep 17 00:00:00 2001
> From: Lukas Gradl <lgradl@openmailbox.org>
> Date: Mon, 29 Feb 2016 22:07:35 -0600
> Subject: [PATCH] gnu: Add procmail.
>
> * gnu/packages/patches/procmail-ambiguous-getline-debian.patch: New file.
> * gnu-system.am (dist_patch_DATA): Add it.
> * gnu/packages/mail.scm (procmail): New variable.
> ---
> gnu-system.am | 1 +
> gnu/packages/mail.scm | 52 ++++++++++++++++++++++
> .../procmail-ambiguous-getline-debian.patch | 52 ++++++++++++++++++++++
> 3 files changed, 105 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 = \
> 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..cbb1271 100644
> --- a/gnu/packages/mail.scm
> +++ b/gnu/packages/mail.scm
> @@ -1085,4 +1085,56 @@ deliver it in various ways.")
> ;; with that information.
> (non-copyleft "https://github.com/nicm/fdm/blob/master/command.c"))))
>
> +
> +(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 (modify-phases %standard-phases
> + (replace 'configure
> + (lambda _
> + (substitute* "Makefile"
> + (("/bin/sh")
> + (which "sh"))
> + (("/usr")
> + (assoc-ref %outputs "out"))
> + (("/bin/rm")
> + (which "rm")))
> + #t)))
> + #:tests? #f)) ;; There are no tests indicating a successful
> + ;; build. Some tests of basic locking mechanisms provided by the
> + ;; filesystem are performed during 'make install'. However, these
> + ;; are performed before the actual build process.
> + (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 mail
> +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=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=='>';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 field */
> + { 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=0;
> + #ifdef sMAILBOX_SEPARATOR
> +- getline();buffilled=0; /* but only if it's defined */
> ++ procmail_getline();buffilled=0; /* but only if it's defined */
> + #endif
> + if(buflast!=EOF) /* if any */
> + goto splitit;
> +--- a/src/formisc.c
> ++++ b/src/formisc.c
> +@@ -115,7 +115,7 @@
> + buf[buffilled++]=c;
> + }
> +
> +-int getline P((void)) /* read a newline-terminated line */
> ++int procmail_getline 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 */
> +--- 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));
> --
> 2.6.3
>
next prev parent reply other threads:[~2016-03-03 1:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-27 9:16 [PATCH] Add procmail Lukas Gradl
2016-02-29 13:54 ` Andy Wingo
2016-03-01 4:35 ` Lukas Gradl
2016-02-29 19:50 ` Leo Famulari
2016-03-01 4:41 ` Lukas Gradl
2016-03-03 1:46 ` Leo Famulari [this message]
2016-03-03 2:59 ` Lukas Gradl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160303014605.GA14850@jasmine \
--to=leo@famulari.name \
--cc=guix-devel@gnu.org \
--cc=lgradl@openmailbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).