Update to latest versions and take maintainership.
If there are no objections I am going to commit them next week.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.93
diff -u -p -u -p -r1.93 Makefile
--- Makefile 15 Apr 2014 08:53:04 -0000 1.93
+++ Makefile 30 Apr 2014 17:31:47 -0000
@@ -3,16 +3,12 @@
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
-V= 4.13
+V= 4.15
DISTNAME= courier-imap-${V}
-REVISION= 0
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-pop3= courier-pop3-${V}
FULLPKGPATH-pop3= mail/courier-imap,-pop3
-REVISION-main= 0
-REVISION-pop3= 0
-
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
@@ -24,8 +20,8 @@ MAINTAINER= Giovanni Bechis <giovanni@o
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c courierauth courierauthsasl gdbm idn
-WANTLIB-pop3= c courierauth courierauthsasl idn ${MODGETTEXT_WANTLIB}
+WANTLIB= c courierauth courierauthcommon courierauthsasl gdbm idn
+WANTLIB-pop3= c courierauth courierauthcommon courierauthsasl idn
${MODGETTEXT_WANTLIB}
USE_GMAKE= Yes
USE_GROFF= Yes
@@ -38,6 +34,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/
ac_cv_lib_db_dbopen=no \
ac_cv_lib_db_db_env_create=no
+BUILD_DEPENDS= devel/pcre
LIB_DEPENDS= mail/courier-authlib \
devel/libidn
@@ -64,13 +61,13 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/sbi
--cache-file=${WRKDIR}/courier-imap.cache
DOCS= AUTHORS INSTALL \
- NEWS imap/ChangeLog \
- imap/README imap/README.proxy \
- maildir/README.imapkeywords.html \
- maildir/README.maildirfilter.html \
- maildir/README.maildirquota.txt \
- maildir/README.sharedfolders.txt \
- tcpd/README.couriertls
+ NEWS libs/imap/ChangeLog \
+ libs/imap/README libs/imap/README.proxy \
+ libs/maildir/README.imapkeywords.html \
+ libs/maildir/README.maildirfilter.html \
+ libs/maildir/README.maildirquota.txt \
+ libs/maildir/README.sharedfolders.txt \
+ libs/tcpd/README.couriertls
FLAVORS= no_trashquota imap_bugs
FLAVOR?=
@@ -112,15 +109,15 @@ NO_TEST= Yes
post-extract:
@perl -pi -e 's,\@datadir\@\/imapd.rand,\/dev\/urandom,g' \
- ${WRKSRC}/imap/imapd.cnf.openssl.in
+ ${WRKSRC}/libs/imap/imapd.cnf.openssl.in
@perl -pi -e 's,\@datadir\@\/imapd.rand,\/dev\/urandom,g' \
- ${WRKSRC}/imap/pop3d.cnf.openssl.in
+ ${WRKSRC}/libs/imap/pop3d.cnf.openssl.in
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/courier
- ${INSTALL_DATA} ${WRKSRC}/unicode/README \
+ ${INSTALL_DATA} ${WRKSRC}/libs/unicode/README \
${PREFIX}/share/doc/courier/README.unicode.txt
- ${INSTALL_DATA} ${WRKSRC}/imap/README \
+ ${INSTALL_DATA} ${WRKSRC}/libs/imap/README \
${PREFIX}/share/doc/courier/README.imap.txt
. for i in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/courier
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/courier-imap/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo 7 May 2013 08:12:09 -0000 1.18
+++ distinfo 30 Apr 2014 17:31:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (courier-imap-4.13.tar.bz2) =
vH4TxHpDF4AZXl/WXbdM0cjnFXhlIU9Nx4USxJFTazQ=
-SIZE (courier-imap-4.13.tar.bz2) = 3209625
+SHA256 (courier-imap-4.15.tar.bz2) =
bDQQfnup5TltULWPtBSklYBjNcq3E1yWrYWjgWeFsQk=
+SIZE (courier-imap-4.15.tar.bz2) = 3266353
Index: patches/patch-bdbobj_Makefile_in
===================================================================
RCS file: patches/patch-bdbobj_Makefile_in
diff -N patches/patch-bdbobj_Makefile_in
--- patches/patch-bdbobj_Makefile_in 9 May 2011 09:30:26 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-bdbobj_Makefile_in,v 1.2 2011/05/09 09:30:26 giovanni Exp $
-
-Removing "-static" from libtool linking flags makes our libtool happy
-and doesn't break the testbdb binary
-
---- bdbobj/Makefile.in.orig Mon Apr 4 17:04:28 2011
-+++ bdbobj/Makefile.in Wed Apr 13 15:53:46 2011
-@@ -72,7 +72,7 @@ am__objects_2 = testbdb.$(OBJEXT)
- testbdb_OBJECTS = $(am_testbdb_OBJECTS)
- testbdb_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-- $(testbdb_LDFLAGS) $(LDFLAGS) -o $@
-+ $(LDFLAGS) -o $@
- SCRIPTS = $(noinst_SCRIPTS)
- DEFAULT_INCLUDES = -I.@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/../depcomp
Index: patches/patch-imap_imapd-ssl_dist_in
===================================================================
RCS file: patches/patch-imap_imapd-ssl_dist_in
diff -N patches/patch-imap_imapd-ssl_dist_in
--- patches/patch-imap_imapd-ssl_dist_in 18 Oct 2012 08:06:27 -0000
1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.9 2012/10/18 08:06:27 giovanni Exp $
---- imap/imapd-ssl.dist.in.orig Fri Jun 22 14:24:14 2012
-+++ imap/imapd-ssl.dist.in Sat Sep 22 11:48:04 2012
-@@ -72,13 +72,13 @@ SSLLOGGEROPTS="-name=imapd-ssl"
- #
- # Whether or not to start IMAP over SSL on simap port:
-
--IMAPDSSLSTART=NO
-+IMAPDSSLSTART=YES
-
- ##NAME: IMAPDSTARTTLS:0
- #
- # Whether or not to implement IMAP STARTTLS extension instead:
-
--IMAPDSTARTTLS=YES
-+IMAPDSTARTTLS=NO
-
- ##NAME: IMAP_TLS_REQUIRED:1
- #
-@@ -268,8 +268,8 @@ TLS_VERIFYPEER=NONE
- # problems with SSL clients. Disable SSL caching by commenting out the
- # following settings:
-
--TLS_CACHEFILE=@localstatedir@/couriersslcache
--TLS_CACHESIZE=524288
-+# TLS_CACHEFILE=@localstatedir@/couriersslcache
-+# TLS_CACHESIZE=524288
-
- ##NAME: MAILDIRPATH:0
- #
Index: patches/patch-imap_pop3d-ssl_dist_in
===================================================================
RCS file: patches/patch-imap_pop3d-ssl_dist_in
diff -N patches/patch-imap_pop3d-ssl_dist_in
--- patches/patch-imap_pop3d-ssl_dist_in 18 Oct 2012 08:06:27 -0000
1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.9 2012/10/18 08:06:27 giovanni Exp $
---- imap/pop3d-ssl.dist.in.orig Fri Jun 22 14:24:14 2012
-+++ imap/pop3d-ssl.dist.in Sat Sep 22 11:48:04 2012
-@@ -253,8 +253,8 @@ TLS_VERIFYPEER=NONE
- # problems with SSL clients. Disable SSL caching by commenting out the
- # following settings:
-
--TLS_CACHEFILE=@localstatedir@/couriersslcache
--TLS_CACHESIZE=524288
-+# TLS_CACHEFILE=@localstatedir@/couriersslcache
-+# TLS_CACHESIZE=524288
-
- ##NAME: MAILDIRPATH:0
- #
Index: patches/patch-liblock_locktest_c
===================================================================
RCS file: patches/patch-liblock_locktest_c
diff -N patches/patch-liblock_locktest_c
--- patches/patch-liblock_locktest_c 17 Mar 2013 19:37:36 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-$OpenBSD: patch-liblock_locktest_c,v 1.2 2013/03/17 19:37:36 rpe Exp $
-
-mktemp change
-
---- liblock/locktest.c.orig Mon Dec 6 11:18:55 1999
-+++ liblock/locktest.c Fri Jan 6 19:06:31 2006
-@@ -5,6 +5,7 @@
-
- /* $Id */
-
-+#include <paths.h>
- #include "liblock.h"
- #if USE_FCNTL
- #include "lockfcntl.c"
-@@ -20,11 +21,23 @@
-
- int main()
- {
-+#define FILENAME "courier-imap.locktest.XXXXXXXXXX"
- int fd[2];
- pid_t p;
- int s;
- int f;
-
-+ char *name;
-+ const char *tmpdir;
-+ if ((tmpdir = (char *)getenv("TMPDIR")) == NULL)
-+ tmpdir = _PATH_TMP;
-+ (void)asprintf(&name, "%s%s%s", tmpdir,
-+ (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME);
-+ if (name == NULL) {
-+ perror("get filename");
-+ exit(1);
-+ }
-+
- signal(SIGCHLD, SIG_DFL);
- if (pipe(fd))
- {
-@@ -32,6 +45,12 @@ int f;
- return (1);
- }
-
-+ if ((f=mkstemp(name)) < 0)
-+ {
-+ perror("open");
-+ exit(1);
-+ }
-+
- if ((p=fork()) == (pid_t)-1)
- {
- perror("fork");
-@@ -46,7 +65,7 @@ int f;
- read(fd[0], &c, 1);
- close(fd[0]);
-
-- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
-+ if ((f=open(name, O_RDWR)) < 0)
- {
- perror("open");
- exit(1);
-@@ -56,22 +75,18 @@ int f;
- if (ll_lockfd(f, ll_writelock, 0, 0))
- {
- close(f);
-+ unlink(name);
- exit(0);
- }
- close(f);
- exit(1);
- }
--
-- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
-- {
-- perror("open");
-- exit(1);
-- }
-
- if (ll_lockfd(f, ll_writelock, 0, 0))
- {
- perror("lock");
- close(f);
-+ unlink(name);
- exit(1);
- }
- close(fd[1]);
Index: patches/patch-libs_bdbobj_Makefile_in
===================================================================
RCS file: patches/patch-libs_bdbobj_Makefile_in
diff -N patches/patch-libs_bdbobj_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_bdbobj_Makefile_in 30 Apr 2014 17:31:47 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libs/bdbobj/Makefile.in.orig Sun Aug 25 20:52:35 2013
++++ libs/bdbobj/Makefile.in Fri Oct 4 15:11:24 2013
+@@ -123,7 +123,7 @@ am__objects_2 = testbdb.$(OBJEXT)
+ testbdb_OBJECTS = $(am_testbdb_OBJECTS)
+ testbdb_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(testbdb_LDFLAGS) $(LDFLAGS) -o $@
++ $(CXXFLAGS) $(LDFLAGS) -o $@
+ SCRIPTS = $(noinst_SCRIPTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
Index: patches/patch-libs_imap_imapd-ssl_dist_in
===================================================================
RCS file: patches/patch-libs_imap_imapd-ssl_dist_in
diff -N patches/patch-libs_imap_imapd-ssl_dist_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_imap_imapd-ssl_dist_in 30 Apr 2014 17:31:47 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- libs/imap/imapd-ssl.dist.in.orig Sun Aug 25 20:52:11 2013
++++ libs/imap/imapd-ssl.dist.in Fri Oct 4 15:13:06 2013
+@@ -72,13 +72,13 @@ SSLLOGGEROPTS="-name=imapd-ssl"
+ #
+ # Whether or not to start IMAP over SSL on simap port:
+
+-IMAPDSSLSTART=NO
++IMAPDSSLSTART=YES
+
+ ##NAME: IMAPDSTARTTLS:0
+ #
+ # Whether or not to implement IMAP STARTTLS extension instead:
+
+-IMAPDSTARTTLS=YES
++IMAPDSTARTTLS=NO
+
+ ##NAME: IMAP_TLS_REQUIRED:1
+ #
+@@ -268,8 +268,8 @@ TLS_VERIFYPEER=NONE
+ # problems with SSL clients. Disable SSL caching by commenting out the
+ # following settings:
+
+-TLS_CACHEFILE=@localstatedir@/couriersslcache
+-TLS_CACHESIZE=524288
++# TLS_CACHEFILE=@localstatedir@/couriersslcache
++# TLS_CACHESIZE=524288
+
+ ##NAME: MAILDIRPATH:0
+ #
Index: patches/patch-libs_imap_pop3d-ssl_dist_in
===================================================================
RCS file: patches/patch-libs_imap_pop3d-ssl_dist_in
diff -N patches/patch-libs_imap_pop3d-ssl_dist_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_imap_pop3d-ssl_dist_in 30 Apr 2014 17:31:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- libs/imap/pop3d-ssl.dist.in.orig Sun Aug 25 20:52:11 2013
++++ libs/imap/pop3d-ssl.dist.in Fri Oct 4 15:13:25 2013
+@@ -253,8 +253,8 @@ TLS_VERIFYPEER=NONE
+ # problems with SSL clients. Disable SSL caching by commenting out the
+ # following settings:
+
+-TLS_CACHEFILE=@localstatedir@/couriersslcache
+-TLS_CACHESIZE=524288
++# TLS_CACHEFILE=@localstatedir@/couriersslcache
++# TLS_CACHESIZE=524288
+
+ ##NAME: MAILDIRPATH:0
+ #
Index: patches/patch-libs_liblock_locktest_c
===================================================================
RCS file: patches/patch-libs_liblock_locktest_c
diff -N patches/patch-libs_liblock_locktest_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_liblock_locktest_c 30 Apr 2014 17:31:47 -0000
@@ -0,0 +1,82 @@
+$OpenBSD$
+--- libs/liblock/locktest.c.orig Sun Aug 25 20:52:10 2013
++++ libs/liblock/locktest.c Fri Oct 4 15:13:39 2013
+@@ -5,6 +5,7 @@
+
+ /* $Id */
+
++#include <paths.h>
+ #include "liblock.h"
+ #if USE_FCNTL
+ #include "lockfcntl.c"
+@@ -20,11 +21,23 @@
+
+ int main()
+ {
++#define FILENAME "courier-imap.locktest.XXXXXXXXXX"
+ int fd[2];
+ pid_t p;
+ int s;
+ int f;
+
++ char *name;
++ const char *tmpdir;
++ if ((tmpdir = (char *)getenv("TMPDIR")) == NULL)
++ tmpdir = _PATH_TMP;
++ (void)asprintf(&name, "%s%s%s", tmpdir,
++ (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME);
++ if (name == NULL) {
++ perror("get filename");
++ exit(1);
++ }
++
+ signal(SIGCHLD, SIG_DFL);
+ if (pipe(fd))
+ {
+@@ -32,6 +45,12 @@ int f;
+ return (1);
+ }
+
++ if ((f=mkstemp(name)) < 0)
++ {
++ perror("open");
++ exit(1);
++ }
++
+ if ((p=fork()) == (pid_t)-1)
+ {
+ perror("fork");
+@@ -46,7 +65,7 @@ int f;
+ read(fd[0], &c, 1);
+ close(fd[0]);
+
+- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
++ if ((f=open(name, O_RDWR)) < 0)
+ {
+ perror("open");
+ exit(1);
+@@ -56,22 +75,18 @@ int f;
+ if (ll_lockfd(f, ll_writelock, 0, 0))
+ {
+ close(f);
++ unlink(name);
+ exit(0);
+ }
+ close(f);
+ exit(1);
+ }
+-
+- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
+- {
+- perror("open");
+- exit(1);
+- }
+
+ if (ll_lockfd(f, ll_writelock, 0, 0))
+ {
+ perror("lock");
+ close(f);
++ unlink(name);
+ exit(1);
+ }
+ close(fd[1]);
Index: patches/patch-libs_maildir_configure
===================================================================
RCS file: patches/patch-libs_maildir_configure
diff -N patches/patch-libs_maildir_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_maildir_configure 30 Apr 2014 17:31:47 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+--- libs/maildir/configure.orig Sun Aug 25 20:53:34 2013
++++ libs/maildir/configure Fri Oct 4 15:14:02 2013
+@@ -16890,7 +16890,7 @@ if ${ac_cv_lib_fam_FAMOpen+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfam $LIBS"
++LIBS="$LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -16925,7 +16925,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = xyes; then :
+ LIBFAM=-lfam
+
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_FAM 1
++#define HAVE_FAM 0
+ _ACEOF
+
+
+@@ -16955,7 +16955,6 @@ fi
+
+
+
+-echo "$LIBFAM" >maildir.libdeps
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for missing gethostname
prototype" >&5
+ $as_echo_n "checking for missing gethostname prototype... " >&6; }
Index: patches/patch-libs_tcpd_libcouriertls_c
===================================================================
RCS file: patches/patch-libs_tcpd_libcouriertls_c
diff -N patches/patch-libs_tcpd_libcouriertls_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_tcpd_libcouriertls_c 30 Apr 2014 17:31:47 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libs/tcpd/libcouriertls.c.orig Sun Aug 25 20:52:11 2013
++++ libs/tcpd/libcouriertls.c Fri Oct 4 15:14:17 2013
+@@ -814,7 +814,7 @@ static int get_func(void *rec, size_t recsize,
+ time_t timeout;
+ size_t session_id_len;
+
+- unsigned char *sess;
++ const unsigned char *sess;
+
+ if (recsize < sizeof(timeout)+sizeof(session_id_len))
+ return (0);
Index: patches/patch-maildir_configure
===================================================================
RCS file: patches/patch-maildir_configure
diff -N patches/patch-maildir_configure
--- patches/patch-maildir_configure 18 Oct 2012 08:06:27 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-maildir_configure,v 1.4 2012/10/18 08:06:27 giovanni Exp $
---- maildir/configure.orig Sun Jun 3 04:15:18 2012
-+++ maildir/configure Sat Sep 22 11:48:05 2012
-@@ -16802,7 +16802,7 @@ if ${ac_cv_lib_fam_FAMOpen+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lfam $LIBS"
-+LIBS="$LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -16837,7 +16837,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = xyes; then :
- LIBFAM=-lfam
-
- cat >>confdefs.h <<_ACEOF
--#define HAVE_FAM 1
-+#define HAVE_FAM 0
- _ACEOF
-
-
-@@ -16867,7 +16867,6 @@ fi
-
-
-
--echo "$LIBFAM" >maildir.libdeps
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for missing gethostname
prototype" >&5
- $as_echo_n "checking for missing gethostname prototype... " >&6; }
Index: patches/patch-tcpd_libcouriertls_c
===================================================================
RCS file: patches/patch-tcpd_libcouriertls_c
diff -N patches/patch-tcpd_libcouriertls_c
--- patches/patch-tcpd_libcouriertls_c 28 Oct 2009 14:20:19 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tcpd_libcouriertls_c,v 1.2 2009/10/28 14:20:19 giovanni Exp $
---- tcpd/libcouriertls.c.orig Sun Jul 13 16:27:33 2008
-+++ tcpd/libcouriertls.c Mon Jun 15 15:25:07 2009
-@@ -814,7 +814,7 @@ static int get_func(void *rec, size_t recsize,
- time_t timeout;
- size_t session_id_len;
-
-- unsigned char *sess;
-+ const unsigned char *sess;
-
- if (recsize < sizeof(timeout)+sizeof(session_id_len))
- return (0);
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/courier-imap/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST-main
--- pkg/PLIST-main 28 Apr 2012 11:06:12 -0000 1.9
+++ pkg/PLIST-main 30 Apr 2014 17:31:47 -0000
@@ -22,8 +22,10 @@ libexec/imapd.rc
@man man/man1/maildirmake.1
@man man/man8/deliverquota.8
@man man/man8/imapd.8
+@man man/man8/mkdhparams.8
@man man/man8/mkimapdcert.8
@bin sbin/imaplogin
+sbin/mkdhparams
sbin/mkimapdcert
sbin/sharedindexinstall
sbin/sharedindexsplit
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/maildrop/Makefile,v
retrieving revision 1.48
diff -u -p -u -p -r1.48 Makefile
--- Makefile 7 Nov 2013 07:09:00 -0000 1.48
+++ Makefile 1 Jun 2014 09:12:59 -0000
@@ -3,32 +3,35 @@
COMMENT-main= mail delivery agent with filtering abilities
COMMENT-utils= quota tools for the Courier mail suite
-V= 2.5.5
+V= 2.7.1
DISTNAME= maildrop-$V
PKGNAME-main= maildrop-${V}
FULLPKGNAME-utils= courier-utils-$V
FULLPKGPATH-utils= mail/maildrop,-utils
CATEGORIES= mail
-REVISION-main= 1
-REVISION-utils= 0
-
HOMEPAGE= http://www.courier-mta.org/maildrop/
+MAINTAINER= Giovanni Bechis <[email protected]>
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
-FLAVORS= postfix
+FLAVORS= postfix no_trashquota
FLAVOR?=
MULTI_PACKAGES= -main -utils
-
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
+ CPPFLAGS="${CFLAGS:C/ *$//} -I${LOCALBASE}/include" \
+ ac_cv_header_fam_h=no \
+ ac_cv_lib_fam_FAMOpen=no \
+ ac_cv_lib_db_dbopen=no \
+ ac_cv_func_dbopen=no
+MAKE_ENV= INCLUDES="-I${LOCALBASE}/include" \
CPPFLAGS="-I${LOCALBASE}/include" \
ac_cv_header_fam_h=no ac_cv_lib_fam_FAMOpen=no
@@ -60,9 +63,9 @@ DOCFILES= ${WRKSRC}/README \
${WRKSRC}/UPGRADE \
${WRKSRC}/README.postfix \
${WRKSRC}/maildroptips.txt \
- ${WRKSRC}/maildir/README.sharedfolders.txt \
- ${WRKSRC}/maildir/README.maildirquota.txt \
- ${WRKSRC}/maildir/quotawarnmsg
+ ${WRKSRC}/libs/maildir/README.sharedfolders.txt \
+ ${WRKSRC}/libs/maildir/README.maildirquota.txt \
+ ${WRKSRC}/libs/maildir/quotawarnmsg
.if ${FLAVOR:Mpostfix}
@@ -76,6 +79,12 @@ CONFIGURE_ARGS+= --enable-trusted-users=
CONFIGURE_ARGS+= --enable-trusted-groups="wheel _courier"
.endif
+.if ${FLAVOR:Mno_trashquota}
+CONFIGURE_ARGS+= --without-trashquota
+.else
+CONFIGURE_ARGS+= --with-trashquota
+.endif
+
MODULES= devel/gettext
LIB_DEPENDS= devel/libidn
@@ -88,6 +97,9 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/pcre \
mail/courier-authlib
+USE_GROFF= Yes
+USE_LIBTOOL= Yes
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/maildrop
@for i in ${DOCFILES}; do \
@@ -95,7 +107,7 @@ post-install:
${INSTALL_DATA} $$i ${PREFIX}/share/doc/maildrop ;\
fi \
done
- ${INSTALL_DATA} ${WRKSRC}/unicode/README \
+ ${INSTALL_DATA} ${WRKSRC}/libs/unicode/README \
${PREFIX}/share/doc/maildrop/README.unicode.txt
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/maildrop/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo 4 Sep 2012 11:33:35 -0000 1.15
+++ distinfo 1 Jun 2014 09:12:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (maildrop-2.5.5.tar.bz2) = dIQ4KFIHX0UoUKCCRUyMR6ZdUvAP5k4LGmPtfM8lKIw=
-SIZE (maildrop-2.5.5.tar.bz2) = 2158846
+SHA256 (maildrop-2.7.1.tar.bz2) = /hw1KMUn46W/5EsudDeRK/VaWCn65EIlU0estKHK6xs=
+SIZE (maildrop-2.7.1.tar.bz2) = 2211838
Index: patches/patch-liblock_locktest_c
===================================================================
RCS file: patches/patch-liblock_locktest_c
diff -N patches/patch-liblock_locktest_c
--- patches/patch-liblock_locktest_c 17 Mar 2013 19:37:36 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-$OpenBSD: patch-liblock_locktest_c,v 1.2 2013/03/17 19:37:36 rpe Exp $
-
-mktemp change
-
---- liblock/locktest.c.orig Mon Dec 6 11:18:55 1999
-+++ liblock/locktest.c Sat Jan 7 20:36:26 2006
-@@ -5,6 +5,7 @@
-
- /* $Id */
-
-+#include <paths.h>
- #include "liblock.h"
- #if USE_FCNTL
- #include "lockfcntl.c"
-@@ -20,11 +21,23 @@
-
- int main()
- {
-+#define FILENAME "maildrop.locktest.XXXXXXXXXX"
- int fd[2];
- pid_t p;
- int s;
- int f;
-
-+ char *name;
-+ const char *tmpdir;
-+ if ((tmpdir = (char *)getenv("TMPDIR")) == NULL)
-+ tmpdir = _PATH_TMP;
-+ (void)asprintf(&name, "%s%s%s", tmpdir,
-+ (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME);
-+ if (name == NULL) {
-+ perror("get filename");
-+ exit(1);
-+ }
-+
- signal(SIGCHLD, SIG_DFL);
- if (pipe(fd))
- {
-@@ -32,6 +45,12 @@ int f;
- return (1);
- }
-
-+ if ((f=mkstemp(name)) < 0)
-+ {
-+ perror("open");
-+ exit(1);
-+ }
-+
- if ((p=fork()) == (pid_t)-1)
- {
- perror("fork");
-@@ -46,7 +65,7 @@ int f;
- read(fd[0], &c, 1);
- close(fd[0]);
-
-- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
-+ if ((f=open(name, O_RDWR)) < 0)
- {
- perror("open");
- exit(1);
-@@ -56,22 +75,18 @@ int f;
- if (ll_lockfd(f, ll_writelock, 0, 0))
- {
- close(f);
-+ unlink(name);
- exit(0);
- }
- close(f);
- exit(1);
- }
--
-- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
-- {
-- perror("open");
-- exit(1);
-- }
-
- if (ll_lockfd(f, ll_writelock, 0, 0))
- {
- perror("lock");
- close(f);
-+ unlink(name);
- exit(1);
- }
- close(fd[1]);
Index: patches/patch-libs_liblock_locktest_c
===================================================================
RCS file: patches/patch-libs_liblock_locktest_c
diff -N patches/patch-libs_liblock_locktest_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_liblock_locktest_c 1 Jun 2014 09:12:59 -0000
@@ -0,0 +1,82 @@
+$OpenBSD$
+--- libs/liblock/locktest.c.orig Sun Aug 25 20:54:20 2013
++++ libs/liblock/locktest.c Fri Oct 4 15:32:45 2013
+@@ -5,6 +5,7 @@
+
+ /* $Id */
+
++#include <paths.h>
+ #include "liblock.h"
+ #if USE_FCNTL
+ #include "lockfcntl.c"
+@@ -20,11 +21,23 @@
+
+ int main()
+ {
++#define FILENAME "maildrop.locktest.XXXXXXXXXX"
+ int fd[2];
+ pid_t p;
+ int s;
+ int f;
+
++ char *name;
++ const char *tmpdir;
++ if ((tmpdir = (char *)getenv("TMPDIR")) == NULL)
++ tmpdir = _PATH_TMP;
++ (void)asprintf(&name, "%s%s%s", tmpdir,
++ (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME);
++ if (name == NULL) {
++ perror("get filename");
++ exit(1);
++ }
++
+ signal(SIGCHLD, SIG_DFL);
+ if (pipe(fd))
+ {
+@@ -32,6 +45,12 @@ int f;
+ return (1);
+ }
+
++ if ((f=mkstemp(name)) < 0)
++ {
++ perror("open");
++ exit(1);
++ }
++
+ if ((p=fork()) == (pid_t)-1)
+ {
+ perror("fork");
+@@ -46,7 +65,7 @@ int f;
+ read(fd[0], &c, 1);
+ close(fd[0]);
+
+- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
++ if ((f=open(name, O_RDWR)) < 0)
+ {
+ perror("open");
+ exit(1);
+@@ -56,22 +75,18 @@ int f;
+ if (ll_lockfd(f, ll_writelock, 0, 0))
+ {
+ close(f);
++ unlink(name);
+ exit(0);
+ }
+ close(f);
+ exit(1);
+ }
+-
+- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
+- {
+- perror("open");
+- exit(1);
+- }
+
+ if (ll_lockfd(f, ll_writelock, 0, 0))
+ {
+ perror("lock");
+ close(f);
++ unlink(name);
+ exit(1);
+ }
+ close(fd[1]);
Index: patches/patch-libs_maildir_Makefile_am
===================================================================
RCS file: patches/patch-libs_maildir_Makefile_am
diff -N patches/patch-libs_maildir_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_maildir_Makefile_am 1 Jun 2014 09:12:59 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- libs/maildir/Makefile.am.orig Thu Aug 29 14:29:15 2013
++++ libs/maildir/Makefile.am Fri Oct 4 15:33:07 2013
+@@ -119,16 +119,16 @@ mailbot.h: config.status
+ echo '#define MAILBOT "@MAILBOT@"' >mailbot.h
+
+ maildirsharedrc.h: config.status
+- echo '#define MAILDIRSHAREDRC "$(sysconfdir)/maildirshared"'
>maildirsharedrc.h
++ echo '#define MAILDIRSHAREDRC "$(sysconfdir)/maildrop/maildirshared"'
>maildirsharedrc.h
+
+ maildirfilterconfig.h: config.status
+- echo '#define MAILDIRFILTERCONFIG "$(sysconfdir)/maildirfilterconfig"'
>maildirfilterconfig.h
++ echo '#define MAILDIRFILTERCONFIG
"$(sysconfdir)/maildrop/maildirfilterconfig"' >maildirfilterconfig.h
+
+ autoresponsequota.h: config.status
+- echo '#define AUTORESPONSEQUOTA "$(sysconfdir)/autoresponsesquota"'
>autoresponsequota.h
++ echo '#define AUTORESPONSEQUOTA
"$(sysconfdir)/maildrop/autoresponsesquota"' >autoresponsequota.h
+
+ quotawarnmsg.h: config.status
+- echo '#define QUOTAWARNMSG "$(sysconfdir)/quotawarnmsg"' >quotawarnmsg.h
++ echo '#define QUOTAWARNMSG "$(sysconfdir)/maildrop/quotawarnmsg"'
>quotawarnmsg.h
+ maildir.libdeps: config.status
+ echo @LIBFAM@ >maildir.libdeps
+
Index: patches/patch-libs_maildir_Makefile_in
===================================================================
RCS file: patches/patch-libs_maildir_Makefile_in
diff -N patches/patch-libs_maildir_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_maildir_Makefile_in 1 Jun 2014 09:12:59 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- libs/maildir/Makefile.in.orig Thu Aug 29 14:31:32 2013
++++ libs/maildir/Makefile.in Fri Oct 4 15:33:09 2013
+@@ -1076,16 +1076,16 @@ mailbot.h: config.status
+ echo '#define MAILBOT "@MAILBOT@"' >mailbot.h
+
+ maildirsharedrc.h: config.status
+- echo '#define MAILDIRSHAREDRC "$(sysconfdir)/maildirshared"'
>maildirsharedrc.h
++ echo '#define MAILDIRSHAREDRC "$(sysconfdir)/maildrop/maildirshared"'
>maildirsharedrc.h
+
+ maildirfilterconfig.h: config.status
+- echo '#define MAILDIRFILTERCONFIG "$(sysconfdir)/maildirfilterconfig"'
>maildirfilterconfig.h
++ echo '#define MAILDIRFILTERCONFIG
"$(sysconfdir)/maildrop/maildirfilterconfig"' >maildirfilterconfig.h
+
+ autoresponsequota.h: config.status
+- echo '#define AUTORESPONSEQUOTA "$(sysconfdir)/autoresponsesquota"'
>autoresponsequota.h
++ echo '#define AUTORESPONSEQUOTA
"$(sysconfdir)/maildrop/autoresponsesquota"' >autoresponsequota.h
+
+ quotawarnmsg.h: config.status
+- echo '#define QUOTAWARNMSG "$(sysconfdir)/quotawarnmsg"' >quotawarnmsg.h
++ echo '#define QUOTAWARNMSG "$(sysconfdir)/maildrop/quotawarnmsg"'
>quotawarnmsg.h
+ maildir.libdeps: config.status
+ echo @LIBFAM@ >maildir.libdeps
+
Index: patches/patch-libs_maildrop_configure
===================================================================
RCS file: patches/patch-libs_maildrop_configure
diff -N patches/patch-libs_maildrop_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_maildrop_configure 1 Jun 2014 09:12:59 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- libs/maildrop/configure.orig Wed Sep 25 12:55:08 2013
++++ libs/maildrop/configure Fri Oct 4 15:35:48 2013
+@@ -17679,16 +17679,12 @@ fi
+ $as_echo "$maildrop_cv_SYS_INSTALL_RESET_GID" >&6; }
+
+ # 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"
+ 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
+
+
Index: patches/patch-libs_maildrop_deliver_C
===================================================================
RCS file: patches/patch-libs_maildrop_deliver_C
diff -N patches/patch-libs_maildrop_deliver_C
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_maildrop_deliver_C 1 Jun 2014 09:12:59 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+
+maildrop adds a newline to mbox files before delivering new messages.
+This effectively alters the final message in the mbox, causing a
+running mutt (and maybe other MUAs) with that mbox open to freak out
+and lose unsaved state [1]. The maildrop folks prefer to keep this
+(out of spec) behaviour to keep from breaking users working
+configurations as well as to avoid problems caused by other out of
+spec mail delivery agents (which may aberrantly neglect to leave a
+blank line at the end of the mbox) [2].
+
+This patch disables this behaviour of maildrop allowing an MUA to
+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
+
+--- libs/maildrop/deliver.C.orig Sun Aug 25 20:54:20 2013
++++ libs/maildrop/deliver.C Fri Oct 4 15:36:27 2013
+@@ -230,15 +230,7 @@ Buffer b;
+ {
+ format_mbox.Init(1);
+
+- if ((stat_buf.st_size > 0 &&
+- mio.write(
+-#if CRLF_TERM
+- "\r\n", 2
+-#else
+- "\n", 1
+-#endif
+- ) < 0) ||
+- format_mbox.DeliverTo(mio))
++ if (format_mbox.DeliverTo(mio))
+ {
+ dotlock.truncate();
+ log(mailbox, -1, format_mbox);
Index: patches/patch-libs_maildrop_maildropfilter_7_in
===================================================================
RCS file: patches/patch-libs_maildrop_maildropfilter_7_in
diff -N patches/patch-libs_maildrop_maildropfilter_7_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_maildrop_maildropfilter_7_in 1 Jun 2014 09:12:59
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libs/maildrop/maildropfilter.7.in.orig Thu Aug 29 14:31:35 2013
++++ libs/maildrop/maildropfilter.7.in Fri Oct 4 15:36:35 2013
+@@ -377,7 +377,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\&.
+ .RE
+ .PP
+ \fIMAILDROP_OLD_REGEXP\fR
Index: patches/patch-libs_rfc2045_reformime_1
===================================================================
RCS file: patches/patch-libs_rfc2045_reformime_1
diff -N patches/patch-libs_rfc2045_reformime_1
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_rfc2045_reformime_1 1 Jun 2014 09:12:59 -0000
@@ -0,0 +1,46 @@
+$OpenBSD$
+--- libs/rfc2045/reformime.1.orig Sun Aug 25 21:15:30 2013
++++ libs/rfc2045/reformime.1 Fri Oct 4 15:38:06 2013
+@@ -42,7 +42,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\&.
+@@ -110,7 +110,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
+@@ -170,7 +170,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
+@@ -449,11 +449,11 @@ MIME objects\&.
+ .RE
+ .SH "SEE ALSO"
+ .PP
+-\m[blue]\fB\fBreformail\fR(1)\fR\m[]\&\s-2\u[3]\d\s+2,
++\fB\fBreformail\fR(1)\fR\m[]\&\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\m[]\&\s-2\u[4]\d\s+2,
++\fB\fBmaildrop\fR(1)\fR\m[]\&\s-2\u[5]\d\s+2,
++\fB\fBmaildropfilter\fR(5)\fR\m[]\&\s-2\u[6]\d\s+2,
+ \fBegrep\fR(1),
+ \fBgrep\fR(1),
+ \fBsendmail\fR(8)\&.
Index: patches/patch-maildir_Makefile_in
===================================================================
RCS file: patches/patch-maildir_Makefile_in
diff -N patches/patch-maildir_Makefile_in
--- patches/patch-maildir_Makefile_in 4 Sep 2012 11:33:35 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$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
-- echo '#define MAILDIRSHAREDRC "$(sysconfdir)/maildirshared"'
>maildirsharedrc.h
-+ echo '#define MAILDIRSHAREDRC "$(sysconfdir)/maildrop/maildirshared"'
>maildirsharedrc.h
-
- maildirfilterconfig.h: config.status
-- echo '#define MAILDIRFILTERCONFIG "$(sysconfdir)/maildirfilterconfig"'
>maildirfilterconfig.h
-+ echo '#define MAILDIRFILTERCONFIG
"$(sysconfdir)/maildrop/maildirfilterconfig"' >maildirfilterconfig.h
-
- autoresponsequota.h: config.status
-- echo '#define AUTORESPONSEQUOTA "$(sysconfdir)/autoresponsesquota"'
>autoresponsequota.h
-+ echo '#define AUTORESPONSEQUOTA
"$(sysconfdir)/maildrop/autoresponsesquota"' >autoresponsequota.h
-
- quotawarnmsg.h: config.status
-- echo '#define QUOTAWARNMSG "$(sysconfdir)/quotawarnmsg"' >quotawarnmsg.h
-+ echo '#define QUOTAWARNMSG "$(sysconfdir)/maildrop/quotawarnmsg"'
>quotawarnmsg.h
- maildir.libdeps: config.status
- echo @LIBFAM@ >maildir.libdeps
-
Index: patches/patch-maildrop_configure
===================================================================
RCS file: patches/patch-maildrop_configure
diff -N patches/patch-maildrop_configure
--- patches/patch-maildrop_configure 4 Sep 2012 11:33:35 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$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.
--if test "${with_default_maildrop+set}" = set; then :
-+if false; then :
- 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
-
-
Index: patches/patch-maildrop_deliver_C
===================================================================
RCS file: patches/patch-maildrop_deliver_C
diff -N patches/patch-maildrop_deliver_C
--- patches/patch-maildrop_deliver_C 4 Sep 2012 11:33:35 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$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
-running mutt (and maybe other MUAs) with that mbox open to freak out
-and lose unsaved state [1]. The maildrop folks prefer to keep this
-(out of spec) behaviour to keep from breaking users working
-configurations as well as to avoid problems caused by other out of
-spec mail delivery agents (which may aberrantly neglect to leave a
-blank line at the end of the mbox) [2].
-
-This patch disables this behaviour of maildrop allowing an MUA to
-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 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);
-
-- if ((stat_buf.st_size > 0 &&
-- mio.write(
--#if CRLF_TERM
-- "\r\n", 2
--#else
-- "\n", 1
--#endif
-- ) < 0) ||
-- format_mbox.DeliverTo(mio))
-+ if (format_mbox.DeliverTo(mio))
- {
- dotlock.truncate();
- log(mailbox, -1, format_mbox);
Index: patches/patch-maildrop_maildropfilter_7_in
===================================================================
RCS file: patches/patch-maildrop_maildropfilter_7_in
diff -N patches/patch-maildrop_maildropfilter_7_in
--- patches/patch-maildrop_maildropfilter_7_in 4 Sep 2012 11:33:35 -0000
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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
--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
Index: patches/patch-rfc2045_reformime_1
===================================================================
RCS file: patches/patch-rfc2045_reformime_1
diff -N patches/patch-rfc2045_reformime_1
--- patches/patch-rfc2045_reformime_1 4 Sep 2012 11:33:35 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$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
--\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\&.
-@@ -111,7 +111,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
-@@ -171,7 +171,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
-@@ -452,11 +452,11 @@ MIME objects\&.
- .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)\&.
Index: pkg/MESSAGE-main
===================================================================
RCS file: pkg/MESSAGE-main
diff -N pkg/MESSAGE-main
--- pkg/MESSAGE-main 26 Nov 2006 11:36:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-The documentation for maildrop has been installed in
-${PREFIX}/share/doc/maildrop.
-
-You should also read ${PREFIX}/share/doc/maildrop/SECURITY
-file now, as it has
-some important information regarding the setuid/setgid
-bits that some of the binaries that have been installed
-may need for correct operation.
-
-There are currently NO setuid/gid bits enabled, but if you
-use maildrop in certain capacities, these will need to be
-set to allow maildrop to function correctly.
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/maildrop/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 7 Nov 2013 07:09:00 -0000 1.5
+++ pkg/PLIST-main 1 Jun 2014 09:12:59 -0000
@@ -2,6 +2,7 @@
@pkgpath mail/maildrop
@newgroup _courier:571
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
+@extraunexec rm -rf ${SYSCONFDIR}/maildrop/*
@owner _courier
@group _courier
@bin bin/lockmail
@@ -59,4 +60,9 @@ share/doc/maildrop/html/rfc2045.html
share/doc/maildrop/html/rfc822.html
share/doc/maildrop/maildroptips.txt
share/doc/maildrop/quotawarnmsg
+@sample ${SYSCONFDIR}/maildrop/
+@mode 644
+@owner _courier
+@group _courier
+@sample ${SYSCONFDIR}/maildrop/quotawarnmsg
share/doc/pkg-readmes/${FULLPKGNAME}
