diff options
Diffstat (limited to 'sys-apps/sysvinit/files')
-rw-r--r-- | sys-apps/sysvinit/files/digest-sysvinit-2.84 | 1 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/digest-sysvinit-2.85 | 1 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/sysvinit-2.84-selinux.patch | 122 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/sysvinit-2.84-selinux1.patch | 131 |
4 files changed, 0 insertions, 255 deletions
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 |