From 61f6dae18bde9414f2f7be2da0c887fd2be6ee69 Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 24 Jan 2015 21:09:20 +0100
Subject: [PATCH] sysvinit: Remove last lasb and mesg.

These binaries are provided and maintained by util-linux since
version 2.25.2.
---
 .../sysvinit-2.86-remove-utils-1.patch        | 34 +++++++++++--------
 sysvinit/sysvinit.nm                          | 33 ++++++++++--------
 2 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
index e5a2182e4..41e0f9078 100644
--- a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
+++ b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
@@ -1,5 +1,6 @@
---- sysvinit-2.86/src/Makefile.old	2004-06-09 14:47:45.000000000 +0200
-+++ sysvinit-2.86/src/Makefile	2011-12-17 18:20:12.067186698 +0100
+diff -Nur sysvinit-2.86-orig/src/Makefile sysvinit-2.86/src/Makefile
+--- sysvinit-2.86-orig/src/Makefile	2004-06-09 14:47:45.000000000 +0200
++++ sysvinit-2.86/src/Makefile	2015-01-24 20:17:45.980202112 +0100
 @@ -10,32 +10,30 @@
  
  CC	= gcc
@@ -11,33 +12,38 @@
  # For some known distributions we do not build all programs, otherwise we do.
  BIN	=
 -SBIN	= init halt shutdown runlevel killall5
+-USRBIN	= last mesg
 +SBIN	= killall5
- USRBIN	= last mesg
++USRBIN	=
  
- MAN1	= last.1 lastb.1 mesg.1
+-MAN1	= last.1 lastb.1 mesg.1
 -MAN5	= initscript.5 inittab.5
 -MAN8	= halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
 -MAN8	+= shutdown.8 telinit.8
++MAN1	=
 +MAN8	= killall5.8 pidof.8
  
  ifeq ($(DISTRO),)
- BIN	+= mountpoint
+-BIN	+= mountpoint
 -SBIN	+= sulogin bootlogd
 -USRBIN	+= utmpdump wall
 -MAN1	+= mountpoint.1 wall.1
 -MAN8	+= sulogin.8 bootlogd.8
++BIN	+=
 +SBIN	+=
 +USRBIN	+=
-+MAN1	+= mountpoint.1
++MAN1	+=
 +MAN8	+=
  endif
  
  ifeq ($(DISTRO),Debian)
- BIN	+= mountpoint
+-BIN	+= mountpoint
 -SBIN	+= sulogin bootlogd
-+SBIN	+=
- MAN1	+= mountpoint.1
+-MAN1	+= mountpoint.1
 -MAN8	+= sulogin.8 bootlogd.8
++BIN	+=
++SBIN	+=
++MAN1	+=
 +MAN8	+=
  endif
  
@@ -51,7 +57,7 @@
  LCRYPT		= -lcrypt
  endif
  
-@@ -120,14 +118,10 @@
+@@ -120,14 +118,7 @@
  			$(INSTALL) -m 755 $$i $(ROOT)/usr/bin/; \
  		done
  		# $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc/
@@ -59,14 +65,14 @@
 -		ln -sf halt $(ROOT)/sbin/poweroff
 -		ln -sf init $(ROOT)/sbin/telinit
  		ln -sf ../sbin/killall5 $(ROOT)/bin/pidof
- 		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
- 			ln -sf last $(ROOT)/usr/bin/lastb; \
- 		fi
+-		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
+-			ln -sf last $(ROOT)/usr/bin/lastb; \
+-		fi
 -		$(INSTALL) -m 644 initreq.h $(ROOT)/usr/include/
  		for i in $(MAN1); do \
  			$(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/; \
  		done
-@@ -137,12 +131,3 @@
+@@ -137,12 +128,3 @@
  		for i in $(MAN8); do \
  			$(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man8/; \
  		done
diff --git a/sysvinit/sysvinit.nm b/sysvinit/sysvinit.nm
index 637b564ca..3727da59e 100644
--- a/sysvinit/sysvinit.nm
+++ b/sysvinit/sysvinit.nm
@@ -5,7 +5,7 @@
 
 name       = sysvinit
 version    = 2.86
-release    = 5
+release    = 6
 
 groups     = System/Base
 url        = https://alioth.debian.org/projects/pkg-sysvinit/
@@ -22,29 +22,34 @@ sources    = %{thisapp}.tar.gz
 CFLAGS    += -D_GNU_SOURCE
 
 build
-	requires
-		libselinux-devel
-	end
-
 	make_build_targets += \
 		-C src CFLAGS="%{CFLAGS}" \
-		LDFLAGS="" \
-		LCRYPT="-lcrypt"
+		LDFLAGS=""
 
 	install
-		mkdir -pv %{BUILDROOT}/{bin,sbin,usr/{bin,include}}
-		mkdir -pv %{BUILDROOT}/usr/share/man/man{1,5,8}
-		make -C src install ROOT=%{BUILDROOT}
-
-		# /bin/mountpoint is part of util-linux >= 2.20
-		rm -vf %{BUILDROOT}/bin/mountpoint \
-			%{BUILDROOT}/usr/share/man/man1/mountpoint.1
+		# Create directories.
+		mkdir -pv %{BUILDROOT}%{bindir}
+		mkdir -pv %{BUILDROOT}%{sbindir}
+		mkdir -pv %{BUILDROOT}%{mandir}/man8
+
+		# Install binaries.
+		install -m 0755 src/killall5 %{BUILDROOT}%{sbindir}
+		ln -sf ../sbin/killall5 %{BUILDROOT}%{bindir}/pidof
+
+		# Install man-pages.
+		install -m 0664 man/killall5.8 %{BUILDROOT}%{mandir}/man8
+		install -m 0664 man/pidof.8 %{BUILDROOT}%{mandir}/man8
 	end
 end
 
 packages
 	package %{name}
 		groups += Base
+
+		provides
+			/bin/pidof
+			/sbin/killall5
+		end
 	end
 
 	package %{name}-debuginfo
-- 
2.39.2