From 2840f5bc263074d10ef8d691355e67dad091784a90b8a76fec948fe8c7004293 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 29 Jun 2011 10:55:01 +0000
Subject: [PATCH] Accepting request 74732 from
 home:a_jaeger:branches:openSUSE:Factory

Fix build without static libcrypt.a

OBS-URL: https://build.opensuse.org/request/show/74732
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=127
---
 sysvinit-2.88+dsf-crypt.patch | 22 ++++++++++++++++++++++
 sysvinit.changes              |  6 ++++++
 sysvinit.spec                 |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 sysvinit-2.88+dsf-crypt.patch

diff --git a/sysvinit-2.88+dsf-crypt.patch b/sysvinit-2.88+dsf-crypt.patch
new file mode 100644
index 0000000..b0f1411
--- /dev/null
+++ b/sysvinit-2.88+dsf-crypt.patch
@@ -0,0 +1,22 @@
+Index: src/Makefile
+===================================================================
+--- src/Makefile.orig
++++ src/Makefile
+@@ -70,7 +70,7 @@ MANDIR		= /usr/share/man
+ ifeq ($(WITH_SELINUX),yes)
+   SELINUX_DEF	=  -DWITH_SELINUX
+   INITLIBS	+= -lsepol -lselinux
+-  SULOGINLIBS	= -lselinux	
++  SULOGINLIBS	= -lselinux
+ else
+   SELINUX_DEF	=
+   INITLIBS	=
+@@ -78,7 +78,7 @@ else
+ endif
+ 
+ # Additional libs for GNU libc.
+-ifneq ($(wildcard /usr/lib*/libcrypt.a),)
++ifneq ($(wildcard /usr/lib*/libcrypt.so),)
+   SULOGINLIBS	+= -lcrypt
+ endif
+ 
diff --git a/sysvinit.changes b/sysvinit.changes
index 4e8945f..5b9c149 100644
--- a/sysvinit.changes
+++ b/sysvinit.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 28 08:36:54 UTC 2011 - aj@suse.de
+
+- Fix build without libcrypt.a (without static glibc), added
+  patch sysvinit-2.88+dsf-crypt.patch.
+
 -------------------------------------------------------------------
 Wed Jun  1 12:57:08 UTC 2011 - lnussel@suse.de
 
diff --git a/sysvinit.spec b/sysvinit.spec
index cfdb4e5..290a3b1 100644
--- a/sysvinit.spec
+++ b/sysvinit.spec
@@ -51,6 +51,7 @@ Patch3:         sysvinit-2.88dsf-no-kill.patch
 Patch4:         notify-pam-dead.patch
 Patch5:         sysvinit-2.88dsf-multiple-sulogin.patch
 Patch6:         sysvinit-2.88+dsf-run.diff
+Patch7:         sysvinit-2.88+dsf-crypt.patch
 Patch20:        powerd-2.0.2.dif
 Patch21:        powerd-2.0.2-getaddrinfo.patch
 Patch30:        killproc-2.19.dif
@@ -93,6 +94,7 @@ sysvinit package.
 %patch4  -p0 -b .pam
 %patch5  -p0 -b .sulogin
 %patch6  -p0 -b .run
+%patch7  -p0 -b .crypt
 %patch
 pushd ../powerd-%{PDVER}
 %patch20