summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/minit/ChangeLog6
-rw-r--r--sys-process/minit/Manifest13
-rw-r--r--sys-process/minit/files/minit-0.10-fixes.diff62
3 files changed, 69 insertions, 12 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/Manifest b/sys-process/minit/Manifest
index 4c85c3ec441d..7393337f9008 100644
--- a/sys-process/minit/Manifest
+++ b/sys-process/minit/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 0.9.1-destdir.patch 622 RMD160 780697bdfc21460284c6842cbea10c0563567c0b SHA1 bfd98fc1e9fc5c3656277c6c7f6552ff7481fa8c SHA256 3e9f633a6f9c02a61a68d85c1bd8308d26898379d5fa31fd8dac88381e522d19
+AUX minit-0.10-fixes.diff 1916 RMD160 f3537d209bbd5793df9993ecb8a4a2d6c6195fa2 SHA1 124e5f83dbfd18ba7b9c8dd090eae0ae220d032d SHA256 0d65720c5170949fad9b798cf8185eb4a01ccbeab6a79ef5805ff65b9975a5a2
DIST minit-0.10.tar.bz2 26119 RMD160 d9364ecfada752affd1052050daa73cc4c4acb18 SHA1 f4ca32bafb3e9567bbc21f13f2f06fe009fe64db SHA256 e976926342da1828d7e6b10fe489366e7690acdd0c81c0fdfa04c57182ddfacd
DIST minit-0.9.1.tar.bz2 21894 RMD160 48ddd675fc13dbf57afd26224e83a9c4a8aa8946 SHA1 c0f4ac571012daadc2b581683e861cfbe4d997e8 SHA256 8128b6b96dbe31072005acb63005d77f052a98393c455a725c2ac5054d561d22
EBUILD minit-0.10.ebuild 1039 RMD160 9a9ceefd62d45195a0cd3e28910fdfce661429b4 SHA1 004a0a0efd408309c28986d68f1900fdc84ba15b SHA256 855df87d22d29f7ffdb40866de824e5b49223ecc9b9156b337a5d153e48e6c2e
EBUILD minit-0.9.1.ebuild 675 RMD160 42216a095cd1ce7013766fe6b005d41550c4f05a SHA1 4554f51eb9799f35609cf3152a048b763b867a6f SHA256 4543adaaa9a4b644343b6ecd5955651ebf2bf414775eb3c0f310d1d4be2c7de3
-MISC ChangeLog 1043 RMD160 cc2f0fd2517afbe45d5bc861a80686d9852257ba SHA1 d1364734b3b42d671f557dd1a5ad934e78f6aa7d SHA256 59d612ff2832f9a0fbb4274e633f6a09f0da1c4a0dcb6db34790b2dc2187ae81
+MISC ChangeLog 1168 RMD160 7ad3d560721723293ab6d3599dac600568ccb539 SHA1 01db0e92b9ea734c47c44422c130065a1bc346f5 SHA256 3d8f1eb28c08c7b08b1a171dd566d2e38554c9ed22490f0cfcab29e32ff4137e
MISC metadata.xml 1246 RMD160 8757553a3daab945e89001af8b15a76cb6d7a6dc SHA1 b7086b12013b37322fd82be9ced94621caa0d18f SHA256 82eba9f77ac2de86c01f8777fb323677f0099b8a80f140169abfd89a5033ea41
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrTi7AACgkQ/ejvha5XGaOnZwCcDirgBJQCZ7S14N/a2ACNHzPz
-yHUAoIWcMLk5364eGLbpfxkzMzWUeuGK
-=52KR
------END PGP SIGNATURE-----
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;
+