openrc-0.23.2-1.parabola1: updating version

4 files changed, 93 insertions, 63 deletions

diff --git a/pcr/openrc/PKGBUILD b/pcr/openrc/PKGBUILD
index c6be8b9f9..023414b1f 100644
--- a/pcr/openrc/PKGBUILD
+++ b/pcr/openrc/PKGBUILD
@@ -1,84 +1,77 @@
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor: Luke Shumaker <lukeshu@parabola.nu>
-
 # Maintainer (Manjaro): artoo <artoo@manjaro.org>
 # Contributor (Manjaro): williamh <williamh@gentoo.org>
-# Maintainer (AUR): Andrew Gregory <andrew.gregory.8@gmail.com>
-# Contributor (AUR): Lone_Wolf <lonewolf.xs4all.nl>
-# Contributor (AUR): Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-pkgname=(openrc openrc-sysvinit)
-pkgver=0.23
-pkgdesc="A dependency based init system that works with the system provided init program"
-url="https://www.gentoo.org/proj/en/base/openrc/"
-license=('BSD2')
+_url="https://github.com/OpenRC/openrc/archive"
 
-pkgrel=1
+pkgname=openrc
+pkgver=0.23.2
+pkgrel=1.parabola1
+pkgdesc="Gentoo's universal init system"
 arch=('i686' 'x86_64' 'armv7h')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/OpenRC/openrc/archive/${pkgver}.tar.gz"
-	"${pkgname}.logrotate")
-sha256sums=('20d0f11c66f808ee99a69b99f7f3b774f217f62d0b6d6a5acb3e039808b0f326'
-            '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c')
-depends=(
-	glibc
-	pam # MKPAM=pam
-	ncurses # MKTERMCAP=ncurses
-)
-
-_makeargs=(
-	MKPAM=pam # either 'pam' or ''
-	MKTERMCAP=ncurses # either 'ncurses' or 'termcap'
-
-	PREFIX=/usr
-	SYSCONFDIR=/etc # instead of ${PREFIX}/etc
-	SBINDIR=/usr/bin # instead of ${PREFIX}/sbin
-	LIBEXECDIR=/usr/lib/rc # instead of ${PREFIX}/libexec/rc
-
-	# these default to 0444
-	INCMODE=0644
-	LIBMODE=0644
-	MANMODE=0644
-)
+url="http://www.gentoo.org/proj/en/base/openrc/"
+license=('BSD2')
+depends=('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')
+#options=('emptydirs')
+source=("${pkgname}-${pkgver}.tar.gz::${_url}/${pkgver}.tar.gz"
+	"${pkgname}.logrotate"
+	'openrc-install.hook'
+	'openrc-remove.hook')
+sha256sums=('244a9902a98694a7fd59ad3dec49bd9e61a6b22864795ed31ef8fc81aa474251'
+            '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c'
+            '1d4d31a7275660e7b23778e6fceb0714cab8ed2793b04aa004b01d8e7bcd43bd'
+            'cbb4d00262a55a508114cb31e3903350be2cff748a4fb5e120dc745292e3987e')
+
+_args=(SYSCONFDIR=/etc)
+_args+=(PREFIX=/usr)
+_args+=(SBINDIR=/usr/bin)
+_args+=(LIBEXECDIR=/usr/lib/rc)
+_args+=(MKSELINUX=no)
+_args+=(MKPAM=pam)
+_args+=(MKTERMCAP=ncurses)
+_args+=(MKNET=no)
+_args+=(BRANDING='Parabola')
+
+prepare(){
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed -e "s|/sbin|/usr/bin|g" -i support/sysvinit/inittab
+	sed -i 's:0444:0644:' mk/sys.mk
+}
 
 build(){
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make "${_makeargs[@]}"
+	make "${_args[@]}"
 }
 
-package_openrc() {
-	depends+=('openrc-init')
-	backup=(
-		etc/rc.conf
-		# core
-		etc/conf.d/{bootmisc,fsck,hostname,localmount,netmount,swap,urandom}
-		# MKNET=yes (yes by default)
-		etc/conf.d/{network,staticroute}
-		# Linux-specific
-		etc/conf.d/{consolefont,devfs,dmesg,hwclock,keymaps,killprocs,modules,mtab,net-online}
-	)
-
+package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" "${_args[@]}" install
 
-	make DESTDIR="${pkgdir}" "${_makeargs[@]}" install
-
+	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"/' \
 	    -i "${pkgdir}/etc/rc.conf"
 
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_openrc-sysvinit() {
-	pkgdesc="OpenRC support for using sysvinit as pid 1"
-	depends=(openrc sysvinit)
-	provides=('openrc-init')
-	backup=('etc/inittab')
+	install -d ${pkgdir}/usr/lib/rc/cache
 
-	conflicts=('initscripts')
+	install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
 
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm644 support/sysvinit/inittab "${pkgdir}/etc/inittab"
+	for f in openrc-{install,remove}.hook;do
+		install -Dm644 ${srcdir}/$f ${pkgdir}/usr/share/libalpm/hooks/$f
+	done
 }
diff --git a/pcr/openrc/openrc-install.hook b/pcr/openrc/openrc-install.hook
new file mode 100644
index 000000000..a85808fac
--- /dev/null
+++ b/pcr/openrc/openrc-install.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = etc/init.d/*
+
+[Action]
+Description = Displaying openrc service help ...
+When = PostTransaction
+Exec = /bin/bash -c 'echo "	==> Add a service to runlevel:"; echo "	rc-update add <service> <runlevel>"'
+NeedsTargets
diff --git a/pcr/openrc/openrc-remove.hook b/pcr/openrc/openrc-remove.hook
new file mode 100644
index 000000000..d9f966cc5
--- /dev/null
+++ b/pcr/openrc/openrc-remove.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Type = File
+Operation = Remove
+Target = etc/init.d/*
+
+[Action]
+Description = Displaying openrc service help ...
+When = PostTransaction
+Exec = /bin/bash -c 'echo "	==> Remove a service from runlevel:"; echo "	rc-update del <service> <runlevel>"'
+NeedsTargets
diff --git a/pcr/openrc/openrc.install b/pcr/openrc/openrc.install
new file mode 100644
index 000000000..c45dcce43
--- /dev/null
+++ b/pcr/openrc/openrc.install
@@ -0,0 +1,16 @@
+pre_install() {
+	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 "	==> Install one of the optional depends for network support!"
+}
+
+post_upgrade() {
+	post_install "$1"
+}
+
+post_remove() {
+	echo "	==> Make sure you install systemd-sysvcompat before you reboot!"
+}