From 76ff91b459f8d6faacd9300164b8b6ae871cad7b Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Wed, 25 Dec 2019 22:01:07 +0300
Subject: [PATCH] sysvinit 2.96

---
 system/base/sysvinit/actions.py |  6 +++++-
 system/base/sysvinit/pspec.xml  | 19 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/system/base/sysvinit/actions.py b/system/base/sysvinit/actions.py
index e743f8b0..f59168e8 100644
--- a/system/base/sysvinit/actions.py
+++ b/system/base/sysvinit/actions.py
@@ -9,7 +9,7 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
-WorkDir = "sysvinit-%sdsf" % get.srcVERSION()
+WorkDir = "sysvinit-%s" % get.srcVERSION()
 
 def build():
     autotools.make("-C src CC=\"%s\" CFLAGS=\"%s -D_GNU_SOURCE\" LCRYPT=\"-lcrypt\"" % (get.CC(), get.CFLAGS()))
@@ -19,4 +19,8 @@ def install():
     autotools.rawInstall("ROOT='%s' STRIP=/bin/true" % get.installDIR())
 
     pisitools.remove("/bin/pidof")
+    # These files conflict with e2fsprogs
+    pisitools.remove("/sbin/logsave")
+    pisitools.remove("/usr/share/man/man8/logsave.8")
+    
     pisitools.dosym("killall5", "/sbin/pidof")
diff --git a/system/base/sysvinit/pspec.xml b/system/base/sysvinit/pspec.xml
index ecf1155c..946d2a95 100644
--- a/system/base/sysvinit/pspec.xml
+++ b/system/base/sysvinit/pspec.xml
@@ -12,19 +12,19 @@
         <IsA>app:console</IsA>
         <Summary>Programs which control basic system processes</Summary>
         <Description>sysvinit package contains a group of utilities that control the very basic functions of your system. sysvinit contains the init program, the first program started by the Linux kernel when the system boots.</Description>
-        <Archive sha1sum="f2ca149df1314a91f3007cccd7a0aa47d990de26" type="tarbz2">http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2</Archive>
+        <Archive sha1sum="3f826119b988dfd149f63bab987d735eb5d32eaa" type="tarxz">http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.96.tar.xz</Archive>
         <Patches>
             <!--<Patch>makefile.patch</Patch>-->
             <!--<Patch>sysvinit-2.86-docs.patch</Patch>-->
-            <Patch level="1">sysvinit-2.86-ctrlc.patch</Patch>
+<!--             <Patch level="1">sysvinit-2.86-ctrlc.patch</Patch> -->
 
-            <Patch level="1">sysvinit-2.78-man.patch</Patch>
+<!--             <Patch level="1">sysvinit-2.78-man.patch</Patch> -->
             <Patch level="1">sysvinit-2.86-loginshell.patch</Patch>
             <Patch level="1">sysvinit-2.86-single.patch</Patch>
             <Patch level="1">sysvinit-2.88-quiet.patch</Patch>
-            <Patch level="1">sysvinit-2.88-ipv6.patch</Patch>
-            <Patch level="1">sysvinit-2.88-omit.patch</Patch>
-            <Patch level="1">sysvinit-2.88-wall-maxlines.patch</Patch>
+<!--             <Patch level="1">sysvinit-2.88-ipv6.patch</Patch> -->
+<!--             <Patch level="1">sysvinit-2.88-omit.patch</Patch> -->
+<!--             <Patch level="1">sysvinit-2.88-wall-maxlines.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -63,6 +63,13 @@
     </Package>
 
     <History>
+		<Update release="5">
+            <Date>2019-12-25</Date>
+            <Version>2.96</Version>
+            <Comment>Version bump</Comment>
+            <Name>Idris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2018-07-15</Date>
             <Version>2.88</Version>