Update to 2.90

2 files changed, 21 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce2747075471..58b1236502f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Jul  6 05:25:20 UTC 2018
 pkgbase = sysvinit
 	pkgdesc = Linux System V Init
-	pkgver = 2.88
-	pkgrel = 15
+	pkgver = 2.90
+	pkgrel = 1
 	url = http://savannah.nongnu.org/projects/sysvinit
 	arch = i686
 	arch = x86_64
@@ -10,14 +12,8 @@ pkgbase = sysvinit
 	depends = glibc
 	depends = procps-ng>=3.3.9
 	conflicts = systemd-sysvcompat
-	source = http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2
-	source = 0001-simplify-writelog.patch
-	source = 0002-remove-ansi-escape-codes-from-log-file.patch
-	source = 0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch
-	sha256sums = 60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519
-	sha256sums = 8126d09a35bdb9137bb19dc31b58cf1e829137fba34f7dcde7598018e1736826
-	sha256sums = 90d38e4351ef9d77088661b411eb2b20eda435676e1e407f3d959ca2064d5c1e
-	sha256sums = 43fed9d36b92f15bcdbde6ba2a2784a57115562795942c09dd33ff37a51cb138
+	source = http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-2.90.tar.xz
+	sha256sums = 114cffc8ef514a38b9916de2050bb6d73b43dff7afd05aee6b09d2f6cea7664e
 
 pkgname = sysvinit
 
diff --git a/PKGBUILD b/PKGBUILD
index 169b03108b21..fecc2e6ab3b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
 pkgname=sysvinit
-pkgver=2.88
-pkgrel=15
+pkgver=2.90
+pkgrel=1
 pkgdesc='Linux System V Init'
 url='http://savannah.nongnu.org/projects/sysvinit'
 arch=('i686' 'x86_64' 'armv6h')
@@ -9,43 +9,35 @@ license=('GPL')
 depends=('glibc' 'procps-ng>=3.3.9')
 conflicts=('systemd-sysvcompat')
 
-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"
-	"0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch")
-sha256sums=('60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519'
-            '8126d09a35bdb9137bb19dc31b58cf1e829137fba34f7dcde7598018e1736826'
-            '90d38e4351ef9d77088661b411eb2b20eda435676e1e407f3d959ca2064d5c1e'
-	    '43fed9d36b92f15bcdbde6ba2a2784a57115562795942c09dd33ff37a51cb138')
+source=("http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-${pkgver}.tar.xz")
+sha256sums=('114cffc8ef514a38b9916de2050bb6d73b43dff7afd05aee6b09d2f6cea7664e')
 
 
 build()
 {
-    cd "$srcdir/$pkgname-${pkgver}dsf"
-    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"
-    patch -p1          -i "$srcdir/0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch"
-    
+    cd "$srcdir/$pkgname-${pkgver}"
+
     # Patch for Arch's Linux filesystem hierarchy
     if [ "$(grep 'execv("/sbin/mount", args);' < src/killall5.c | wc -l)" = 1 ]; then
         sed -i 's:execv("/bin/mount", args);::' src/killall5.c
     fi
-    sed -i 's|/bin:/sbin:/usr/bin:/usr/sbin|/usr/bin|' src/initscript.sample src/init.h src/shutdown.c
-    sed -i 's|/sbin:/usr/sbin:/bin:/usr/bin|/usr/bin|' src/initscript.sample src/init.h src/shutdown.c
-    sed -i 's|/bin:/usr/bin:/sbin:/usr/sbin|/usr/bin|' src/initscript.sample src/init.h src/shutdown.c
-    sed -i 's:/sbin/:/bin/:g'    contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} src/initscript.sample
-    sed -i 's:/bin/:/usr/bin/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} src/initscript.sample
-    sed -i 's:/usr/usr/:/usr/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} src/initscript.sample
-    
+    sed -i 's|/bin:/sbin:/usr/bin:/usr/sbin|/usr/bin|' src/init.h src/shutdown.c
+    sed -i 's|/sbin:/usr/sbin:/bin:/usr/bin|/usr/bin|' src/init.h src/shutdown.c
+    sed -i 's|/bin:/usr/bin:/sbin:/usr/sbin|/usr/bin|' src/init.h src/shutdown.c
+    sed -i 's:/sbin/:/bin/:g'    contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h}
+    sed -i 's:/bin/:/usr/bin/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h}
+    sed -i 's:/usr/usr/:/usr/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h}
+
     make DISTRO=archlinux
 }
 
 package()
 {
-    cd "$srcdir/$pkgname-${pkgver}dsf"
+    cd "$srcdir/$pkgname-${pkgver}"
     mkdir -p "$pkgdir/__temp__"
     make DISTRO=archlinux ROOT="$pkgdir/__temp__" install
     cd "$pkgdir/__temp__"
-    rm -r bin usr/bin usr/share/man/man?/{mesg,utmpdump,wall,last,pidof}.? usr/share/man/man1
+    rm -r bin usr/bin usr/share/man/man*/{mesg,last,pidof}.* usr/share/man/man1
     find . | while read file; do
         if [ -d "$file" ]; then
             mkdir -p ".$file"