diff options
| author |   Victor Ostorga <vostorga@gentoo.org> | 2009-12-07 17:26:17 +0000 |
|---|---|---|
| committer | Victor Ostorga <vostorga@gentoo.org> | 2009-12-07 17:26:17 +0000 |
| commit | 9c22741fcd454e2d88800e05cca64ae32986cebf (patch) | |
| tree | 1f0c4819ca7e764dde379ff503a31fee04b018ad /sys-process | |
| parent | stable sparc, security bug 295535 (diff) | |
| download | gentoo-2-9c22741fcd454e2d88800e05cca64ae32986cebf.tar.gz gentoo-2-9c22741fcd454e2d88800e05cca64ae32986cebf.tar.bz2 gentoo-2-9c22741fcd454e2d88800e05cca64ae32986cebf.zip | |
Re-adding missing patch, bug #295817
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'sys-process')
| -rw-r--r-- | sys-process/minit/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-process/minit/files/minit-0.10-fixes.diff | 62 |
2 files changed, 67 insertions, 1 deletions
diff --git a/sys-process/minit/ChangeLog b/sys-process/minit/ChangeLog index 66447465f8cb..afaf43dec025 100644 --- a/sys-process/minit/ChangeLog +++ b/sys-process/minit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-process/minit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/minit/ChangeLog,v 1.8 2009/08/30 17:39:54 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/minit/ChangeLog,v 1.9 2009/12/07 17:26:17 vostorga Exp $ + + 07 Dec 2009; Víctor Ostorga <vostorga@gentoo.org> + +files/minit-0.10-fixes.diff: + Re-adding missing patch, bug #295817 30 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> minit-0.10.ebuild, +files/minit-0.10-fixes.diff, metadata.xml: diff --git a/sys-process/minit/files/minit-0.10-fixes.diff b/sys-process/minit/files/minit-0.10-fixes.diff new file mode 100644 index 000000000000..5c80091f84f3 --- /dev/null +++ b/sys-process/minit/files/minit-0.10-fixes.diff @@ -0,0 +1,62 @@ +diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile +--- minit-0.10.orig/Makefile 2005-04-08 19:24:04.000000000 +0200 ++++ minit-0.10/Makefile 2008-11-27 23:05:57.000000000 +0100 +@@ -7,7 +7,7 @@ + CROSS= + #CROSS=arm-linux- + LDFLAGS=-s +-MANDIR=/usr/man ++MANDIR=/usr/share/man + + path = $(subst :, ,$(PATH)) + diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet)) +@@ -44,9 +44,11 @@ + msvc: msvc.o + minit-update: minit-update.o split.o openreadclose.o + serdo: serdo.o +- + shutdown: shutdown.o split.o openreadclose.o opendevconsole.o +- $(DIET) $(CROSS)$(CC) $(LDFLAGS) -o shutdown $^ ++pidfilehack: pidfilehack.o ++hard-reboot: hard-reboot.o ++write_proc: write_proc.o ++killall5: killall5.o + + %.o: %.c + $(DIET) $(CROSS)$(CC) $(CFLAGS) -c $< +@@ -61,22 +63,11 @@ + test: test.c + gcc -nostdlib -o $@ $^ -I../dietlibc/include ../dietlibc/start.o ../dietlibc/dietlibc.a + +-pidfilehack: pidfilehack.c +- $(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^ +- +-hard-reboot: hard-reboot.c +- $(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^ +- +-write_proc: write_proc.c +- $(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^ +- +-killall5: killall5.c +- $(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^ +- + install-files: + install -d $(DESTDIR)/etc/minit $(DESTDIR)/sbin $(DESTDIR)/bin $(DESTDIR)$(MANDIR)/man8 +- install minit pidfilehack $(DESTDIR)/sbin ++ install minit killall5 pidfilehack $(DESTDIR)/sbin + install write_proc hard-reboot minit-update $(DESTDIR)/sbin ++ install listpids $(DESTDIR)/sbin/minit-list + install msvc serdo $(DESTDIR)/bin + install -m 4750 shutdown $(DESTDIR)/sbin + test -f $(DESTDIR)/sbin/init || ln $(DESTDIR)/sbin/minit $(DESTDIR)/sbin/init +diff -ru minit-0.10.orig/serdo.c minit-0.10/serdo.c +--- minit-0.10.orig/serdo.c 2005-02-26 18:00:22.000000000 +0100 ++++ minit-0.10/serdo.c 2008-11-27 23:02:57.000000000 +0100 +@@ -10,6 +10,7 @@ + #define MAXENV 256 + char* envp[MAXENV+2]; + int envc; ++extern char **environ; + + int continueonerror; + |