Changes 2.5.6:

- Possible to build again with OpenSSL older than version 1.0.1 (was a
  requirement for the previous release due to new protocols TLS 1.1/1.2).
- Support for reading the configuration from the standard input stream.
- New makefile dist target, which can be used to create distribution archives.

3 files changed, 31 insertions, 25 deletions

diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index e17e8e8cbfc..fd400cdd81b 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.38 2013/10/30 06:49:54 dholland Exp $
+# $NetBSD: Makefile,v 1.39 2013/11/05 18:57:32 adam Exp $
 
-DISTNAME=		imapfilter-${VERSION}
-VERSION=		2.5.5
-PKGREVISION=		1
-CATEGORIES=		mail
-MASTER_SITES=  -https://codeload.github.com/lefcha/imapfiler/tar.gz/${VERSION}
+DISTNAME=	imapfilter-2.5.6
+CATEGORIES=	mail
+MASTER_SITES=	-https://codeload.github.com/lefcha/imapfilter/tar.gz/v${PKGVERSION_NOREV}
+FETCH_USING=	curl
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://imapfilter.hellug.gr/
-COMMENT=		Mail filtering utility for the IMAP
-LICENSE=		mit
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://imapfilter.hellug.gr/
+COMMENT=	Mail filtering utility for the IMAP
+LICENSE=	mit
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
-
-FETCH_USING=   curl
-WRKSRC= 		${WRKDIR}/lefcha-imapfilter-ef03d60
-
 INSTALLATION_DIRS=	share/examples/imapfilter
 
 post-install:
@@ -24,7 +19,7 @@ post-install:
 		${DESTDIR}${PREFIX}/share/examples/imapfilter
 .endfor
 
-.include "../../lang/lua/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo
index 3ccbee14934..bd1bc6989f4 100644
--- a/mail/imapfilter/distinfo
+++ b/mail/imapfilter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2013/07/25 13:25:08 degroote Exp $
+$NetBSD: distinfo,v 1.22 2013/11/05 18:57:32 adam Exp $
 
-SHA1 (imapfilter-2.5.5.tar.gz) = 1f1c3d9568c69b7dcfc5616d42405b647383358b
-RMD160 (imapfilter-2.5.5.tar.gz) = ea7db693c8c4d470afd1a968f85b63b8a2580ae4
-Size (imapfilter-2.5.5.tar.gz) = 53104 bytes
-SHA1 (patch-aa) = 78f7bfc3bc15669db7ef437710a65cdd4c49daa9
+SHA1 (imapfilter-2.5.6.tar.gz) = 49ac7b7fb937b40eb42a162314de4f8866e33c11
+RMD160 (imapfilter-2.5.6.tar.gz) = 29571b98820e27d803ebcda95444e128e62c31bf
+Size (imapfilter-2.5.6.tar.gz) = 53579 bytes
+SHA1 (patch-aa) = b5f1a74de39389f1507c2d02fdb4f81b814cb85c
diff --git a/mail/imapfilter/patches/patch-aa b/mail/imapfilter/patches/patch-aa
index 466fd28ac5b..e3b43cc5def 100644
--- a/mail/imapfilter/patches/patch-aa
+++ b/mail/imapfilter/patches/patch-aa
@@ -1,14 +1,25 @@
-$NetBSD: patch-aa,v 1.12 2013/07/19 13:58:56 degroote Exp $
+$NetBSD: patch-aa,v 1.13 2013/11/05 18:57:32 adam Exp $
 
---- src/Makefile.orig	2013-06-08 09:25:04.000000000 +0000
-+++ src/Makefile	2013-07-19 15:45:59.000000000 +0000
+--- src/Makefile.orig	2013-10-27 22:46:05.000000000 +0000
++++ src/Makefile
 @@ -1,5 +1,3 @@
 -DESTDIR =
 -PREFIX = /usr/local
  BINDIR = $(PREFIX)/bin
  SHAREDIR = $(PREFIX)/share/imapfilter
  MANDIR = $(PREFIX)/man
-@@ -34,7 +32,7 @@
+@@ -16,8 +14,8 @@ LIBPCRE = -lpcre
+ LIBSSL = -lssl
+ LIBCRYPTO = -lcrypto
+ 
+-CFLAGS = -Wall -Wextra -O -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS) $(MYCFLAGS)
+-LDFLAGS = $(LIBDIRS) $(MYLDFLAGS)
++CFLAGS += -Wall -Wextra -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS) $(MYCFLAGS)
++LDFLAGS += $(LIBDIRS) $(MYLDFLAGS)
+ LIBS = -lm $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS)
+ 
+ MAN1 = imapfilter.1
+@@ -34,7 +32,7 @@ OBJ = auth.o buffer.o cert.o core.o file
  all: $(BIN)
  
  $(BIN): $(OBJ)
@@ -17,7 +28,7 @@ $NetBSD: patch-aa,v 1.12 2013/07/19 13:58:56 degroote Exp $
  
  $(OBJ): imapfilter.h
  buffer.o: buffer.h 
-@@ -52,18 +50,14 @@
+@@ -52,18 +50,14 @@ session.o: list.h session.h
  socket.o: session.h
  
  install: $(BIN)