Pullup ticket #4425 - requested by taca

mail/dovecot2-pigeonhole: keep in step with mail/dovecot2

Revisions pulled up:
- mail/dovecot2-pigeonhole/Makefile                             1.18
- mail/dovecot2-pigeonhole/PLIST                                1.6
- mail/dovecot2-pigeonhole/distinfo                             1.12

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed May 14 06:10:36 UTC 2014

   Modified Files:
   	pkgsrc/mail/dovecot2-pigeonhole: Makefile PLIST distinfo

   Log Message:
   Changes 0.4.3:

   * Editheader extension: Made control characters allowed for editheader,
     except NUL. Before, this would cause a runtime error.
   + Upgraded Dovecot-specific Sieve "vnd.dovecot.duplicate" extension to
     match the new draft "duplicate" extension.
   - Fixed sieve_result_global_log_error to log only as i_info in
     administrator log (syslog) if executed from multiscript context.
   - Sieve redirect extension: Adjusted loop detection to show leniency to
     resent messages.
   - Sieve include extension: Fixed problem with handling of duplicate
     includes with different parameters :once or :optional.
   - Sieve spamtest/virustest extensions: Tests were erroneously performed
     against the original message. When used together with extprograms
     filter to add the spam headers, the changes were not being used by
     the spamtest and virustest extensions.
   - Deprecated Sieve notify extension: Fixed segfault problems in message
     string substitution.
   - ManageSieve: Fixed active link verification to handle redundant path
     slashes correctly.
   - Sieve vacation extension:
     - Fixed interaction of sieve_vacation_dont_check_recipient with
       sieve_vacation_send_from_recipient setting.
     - Fixed log message for discarded response.
   - Sieve extprograms plugin:
     - Forgot to disable the alarm() timeouts set for script execution.
     - Fixed fd leak and handling of output shutdown.
     - Fixed 'Bad filedescriptor' error occurring when disconnecting
       script client.
     - Made sure that programs are never forked with root privileges.

3 files changed, 10 insertions, 9 deletions

diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index 26f4d900e95..b51a48ba85a 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2014/02/12 23:18:07 tron Exp $
+# $NetBSD: Makefile,v 1.17.2.1 2014/05/28 19:39:04 tron Exp $
 
-DISTNAME=	dovecot-2.2-pigeonhole-0.4.2
+DISTNAME=	dovecot-2.2-pigeonhole-0.4.3
 PKGNAME=	${DISTNAME:S/-2.2-/-/}
-PKGREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	http://www.rename-it.nl/dovecot/2.2/
+MASTER_SITES=	http://pigeonhole.dovecot.org/releases/2.2/
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.dovecot.org/
diff --git a/mail/dovecot2-pigeonhole/PLIST b/mail/dovecot2-pigeonhole/PLIST
index 57a1e65d57b..dc8cbfd0ce3 100644
--- a/mail/dovecot2-pigeonhole/PLIST
+++ b/mail/dovecot2-pigeonhole/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2013/05/14 15:49:52 taca Exp $
+@comment $NetBSD: PLIST,v 1.5.8.1 2014/05/28 19:39:04 tron Exp $
 bin/sieve-dump
 bin/sieve-filter
 bin/sieve-test
 bin/sievec
 include/dovecot/sieve/edit-mail.h
 include/dovecot/sieve/pigeonhole-config.h
+include/dovecot/sieve/program-client-private.h
+include/dovecot/sieve/program-client.h
 include/dovecot/sieve/rfc2822.h
 include/dovecot/sieve/sieve-actions.h
 include/dovecot/sieve/sieve-address-parts.h
diff --git a/mail/dovecot2-pigeonhole/distinfo b/mail/dovecot2-pigeonhole/distinfo
index 316ade651b8..c9070912d49 100644
--- a/mail/dovecot2-pigeonhole/distinfo
+++ b/mail/dovecot2-pigeonhole/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2013/10/08 13:56:02 adam Exp $
+$NetBSD: distinfo,v 1.11.4.1 2014/05/28 19:39:04 tron Exp $
 
-SHA1 (dovecot-2.2-pigeonhole-0.4.2.tar.gz) = 80491d872838d27a6f2775561ba9163150c23a1c
-RMD160 (dovecot-2.2-pigeonhole-0.4.2.tar.gz) = 3e7b80e222ed59f6d2fdb2a581373b09758779ea
-Size (dovecot-2.2-pigeonhole-0.4.2.tar.gz) = 1159311 bytes
+SHA1 (dovecot-2.2-pigeonhole-0.4.3.tar.gz) = 6eee6958b755721432e782b8f5c9bd4f5b01ab95
+RMD160 (dovecot-2.2-pigeonhole-0.4.3.tar.gz) = f0cfd1e4ea7c85be6744511e352a06012857d084
+Size (dovecot-2.2-pigeonhole-0.4.3.tar.gz) = 1184029 bytes
 SHA1 (patch-aa) = 264399e166b5fece22bacd47b043c59f8f0f0a29