Update to 4.9.0, unicode support completely rewritten and many bug fixes.
Ok ? Comments ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile 20 Mar 2011 13:06:23 -0000 1.70
+++ Makefile 13 Apr 2011 14:29:24 -0000
@@ -3,12 +3,10 @@
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
-V= 4.8.0
+V= 4.9.0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
-REVISION-main= 6
FULLPKGNAME-pop3= courier-pop3-${V}
-REVISION-pop3= 6
FULLPKGPATH-pop3= mail/courier-imap,-pop3
CATEGORIES= mail
@@ -30,6 +28,7 @@ WANTLIB-pop3= c courierauth courierauth
USE_GMAKE= Yes
USE_LIBTOOL= Yes
+USE_GROFF= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
@@ -61,6 +60,7 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/sbi
--with-piddir=${COURIERSTATE} \
--with-makedatprog \
--with-db=gdbm \
+ --with-certsdir=/etc/ssl/private \
--cache-file=${WRKDIR}/courier-imap.cache
CONFIGURE_ENV+= OPENSSL=/usr/sbin/openssl
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/courier-imap/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 8 Jul 2010 16:29:58 -0000 1.13
+++ distinfo 13 Apr 2011 14:29:24 -0000
@@ -1,5 +1,5 @@
-MD5 (courier-imap-4.8.0.tar.bz2) = h8UB5l6uedZntRI99q6J8g==
-RMD160 (courier-imap-4.8.0.tar.bz2) = z8C+7GiTwVXPlxLZIAAjIBaa0MU=
-SHA1 (courier-imap-4.8.0.tar.bz2) = 9ojOqHxmGBNiYizpy9RxDXUmjPw=
-SHA256 (courier-imap-4.8.0.tar.bz2) =
7HURpDmJIKBPO7YM8SCOKamlQyuu/001ak7BQhE7+/I=
-SIZE (courier-imap-4.8.0.tar.bz2) = 3362734
+MD5 (courier-imap-4.9.0.tar.bz2) = ViO5i3+1z1WV7rDBjAwoBw==
+RMD160 (courier-imap-4.9.0.tar.bz2) = gZcCEFTt8R/XTVRpBNGZC7GF8xs=
+SHA1 (courier-imap-4.9.0.tar.bz2) = aWooriDY0vXxJbyvgK3k7+Ko/tQ=
+SHA256 (courier-imap-4.9.0.tar.bz2) =
kKeZKjz/Ju+cA79Z4pw3d1GpVpX037d3UYB8DO4qWwo=
+SIZE (courier-imap-4.9.0.tar.bz2) = 3049032
Index: patches/patch-bdbobj_Makefile_in
===================================================================
RCS file: /cvs/ports/mail/courier-imap/patches/patch-bdbobj_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bdbobj_Makefile_in
--- patches/patch-bdbobj_Makefile_in 5 Oct 2010 13:41:52 -0000 1.1
+++ patches/patch-bdbobj_Makefile_in 13 Apr 2011 14:29:24 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-bdbobj_Makefile_in,v 1.1
Removing "-static" from libtool linking flags makes our libtool happy
and doesn't break the testbdb binary
---- bdbobj/Makefile.in.orig Thu Sep 23 15:56:00 2010
-+++ bdbobj/Makefile.in Thu Sep 23 15:56:23 2010
-@@ -73,7 +73,7 @@ am__objects_2 = testbdb.$(OBJEXT)
+--- 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) \
Index: patches/patch-imap_imapd-ssl_dist_in
===================================================================
RCS file: /cvs/ports/mail/courier-imap/patches/patch-imap_imapd-ssl_dist_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-imap_imapd-ssl_dist_in
--- patches/patch-imap_imapd-ssl_dist_in 28 Oct 2009 14:20:19 -0000
1.6
+++ patches/patch-imap_imapd-ssl_dist_in 13 Apr 2011 14:29:24 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.6 2009/10/28 14:20:19 giovanni Exp $
---- imap/imapd-ssl.dist.in.orig Sat Jul 12 22:17:24 2008
-+++ imap/imapd-ssl.dist.in Mon Jun 15 15:26:36 2009
+--- imap/imapd-ssl.dist.in.orig Mon Apr 4 17:02:32 2011
++++ imap/imapd-ssl.dist.in Wed Apr 13 15:53:46 2011
@@ -72,13 +72,13 @@ SSLLOGGEROPTS="-name=imapd-ssl"
#
# Whether or not to start IMAP over SSL on simap port:
@@ -16,15 +16,6 @@ $OpenBSD: patch-imap_imapd-ssl_dist_in,v
+IMAPDSTARTTLS=NO
##NAME: IMAP_TLS_REQUIRED:1
- #
-@@ -260,7 +260,7 @@ TLS_CERTS=X509
- #
- # This is an experimental feature.
-
--TLS_CERTFILE=@mydatadir@/imapd.pem
-+TLS_CERTFILE=/etc/ssl/private/imapd.pem
-
- ##NAME: TLS_TRUSTCERTS:0
#
@@ -322,8 +322,8 @@ TLS_VERIFYPEER=NONE
# problems with SSL clients. Disable SSL caching by commenting out the
Index: patches/patch-imap_imaplogin_c
===================================================================
RCS file: /cvs/ports/mail/courier-imap/patches/patch-imap_imaplogin_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-imap_imaplogin_c
--- patches/patch-imap_imaplogin_c 28 Oct 2009 14:20:19 -0000 1.2
+++ patches/patch-imap_imaplogin_c 13 Apr 2011 14:29:24 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-imap_imaplogin_c,v 1.2 2009/10/28 14:20:19 giovanni Exp $
---- imap/imaplogin.c.orig Sun Jun 29 22:18:36 2008
-+++ imap/imaplogin.c Mon Jun 15 15:25:07 2009
-@@ -235,7 +235,7 @@ int login_callback(struct authinfo *ainfo, void *dummy
+--- imap/imaplogin.c.orig Mon Apr 4 17:02:32 2011
++++ imap/imaplogin.c Wed Apr 13 15:53:46 2011
+@@ -234,7 +234,7 @@ int login_callback(struct authinfo *ainfo, void *dummy
execl(imapd, imapd,
ainfo->maildir ?
ainfo->maildir:defaultmaildir,
Index: patches/patch-imap_mkimapdcert_in
===================================================================
RCS file: patches/patch-imap_mkimapdcert_in
diff -N patches/patch-imap_mkimapdcert_in
--- patches/patch-imap_mkimapdcert_in 28 Oct 2009 14:20:19 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-$OpenBSD: patch-imap_mkimapdcert_in,v 1.7 2009/10/28 14:20:19 giovanni Exp $
---- imap/mkimapdcert.in.orig Sun Nov 4 21:49:58 2007
-+++ imap/mkimapdcert.in Mon Jun 15 15:30:20 2009
-@@ -17,42 +17,43 @@ else
- fi
-
- prefix="@prefix@"
-+SSLDIR="/etc/ssl/private"
-
--if test -f @mydatadir@/imapd.pem
-+if test -f ${SSLDIR}/imapd.pem
- then
-- echo "@mydatadir@/imapd.pem already exists."
-+ echo "${SSLDIR}/imapd.pem already exists."
- exit 1
- fi
-
- umask 077
-
- cleanup() {
-- rm -f @mydatadir@/imapd.pem
-- rm -f @mydatadir@/imapd.rand
-- rm -f @mydatadir@/imapd.key
-- rm -f @mydatadir@/imapd.cert
-+ rm -f ${SSLDIR}/imapd.pem
-+ rm -f ${SSLDIR}/imapd.rand
-+ rm -f ${SSLDIR}/imapd.key
-+ rm -f ${SSLDIR}/imapd.cert
- exit 1
- }
-
--cd @mydatadir@
-+cd ${SSLDIR}
-
- if test "@ssllib@" = "openssl"
- then
-- cp /dev/null @mydatadir@/imapd.pem
-- chmod 600 @mydatadir@/imapd.pem
-- chown @mailuser@ @mydatadir@/imapd.pem
-+ cp /dev/null ${SSLDIR}/imapd.pem
-+ chmod 600 ${SSLDIR}/imapd.pem
-+ chown @mailuser@ ${SSLDIR}/imapd.pem
-
-- dd if=@RANDOMV@ of=@mydatadir@/imapd.rand count=1 2>/dev/null
-+ dd if=@RANDOMV@ of=${SSLDIR}/imapd.rand count=1 2>/dev/null
- @OPENSSL@ req -new -x509 -days 365 -nodes \
-- -config @sysconfdir@/imapd.cnf -out @mydatadir@/imapd.pem
-keyout @mydatadir@/imapd.pem || cleanup
-- @OPENSSL@ gendh -rand @mydatadir@/imapd.rand 512
>>@mydatadir@/imapd.pem || cleanup
-- @OPENSSL@ x509 -subject -dates -fingerprint -noout -in
@mydatadir@/imapd.pem || cleanup
-- rm -f @mydatadir@/imapd.rand
-+ -config @sysconfdir@/imapd.cnf -out ${SSLDIR}/imapd.pem
-keyout ${SSLDIR}/imapd.pem || cleanup
-+ @OPENSSL@ gendh -rand ${SSLDIR}/imapd.rand 512 >>${SSLDIR}/imapd.pem ||
cleanup
-+ @OPENSSL@ x509 -subject -dates -fingerprint -noout -in
${SSLDIR}/imapd.pem || cleanup
-+ rm -f ${SSLDIR}/imapd.rand
- else
-- cp /dev/null @mydatadir@/imapd.key
-- chmod 600 @mydatadir@/imapd.key
-- cp /dev/null @mydatadir@/imapd.cert
-- chmod 600 @mydatadir@/imapd.cert
-+ cp /dev/null ${SSLDIR}/imapd.key
-+ chmod 600 ${SSLDIR}/imapd.key
-+ cp /dev/null ${SSLDIR}/imapd.cert
-+ chmod 600 ${SSLDIR}/imapd.cert
-
- @CERTTOOL@ --generate-privkey --outfile imapd.key
- @CERTTOOL@ --generate-self-signed --load-privkey imapd.key --outfile
imapd.cert --template @sysconfdir@/imapd.cnf
Index: patches/patch-imap_mkpop3dcert_in
===================================================================
RCS file: patches/patch-imap_mkpop3dcert_in
diff -N patches/patch-imap_mkpop3dcert_in
--- patches/patch-imap_mkpop3dcert_in 28 Oct 2009 14:20:19 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-$OpenBSD: patch-imap_mkpop3dcert_in,v 1.4 2009/10/28 14:20:19 giovanni Exp $
---- imap/mkpop3dcert.in.orig Sun Nov 4 21:49:58 2007
-+++ imap/mkpop3dcert.in Mon Jun 15 15:31:09 2009
-@@ -17,42 +17,43 @@ else
- fi
-
- prefix="@prefix@"
-+SSLDIR="/etc/ssl/private"
-
--if test -f @mydatadir@/pop3d.pem
-+if test -f ${SSLDIR}/pop3d.pem
- then
-- echo "@mydatadir@/pop3d.pem already exists."
-+ echo "${SSLDIR}/pop3d.pem already exists."
- exit 1
- fi
-
- umask 077
-
- cleanup() {
-- rm -f @mydatadir@/pop3d.pem
-- rm -f @mydatadir@/pop3d.rand
-- rm -f @mydatadir@/pop3d.key
-- rm -f @mydatadir@/pop3d.cert
-+ rm -f ${SSLDIR}/pop3d.pem
-+ rm -f ${SSLDIR}/pop3d.rand
-+ rm -f ${SSLDIR}/pop3d.key
-+ rm -f ${SSLDIR}/pop3d.cert
- exit 1
- }
-
--cd @mydatadir@
-+cd ${SSLDIR}
-
- if test "@ssllib@" = "openssl"
- then
-- cp /dev/null @mydatadir@/pop3d.pem
-- chmod 600 @mydatadir@/pop3d.pem
-- chown @mailuser@ @mydatadir@/pop3d.pem
-+ cp /dev/null ${SSLDIR}/pop3d.pem
-+ chmod 600 ${SSLDIR}/pop3d.pem
-+ chown @mailuser@ ${SSLDIR}/pop3d.pem
-
-- dd if=@RANDOMV@ of=@mydatadir@/pop3d.rand count=1 2>/dev/null
-+ dd if=@RANDOMV@ of=${SSLDIR}/pop3d.rand count=1 2>/dev/null
- @OPENSSL@ req -new -x509 -days 365 -nodes \
-- -config @sysconfdir@/pop3d.cnf -out @mydatadir@/pop3d.pem
-keyout @mydatadir@/pop3d.pem || cleanup
-- @OPENSSL@ gendh -rand @mydatadir@/pop3d.rand 512
>>@mydatadir@/pop3d.pem || cleanup
-- @OPENSSL@ x509 -subject -dates -fingerprint -noout -in
@mydatadir@/pop3d.pem || cleanup
-- rm -f @mydatadir@/pop3d.rand
-+ -config @sysconfdir@/pop3d.cnf -out ${SSLDIR}/pop3d.pem
-keyout ${SSLDIR}/pop3d.pem || cleanup
-+ @OPENSSL@ gendh -rand ${SSLDIR}/pop3d.rand 512 >>${SSLDIR}/pop3d.pem ||
cleanup
-+ @OPENSSL@ x509 -subject -dates -fingerprint -noout -in
${SSLDIR}/pop3d.pem || cleanup
-+ rm -f ${SSLDIR}/pop3d.rand
- else
-- cp /dev/null @mydatadir@/pop3d.key
-- chmod 600 @mydatadir@/pop3d.key
-- cp /dev/null @mydatadir@/pop3d.cert
-- chmod 600 @mydatadir@/pop3d.cert
-+ cp /dev/null ${SSLDIR}/pop3d.key
-+ chmod 600 ${SSLDIR}/pop3d.key
-+ cp /dev/null ${SSLDIR}/pop3d.cert
-+ chmod 600 ${SSLDIR}/pop3d.cert
-
- @CERTTOOL@ --generate-privkey --outfile pop3d.key
- @CERTTOOL@ --generate-self-signed --load-privkey pop3d.key --outfile
pop3d.cert --template @sysconfdir@/pop3d.cnf
Index: patches/patch-imap_pop3d-ssl_dist_in
===================================================================
RCS file: /cvs/ports/mail/courier-imap/patches/patch-imap_pop3d-ssl_dist_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-imap_pop3d-ssl_dist_in
--- patches/patch-imap_pop3d-ssl_dist_in 28 Oct 2009 14:20:19 -0000
1.6
+++ patches/patch-imap_pop3d-ssl_dist_in 13 Apr 2011 14:29:24 -0000
@@ -1,15 +1,6 @@
$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.6 2009/10/28 14:20:19 giovanni Exp $
---- imap/pop3d-ssl.dist.in.orig Sat Jul 12 22:17:25 2008
-+++ imap/pop3d-ssl.dist.in Mon Jun 15 15:31:54 2009
-@@ -248,7 +248,7 @@ TLS_CERTS=X509
- #
- # This is an experimental feature.
-
--TLS_CERTFILE=@mydatadir@/pop3d.pem
-+TLS_CERTFILE=/etc/ssl/private/pop3d.pem
-
- ##NAME: TLS_TRUSTCERTS:0
- #
+--- imap/pop3d-ssl.dist.in.orig Mon Apr 4 17:02:32 2011
++++ imap/pop3d-ssl.dist.in Wed Apr 13 15:53:46 2011
@@ -308,8 +308,8 @@ TLS_VERIFYPEER=NONE
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:
Index: patches/patch-imap_pop3login_c
===================================================================
RCS file: /cvs/ports/mail/courier-imap/patches/patch-imap_pop3login_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-imap_pop3login_c
--- patches/patch-imap_pop3login_c 28 Oct 2009 14:20:19 -0000 1.2
+++ patches/patch-imap_pop3login_c 13 Apr 2011 14:29:24 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-imap_pop3login_c,v 1.2 2009/10/28 14:20:19 giovanni Exp $
---- imap/pop3login.c.orig Sun Jun 29 22:18:36 2008
-+++ imap/pop3login.c Mon Jun 15 15:25:07 2009
-@@ -213,7 +213,7 @@ static int login_callback(struct authinfo *ainfo, void
+--- imap/pop3login.c.orig Mon Apr 4 17:02:32 2011
++++ imap/pop3login.c Wed Apr 13 15:53:46 2011
+@@ -212,7 +212,7 @@ static int login_callback(struct authinfo *ainfo, void
execl(pop3d, pop3d,
ainfo->maildir ?
ainfo->maildir:defaultmaildir,
Index: patches/patch-maildir_configure
===================================================================
RCS file: /cvs/ports/mail/courier-imap/patches/patch-maildir_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-maildir_configure
--- patches/patch-maildir_configure 21 Apr 2010 07:18:25 -0000 1.1
+++ patches/patch-maildir_configure 13 Apr 2011 14:29:24 -0000
@@ -1,15 +1,16 @@
$OpenBSD: patch-maildir_configure,v 1.1 2010/04/21 07:18:25 giovanni Exp $
---- maildir/configure.orig Sun Nov 22 15:45:17 2009
-+++ maildir/configure Tue Mar 30 11:23:32 2010
-@@ -18366,7 +18366,6 @@ if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
+--- maildir/configure.orig Mon Apr 4 17:04:53 2011
++++ maildir/configure Wed Apr 13 15:58:52 2011
+@@ -15904,7 +15904,7 @@ if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfam $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -18430,7 +18429,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = x""yes; then
++LIBS="$LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -15939,7 +15939,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = x""yes; then :
LIBFAM=-lfam
cat >>confdefs.h <<_ACEOF
@@ -18,11 +19,11 @@ $OpenBSD: patch-maildir_configure,v 1.1
_ACEOF
-@@ -18593,7 +18592,6 @@ fi
+@@ -15969,7 +15969,6 @@ fi
-echo "$LIBFAM" >maildir.libdeps
- { $as_echo "$as_me:$LINENO: checking for missing gethostname prototype" >&5
+ { $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-rfc822_rfc822_c
===================================================================
RCS file: patches/patch-rfc822_rfc822_c
diff -N patches/patch-rfc822_rfc822_c
--- patches/patch-rfc822_rfc822_c 8 Jul 2010 16:29:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-rfc822_rfc822_c,v 1.1 2010/07/08 16:29:58 giovanni Exp $
---- rfc822/rfc822.c.orig Sun Nov 22 22:22:24 2009
-+++ rfc822/rfc822.c Tue Jun 29 13:19:53 2010
-@@ -627,10 +627,12 @@ static int rfc822_print_common_nameaddr(const struct r
- p=(*decode_func)(addrbuf, chset, 1);
- free(addrbuf);
-
-+ if (!p)
-+ return -1;
-+
- if (print_braces)
- (*print_func)(' ', ptr);
-
--
- for (q=p; *q; ++q)
- if (*q != '.' && *q != '@' && strchr(RFC822_SPECIALS, *q))
- {
-@@ -640,9 +642,6 @@ static int rfc822_print_common_nameaddr(const struct r
-
- if (print_braces)
- (*print_func)('<', ptr);
--
-- if (!p)
-- return -1;
-
- for (addrbuf=p; *p; p++)
- (*print_func)(*p, ptr);
