[arch-commits] Commit in rpcbind/trunk (PKGBUILD systemd_service.diff)

[Andreas Radke]

    Date: Tuesday, December 6, 2016 @ 15:25:19
  Author: andyrtr
Revision: 282879

upgpkg: rpcbind 0.2.4-2

source /etc/conf.d/rpcbind; FS#52058

Added:
  rpcbind/trunk/systemd_service.diff
Modified:
  rpcbind/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   16 +++++++---------
 systemd_service.diff |   10 ++++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-06 15:06:12 UTC (rev 282878)
+++ PKGBUILD	2016-12-06 15:25:19 UTC (rev 282879)
@@ -4,7 +4,7 @@
 
 pkgname=rpcbind
 pkgver=0.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="portmap replacement which supports RPC over various protocols"
 arch=(i686 x86_64)
 backup=('etc/conf.d/rpcbind')
@@ -16,18 +16,20 @@
 # see also http://git.infradead.org/users/steved/rpcbind.git
 source=(https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
         rpcbind-sunrpc.patch
-#        rpcbind.service
-#        rpcbind.socket
-        rpcbind.conf)
+        rpcbind.conf
+        systemd_service.diff)
 install=rpcbind.install
 sha1sums=('8a6045dd3397e9f71bf3a7c9d269e255cca537bd'
           '1b997ce76f9727efc8c72fc5f97189591c9a60e2'
-          '08246ff18d12cee01e5c9391c6ba8f5597cac936')
+          '08246ff18d12cee01e5c9391c6ba8f5597cac936'
+          '3ebfcf09d01e41c70135124e68b3db681c768aa0')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
   # patch for iana services file # FS#20273
   patch -Np1 -i ../rpcbind-sunrpc.patch
+  # use distro config file; FS#52058
+  patch -Np1 -i ../systemd_service.diff
 }
 
 build() {
@@ -46,10 +48,6 @@
   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/rpcbind.socket
   # add state directory
   install -d -m 700 -o 32 -g 32 $pkgdir/var/lib/rpcbind
   # install license

Added: systemd_service.diff
===================================================================
--- systemd_service.diff	                        (rev 0)
+++ systemd_service.diff	2016-12-06 15:25:19 UTC (rev 282879)
@@ -0,0 +1,10 @@
+--- rpcbind-0.2.4/systemd/rpcbind.service.in	2016-11-28 21:47:28.000000000 +0100
++++ rpcbind-0.2.4/systemd/rpcbind.service.in.new	2016-12-06 16:18:54.429326613 +0100
+@@ -11,6 +11,7 @@
+ [Service]
+ Type=notify
+ # distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
++EnvironmentFile=/etc/conf.d/rpcbind
+ ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS -w -f
+ 
+ [Install]