- up to 2.98

diff --git a/SysVinit.spec b/SysVinit.spec
index d183d1e3bba7ecc207673e5ecac0d6cd3d9d6315..65ae59b9a54177ac4a7716ced40606bdf05ba8f0 100644 (file)
--- a/SysVinit.spec
+++ b/SysVinit.spec
@@ -12,12 +12,12 @@ Summary(ru.UTF-8):  Программы, управляющие базовыми 
 Summary(tr.UTF-8):     System V başlatma programı
 Summary(uk.UTF-8):     Програми, що керують базовими системними процесами
 Name:          SysVinit
-Version:       2.96
-Release:       3
+Version:       2.98
+Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       http://download.savannah.gnu.org/releases/sysvinit/sysvinit-%{version}.tar.xz
-# Source0-md5: 48cebffebf2a96ab09bec14bf9976016
+# Source0-md5: e11bc4b3eac6e6ddee7f8306230749a9
 Source1:       sysvinit.logrotate
 Source2:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/sysvinit-non-english-man-pages.tar.bz2
 # Source2-md5: 9ae8a63a4685368fae19707f95475cca
@@ -25,7 +25,7 @@ Source3:      crypttab.5
 Patch0:                sysvinit-paths.patch
 Patch1:                sysvinit-bequiet.patch
 Patch2:                sysvinit-wtmp.patch
-Patch3:                time-parsing.patch
+
 Patch4:                sysvinit-halt.patch
 Patch5:                sysvinit-autofsck.patch
 
@@ -130,7 +130,7 @@ Ten pakiet zawiera różne narzędzia do zarządzania procesami.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+
 %patch4 -p1
 %patch5 -p1
 

diff --git a/time-parsing.patch b/time-parsing.patch
deleted file mode 100644 (file)
index 1871646..0000000
--- a/time-parsing.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- sysvinit-2.96/src/shutdown.c.org   2020-02-24 14:20:54.265362805 +0100
-+++ sysvinit-2.96/src/shutdown.c       2020-02-27 10:24:16.865892277 +0100
-@@ -778,16 +778,18 @@ int main(int argc, char **argv)
-       if (!strcmp(when, "now")) strcpy(when, "0");
- 
-         sp = when;
--      if (when[0] == '+') sp++;
--      /* Decode shutdown time. */
-+      /* Validate time argument. */
-       for ( ; *sp; sp++) {
--              if (*sp != ':' && (*sp < '0' || *sp > '9'))
-+              if (*sp != '+' && *sp != ':' && (*sp < '0' || *sp > '9'))
-                       usage();
-       }
-+      sp = when;
-+      /* Decode shutdown time. */
-+      if (when[0] == '+') sp++;
-       if (strchr(when, ':') == NULL) {
-               /* Time in minutes. */
--              wt = atoi(when);
--              if (wt == 0 && when[0] != '0') usage();
-+              wt = atoi(sp);
-+              if (wt == 0 && sp[0] != '0') usage();
-       } else {
-               /* Time in hh:mm format. */
-               if (sscanf(when, "%d:%2d", &hours, &mins) != 2) usage();