Update to 2.2.0

ok landry@
This commit is contained in:
giovanni 2009-10-28 14:21:38 +00:00
parent ac448ac1e6
commit 6866e2676d
10 changed files with 57 additions and 59 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.27 2009/09/15 17:37:21 jasper Exp $
# $OpenBSD: Makefile,v 1.28 2009/10/28 14:21:38 giovanni Exp $
COMMENT-main= mail delivery agent with filtering abilities
COMMENT-utils= quota tools for the Courier mail suite
V= 2.0.4
V= 2.2.0
DISTNAME= maildrop-$V
PKGNAME-main= maildrop-$Vp0
FULLPKGNAME-utils= courier-utils-$Vp0
PKGNAME-main= maildrop-$V
FULLPKGNAME-utils= courier-utils-$V
CATEGORIES= mail
HOMEPAGE= http://www.courier-mta.org/maildrop/
@ -20,7 +20,7 @@ FLAVOR?=
MULTI_PACKAGES= -main -utils
# GPL
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

View File

@ -1,5 +1,5 @@
MD5 (maildrop-2.0.4.tar.bz2) = anYO/kKXFqsL5nod3FVO1w==
RMD160 (maildrop-2.0.4.tar.bz2) = nAo0mHnMB5GtAeW64EtoDeOnpgY=
SHA1 (maildrop-2.0.4.tar.bz2) = 3ydVwdDgDRlQawZZ5Zv11HVszhc=
SHA256 (maildrop-2.0.4.tar.bz2) = VzAy1lJax0VDd+tAA3LDY0Rrs9mr2SSdqc9mdq74VnE=
SIZE (maildrop-2.0.4.tar.bz2) = 2286125
MD5 (maildrop-2.2.0.tar.bz2) = H9UpPHOttkoByz0+WeVGGA==
RMD160 (maildrop-2.2.0.tar.bz2) = jHFa8YaTw3XKGXRQzbV+OYE+qM0=
SHA1 (maildrop-2.2.0.tar.bz2) = pq+Yck/acsTR6/1ub1/F84yvnjg=
SHA256 (maildrop-2.2.0.tar.bz2) = FcmcPB57HXwHjakrz2Q9pBG+QUmU7/fzh+MwK6oYmz8=
SIZE (maildrop-2.2.0.tar.bz2) = 2412329

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-maildir_Makefile_am,v 1.1 2006/11/03 13:52:19 mbalmer Exp $
--- maildir/Makefile.am.orig Sat Jan 7 22:49:37 2006
+++ maildir/Makefile.am Sat Jan 7 22:53:22 2006
@@ -115,16 +115,16 @@ mailbot.h: config.status
$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
echo '#define MAILBOT "@MAILBOT@"' >mailbot.h
maildirsharedrc.h: config.status

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-maildir_Makefile_in,v 1.2 2008/05/07 20:02:47 mbalmer Exp $
--- maildir/Makefile.in.orig Mon Feb 26 03:58:14 2007
+++ maildir/Makefile.in Sun May 4 12:16:24 2008
@@ -827,16 +827,16 @@ mailbot.h: config.status
$OpenBSD: patch-maildir_Makefile_in,v 1.3 2009/10/28 14:21:38 giovanni Exp $
--- maildir/Makefile.in.orig Sat Jun 27 19:28:09 2009
+++ maildir/Makefile.in Wed Jul 15 15:07:13 2009
@@ -916,16 +916,16 @@ mailbot.h: config.status
echo '#define MAILBOT "@MAILBOT@"' >mailbot.h
maildirsharedrc.h: config.status

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-maildrop_Makefile_in,v 1.2 2008/05/07 20:02:47 mbalmer Exp $
--- maildrop/Makefile.in.orig Sun Apr 22 17:24:24 2007
+++ maildrop/Makefile.in Sun May 4 12:16:24 2008
@@ -137,7 +137,7 @@ AUTOMAKE = srcdir=${srcdir} @SHELL@ ${srcdir}/../autom
$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@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@

View File

@ -1,23 +1,21 @@
$OpenBSD: patch-maildrop_configure,v 1.2 2008/05/07 20:02:47 mbalmer Exp $
--- maildrop/configure.orig Sun Apr 22 17:24:25 2007
+++ maildrop/configure Sun May 4 12:16:24 2008
@@ -21761,17 +21761,12 @@ echo "$as_me:$LINENO: result: $maildrop_cv_SYS_INSTALL
echo "${ECHO_T}$maildrop_cv_SYS_INSTALL_RESET_GID" >&6
$OpenBSD: patch-maildrop_configure,v 1.3 2009/10/28 14:21:38 giovanni Exp $
--- maildrop/configure.orig Sat Jun 27 19:28:18 2009
+++ maildrop/configure Wed Jul 15 15:07:13 2009
@@ -19267,15 +19267,12 @@ fi
$as_echo "$maildrop_cv_SYS_INSTALL_RESET_GID" >&6; }
# Check whether --with-default-maildrop or --without-default-maildrop was given.
# Check whether --with-default-maildrop was given.
-if test "${with_default_maildrop+set}" = set; then
+if false; then
withval="$with_default_maildrop"
maildrop_cv_SYS_INSTALL_MBOXDIR="$withval"
withval=$with_default_maildrop; maildrop_cv_SYS_INSTALL_MBOXDIR="$withval"
else
# Courier defaults to ./Maildir
-
- if test -d $srcdir/../courier
- then
- maildrop_cv_SYS_INSTALL_MBOXDIR=./Maildir
- fi
-
+ maildrop_cv_SYS_INSTALL_MBOXDIR=./Maildir
fi;
+ maildrop_cv_SYS_INSTALL_MBOXDIR=./Maildir
fi

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-maildrop_maildrop_1_in,v 1.2 2008/05/07 20:02:47 mbalmer Exp $
--- maildrop/maildrop.1.in.orig Sun Apr 22 17:26:55 2007
+++ maildrop/maildrop.1.in Sun May 4 12:18:19 2008
@@ -184,7 +184,7 @@ is not owned by the user, or if it has any group or wo
$OpenBSD: patch-maildrop_maildrop_1_in,v 1.3 2009/10/28 14:21:38 giovanni Exp $
--- maildrop/maildrop.1.in.orig Sun May 10 16:53:44 2009
+++ maildrop/maildrop.1.in Wed Jun 24 18:28:11 2009
@@ -344,7 +344,7 @@ is not owned by the user, or if it has any group or wo
\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
-reads smalle messages into memory, then filters and/or delivers the message directly from memory. For larger messages,
+reads smaller messages into memory, then filters and/or delivers the message directly from memory. For larger messages,
-reads smalle messages into memory, then filters and/or delivers the message directly from memory\&. For larger messages,
+reads smaller messages into memory, then filters and/or delivers the message directly from memory\&. For larger messages,
\fBmaildrop\fR
accesses the message directly from the file. If the standard input is not a file,
accesses the message directly from the file\&. If the standard input is not a file,
\fBmaildrop\fR

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-maildrop_maildropfilter_7_in,v 1.2 2008/05/07 20:02:47 mbalmer Exp $
--- maildrop/maildropfilter.7.in.orig Sun Apr 22 17:26:58 2007
+++ maildrop/maildropfilter.7.in Sun May 4 12:18:59 2008
@@ -309,7 +309,7 @@ seconds before trying to create its own dot\-lock file
$OpenBSD: patch-maildrop_maildropfilter_7_in,v 1.3 2009/10/28 14:21:38 giovanni Exp $
--- maildrop/maildropfilter.7.in.orig Sun May 10 16:53:44 2009
+++ maildrop/maildropfilter.7.in Wed Jun 24 18:28:39 2009
@@ -583,7 +583,7 @@ seconds before trying to create its own dot\-lock file
.PP
\fILOGNAME\fR
.RS 4
-Name of the user to who the message is being delivered.
+Name of the user to whom the message is being delivered.
-Name of the user to who the message is being delivered\&.
+Name of the user to whom the message is being delivered\&.
.RE
.PP
\fIMAILDROP_OLD_REGEXP\fR

View File

@ -1,23 +1,23 @@
@comment $OpenBSD: PLIST-main,v 1.2 2008/05/07 20:02:47 mbalmer Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2009/10/28 14:21:38 giovanni Exp $
@pkgpath mail/maildrop
@newgroup _courier:571
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
@owner _courier
@group _courier
bin/lockmail
@bin bin/lockmail
@owner
@group
bin/mailbot
@bin bin/mailbot
@owner _courier
@group _courier
bin/maildrop
@bin bin/maildrop
@owner
@group
bin/makedat
bin/makedatprog
bin/makemime
bin/reformail
bin/reformime
@bin bin/makedatprog
@bin bin/makemime
@bin bin/reformail
@bin bin/reformime
@man man/man1/lockmail.1
@man man/man1/mailbot.1
@man man/man1/maildrop.1

View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST-utils,v 1.8 2007/02/08 11:28:46 bernd Exp $
@comment $OpenBSD: PLIST-utils,v 1.9 2009/10/28 14:21:38 giovanni Exp $
@conflict courier-imap-*
@newgroup _courier:571
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
bin/deliverquota
bin/maildirmake
@bin bin/deliverquota
@bin bin/maildirmake
@man man/man1/maildirmake.1
@man man/man8/deliverquota.8