Update for Maildrop to 2.5.5:
* rfc2045/rfc2045reply.c (mkreply): Fix copying of the contents of the original message. * rfc2045/reformime.c (do_print_info): rfc2231_udecodeDisposition() failure is not fatal. * rfc2045/reformime.c (get_suitable_filename): Ditto. * rfc2045/reformime.c (main2): Fixed segfault on some arches from an initial null given to strtok. * mailbot: add "feedback" and "replyfeedback" formats, generating RFC 5965-formatted feedback report. -a option attaches the entire original message, instead of only its headers, for "replydsn", "feedback", and "replyfeedback" formats. Ok giovanni@
This commit is contained in:
parent
80813e8fbe
commit
773daa81c8
@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.41 2011/09/16 10:31:21 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.42 2012/09/04 11:33:35 gonzalo Exp $
|
||||
|
||||
COMMENT-main= mail delivery agent with filtering abilities
|
||||
COMMENT-utils= quota tools for the Courier mail suite
|
||||
|
||||
V= 2.5.4
|
||||
V= 2.5.5
|
||||
DISTNAME= maildrop-$V
|
||||
PKGNAME-main= maildrop-${V}
|
||||
REVISION-main = 0
|
||||
FULLPKGNAME-utils= courier-utils-$V
|
||||
FULLPKGPATH-utils= mail/maildrop,-utils
|
||||
CATEGORIES= mail
|
||||
@ -33,7 +32,6 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
CPPFLAGS="${CFLAGS:C/ *$//} -I${LOCALBASE}/include" \
|
||||
ac_cv_header_fam_h=no ac_cv_lib_fam_FAMOpen=no
|
||||
MAKE_ENV= INCLUDES="-I${LOCALBASE}/include"
|
||||
USE_GROFF = Yes
|
||||
|
||||
SUBST_VARS= MAILDROPCONF
|
||||
|
||||
|
@ -1,5 +1,2 @@
|
||||
MD5 (maildrop-2.5.4.tar.bz2) = V3A0XNzq4ovcJICeets0Jg==
|
||||
RMD160 (maildrop-2.5.4.tar.bz2) = pxwI/ClR3RInQIcBhmk6wRLlnr0=
|
||||
SHA1 (maildrop-2.5.4.tar.bz2) = bZUUux3yB6IDZ3nhTk8Oo1D10e4=
|
||||
SHA256 (maildrop-2.5.4.tar.bz2) = diG0rt4AfUeNvYv4ghbgKJwYvt3Ta79CnoXj5myp4AI=
|
||||
SIZE (maildrop-2.5.4.tar.bz2) = 2082167
|
||||
SHA256 (maildrop-2.5.5.tar.bz2) = dIQ4KFIHX0UoUKCCRUyMR6ZdUvAP5k4LGmPtfM8lKIw=
|
||||
SIZE (maildrop-2.5.5.tar.bz2) = 2158846
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-maildir_Makefile_am,v 1.2 2009/10/28 14:21:38 giovanni Exp $
|
||||
--- maildir/Makefile.am.orig Sun Aug 24 23:33:59 2008
|
||||
+++ maildir/Makefile.am Wed Jun 24 18:04:41 2009
|
||||
@@ -114,16 +114,16 @@ mailbot.h: config.status
|
||||
$OpenBSD: patch-maildir_Makefile_am,v 1.3 2012/09/04 11:33:35 gonzalo Exp $
|
||||
--- maildir/Makefile.am.orig Mon Apr 4 12:59:15 2011
|
||||
+++ maildir/Makefile.am Mon Sep 3 14:44:36 2012
|
||||
@@ -117,16 +117,16 @@ mailbot.h: config.status
|
||||
echo '#define MAILBOT "@MAILBOT@"' >mailbot.h
|
||||
|
||||
maildirsharedrc.h: config.status
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-maildir_Makefile_in,v 1.4 2010/04/21 07:23:58 giovanni Exp $
|
||||
--- maildir/Makefile.in.orig Thu Feb 4 02:39:54 2010
|
||||
+++ maildir/Makefile.in Fri Mar 5 19:09:56 2010
|
||||
@@ -917,16 +917,16 @@ mailbot.h: config.status
|
||||
$OpenBSD: patch-maildir_Makefile_in,v 1.5 2012/09/04 11:33:35 gonzalo Exp $
|
||||
--- maildir/Makefile.in.orig Sat Nov 12 23:07:11 2011
|
||||
+++ maildir/Makefile.in Mon Sep 3 14:44:36 2012
|
||||
@@ -928,16 +928,16 @@ mailbot.h: config.status
|
||||
echo '#define MAILBOT "@MAILBOT@"' >mailbot.h
|
||||
|
||||
maildirsharedrc.h: config.status
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-maildrop_Makefile_in,v 1.3 2009/10/28 14:21:38 giovanni Exp $
|
||||
--- maildrop/Makefile.in.orig Sat Jun 27 19:28:17 2009
|
||||
+++ maildrop/Makefile.in Wed Jul 15 15:07:13 2009
|
||||
@@ -146,7 +146,7 @@ AUTOMAKE = @AUTOMAKE@
|
||||
$OpenBSD: patch-maildrop_Makefile_in,v 1.4 2012/09/04 11:33:35 gonzalo Exp $
|
||||
--- maildrop/Makefile.in.orig Sat Dec 3 18:26:44 2011
|
||||
+++ maildrop/Makefile.in Mon Sep 3 14:44:36 2012
|
||||
@@ -145,7 +145,7 @@ AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-maildrop_configure,v 1.5 2010/07/08 16:35:58 giovanni Exp $
|
||||
--- maildrop/configure.orig Sun May 30 23:36:43 2010
|
||||
+++ maildrop/configure Fri Jun 25 09:17:14 2010
|
||||
@@ -16697,16 +16697,12 @@ fi
|
||||
$OpenBSD: patch-maildrop_configure,v 1.6 2012/09/04 11:33:35 gonzalo Exp $
|
||||
--- maildrop/configure.orig Sat Dec 3 18:26:43 2011
|
||||
+++ maildrop/configure Mon Sep 3 14:44:36 2012
|
||||
@@ -17536,16 +17536,12 @@ fi
|
||||
$as_echo "$maildrop_cv_SYS_INSTALL_RESET_GID" >&6; }
|
||||
|
||||
# Check whether --with-default-maildrop was given.
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-maildrop_deliver_C,v 1.1 2010/07/08 20:32:01 jasper Exp $
|
||||
$OpenBSD: patch-maildrop_deliver_C,v 1.2 2012/09/04 11:33:35 gonzalo Exp $
|
||||
|
||||
maildrop adds a newline to mbox files before delivering new messages.
|
||||
This effectively alters the final message in the mbox, causing a
|
||||
@ -15,9 +15,9 @@ gracefully handle the delivery of new mail to an open folder.
|
||||
[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=132411
|
||||
[2] http://markmail.org/message/w5mwn3jpmn3qeo5x
|
||||
|
||||
--- maildrop/deliver.C.orig Sat Jun 27 13:26:54 2009
|
||||
+++ maildrop/deliver.C Wed Jun 23 15:45:28 2010
|
||||
@@ -231,15 +231,7 @@ Buffer b;
|
||||
--- maildrop/deliver.C.orig Mon Apr 4 12:58:58 2011
|
||||
+++ maildrop/deliver.C Mon Sep 3 14:44:36 2012
|
||||
@@ -230,15 +230,7 @@ Buffer b;
|
||||
{
|
||||
format_mbox.Init(1);
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-maildrop_maildropfilter_7_in,v 1.4 2010/04/21 07:23:58 giovanni Exp $
|
||||
--- maildrop/maildropfilter.7.in.orig Sat Feb 20 05:13:33 2010
|
||||
+++ maildrop/maildropfilter.7.in Fri Mar 5 19:09:57 2010
|
||||
@@ -374,7 +374,7 @@ seconds before trying to create its own dot\-lock file
|
||||
$OpenBSD: patch-maildrop_maildropfilter_7_in,v 1.5 2012/09/04 11:33:35 gonzalo Exp $
|
||||
--- maildrop/maildropfilter.7.in.orig Wed Aug 31 00:29:43 2011
|
||||
+++ maildrop/maildropfilter.7.in Mon Sep 3 14:44:36 2012
|
||||
@@ -382,7 +382,7 @@ seconds before trying to create its own dot\-lock file
|
||||
.PP
|
||||
\fILOGNAME\fR
|
||||
.RS 4
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-rfc2045_reformime_1,v 1.2 2010/07/08 16:35:58 giovanni Exp $
|
||||
--- rfc2045/reformime.1.orig Sat May 1 17:34:46 2010
|
||||
+++ rfc2045/reformime.1 Fri Jun 25 09:15:40 2010
|
||||
@@ -35,7 +35,7 @@ is a utility for reformatting MIME messages\&.
|
||||
$OpenBSD: patch-rfc2045_reformime_1,v 1.3 2012/09/04 11:33:35 gonzalo Exp $
|
||||
--- rfc2045/reformime.1.orig Wed Aug 31 00:29:40 2011
|
||||
+++ rfc2045/reformime.1 Mon Sep 3 14:44:36 2012
|
||||
@@ -43,7 +43,7 @@ is a utility for reformatting MIME messages\&.
|
||||
Generally,
|
||||
\fBreformime\fR
|
||||
expects to see an
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-rfc2045_reformime_1,v 1.2 2010/07/08 16:35:58 giovanni Exp $
|
||||
compliant message on standard input, except in few cases such as the
|
||||
\fB\-m\fR
|
||||
option\&.
|
||||
@@ -94,7 +94,7 @@ Arbitrarily complex MIME constructs are possible\&.
|
||||
@@ -111,7 +111,7 @@ Arbitrarily complex MIME constructs are possible\&.
|
||||
.PP
|
||||
\-d
|
||||
.RS 4
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-rfc2045_reformime_1,v 1.2 2010/07/08 16:35:58 giovanni Exp $
|
||||
\fBreformime\fR
|
||||
expects to see on standard input a MIME message that consists of a delivery status notification, as defined by RFC 1894\&.
|
||||
\fBreformime\fR
|
||||
@@ -154,7 +154,7 @@ MIME message digest\&.
|
||||
@@ -171,7 +171,7 @@ MIME message digest\&.
|
||||
\-r
|
||||
.RS 4
|
||||
Rewrite message, adding or standardizing
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-rfc2045_reformime_1,v 1.2 2010/07/08 16:35:58 giovanni Exp $
|
||||
MIME headers\&.
|
||||
.RE
|
||||
.PP
|
||||
@@ -411,11 +411,11 @@ options\&.
|
||||
@@ -452,11 +452,11 @@ MIME objects\&.
|
||||
.SH "SEE ALSO"
|
||||
.PP
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.3 2009/10/28 14:21:38 giovanni Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.4 2012/09/04 11:33:35 gonzalo Exp $
|
||||
@pkgpath mail/maildrop
|
||||
@newgroup _courier:571
|
||||
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
|
||||
@ -43,6 +43,8 @@ share/doc/maildrop/html/deliverquota.html
|
||||
share/doc/maildrop/html/lockmail.html
|
||||
share/doc/maildrop/html/mailbot.html
|
||||
share/doc/maildrop/html/maildir.html
|
||||
share/doc/maildrop/html/maildiracl.html
|
||||
share/doc/maildrop/html/maildirkw.html
|
||||
share/doc/maildrop/html/maildirmake.html
|
||||
share/doc/maildrop/html/maildirquota.html
|
||||
share/doc/maildrop/html/maildrop.html
|
||||
|
Loading…
x
Reference in New Issue
Block a user