X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsysvinit;h=d85a3659b4767b45816473004a3cd60778c19651;hb=a2d49659f3947e5a5a77cbc1bf384eb0b2760ca9;hp=2167b99789840ba7f21afc11d894c306044f05e6;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/sysvinit b/lfs/sysvinit
index 2167b99789..d85a3659b4 100644
--- a/lfs/sysvinit
+++ b/lfs/sysvinit
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,13 @@
 
 include Config
 
-VER        = 2.86
+VER        = 2.88dsf
 
 THISAPP    = sysvinit-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(LFS_PASS)" "install"
-  TARGET     = $(DIR_INFO)/$(THISAPP)-install
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7d5d61c026122ab791ac04c8a84db967
+$(DL_FILE)_MD5 = 6eda8a97b86e0a6f59dabbf25202aa6f
 
 install : $(TARGET)
 
@@ -73,17 +69,12 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(LFS_PASS)" "install"
-	cd $(DIR_APP)/src && sed -i s'/-O2/-Os\ -fomit-frame-pointer/' Makefile
-	cd $(DIR_APP)/src && make killall5
-	cd $(DIR_APP)/src && install -m 0755 killall5 /install/initrd/bin
-else
-	cd $(DIR_APP) && cp src/init.c{,.backup}
-	cd $(DIR_APP) && sed -i 's@Sending processes@& started by init@g' \
-				src/init.c
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	# Newer C libraries omit this include from sys/types.h.
+	# https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html
+	cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \
+		-e "/include.*sys\/stat.h/a#include <sys/sysmacros.h>\n"
 	cd $(DIR_APP) && make $(MAKETUNING) -C src 
 	cd $(DIR_APP) && make -C src install
-endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)