[arch-commits] Commit in rpcbind/trunk (4 files)

[Tobias Powalowski]

    Date: Sunday, June 22, 2014 @ 13:37:32
  Author: tpowa
Revision: 215340

upgpkg: rpcbind 0.2.1-4

added rpcbind config file, added socket activation, cleaned up service file

Added:
  rpcbind/trunk/rpcbind.conf
  rpcbind/trunk/rpcbind.socket
Modified:
  rpcbind/trunk/PKGBUILD
  rpcbind/trunk/rpcbind.service

-----------------+
 PKGBUILD        |   17 +++++++++++++----
 rpcbind.conf    |    3 +++
 rpcbind.service |   12 +++++-------
 rpcbind.socket  |    8 ++++++++
 4 files changed, 29 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-22 09:16:43 UTC (rev 215339)
+++ PKGBUILD	2014-06-22 11:37:32 UTC (rev 215340)
@@ -3,9 +3,10 @@
 
 pkgname=rpcbind
 pkgver=0.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="portmap replacement which supports RPC over various protocols"
 arch=(i686 x86_64)
+backup=('etc/conf.d/rpcbind')
 depends=('bash' 'glibc' 'libtirpc')
 url="http://rpcbind.sourceforge.net"
 license=('custom')
@@ -12,12 +13,16 @@
 replaces=('portmap')
 source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.1.tar.bz2
         rpcbind-sunrpc.patch
-        rpcbind.service)
+        rpcbind.service
+        rpcbind.socket
+        rpcbind.conf)
 install=rpcbind.install
 md5sums=('0a5f9c2142af814c55d957aaab3bcc68'
          'c02ac36a98baac70b8a26190524b7b73'
-         'a7b23a32be2eb52d7dec52da36d4eba1'
-)
+         '0f493a590c250267034e230e7bf1f894'
+         'e5a205cd7402fedaf74a744b2a22f0ad'
+         'd4c74d1be9f98344af138a15ad3b6f8c')
+
 prepare() {
   cd $srcdir/$pkgname-$pkgver
   # patch for iana services file
@@ -38,10 +43,14 @@
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
+  # install rpcbind config file
+  install -D -m644 $srcdir/rpcbind.conf $pkgdir/etc/conf.d/rpcbind
   # install missing man page - https://bugs.archlinux.org/task/21271
   install -m644 man/rpcinfo.8 $pkgdir/usr/share/man/man8/
   # install systemd service file
   install -D -m644 $srcdir/rpcbind.service $pkgdir/usr/lib/systemd/system/rpcbind.service
+  # install system socket activation
+  install -D -m644 $srcdir/rpcbind.socket $pkgdir/usr/lib/systemd/system/sockets.target.wants/rpcbind.socket
   # add state directory
   install -d -m 700 -o 32 -g 32 $pkgdir/var/lib/rpcbind
   # install license

Added: rpcbind.conf
===================================================================
--- rpcbind.conf	                        (rev 0)
+++ rpcbind.conf	2014-06-22 11:37:32 UTC (rev 215340)
@@ -0,0 +1,3 @@
+#
+# Optional arguments passed to rpcbind. See rpcbind(8)
+RPCBIND_ARGS=""

Modified: rpcbind.service
===================================================================
--- rpcbind.service	2014-06-22 09:16:43 UTC (rev 215339)
+++ rpcbind.service	2014-06-22 11:37:32 UTC (rev 215340)
@@ -1,13 +1,11 @@
 [Unit]
-Description=RPC Bind
-After=network.target
-Wants=rpcbind.target
-Before=rpcbind.target
+Description=RPC bind service
+Requires=rpcbind.socket
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/rpcbind
-Restart=always
+EnvironmentFile=/etc/conf.d/rpcbind
+ExecStart=/usr/bin/rpcbind -w ${RPCBIND_ARGS}
 
 [Install]
-WantedBy=multi-user.target
+Also=rpcbind.socket

Added: rpcbind.socket
===================================================================
--- rpcbind.socket	                        (rev 0)
+++ rpcbind.socket	2014-06-22 11:37:32 UTC (rev 215340)
@@ -0,0 +1,8 @@
+[Unit]
+Description=RPCbind Server Activation Socket
+
+[Socket]
+ListenStream=/var/run/rpcbind.sock
+
+[Install]
+WantedBy=sockets.target