summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-07-21 12:46:52 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-07-21 12:46:52 +0000
commit7876dd2c0ee81ee6be3a5770990c483e2047acce (patch)
tree436a63b1a538eccd16c888e467eed6c8a4c4afbb /sys-apps/mkinitrd
parentstable x86, bug 304057 (diff)
downloadgentoo-2-7876dd2c0ee81ee6be3a5770990c483e2047acce.tar.gz
gentoo-2-7876dd2c0ee81ee6be3a5770990c483e2047acce.tar.bz2
gentoo-2-7876dd2c0ee81ee6be3a5770990c483e2047acce.zip
gone
Diffstat (limited to 'sys-apps/mkinitrd')
-rw-r--r--sys-apps/mkinitrd/ChangeLog102
-rw-r--r--sys-apps/mkinitrd/Manifest10
-rw-r--r--sys-apps/mkinitrd/files/mkinitrd-3.5.7-dietssp.patch275
-rw-r--r--sys-apps/mkinitrd/files/mkinitrd-4.2.0.3-glibc-2.10.patch29
-rw-r--r--sys-apps/mkinitrd/files/mkinitrd-lvm_statics.diff15
-rw-r--r--sys-apps/mkinitrd/files/mkinitrd-selinux.diff28
-rw-r--r--sys-apps/mkinitrd/metadata.xml5
-rw-r--r--sys-apps/mkinitrd/mkinitrd-3.5.7-r3.ebuild53
-rw-r--r--sys-apps/mkinitrd/mkinitrd-4.2.0.3-r1.ebuild47
9 files changed, 0 insertions, 564 deletions
diff --git a/sys-apps/mkinitrd/ChangeLog b/sys-apps/mkinitrd/ChangeLog
deleted file mode 100644
index 37a4977f17f3..000000000000
--- a/sys-apps/mkinitrd/ChangeLog
+++ /dev/null
@@ -1,102 +0,0 @@
-# ChangeLog for sys-apps/mkinitrd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/ChangeLog,v 1.25 2010/04/16 15:23:12 ranger Exp $
-
- 16 Apr 2010; Brent Baude <ranger@gentoo.org> mkinitrd-4.2.0.3-r1.ebuild:
- stable ppc, bug 314857
-
-*mkinitrd-4.2.0.3-r1 (09 Aug 2009)
-
- 09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
- +mkinitrd-4.2.0.3-r1.ebuild, +files/mkinitrd-4.2.0.3-glibc-2.10.patch:
- Fix building with GLIBC 2.10+ wrt #271605.
-
- 14 Oct 2008; Diego Pettenò <flameeyes@gentoo.org>
- mkinitrd-4.2.0.3.ebuild:
- Let CFLAGS be respected during src_compile rather than being set in stone.
-
- 22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
- Redigest for Manifest2
-
- 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> mkinitrd-3.5.7-r3.ebuild:
- Mark 3.5.7-r3 stable on ia64
-
- 27 Dec 2005; Bryan Østergaard <kloeri@gentoo.org
- mkinitrd-3.5.7-r3.ebuild:
- Stable on alpha.
-
- 24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
- mkinitrd-3.5.7-r3.ebuild:
- Stable on ppc.
-
- 10 Dec 2005; Mark Loeser <halcy0n@gentoo.org> mkinitrd-3.5.7-r3.ebuild:
- Stable on x86; bug #110544
-
- 29 Aug 2005; Mike Frysinger <vapier@gentoo.org> mkinitrd-3.5.7-r3.ebuild,
- mkinitrd-4.2.0.3.ebuild:
- Punt USE=diet.
-
-*mkinitrd-4.2.0.3 (12 Feb 2005)
-
- 12 Feb 2005; Mike Frysinger <vapier@gentoo.org> +mkinitrd-4.2.0.3.ebuild:
- Version bump.
-
- 23 Oct 2004; Aron Griffis <agriffis@gentoo.org> mkinitrd-3.5.7-r2.ebuild,
- mkinitrd-3.5.7-r3.ebuild:
- add alpha/ia64 keywords
-
-*mkinitrd-3.5.7-r3 (10 Oct 2004)
-
- 10 Oct 2004; <solar@gentoo.org> +files/mkinitrd-3.5.7-dietssp.patch,
- +mkinitrd-3.5.7-r3.ebuild:
- added additional local diet and __guard functions support for mkinitrd. bug
- 35138
-
- 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
- mkinitrd-3.5.7-r2.ebuild:
- Masked mkinitrd-3.5.7-r2.ebuild stable for ppc
-
- 20 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> mkinitrd-3.5.7-r2.ebuild:
- Marked ~amd64.
-
- 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> mkinitrd-3.5.7.ebuild:
- Add inherit eutils
-
-*mkinitrd-3.5.7-r2 (31 Oct 2003)
-
- 25 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
- dietlibc support seems to be broken so remove it for now #35138.
-
- 31 Oct 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7-r2.ebuild,
- files/mkinitrd-lvm_statics.diff:
- Change vgwrapper to static vgscan and vgchange to fix #29694. Using modified
- patch from Sascha Silbe.
-
- 27 Oct 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7-r1.ebuild,
- mkinitrd-3.5.7.ebuild:
- Add linux-headers dependancy to close #31580.
-
-*mkinitrd-3.5.7-r1 (18 Oct 2003)
-
- 18 Oct 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7-r1.ebuild:
- Add fix for coreutils changed tail -1 behavior.
-
- 15 Oct 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7.ebuild:
- Fix SELinux circular dependancy
-
- 06 Oct 2003; Chris PeBenito <pebenito@gentoo.org> metadata.xml,
- mkinitrd-3.5.7.ebuild:
- Mark stable.
-
- 22 Sep 2003; <paul@gentoo.org> metadata.xml:
- Fix metadata.xml
-
- 07 Aug 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7.ebuild:
- Add missing selinux? RDEP
-
-*mkinitrd-3.5.7 (07 Aug 2003)
-
- 07 Aug 2003; Chris PeBenito <pebenito@gentoo.org> metadata.xml,
- mkinitrd-3.5.7.ebuild, files/mkinitrd-selinux.diff:
- Initial commit
-
diff --git a/sys-apps/mkinitrd/Manifest b/sys-apps/mkinitrd/Manifest
deleted file mode 100644
index 6b7087188bcf..000000000000
--- a/sys-apps/mkinitrd/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX mkinitrd-3.5.7-dietssp.patch 8035 RMD160 9f5771ca418e86e54e9c09abac4dcf6830ddefe5 SHA1 b28d1df724cfa746363d9c5fbbe277c7adf9acfc SHA256 15e8e7935d789cc911516677f1e09b54241f5fc41bd16005aacb642252ae9f20
-AUX mkinitrd-4.2.0.3-glibc-2.10.patch 912 RMD160 abf8bf4d76a4e401150c1b18113ccc6ddfa2d0cb SHA1 265a43a90f870ccc1bdbc898faf7419c3a0463ef SHA256 e6783f7eab19c5dcde899c77368173e7fd4e2da7bc86fdf0c6408e54af9f4304
-AUX mkinitrd-lvm_statics.diff 591 RMD160 0c119b1300e2bbb007f91955b7157450616c806a SHA1 6af17a057d768bc9d131cc9d0f24afdc8f025ee8 SHA256 27112716e4d4be34681341c5c1ef72466f236de8b1042685fad6dd33ed365c24
-AUX mkinitrd-selinux.diff 1007 RMD160 6bd572981825cb35463f2527c016f2129309100d SHA1 313a9ed2a5cb40ac7359a305e2226f4c3524f951 SHA256 706a83c6148c86b3c02e72a74d9975405efe11bb97189f6eb982a95ea4ec9a6a
-DIST mkinitrd-3.5.7.tar.bz2 53233 RMD160 bbf9e1ffb30946f56c4c5d9e6e453a1e5623a185 SHA1 759e9be1bf4b9274b6475c75c71f7ec5417263f7 SHA256 e616299e8c6aaea96abba5d176eebeccd9d60e99237956d5f1894dc1a05a92f5
-DIST mkinitrd-4.2.0.3.tar.bz2 63317 RMD160 4bc253378e44f04dffbf4e68acd62bf43b781867 SHA1 c2ceacb60bbab52fc406a77b2e8c88d119c837ef SHA256 7fe1a9dc461bacc7b968ed23a0314563e3136943d68bbfeb3c5bcde57c9fe563
-EBUILD mkinitrd-3.5.7-r3.ebuild 1352 RMD160 ce34e5f76e8851357daf0bd0afae76b8455026b4 SHA1 cc71967824133926e81a06dd5a11b7a183cbfe62 SHA256 34afec749fa374aab47cb6f6b4519011d334a52f76903ac569b0be9b35030c9d
-EBUILD mkinitrd-4.2.0.3-r1.ebuild 1313 RMD160 45c7ed88b328f8486ba84837f67c1d3778e6eb28 SHA1 d974e5cfeb7f59f01991085b6dd1676ccc27811d SHA256 605701164741bbc0c6cf920d861dcdb86e713b892c5aedd7c738efcc6446a516
-MISC ChangeLog 3347 RMD160 be2ad8a8744723ea44f1ff5178e56a57c26e5ee6 SHA1 c041b26305c84ca968df8d116546c51a614a33a7 SHA256 86492274a37dc3c46ac1bbdad85de48b6ca57b7a5cf59c0a5578db0f39ef473f
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-apps/mkinitrd/files/mkinitrd-3.5.7-dietssp.patch b/sys-apps/mkinitrd/files/mkinitrd-3.5.7-dietssp.patch
deleted file mode 100644
index f2a0e5b1a31d..000000000000
--- a/sys-apps/mkinitrd/files/mkinitrd-3.5.7-dietssp.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-diff -Nrup mkinitrd-3.5.7.orig/grubby/mount_by_label.c mkinitrd-3.5.7/grubby/mount_by_label.c
---- mkinitrd-3.5.7.orig/grubby/mount_by_label.c 2002-12-16 22:05:01.000000000 +0000
-+++ mkinitrd-3.5.7/grubby/mount_by_label.c 2004-08-07 09:14:40.000000000 +0000
-@@ -29,6 +29,15 @@
-
- #define _(str) (str)
-
-+#ifndef gnu_dev_makedev
-+unsigned long long int gnu_dev_makedev (unsigned int __major, unsigned int __minor)
-+{
-+ return ((__minor & 0xff) | ((__major & 0xfff) << 8)
-+ | (((unsigned long long int) (__minor & ~0xff)) << 12)
-+ | (((unsigned long long int) (__major & ~0xfff)) << 32));
-+}
-+#endif
-+
- static struct uuidCache_s {
- struct uuidCache_s *next;
- char uuid[16];
-diff -Nrup mkinitrd-3.5.7.orig/nash/Makefile mkinitrd-3.5.7/nash/Makefile
---- mkinitrd-3.5.7.orig/nash/Makefile 2003-06-11 16:55:31.000000000 +0000
-+++ mkinitrd-3.5.7/nash/Makefile 2004-08-07 09:19:13.000000000 +0000
-@@ -1,23 +1,25 @@
- CFLAGS=-Wall -DVERSION=\"$(VERSION)\" -g
- VERSION=$(shell awk -F= '/^VERSION=/ { print $$2 }' ../mkinitrd)
-+OBJS = nash.o mount_by_label.o
-
- ARCH := $(patsubst i%86,i386,$(shell uname -m))
- ARCH := $(patsubst sparc%,sparc,$(ARCH))
-
- ifeq (i386, $(ARCH))
- CC:=diet $(CC)
--CFLAGS += -DUSE_DIET=1
-+CFLAGS += -fno-stack-protector
-+OBJS += $(shell gcc -fstack-protector -S -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo "ssp.o")
- else
- STATIC=-static
- endif
-
- mandir=usr/share/man
-
--nash: nash.o mount_by_label.o
-- $(CC) $(STATIC) -g $(LDFLAGS) -o $@ nash.o mount_by_label.o
-+nash: $(OBJS)
-+ $(CC) $(STATIC) -static -fno-stack-protector $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
-
- clean:
-- rm -f nash $(MINILIBC) nash.o mount_by_label.o
-+ rm -f nash $(MINILIBC) $(OBJS)
-
- install:
- mkdir -p $(BUILDROOT)/sbin
-diff -Nrup mkinitrd-3.5.7.orig/nash/mount_by_label.c mkinitrd-3.5.7/nash/mount_by_label.c
---- mkinitrd-3.5.7.orig/nash/mount_by_label.c 2002-12-16 22:05:01.000000000 +0000
-+++ mkinitrd-3.5.7/nash/mount_by_label.c 2004-08-07 09:14:40.000000000 +0000
-@@ -172,7 +172,7 @@ uuidcache_init(void) {
- int mustRemoveDir = 0;
- int i;
-
-- sprintf(device, "%s/%s", DEVLABELDIR, ptname);
-+ snprintf(device, sizeof(device), "%s/%s", DEVLABELDIR, ptname);
- if (access(device, F_OK)) {
- ptr = device;
- i = 0;
-diff -Nrup mkinitrd-3.5.7.orig/nash/nash.c mkinitrd-3.5.7/nash/nash.c
---- mkinitrd-3.5.7.orig/nash/nash.c 2003-06-20 19:18:02.000000000 +0000
-+++ mkinitrd-3.5.7/nash/nash.c 2004-08-07 09:19:55.000000000 +0000
-@@ -72,7 +72,7 @@
- #define MS_REMOUNT 32
- #endif
-
--#ifdef USE_DIET
-+#if (defined(__dietlibc__) && !defined(__PIC__))
- static inline _syscall2(int,pivot_root,const char *,one,const char *,two)
- #endif
-
-@@ -517,7 +517,7 @@ int raidautorunCommand(char * cmd, char
- }
-
- static int my_pivot_root(char * one, char * two) {
--#ifdef USE_DIET
-+#ifdef __dietlibc__
- return pivot_root(one, two);
- #else
- return syscall(__NR_pivot_root, one, two);
-@@ -914,7 +914,7 @@ int findlodevCommand(char * cmd, char *
- strcpy(separator, "/");
-
- for (devNum = 0; devNum < 256; devNum++) {
-- sprintf(devName, "/dev/loop%s%d", separator, devNum);
-+ snprintf(devName, sizeof(devName), "/dev/loop%s%d", separator, devNum);
- if ((fd = open(devName, O_RDONLY)) < 0) return 0;
-
- if (ioctl(fd, LOOP_GET_STATUS, &loopInfo)) {
-@@ -1045,7 +1045,7 @@ int mkdevicesCommand(char * cmd, char *
- char * ptr, * deviceDir;
- int i;
-
-- sprintf(devName, "%s/%s", prefix, start);
-+ snprintf(devName, sizeof(devName), "%s/%s", prefix, start);
- unlink(devName);
-
- ptr = devName;
-diff -Nrup mkinitrd-3.5.7.orig/nash/ssp.c mkinitrd-3.5.7/nash/ssp.c
---- mkinitrd-3.5.7.orig/nash/ssp.c 1970-01-01 00:00:00.000000000 +0000
-+++ mkinitrd-3.5.7/nash/ssp.c 2004-08-07 09:14:40.000000000 +0000
-@@ -0,0 +1,168 @@
-+/*
-+ * Distributed under the terms of the GNU General Public License v2
-+ * $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/files/mkinitrd-3.5.7-dietssp.patch,v 1.1 2004/10/10 22:44:47 solar Exp $
-+ *
-+ * This is a modified version of Hiroaki Etoh's stack smashing routines
-+ * implemented for glibc.
-+ *
-+ * The following people have contributed input to this code.
-+ * Ned Ludd - <solar[@]gentoo.org>
-+ * Alexander Gabert - <pappy[@]gentoo.org>
-+ * The PaX Team - <pageexec[@]freemail.hu>
-+ * Peter S. Mazinger - <ps.m[@]gmx.net>
-+ * Yoann Vandoorselaere - <yoann[@]prelude-ids.org>
-+ * Robert Connolly - <robert[@]linuxfromscratch.org>
-+ * Cory Visi <cory@visi.name>
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <signal.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
-+#include <sys/syslog.h>
-+#include <sys/time.h>
-+#include <sys/sysctl.h>
-+
-+#ifndef _PATH_LOG
-+#define _PATH_LOG "/dev/log"
-+#endif
-+
-+#ifdef __PROPOLICE_BLOCK_SEGV__
-+#define SSP_SIGTYPE SIGSEGV
-+#elif __PROPOLICE_BLOCK_KILL__
-+#define SSP_SIGTYPE SIGKILL
-+#else
-+#define SSP_SIGTYPE SIGABRT
-+#endif
-+
-+unsigned long __guard = 0UL;
-+
-+void
-+__guard_setup (void)
-+{
-+ size_t size;
-+#ifdef HAVE_DEV_ERANDOM
-+ int mib[3];
-+#endif
-+
-+ if (__guard != 0UL)
-+ return;
-+
-+#ifndef __SSP_QUICK_CANARY__
-+#ifdef HAVE_DEV_ERANDOM
-+ /* Random is another depth in Linux, hence an array of 3. */
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_RANDOM;
-+ mib[2] = RANDOM_ERANDOM;
-+
-+ size = sizeof (unsigned long);
-+ if (__sysctl (mib, 3, &__guard, &size, NULL, 0) != (-1))
-+ if (__guard != 0UL)
-+ return;
-+#endif
-+ /*
-+ * Attempt to open kernel pseudo random device if one exists before
-+ * opening urandom to avoid system entropy depletion.
-+ */
-+ {
-+ int fd;
-+#ifdef HAVE_DEV_ERANDOM
-+ if ((fd = open ("/dev/erandom", O_RDONLY)) == (-1))
-+#endif
-+ fd = open ("/dev/urandom", O_RDONLY);
-+ if (fd != (-1))
-+ {
-+ size = read (fd, (char *) &__guard, sizeof (__guard));
-+ close (fd);
-+ if (size == sizeof (__guard))
-+ return;
-+ }
-+ }
-+#endif
-+
-+ /* If sysctl was unsuccessful, use the "terminator canary". */
-+ __guard = 0xFF0A0D00UL;
-+
-+ {
-+ /* Everything failed? Or we are using a weakened model of the
-+ * terminator canary */
-+ struct timeval tv;
-+
-+ gettimeofday (&tv, NULL);
-+ __guard ^= tv.tv_usec ^ tv.tv_sec;
-+ }
-+}
-+
-+void
-+__stack_smash_handler (char func[], int damaged)
-+{
-+#ifndef __dietlibc__
-+ struct sockaddr_un sock; /* AF_UNIX address of local logger */
-+#endif
-+ struct sigaction sa;
-+ const char message[] = ": stack smashing attack in function ";
-+ char buf[512];
-+ int bufsz, len;
-+#if !defined(__dietlibc__)
-+ int log;
-+ extern char *__progname;
-+#else
-+ static char *__progname = "dietapp";
-+#endif
-+
-+ sigset_t mask;
-+ sigfillset (&mask);
-+
-+ sigdelset (&mask, SSP_SIGTYPE); /* Block all signal handlers */
-+ sigprocmask (SIG_BLOCK, &mask, NULL); /* except SIGABRT */
-+
-+ bufsz = sizeof (buf);
-+ strcpy (buf, "<2>");
-+ len = 3;
-+
-+ strncat (buf, __progname, sizeof (buf) - 4);
-+ len = strlen (buf);
-+
-+ if (bufsz > len)
-+ {
-+ strncat (buf, message, bufsz - len - 1);
-+ len = strlen (buf);
-+ }
-+ if (bufsz > len)
-+ {
-+ strncat (buf, func, bufsz - len - 1);
-+ len = strlen (buf);
-+ }
-+
-+ /* print error message */
-+ write (STDERR_FILENO, buf + 3, len - 3);
-+ write (STDERR_FILENO, "()\n", 3);
-+#ifndef __dietlibc__
-+ if ((log = socket (AF_UNIX, SOCK_DGRAM, 0)) != -1)
-+ {
-+ /* Send "found" message to the "/dev/log" path */
-+ sock.sun_family = AF_UNIX;
-+ (void) strncpy (sock.sun_path, _PATH_LOG, sizeof (sock.sun_path) - 1);
-+ sock.sun_path[sizeof (sock.sun_path) - 1] = '\0';
-+ sendto (log, buf, len, 0, (struct sockaddr *) &sock, sizeof (sock));
-+ }
-+#endif
-+ /* Make sure the default handler is associated with the our signal handler */
-+
-+ memset (&sa, 0, sizeof (struct sigaction));
-+ sigfillset (&sa.sa_mask); /* Block all signals */
-+ sa.sa_flags = 0;
-+ sa.sa_handler = SIG_DFL;
-+ sigaction (SSP_SIGTYPE, &sa, NULL);
-+ // (void) kill (getpid (), SSP_SIGTYPE);
-+ // _exit (127);
-+}
diff --git a/sys-apps/mkinitrd/files/mkinitrd-4.2.0.3-glibc-2.10.patch b/sys-apps/mkinitrd/files/mkinitrd-4.2.0.3-glibc-2.10.patch
deleted file mode 100644
index b8f4842c60a7..000000000000
--- a/sys-apps/mkinitrd/files/mkinitrd-4.2.0.3-glibc-2.10.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur mkinitrd-4.2.0.3.orig/grubby/grubby.c mkinitrd-4.2.0.3/grubby/grubby.c
---- mkinitrd-4.2.0.3.orig/grubby/grubby.c 2005-01-19 06:29:14.000000000 +0200
-+++ mkinitrd-4.2.0.3/grubby/grubby.c 2009-08-09 19:19:41.000000000 +0300
-@@ -239,7 +239,9 @@
- struct singleEntry * findEntryByPath(struct grubConfig * cfg,
- const char * path, const char * prefix,
- int * index);
-+#ifndef strndup
- static char * strndup(char * from, int len);
-+#endif
- static int readFile(int fd, char ** bufPtr);
- static void lineInit(struct singleLine * line);
- static void lineFree(struct singleLine * line);
-@@ -249,6 +251,7 @@
- struct configFileInfo * cfi);
- static char * getRootSpecifier(char * str);
-
-+#ifndef strndup
- static char * strndup(char * from, int len) {
- char * to;
-
-@@ -258,6 +261,7 @@
-
- return to;
- }
-+#endif
-
- static char * sdupprintf(const char *format, ...)
- #ifdef __GNUC__
diff --git a/sys-apps/mkinitrd/files/mkinitrd-lvm_statics.diff b/sys-apps/mkinitrd/files/mkinitrd-lvm_statics.diff
deleted file mode 100644
index c690b9b3b585..000000000000
--- a/sys-apps/mkinitrd/files/mkinitrd-lvm_statics.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN mkinitrd-3.5.7.orig/mkinitrd mkinitrd-3.5.7/mkinitrd
---- mkinitrd-3.5.7.orig/mkinitrd 2003-07-09 18:26:02.000000000 -0500
-+++ mkinitrd-3.5.7/mkinitrd 2003-10-25 11:56:32.083678110 -0500
-@@ -534,9 +534,8 @@
- cp $verbose --parents -a $pv $MNTIMAGE/
- done
-
-- inst /sbin/vgwrapper "$MNTIMAGE/bin/vgwrapper"
-- ln "$MNTIMAGE/bin/vgwrapper" "$MNTIMAGE/bin/vgscan"
-- ln "$MNTIMAGE/bin/vgwrapper" "$MNTIMAGE/bin/vgchange"
-+ inst /sbin/vgscan.static "$MNTIMAGE/bin/vgscan"
-+ inst /sbin/vgchange.static "$MNTIMAGE/bin/vgchange"
-
- mknod $MNTIMAGE/dev/lvm b 109 0
- fi
diff --git a/sys-apps/mkinitrd/files/mkinitrd-selinux.diff b/sys-apps/mkinitrd/files/mkinitrd-selinux.diff
deleted file mode 100644
index 1eeeca5eda2f..000000000000
--- a/sys-apps/mkinitrd/files/mkinitrd-selinux.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN mkinitrd-3.5.7.orig/mkinitrd mkinitrd-3.5.7/mkinitrd
---- mkinitrd-3.5.7.orig/mkinitrd 2003-07-09 18:26:02.000000000 -0500
-+++ mkinitrd-3.5.7/mkinitrd 2003-08-05 17:00:27.000000000 -0500
-@@ -513,6 +513,12 @@
- inst /sbin/insmod.static "$MNTIMAGE/bin/insmod"
- ln -s /sbin/nash $MNTIMAGE/sbin/modprobe
-
-+# Binary policy file and load_policy utility for loading it.
-+mkdir -p $MNTIMAGE/selinux
-+mkdir -p $MNTIMAGE/etc/security/selinux
-+inst /etc/security/selinux/policy.15 "$MNTIMAGE/etc/security/selinux/policy.15"
-+inst /usr/sbin/load_policy "$MNTIMAGE/bin/load_policy"
-+
- for MODULE in $MODULES; do
- cp $verbose -a /lib/modules/$kernel/$MODULE $MNTIMAGE/lib
- done
-@@ -567,6 +573,11 @@
- fi
- done
-
-+echo "echo Loading policy" >> $RCFILE
-+echo "mount -t selinuxfs none /selinux" >> $RCFILE
-+echo "/bin/load_policy /etc/security/selinux/policy.15" >> $RCFILE
-+echo "umount /selinux" >> $RCFILE
-+
- echo "echo Mounting /proc filesystem" >> $RCFILE
- echo "mount -t proc /proc /proc" >> $RCFILE
-
diff --git a/sys-apps/mkinitrd/metadata.xml b/sys-apps/mkinitrd/metadata.xml
deleted file mode 100644
index 96a2d586367d..000000000000
--- a/sys-apps/mkinitrd/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-apps/mkinitrd/mkinitrd-3.5.7-r3.ebuild b/sys-apps/mkinitrd/mkinitrd-3.5.7-r3.ebuild
deleted file mode 100644
index 12ed8b5e821b..000000000000
--- a/sys-apps/mkinitrd/mkinitrd-3.5.7-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/mkinitrd-3.5.7-r3.ebuild,v 1.9 2010/05/12 14:30:05 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="Tools for creating initrd images"
-HOMEPAGE="http://www.redhat.com"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ppc ~sparc x86"
-IUSE="selinux"
-
-DEPEND="dev-libs/popt
- virtual/os-headers"
-RDEPEND="app-shells/bash"
-PDEPEND="selinux? ( sys-apps/policycoreutils )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Fix for coreutils tail behavior
- sed -i -e 's/tail -1/tail -n 1/' mkinitrd || die "sed for tail -1 failed."
-
- # bug 29694 -- Change vgwrapper to static vgscan and vgchange
- epatch "${FILESDIR}"/mkinitrd-lvm_statics.diff
-
- # bug 35138
- epatch "${FILESDIR}"/mkinitrd-3.5.7-dietssp.patch
-
- # SELinux policy load
- use selinux && epatch "${FILESDIR}"/mkinitrd-selinux.diff
-
- # we don't always need diet support.
- sed -i -e s/'=diet '/=/g "${S}"/nash/Makefile
-}
-
-src_compile() {
- cd "${S}"/nash
- emake || die "nash compile failed."
-
- cd "${S}"/grubby
- emake || die "grubby compile failed."
-}
-
-src_install() {
- into /
- dosbin "${S}"/grubby/grubby "${S}"/nash/nash "${S}"/mkinitrd
- doman "${S}"/grubby/grubby.8 "${S}"/nash/nash.8 "${S}"/mkinitrd.8
-}
diff --git a/sys-apps/mkinitrd/mkinitrd-4.2.0.3-r1.ebuild b/sys-apps/mkinitrd/mkinitrd-4.2.0.3-r1.ebuild
deleted file mode 100644
index c4fb8b8b8894..000000000000
--- a/sys-apps/mkinitrd/mkinitrd-4.2.0.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/mkinitrd-4.2.0.3-r1.ebuild,v 1.2 2010/04/16 15:23:12 ranger Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools for creating initrd images"
-HOMEPAGE="http://www.redhat.com/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ~sparc ~x86"
-IUSE="selinux"
-
-DEPEND="dev-libs/popt
- virtual/os-headers"
-RDEPEND="app-shells/bash"
-PDEPEND="selinux? ( sys-apps/policycoreutils )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-glibc-2.10.patch
- # bug 29694 -- Change vgwrapper to static vgscan and vgchange
- epatch "${FILESDIR}"/mkinitrd-lvm_statics.diff
- sed -i \
- -e '/^CFLAGS/s: -Werror::' \
- -e '/^CFLAGS/s: -g::' \
- -e '/^CFLAGS/s:=:+=:' \
- grubby/Makefile nash/Makefile
-}
-
-src_compile() {
- if has_version ">=sys-libs/glibc-2.10"; then
- append-flags -Dstrndup=strndup
- fi
-
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" -C nash || die "nash compile failed."
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" -C grubby|| die "grubby compile failed."
-}
-
-src_install() {
- into /
- dosbin grubby/grubby nash/nash mkinitrd || die
- doman grubby/grubby.8 nash/nash.8 mkinitrd.8
-}