openrc-base-20151014-1: updating version

2 files changed, 83 insertions, 76 deletions

diff --git a/pcr/openrc-base/PKGBUILD b/pcr/openrc-base/PKGBUILD
index 476235c28..1c2440f48 100644
--- a/pcr/openrc-base/PKGBUILD
+++ b/pcr/openrc-base/PKGBUILD
@@ -1,35 +1,32 @@
-# Maintainer (Arch): artoo <artoo@manjaro.org>
+# Maintainer (Manjaro): artoo <artoo@manjaro.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor: freaj <freaj@riseup.net>
 
-_gentoo_uri="http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86"
+_gentoo_uri="https://raw.githubusercontent.com/gentoo/gentoo/master"
+
+_uscript_ver=30
 
 pkgbase=openrc-base
 pkgname=('cronie-openrc'
-		'cryptsetup-openrc'
-		'dbus-openrc'
-		'dhcpcd-openrc'
-		'device-mapper-openrc'
-		'glibc-openrc'
-		'inetutils-openrc'
-		'lvm2-openrc'
-		'mdadm-openrc')
-pkgver=20150613
+        'cryptsetup-openrc'
+        'dhcpcd-openrc'
+        'device-mapper-openrc'
+        'glibc-openrc'
+        'inetutils-openrc'
+        'lvm2-openrc'
+        'mdadm-openrc'
+        'udev-openrc')
+        #'dbus-openrc')
+pkgver=20151014
 pkgrel=1
 pkgdesc="OpenRC init scripts"
 arch=('any')
 url="https://github.com/manjaro/packages-openrc"
 license=('GPL2')
 groups=('openrc-base')
-conflicts=('initscripts'
-		'systemd-sysvcompat'
-		'openrc'
-		'openrc-git'
-		'openrc-sysvinit')
+conflicts=('systemd-sysvcompat')
 source=("cronie.initd::${_gentoo_uri}/sys-process/cronie/files/cronie-1.3-initd"
 		"dmcrypt.confd::${_gentoo_uri}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd"
 		"dmcrypt.initd::${_gentoo_uri}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc"
-		"dbus.initd::${_gentoo_uri}/sys-apps/dbus/files/dbus.initd"
 		"nscd.initd::${_gentoo_uri}/sys-libs/glibc/files/nscd"
 		"device-mapper.confd::${_gentoo_uri}/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3"
 		"device-mapper.initd::${_gentoo_uri}/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2"
@@ -44,26 +41,30 @@ source=("cronie.initd::${_gentoo_uri}/sys-process/cronie/files/cronie-1.3-initd"
 		"mdraid.initd::${_gentoo_uri}/sys-fs/mdadm/files/mdraid.rc"
 		"dhcpcd.initd::${_gentoo_uri}/net-misc/dhcpcd/files/dhcpcd.initd"
 		'ftpd.confd'
-		'ftpd.initd')
-sha256sums=('292a7b20fe33bd027357475fea6aa1194afa7e5c1c47a85299db945b9d1c847e'
+		'ftpd.initd'
+		"http://dev.gentoo.org/~williamh/dist/udev-init-scripts-${_uscript_ver}.tar.gz"
+		"kmod-static-nodes.initd::${_gentoo_uri}/sys-apps/kmod/files/kmod-static-nodes-r1")
+		#"dbus.initd::${_gentoo_uri}/sys-apps/dbus/files/dbus.initd")
+sha256sums=('316753fd55bcc196aaee034f14a25f2324545749bf7bdd44fd3762d11ab18d05'
             '3d933a54abe62a547294b83208dbf5d7615d9c7f380d6504c91fff3620530803'
-            '4bec4e67e2447a4472eecdd2fb31325b4dd558e1fe283683f86707629b9d192d'
-            '98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01'
-            '6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8'
+            'd0a55d31c713bbddf7d05634018623586e69d43281bc5019b5b821a745f9a57f'
+            '7da9311c50f432d425549288288e0952d50e08644a06af6b8e2f886039f682fe'
             '57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22'
-            '036b6de05e6cbd921a667d6fc6b01d30c8f9b720e1a0d0e2453ecd62d32573fb'
-            '0c051388991ba69afbf2f6baf36ba227d7c26fc8f0d7588d8de76d9a74886d79'
+            'eb5c194b5e70a6fef95d5b1064771e37384d0972494a500fc22c3265eb9064e4'
+            '63e45f4a86c9c0be27d455999289f0dd62d912c04f12a38e3fa0257fafe293fb'
             '28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844'
-            'a5754ffa0a05a0c29a9f6b5acf1b21dd313581fd6156c1ef722dc620e0114676'
-            'd7655cadd3a3a9d3683a540413365310ca9503c38fd21a9bfccec40630ca72f1'
-            '60accb4b6114753232f2db0adf3fc3f46d4459bfedf79b888801a13c55d79fa9'
+            '53aaa87749be5cc89942e2485ea76491e3f2ca98de4f9a392fac4cd88c87f548'
+            '258b913654312e39ab8db4aa43584cbeee8d654621f357810e6dac744312fb62'
+            '84fe3d786652a0d73f3626923feffa1fcb0a0b0054260cb5f73b0485d99fa168'
             'ec55674955af7a31da51b8b72b599e8519809287dad796a9b16155bcba471b79'
-            '3073b14619cb7b2c99c33f2d6cfd1e59ce5557899bffebaa65fa52f3caffadc7'
+            'b686fbc31b85a9dbf2f8569ce9158858e7f96a0ee02b21f68c36cb38eedbf927'
             'b489ced10391d4295bb8ca29e128b0d4217c290f1b4e37b05f5a9275048d289d'
-            '003b2c832909f1b89ffd283fb02d2712791d922394e201de0e42c0b463b2b1bd'
+            '9681b6bc6358dd80f6add0a115faa0113afa2be1784de4e07dbf31c460ac4252'
             '72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492'
             '59fe1aa68c43f4958afc397a0d6b35da263a20fcdb457005123a0d64cb1f7477'
-            '7f46e5e9ac9f204fb1564560c506a5bb4cede8823b89e3f1844e4f8be258e9ef')
+            '7f46e5e9ac9f204fb1564560c506a5bb4cede8823b89e3f1844e4f8be258e9ef'
+            '4de998d68e28f8ce4c1d4c9955aec0fa4cfe84673cbf3bfe1be71a1e9918693f'
+            'b9452437b06aae67e19e2cade37e89398ab5a7162318e15d1ed083606b1fe7e0')
 
 pkgver() {
 	date +%Y%m%d
@@ -73,8 +74,9 @@ _inst_initd(){
 	install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1
 
 	sed -e 's|#!/sbin/runscript|#!/usr/bin/openrc-run|' \
-		-e 's|/var/run|/run|g' \
-		-i ${pkgdir}/etc/init.d/$1
+            -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|' \
+            -e 's|/var/run|/run|g' \
+            -i ${pkgdir}/etc/init.d/$1
 }
 
 _inst_confd(){
@@ -84,15 +86,11 @@ _inst_confd(){
 package_cronie-openrc() {
 	pkgdesc="OpenRC cronie init script"
 	groups=('openrc-base' 'openrc-desktop')
-	depends=('openrc-core' 'cronie')
+	depends=('openrc' 'cronie')
 	provides=('openrc-cron')
 	conflicts=('fcron'
-			'fcron-openrc'
-			'openrc'
-			'openrc-git'
-			'openrc-arch-services-git'
-			'initscripts'
-			'systemd-sysvcompat')
+                    'fcron-openrc'
+                    'systemd-sysvcompat')
 	backup=('etc/init.d/cronie')
 	install=cronie.install
 
@@ -101,10 +99,21 @@ package_cronie-openrc() {
 	sed -e 's|/usr/sbin|/usr/bin|g' -i ${pkgdir}/etc/init.d/cronie
 }
 
+# package_dbus-openrc() {
+#     pkgdesc="OpenRC dbus init script"
+#     groups=('openrc-base' 'openrc-desktop')
+#     depends=('openrc' 'dbus')
+#     install=dbus.install
+#
+#     _inst_initd 'dbus'
+#
+#     sed -e 's|dbus.pid|dbus/pid|g' -i "${pkgdir}/etc/init.d/dbus"
+# }
+
 package_dhcpcd-openrc() {
 	pkgdesc="OpenRC dhcpcd init script"
 	groups=('openrc-base' 'openrc-desktop')
-	depends=('openrc-core' 'dhcpcd')
+	depends=('openrc' 'dhcpcd')
 	install=dhcpcd.install
 
 	_inst_initd 'dhcpcd'
@@ -112,20 +121,9 @@ package_dhcpcd-openrc() {
 	sed -e 's|/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/dhcpcd"
 }
 
-package_dbus-openrc() {
-	pkgdesc="OpenRC dbus init script"
-	groups=('openrc-base' 'openrc-desktop')
-	depends=('openrc-core' 'dbus')
-	install=dbus.install
-
-	_inst_initd 'dbus'
-
-	sed -e 's|dbus.pid|dbus/pid|g' -i "${pkgdir}/etc/init.d/dbus"
-}
-
 package_device-mapper-openrc() {
 	pkgdesc="OpenRC device-mapper init script"
-	depends=('openrc-core' 'device-mapper')
+	depends=('openrc' 'device-mapper')
 	backup=('etc/conf.d/device-mapper')
 	install=device-mapper.install
 
@@ -152,7 +150,7 @@ package_cryptsetup-openrc() {
 
 package_glibc-openrc() {
 	pkgdesc="OpenRC nscd init script"
-	depends=('openrc-core' 'glibc')
+	depends=('openrc' 'glibc')
 	optdepends=('openldap-openrc'
 			'bind-openrc')
 	install=glibc.install
@@ -164,7 +162,7 @@ package_glibc-openrc() {
 
 package_inetutils-openrc() {
 	pkgdesc="OpenRC ftpd init script"
-	depends=('openrc-core' 'inetutils')
+	depends=('openrc' 'inetutils')
 	backup=('etc/conf.d/ftpd')
 	install=inetutils.install
 
@@ -190,14 +188,39 @@ package_lvm2-openrc() {
 
 package_mdadm-openrc() {
 	pkgdesc="OpenRC mdadm init script"
-	depends=('openrc-core' 'mdadm')
+	depends=('openrc' 'mdadm')
 	optdepends=('bind-openrc')
 	backup=('etc/conf.d/mdadm')
 	install=mdadm.install
 
-	_inst_confd 'mdadm'
-	_inst_initd 'mdadm'
+        for f in mdadm mdraid;do
+            _inst_confd $f
+            _inst_initd $f
+        done
+}
+
+package_udev-openrc(){
+        pkgver=${_uscript_ver}
+        pkgrel=3
+        pkgdesc="udev startup scripts for openrc"
+        groups=('openrc-base' 'openrc-desktop')
+        depends=('openrc' 'udev')
+
+        cd "${srcdir}/udev-init-scripts-${_uscript_ver}"
+	make DESTDIR="${pkgdir}" install
+	for f in ${pkgdir}/etc/init.d/*;do
+		sed -e "s|#!/sbin/openrc-run|#!/usr/bin/openrc-run|" \
+                    -e "s|#!/sbin/runscript|#!/usr/bin/openrc-run|" \
+			-e "s|/bin/udevadm|/usr/bin/udevadm|g" \
+			-e "s|/sbin/udevd|/usr/bin/udevd|g" \
+			-i "$f"
+	done
+	install -d "${pkgdir}/etc/runlevels/sysinit"
+	ln -sf "/etc/init.d/udev" "${pkgdir}/etc/runlevels/sysinit/udev"
+	ln -sf "/etc/init.d/udev-trigger" "${pkgdir}/etc/runlevels/sysinit/udev-trigger"
+
+	# kmod-static-nodes
+	_inst_initd 'kmod-static-nodes'
 
-	_inst_confd 'mdraid'
-	_inst_initd 'mdraid'
+	ln -sf "/etc/init.d/kmod-static-nodes" "${pkgdir}/etc/runlevels/sysinit/kmod-static-nodes"
 }
diff --git a/pcr/openrc-base/dbus.install b/pcr/openrc-base/dbus.install
deleted file mode 100644
index f93bc37ca..000000000
--- a/pcr/openrc-base/dbus.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_svc="dbus"
-_rlvl="default"
-
-post_install() {
-	_cmd="rc-update add ${_svc} ${_rlvl}"
-	echo "	==> run '${_cmd}'"
-}
-
-post_upgrade() {
-	post_install "$1"
-}
-
-post_remove() {
-	_cmd="rc-update del ${_svc} ${_rlvl}"
-	echo "	==> run '${_cmd}'"
-}