From 327bb1b6b7a73f12e57f0faf23786940dae9ea30 Mon Sep 17 00:00:00 2001
From: Benny Pedersen <xpunkt@users.noreply.github.com>
Date: Mon, 11 Jan 2016 18:03:58 +0100
Subject: [PATCH] mail-filter/rspamd: create /var/run at run time

---
 mail-filter/rspamd/files/rspamd.init    | 9 ++++++++-
 mail-filter/rspamd/rspamd-1.0.11.ebuild | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mail-filter/rspamd/files/rspamd.init b/mail-filter/rspamd/files/rspamd.init
index 8ba223193683..3f5df5b390c3 100644
--- a/mail-filter/rspamd/files/rspamd.init
+++ b/mail-filter/rspamd/files/rspamd.init
@@ -5,7 +5,8 @@
 extra_commands="checkconfig"
 extra_started_commands="reload"
 
-PIDFILE=/var/run/rspamd/rspamd.pid
+RUNDIR=/var/run/rspamd
+PIDFILE=$RUNDIR/rspamd.pid
 
 depend() {
 	need net
@@ -19,6 +20,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting ${SVCNAME}"
+	
+	mkdir -m0750 -p $RUNDIR
+	chown rspamd:rspamd $RUNDIR
+	chmod g+s $RUNDIR
+	rm -f $RUNDIR/$SVCNAME.sock
+	
 	start-stop-daemon --start --quiet --pidfile $PIDFILE -u rspamd -g rspamd \
 						--exec /usr/bin/rspamd
 	eend $?
diff --git a/mail-filter/rspamd/rspamd-1.0.11.ebuild b/mail-filter/rspamd/rspamd-1.0.11.ebuild
index 73e673817e76..97460a2640bc 100644
--- a/mail-filter/rspamd/rspamd-1.0.11.ebuild
+++ b/mail-filter/rspamd/rspamd-1.0.11.ebuild
@@ -46,8 +46,8 @@ src_install() {
 
 	dodir /var/lib/rspamd
 	dodir /var/log/rspamd
-	dodir /var/run/rspamd
-	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd /var/run/rspamd
+	
+	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/rspamd.logrotate" rspamd
-- 
2.26.2