rpms/kernel/F-10 TODO, 1.46.2.3, 1.46.2.4 selinux-netlabel_setsockopt_fix.patch, 1.1.2.1, 1.1.2.2

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12096

Modified Files:
      Tag: private-fedora-10-2_6_27
	TODO selinux-netlabel_setsockopt_fix.patch 
Log Message:
upstream patch for -stable


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/TODO,v
retrieving revision 1.46.2.3
retrieving revision 1.46.2.4
diff -u -r1.46.2.3 -r1.46.2.4
--- TODO	22 Feb 2009 00:25:26 -0000	1.46.2.3
+++ TODO	23 Feb 2009 13:49:25 -0000	1.46.2.4
@@ -194,3 +194,6 @@
 
 linux-2.6-usb-option-increase-outgoing-buffers.patch
 	sent for -stable
+
+selinux-netlabel_setsockopt_fix.patch
+	todo: send for -stable

selinux-netlabel_setsockopt_fix.patch:

Index: selinux-netlabel_setsockopt_fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/Attic/selinux-netlabel_setsockopt_fix.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- selinux-netlabel_setsockopt_fix.patch	22 Feb 2009 18:11:43 -0000	1.1.2.1
+++ selinux-netlabel_setsockopt_fix.patch	23 Feb 2009 13:49:25 -0000	1.1.2.2
@@ -1,6 +1,10 @@
-selinux: Fix the NetLabel glue code for setsockopt()
-
 From: Paul Moore <paul.moore at hp.com>
+Date: Fri, 20 Feb 2009 21:33:02 +0000 (-0500)
+Subject: selinux: Fix the NetLabel glue code for setsockopt()
+X-Git-Tag: v2.6.29-rc6~3
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=09c50b4a52c01a1f450b8eec819089e228655bfb
+
+selinux: Fix the NetLabel glue code for setsockopt()
 
 At some point we (okay, I) managed to break the ability for users to use the
 setsockopt() syscall to set IPv4 options when NetLabel was not active on the
@@ -16,12 +20,9 @@
 NetLabel labeling active; this is done to ensure the labeling remains intact.
 
 Signed-off-by: Paul Moore <paul.moore at hp.com>
+Signed-off-by: James Morris <jmorris at namei.org>
 ---
 
- security/selinux/netlabel.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-
 diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c
 index f58701a..3f4b266 100644
 --- a/security/selinux/netlabel.c