openrc-base-20170505-1: updating version

2 files changed, 184 insertions, 93 deletions

diff --git a/pcr/openrc-base/PKGBUILD b/pcr/openrc-base/PKGBUILD
index 1756af94b..25f94c5f0 100644
--- a/pcr/openrc-base/PKGBUILD
+++ b/pcr/openrc-base/PKGBUILD
@@ -3,6 +3,11 @@
 
 _url="https://raw.githubusercontent.com/gentoo/gentoo/master"
 
+_sed_args=(-e 's|/var/run|/run|g')
+prefix=true
+
+$_prefix && _sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g')
+
 pkgbase=openrc-base
 pkgname=('dbus-openrc'
         'cronie-openrc'
@@ -12,35 +17,56 @@ pkgname=('dbus-openrc'
         'glibc-openrc'
         'inetutils-openrc'
         'lvm2-openrc'
-        'mdadm-openrc')
-pkgver=20170315
-pkgrel=1.3
+        'mdadm-openrc'
+        'nfs-utils-openrc'
+        'quota-tools-openrc'
+        'rpcbind-openrc'
+        'syslog-ng-openrc')
+pkgver=20170505
+pkgrel=1
 pkgdesc="OpenRC init scripts"
 arch=('any')
 url="https://github.com/manjaro/packages-openrc"
 license=('GPL2')
+# groups=('openrc-base' 'base-nosystemd')
 groups=('base-openrc' 'openrc-base')
 conflicts=('systemd-sysvcompat')
 source=("cronie.initd::${_url}/sys-process/cronie/files/cronie-1.3-initd"
-		"dmcrypt.confd::${_url}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd"
-		"dmcrypt.initd::${_url}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc"
-		"nscd.initd::${_url}/sys-libs/glibc/files/nscd"
-		"device-mapper.confd::${_url}/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3"
-		"device-mapper.initd::${_url}/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2"
-		"dmeventd.initd::${_url}/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1"
-		"lvm.confd::${_url}/sys-fs/lvm2/files/lvm.confd-2.02.28-r2"
-		"lvm.initd::${_url}/sys-fs/lvm2/files/lvm.rc-2.02.166-r2"
-		"lvm-monitoring.initd::${_url}/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2"
-		"lvmetad.initd::${_url}/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3"
-# 		"lvmlockd.initd::${_url}/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1"
-		"mdadm.confd::${_url}/sys-fs/mdadm/files/mdadm.confd"
-		"mdadm.initd::${_url}/sys-fs/mdadm/files/mdadm.rc"
-		"mdraid.confd::${_url}/sys-fs/mdadm/files/mdraid.confd"
-		"mdraid.initd::${_url}/sys-fs/mdadm/files/mdraid.rc"
-		"dhcpcd.initd::${_url}/net-misc/dhcpcd/files/dhcpcd.initd"
-		"dbus.initd::${_url}/sys-apps/dbus/files/dbus.initd-r1"
-		'ftpd.confd'
-		'ftpd.initd')
+        "dmcrypt.confd::${_url}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd"
+        "dmcrypt.initd::${_url}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc"
+        "nscd.initd::${_url}/sys-libs/glibc/files/nscd"
+        "device-mapper.confd::${_url}/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3"
+        "device-mapper.initd::${_url}/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2"
+        "dmeventd.initd::${_url}/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1"
+        "lvm.confd::${_url}/sys-fs/lvm2/files/lvm.confd-2.02.28-r2"
+        "lvm.initd::${_url}/sys-fs/lvm2/files/lvm.rc-2.02.166-r2"
+        "lvm-monitoring.initd::${_url}/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2"
+        "lvmetad.initd::${_url}/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3"
+#         "lvmlockd.initd::${_url}/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1"
+        "mdadm.confd::${_url}/sys-fs/mdadm/files/mdadm.confd"
+        "mdadm.initd::${_url}/sys-fs/mdadm/files/mdadm.rc"
+        "mdraid.confd::${_url}/sys-fs/mdadm/files/mdraid.confd"
+        "mdraid.initd::${_url}/sys-fs/mdadm/files/mdraid.rc"
+        "dhcpcd.initd::${_url}/net-misc/dhcpcd/files/dhcpcd.initd"
+        "dbus.initd::${_url}/sys-apps/dbus/files/dbus.initd-r1"
+        'ftpd.confd'
+        'ftpd.initd'
+        "nfs.confd::${_url}/net-fs/nfs-utils/files/nfs.confd"
+        "nfs.initd::${_url}/net-fs/nfs-utils/files/nfs.initd"
+        "nfsclient.confd::${_url}/net-fs/nfs-utils/files/nfsclient.confd"
+        "nfsclient.initd::${_url}/net-fs/nfs-utils/files/nfsclient.initd"
+        "rpc.idmapd.initd::${_url}/net-fs/nfs-utils/files/rpc.idmapd.initd"
+        "rpc.pipefs.initd::${_url}/net-fs/nfs-utils/files/rpc.pipefs.initd"
+        "rpc.gssd.initd::${_url}/net-fs/nfs-utils/files/rpc.gssd.initd"
+        "rpc.svcgssd.initd::${_url}/net-fs/nfs-utils/files/rpc.svcgssd.initd"
+        "rpc.statd.initd::${_url}/net-fs/nfs-utils/files/rpc.statd.initd"
+        "quota.confd::${_url}/sys-fs/quota/files/quota.confd"
+        "quota.initd::${_url}/sys-fs/quota/files/quota.rc7"
+        "rpc.rquotad.initd::${_url}/sys-fs/quota/files/rpc.rquotad.initd"
+#         "rpcbind.confd::${_url}/net-nds/rpcbind/files/rpcbind.confd"
+        "rpcbind.initd::${_url}/net-nds/rpcbind/files/rpcbind.initd"
+        "syslog-ng.confd::${_url}/app-admin/syslog-ng/files/3.7/syslog-ng.confd"
+        "syslog-ng.initd::${_url}/app-admin/syslog-ng/files/3.7/syslog-ng.rc6")
 sha256sums=('8646ff964892eeb5f6c5da444a5ef5d898fb1f3a395c5b9fc85d32d8d56fc785'
             '3d933a54abe62a547294b83208dbf5d7615d9c7f380d6504c91fff3620530803'
             'd04627e1a64e4d86e957b20ff6f478fb376833b7602098a708af9c070e30a980'
@@ -59,41 +85,51 @@ sha256sums=('8646ff964892eeb5f6c5da444a5ef5d898fb1f3a395c5b9fc85d32d8d56fc785'
             '6bb9b8b0075e45e63e898ed043f3c5951dc3e95c1fa62d22cc6e0616c792ecd1'
             '00a1a8f254d4f40b6f98a2777809b9c45ad81c4aeb4c0592793dd839777990bd'
             '59fe1aa68c43f4958afc397a0d6b35da263a20fcdb457005123a0d64cb1f7477'
-            'b9aadae3d8bcb31df51613919c8b8cf787ce4d35fe26ce2b639e84b3a862c2e5')
+            '7f46e5e9ac9f204fb1564560c506a5bb4cede8823b89e3f1844e4f8be258e9ef'
+            'c652a4fe8a43dc68a818345db2b3acc560663b5b6c969324d4f23afb0fb96a94'
+            '247456e845e70badb44d9155b68e5f76d502361769e4332a9d1bd6345f85fbfa'
+            'e8842fca856eae598fb8fe15ed8d3cef13e61851217be66b8cc4087af8cee8ad'
+            '56973f5c8196b4227114d94a1d3c8c95518be5a02c6b5dc97da243d0b6086843'
+            'dc21ce6ba28f45eb450d5d0dbe7e5ea706b1547c8bece4ddb6836a5433427bd6'
+            '04102bff9b13d2e7c4e30603e7c98fe412d5f6c907a37dcea95f420f153c29ae'
+            '83c318a7502718a3e1693869297b95db1c32270b37d45b26b2bc151ec06f3c08'
+            '272905335a7c82034c6bac007bd4477aae21d8ce49e82355c48301db771ba77e'
+            '6f3d93442db0c17436547a16155e0d61dd5cd17f49fd3a642a9a5de833411d51'
+            '00d1dfb3b893db5d6a213a4edda622c7d64dcafa40b3019f15e070c164286632'
+            '2a4dc1f695a881d0715e6220dad54b3690d98bf26b618b0fe6cb4ab26823e047'
+            'ef7eec0fd1921f786580169628c9cc7af82c73d0b2cf420fba0e87f8fd428651'
+            'da992f87b5043e22dfd340b4a5440b76dce29cc14d3ef7b0ce586726fe4b220b'
+            'b29325498ee3b1f3d63672efcd1e93f0745eecdb9f4bb05fed82a2f085399484'
+            '5c4ad3406fc885555883de0537614034de181d783bcb1e864bff6299ac6c1356')
 
 pkgver() {
-	date +%Y%m%d
+    date +%Y%m%d
 }
 
 _inst_initd(){
-	install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1
+    install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1
 
-	sed -e 's|/var/run|/run|g' \
-        -i ${pkgdir}/etc/init.d/$1
+    sed ${_sed_args[@]} -i ${pkgdir}/etc/init.d/$1
 }
 
 _inst_confd(){
-	install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1
+    install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1
 }
 
 package_cronie-openrc() {
-	pkgdesc="OpenRC cronie init script"
-	groups=('base-openrc' 'openrc-base' 'openrc-desktop')
-	depends=('openrc' 'cronie')
-	provides=('openrc-cron')
-	conflicts=('fcron'
-                    'fcron-openrc'
-                    'systemd-sysvcompat')
-	backup=('etc/init.d/cronie')
+    pkgdesc="OpenRC cronie init script"
+    depends=('openrc' 'cronie')
+    provides=('openrc-cron')
+    conflicts=('fcron' 'fcron-openrc' 'systemd-sysvcompat')
+    backup=('etc/init.d/cronie')
 
-	_inst_initd 'cronie'
+    _inst_initd 'cronie'
 
-	sed -e 's|/usr/sbin|/usr/bin|g' -i ${pkgdir}/etc/init.d/cronie
+    sed -e 's|/usr/sbin|/usr/bin|g' -i ${pkgdir}/etc/init.d/cronie
 }
 
 package_dbus-openrc() {
     pkgdesc="OpenRC dbus init script"
-    groups=('base-openrc' 'openrc-base' 'openrc-desktop')
     depends=('openrc' 'dbus')
 
     _inst_initd 'dbus'
@@ -102,87 +138,142 @@ package_dbus-openrc() {
 }
 
 package_dhcpcd-openrc() {
-	pkgdesc="OpenRC dhcpcd init script"
-	groups=('base-openrc' 'openrc-base' 'openrc-desktop')
-	depends=('openrc' 'dhcpcd')
+    pkgdesc="OpenRC dhcpcd init script"
+    depends=('openrc' 'dhcpcd')
 
-	_inst_initd 'dhcpcd'
+    _inst_initd 'dhcpcd'
 
-	sed -e 's|/sbin/dhcpcd|/usr/bin/dhcpcd|g' -i "${pkgdir}/etc/init.d/dhcpcd"
+    sed -e 's|/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/dhcpcd"
 }
 
 package_device-mapper-openrc() {
-	pkgdesc="OpenRC device-mapper init script"
-	depends=('openrc' 'device-mapper' 'udev-openrc')
-	backup=('etc/conf.d/device-mapper')
+    pkgdesc="OpenRC device-mapper init script"
+    depends=('device-mapper' 'eudev-openrc')
+    backup=('etc/conf.d/device-mapper')
 
-	_inst_confd 'device-mapper'
-	_inst_initd 'device-mapper'
-	_inst_initd 'dmeventd'
+    _inst_confd 'device-mapper'
+    _inst_initd 'device-mapper'
+    _inst_initd 'dmeventd'
 
-	sed -e 's|/sbin/dmsetup|/usr/bin/dmsetup|g' -i "${pkgdir}/etc/init.d/device-mapper"
-	sed -e 's|/sbin/dmeventd|/usr/bin/dmeventd|g' -i "${pkgdir}/etc/init.d/dmeventd"
+    for f in ${pkgdir}/etc/init.d/*; do
+        sed -e 's|/sbin|/usr/bin|g' -i $f
+    done
 }
 
 package_cryptsetup-openrc() {
-	pkgdesc="OpenRC cryptsetup init script"
-	depends=('device-mapper-openrc' 'cryptsetup')
-	backup=('etc/conf.d/dmcrypt')
+    pkgdesc="OpenRC cryptsetup init script"
+    depends=('device-mapper-openrc' 'cryptsetup')
+    backup=('etc/conf.d/dmcrypt')
 
-	_inst_confd 'dmcrypt'
-	_inst_initd 'dmcrypt'
+    _inst_confd 'dmcrypt'
+    _inst_initd 'dmcrypt'
 
-	sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/dmcrypt"
+    sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/dmcrypt"
 }
 
 package_glibc-openrc() {
-	pkgdesc="OpenRC nscd init script"
-	depends=('openrc' 'glibc')
-	optdepends=('openldap-openrc'
-			'bind-openrc')
+    pkgdesc="OpenRC nscd init script"
+    depends=('openrc' 'glibc')
 
-	_inst_initd 'nscd'
+    _inst_initd 'nscd'
 
-	sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/nscd"
+    sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/nscd"
 }
 
 package_inetutils-openrc() {
-	pkgdesc="OpenRC ftpd init script"
-	depends=('openrc' 'inetutils')
-	backup=('etc/conf.d/ftpd')
+    pkgdesc="OpenRC ftpd init script"
+    depends=('openrc' 'inetutils')
+    backup=('etc/conf.d/ftpd')
 
-	_inst_confd 'ftpd'
-	_inst_initd 'ftpd'
+    _inst_confd 'ftpd'
+    _inst_initd 'ftpd'
 }
 
 package_lvm2-openrc() {
-	pkgdesc="OpenRC lvm2 init script"
-	depends=('device-mapper-openrc' 'lvm2')
-	backup=('etc/conf.d/lvm')
+    pkgdesc="OpenRC lvm2 init script"
+    depends=('device-mapper-openrc' 'lvm2')
+    backup=('etc/conf.d/lvm')
+
+    _inst_confd 'lvm'
 
-	_inst_confd 'lvm'
-	_inst_initd 'lvm'
-	_inst_initd 'lvm-monitoring'
-	_inst_initd 'lvmetad'
+    for f in lvm lvm-monitoring lvmetad; do
+        _inst_initd "$f"
+    done
 
-	sed -e 's|/sbin |/usr/bin |g' -i "${pkgdir}/etc/init.d/lvm"
-	sed -e 's|/sbin/lvm|/usr/bin/lvm|g' -i "${pkgdir}/etc/init.d/lvm"
-	sed -e 's|/sbin/vgs|/usr/bin/vgs|g' -i "${pkgdir}/etc/init.d/lvm"
-	sed -e 's|/sbin/vgchange|/usr/bin/vgchange|g' -i "${pkgdir}/etc/init.d/lvm"
-	sed -e 's|/sbin/lvchange|/usr/bin/lvchange|g' -i "${pkgdir}/etc/init.d/lvm"
-	sed -e 's|/sbin/vgchange|/usr/bin/vgchange|g' -i "${pkgdir}/etc/init.d/lvm-monitoring"
-	sed -e 's|/sbin/vgs|/usr/bin/vgs|g' -i "${pkgdir}/etc/init.d/lvm-monitoring"
-	sed -e 's|/sbin/lvmetad|/usr/bin/lvmetad|g' -i "${pkgdir}/etc/init.d/lvmetad"
+    for f in ${pkgdir}/etc/init.d/*; do
+        sed -e 's|/sbin|/usr/bin|g' -i $f
+    done
+
+    sed -e 's|/proc/self/fd/0|vgs|g' -i ${pkgdir}/etc/init.d/lvm
 }
 
 package_mdadm-openrc() {
-	pkgdesc="OpenRC mdadm init script"
-	depends=('openrc' 'mdadm')
-	optdepends=('bind-openrc')
-	backup=('etc/conf.d/mdadm')
+    pkgdesc="OpenRC mdadm init script"
+    depends=('openrc' 'mdadm')
+    backup=('etc/conf.d/mdadm')
+
+    for f in mdadm mdraid;do
+        _inst_confd $f
+        _inst_initd $f
+    done
+}
+
+package_syslog-ng-openrc() {
+    pkgdesc="OpenRC syslog-ng init script"
+    depends=('openrc' 'syslog-ng')
+    backup=('etc/conf.d/syslog-ng')
+
+    _inst_confd 'syslog-ng'
+    _inst_initd 'syslog-ng'
+}
+
+package_rpcbind-openrc() {
+    pkgdesc="OpenRC rpcbind init script"
+#     groups=('openrc-base')
+    depends=('openrc' 'rpcbind')
+#     backup=('etc/conf.d/rpcbind')
+
+#     _inst_confd 'rpcbind'
+    _inst_initd 'rpcbind'
 
-        for f in mdadm mdraid;do
-            _inst_confd $f
-            _inst_initd $f
-        done
+    sed -e 's|/sbin|/usr/bin|g' \
+        -e 's|RPCBIND_OPTS|RPCBIND_ARGS|' \
+        -i "${pkgdir}/etc/init.d/rpcbind"
 }
+
+package_quota-tools-openrc() {
+    pkgdesc="OpenRC quota-tools init script"
+#     groups=('openrc-base')
+    depends=('quota-tools' 'rpcbind-openrc')
+    backup=('etc/conf.d/quota')
+
+    _inst_confd 'quota'
+    _inst_initd 'quota'
+    _inst_initd 'rpc.rquotad'
+
+    for f in ${pkgdir}/etc/init.d/*;do
+            sed -e 's|/usr/sbin|/usr/bin|g' -i $f
+    done
+}
+
+package_nfs-utils-openrc() {
+    pkgdesc="OpenRC nfs-utils init script"
+#     groups=('openrc-base')
+    depends=('nfs-utils' 'rpcbind-openrc' 'device-mapper-openrc')
+    backup=('etc/conf.d/nfs'
+            'etc/conf.d/nfsclient')
+
+    for f in nfs nfsclient;do
+        _inst_confd $f
+        _inst_initd $f
+    done
+
+    for f in rpc.gssd rpc.idmapd rpc.pipefs rpc.statd rpc.svcgssd;do
+        _inst_initd $f
+    done
+
+    for f in ${pkgdir}/etc/init.d/*;do
+            sed -e 's|/usr/sbin|/usr/bin|g' -i $f
+    done
+}
+
diff --git a/pcr/openrc-base/ftpd.initd b/pcr/openrc-base/ftpd.initd
index 68be16a36..a53184c4c 100644
--- a/pcr/openrc-base/ftpd.initd
+++ b/pcr/openrc-base/ftpd.initd
@@ -1,4 +1,4 @@
-#!/sbin/openrc-run
+#!/usr/bin/openrc-run
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2