Hi,
as usual a bunch of updates to courier-* stuff, some bugs fixed and some
patches committed upstream.
courier-unicode library has been renamed from libunicode.so to
libcourier-unicode.so.
Ok ? Comments ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile 28 Oct 2014 09:19:29 -0000 1.49
+++ Makefile 7 Jul 2015 18:01:27 -0000
@@ -6,9 +6,7 @@ COMMENT-mysql= mysql authentication mod
COMMENT-pgsql= pgsql authentication module for courier-authLib
COMMENT-userdb= userdb authentication module for courier-authLib
-DISTNAME= courier-authlib-0.66.1
-REVISION= 1
-REVISION-mysql= 2
+DISTNAME= courier-authlib-0.66.3
PKGNAME-main= ${DISTNAME}
PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}
PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/mail/courier-authlib/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 11 Apr 2014 09:35:04 -0000 1.7
+++ distinfo 7 Jul 2015 18:01:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (courier-authlib-0.66.1.tar.bz2) = j4kWb1fI5Z9EX+ATXakrlfHEQXiW0B7aXi6U2P+Hj+g=
-SIZE (courier-authlib-0.66.1.tar.bz2) = 2299965
+SHA256 (courier-authlib-0.66.3.tar.bz2) = AzQCqG4zSZnq8Xwbci1vbMGWH8y10u6INC39bF1TSWE=
+SIZE (courier-authlib-0.66.3.tar.bz2) = 2085083
Index: patches/patch-libs_liblock_locktest_c
===================================================================
RCS file: patches/patch-libs_liblock_locktest_c
diff -N patches/patch-libs_liblock_locktest_c
--- patches/patch-libs_liblock_locktest_c 11 Apr 2014 09:35:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,82 +0,0 @@
-$OpenBSD: patch-libs_liblock_locktest_c,v 1.1 2014/04/11 09:35:04 giovanni Exp $
---- libs/liblock/locktest.c.orig Sun Aug 25 20:50:44 2013
-+++ libs/liblock/locktest.c Fri Oct 4 14:58:16 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-authlib.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: pkg/PLIST-main
===================================================================
RCS file: /var/cvs/ports/mail/courier-authlib/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-main
--- pkg/PLIST-main 25 Jan 2014 13:12:12 -0000 1.7
+++ pkg/PLIST-main 8 Jul 2015 22:51:11 -0000
@@ -39,10 +39,12 @@ libexec/courier-authlib/sysconftool
@man man/man3/auth_getoption.3
@man man/man3/auth_getuserinfo.3
@man man/man3/auth_login.3
+@man man/man3/auth_mkhomedir.3
@man man/man3/auth_passwd.3
@man man/man3/auth_sasl.3
@man man/man3/auth_sasl_ex.3
@man man/man3/authlib.3
+@man man/man8/pw2userdb.8
sbin/authdaemond
@bin sbin/authenumerate
@bin sbin/authpasswd
Index: pkg/PLIST-userdb
===================================================================
RCS file: /var/cvs/ports/mail/courier-authlib/pkg/PLIST-userdb,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-userdb
--- pkg/PLIST-userdb 11 Apr 2014 09:35:04 -0000 1.3
+++ pkg/PLIST-userdb 8 Jul 2015 22:51:49 -0000
@@ -9,4 +9,5 @@ sbin/makeuserdb
sbin/pw2userdb
sbin/userdb
sbin/userdb-test-cram-md5
+@bin libexec/courier-authlib/makedatprog
@bin sbin/userdbpw
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.96
diff -u -p -r1.96 Makefile
--- Makefile 28 Apr 2015 07:20:02 -0000 1.96
+++ Makefile 8 Jul 2015 23:00:59 -0000
@@ -3,7 +3,7 @@
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
-V= 4.16.0
+V= 4.16.2
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-pop3= courier-pop3-${V}
@@ -89,11 +89,11 @@ CONFIGURE_ARGS+= --disable-workarounds-f
MULTI_PACKAGES= -main -pop3
LIB_DEPENDS-main= ${LIB_DEPENDS} \
- mail/courier-unicode \
+ mail/courier-unicode>=1.3 \
databases/gdbm
RUN_DEPENDS-pop3= mail/courier-imap,-main
-WANTLIB-main= ${WANTLIB} ssl crypto unicode
+WANTLIB-main= ${WANTLIB} ssl crypto courier-unicode
MODULES= devel/gettext
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo 28 Apr 2015 07:20:02 -0000 1.20
+++ distinfo 7 Jul 2015 18:02:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (courier-imap-4.16.0.tar.bz2) = IO5j+7Xu9nHfzO7PPtPrSGY8/zvLYH7MkE0LxPjAtLI=
-SIZE (courier-imap-4.16.0.tar.bz2) = 3021228
+SHA256 (courier-imap-4.16.2.tar.bz2) = O+JEs8TT1cXjPvs35M9xKug8viHkPDFyXg2ZarSsw4c=
+SIZE (courier-imap-4.16.2.tar.bz2) = 3028445
Index: patches/patch-libs_imap_mkdhparams_in
===================================================================
RCS file: patches/patch-libs_imap_mkdhparams_in
diff -N patches/patch-libs_imap_mkdhparams_in
--- patches/patch-libs_imap_mkdhparams_in 28 Apr 2015 07:20:02 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-libs_imap_mkdhparams_in,v 1.1 2015/04/28 07:20:02 giovanni Exp $
---- libs/imap/mkdhparams.in.orig Sat Oct 11 17:50:22 2014
-+++ libs/imap/mkdhparams.in Sun Apr 26 01:12:12 2015
-@@ -7,6 +7,12 @@
-
- # Override from the environment
-
-+@OPENSSL@ version | grep LibreSSL 1>/dev/null
-+if test $? = 0
-+then
-+ LIBRESSL=1
-+fi
-+
- if test "$TLS_DHPARAMS" = ""
- then
- TLS_DHPARAMS="@certsdir@/dhparams.pem"
-@@ -36,9 +42,14 @@ then
- BITS=2048
- fi
-
-- dd if=@RANDOMV@ of=$TLS_DHPARAMS.rand.tmp count=1 2>/dev/null
-- @OPENSSL@ dhparam -rand $TLS_DHPARAMS.rand.tmp -outform PEM $BITS >$TLS_DHPARAMS.tmp
-- rm -f $TLS_DHPARAMS.rand.tmp
-+ if test "$LIBRESSL" = 0
-+ then
-+ dd if=@RANDOMV@ of=$TLS_DHPARAMS.rand.tmp count=1 2>/dev/null
-+ @OPENSSL@ dhparam -rand $TLS_DHPARAMS.rand.tmp -outform PEM $BITS >$TLS_DHPARAMS.tmp
-+ rm -f $TLS_DHPARAMS.rand.tmp
-+ else
-+ @OPENSSL@ dhparam -outform PEM $BITS >$TLS_DHPARAMS.tmp
-+ fi
- mv -f $TLS_DHPARAMS.tmp $TLS_DHPARAMS
- else
- if test "$BITS" = ""
Index: patches/patch-libs_maildir_maildircache_c
===================================================================
RCS file: patches/patch-libs_maildir_maildircache_c
diff -N patches/patch-libs_maildir_maildircache_c
--- patches/patch-libs_maildir_maildircache_c 28 Apr 2015 07:20:02 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-libs_maildir_maildircache_c,v 1.1 2015/04/28 07:20:02 giovanni Exp $
-fix a use-after-free
-
---- libs/maildir/maildircache.c.orig Thu Apr 23 23:58:45 2015
-+++ libs/maildir/maildircache.c Fri Apr 24 00:00:09 2015
-@@ -249,17 +249,18 @@ FILE *fp;
- exit(1);
- }
- }
-- free(f);
-
- if ( fwrite(data, strlen(data), 1, fp) != 1 || fflush(fp)
- || ferror(fp))
- {
- fclose(fp);
- unlink(f); /* Problems */
-+ free(f);
- fprintf(stderr, "CRIT: maildircache: Cache create failure - write error.\n");
- exit(1);
- }
- else fclose(fp);
-+ free(f);
- exit(0);
- }
-
Index: pkg/PLIST-main
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/pkg/PLIST-main,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-main
--- pkg/PLIST-main 28 Apr 2015 07:20:02 -0000 1.11
+++ pkg/PLIST-main 8 Jul 2015 22:59:47 -0000
@@ -12,6 +12,8 @@
@bin bin/maildiracl
@bin bin/maildirkw
@bin bin/maildirmake
+bin/makedat
+bin/makeimapaccess
@bin libexec/couriertcpd
libexec/imapd-ssl.rc
libexec/imapd.rc
@@ -22,6 +24,7 @@ libexec/imapd.rc
@man man/man1/maildirmake.1
@man man/man8/deliverquota.8
@man man/man8/imapd.8
+@man man/man8/makeimapaccess.8
@man man/man8/mkdhparams.8
@man man/man8/mkimapdcert.8
@bin sbin/imaplogin
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/courier-unicode/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 28 Apr 2015 07:06:37 -0000 1.1.1.1
+++ Makefile 7 Jul 2015 18:06:34 -0000
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2015/04/28 07:06:37 giovanni Exp $
-SHARED_LIBS += unicode 0.0 # 1.0
+SHARED_LIBS += courier-unicode 0.0 # 2.0
COMMENT = courier unicode library
-DISTNAME = courier-unicode-1.1
+DISTNAME = courier-unicode-1.3
CATEGORIES = mail devel
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/mail/courier-unicode/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 28 Apr 2015 07:06:37 -0000 1.1.1.1
+++ distinfo 7 Jul 2015 18:00:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (courier-unicode-1.1.tar.bz2) = oQ5h0g878lvr3sSV3qVCWJSPMzop8pp/FVox+b+z9Ww=
-SIZE (courier-unicode-1.1.tar.bz2) = 372684
+SHA256 (courier-unicode-1.3.tar.bz2) = gGfS/sYhrxpGO2kLMlxwCSD5jhJxBSNUq/1MjKgvfmg=
+SIZE (courier-unicode-1.3.tar.bz2) = 394011
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/mail/courier-unicode/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 28 Apr 2015 07:06:37 -0000 1.1.1.1
+++ pkg/PLIST 7 Jul 2015 18:03:43 -0000
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/04/28 07:06:37 giovanni Exp $
-include/unicode.h
-lib/libunicode.a
-lib/libunicode.la
-@lib lib/libunicode.so.${LIBunicode_VERSION}
+include/courier-unicode.h
+lib/libcourier-unicode.a
+lib/libcourier-unicode.la
+@lib lib/libcourier-unicode.so.${LIBcourier-unicode_VERSION}
@man man/man3/unicode::iconvert::convert.3
@man man/man3/unicode::iconvert::convert_tocase.3
@man man/man3/unicode::iconvert::fromu.3
@@ -47,6 +47,7 @@ lib/libunicode.la
@man man/man3/unicode_lbc_next_cnt.3
@man man/man3/unicode_lbc_set_opts.3
@man man/man3/unicode_lc.3
+@man man/man3/unicode_script.3
@man man/man3/unicode_tc.3
@man man/man3/unicode_u_ucs2_native.3
@man man/man3/unicode_u_ucs4_native.3
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/maildrop/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile 28 Apr 2015 07:24:43 -0000 1.52
+++ Makefile 8 Jul 2015 23:08:42 -0000
@@ -3,7 +3,7 @@
COMMENT-main= mail delivery agent with filtering abilities
COMMENT-utils= quota tools for the Courier mail suite
-V= 2.8.1
+V= 2.8.3
DISTNAME= maildrop-$V
PKGNAME-main= maildrop-$V
FULLPKGNAME-utils= courier-utils-$V
@@ -91,9 +91,9 @@ CONFIGURE_ARGS+= --with-trashquota
MODULES= devel/gettext
LIB_DEPENDS= devel/libidn \
- mail/courier-unicode
+ mail/courier-unicode>=1.3
-WANTLIB = c idn unicode
+WANTLIB = c idn courier-unicode
WANTLIB-main= ${WANTLIB} gdbm m stdc++ gdbm>=3 pcre>=1 courierauth
LIB_DEPENDS-main= ${LIB_DEPENDS} \
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/mail/maildrop/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 28 Apr 2015 07:24:43 -0000 1.17
+++ distinfo 7 Jul 2015 17:54:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (maildrop-2.8.1.tar.bz2) = 4dvcg8qSxhSwX+6oN9uubSdeEbmjVyj2jC1LgEIVO2Q=
-SIZE (maildrop-2.8.1.tar.bz2) = 1989926
+SHA256 (maildrop-2.8.3.tar.bz2) = WCRczXWTgnYcTNvq7703Yi4B8cSOcSUbBuoIWokM5sk=
+SIZE (maildrop-2.8.3.tar.bz2) = 1992695
Index: patches/patch-libs_maildir_maildircache_c
===================================================================
RCS file: patches/patch-libs_maildir_maildircache_c
diff -N patches/patch-libs_maildir_maildircache_c
--- patches/patch-libs_maildir_maildircache_c 28 Apr 2015 07:24:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-libs_maildir_maildircache_c,v 1.1 2015/04/28 07:24:43 giovanni Exp $
-fix a use-after-free
-
---- libs/maildir/maildircache.c.orig Thu Apr 23 23:58:45 2015
-+++ libs/maildir/maildircache.c Fri Apr 24 00:00:09 2015
-@@ -249,17 +249,18 @@ FILE *fp;
- exit(1);
- }
- }
-- free(f);
-
- if ( fwrite(data, strlen(data), 1, fp) != 1 || fflush(fp)
- || ferror(fp))
- {
- fclose(fp);
- unlink(f); /* Problems */
-+ free(f);
- fprintf(stderr, "CRIT: maildircache: Cache create failure - write error.\n");
- exit(1);
- }
- else fclose(fp);
-+ free(f);
- exit(0);
- }
-
