From bbfbb389f27f34fed437a080553b5197d0f2e6c7 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 13 May 2011 07:34:48 +0000 Subject: Changes 1.2.17: * Fixed potential crashes and other problems when parsing header names that contained NUL characters. * IMAP: Fixed a memory leak with ESEARCH command handling * Quota warnings could have been executed at incorrect times with some configs. --- mail/dovecot/Makefile | 17 +++++++---------- mail/dovecot/PLIST | 3 +-- mail/dovecot/distinfo | 17 ++++------------- mail/dovecot/options.mk | 4 ++-- 4 files changed, 14 insertions(+), 27 deletions(-) (limited to 'mail') diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 52dc44708a7..1ae474b3eb7 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.154 2011/04/22 14:40:43 obache Exp $ +# $NetBSD: Makefile,v 1.155 2011/05/13 07:34:48 adam Exp $ DOVECOT_VERSION= 1.2 -DOVECOT_SUBVERSION= .16 +DOVECOT_SUBVERSION= .17 SIEVE_VERSION= 0.1.18 MANAGESIEVE_VERSION= 0.11.12 DISTNAME= dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION} -PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.dovecot.org/releases/${DOVECOT_VERSION}/ DOVECOT_SIEVE_SITES= http://www.rename-it.nl/dovecot/${DOVECOT_VERSION}/ @@ -23,14 +22,12 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir USE_LIBTOOL= yes +USE_TOOLS+= pkg-config rpcgen GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config -USE_TOOLS+= rpcgen - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --enable-header-install CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-ssldir=${SSLDIR} -CONFIGURE_ARGS+= --enable-header-install .include "../../mk/bsd.prefs.mk" .include "options.mk" @@ -46,8 +43,8 @@ PKG_USERS_VARS+= DOVECOT_USER PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user -EGDIR= ${PREFIX}/share/examples/dovecot -CONF_FILES= ${EGDIR}/dovecot-example.conf ${PKG_SYSCONFDIR}/dovecot.conf +EGDIR= ${PREFIX}/share/examples/dovecot +CONF_FILES= ${EGDIR}/dovecot-example.conf ${PKG_SYSCONFDIR}/dovecot.conf INSTALLATION_DIRS= libexec/dovecot sbin share/doc/dovecot \ share/examples/dovecot diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST index 2732ce6e097..34cd4df2da3 100644 --- a/mail/dovecot/PLIST +++ b/mail/dovecot/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.28 2010/07/25 22:17:20 ghen Exp $ +@comment $NetBSD: PLIST,v 1.29 2011/05/13 07:34:48 adam Exp $ include/dovecot/config.h include/dovecot/src/auth/auth-cache.h include/dovecot/src/auth/auth-client-connection.h @@ -507,7 +507,6 @@ share/doc/dovecot/wiki/UserDatabase.Prefetch.txt share/doc/dovecot/wiki/UserDatabase.Static.txt share/doc/dovecot/wiki/UserDatabase.txt share/doc/dovecot/wiki/UserIds.txt -share/doc/dovecot/wiki/VarMailDotLock.txt share/doc/dovecot/wiki/Variables.txt share/doc/dovecot/wiki/VirtualUsers.Home.txt share/doc/dovecot/wiki/VirtualUsers.txt diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index 114250ad48f..b7c279dce70 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,17 +1,8 @@ -$NetBSD: distinfo,v 1.115 2010/11/20 15:57:11 ghen Exp $ +$NetBSD: distinfo,v 1.116 2011/05/13 07:34:48 adam Exp $ -SHA1 (dovecot-1.2-managesieve-0.11.12.tar.gz) = c632c74bfc5e0c0c0a00c1445a65cb012423ceba -RMD160 (dovecot-1.2-managesieve-0.11.12.tar.gz) = f91a1fd059cebcb3c934192f1db57eb75ea4baa6 -Size (dovecot-1.2-managesieve-0.11.12.tar.gz) = 406261 bytes -SHA1 (dovecot-1.2-sieve-0.1.18.tar.gz) = e661a6ab79b2987dedec1ed84cbd957755882ade -RMD160 (dovecot-1.2-sieve-0.1.18.tar.gz) = f61b1ec03d861b964666a374a8c42a7b98c1fba1 -Size (dovecot-1.2-sieve-0.1.18.tar.gz) = 1052057 bytes -SHA1 (dovecot-1.2.16-managesieve-0.11.12.diff.gz) = 54000390e45d0d3978158322ab6377f79cd87fa0 -RMD160 (dovecot-1.2.16-managesieve-0.11.12.diff.gz) = 58369056e8f0f094fd28adf64d4de4dada24a955 -Size (dovecot-1.2.16-managesieve-0.11.12.diff.gz) = 6459 bytes -SHA1 (dovecot-1.2.16.tar.gz) = 84246be1c285de935bbe7649b1920efea91b12d6 -RMD160 (dovecot-1.2.16.tar.gz) = 50fbaec8a7a258be17912ea962cafaa51b4e8bc7 -Size (dovecot-1.2.16.tar.gz) = 2949818 bytes +SHA1 (dovecot-1.2.17.tar.gz) = 457b16791a15e739c6bc8b02bc9c78f9ad794e39 +RMD160 (dovecot-1.2.17.tar.gz) = 59f619dba2aadef3cccd6ceb045a2e75a11700a2 +Size (dovecot-1.2.17.tar.gz) = 2983431 bytes SHA1 (patch-aa) = 447e46268a93201b3ef22491ff0968752978d020 SHA1 (patch-ab) = e5b5d72f0553da42d14ee05a9ed0faff8a6c7075 SHA1 (patch-ac) = 5912392abb79df8e78de6f710c2a83264ee58fe7 diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk index 41e1b6f31e2..4ca120aa3ab 100644 --- a/mail/dovecot/options.mk +++ b/mail/dovecot/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.27 2010/07/23 07:44:51 ghen Exp $ +# $NetBSD: options.mk,v 1.28 2011/05/13 07:34:48 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot PKG_SUPPORTED_OPTIONS= dovecot-sieve dovecot-managesieve gssapi @@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --without-gssapi # Default so we can use += below DISTFILES= ${DEFAULT_DISTFILES} PLIST_SRC= ${PLIST_SRC_DFLT:Q} -INSTALL_DIRS= ${WRKSRC} +INSTALL_DIRS= . # sieve (must be built after dovecot, before managesieve) DISTFILES+= dovecot-${DOVECOT_VERSION}-sieve-${SIEVE_VERSION}.tar.gz SITES.dovecot-${DOVECOT_VERSION}-sieve-${SIEVE_VERSION}.tar.gz=\ -- cgit v1.2.3