Update to 1.9.2.

[Bartosz Kuzma <bartosz.kuzma%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Bartosz Kuzma <bartosz.kuzma%gmail.com@localhost>
Pushed By:	bartosz.kuzma
Date:		Tue Sep 27 09:42:31 2016 +0200
Changeset:	d11d89937bdb017fd798bcb4673001e965ec13e5

Modified Files:
	rmilter/Makefile
	rmilter/PLIST
	rmilter/distinfo
Removed Files:
	rmilter/patches/patch-src__libclamc.c
	rmilter/patches/patch-src__libspamd.c

Log Message:
Update to 1.9.2.

Changes:

Release 1.9.2
* [Feature] Allow adding/overriding options for rmilter
* [Feature] Allow to disable dkim signing completely
* [Fix] Allow empty sections in the config
* [Fix] Do not fold dkim signature received from Rspamd
* [Fix] Fix adding headers from rspamd
* [Fix] Fix adding of IP addresses to the lists
* [Fix] Treat connections from unix socket as local connections
* [Fix] Unbroke 'spamd_greylist = no' config option
* [Rework] Process all flag config file options in same way
* [Rework] Remove old and deprecated rules
* [Rework] Use lc-btrie code for radix trie

Release 1.9.1
* [Feature] Allow to disable greylisting and ratelimit globally
* [Feature] Optimize sending data to rspamd
* [Fix] Avoid using of LTS as it seems to be broken on FreeBSD
* [Fix] Fix detection of sendfile on FreeBSD
* [Fix] Fix probability setup
* [Fix] Fix sdsnewlen usage
* [Fix] Fix usage of magic constants
* [Rework] Remove systemd socket activation

Release 1.9.0
* [CritFix] Fix spam scan
* [Feature] Add .try_include macro
* [Feature] Allow to use dkim signature from rspamd
* [Feature] Allow try_include and globs in rmilter macroes
* [Feature] Backport utility to fold headers from rspamd
* [Fix] Add checks for sendfile presence in a system
* [Fix] Fix errors handling
* [Fix] Fix spam scanning buffer allocation
* [Fix] Fix support of systems without sendfile
* [Fix] Keep compatibility with old redis (< 2.6.12)
* [Fix] Pass header number when removing headers specified by
* [Fix] Remove manpage from debian package
* [Fix] Update the sample files
* [Rework] Add glib dependency
* [Rework] Remove SA compatible headers, allow to process
* [Rework] Remove beanstalk code, rename memcached vars, remove
* [Rework] Remove separated include directory
* [Rework] Reorganize documentation
* [Rework] Rework configuration
* [Rework] Rework the rest of the project to use pubsub
* [Rework] Simplify and modernize spam scan function

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d11d89937bdb017fd798bcb4673001e965ec13e5

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

diffstat:
 rmilter/Makefile                      |  5 +++--
 rmilter/PLIST                         |  1 -
 rmilter/distinfo                      | 10 ++++------
 rmilter/patches/patch-src__libclamc.c | 26 --------------------------
 rmilter/patches/patch-src__libspamd.c | 22 ----------------------
 5 files changed, 7 insertions(+), 57 deletions(-)

diffs:
diff --git a/rmilter/Makefile b/rmilter/Makefile
index c72222e..f5b83a0 100644
--- a/rmilter/Makefile
+++ b/rmilter/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	rmilter
-DISTNAME=	1.8.6
+DISTNAME=	1.9.2
 PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=vstakhov/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/vstakhov/rmilter/
 COMMENT=	Milter for rspamd
 LICENSE=	2-clause-bsd
 
-WRKSRC=		${WRKDIR}/rmilter-1.8.6
+WRKSRC=		${WRKDIR}/rmilter-1.9.2
 USE_CMAKE=	yes
 
 BUILD_DEFS+=	VARBASE
@@ -55,6 +55,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/rmilter-grey.conf \
 		${DESTDIR}${EGDIR}/rmilter-grey.conf
 
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libmemcached/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mail/libmilter/buildlink3.mk"
diff --git a/rmilter/PLIST b/rmilter/PLIST
index 7b60682..0461831 100644
--- a/rmilter/PLIST
+++ b/rmilter/PLIST
@@ -1,5 +1,4 @@
 @comment $NetBSD$
 sbin/rmilter
-man/man8/rmilter.8
 share/examples/rmilter/rmilter.conf
 share/examples/rmilter/rmilter-grey.conf
diff --git a/rmilter/distinfo b/rmilter/distinfo
index bf50db7..f0763a0 100644
--- a/rmilter/distinfo
+++ b/rmilter/distinfo
@@ -1,8 +1,6 @@
 $NetBSD$
 
-SHA1 (rmilter/1.8.6.tar.gz) = fd728478ea3dd13c34b76a8aaae5d6797b0fd4ba
-RMD160 (rmilter/1.8.6.tar.gz) = 4e38724b198e7e59af97dbcfe10b959529943262
-SHA512 (rmilter/1.8.6.tar.gz) = 34304fd1f515cd6b5ce53e0e3ba42d6d58c41b604626afa742f22e5da1d8470b1f70d627457988d824ee3cd91d3be0591b41a1342da80440601c779e5bb65f66
-Size (rmilter/1.8.6.tar.gz) = 263883 bytes
-SHA1 (patch-src__libclamc.c) = 7a709bc8e97c3b814f11c1e033de126315322a06
-SHA1 (patch-src__libspamd.c) = 94c46415ede843b58644f03a0ff5a645f1c8e788
+SHA1 (rmilter/1.9.2.tar.gz) = d79446ba70d64851c83ca378e658e6ad29a2a4bb
+RMD160 (rmilter/1.9.2.tar.gz) = 31cecac132abed06f54127042bc84ad9a1d0a958
+SHA512 (rmilter/1.9.2.tar.gz) = 4938515d18d4cff363266348cbd00b85690f889cb479a0e2fb61fa74e1e0deb3e78ec06132537ae001ccec375d0bab10af77c4a4c6fb248dc7f9f929c5a57eb9
+Size (rmilter/1.9.2.tar.gz) = 264637 bytes
diff --git a/rmilter/patches/patch-src__libclamc.c b/rmilter/patches/patch-src__libclamc.c
deleted file mode 100644
index b795e81..0000000
--- a/rmilter/patches/patch-src__libclamc.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-Fix for platform without sendfile
-
---- src/libclamc.c.orig	2016-06-20 10:08:56.000000000 +0000
-+++ src/libclamc.c
-@@ -147,6 +147,9 @@ static int clamscan_socket(const char *f
- 		return -1;
- 	}
- #else
-+#warning There is no sendfile code for this platform
-+#endif
-+#else
- 	while ((r = read (fd, buf, sizeof(buf))) > 0) {
- 		if (write (s, buf, r) <= 0) {
- 			msg_warn("<%s>; clamav: write (%s): %s", priv->mlfi_id,
-@@ -156,8 +159,7 @@ static int clamscan_socket(const char *f
- 			return -1;
- 		}
- 	}
--#endif
--#endif
-+#endif /* HAVE_SENDFILE */
- 	close (fd);
- 
- 	/* Send zero chunk */
diff --git a/rmilter/patches/patch-src__libspamd.c b/rmilter/patches/patch-src__libspamd.c
deleted file mode 100644
index 45a1a73..0000000
--- a/rmilter/patches/patch-src__libspamd.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Fix for platform without sendfile
-
---- src/libspamd.c.orig	2016-06-20 10:08:56.000000000 +0000
-+++ src/libspamd.c
-@@ -357,11 +357,13 @@ rspamdscan_socket(SMFICTX *ctx, struct m
- 		return -1;
- 	}
- #else
-+#warning There is sendfile code for this platform
-+#endif
-+#else
- 	while ((r = read (fd, buf, sizeof (buf))) > 0) {
- 		write (s, buf, r);
- 	}
--#endif
--#endif
-+#endif /* HAVE_SENDFILE */
- 
- 	fcntl (s, F_SETFL, ofl|O_NONBLOCK);
- 	close (fd);