Update to 2.4.3
This commit is contained in:
parent
a984ee53cb
commit
13ad994a61
@ -1,12 +1,12 @@
|
|||||||
# $OpenBSD: Makefile,v 1.31 2010/02/26 18:52:57 espie Exp $
|
# $OpenBSD: Makefile,v 1.32 2010/04/21 07:23:58 giovanni Exp $
|
||||||
|
|
||||||
COMMENT-main= mail delivery agent with filtering abilities
|
COMMENT-main= mail delivery agent with filtering abilities
|
||||||
COMMENT-utils= quota tools for the Courier mail suite
|
COMMENT-utils= quota tools for the Courier mail suite
|
||||||
|
|
||||||
V= 2.2.0
|
V= 2.4.3
|
||||||
DISTNAME= maildrop-$V
|
DISTNAME= maildrop-$V
|
||||||
PKGNAME-main= maildrop-$Vp1
|
PKGNAME-main= maildrop-$V
|
||||||
FULLPKGNAME-utils= courier-utils-$Vp0
|
FULLPKGNAME-utils= courier-utils-$V
|
||||||
FULLPKGPATH-utils= mail/maildrop,-utils
|
FULLPKGPATH-utils= mail/maildrop,-utils
|
||||||
CATEGORIES= mail
|
CATEGORIES= mail
|
||||||
|
|
||||||
@ -79,6 +79,7 @@ WANTLIB-main= c gdbm m stdc++
|
|||||||
LIB_DEPENDS-main= gdbm.>=3::databases/gdbm \
|
LIB_DEPENDS-main= gdbm.>=3::databases/gdbm \
|
||||||
pcre.>=1::devel/pcre \
|
pcre.>=1::devel/pcre \
|
||||||
courierauth::mail/courier-authlib
|
courierauth::mail/courier-authlib
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/maildrop
|
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/maildrop
|
||||||
@for i in ${DOCFILES}; do \
|
@for i in ${DOCFILES}; do \
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
MD5 (maildrop-2.2.0.tar.bz2) = H9UpPHOttkoByz0+WeVGGA==
|
MD5 (maildrop-2.4.3.tar.bz2) = FbdSi6Xnq3bmdllq9rzRyQ==
|
||||||
RMD160 (maildrop-2.2.0.tar.bz2) = jHFa8YaTw3XKGXRQzbV+OYE+qM0=
|
RMD160 (maildrop-2.4.3.tar.bz2) = yq6QJ3XG+zRw09nrpwsiDVCtF+g=
|
||||||
SHA1 (maildrop-2.2.0.tar.bz2) = pq+Yck/acsTR6/1ub1/F84yvnjg=
|
SHA1 (maildrop-2.4.3.tar.bz2) = F71ZoCwdHuqyq0lpKGqP5atNORQ=
|
||||||
SHA256 (maildrop-2.2.0.tar.bz2) = FcmcPB57HXwHjakrz2Q9pBG+QUmU7/fzh+MwK6oYmz8=
|
SHA256 (maildrop-2.4.3.tar.bz2) = tPVPX/ZZvwnhlxQdpdGQlwkbxLBfsZp/c9HLuZau0xA=
|
||||||
SIZE (maildrop-2.2.0.tar.bz2) = 2412329
|
SIZE (maildrop-2.4.3.tar.bz2) = 2413480
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-maildir_Makefile_in,v 1.3 2009/10/28 14:21:38 giovanni Exp $
|
$OpenBSD: patch-maildir_Makefile_in,v 1.4 2010/04/21 07:23:58 giovanni Exp $
|
||||||
--- maildir/Makefile.in.orig Sat Jun 27 19:28:09 2009
|
--- maildir/Makefile.in.orig Thu Feb 4 02:39:54 2010
|
||||||
+++ maildir/Makefile.in Wed Jul 15 15:07:13 2009
|
+++ maildir/Makefile.in Fri Mar 5 19:09:56 2010
|
||||||
@@ -916,16 +916,16 @@ mailbot.h: config.status
|
@@ -917,16 +917,16 @@ mailbot.h: config.status
|
||||||
echo '#define MAILBOT "@MAILBOT@"' >mailbot.h
|
echo '#define MAILBOT "@MAILBOT@"' >mailbot.h
|
||||||
|
|
||||||
maildirsharedrc.h: config.status
|
maildirsharedrc.h: config.status
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-maildrop_configure,v 1.3 2009/10/28 14:21:38 giovanni Exp $
|
$OpenBSD: patch-maildrop_configure,v 1.4 2010/04/21 07:23:58 giovanni Exp $
|
||||||
--- maildrop/configure.orig Sat Jun 27 19:28:18 2009
|
--- maildrop/configure.orig Fri Dec 25 23:14:47 2009
|
||||||
+++ maildrop/configure Wed Jul 15 15:07:13 2009
|
+++ maildrop/configure Mon Jan 11 17:06:04 2010
|
||||||
@@ -19267,15 +19267,12 @@ fi
|
@@ -19265,15 +19265,12 @@ fi
|
||||||
$as_echo "$maildrop_cv_SYS_INSTALL_RESET_GID" >&6; }
|
$as_echo "$maildrop_cv_SYS_INSTALL_RESET_GID" >&6; }
|
||||||
|
|
||||||
# Check whether --with-default-maildrop was given.
|
# Check whether --with-default-maildrop was given.
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-maildrop_maildrop_1_in,v 1.3 2009/10/28 14:21:38 giovanni Exp $
|
$OpenBSD: patch-maildrop_maildrop_1_in,v 1.4 2010/04/21 07:23:58 giovanni Exp $
|
||||||
--- maildrop/maildrop.1.in.orig Sun May 10 16:53:44 2009
|
--- maildrop/maildrop.1.in.orig Sat Sep 5 23:44:19 2009
|
||||||
+++ maildrop/maildrop.1.in Wed Jun 24 18:28:11 2009
|
+++ maildrop/maildrop.1.in Mon Jan 11 17:06:04 2010
|
||||||
@@ -344,7 +344,7 @@ is not owned by the user, or if it has any group or wo
|
@@ -192,7 +192,7 @@ is not owned by the user, or if it has any group or wo
|
||||||
\fBmaildrop\fR
|
\fBmaildrop\fR
|
||||||
is heavily optimized and tries to use as little resources as possible\&.
|
is heavily optimized and tries to use as little resources as possible\&.
|
||||||
\fBmaildrop\fR
|
\fBmaildrop\fR
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-maildrop_maildropfilter_7_in,v 1.3 2009/10/28 14:21:38 giovanni Exp $
|
$OpenBSD: patch-maildrop_maildropfilter_7_in,v 1.4 2010/04/21 07:23:58 giovanni Exp $
|
||||||
--- maildrop/maildropfilter.7.in.orig Sun May 10 16:53:44 2009
|
--- maildrop/maildropfilter.7.in.orig Sat Feb 20 05:13:33 2010
|
||||||
+++ maildrop/maildropfilter.7.in Wed Jun 24 18:28:39 2009
|
+++ maildrop/maildropfilter.7.in Fri Mar 5 19:09:57 2010
|
||||||
@@ -583,7 +583,7 @@ seconds before trying to create its own dot\-lock file
|
@@ -374,7 +374,7 @@ seconds before trying to create its own dot\-lock file
|
||||||
.PP
|
.PP
|
||||||
\fILOGNAME\fR
|
\fILOGNAME\fR
|
||||||
.RS 4
|
.RS 4
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
$OpenBSD: patch-maildrop_main_C,v 1.1 2010/01/29 12:03:09 jasper Exp $
|
|
||||||
|
|
||||||
Security fix for CVE-2010-0301, "maildrop Privilege Escalation
|
|
||||||
Security Issue". patch from upstream cvs -r1.59 of main.C.
|
|
||||||
|
|
||||||
--- maildrop/main.C.orig Fri Jan 29 12:04:39 2010
|
|
||||||
+++ maildrop/main.C Fri Jan 29 12:05:04 2010
|
|
||||||
@@ -471,6 +471,8 @@ const char *numuidgid=0;
|
|
||||||
nouser();
|
|
||||||
#if RESET_GID
|
|
||||||
setgroupid(my_pw->pw_gid);
|
|
||||||
+#else
|
|
||||||
+ setgroupid(getegid());
|
|
||||||
#endif
|
|
||||||
setuid(my_pw->pw_uid);
|
|
||||||
if (getuid() != my_pw->pw_uid)
|
|
92
mail/maildrop/patches/patch-rfc2045_reformime_1
Normal file
92
mail/maildrop/patches/patch-rfc2045_reformime_1
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
$OpenBSD: patch-rfc2045_reformime_1,v 1.1 2010/04/21 07:23:59 giovanni Exp $
|
||||||
|
--- rfc2045/reformime.1.orig Tue Mar 30 12:58:02 2010
|
||||||
|
+++ rfc2045/reformime.1 Tue Mar 30 12:59:02 2010
|
||||||
|
@@ -1,26 +1,26 @@
|
||||||
|
-.\" <!-- $Id: patch-rfc2045_reformime_1,v 1.1 2010/04/21 07:23:59 giovanni Exp $ -->
|
||||||
|
-.\" <!-- Copyright 1998 - 2009 Double Precision, Inc. See COPYING for -->
|
||||||
|
-.\" <!-- distribution information. -->
|
||||||
|
+ \" <!-- $Id: patch-rfc2045_reformime_1,v 1.1 2010/04/21 07:23:59 giovanni Exp $ -->
|
||||||
|
+ \" <!-- Copyright 1998 - 2009 Double Precision, Inc. See COPYING for -->
|
||||||
|
+ \" <!-- distribution information. -->
|
||||||
|
'\" t
|
||||||
|
-.\" Title: reformime
|
||||||
|
-.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
||||||
|
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
|
||||||
|
-.\" Date: 02/19/2010
|
||||||
|
-.\" Manual: Double Precision, Inc.
|
||||||
|
-.\" Source: Double Precision, Inc.
|
||||||
|
-.\" Language: English
|
||||||
|
-.\"
|
||||||
|
+ \" Title: reformime
|
||||||
|
+ \" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
||||||
|
+ \" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
|
||||||
|
+ \" Date: 02/19/2010
|
||||||
|
+ \" Manual: Double Precision, Inc.
|
||||||
|
+ \" Source: Double Precision, Inc.
|
||||||
|
+ \" Language: English
|
||||||
|
+ \"
|
||||||
|
.TH "REFORMIME" "1" "02/19/2010" "Double Precision, Inc." "Double Precision, Inc."
|
||||||
|
-.\" -----------------------------------------------------------------
|
||||||
|
-.\" * set default formatting
|
||||||
|
-.\" -----------------------------------------------------------------
|
||||||
|
-.\" disable hyphenation
|
||||||
|
+ \" -----------------------------------------------------------------
|
||||||
|
+ \" * set default formatting
|
||||||
|
+ \" -----------------------------------------------------------------
|
||||||
|
+ \" disable hyphenation
|
||||||
|
.nh
|
||||||
|
-.\" disable justification (adjust text to left margin only)
|
||||||
|
+ \" disable justification (adjust text to left margin only)
|
||||||
|
.ad l
|
||||||
|
-.\" -----------------------------------------------------------------
|
||||||
|
-.\" * MAIN CONTENT STARTS HERE *
|
||||||
|
-.\" -----------------------------------------------------------------
|
||||||
|
+ \" -----------------------------------------------------------------
|
||||||
|
+ \" * MAIN CONTENT STARTS HERE *
|
||||||
|
+ \" -----------------------------------------------------------------
|
||||||
|
.SH "NAME"
|
||||||
|
reformime \- MIME E\-mail reformatting tool
|
||||||
|
.SH "SYNOPSIS"
|
||||||
|
@@ -35,7 +35,7 @@ is a utility for reformatting MIME messages\&.
|
||||||
|
Generally,
|
||||||
|
\fBreformime\fR
|
||||||
|
expects to see an
|
||||||
|
-\m[blue]\fBRFC 2045\fR\m[]\&\s-2\u[1]\d\s+2
|
||||||
|
+\fBRFC 2045\fR\&\s-2\u[1]\d\s+2
|
||||||
|
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\&.
|
||||||
|
.PP
|
||||||
|
\-d
|
||||||
|
.RS 4
|
||||||
|
-Parse a delivery status notification MIME message (\m[blue]\fBRFC 1894\fR\m[]\&\s-2\u[2]\d\s+2)\&.
|
||||||
|
+Parse a delivery status notification MIME message (\fBRFC 1894\fR\&\s-2\u[2]\d\s+2)\&.
|
||||||
|
\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\&.
|
||||||
|
\-r
|
||||||
|
.RS 4
|
||||||
|
Rewrite message, adding or standardizing
|
||||||
|
-\m[blue]\fBRFC 2045\fR\m[]\&\s-2\u[1]\d\s+2
|
||||||
|
+\fBRFC 2045\fR\&\s-2\u[1]\d\s+2
|
||||||
|
MIME headers\&.
|
||||||
|
.RE
|
||||||
|
.PP
|
||||||
|
@@ -400,11 +400,11 @@ is a structured header with RFC 2822 addresses\&.
|
||||||
|
.SH "SEE ALSO"
|
||||||
|
.PP
|
||||||
|
|
||||||
|
-\m[blue]\fB\fBreformail\fR(1)\fR\m[]\&\s-2\u[3]\d\s+2,
|
||||||
|
+\fB\fBreformail\fR(1)\fR\&\s-2\u[3]\d\s+2,
|
||||||
|
\fBsendmail\fR(8),
|
||||||
|
-\m[blue]\fB\fBmailbot\fR(1)\fR\m[]\&\s-2\u[4]\d\s+2,
|
||||||
|
-\m[blue]\fB\fBmaildrop\fR(1)\fR\m[]\&\s-2\u[5]\d\s+2,
|
||||||
|
-\m[blue]\fB\fBmaildropfilter\fR(5)\fR\m[]\&\s-2\u[6]\d\s+2,
|
||||||
|
+\fB\fBmailbot\fR(1)\fR\&\s-2\u[4]\d\s+2,
|
||||||
|
+\fB\fBmaildrop\fR(1)\fR\&\s-2\u[5]\d\s+2,
|
||||||
|
+\fB\fBmaildropfilter\fR(5)\fR\&\s-2\u[6]\d\s+2,
|
||||||
|
\fBegrep\fR(1),
|
||||||
|
\fBgrep\fR(1),
|
||||||
|
\fBsendmail\fR(8)\&.
|
14
mail/maildrop/patches/patch-rfc822_rfc822_c
Normal file
14
mail/maildrop/patches/patch-rfc822_rfc822_c
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
$OpenBSD: patch-rfc822_rfc822_c,v 1.1 2010/04/21 07:23:59 giovanni Exp $
|
||||||
|
--- rfc822/rfc822.c.orig Fri Mar 5 19:39:55 2010
|
||||||
|
+++ rfc822/rfc822.c Fri Mar 5 19:40:25 2010
|
||||||
|
@@ -631,8 +631,8 @@ static int rfc822_print_common_nameaddr(const struct r
|
||||||
|
(*print_func)(' ', ptr);
|
||||||
|
|
||||||
|
|
||||||
|
- for (q=p; *q; ++q)
|
||||||
|
- if (*q != '.' && *q != '@' && strchr(RFC822_SPECIALS, *q))
|
||||||
|
+ for (q=p; (void *)q; ++q)
|
||||||
|
+ if ((void *)q != '.' && (void *)q != '@' && strchr(RFC822_SPECIALS, *q))
|
||||||
|
{
|
||||||
|
print_braces=1;
|
||||||
|
break;
|
Loading…
x
Reference in New Issue
Block a user