From c33a31ad55041431bee9ab9ed6dfa483dab12191 Mon Sep 17 00:00:00 2001
From: John Regan <john@jrjrtech.com>
Date: Wed, 20 Jul 2016 01:02:14 -0500
Subject: [PATCH] rmilter: update to 1.8.6 (#4468)

Also enhance the start script. The rmilter default config places files
under /run/rmilter.
---
 srcpkgs/rmilter/files/rmilter/run | 7 ++++++-
 srcpkgs/rmilter/template          | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/rmilter/files/rmilter/run b/srcpkgs/rmilter/files/rmilter/run
index a4a79b973bd..0cc86694d91 100755
--- a/srcpkgs/rmilter/files/rmilter/run
+++ b/srcpkgs/rmilter/files/rmilter/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
-exec chpst -u rmilter:rmilter rmilter -n -c /etc/rmilter/rmilter.conf ${OPTS}
+: ${RMILTERUSER:=rmilter}
+: ${RMILTERGROUP:=rmilter}
+if [ ! -d /run/rmilter ]; then
+	install -d -m 0755 -o $RMILTERUSER -g $RMILTERGROUP /run/rmilter
+fi
+exec chpst -u $RMILTERUSER:$RMILTERGROUP rmilter -n -c /etc/rmilter/rmilter.conf ${OPTS}
diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index 4fe7743bd06..fb987d4c51d 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -1,7 +1,7 @@
 # Template file for 'rmilter'
 pkgname=rmilter
-version=1.8.5
-revision=2
+version=1.8.6
+revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
@@ -11,7 +11,7 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"
 homepage="https://github.com/vstakhov/rmilter"
 distfiles="$homepage/archive/${version}.tar.gz"
-checksum=e9e1b3c724aa7d9e43f899ad0dbb367d37945e48b742b89188e1a1c256be318f
+checksum=dd00e10a6c5e2a7682bd81155f8cb09fbdbed0416e1c7ccc955a4338c85f144f
 system_accounts="rmilter"
 rmilter_homedir="/var/lib/rmilter"