From b6577ad94641d022f413b9f95426d5e68fbaa38b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 9 Jul 2012 11:47:41 +0200
Subject: [PATCH] rpcbind: use socket activation for systemd, run daemon as rpc
 user.

---
 srcpkgs/rpcbind/files/rpcbind.service |  7 +++++--
 srcpkgs/rpcbind/files/rpcbind.socket  |  8 ++++++++
 srcpkgs/rpcbind/template              | 17 +++++++++++------
 3 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/rpcbind/files/rpcbind.socket

diff --git a/srcpkgs/rpcbind/files/rpcbind.service b/srcpkgs/rpcbind/files/rpcbind.service
index d3dafa3554..d97a13b934 100644
--- a/srcpkgs/rpcbind/files/rpcbind.service
+++ b/srcpkgs/rpcbind/files/rpcbind.service
@@ -1,9 +1,12 @@
 [Unit]
-Description=RPC Bind
+Description=RPC bind service
+Requires=rpcbind.socket
+After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/rpcbind
+ExecStart=/usr/bin/rpcbind -w
 
 [Install]
 WantedBy=multi-user.target
+Also=rpcbind.socket
diff --git a/srcpkgs/rpcbind/files/rpcbind.socket b/srcpkgs/rpcbind/files/rpcbind.socket
new file mode 100644
index 0000000000..d63c1d9720
--- /dev/null
+++ b/srcpkgs/rpcbind/files/rpcbind.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=RPCbind Server Activation Socket
+
+[Socket]
+ListenStream=/var/run/rpcbind.sock
+
+[Install]
+WantedBy=sockets.target
diff --git a/srcpkgs/rpcbind/template b/srcpkgs/rpcbind/template
index 7f886d5b12..b18901bdbd 100644
--- a/srcpkgs/rpcbind/template
+++ b/srcpkgs/rpcbind/template
@@ -1,14 +1,15 @@
 # Template file for 'rpcbind'
 pkgname=rpcbind
 version=0.2.0
-homepage="http://rpcbind.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
-configure_args="--enable-warmstarts --with-statedir=/run"
+configure_args="--enable-warmstarts --with-statedir=/var/lib/rpcbind
+--with-rpcuser=rpc"
 makedepends="libtirpc-devel"
-revision=1
 short_desc="Converts RPC program numbers into universal addresses"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://rpcbind.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 checksum=c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3
 long_desc="
  The rpcbind utility is a server that converts RPC program numbers into
@@ -16,10 +17,14 @@ long_desc="
  RPC calls on a server on that machine."
 
 systemd_services="${pkgname}.service on"
-
+system_accounts="rpc"
+rpc_homedir="/var/lib/rpcbind"
+make_dirs="/var/lib/rpcbind 0700 rpc rpc"
 
 post_install() {
 	vinstall man/rpcbind.8 644 usr/share/man/man8
 	vinstall man/rpcinfo.8 644 usr/share/man/man8
-	vinstall ${FILESDIR}/${pkgname}.service 644 lib/systemd/system
+	vmkdir lib/systemd/system
+	install -m644 ${FILESDIR}/*.{service,socket} \
+		${DESTDIR}/lib/systemd/system
 }