rpms/initng/F-8 initng-selinux.patch, NONE, 1.1 initng.spec, 1.16, 1.17

Daniel Malmgren (danielm) fedora-extras-commits at redhat.com
Fri Nov 2 16:17:17 UTC 2007


Author: danielm

Update of /cvs/extras/rpms/initng/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4378

Modified Files:
	initng.spec 
Added Files:
	initng-selinux.patch 
Log Message:
initng 0.6.10.1-3 for F8


initng-selinux.patch:

--- NEW FILE initng-selinux.patch ---
diff -upNr initng.orign/src/main.c initng-0.6.10.1/src/main.c
--- initng.orign/src/main.c	2007-03-24 05:12:56.000000000 +0100
+++ initng-0.6.10.1/src/main.c	2007-10-27 12:25:13.000000000 +0200
@@ -414,6 +414,9 @@ int main(int argc, char *argv[], char *e
 	{
 		/*load selinux policy and rexec*/
 #ifdef SELINUX
+		/*we have nothing to do when selinux is disabled*/
+		if(is_selinux_enabled() != 1) goto BOOT;
+
 		FILE *tmp_f;
 		if ((tmp_f = fopen("/selinux/enforce", "r")) != NULL)
 		{


Index: initng.spec
===================================================================
RCS file: /cvs/extras/rpms/initng/F-8/initng.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- initng.spec	15 Aug 2007 18:00:07 -0000	1.16
+++ initng.spec	2 Nov 2007 16:16:44 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes
 Name: initng
 Version: 0.6.10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.initng.org
 Group: System Environment/Base
@@ -15,6 +15,7 @@
 Requires: %{name}-lib = %{version}-%{release}
 Patch0: fontbug.patch
 Patch1: logfilemode.patch
+Patch2: initng-selinux.patch
 
 %description
 Initng is a full replacement of the old and in many ways deprecated sysvinit
@@ -41,6 +42,7 @@
 %setup -q
 %patch0 -p0 -b .fontbug
 %patch1 -p0 -b .logfilemode
+%patch2 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -117,6 +119,9 @@
 /%{_lib}/libngcclient.so
 
 %changelog
+* Sat Oct 27 2007 Rudolf Kastl <che666 at gmail.com> 0.6.10.1-3
+- Add selinux patch so initng also boots when it is disabled (thanks to Dragoran)
+
 * Wed Aug 15 2007 Daniel Malmgren <dm at mensa.se> 0.6.10.1-2
 - Added patch to fix compilation with glibc >= 2.6.90 (thanks to Dragoran)
 




More information about the fedora-extras-commits mailing list