Update to 4.9.1, utf-8 support completely rewritten and some bug fixes.
This commit is contained in:
giovanni
parent
37d362b0dd
commit
ce2fea2aed
@ -1,14 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.70 2011/03/20 13:06:23 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.71 2011/05/09 09:30:26 giovanni Exp $
|
||||
|
||||
COMMENT-main= imap server for maildir format mailboxes
|
||||
COMMENT-pop3= pop3 server for maildir format mailboxes
|
||||
|
||||
V= 4.8.0
|
||||
V= 4.9.1
|
||||
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 courierauthsasl idn ${MODGETTEXT_WANTLIB}
|
||||
|
||||
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}/sbin \
|
||||
--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
|
||||
|
||||
@ -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.1.tar.bz2) = eAkp5QnE6RmdXvxo2RWLoQ==
|
||||
RMD160 (courier-imap-4.9.1.tar.bz2) = opaLJn3Y3byuC484Tv965kTIJ98=
|
||||
SHA1 (courier-imap-4.9.1.tar.bz2) = g4ILd0XR6520L1+05BGEySksigs=
|
||||
SHA256 (courier-imap-4.9.1.tar.bz2) = Hh2EjRovrKjzaswDES0QIB6zNvAti0YPZFMagzV7X8Q=
|
||||
SIZE (courier-imap-4.9.1.tar.bz2) = 3049831
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-bdbobj_Makefile_in,v 1.1 2010/10/05 13:41:52 dcoppa Exp $
|
||||
$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 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) \
|
||||
|
||||
@ -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
|
||||
$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.7 2011/05/09 09:30:26 giovanni Exp $
|
||||
--- 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:
|
||||
@ -17,15 +17,6 @@ $OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.6 2009/10/28 14:20:19 giovanni Exp $
|
||||
|
||||
##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
|
||||
# following settings:
|
||||
|
||||
@ -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
|
||||
$OpenBSD: patch-imap_imaplogin_c,v 1.3 2011/05/09 09:30:26 giovanni Exp $
|
||||
--- 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,
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
@ -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
|
||||
#
|
||||
$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.7 2011/05/09 09:30:26 giovanni Exp $
|
||||
--- 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:
|
||||
|
||||
@ -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
|
||||
$OpenBSD: patch-imap_pop3login_c,v 1.3 2011/05/09 09:30:26 giovanni Exp $
|
||||
--- 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,
|
||||
|
||||
@ -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
|
||||
$OpenBSD: patch-maildir_configure,v 1.2 2011/05/09 09:30:26 giovanni Exp $
|
||||
--- 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 2010/04/21 07:18:25 giovanni Exp $
|
||||
_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; }
|
||||
|
||||
@ -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);
|
||||
Loading…
Reference in New Issue
Block a user