* sysvinit 2.86.

svn path=/nixpkgs/trunk/; revision=8736

4 files changed, 18 insertions, 129 deletions

diff --git a/pkgs/os-specific/linux/sysvinit/builder.sh b/pkgs/os-specific/linux/sysvinit/builder.sh
index 76927bccda4..ce5119d2b6a 100644
--- a/pkgs/os-specific/linux/sysvinit/builder.sh
+++ b/pkgs/os-specific/linux/sysvinit/builder.sh
@@ -1,25 +1,21 @@
 source $stdenv/setup
 
-buildPhase() {
-cd src
-make
-}
+makeFlagsArray=(LCRYPT=-lcrypt BIN_OWNER=$(id -u) BIN_GROUP=$(id -g) ROOT=$out)
 
-buildPhase=buildPhase
+preBuild="cd src"
 
-installPhase() {
-mkdir $out
-mkdir $out/bin
-mkdir $out/sbin
-mkdir $out/include
-mkdir $out/share
-mkdir $out/share/man
-mkdir $out/share/man/man1
-mkdir $out/share/man/man5
-mkdir $out/share/man/man8
-make ROOT=$out install
+preInstall=preInstall
+preInstall() {
+    substituteInPlace Makefile --replace /usr /
+    mkdir $out
+    mkdir $out/bin
+    mkdir $out/sbin
+    mkdir $out/include
+    mkdir $out/share
+    mkdir $out/share/man
+    mkdir $out/share/man/man1
+    mkdir $out/share/man/man5
+    mkdir $out/share/man/man8
 }
 
-installPhase=installPhase
-
 genericBuild
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index cfe51c38762..27d438345fa 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -1,12 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "sysvinit-2.85";
+  name = "sysvinit-2.86";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sysvinit-2.85.tar.gz;
-    md5 = "8a2d8f1ed5a2909da04132fefa44905e";
+    url = ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.86.tar.gz;
+    sha256 = "1n3rnsynlaw7zyp2q5r7c49yvi1xr3669ick540gz73xw7x9hpq3";
   };
-  #srcPatch = ./patch;
-  patches = [./patch ./sysvinit-2.85-exec.patch];
+  patches = [./sysvinit-2.85-exec.patch];
 }
diff --git a/pkgs/os-specific/linux/sysvinit/patch b/pkgs/os-specific/linux/sysvinit/patch
deleted file mode 100644
index 20fa2620663..00000000000
--- a/pkgs/os-specific/linux/sysvinit/patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Only in sysvinit-2.85/src: dowall.o
-Only in sysvinit-2.85/src: halt
-Only in sysvinit-2.85/src: halt.o
-Only in sysvinit-2.85/src: hddown.o
-Only in sysvinit-2.85/src: ifdown.o
-Only in sysvinit-2.85/src: init
-Only in sysvinit-2.85/src: init.o
-Only in sysvinit-2.85/src: init_utmp.o
-Only in sysvinit-2.85/src: killall5
-Only in sysvinit-2.85/src: last
-Only in sysvinit-2.85/src: last.o
-diff -rc sysvinit-2.85-orig/src/Makefile sysvinit-2.85/src/Makefile
-*** sysvinit-2.85-orig/src/Makefile	2001-11-06 12:58:16.000000000 +0100
---- sysvinit-2.85/src/Makefile	2004-02-16 14:49:01.000000000 +0100
-***************
-*** 24,36 ****
-  BIN_OWNER	= root
-  BIN_GROUP	= root
-  BIN_COMBO	= $(BIN_OWNER).$(BIN_GROUP)
-! INSTALL		= install -o $(BIN_OWNER) -g $(BIN_GROUP)
-! MANDIR		= /usr/share/man
-  
-  # Additional libs for Gnu Libc
-! ifneq ($(wildcard /usr/lib/libcrypt.a),)
-  LCRYPT		= -lcrypt
-! endif
-  
-  all:		$(PROGS)
-  
---- 24,36 ----
-  BIN_OWNER	= root
-  BIN_GROUP	= root
-  BIN_COMBO	= $(BIN_OWNER).$(BIN_GROUP)
-! INSTALL		= install # -o $(BIN_OWNER) -g $(BIN_GROUP)
-! MANDIR		= /share/man
-  
-  # Additional libs for Gnu Libc
-! #ifneq ($(wildcard /usr/lib/libcrypt.a),)
-  LCRYPT		= -lcrypt
-! #endif
-  
-  all:		$(PROGS)
-  
-***************
-*** 89,104 ****
-  			runlevel shutdown $(ROOT)/sbin
-  		# These are not installed by default
-  ifeq ($(DEBIAN),)
-! 		$(INSTALL) -m 555 utmpdump wall $(ROOT)/usr/bin
-  endif
-  		# $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc
-! 		$(INSTALL) -m 755 mesg last $(ROOT)/usr/bin
-! 		cd $(ROOT)/sbin; ln -sf halt reboot; chown $(BIN_COMBO) reboot
-! 		cd $(ROOT)/sbin; ln -sf halt poweroff; chown $(BIN_COMBO) poweroff
-! 		cd $(ROOT)/sbin; ln -sf init telinit; chown $(BIN_COMBO) telinit
-! 		cd $(ROOT)/bin; ln -sf ../sbin/killall5 pidof; chown $(BIN_COMBO) pidof
-! 		cd $(ROOT)/usr/bin; ln -sf last lastb; chown $(BIN_COMBO) lastb
-! 		$(INSTALL) -m 644 initreq.h $(ROOT)/usr/include
-  		$(INSTALL) -m 644 ../man/*.8 $(ROOT)$(MANDIR)/man8
-  		$(INSTALL) -m 644 ../man/*.5 $(ROOT)$(MANDIR)/man5
-  ifeq ($(DEBIAN),)
---- 89,104 ----
-  			runlevel shutdown $(ROOT)/sbin
-  		# These are not installed by default
-  ifeq ($(DEBIAN),)
-! 		$(INSTALL) -m 555 utmpdump wall $(ROOT)/bin
-  endif
-  		# $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc
-! 		$(INSTALL) -m 755 mesg last $(ROOT)/bin
-! 		cd $(ROOT)/sbin; ln -sf halt reboot #; chown $(BIN_COMBO) reboot
-! 		cd $(ROOT)/sbin; ln -sf halt poweroff #; chown $(BIN_COMBO) poweroff
-! 		cd $(ROOT)/sbin; ln -sf init telinit #; chown $(BIN_COMBO) telinit
-! 		cd $(ROOT)/bin; ln -sf ../sbin/killall5 pidof #; chown $(BIN_COMBO) pidof
-! 		cd $(ROOT)/bin; ln -sf last lastb #; chown $(BIN_COMBO) lastb
-! 		$(INSTALL) -m 644 initreq.h $(ROOT)/include
-  		$(INSTALL) -m 644 ../man/*.8 $(ROOT)$(MANDIR)/man8
-  		$(INSTALL) -m 644 ../man/*.5 $(ROOT)$(MANDIR)/man5
-  ifeq ($(DEBIAN),)
-Only in sysvinit-2.85/src: Makefile~
-Only in sysvinit-2.85/src: mesg
-Only in sysvinit-2.85/src: mesg.o
-Only in sysvinit-2.85/src: runlevel
-Only in sysvinit-2.85/src: runlevel.o
-Only in sysvinit-2.85/src: shutdown
-Only in sysvinit-2.85/src: shutdown.o
-Only in sysvinit-2.85/src: sulogin
-Only in sysvinit-2.85/src: sulogin.o
-Only in sysvinit-2.85/src: utmpdump
-Only in sysvinit-2.85/src: utmpdump.o
-Only in sysvinit-2.85/src: utmp.o
-Only in sysvinit-2.85/src: wall
-Only in sysvinit-2.85/src: wall.o
-Only in sysvinit-2.85/src: x
diff --git a/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch b/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch
index b3f12ca9a62..ef3d0f66b2f 100644
--- a/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch
+++ b/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch
@@ -20,16 +20,3 @@ diff -ruN sysvinit-2.85/src/halt.c sysvinit-2.85.new/src/halt.c
 +	execv(EXEC_PATH, args);
  	execv("/etc/shutdown", args);
  	execv("/bin/shutdown", args);
- 
-diff -ruN sysvinit-2.85/src/Makefile sysvinit-2.85.new/src/Makefile
---- sysvinit-2.85/src/Makefile	2001-11-06 12:58:16.000000000 +0100
-+++ sysvinit-2.85.new/src/Makefile	2005-10-18 23:37:46.000000000 +0200
-@@ -9,7 +9,7 @@
- #
- 
- CC	= cc
--CFLAGS	= -Wall -O2 -D_GNU_SOURCE
-+CFLAGS	= -Wall -save-temps -O2 -D_GNU_SOURCE -DEXEC_PATH=\"${out}/sbin/shutdown\"
- LDFLAGS	= -s
- STATIC	=
-