From a3368ae4e437d8abc97fa405c88a382abc17b291 Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 17 Dec 2011 18:41:42 +0100
Subject: [PATCH] sysvinit: Build sulogin for systemd emergency mode.

The build of the binary was disabled in the past, so I had to edit our patch
to enable build of sulogin.

Fixes #302
---
 .../patches/sysvinit-2.86-remove-utils-1.patch   | 16 ++++++++++------
 sysvinit/sysvinit.nm                             |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
index b3c22ef25..8e6881d51 100644
--- a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
+++ b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
@@ -1,6 +1,6 @@
---- sysvinit-2.86/src/Makefile.old	2009-08-05 17:57:57.000000000 +0200
-+++ sysvinit-2.86/src/Makefile	2009-08-05 19:03:04.000000000 +0200
-@@ -10,32 +10,26 @@
+--- 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
+@@ -10,32 +10,30 @@
  
  CC	= gcc
  CFLAGS	= -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
@@ -26,19 +26,23 @@
 -USRBIN	+= utmpdump wall
 -MAN1	+= mountpoint.1 wall.1
 -MAN8	+= sulogin.8 bootlogd.8
++SBIN	+= sulogin
 +USRBIN	+= utmpdump
 +MAN1	+= mountpoint.1
++MAN8	+= sulogin.8
  endif
  
  ifeq ($(DISTRO),Debian)
  BIN	+= mountpoint
 -SBIN	+= sulogin bootlogd
++SBIN	+= sulogin
  MAN1	+= mountpoint.1
 -MAN8	+= sulogin.8 bootlogd.8
++MAN8	+= sulogin.8
  endif
  
  ifeq ($(DISTRO),Owl)
-@@ -50,7 +44,7 @@
+@@ -50,7 +48,7 @@
  MANDIR		= /usr/share/man
  
  # Additional libs for GNU libc.
@@ -47,7 +51,7 @@
  LCRYPT		= -lcrypt
  endif
  
-@@ -120,14 +114,10 @@
+@@ -120,14 +118,10 @@
  			$(INSTALL) -m 755 $$i $(ROOT)/usr/bin/; \
  		done
  		# $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc/
@@ -62,7 +66,7 @@
  		for i in $(MAN1); do \
  			$(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/; \
  		done
-@@ -137,12 +127,3 @@
+@@ -137,12 +131,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 cdbed7f69..5627f76c6 100644
--- a/sysvinit/sysvinit.nm
+++ b/sysvinit/sysvinit.nm
@@ -5,7 +5,7 @@
 
 name       = sysvinit
 version    = 2.86
-release    = 3
+release    = 4
 
 groups     = System/Base
 url        = https://alioth.debian.org/projects/pkg-sysvinit/
-- 
2.39.5