Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1606421876136730"
MIME-Version: 1.0
Date: Thu, 26 Nov 2020 20:17:56 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/mail/imapfilter
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20201126201757.03AA7FA9D@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1606421876136730
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Thu Nov 26 20:17:56 UTC 2020

Modified Files:
	pkgsrc/mail/imapfilter: Makefile distinfo
Added Files:
	pkgsrc/mail/imapfilter/patches: patch-src_Makefile
Removed Files:
	pkgsrc/mail/imapfilter/patches: patch-aa

Log Message:
imapfilter: Update to 2.7.4 - via snow flurry in wip, thx!

    IMAPFilter 2.7.4 - 18 Nov 2020
      - Bug fix; incorrect argument to regular expression compile function.

    IMAPFilter 2.7.3 - 14 Nov 2020
      - Bug fix; incorrect free of compiled pattern.
      - Unexpected network errors and IMAP BYE are now logged.

    IMAPFilter 2.7.2 - 10 Nov 2020
      - Makefile is back to being Lua version agnostic.

    IMAPFilter 2.7.1 - 9 Nov 2020
      - Makefile now builds with Lua 5.4 and PCRE2.

    IMAPFilter 2.7 - 8 Nov 2020
      - Lua 5.4 compatibility (the codebase can still be compiled with versions
        5.3, 5.2 and 5.1).
      - PCRE2 compatibility (version 10.00 and later)
      - New error code is returned if certificate verify fails.
      - Bug fix; add missing truststore option from brief usage message.

    IMAPFilter 2.6.16 - 23 Nov 2019
      - Bug fix; escape the double-quote character in passwords.

    IMAPFilter 2.6.15 - 14 Nov 2019
      - Bug fix; try to setup both a CA file and path for SSL validations.

    IMAPFilter 2.6.14 - 1 Nov 2019
      - Bug fix; OpenSSL version mess up for SSL hostname validation.

    IMAPFilter 2.6.13 - 17 Sep 2019
      - Support for SSL hostname validation.

    IMAPFilter 2.6.12 - 3 Oct 2018
      - Support for Server Name Indication (SNI).
      - The searching methods return values are described in the config man page.
      - Example of using the enter_idle() function in the sample extend file.

    IMAPFilter 2.6.11 - 19 Nov 2017
      - Support for interrupting IDLE mode with SIGUSR1/SIGUSR2.
      - New "persist" option to try to recover a connection indefinitely.
      - New "range" option to limit messages included in a range.
      - Bug fix; always close selected mailbox before check_status().
      - Bug fix; closing of selected mailbox twice with fetch_message().


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/mail/imapfilter/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/mail/imapfilter/distinfo
cvs rdiff -u -r1.16 -r0 pkgsrc/mail/imapfilter/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/imapfilter/patches/patch-src_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1606421876136730
Content-Disposition: inline
Content-Length: 4931
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/imapfilter/Makefile
diff -u pkgsrc/mail/imapfilter/Makefile:1.47 pkgsrc/mail/imapfilter/Makefile:1.48
--- pkgsrc/mail/imapfilter/Makefile:1.47	Sat Jan 18 21:49:50 2020
+++ pkgsrc/mail/imapfilter/Makefile	Thu Nov 26 20:17:56 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2020/01/18 21:49:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.48 2020/11/26 20:17:56 nia Exp $
 
-DISTNAME=	imapfilter-2.6.10
-PKGREVISION=	1
+DISTNAME=	imapfilter-2.7.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=lefcha/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -12,6 +11,7 @@ COMMENT=	Mail filtering utility for the 
 LICENSE=	mit
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
+LIBS.Linux+=		-ldl
 INSTALLATION_DIRS=	share/examples/imapfilter
 
 post-install:
@@ -20,7 +20,7 @@ post-install:
 		${DESTDIR}${PREFIX}/share/examples/imapfilter
 .endfor
 
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/imapfilter/distinfo
diff -u pkgsrc/mail/imapfilter/distinfo:1.26 pkgsrc/mail/imapfilter/distinfo:1.27
--- pkgsrc/mail/imapfilter/distinfo:1.26	Sat Feb 25 00:24:11 2017
+++ pkgsrc/mail/imapfilter/distinfo	Thu Nov 26 20:17:56 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2017/02/25 00:24:11 mef Exp $
+$NetBSD: distinfo,v 1.27 2020/11/26 20:17:56 nia Exp $
 
-SHA1 (imapfilter-2.6.10.tar.gz) = e322ad37679107d60dbbbffd292908c92adfd0a6
-RMD160 (imapfilter-2.6.10.tar.gz) = dad0fe43e299ccd7b079b6dadb08d911e48687d5
-SHA512 (imapfilter-2.6.10.tar.gz) = b01f50d22583b5c89e446c70ab4dea711ca5a2c77fad5362799bc137f48083fbf9c6fc403648502c963f0da14ea8edf652c98ed9ffac96db27b8408aec21014a
-Size (imapfilter-2.6.10.tar.gz) = 57916 bytes
-SHA1 (patch-aa) = 277593adb235b189f336804179723febd57da9ad
+SHA1 (imapfilter-2.7.4.tar.gz) = e06a0ba5dce10627aa1e86aacea76b1f1881e92a
+RMD160 (imapfilter-2.7.4.tar.gz) = 340eb44b3efd9e44af561d08c1a5da51deccc78f
+SHA512 (imapfilter-2.7.4.tar.gz) = cfc1d2371d44166d45f77eeef960083ba4da9dc0909c21bfd6f6c6920b32560a68abd928ca3a3d918e5c461a21730fc59976bf9353cfee95764a03d05318401e
+Size (imapfilter-2.7.4.tar.gz) = 59361 bytes
+SHA1 (patch-src_Makefile) = be705d5c9a52152ee41657321535dd60e19622ab

Added files:

Index: pkgsrc/mail/imapfilter/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/mail/imapfilter/patches/patch-src_Makefile:1.1
--- /dev/null	Thu Nov 26 20:17:56 2020
+++ pkgsrc/mail/imapfilter/patches/patch-src_Makefile	Thu Nov 26 20:17:56 2020
@@ -0,0 +1,68 @@
+$NetBSD: patch-src_Makefile,v 1.1 2020/11/26 20:17:56 nia Exp $
+
+Use pkgsrc layout/flags.
+
+--- src/Makefile.orig	2020-11-18 21:30:58.000000000 +0000
++++ src/Makefile
+@@ -2,7 +2,7 @@ DESTDIR ?=
+ PREFIX ?= /usr/local
+ BINDIR = $(PREFIX)/bin
+ SHAREDIR = $(PREFIX)/share/imapfilter
+-MANDIR = $(PREFIX)/man
++MANDIR = $(PREFIX)/$(PKGMANDIR)
+ 
+ SSLCAPATH = /etc/ssl/certs
+ SSLCAFILE = /etc/ssl/cert.pem
+@@ -19,13 +19,13 @@ LIBPCRE = -lpcre2-8
+ LIBSSL = -lssl
+ LIBCRYPTO = -lcrypto
+ 
+-CFLAGS = -Wall -Wextra -O \
++CFLAGS += -Wall -Wextra -O \
+ 	 -DCONFIG_SHAREDIR='"$(SHAREDIR)"' \
+ 	 -DCONFIG_SSL_CAPATH='"$(SSLCAPATH)"' \
+ 	 -DCONFIG_SSL_CAFILE='"$(SSLCAFILE)"' \
+ 	 $(INCDIRS) $(MYCFLAGS)
+-LDFLAGS = $(LIBDIRS) $(MYLDFLAGS)
+-LIBS = -lm -ldl $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS)
++LDFLAGS += $(LIBDIRS) $(MYLDFLAGS)
++LIBS += -lm $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS)
+ 
+ MAN1 = imapfilter.1
+ MAN5 = imapfilter_config.5
+@@ -41,7 +41,7 @@ OBJ = auth.o buffer.o cert.o core.o file
+ all: $(BIN)
+ 
+ $(BIN): $(OBJ)
+-	$(CC) -o $(BIN) $(LDFLAGS) $(OBJ) $(LIBS)
++	$(CC) -o $(BIN) $(LDFLAGS) $(CFLAGS) $(OBJ) $(LIBS)
+ 
+ $(OBJ): imapfilter.h
+ buffer.o: buffer.h 
+@@ -59,18 +59,14 @@ session.o: list.h session.h
+ socket.o: session.h
+ 
+ install: $(BIN)
+-	mkdir -p $(DESTDIR)$(BINDIR) && \
+-	cp -f $(BIN) $(DESTDIR)$(BINDIR) && \
+-	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) $(LUA) $(DESTDIR)$(SHAREDIR)/
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man1
++	$(BSD_INSTALL_MAN) ../doc/$(MAN1) $(DESTDIR)$(MANDIR)/man1/$(MAN1)
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man5
++	$(BSD_INSTALL_MAN) ../doc/$(MAN5) $(DESTDIR)$(MANDIR)/man5/$(MAN5)
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)


--_----------=_1606421876136730--