old

7 files changed, 3 insertions, 413 deletions

diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 6954cf708a01..d418ce8e756c 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -3,20 +3,14 @@ Hash: SHA1
 
 MD5 0d7c267c0c504f5e5a322ae34f402552 ChangeLog 1943
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 3003e070f46d5a0c9a2a4d8753c67801 sysvinit-2.84.ebuild 2003
 MD5 4bb35af95759582d45324cdf3bc237b7 sysvinit-2.85-r1.ebuild 2545
-MD5 06f8b8527ed3a08f86f531232d6ea9ba sysvinit-2.85.ebuild 1887
-MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-sysvinit-2.84 64
 MD5 6e4627df68938fb6fd18afb1aea2bb8a files/inittab 1561
-MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
-MD5 adc667ea815b256d6f39259f4134f6df files/sysvinit-2.84-selinux1.patch 3556
-MD5 38c0059ecfaa1b09e59a75cc2780aa94 files/digest-sysvinit-2.85 64
 MD5 38c0059ecfaa1b09e59a75cc2780aa94 files/digest-sysvinit-2.85-r1 64
 MD5 3c171d9c843284ce606663e4e6da26e9 files/sysvinit-2.85-selinux.patch 6448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBxu5+roRuSHgZdywRAoisAJ0WJC9Y2F/9UlVHu1jlEdTWcRHQeACfdLGy
-YWvxPKVe3cFmWkK6+jAt+5U=
-=mSYD
+iD8DBQFBxvD7roRuSHgZdywRAv48AJ4zU5TGLKHzyoTn47VjahfjRBg+PQCfaflc
+phe7xGKxGrRh5w+6PN3AF48=
+=QvwE
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sysvinit/files/digest-sysvinit-2.84 b/sys-apps/sysvinit/files/digest-sysvinit-2.84
deleted file mode 100644
index 369032eee571..000000000000
--- a/sys-apps/sysvinit/files/digest-sysvinit-2.84
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
diff --git a/sys-apps/sysvinit/files/digest-sysvinit-2.85 b/sys-apps/sysvinit/files/digest-sysvinit-2.85
deleted file mode 100644
index e60573a3c576..000000000000
--- a/sys-apps/sysvinit/files/digest-sysvinit-2.85
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a2d8f1ed5a2909da04132fefa44905e sysvinit-2.85.tar.gz 92758
diff --git a/sys-apps/sysvinit/files/sysvinit-2.84-selinux.patch b/sys-apps/sysvinit/files/sysvinit-2.84-selinux.patch
deleted file mode 100644
index e9862a7bee66..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.84-selinux.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- sysvinit-2.85/src/init.c.selinux	2003-11-10 14:56:40.687719862 -0500
-+++ sysvinit-2.85/src/init.c	2003-11-10 14:56:55.856964055 -0500
-@@ -78,6 +78,78 @@
- 			sigemptyset(&sa.sa_mask); \
- 			sigaction(sig, &sa, NULL); \
- 		} while(0)
-+#ifdef WITH_SELINUX
-+#include <sys/mman.h>
-+#include <selinux/selinux.h>
-+#include <sys/mount.h>
-+
-+static int load_policy(int *enforce) 
-+{
-+  int fd=-1,ret=-1;
-+  int rc=0;
-+  struct stat sb;
-+  void *map;
-+  char policy_file[PATH_MAX];
-+  int policy_version=0;
-+
-+  log(L_VB, "Loading security policy\n");
-+  if (mount("none", SELINUXMNT, "selinuxfs", 0, 0) < 0) {
-+    if (errno == ENODEV) {
-+      log(L_VB, "SELinux not supported by kernel: %s\n",SELINUXMNT,strerror(errno));
-+    } 
-+    else {
-+      log(L_VB, "Failed to mount %s: %s\n",SELINUXMNT,strerror(errno));
-+      return ret;
-+    }
-+    return ret; /* Never gets here */
-+  }
-+
-+  policy_version=security_policyvers();
-+  if (policy_version < 0) {
-+    log(L_VB,  "Can't get policy version: %s\n", strerror(errno));
-+    goto UMOUNT;
-+  }
-+  
-+  rc=security_getenforce();
-+  if (rc < 0) {
-+    log(L_VB,  "Can't get SELinux enforcement flag: %s\n", strerror(errno));
-+    goto UMOUNT;
-+  } 
-+  *enforce=rc;
-+
-+  snprintf(policy_file,sizeof(policy_file),"%s.%d",SELINUXPOLICY,policy_version);
-+  fd = open(policy_file, O_RDONLY);
-+  if (fd < 0) {
-+    log(L_VB,  "Can't open '%s':  %s\n",
-+	    policy_file, strerror(errno));
-+    goto UMOUNT;
-+  }
-+  
-+  if (fstat(fd, &sb) < 0) {
-+    log(L_VB, "Can't stat '%s':  %s\n",
-+	    policy_file, strerror(errno));
-+    goto UMOUNT;
-+  }
-+  
-+  map = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
-+  if (map == MAP_FAILED) {
-+    log(L_VB,  "Can't map '%s':  %s\n",
-+	    policy_file, strerror(errno));
-+    goto UMOUNT;
-+  }
-+  ret=security_load_policy(map, sb.st_size);
-+  if (ret < 0) {
-+    log(L_VB, "security_load_policy failed\n");
-+  }
-+
-+ UMOUNT:
-+  umount(SELINUXMNT); 
-+  if ( fd >= 0) {
-+    close(fd);
-+  }
-+  return(ret);
-+}
-+#endif
- 
- /* Version information */
- char *Version = "@(#) init " VERSION "  " DATE "  miquels@cistron.nl";
-@@ -2576,6 +2648,20 @@
- 		maxproclen += strlen(argv[f]) + 1;
- 	}
- 
-+#ifdef WITH_SELINUX
-+  	if (getenv("SELINUX_INIT") == NULL) {
-+	  putenv("SELINUX_INIT=YES");
-+	  int enforce=0;
-+	  if (load_policy(&enforce) == 0 ) {
-+	    execv(myname, argv);
-+	  } else {
-+	    if (enforce) 
-+	      /* SELinux in enforcing mode but load_policy failed */
-+	      exit(1);
-+	  }
-+	}
-+#endif
-+  
- 	/* Start booting. */
- 	argv0 = argv[0];
- 	argv[1] = NULL;
---- sysvinit-2.85/src/Makefile.selinux	2003-11-10 14:56:40.430749605 -0500
-+++ sysvinit-2.85/src/Makefile	2003-11-10 14:56:40.725715464 -0500
-@@ -32,7 +32,7 @@
- all:		$(PROGS)
- 
- init:		init.o init_utmp.o
--		$(CC) $(LDFLAGS) $(STATIC) -o $@ init.o init_utmp.o
-+		$(CC) $(LDFLAGS) $(STATIC) -o $@ init.o init_utmp.o -lselinux
- 
- halt:		halt.o ifdown.o hddown.o utmp.o reboot.h
- 		$(CC) $(LDFLAGS) -o $@ halt.o ifdown.o hddown.o utmp.o
-@@ -62,7 +62,7 @@
- 		$(CC) $(LDFLAGS) -o $@ bootlogd.o
- 
- init.o:		init.c init.h set.h reboot.h
--		$(CC) -c $(CFLAGS) init.c
-+		$(CC) -c $(CFLAGS) -DWITH_SELINUX init.c
- 
- utmp.o:		utmp.c init.h
- 		$(CC) -c $(CFLAGS) utmp.c
diff --git a/sys-apps/sysvinit/files/sysvinit-2.84-selinux1.patch b/sys-apps/sysvinit/files/sysvinit-2.84-selinux1.patch
deleted file mode 100644
index a82ddaa4ff57..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.84-selinux1.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- sysvinit-2.85/src/init.c.selinux	2004-02-10 14:34:18.454593535 -0500
-+++ sysvinit-2.85/src/init.c	2004-02-10 14:37:27.947014932 -0500
-@@ -78,6 +78,87 @@
- 			sigemptyset(&sa.sa_mask); \
- 			sigaction(sig, &sa, NULL); \
- 		} while(0)
-+#ifdef WITH_SELINUX
-+#include <sys/mman.h>
-+#include <selinux/selinux.h>
-+#include <sys/mount.h>
-+
-+static int load_policy(int *enforce) 
-+{
-+  int fd=-1,ret=-1;
-+  int rc=0;
-+  struct stat sb;
-+  void *map;
-+  char policy_file[PATH_MAX];
-+  int policy_version=0;
-+  extern char *selinux_mnt;
-+
-+  log(L_VB, "Loading security policy\n");
-+  if (mount("none", SELINUXMNT, "selinuxfs", 0, 0) < 0) {
-+    if (errno == ENODEV) {
-+      log(L_VB, "SELinux not supported by kernel: %s\n",SELINUXMNT,strerror(errno));
-+    } 
-+    else {
-+      log(L_VB, "Failed to mount %s: %s\n",SELINUXMNT,strerror(errno));
-+      return ret;
-+    }
-+    return ret; /* Never gets here */
-+  }
-+
-+  selinux_mnt = SELINUXMNT; /* set manually since we mounted it */
-+
-+  policy_version=security_policyvers();
-+  if (policy_version < 0) {
-+    log(L_VB,  "Can't get policy version: %s\n", strerror(errno));
-+    goto UMOUNT;
-+  }
-+  
-+  rc=security_getenforce();
-+  if (rc < 0) {
-+    log(L_VB,  "Can't get SELinux enforcement flag: %s\n", strerror(errno));
-+    goto UMOUNT;
-+  } 
-+  *enforce=rc;
-+
-+  snprintf(policy_file,sizeof(policy_file),"%s.%d",SELINUXPOLICY,policy_version);
-+  fd = open(policy_file, O_RDONLY);
-+  if (fd < 0) {
-+    /* Check previous version to see if old policy is available
-+     */
-+    snprintf(policy_file,sizeof(policy_file),"%s.%d",SELINUXPOLICY,policy_version-1);
-+    fd = open(policy_file, O_RDONLY);
-+    if (fd < 0) {
-+      log(L_VB,  "Can't open '%s.%d':  %s\n",
-+	  SELINUXPOLICY,policy_version,strerror(errno));
-+      goto UMOUNT;
-+    }
-+  }
-+  
-+  if (fstat(fd, &sb) < 0) {
-+    log(L_VB, "Can't stat '%s':  %s\n",
-+	    policy_file, strerror(errno));
-+    goto UMOUNT;
-+  }
-+  
-+  map = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
-+  if (map == MAP_FAILED) {
-+    log(L_VB,  "Can't map '%s':  %s\n",
-+	    policy_file, strerror(errno));
-+    goto UMOUNT;
-+  }
-+  ret=security_load_policy(map, sb.st_size);
-+  if (ret < 0) {
-+    log(L_VB, "security_load_policy failed\n");
-+  }
-+
-+ UMOUNT:
-+  /*umount(SELINUXMNT); */
-+  if ( fd >= 0) {
-+    close(fd);
-+  }
-+  return(ret);
-+}
-+#endif
- 
- /* Version information */
- char *Version = "@(#) init " VERSION "  " DATE "  miquels@cistron.nl";
-@@ -2576,6 +2657,20 @@
- 		maxproclen += strlen(argv[f]) + 1;
- 	}
- 
-+#ifdef WITH_SELINUX
-+  	if (getenv("SELINUX_INIT") == NULL) {
-+	  putenv("SELINUX_INIT=YES");
-+	  int enforce=0;
-+	  if (load_policy(&enforce) == 0 ) {
-+	    execv(myname, argv);
-+	  } else {
-+	    if (enforce) 
-+	      /* SELinux in enforcing mode but load_policy failed */
-+	      exit(1);
-+	  }
-+	}
-+#endif
-+  
- 	/* Start booting. */
- 	argv0 = argv[0];
- 	argv[1] = NULL;
---- sysvinit-2.85/src/Makefile.selinux	2004-02-10 14:34:18.413598203 -0500
-+++ sysvinit-2.85/src/Makefile	2004-02-10 14:34:18.552582377 -0500
-@@ -32,7 +32,7 @@
- all:		$(PROGS)
- 
- init:		init.o init_utmp.o
--		$(CC) $(LDFLAGS) $(STATIC) -o $@ init.o init_utmp.o
-+		$(CC) $(LDFLAGS) $(STATIC) -o $@ init.o init_utmp.o -lselinux
- 
- halt:		halt.o ifdown.o hddown.o utmp.o reboot.h
- 		$(CC) $(LDFLAGS) -o $@ halt.o ifdown.o hddown.o utmp.o
-@@ -62,7 +62,7 @@
- 		$(CC) $(LDFLAGS) -o $@ bootlogd.o
- 
- init.o:		init.c init.h set.h reboot.h
--		$(CC) -c $(CFLAGS) init.c
-+		$(CC) -c $(CFLAGS) -DWITH_SELINUX init.c
- 
- utmp.o:		utmp.c init.h
- 		$(CC) -c $(CFLAGS) utmp.c
diff --git a/sys-apps/sysvinit/sysvinit-2.84.ebuild b/sys-apps/sysvinit/sysvinit-2.84.ebuild
deleted file mode 100644
index 2a6cce56e597..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.84.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.84.ebuild,v 1.7 2004/11/05 01:30:50 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="selinux build"
-
-DEPEND="virtual/os-headers
-	selinux? ( sys-libs/libselinux )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src || die
-
-	# Note that if sysvinit is ever built with USE=build, need to
-	# refrain from building sulogin as it needs libcrypt which is
-	# not in the build image:
-	if use build; then
-		sed -i -e '/^PROGS/s/ sulogin//' Makefile || die
-	fi
-
-	# Selinux patch
-	if use selinux; then
-		if has_version '>=sys-libs/libselinux-1.6'; then
-			epatch ${FILESDIR}/sysvinit-${PV}-selinux1.patch
-		else
-			epatch ${FILESDIR}/sysvinit-${PV}-selinux.patch
-		fi
-	fi
-}
-
-src_compile() {
-	cd ${S}/src
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} -D_GNU_SOURCE" || die
-}
-
-src_install() {
-	cd ${S}/src
-	into /
-	dosbin init halt killall5 runlevel shutdown sulogin
-	dosym init /sbin/telinit
-	dobin last mesg utmpdump wall
-	dosym killall5 /sbin/pidof
-	dosym halt /sbin/reboot
-	dosym halt /sbin/poweroff
-	dosym last /bin/lastb
-	insinto /usr/include
-	doins initreq.h
-
-	# sysvinit docs
-	cd ${S}
-	doman man/*.[1-9]
-	dodoc COPYRIGHT README doc/*
-
-	# install our inittab
-	insinto /etc
-	doins ${FILESDIR}/inittab || die
-
-	# Add serial console for arches that typically have it
-	case ${ARCH} in
-		sparc|mips|hppa|alpha|ia64|arm)
-			sed -i -e \
-				's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n&"' \
-				${D}/etc/inittab || die
-			;;
-	esac
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.85.ebuild b/sys-apps/sysvinit/sysvinit-2.85.ebuild
deleted file mode 100644
index d4eec81ae9a9..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.85.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.85.ebuild,v 1.6 2004/11/05 01:30:50 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="selinux build"
-
-RDEPEND="selinux? ( >=sys-libs/libselinux-1.14 )"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src || die
-
-	# Note that if sysvinit is ever built with USE=build, need to
-	# refrain from building sulogin as it needs libcrypt which is
-	# not in the build image:
-	if use build; then
-		sed -i -e '/^PROGS/s/ sulogin//' Makefile || die
-	fi
-
-	# SELinux patch
-	use selinux && epatch ${FILESDIR}/sysvinit-${PV}-selinux.patch
-}
-
-src_compile() {
-	cd ${S}/src
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} -D_GNU_SOURCE" || die
-}
-
-src_install() {
-	cd ${S}/src
-	into /
-	dosbin init halt killall5 runlevel shutdown sulogin
-	dosym init /sbin/telinit
-	dobin last mesg utmpdump wall
-	dosym killall5 /sbin/pidof
-	dosym halt /sbin/reboot
-	dosym halt /sbin/poweroff
-	dosym last /bin/lastb
-	insinto /usr/include
-	doins initreq.h
-
-	# sysvinit docs
-	cd ${S}
-	doman man/*.[1-9]
-	dodoc COPYRIGHT README doc/*
-
-	# install our inittab
-	insinto /etc
-	doins ${FILESDIR}/inittab || die
-
-	# Add serial console for arches that typically have it
-	case ${ARCH} in
-		sparc|mips|hppa|alpha|ia64|arm)
-			sed -i -e \
-				's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n&"' \
-				${D}/etc/inittab || die
-			;;
-	esac
-}