sysvinit: bump to version 2.90

This commit updates sysvinit package using the upstream tarball at
http://download.savannah.nongnu.org/releases/sysvinit/ instead of the
Debian tarball + patches currently in use

Signed-off-by: Benjamin Calderon <benj.calderon@gmail.com>
Tested-by: Carlos Santos <casantos@datacom.com.br>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/sysvinit/0001-fix-libcrypt-test.patch b/package/sysvinit/0001-fix-libcrypt-test.patch
deleted file mode 100644 (file)
index 6c22436..0000000
--- a/package/sysvinit/0001-fix-libcrypt-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Make the libcrypt test somewhat cross-compilation compliant
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/src/Makefile
-===================================================================
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -78,8 +78,9 @@ else
- endif
- 
- # Additional libs for GNU libc.
--ifneq ($(wildcard /usr/lib*/libcrypt.a),)
--  SULOGINLIBS += -lcrypt
-+HAS_LIBCRYPT=$(shell f=`mktemp` && echo 'int main(void) {}' | $(CC) -o $$f -xc - -lcrypt >/dev/null 2>&1 && echo yes; rm -f $$f)
-+ifeq ($(HAS_LIBCRYPT),yes)
-+  SULOGINLIBS += -lcrypt
- endif
- 
- all:          $(BIN) $(SBIN) $(USRBIN)

diff --git a/package/sysvinit/0002-musl-fix-compilation-errors.patch b/package/sysvinit/0002-musl-fix-compilation-errors.patch
deleted file mode 100644 (file)
index 5dcdecf..0000000
--- a/package/sysvinit/0002-musl-fix-compilation-errors.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Fix various compilation errors when compiling against must libc
-
-Signed-off-by: Dagg Stompler <daggs@gmx.com>
-
-diff -Nupr a/src/init.c b/src/init.c
---- a/src/init.c       2017-08-13 18:44:27.000000000 +0300
-+++ b/src/init.c       2017-08-13 18:34:45.000000000 +0300
-@@ -37,6 +37,7 @@
- #include <sys/kd.h>
- #endif
- #include <sys/resource.h>
-+#include <sys/ttydefaults.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <errno.h>
-diff -Nupr a/src/init.h b/src/init.h
---- a/src/init.h       2017-08-13 19:35:46.000000000 +0300
-+++ b/src/init.h       2017-08-13 19:36:01.000000000 +0300
-@@ -22,6 +22,8 @@
-  *
-  */
- 
-+#include <time.h>
-+
- /* Standard configuration */
- #define CHANGE_WAIT 0                 /* Change runlevel while
-                                          waiting for a process to exit? */
-diff -Nupr a/src/mountpoint.c b/src/mountpoint.c
---- a/src/mountpoint.c 2017-08-13 20:28:26.000000000 +0300
-+++ b/src/mountpoint.c 2017-08-13 20:28:40.000000000 +0300
-@@ -24,6 +24,7 @@
-  */
- 
- #include <sys/stat.h>
-+#include <sys/types.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>

diff --git a/package/sysvinit/sysvinit.hash b/package/sysvinit/sysvinit.hash
index 268b9841b0d09e64467720ccec74415c6f5dfacd..2161fb38bd9a2188f134469cb25c7ff69c58addf 100644 (file)
--- a/package/sysvinit/sysvinit.hash
+++ b/package/sysvinit/sysvinit.hash
@@ -1,3 +1,5 @@
-# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/sysvinit/sysvinit_2.88dsf-13.1%2Bsqueeze1.dsc
-sha256 b016f937958d2809a020d407e1287bdc09abf1d44efaa96530e2ea57f544f4e8        sysvinit_2.88dsf.orig.tar.gz
-sha256 26b456a31036b1e1c2486c22ca2b7fde6d723b7c63669604eacc61cfb6609ef8        sysvinit_2.88dsf-13.1+squeeze1.diff.gz
+# Locally computed:
+sha256 114cffc8ef514a38b9916de2050bb6d73b43dff7afd05aee6b09d2f6cea7664e  sysvinit-2.90.tar.xz
+
+# Hash for license files:
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING

diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index 993e399e736d355315000ca35a68d7db400624ad..98aa5a417b7cea2e42199680b1eda8cbf738a0f7 100644 (file)
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-SYSVINIT_VERSION = 2.88
-SYSVINIT_SOURCE = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
-SYSVINIT_PATCH = sysvinit_$(SYSVINIT_VERSION)dsf-13.1+squeeze1.diff.gz
-SYSVINIT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/sysvinit
+SYSVINIT_VERSION = 2.90
+SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VERSION).tar.xz
+SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit
 SYSVINIT_LICENSE = GPL-2.0+
 SYSVINIT_LICENSE_FILES = COPYING
 
@@ -18,17 +17,7 @@ SYSVINIT_DEPENDENCIES += libselinux
 SYSVINIT_MAKE_OPTS += WITH_SELINUX="yes"
 endif
 
-define SYSVINIT_DEBIAN_PATCHES
-       if [ -d $(@D)/debian/patches ]; then \
-               $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \
-       fi
-endef
-
-SYSVINIT_POST_PATCH_HOOKS = SYSVINIT_DEBIAN_PATCHES
-
 define SYSVINIT_BUILD_CMDS
-       # Force sysvinit to link against libcrypt as it otherwise
-       # use an incorrect test to see if it's available
        $(TARGET_CONFIGURE_OPTS) $(MAKE) $(SYSVINIT_MAKE_OPTS) -C $(@D)/src
 endef