rpms/udev/devel udev-106-selinuxmedia.patch, NONE, 1.1 udev.spec, 1.199, 1.200

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8702

Modified Files:
	udev.spec 
Added Files:
	udev-106-selinuxmedia.patch 
Log Message:
- create floppy device nodes with the correct selinux context (bug #235953)
- Resolves: rhbz#235953


udev-106-selinuxmedia.patch:
 extras/floppy/create_floppy_devices.c |    1 +
 udev_selinux.c                        |   12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE udev-106-selinuxmedia.patch ---
--- udev-106/udev_selinux.c.selinuxmedia	2007-03-03 18:42:09.000000000 +0100
+++ udev-106/udev_selinux.c	2007-04-11 11:49:14.000000000 +0200
@@ -118,10 +118,12 @@
 		char *media;
 		int ret = -1;
 
-		media = get_media(devname, mode);
-		if (media) {
-			ret = matchmediacon(media, &scontext);
-			free(media);
+		if (devname) {
+			media = get_media(devname, mode);
+			if (media) {
+				ret = matchmediacon(media, &scontext);
+				free(media);
+			}
 		}
 
 		if (ret < 0)
@@ -152,6 +154,8 @@
 	 * restoration creation purposes.
 	 */
 	if (is_selinux_running()) {
+		if (!udev_root[0])
+			err("selinux_init: udev_root not set\n");
 		matchpathcon_init_prefix(NULL, udev_root);
 		if (getfscreatecon(&prev_scontext) < 0) {
 			err("getfscreatecon failed\n");
--- udev-106/extras/floppy/create_floppy_devices.c.selinuxmedia	2007-03-03 18:42:09.000000000 +0100
+++ udev-106/extras/floppy/create_floppy_devices.c	2007-04-11 11:45:59.000000000 +0200
@@ -155,6 +155,7 @@
 	if (type == 0)
 		return 0;
 
+	udev_config_init();
 	selinux_init();
 
 	i = 0;


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- udev.spec	7 Mar 2007 18:01:25 -0000	1.199
+++ udev.spec	11 Apr 2007 09:53:30 -0000	1.200
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 106
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -24,6 +24,7 @@
 Patch5: udev-extras.patch
 Patch7: udev-089-nopie.patch
 Patch9: udev-091-lib64.patch
+Patch10: udev-106-selinuxmedia.patch
 Patch14: udev-095-dbgwait.patch
 
 ExclusiveOS: Linux
@@ -77,6 +78,7 @@
 %patch5 -p1 -b .rhextras
 %patch7 -p1 -b .nopie
 %patch9 -p1 -b .lib64
+%patch10 -p1 -b .selinuxmedia
 %patch14 -p1 -b .dbgwait
 
 rm -f etc/udev/redhat/51-hotplug.rules
@@ -348,7 +350,11 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
-* Wed Mar  7 2007 Harald Hoyer <harald at redhat.com> - 106-1%{?dist}
+* Wed Apr 11 2007 Harald Hoyer <harald at redhat.com> - 106-2
+- create floppy device nodes with the correct selinux context (bug #235953)
+- Resolves: rhbz#235953
+
+* Wed Mar  7 2007 Harald Hoyer <harald at redhat.com> - 106-1
 - version 106
 - specfile cleanup
 - removed pilot rule