[Demudi-commits] r972 - in linux-patch-realtime-lsm/trunk: . debian

[Free Ekanayaka]

Author: free-guest
Date: 2006-10-31 16:08:03 +0100 (Tue, 31 Oct 2006)
New Revision: 972

Modified:
   linux-patch-realtime-lsm/trunk/debian/changelog
   linux-patch-realtime-lsm/trunk/realtime_lsm.patch
Log:
releasing version 2.6.18-2

Modified: linux-patch-realtime-lsm/trunk/debian/changelog
===================================================================
--- linux-patch-realtime-lsm/trunk/debian/changelog	2006-10-25 13:55:05 UTC (rev 971)
+++ linux-patch-realtime-lsm/trunk/debian/changelog	2006-10-31 15:08:03 UTC (rev 972)
@@ -1,3 +1,9 @@
+linux-patch-realtime-lsm (2.6.18-2) unstable; urgency=low
+
+  * Fixed conflicts with latest kernel source
+
+ -- Free Ekanayaka <free at 64studio.com>  Tue, 31 Oct 2006 16:08:37 +0100
+
 linux-patch-realtime-lsm (2.6.18-1) unstable; urgency=low
 
   * Added provisions for 2.6.18

Modified: linux-patch-realtime-lsm/trunk/realtime_lsm.patch
===================================================================
--- linux-patch-realtime-lsm/trunk/realtime_lsm.patch	2006-10-25 13:55:05 UTC (rev 971)
+++ linux-patch-realtime-lsm/trunk/realtime_lsm.patch	2006-10-31 15:08:03 UTC (rev 972)
@@ -65,10 +65,10 @@
 diff -ruN -X /home/joq/bin/kdiff.exclude linux-2.6.10-rc1-mm2/security/Makefile linux-2.6.10-rc1-mm2-rt1/security/Makefile
 --- linux-2.6.10-rc1-mm2/security/Makefile	Fri Oct 29 21:12:59 2004
 +++ linux-2.6.10-rc1-mm2-rt1/security/Makefile	Fri Oct 29 21:29:10 2004
-@@ -17,3 +17,4 @@
+@@ -16,3 +16,4 @@
+ obj-$(CONFIG_SECURITY_SELINUX)		+= selinux/built-in.o
  obj-$(CONFIG_SECURITY_CAPABILITIES)	+= commoncap.o capability.o
  obj-$(CONFIG_SECURITY_ROOTPLUG)		+= commoncap.o root_plug.o
- obj-$(CONFIG_SECURITY_SECLVL)		+= seclvl.o
 +obj-$(CONFIG_SECURITY_REALTIME)		+= commoncap.o realtime.o
 diff -ruN -X /home/joq/bin/kdiff.exclude linux-2.6.10-rc1-mm2/security/realtime.c linux-2.6.10-rc1-mm2-rt1/security/realtime.c
 --- linux-2.6.10-rc1-mm2/security/realtime.c	Wed Dec 31 18:00:00 1969