From ab4f1e4354aa32a02328eb24b608d00500f93610 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sun, 29 Jul 2018 13:32:42 -0400
Subject: pcr/sysvinit: Update 2.88dsf -> 2.90

 - v2.88dsf -> v2.90
 - provides & conflicts=(init)
 - drop conflicts=(systemd-sysvinit)
 - Drop the patches; they were included in v2.89
 - PGP signature verification
 - No defers to util-linux for mountpoint(1) by default, remove
   'mountpoint' from rmprogs

fixup sysvinit
---
 pcr/sysvinit/PKGBUILD | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

(limited to 'pcr/sysvinit/PKGBUILD')

diff --git a/pcr/sysvinit/PKGBUILD b/pcr/sysvinit/PKGBUILD
index af61c4dec..f48615b1b 100644
--- a/pcr/sysvinit/PKGBUILD
+++ b/pcr/sysvinit/PKGBUILD
@@ -1,40 +1,32 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Luke Shumaker <lukeshu@parabola.nu>
 # Maintainer (Manjaro): artoo <artoo@manjaro.org>
 # Contributor (Manjaro): Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
 # Maintainer (Arch Linux): Eric Belanger <eric@archlinux.org>
 
 pkgname=sysvinit
-pkgver=2.88
-pkgrel=16.2
+pkgver=2.90
+pkgrel=1
 pkgdesc='Linux System V Init'
 url='http://www.nongnu.org/sysvinit/'
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
 depends=('glibc')
-conflicts=('systemd-sysvcompat')
+provides=('init')
+conflicts=('init')
 
-source=("http://download.savannah.gnu.org/releases/sysvinit/sysvinit-${pkgver}dsf.tar.bz2"
-        "0001-simplify-writelog.patch"
-        "0002-remove-ansi-escape-codes-from-log-file.patch")
-sha256sums=('60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519'
-            '8126d09a35bdb9137bb19dc31b58cf1e829137fba34f7dcde7598018e1736826'
-            '90d38e4351ef9d77088661b411eb2b20eda435676e1e407f3d959ca2064d5c1e')
-
-prepare() {
-    cd "$srcdir/$pkgname-${pkgver}dsf"
-
-    # FS#30005
-    patch -p1 -d "src" -i "$srcdir/0001-simplify-writelog.patch"
-    patch -p1 -d "src" -i "$srcdir/0002-remove-ansi-escape-codes-from-log-file.patch"
-}
+validpgpkeys=('146BF1D0D20B006B10299B4CFA3EC79A4C0C11CC') # Jesse Smith <jsmith@resonatingmedia.com>
+source=("https://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+sha256sums=('114cffc8ef514a38b9916de2050bb6d73b43dff7afd05aee6b09d2f6cea7664e'
+            'SKIP')
 
 build() {
-    cd "$srcdir/$pkgname-${pkgver}dsf"
+    cd "$srcdir/$pkgname-$pkgver"
     make
 }
 
 package() {
-    cd "$srcdir/$pkgname-${pkgver}dsf"
+    cd "$srcdir/$pkgname-$pkgver"
 
     mkdir -p "$pkgdir/usr/bin"
     ln -s usr/bin "$pkgdir/bin"
@@ -47,7 +39,6 @@ package() {
         last
         lastb
         mesg
-        mountpoint
         sulogin
         utmpdump
         wall
-- 
cgit v1.2.3