openrc-core-0.18.3-1: updating version

5 files changed, 135 insertions, 106 deletions

diff --git a/pcr/openrc-core/LICENSE b/pcr/openrc-core/LICENSE
new file mode 100644
index 000000000..a995d5485
--- /dev/null
+++ b/pcr/openrc-core/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) <YEAR>, <OWNER>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/pcr/openrc-core/PKGBUILD b/pcr/openrc-core/PKGBUILD
index 6b0e15b09..589f1260c 100644
--- a/pcr/openrc-core/PKGBUILD
+++ b/pcr/openrc-core/PKGBUILD
@@ -2,95 +2,98 @@
 # Contributor (Manjaro): williamh <williamh@gentoo.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-_pkgname="openrc"
+_src_uri="https://github.com"
 
-_src_uri="http://dev.gentoo.org/~williamh/dist"
-_net_uri="http://dev.gentoo.org/~robbat2/distfiles"
-_g_uri="https://github.com/gentoo/gentoo-functions/archive" #/0.10.tar.gz
+_rc_uri="${_src_uri}/OpenRC/openrc/archive"
+_net_uri="${_src_uri}/gentoo/netifrc/archive"
+_func_uri="${_src_uri}/gentoo/gentoo-functions/archive"
 
-_udev="udev-init-scripts"
-_uver=30
+_rc_ver=0.18.3
+_net_ver=0.3.1
+_func_ver=0.10
 
-_net="netifrc"
-_nver=0.3.1
-
-_genf="gentoo-functions"
-_gver=0.10
-
-pkgname=openrc-core
-pkgdesc="Gentoo's universal init system, udev enabled."
-pkgver=0.18
+pkgver=${_rc_ver}
 pkgrel=1
-pkgdesc="Gentoo's universal init system, udev enabled."
+pkgbase=openrc-core
+pkgname=('openrc' 'netifrc')
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.gentoo.org/proj/en/base/openrc/"
-license=('BSD2' 'GPL2')
-depends=('inetutils' 'psmisc' 'sysvinit' 'udev>=186')
-optdepends=('dhcpcd-openrc: dhcpcd initscript')
-conflicts=('openrc' 'openrc-git' 'initscripts' 'systemd-sysvcompat' 'openrc-sysvinit')
-backup=('etc/rc.conf'
-	'etc/conf.d/consolefont'
-	'etc/conf.d/keymaps'
-	'etc/conf.d/hostname'
-	'etc/conf.d/modules'
-	'etc/conf.d/net'
-	'etc/conf.d/hwclock'
-	'etc/inittab')
-install=${_pkgname}.install
-source=("${_src_uri}/${_pkgname}-${pkgver}.tar.bz2"
-	"${_src_uri}/${_udev}-${_uver}.tar.gz"
-	"${_net_uri}/${_net}-${_nver}.tar.bz2"
-	"${_genf}-${_gver}::${_g_uri}/${_gver}.tar.gz"
-	"${_pkgname}.logrotate"
-	'kmod-static-nodes')
-sha256sums=('1d4831d9941df9248a5622060fb974bc912382cd1f1e07682a34d50e8f5215e7'
-            '4de998d68e28f8ce4c1d4c9955aec0fa4cfe84673cbf3bfe1be71a1e9918693f'
-            'a92a96b6f065981ee1c0232a507f3695230eeb7fb6172ec9048c2538b36cfea8'
+license=('BSD2')
+source=("openrc-${_rc_ver}.tar.gz::${_rc_uri}/${_rc_ver}.tar.gz"
+	"netifrc-${_net_ver}.tar.gz::${_net_uri}/${_net_ver}.tar.gz"
+	"gentoo-functions-${_func_ver}.tar.gz::${_func_uri}/${_func_ver}.tar.gz"
+	"openrc.logrotate"
+	'LICENSE')
+sha256sums=('e8e0bbefd8b40284a167af5c5071bd2eff6304988b3fd935bd6834c62cfa2339'
+            '8ae41223cdc735eee8303e93959b31b6aeae6f1a08661ef5baa6373dd86419c7'
             '709c8b22f404001a512e47a7a4d3192070b3e150fb9d0f943de09736d665b0db'
             '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c'
-            'fc90e8d480de39aff90e41477f79720a98bee2a2359c53c209d0ca7bb75fb6ba')
-
-_base_args=(SYSCONFDIR=/etc)
-_base_args+=(BRANDING="Parabola")
-_id="parabola"
-_base_args+=(PREFIX=/usr)
-_base_args+=(SBINDIR=/usr/bin)
-
-_rc_args=( "${_base_args[@]}" )
-_rc_args+=(LIBEXECDIR=/usr/lib/rc)
-_rc_args+=(MKSELINUX=no)
-_rc_args+=(MKPAM=pam)
-_rc_args+=(MKTERMCAP=ncurses)
-_rc_args+=(MKNET=no)
-
-_f_args+=(ROOTPREFIX=/usr)
-_f_args+=(ROOTSBINDIR=/usr/bin)
-_f_args+=(ROOTLIBEXECDIR=/usr/lib/$_id)
+            '28875cc6cb52e93657b96cf1bf0cc3b91891cdcbbc3196007c8cd93c6e22078f')
+
+_configure_args() {
+    _base_args=(SYSCONFDIR=/etc)
+    _base_args+=(BRANDING="Parabola")
+    _id="parabola"
+    _base_args+=(PREFIX=/usr)
+    _base_args+=(SBINDIR=/usr/bin)
+
+    _rc_args=( "${_base_args[@]}" )
+    _rc_args+=(LIBEXECDIR=/usr/lib/rc)
+    _rc_args+=(MKSELINUX=no)
+    _rc_args+=(MKPAM=pam)
+    _rc_args+=(MKTERMCAP=ncurses)
+    _rc_args+=(MKNET=no)
+
+    _func_args+=(ROOTPREFIX=/usr)
+    _func_args+=(ROOTSBINDIR=/usr/bin)
+    _func_args+=(ROOTLIBEXECDIR=/usr/lib/$_id)
+
+    _net_args=( "${_base_args[@]}" )
+    _net_args+=(LIBEXECDIR=/usr/lib/netifrc)
+}
 
-_net_args=( "${_base_args[@]}" )
-_net_args+=(LIBEXECDIR=/usr/lib/${_net})
+_configure_args
 
 prepare(){
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+	cd "${srcdir}/openrc-${pkgver}"
 	sed -e "s|/sbin|/usr/bin|g" -i support/sysvinit/inittab
 }
 
 build(){
 	# make openrc
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+	cd "${srcdir}/openrc-${pkgver}"
 	make "${_rc_args[@]}"
 	# make netifrc
-	cd "${srcdir}/${_net}-${_nver}"
+	cd "${srcdir}/netifrc-${_net_ver}"
 	make "${_net_args[@]}"
-	cd ${srcdir}/${_genf}-${_gver}
-	make "${_f_args[@]}"
+	cd ${srcdir}/gentoo-functions-${_func_ver}
+	make "${_func_args[@]}"
 }
 
-package() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+package_openrc() {
+        pkgver=${_rc_ver}
+        pkgrel=1
+        pkgdesc="Gentoo's universal init system"
+        depends=('inetutils' 'psmisc' 'sysvinit')
+        optdepends=('netifrc: Network Interface Management Scripts'
+                    'networkmanager-openrc: NetworkManager'
+                    'connman-openrc: connman')
+        conflicts=('systemd-sysvcompat' 'openrc-core')
+        replaces=('openrc-core')
+        install=${pkgname}.install
+        backup=('etc/rc.conf'
+                'etc/conf.d/consolefont'
+                'etc/conf.d/keymaps'
+                'etc/conf.d/hostname'
+                'etc/conf.d/modules'
+                'etc/conf.d/hwclock'
+                'etc/inittab')
+
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" "${_rc_args[@]}" install
-	install -m644 "${srcdir}/${_pkgname}-${pkgver}/support/sysvinit/inittab" "${pkgdir}/etc/inittab"
-	install -Dm644 "${srcdir}/${_pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${_pkgname}"
+
+	install -m644 "${srcdir}/${pkgname}-${pkgver}/support/sysvinit/inittab" "${pkgdir}/etc/inittab"
+	install -Dm644 "${srcdir}/${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}"
 
 	sed -e 's/#unicode="NO"/unicode="YES"/' \
 	    -e 's/#rc_logger="YES"/rc_logger="YES"/' \
@@ -98,37 +101,32 @@ package() {
 
 	install -d ${pkgdir}/usr/lib/rc/cache
 
-	# udev
-	cd "${srcdir}/${_udev}-${_uver}"
-	make DESTDIR="${pkgdir}" install
-	sed -e "s|/sbin/udevd|/usr/bin/udevd|g" \
-		-e "s|#!/sbin/runscript|#!/usr/bin/openrc-run|" \
-		-i ${pkgdir}/etc/init.d/udev
-	for f in ${pkgdir}/etc/init.d/udev-trigger ${pkgdir}/etc/init.d/udev-settle;do
-		sed -e "s|#!/sbin/openrc-run|#!/usr/bin/openrc-run|" \
-			-e "s|/bin/udevadm|/usr/bin/udevadm|g" \
-			-i "$f"
-	done
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	ln -sf "/etc/init.d/udev" "${pkgdir}/etc/runlevels/sysinit/udev"
-	ln -sf "/etc/init.d/udev-trigger" "${pkgdir}/etc/runlevels/sysinit/udev-trigger"
-
-	# netifrc
-	cd "${srcdir}/${_net}-${_nver}"
-	make DESTDIR="${pkgdir}" "${_net_args[@]}" install
-	install -Dm 644 "${srcdir}/${_net}-${_nver}/doc/net.example" "${pkgdir}/etc/conf.d/net"
-
-	sed -e 's|#!/usr/bin/runscript|#!/usr/bin/openrc-run|' \
-	    -i "${pkgdir}/etc/init.d/net.lo"
-	ln -sf "/etc/init.d/net.lo" "${pkgdir}/etc/runlevels/boot/net.lo"
-	sed -e "s|/lib/gentoo/functions.sh|/usr/lib/$_id/functions.sh|g" \
-		-i "${pkgdir}/usr/lib/netifrc/sh/functions.sh"
-
-	# kmod-static-nodes
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	install -Dm755 "${srcdir}/kmod-static-nodes" "${pkgdir}/etc/init.d/kmod-static-nodes"
-	ln -sf "/etc/init.d/kmod-static-nodes" "${pkgdir}/etc/runlevels/sysinit/kmod-static-nodes"
-
-	cd ${srcdir}/${_genf}-${_gver}
-	make DESTDIR="${pkgdir}" "${_f_args[@]}" install
+	install -Dm644 ${srcdir}/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_netifrc() {
+        pkgver=${_net_ver}
+        pkgrel=3
+        groups=('openrc-base')
+        pkgdesc="Gentoo Network Interface Management Scripts"
+        depends=('udev-openrc')
+        install=${pkgname}.install
+        backup=('etc/conf.d/net')
+
+        cd "${srcdir}/${pkgname}-${pkgver}"
+        make DESTDIR="${pkgdir}" "${_net_args[@]}" install
+        install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/doc/net.example" "${pkgdir}/etc/conf.d/net"
+
+        install -d "${pkgdir}/etc/runlevels//boot"
+        sed -e 's|#!/usr/bin/runscript|#!/usr/bin/openrc-run|' \
+            -i "${pkgdir}/etc/init.d/net.lo"
+        ln -sf "/etc/init.d/net.lo" "${pkgdir}/etc/runlevels/boot/net.lo"
+
+        cd ${srcdir}/gentoo-functions-${_func_ver}
+        make DESTDIR="${pkgdir}" "${_func_args[@]}" install
+
+        sed -e "s|/lib/gentoo/functions.sh|/usr/lib/$_id/functions.sh|g" \
+                -i "${pkgdir}/usr/lib/${pkgname}/sh/functions.sh"
+
+        install -Dm644 ${srcdir}/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/pcr/openrc-core/kmod-static-nodes b/pcr/openrc-core/kmod-static-nodes
index 71bcf9c45..7a3f529dc 100644
--- a/pcr/openrc-core/kmod-static-nodes
+++ b/pcr/openrc-core/kmod-static-nodes
@@ -1,13 +1,14 @@
 #!/usr/bin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/files/Attic/kmod-static-nodes,v 1.2 2014/09/21 10:59:57 ssuominen dead $
+# $Id$
 
 description="Create list of required static device nodes for the current kernel"
 
 depend() {
 	after dev-mount
 	before tmpfiles.dev dev
+	keyword -lxc -systemd-nspawn
 }
 
 start() {
diff --git a/pcr/openrc-core/netifrc.install b/pcr/openrc-core/netifrc.install
new file mode 100644
index 000000000..fa8554bc3
--- /dev/null
+++ b/pcr/openrc-core/netifrc.install
@@ -0,0 +1,9 @@
+post_install() {
+	echo "	==> Set up your network interface before you reboot if using netifrc."
+	local _url="https://wiki.gentoo.org/wiki/Handbook:X86/Full/Networking"
+	echo "	==> Visit ${_url}"
+}
+
+post_upgrade() {
+	post_install "$1"
+}
diff --git a/pcr/openrc-core/openrc.install b/pcr/openrc-core/openrc.install
index 3e16fabfd..c45dcce43 100644
--- a/pcr/openrc-core/openrc.install
+++ b/pcr/openrc-core/openrc.install
@@ -1,12 +1,10 @@
 pre_install() {
-	echo "	==> You can boot up systemd any time."
+	echo "	==> You can boot up systemd any time if systemd is used for udev."
 	echo "	==> Add 'init=/usr/lib/systemd/systemd' to kernel command line."
 }
 
 post_install() {
-	echo "	==> Set up your network interface before you reboot."
-	local _url="https://wiki.gentoo.org/wiki/Handbook:X86/Full/Networking"
-	echo "	==> Visit ${_url}"
+        echo "	==> Install one of the optional depends for network support!"
 }
 
 post_upgrade() {