From 2a396fb0fbb855c46ac10ffab35bc248abe8ad3723430a396949f3dbeee4c640 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 13 Mar 2009 14:12:02 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/sysvinit?expand=0&rev=40

---
 startpar-0.53.dif | 39 ++++++++++++++++++++++++++++++++++++++-
 sysvinit.changes  | 10 ++++++++++
 sysvinit.spec     |  6 +++++-
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/startpar-0.53.dif b/startpar-0.53.dif
index de1fd53..d6c7459 100644
--- a/startpar-0.53.dif
+++ b/startpar-0.53.dif
@@ -1,4 +1,41 @@
---- startpar.c	2008-07-18 13:25:50.000000000 +0200
+--- Makefile
++++ Makefile	2009-03-13 15:01:12.317145442 +0100
+@@ -15,17 +15,17 @@ OBJS		= $(SRCS:.c=.o)
+ 
+ CC = gcc
+ OPTFLAGS = -O2 -g -Wall -W
+-CFLAGS = $(OPTFLAGS) -D_GNU_SOURCE $(ISSUSE)
++CFLAGS = $(OPTFLAGS) -D_GNU_SOURCE
+ 
+ ifeq ($(MAKECMDGOALS),makeboot)
+ CFLAGS += -DTEST
+ endif
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c $<
++	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" $(ISSUSE) -c $<
+ 
+ startpar: $(OBJS)
+-	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -o $@ $(OBJS)
++	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" $(ISSUSE) -o $@ $(OBJS)
+ 
+ makeboot: makeboot.c
+ 
+--- makeboot.c
++++ makeboot.c	2009-03-13 13:28:08.824501381 +0100
+@@ -278,8 +278,10 @@ static void filter_files(const char *dir
+ #endif
+ 	ndirs = scandir(path, &dirlist, dirfilter, alphasort);
+ #if defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 600
+-	if (i >= 0)
++	if (i >= 0) {
+ 		(void)posix_fadvise(i, 0, 0, POSIX_FADV_DONTNEED);
++		close(i);
++	}
+ #endif
+ 	/* mark all matching nodes */
+ 	if (ndirs >= 0) {
+--- startpar.c
 +++ startpar.c	2009-02-12 14:49:10.987760000 +0100
 @@ -29,6 +29,8 @@
  #include <sys/select.h>
diff --git a/sysvinit.changes b/sysvinit.changes
index fc59ff8..b2b56b9 100644
--- a/sysvinit.changes
+++ b/sysvinit.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Mar 13 15:03:13 CET 2009 - werner@suse.de
+
+- Do not overwrite SUSE define
+
+-------------------------------------------------------------------
+Fri Mar 13 13:34:05 CET 2009 - werner@suse.de
+
+- startpar: fix file descriptor leak (bnc#485112)
+
 -------------------------------------------------------------------
 Wed Mar 11 14:24:06 CET 2009 - werner@suse.de
 
diff --git a/sysvinit.spec b/sysvinit.spec
index dd932af..9c527ae 100644
--- a/sysvinit.spec
+++ b/sysvinit.spec
@@ -30,7 +30,7 @@ Group:          System/Base
 PreReq:         coreutils
 AutoReqProv:    on
 Version:        2.86
-Release:        199
+Release:        200
 Summary:        SysV-Style init
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libselinux-devel libsepol-devel
@@ -323,6 +323,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc %{_mandir}/man8/mkill.8.gz
 
 %changelog
+* Fri Mar 13 2009 werner@suse.de
+- Do not overwrite SUSE define
+* Fri Mar 13 2009 werner@suse.de
+- startpar: fix file descriptor leak (bnc#485112)
 * Wed Mar 11 2009 werner@suse.de
 - nfs4pidof: make sure not to stumble on short named mount points
   to avoid to terminate processes on wrong mount points