From 5862093f380eb7298a0b65b7636412a7ddec065d957ec4b77fb50030fbd2fc93 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 7 May 2009 13:23:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysvinit?expand=0&rev=48 --- sysvinit-2.86-dynamically_link_init.patch | 31 +++++++++++++++++++++++ sysvinit.changes | 11 ++++++++ sysvinit.spec | 9 ++++++- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 sysvinit-2.86-dynamically_link_init.patch diff --git a/sysvinit-2.86-dynamically_link_init.patch b/sysvinit-2.86-dynamically_link_init.patch new file mode 100644 index 0000000..8bd3afd --- /dev/null +++ b/sysvinit-2.86-dynamically_link_init.patch @@ -0,0 +1,31 @@ +Index: src/Makefile +=================================================================== +--- src/Makefile 2009-05-06 21:31:08.000000000 +0200 ++++ src/Makefile 2009-05-06 21:33:06.000000000 +0200 +@@ -69,7 +69,7 @@ endif + all: $(BIN) $(SBIN) $(USRBIN) + + init: init.o init_utmp.o +- $(CC) $(LDFLAGS) $(STATIC) -o $@ init.o init_utmp.o -lselinux -lsepol ++ $(CC) $(LDFLAGS) -Wl,--as-needed -o $@ init.o init_utmp.o -lselinux -lsepol + + halt: halt.o ifdown.o hddown.o utmp.o reboot.h + $(CC) $(LDFLAGS) -o $@ halt.o ifdown.o hddown.o utmp.o +@@ -90,7 +90,7 @@ runlevel: runlevel.o + $(CC) $(LDFLAGS) -o $@ runlevel.o + + sulogin: sulogin.o +- $(CC) $(LDFLAGS) -o $@ sulogin.o $(LCRYPT) -lselinux ++ $(CC) $(LDFLAGS) -Wl,--as-needed -o $@ sulogin.o $(LCRYPT) -lselinux + + wall: dowall.o wall.o + $(CC) $(LDFLAGS) -o $@ dowall.o wall.o +@@ -99,7 +99,7 @@ shutdown: dowall.o shutdown.o utmp.o reb + $(CC) $(LDFLAGS) -o $@ dowall.o shutdown.o utmp.o + + bootlogd: bootlogd.o +- $(CC) $(LDFLAGS) -o $@ bootlogd.o -lutil ++ $(CC) $(LDFLAGS) -Wl,--as-needed -o $@ bootlogd.o -lutil + + init.o: init.c init.h set.h reboot.h initreq.h + $(CC) -c $(CFLAGS) $(IFLAGS) init.c diff --git a/sysvinit.changes b/sysvinit.changes index 93e5508..9139c7a 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu May 7 12:47:36 CEST 2009 - werner@suse.de + +- Reorder last patch in spec file + +------------------------------------------------------------------- +Wed May 6 21:36:13 CEST 2009 - crrodriguez@suse.de + +- link /sbin/init dynamically, tested in 11.1, also + all other distros work just fine this way. + ------------------------------------------------------------------- Mon May 4 12:22:55 CEST 2009 - werner@suse.de diff --git a/sysvinit.spec b/sysvinit.spec index 0597a44..80a3cab 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -30,7 +30,7 @@ Group: System/Base PreReq: coreutils AutoReqProv: on Version: 2.86 -Release: 207 +Release: 208 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libselinux-devel libsepol-devel @@ -65,6 +65,7 @@ Patch18: sysvinit-2.86-selinux.patch Patch19: sysvinit-2.86-fuse-no-kill.patch Patch20: startpar-preload.diff Patch21: startpar-bootchart.diff +Patch22: sysvinit-2.86-dynamically_link_init.patch %description System V style init programs by Miquel van Smoorenburg that control the @@ -100,6 +101,7 @@ Authors: %patch -P 17 -b .hddown %patch -P 18 -b .selinux %patch -P 19 -b .fuse +%patch -P 22 -b .dynamic %patch pushd ../powerd-%{PDVER} %patch -P 2 @@ -327,6 +329,11 @@ rm -rf ${RPM_BUILD_ROOT} %doc %{_mandir}/man8/mkill.8.gz %changelog +* Thu May 07 2009 werner@suse.de +- Reorder last patch in spec file +* Wed May 06 2009 crrodriguez@suse.de +- link /sbin/init dynamically, tested in 11.1, also + all other distros work just fine this way. * Mon May 04 2009 werner@suse.de - Blogd: shorten minimal timeout at the end and hold all pages in physical RAM