From 8160ca248c843d1ff2785426d97eeab77e7fff3f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 11 Oct 2011 03:38:24 +0200
Subject: [PATCH] cyrus-sasl: switch to systemd, drop openrc support.

---
 srcpkgs/cyrus-sasl/files/saslauthd.confd      |  3 ---
 srcpkgs/cyrus-sasl/files/saslauthd.rc         |  9 ---------
 srcpkgs/cyrus-sasl/files/saslauthd.service    | 10 ++++++++++
 srcpkgs/cyrus-sasl/files/saslauthd.tmpfiles.d |  1 +
 srcpkgs/cyrus-sasl/template                   | 13 +++++++------
 5 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/cyrus-sasl/files/saslauthd.confd
 delete mode 100644 srcpkgs/cyrus-sasl/files/saslauthd.rc
 create mode 100644 srcpkgs/cyrus-sasl/files/saslauthd.service
 create mode 100644 srcpkgs/cyrus-sasl/files/saslauthd.tmpfiles.d

diff --git a/srcpkgs/cyrus-sasl/files/saslauthd.confd b/srcpkgs/cyrus-sasl/files/saslauthd.confd
deleted file mode 100644
index 25c454f0c4c..00000000000
--- a/srcpkgs/cyrus-sasl/files/saslauthd.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration file for Cyrus-SASL daemon.
-#
-SASLAUTHD_ARGS="-m /var/run/saslauthd -a pam"
diff --git a/srcpkgs/cyrus-sasl/files/saslauthd.rc b/srcpkgs/cyrus-sasl/files/saslauthd.rc
deleted file mode 100644
index e78597abe47..00000000000
--- a/srcpkgs/cyrus-sasl/files/saslauthd.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/sbin/runscript
-
-command=/usr/sbin/saslauthd
-command_args="${SASLAUTHD_ARGS}"
-
-depend()
-{
-	need net
-}
diff --git a/srcpkgs/cyrus-sasl/files/saslauthd.service b/srcpkgs/cyrus-sasl/files/saslauthd.service
new file mode 100644
index 00000000000..9fea8aeadf4
--- /dev/null
+++ b/srcpkgs/cyrus-sasl/files/saslauthd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Cyrus SASL authentication daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/saslauthd -a pam -m /run/saslauthd
+PidFile=/run/saslauthd/saslauthd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/srcpkgs/cyrus-sasl/files/saslauthd.tmpfiles.d b/srcpkgs/cyrus-sasl/files/saslauthd.tmpfiles.d
new file mode 100644
index 00000000000..27eb553243f
--- /dev/null
+++ b/srcpkgs/cyrus-sasl/files/saslauthd.tmpfiles.d
@@ -0,0 +1 @@
+d /run/saslauthd 0750 root root
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index c4481199d80..994940b6b7a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -6,7 +6,7 @@ unset run_depends build_depends
 
 pkgname=cyrus-sasl
 revision=2
-configure_args="--with-saslauthd=/var/run/saslauthd
+configure_args="--with-saslauthd=/run/saslauthd
 --enable-login --enable-plain --enable-sql --disable-sqlite
 --enable-postgresql --enable-mysql --enable-ldapdb --with-ldap=/usr"
 short_desc="Cyrus SASL - auth daemon and administration tools"
@@ -16,9 +16,9 @@ long_desc="${long_desc}
  programs for the SASL users database and common binary files for plugin
  modules."
 
-keep_empty_dirs=yes
+revision=3
 subpackages="${pkgname}-modules-ldap ${pkgname}-modules-sql ${pkgname}-modules"
-openrc_services="saslauthd default off"
+systemd_services="saslauthd.service"
 conf_files="/etc/conf.d/saslauthd"
 
 Add_dependency run glibc
@@ -49,7 +49,8 @@ post_install()
 	rm -f ${DESTDIR}/usr/lib/libsasl*
 	rm -rf ${DESTDIR}/usr/lib/sasl2/libsasldb*
 
-	# Install OpenRC service.
-	vinstall ${FILESDIR}/saslauthd.rc 755 etc/init.d saslauthd
-	vinstall ${FILESDIR}/saslauthd.confd 644 etc/conf.d saslauthd
+	# systemd
+	vinstall ${FILESDIR}/saslauthd.service 644 lib/systemd/system
+	vinstall ${FILESDIR}/saslauthd.tmpfiles.d 644 \
+		usr/lib/tmpfiles.d saslauthd.conf
 }