rpms/initng/FC-5 check-selinux.patch,NONE,1.1 initng.spec,1.9,1.10

Daniel Malmgren (danielm) fedora-extras-commits at redhat.com
Sat Sep 30 05:01:12 UTC 2006


Author: danielm

Update of /cvs/extras/rpms/initng/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4115/FC-5

Modified Files:
	initng.spec 
Added Files:
	check-selinux.patch 
Log Message:
...and this time the patch is really included...


check-selinux.patch:

--- NEW FILE check-selinux.patch ---
Index: plugins/selinux/initng_selinux.c
===================================================================
--- plugins/selinux/initng_selinux.c	(Revision 4514)
+++ plugins/selinux/initng_selinux.c	(Arbeitskopie)
@@ -54,6 +54,17 @@
 static int set_selinux_context(active_db_h * s, process_h * p
 							   __attribute__ ((unused)))
 {
+	static int have_selinux = -1;
+	if (have_selinux==-1) {
+		int rc = is_selinux_enabled();
+		if (rc<0)
+			return (TRUE);
+		else
+			have_selinux = rc;
+	}
+	if (!have_selinux)
+		return (TRUE);
+
 	const char *selinux_context = get_string(&SELINUX_CONTEXT, s);
 	char *sestr = NULL;
 	context_t seref = NULL;


Index: initng.spec
===================================================================
RCS file: /cvs/extras/rpms/initng/FC-5/initng.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- initng.spec	30 Sep 2006 04:58:59 -0000	1.9
+++ initng.spec	30 Sep 2006 05:01:12 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes
 Name: initng
 Version: 0.6.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 URL: http://www.initng.org
 Group: System Environment/Base
@@ -114,6 +114,9 @@
 /%{_lib}/libngcclient.so
 
 %changelog
+* Sat Sep 30 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.8-9
+- Seems like this bumping is getting out of hands, right?
+
 * Sat Sep 30 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.8-8
 - Double darn. Forgot the selinux patch for fc5
 




More information about the scm-commits mailing list