Update imapfilter to 2.5.5

Changes since 2.0.6:

IMAPFilter 2.5.5 - 8 Jun 2013
  - Work-around for some servers that send an unexpected APPEND response.
  - The serial number of the certificates is taken into account, because some
    servers send different certificates with the same subject and issuer.
  - Details of the stored certificates are written to the certificates file, in
    order to make it easier to distinguish each of them.
  - Support for TLS versions 1.1 and 1.2 for secure connections.

IMAPFilter 2.5.4 - 9 Apr 2013
  - Some server responses are now parsed less stricly.
  - More detailed information is now printed when there's an error.
  - Bug fix; various corrections in the recovery mechanism.

IMAPFilter 2.5.3 - 22 Jul 2012
  - New implementation for international mailbox names.
  - Bug fix; wrong variable name in one of the examples on extending.
  - Bug fix; an OpenSSL compilation warning.

IMAPFilter 2.5.2 - 29 Feb 2012
  - Persistent errors or connection failures are now ignored when running in
    daemon mode, and a reconnection is attempted during the next loop iteration.
  - Bug fix; problems with failure handling during login/logout.

IMAPFilter 2.5.1 - 27 Feb 2012
  - Support for recovery of a session after a BYE response is received.
  - Option to control in which cases a terminated session will be restored.
  - Bug fix; a BYE response could sometimes get incorrectly ignored.

IMAPFilter 2.5 - 23 Feb 2012
  - Support for recovery of a session when a network failure is encountered,
    and other robustness improvements.
  - Informational messages are printed also for the fetch and append methods.
  - Lua 5.2 compatibility, while the codebase can still be compiled with
    version 5.1.
  - The OpenSSL library is now a mandatory build requirement.
  - Bug fix; unrecoverable login failures did not result in aborting of the
    execution of the configuration.
  - Bug fix; when messages were appended to a mailbox that did not exist, it
    failed to create the mailbox and then retry the appending.
  - Bug fix; misleading errors were printed on some SSL failures.
  - Bug fix; protected call of the commands to execute in the daemon function
    could hide important failures.
  - Bug fix; the man page had an incorrect description of the -d option.
  * Support for the old deprecated 1.x configuration format has been removed,
    and the current 2.x format can only be executed from now on.

IMAPFilter 2.4.2 - 19 Jan 2012
  - Bug fix; some ASCII characters in mailbox names were incorrectly converted
    to UTF-7.

IMAPFilter 2.4.1 - 8 Dec 2011
  - Bug fix; become_daemon() failure.

IMAPFilter 2.4 - 6 Dec 2011
  - Support for non-ASCII mailbox names.
  - New environment variable to set the configuration directory.
  - Bug fix; parsing of some server responses was broken since the previous
    release.
  - Bug fix; the match_field() method matched on the whole header field,
    instead of only the header field body.
  - Bug fix; debug file check caused printing of a misleading error message.
  - Bug fix; typo error in a configuration man page example.

IMAPFilter 2.3 - 6 Aug 2011
  - Support for appending/uploading messages to mailboxes.
  - Debug file option now takes filename argument.
  - New simplified configuration and building procedure.
  - Bug fix; in some cases a mailbox was incorrectly assumed selected.
  - Bug fix; in some cases server capabilities needed update after login.
  - Bug fix; timeout problem with CRAM-MD5 authentication.
  - Bug fix; some servers send non-ASCII characters in their responses.

IMAPFilter 2.2.3 - 6 Mar 2011
  - Project moved to GitHub.
  - Changed file and directory structure.
  - The next UID is returned as an additional return value of check_status().
  - All processing methods now return a boolean based on their success.
  - Bug fix; a lost connection is now handled better by trying to reconnect.
  - Bug fix; in some cases in IDLE a message had arrived but was ignored.
  - Bug fix; in some servers the initial IDLE reply wasn't handled correctly.
  - Bug fix; typo errors in the documentation.

IMAPFilter 2.2.2 - 23 Jan 2010
  - Bug fix; a couple of errors in the extending examples file.

IMAPFilter 2.2.1 - 20 Jan 2010
  - A global option for the IDLE refreshing interval was added.
  - Bug fix; more detailed reporting when SSL socket errors occur.

IMAPFilter 2.2 - 30 Dec 2009
  - Support for combining searching methods in multiple mailboxes at the same
    or different accounts and processing of the results in bulk.
  - Support for meta-searching that allows searching on the previous searching
    results.
  - The processing and fetching methods were enhanced to reflect the new
    changes and the documentation was updated.
  - Global options for the message cache and the certificates were added.
  - Bug fix; questions for certificates are not asked while in daemon mode, but
    instead an error is printed.
  * A different format is used for the returned structures of the searching
    methods, due to the introduction of multiple mailbox searching and
    meta-searching, and thus any configuration files that rely on them should
    be updated. Consequently, the processing and fetching methods have been
    also enhanced and the relevant documentation updated, and while these
    changes are backwards compatible, an update of the configuration file is
    still recommended.

IMAPFilter 2.1.2 - 3 Dec 2009
  - Bug fix; cache for message parts didn't work correctly.
  - Bug fix; documentation error.

IMAPFilter 2.1.1 - 24 Nov 2009
  - Bug fix; global option timeout and enter_idle() didn't play well together.

IMAPFilter 2.1 - 23 Nov 2009
  - Support for the IMAP IDLE extension (RFC 2177) through the enter_idle()
    method.
  - Support for fetching of a message's body structure through the
    fetch_structure() method, and of a message's specific body part through the
    fetch_parts() method.
  - Addition of a global option that controls the character set used for all
    the searching methods.
  - Bug fix; fetching of non-existent messages.
  - Bug fix; no trailing end-of-line characters in the results of
    fetch_fields().

IMAPFilter 2.0.11 - 20 Sep 2009
  - Bug fix; fetching of messages with empty body.
  - Workaround for problematic IMAP server sending non-compliant mailbox status
    information.

IMAPFilter 2.0.10 - 16 Feb 2008
  - Bug fix; failed a great number (tens of thousands) of commands were
    exchanged with an IMAP server.
  - Bug fix; failed to fetch the body of some messages in some extremely rare
    occasions.
  - Bug fix; the description for the contain_header() method was clarified.

IMAPFilter 2.0.9 - 26 Dec 2007
  - Bug fix; the match_*() methods failed to match messages.
  - Bug fix; the match_*() methods failed with an error when no messages
    matched.
  - Bug fix; note added in the documentation about the need to use double
    backslashes inside of regular expression patterns.

IMAPFilter 2.0.8 - 23 Dec 2007
  - Bug fix; on some platforms it is necessary to link against the math library.

IMAPFilter 2.0.7 - 22 Dec 2007
  - Bug fix; the match_*() methods failed with an error message.

4 files changed, 47 insertions, 88 deletions

diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index a905939b02e..059530afe1d 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.35 2013/07/04 21:27:57 adam Exp $
+# $NetBSD: Makefile,v 1.36 2013/07/19 13:58:56 degroote Exp $
 
-DISTNAME=		imapfilter-2.0.6
-PKGREVISION=		6
+DISTNAME= 		v${VERSION}
+PKGNAME=		imapfilter-${VERSION}
+VERSION=		2.5.5
 CATEGORIES=		mail
-MASTER_SITES=		http://imapfilter.hellug.gr/source/
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=	http://github.com/lefcha/imapfilter/archive/
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://imapfilter.hellug.gr/
@@ -12,11 +13,13 @@ COMMENT=		Mail filtering utility for the IMAP
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
+WRKSRC=     ${WRKDIR}/imapfilter-${VERSION}
+
 INSTALLATION_DIRS=	share/examples/imapfilter
 
 post-install:
-.for f in sample.config.lua sample.extend.lua
-	${INSTALL_DATA} ${WRKSRC}/${f} \
+.for f in config.lua extend.lua
+	${INSTALL_DATA} ${WRKSRC}/samples/${f} \
 		${DESTDIR}${PREFIX}/share/examples/imapfilter
 .endfor
 
diff --git a/mail/imapfilter/PLIST b/mail/imapfilter/PLIST
index 7513864a745..b4b01366d0e 100644
--- a/mail/imapfilter/PLIST
+++ b/mail/imapfilter/PLIST
@@ -1,13 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:04:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/07/19 13:58:56 degroote Exp $
 bin/imapfilter
 man/man1/imapfilter.1
 man/man5/imapfilter_config.5
-share/examples/imapfilter/sample.config.lua
-share/examples/imapfilter/sample.extend.lua
+share/examples/imapfilter/config.lua
+share/examples/imapfilter/extend.lua
 share/imapfilter/account.lua
 share/imapfilter/auxiliary.lua
 share/imapfilter/common.lua
-share/imapfilter/deprecated.lua
 share/imapfilter/mailbox.lua
 share/imapfilter/message.lua
 share/imapfilter/options.lua
diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo
index 38c8f354446..89f6139747d 100644
--- a/mail/imapfilter/distinfo
+++ b/mail/imapfilter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2010/02/04 02:28:33 joerg Exp $
+$NetBSD: distinfo,v 1.20 2013/07/19 13:58:56 degroote Exp $
 
-SHA1 (imapfilter-2.0.6.tar.bz2) = 93ce31079f0a350b5b4bbf824fdf9c1d00653ec7
-RMD160 (imapfilter-2.0.6.tar.bz2) = 1ae1e9ac16119d85f64594669b9aa1e918cba16b
-Size (imapfilter-2.0.6.tar.bz2) = 38536 bytes
-SHA1 (patch-aa) = 7a8ba5f66a3e97a533b4d4b09d2021d638ccf28f
+SHA1 (v2.5.5.tar.gz) = 94853df9b0e779b8695a4b4a21d1d0d783ad4324
+RMD160 (v2.5.5.tar.gz) = 944a66cc4cfc327a0cfc5d4354604f2d9b42bbd8
+Size (v2.5.5.tar.gz) = 53078 bytes
+SHA1 (patch-aa) = 78f7bfc3bc15669db7ef437710a65cdd4c49daa9
diff --git a/mail/imapfilter/patches/patch-aa b/mail/imapfilter/patches/patch-aa
index aab4c4f3c6d..466fd28ac5b 100644
--- a/mail/imapfilter/patches/patch-aa
+++ b/mail/imapfilter/patches/patch-aa
@@ -1,89 +1,46 @@
-$NetBSD: patch-aa,v 1.11 2010/02/04 02:28:33 joerg Exp $
+$NetBSD: patch-aa,v 1.12 2013/07/19 13:58:56 degroote Exp $
 
---- Makefile.orig	2007-10-07 11:07:19.000000000 +0000
-+++ Makefile
-@@ -1,7 +1,6 @@
+--- src/Makefile.orig	2013-06-08 09:25:04.000000000 +0000
++++ src/Makefile	2013-07-19 15:45:59.000000000 +0000
+@@ -1,5 +1,3 @@
 -DESTDIR =
--BINDIR = /usr/local/bin
--SHAREDIR = /usr/local/share/imapfilter
--MANDIR = /usr/local/man
-+BINDIR = $(PREFIX)/bin
-+SHAREDIR = $(PREFIX)/share/imapfilter
-+MANDIR = $(PREFIX)/$(PKGMANDIR)
- 
- INCDIRS = -I/usr/local/include
- LIBDIRS = -L/usr/local/lib
-@@ -11,8 +11,7 @@ MYLDFLAGS = 
- 
- DEFS = -DMAKEFILE_SHAREDIR='"$(SHAREDIR)"'
- 
--CFLAGS = $(MYCFLAGS) $(DEFS) $(INCDIRS)
--LDFLAGS = $(MYLDFLAGS) $(LIBDIRS)
-+CFLAGS+=	$(DEFS)
- 
- LIBS = -lm -llua -lpcre -lssl -lcrypto
- 
-@@ -37,7 +36,7 @@ OBJ = auth.o buffer.o cert.o core.o file
+-PREFIX = /usr/local
+ BINDIR = $(PREFIX)/bin
+ SHAREDIR = $(PREFIX)/share/imapfilter
+ MANDIR = $(PREFIX)/man
+@@ -34,7 +32,7 @@
  all: $(BIN)
  
  $(BIN): $(OBJ)
 -	$(CC) -o $(BIN) $(LDFLAGS) $(OBJ) $(LIBS)
-+	$(CC) -o $(BIN) $(LDFLAGS) $(CLFAGS) $(OBJ) $(LIBS)
++	$(CC) -o $(BIN) $(LDFLAGS) $(CFLAGS) $(OBJ) $(LIBS)
  
  $(OBJ): imapfilter.h
- buffer.o imap.o imapfilter.o namespace.o request.o response.o: buffer.h
-@@ -49,38 +48,22 @@ auth.o cert.o imap.o imapfilter.o log.o 
- imapfilter.o: version.h
+ buffer.o: buffer.h 
+@@ -52,18 +50,14 @@
+ socket.o: session.h
  
  install: $(BIN)
--	if test ! -d $(DESTDIR)$(BINDIR); then \
--		mkdir -p $(DESTDIR)$(BINDIR); fi
+-	mkdir -p $(DESTDIR)$(BINDIR) && \
 -	cp -f $(BIN) $(DESTDIR)$(BINDIR) && \
--		chmod 0755 $(DESTDIR)$(BINDIR)/$(BIN)
--	if test ! -d $(DESTDIR)$(SHAREDIR); then \
--		mkdir -p $(DESTDIR)$(SHAREDIR); fi
--	cp -f $(COMMON_LUA) $(DESTDIR)$(SHAREDIR) && \
--		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(COMMON_LUA)
--	cp -f $(SET_LUA) $(DESTDIR)$(SHAREDIR) && \
--		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(SET_LUA)
--	cp -f $(REGEX_LUA) $(DESTDIR)$(SHAREDIR) && \
--		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(REGEX_LUA)
--	cp -f $(ACCOUNT_LUA) $(DESTDIR)$(SHAREDIR) && \
--		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(ACCOUNT_LUA)
--	cp -f $(MAILBOX_LUA) $(DESTDIR)$(SHAREDIR) && \
--		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(MAILBOX_LUA)
--	cp -f $(MESSAGE_LUA) $(DESTDIR)$(SHAREDIR) && \
--		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(MESSAGE_LUA)
--	cp -f $(OPTIONS_LUA) $(DESTDIR)$(SHAREDIR) && \
--		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(OPTIONS_LUA)
--	cp -f $(AUXILIARY_LUA) $(DESTDIR)$(SHAREDIR) && \
--		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(AUXILIARY_LUA)
--	cp -f $(DEPRECATED_LUA) $(DESTDIR)$(SHAREDIR) && \
--		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(DEPRECATED_LUA)
--	if test ! -d $(DESTDIR)$(MANDIR)/man1; then \
--		mkdir -p $(DESTDIR)$(MANDIR)/man1; fi
--	cp -f $(MAN_BIN) $(DESTDIR)$(MANDIR)/man1 && \
--		chmod 0644 $(DESTDIR)$(MANDIR)/man1/$(MAN_BIN)
--	if test ! -d $(DESTDIR)$(MANDIR)/man5; then \
--		mkdir -p $(DESTDIR)$(MANDIR)/man5; fi
--	cp -f $(MAN_CONFIG) $(DESTDIR)$(MANDIR)/man5 && \
--		chmod 0644 $(DESTDIR)$(MANDIR)/man5/$(MAN_CONFIG)
+-	chmod 0755 $(DESTDIR)$(BINDIR)/$(BIN)
+-	mkdir -p $(DESTDIR)$(SHAREDIR) && \
+-	cp -f $(LUA) $(DESTDIR)$(SHAREDIR) && \
+-	chmod 0644 $(DESTDIR)$(SHAREDIR)/$(LUA)
+-	mkdir -p $(DESTDIR)$(MANDIR)/man1 && \
+-	cp -f ../doc/$(MAN1) $(DESTDIR)$(MANDIR)/man1 && \
+-	chmod 0644 $(DESTDIR)$(MANDIR)/man1/$(MAN1)
+-	mkdir -p $(DESTDIR)$(MANDIR)/man5 && \
+-	cp -f ../doc/$(MAN5) $(DESTDIR)$(MANDIR)/man5 && \
+-	chmod 0644 $(DESTDIR)$(MANDIR)/man5/$(MAN5)
 +	$(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(BINDIR)
 +	$(BSD_INSTALL_PROGRAM) $(BIN) ${DESTDIR}$(BINDIR)/$(BIN)
 +	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(SHAREDIR)
-+	$(BSD_INSTALL_DATA) $(COMMON_LUA) ${DESTDIR}$(SHAREDIR)/$(COMMON_LUA)
-+	$(BSD_INSTALL_DATA) $(SET_LUA) ${DESTDIR}$(SHAREDIR)/$(SET_LUA)
-+	$(BSD_INSTALL_DATA) $(REGEX_LUA) ${DESTDIR}$(SHAREDIR)/$(REGEX_LUA)
-+	$(BSD_INSTALL_DATA) $(ACCOUNT_LUA) ${DESTDIR}$(SHAREDIR)/$(ACCOUNT_LUA)
-+	$(BSD_INSTALL_DATA) $(MAILBOX_LUA) ${DESTDIR}$(SHAREDIR)/$(MAILBOX_LUA)
-+	$(BSD_INSTALL_DATA) $(MESSAGE_LUA) ${DESTDIR}$(SHAREDIR)/$(MESSAGE_LUA)
-+	$(BSD_INSTALL_DATA) $(OPTIONS_LUA) ${DESTDIR}$(SHAREDIR)/$(OPTIONS_LUA)
-+	$(BSD_INSTALL_DATA) $(AUXILIARY_LUA) ${DESTDIR}$(SHAREDIR)/$(AUXILIARY_LUA)
-+	$(BSD_INSTALL_DATA) $(DEPRECATED_LUA) ${DESTDIR}$(SHAREDIR)/$(DEPRECATED_LUA)
++	$(BSD_INSTALL_DATA) $(LUA) ${DESTDIR}$(SHAREDIR)/
 +	$(BSD_INSTALL_MAN_DIR) ${DESTDIR}$(MANDIR)/man1
-+	$(BSD_INSTALL_MAN) $(MAN_BIN) ${DESTDIR}$(MANDIR)/man1/$(MAN_BIN)
++	$(BSD_INSTALL_MAN) ../doc/$(MAN1) ${DESTDIR}$(MANDIR)/man1/$(MAN1)
 +	$(BSD_INSTALL_MAN_DIR) ${DESTDIR}$(MANDIR)/man5
-+	$(BSD_INSTALL_MAN) $(MAN_CONFIG) ${DESTDIR}$(MANDIR)/man5/$(MAN_CONFIG)
++	$(BSD_INSTALL_MAN) ../doc/$(MAN5) ${DESTDIR}$(MANDIR)/man5/$(MAN5)
  
- deinstall:
- 	rm -f $(DESTDIR)$(BINDIR)/$(BIN) \
+ uninstall:
+ 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)