Update package to be usable

2 files changed, 43 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c1ea040a1a53..845d46a9d9e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,14 @@
 pkgbase = openrc
 	pkgdesc = Dependency based init system that works with sysvinit.
-	pkgver = 0.38.1
+	pkgver = 0.42.1
 	pkgrel = 1
 	url = https://github.com/OpenRC/openrc/
 	arch = i686
 	arch = x86_64
 	license = BSD
+	makedepends = psmisc
+	makedepends = pam
+	makedepends = git
 	depends = openrc-sysvinit
 	depends = pam
 	depends = sh
@@ -13,6 +16,12 @@ pkgbase = openrc
 	optdepends = net-tools: for network service support
 	optdepends = opentmpfiles: adds support for systemd-style tmpfiles.d
 	optdepends = bash-completion: tab completion for openrc commands in bash shells
+	provides = openrc
+	provides = librc.so
+	provides = init-rc
+	provides = libeinfo.so
+	provides = svc-manager
+	conflicts = openrc
 	backup = etc/openrc/inittab
 	backup = etc/openrc/rc.conf
 	backup = etc/openrc/conf.d/bootmisc
@@ -29,10 +38,14 @@ pkgbase = openrc
 	backup = etc/openrc/conf.d/netmount
 	backup = etc/openrc/conf.d/network
 	backup = etc/openrc/conf.d/staticroute
-	source = openrc-0.38.1::https://github.com/OpenRC/openrc/archive/0.38.1.tar.gz
+	backup = etc/openrc/conf.d/keymaps
+	backup = etc/openrc/conf.d/hostname
+	backup = etc/openrc/conf.d/udev
+	source = openrc-0.42.1.tar.gz::https://github.com/OpenRC/openrc/archive/0.42.1.tar.gz
 	source = openrc.logrotate
-	sha512sums = 3fc4fef60e25ae34039753c3de6471baba89a7ffcd25f6756cf00954ab63262d07c749441a53198099678e5769c9547179074152872aebc66fe7a220d0302804
+	source = gcc-10-fix.patch::https://github.com/OpenRC/openrc/commit/375ef42393f3dc6edbaa2cb70c79b2366072db38.patch
+	sha512sums = 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
 	sha512sums = 690612fddfb2c4cf8f6b5ba7239b9faf29eb3d9b152ab4dcf62694aa2852780440d08cee56d98a9597607f446b3697c911269562821a8402bb5747cbbae34bd9
+	sha512sums = 1757d895a17f1390caf9db36a74a91b4c127fb8333ea3557b352c2049abc3dbbce6f0ce1413daa594bf7107d6afe15bfe90dbaa021aae64a26b9bc089df08f37
 
 pkgname = openrc
-
diff --git a/PKGBUILD b/PKGBUILD
index 5be02759b176..6a6e6278957a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgname=openrc
-pkgver=0.38.1
+pkgver=0.42.1
 pkgrel=1
 pkgdesc='Dependency based init system that works with sysvinit.'
 arch=('i686' 'x86_64')
@@ -14,16 +14,24 @@ optdepends=('openrc-arch-services-git: collection of services for Arch'
             'net-tools: for network service support'
             'opentmpfiles: adds support for systemd-style tmpfiles.d'
             'bash-completion: tab completion for openrc commands in bash shells')
+makedepends=('psmisc' 'pam' 'git')
+provides=('openrc' 'librc.so' 'init-rc' 'libeinfo.so' 'svc-manager')
+conflicts=('openrc')
 backup=(etc/openrc/inittab
         etc/openrc/rc.conf
         etc/openrc/conf.d/{bootmisc,consolefont,devfs,dmesg,fsck,hostname,hwclock,keymaps}
         etc/openrc/conf.d/{killprocs,localmount,modules,netmount,network,staticroute}
-        )
-source=($pkgname-$pkgver::https://github.com/OpenRC/$pkgname/archive/$pkgver.tar.gz
-        $pkgname.logrotate)
-# oldsourcelocation : http://dev.gentoo.org/~williamh/dist/$pkgname-$pkgver.tar.bz2
-sha512sums=('3fc4fef60e25ae34039753c3de6471baba89a7ffcd25f6756cf00954ab63262d07c749441a53198099678e5769c9547179074152872aebc66fe7a220d0302804'
-            '690612fddfb2c4cf8f6b5ba7239b9faf29eb3d9b152ab4dcf62694aa2852780440d08cee56d98a9597607f446b3697c911269562821a8402bb5747cbbae34bd9')
+        etc/openrc/conf.d/keymaps
+	etc/openrc/conf.d/hostname
+	etc/openrc/conf.d/udev
+	)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/$pkgname/archive/$pkgver.tar.gz"
+        'openrc.logrotate'
+	gcc-10-fix.patch::https://github.com/OpenRC/openrc/commit/375ef42393f3dc6edbaa2cb70c79b2366072db38.patch
+	)
+sha512sums=('579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646'
+            '690612fddfb2c4cf8f6b5ba7239b9faf29eb3d9b152ab4dcf62694aa2852780440d08cee56d98a9597607f446b3697c911269562821a8402bb5747cbbae34bd9'
+            '1757d895a17f1390caf9db36a74a91b4c127fb8333ea3557b352c2049abc3dbbce6f0ce1413daa594bf7107d6afe15bfe90dbaa021aae64a26b9bc089df08f37')
 
 _makeargs=(BRANDING='Arch Linux')
 _makeargs+=(MKPAM=pam)
@@ -31,16 +39,22 @@ _makeargs+=(MKSELINUX=no)
 _makeargs+=(MKTERMCAP=ncurses)
 _makeargs+=(PKG_PREFIX="")
 _makeargs+=(LIBDIR=/usr/lib)
-_makeargs+=(LIBMODE=0644) # enable binary stripping by makepkg
 _makeargs+=(SHLIBDIR=/usr/lib)
-_makeargs+=(LIBEXECDIR=/usr/lib/openrc)
+_makeargs+=(LIBEXECDIR=/usr/libexec/rc)
 _makeargs+=(BINDIR=/usr/bin)
 _makeargs+=(SBINDIR=/usr/bin)
 _makeargs+=(SYSCONFDIR=/etc/openrc) # avoid conflicts with other init systems
-_makeargs+=(MKBASHCOMP=yes) # enable bash completion for openrc commands
 
-build() {
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    sed -i 's:0444:6444:' mk/sys.mk
+
+    patch -Np 1 -i ../gcc-10-fix.patch
+    # inittab does not honor SBINDIR
+    sed -ie 's!/sbin/rc!/usr/bin/rc!g' support/sysvinit/inittab
+}
 
+build() {
     cd "${pkgname}-${pkgver}"
     make "${_makeargs[@]}"
 }
@@ -48,7 +62,7 @@ build() {
 package() {
 
     cd "${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" "${_makeargs[@]}" install
+    make DESTDIR="$pkgdir" "${_makeargs[@]}" install
 
     # default path to inittab conflicts with initscripts
     #install -m 644 support/sysvinit/inittab "$pkgdir"/etc/inittab