openrc-base-20170926-1: updating version

2 files changed, 72 insertions, 72 deletions

diff --git a/pcr/openrc-base/PKGBUILD b/pcr/openrc-base/PKGBUILD
index a45e75af5..20b6d16f6 100644
--- a/pcr/openrc-base/PKGBUILD
+++ b/pcr/openrc-base/PKGBUILD
@@ -9,11 +9,11 @@ prefix=true
 $_prefix && _sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g')
 
 pkgbase=openrc-base
-pkgname=('dbus-openrc'
-         'cronie-openrc'
+pkgname=('cronie-openrc'
          'cryptsetup-openrc'
-         'dhcpcd-openrc'
+         'dbus-openrc'
          'device-mapper-openrc'
+         'dhcpcd-openrc'
          'glibc-openrc'
          'inetutils-openrc'
          'kmod-openrc'
@@ -23,8 +23,8 @@ pkgname=('dbus-openrc'
          'quota-tools-openrc'
          'rpcbind-openrc'
          'syslog-ng-openrc')
-pkgver=20170904
-pkgrel=1.1
+pkgver=20170926
+pkgrel=1
 pkgdesc="OpenRC init scripts"
 arch=('any')
 url="https://github.com/manjaro/packages-openrc"
@@ -34,23 +34,24 @@ 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"
+        "dbus.initd::${_url}/sys-apps/dbus/files/dbus.initd-r1"
         "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"
+        "dhcpcd.initd::${_url}/net-misc/dhcpcd/files/dhcpcd.initd"
+        "nscd.initd::${_url}/sys-libs/glibc/files/nscd"
+        'ftpd.confd'
+        'ftpd.initd'
+        'kmod-static-nodes.initd'
         "lvm.confd::${_url}/sys-fs/lvm2/files/lvm.confd-2.02.28-r2"
         "lvm.initd::${_url}/sys-fs/lvm2/files/lvm.rc-2.02.172"
         "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"
+#        "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"
@@ -63,18 +64,22 @@ source=("cronie.initd::${_url}/sys-process/cronie/files/cronie-1.3-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.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"
-        'kmod-static-nodes.initd')
+        "syslog-ng.initd::${_url}/app-admin/syslog-ng/files/3.7/syslog-ng.rc6")
 sha256sums=('8646ff964892eeb5f6c5da444a5ef5d898fb1f3a395c5b9fc85d32d8d56fc785'
             '3d933a54abe62a547294b83208dbf5d7615d9c7f380d6504c91fff3620530803'
             'd04627e1a64e4d86e957b20ff6f478fb376833b7602098a708af9c070e30a980'
-            '13391343bfc64379c696b4bfc1cfe8d7fbb2886f477265343fddf448d82deabf'
+            '00a1a8f254d4f40b6f98a2777809b9c45ad81c4aeb4c0592793dd839777990bd'
             '57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22'
             'e8bfde63341f9e6136ee20a15ed9ea455e2259dbcaea756f8c3d0f710c1c2746'
             '5edaaad292d4fd6b67fd5323636dd2e839be33ae16fbc7872dadb0499fcf22da'
+            '6bb9b8b0075e45e63e898ed043f3c5951dc3e95c1fa62d22cc6e0616c792ecd1'
+            '13391343bfc64379c696b4bfc1cfe8d7fbb2886f477265343fddf448d82deabf'
+            '59fe1aa68c43f4958afc397a0d6b35da263a20fcdb457005123a0d64cb1f7477'
+            '925c1531fd447792a4b2031473057c16bf6cf77486f11aa7f6e50d69f838e2d7'
+            '3ecbe7761b92a123a5a3d395ec3d9e090b0dfba7910a5987b4a2298c20a7e571'
             '28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844'
             '499fae740d7740895842e2a6db8736272ceacf2d4b6f57f00a8ff91b7993d1da'
             '42847d8e6dabbcf2cc19846c6ad22cbab65e9a033c4add569b152504b16ab477'
@@ -83,10 +88,6 @@ sha256sums=('8646ff964892eeb5f6c5da444a5ef5d898fb1f3a395c5b9fc85d32d8d56fc785'
             '5b859ba14b7a4a350c0a8afe6edb352e0db9920bdf1e05315ffbbfb92f201584'
             'b489ced10391d4295bb8ca29e128b0d4217c290f1b4e37b05f5a9275048d289d'
             '31e7ba4174f38c05e939aa56fab8a43a3e371ba9e503e029887c99fed7a28331'
-            '6bb9b8b0075e45e63e898ed043f3c5951dc3e95c1fa62d22cc6e0616c792ecd1'
-            '00a1a8f254d4f40b6f98a2777809b9c45ad81c4aeb4c0592793dd839777990bd'
-            '59fe1aa68c43f4958afc397a0d6b35da263a20fcdb457005123a0d64cb1f7477'
-            '7f46e5e9ac9f204fb1564560c506a5bb4cede8823b89e3f1844e4f8be258e9ef'
             'c652a4fe8a43dc68a818345db2b3acc560663b5b6c969324d4f23afb0fb96a94'
             '247456e845e70badb44d9155b68e5f76d502361769e4332a9d1bd6345f85fbfa'
             'e8842fca856eae598fb8fe15ed8d3cef13e61851217be66b8cc4087af8cee8ad'
@@ -101,8 +102,7 @@ sha256sums=('8646ff964892eeb5f6c5da444a5ef5d898fb1f3a395c5b9fc85d32d8d56fc785'
             'ef7eec0fd1921f786580169628c9cc7af82c73d0b2cf420fba0e87f8fd428651'
             'da992f87b5043e22dfd340b4a5440b76dce29cc14d3ef7b0ce586726fe4b220b'
             'b29325498ee3b1f3d63672efcd1e93f0745eecdb9f4bb05fed82a2f085399484'
-            '5c4ad3406fc885555883de0537614034de181d783bcb1e864bff6299ac6c1356'
-            '3ecbe7761b92a123a5a3d395ec3d9e090b0dfba7910a5987b4a2298c20a7e571')
+            '5c4ad3406fc885555883de0537614034de181d783bcb1e864bff6299ac6c1356')
 
 pkgver() {
     date +%Y%m%d
@@ -130,6 +130,17 @@ package_cronie-openrc() {
     sed -e 's|/usr/sbin|/usr/bin|g' -i ${pkgdir}/etc/init.d/cronie
 }
 
+package_cryptsetup-openrc() {
+    pkgdesc="OpenRC cryptsetup init script"
+    depends=('device-mapper-openrc' 'cryptsetup')
+    backup=('etc/conf.d/dmcrypt')
+
+    _inst_confd 'dmcrypt'
+    _inst_initd 'dmcrypt'
+
+    sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/dmcrypt"
+}
+
 package_dbus-openrc() {
     pkgdesc="OpenRC dbus init script"
     depends=('openrc' 'dbus-elogind')
@@ -139,15 +150,6 @@ package_dbus-openrc() {
     sed -e 's|dbus.pid|dbus/pid|g' -i "${pkgdir}/etc/init.d/dbus"
 }
 
-package_dhcpcd-openrc() {
-    pkgdesc="OpenRC dhcpcd init script"
-    depends=('openrc' 'dhcpcd')
-
-    _inst_initd '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=('device-mapper' 'eudev-openrc')
@@ -162,15 +164,13 @@ package_device-mapper-openrc() {
     done
 }
 
-package_cryptsetup-openrc() {
-    pkgdesc="OpenRC cryptsetup init script"
-    depends=('device-mapper-openrc' 'cryptsetup')
-    backup=('etc/conf.d/dmcrypt')
+package_dhcpcd-openrc() {
+    pkgdesc="OpenRC dhcpcd init script"
+    depends=('openrc' 'dhcpcd')
 
-    _inst_confd 'dmcrypt'
-    _inst_initd 'dmcrypt'
+    _inst_initd 'dhcpcd'
 
-    sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/dmcrypt"
+    sed -e 's|/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/dhcpcd"
 }
 
 package_glibc-openrc() {
@@ -230,26 +230,24 @@ package_mdadm-openrc() {
     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_nfs-utils-openrc() {
+    pkgdesc="OpenRC nfs-utils init script"
+    depends=('nfs-utils' 'rpcbind-openrc' 'device-mapper-openrc')
+    backup=('etc/conf.d/nfs'
+            'etc/conf.d/nfsclient')
 
-package_rpcbind-openrc() {
-    pkgdesc="OpenRC rpcbind init script"
-    depends=('openrc' 'rpcbind')
-#    backup=('etc/conf.d/rpcbind')
+    for f in nfs nfsclient;do
+        _inst_confd $f
+        _inst_initd $f
+    done
 
-#    _inst_confd 'rpcbind'
-    _inst_initd 'rpcbind'
+    for f in rpc.gssd rpc.idmapd rpc.pipefs rpc.statd rpc.svcgssd;do
+        _inst_initd $f
+    done
 
-    sed -e 's|/sbin|/usr/bin|g' \
-        -e 's|RPCBIND_OPTS|RPCBIND_ARGS|' \
-        -i "${pkgdir}/etc/init.d/rpcbind"
+    for f in ${pkgdir}/etc/init.d/*;do
+        sed -e 's|/usr/sbin|/usr/bin|g' -i $f
+    done
 }
 
 package_quota-tools-openrc() {
@@ -262,27 +260,30 @@ package_quota-tools-openrc() {
     _inst_initd 'rpc.rquotad'
 
     for f in ${pkgdir}/etc/init.d/*;do
-            sed -e 's|/usr/sbin|/usr/bin|g' -i $f
+        sed -e 's|/usr/sbin|/usr/bin|g' -i $f
     done
 }
 
-package_nfs-utils-openrc() {
-    pkgdesc="OpenRC nfs-utils init script"
-    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
+package_rpcbind-openrc() {
+    pkgdesc="OpenRC rpcbind init script"
+    depends=('openrc' 'rpcbind')
+#    backup=('etc/conf.d/rpcbind')
 
-    for f in rpc.gssd rpc.idmapd rpc.pipefs rpc.statd rpc.svcgssd;do
-        _inst_initd $f
-    done
+#    _inst_confd 'rpcbind'
+    _inst_initd 'rpcbind'
 
-    for f in ${pkgdir}/etc/init.d/*;do
-            sed -e 's|/usr/sbin|/usr/bin|g' -i $f
-    done
+    sed -e 's|/sbin|/usr/bin|g' \
+        -e 's|RPCBIND_OPTS|RPCBIND_ARGS|' \
+        -i "${pkgdir}/etc/init.d/rpcbind"
 }
 
+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'
+
+    sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/syslog-ng"
+}
diff --git a/pcr/openrc-base/ftpd.initd b/pcr/openrc-base/ftpd.initd
index a53184c4c..41be2d5ce 100644
--- a/pcr/openrc-base/ftpd.initd
+++ b/pcr/openrc-base/ftpd.initd
@@ -24,4 +24,3 @@ stop() {
         --pidfile "${FTPD_PIDFILE}" --quiet
     eend $?
 }
-