emo/sysvinit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sysvinit bug #29758

Browse Source
This commit is contained in:
Werner Fink 2010-05-04 07:50:12 +00:00
parent 1f809110cb
commit ba54bb9ac4
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,7 @@
all install clean distclean: all install clean distclean:
$(MAKE) -C src $@ $(MAKE) -C src $@
ifeq ($(MAKECMDGOALS),upload)
PACKAGE=sysvinit PACKAGE=sysvinit
VERSION=$(shell sed -rn '1s/.*[[:blank:]]\((.*)\)[[:blank:]].*/\1/p' doc/Changelog) VERSION=$(shell sed -rn '1s/.*[[:blank:]]\((.*)\)[[:blank:]].*/\1/p' doc/Changelog)
SVLOGIN=$(shell svn info | sed -rn '/Repository Root:/{ s|.*//(.*)\@.*|\1|p }') SVLOGIN=$(shell svn info | sed -rn '/Repository Root:/{ s|.*//(.*)\@.*|\1|p }')
@ -35,3 +36,4 @@ $(TMP)/$(PACKAGE)-$(VERSION): .svn
svn export . $@ svn export . $@
@chmod -R a+r,u+w,og-w $@ @chmod -R a+r,u+w,og-w $@
@find $@ -type d | xargs -r chmod a+rx,u+w,og-w @find $@ -type d | xargs -r chmod a+rx,u+w,og-w
endif

2
doc/Changelog
View File

@ -5,6 +5,8 @@ sysvinit (2.89dsf) UNRELEASED; urgency=low
and if already set to make sure the utf-8 flag is not cleared and if already set to make sure the utf-8 flag is not cleared
from the tty. Patch from Samuel Thibault. from the tty. Patch from Samuel Thibault.
* Include limits.h in killall.c to enforce definition of PATH_MAX * Include limits.h in killall.c to enforce definition of PATH_MAX
* Fix sysvinit bug #29758 Linker invocation should not contain
headers. Change based on patch from Elias Pipping.
[ Petter Reinholdtsen ] [ Petter Reinholdtsen ]
* Next release will be 2.89dsf. * Next release will be 2.89dsf.

20
src/Makefile
View File

@ -92,9 +92,9 @@ all: $(BIN) $(SBIN) $(USRBIN)
init: LDLIBS += $(INITLIBS) $(STATIC) init: LDLIBS += $(INITLIBS) $(STATIC)
init: init.o init_utmp.o init: init.o init_utmp.o
halt: halt.o ifdown.o hddown.o utmp.o reboot.h halt: halt.o ifdown.o hddown.o utmp.o
last: last.o oldutmp.h last: last.o
mesg: mesg.o mesg: mesg.o
@ -109,7 +109,7 @@ sulogin: sulogin.o
wall: dowall.o wall.o wall: dowall.o wall.o
shutdown: dowall.o shutdown.o utmp.o reboot.h shutdown: dowall.o shutdown.o utmp.o
bootlogd: LDLIBS += -lutil bootlogd: LDLIBS += -lutil
bootlogd: bootlogd.o bootlogd: bootlogd.o
@ -118,14 +118,22 @@ sulogin.o: CPPFLAGS += $(SELINUX_DEF)
sulogin.o: sulogin.c sulogin.o: sulogin.c
init.o: CPPFLAGS += $(SELINUX_DEF) init.o: CPPFLAGS += $(SELINUX_DEF)
init.o: init.c init.h set.h reboot.h initreq.h init.o: init.c init.h initreq.h paths.h reboot.h set.h
utmp.o: utmp.c init.h utmp.o:
init_utmp.o: CPPFLAGS += -DINIT_MAIN init_utmp.o: CPPFLAGS += -DINIT_MAIN
init_utmp.o: utmp.c init.h init_utmp.o: utmp.c init.h initreq.h paths.h
$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
utmpdump.o: utmpdump.c oldutmp.h
shutdown.o: shutdown.c paths.h reboot.h initreq.h init.h
halt.o: halt.c reboot.h
last.o: last.c oldutmp.h
cleanobjs: cleanobjs:
rm -f *.o *.bak rm -f *.o *.bak