rpms/udev/devel udev-118-slink-selinux.patch, NONE, 1.1 udev.spec, 1.232, 1.233

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv425

Modified Files:
	udev.spec 
Added Files:
	udev-118-slink-selinux.patch 
Log Message:
- made symlinks relative (rhbz#432878)
- removed the backgrounding of node creation (rhbz#381461)
- do not change sg group ownership to disk for scanners (rhbz#432602)
- attempt to fix selinux symlink bug (rhbz#345071)
- fixed URL
- made rpmlint mostly happy


udev-118-slink-selinux.patch:

--- NEW FILE udev-118-slink-selinux.patch ---
diff -up udev-118/udev_node.c.slink udev-118/udev_node.c
--- udev-118/udev_node.c.slink	2008-02-20 17:52:39.000000000 +0100
+++ udev-118/udev_node.c	2008-02-20 17:56:55.000000000 +0100
@@ -146,7 +146,7 @@ static int node_symlink(const char *node
 				buf[len] = '\0';
 				if (strcmp(target, buf) == 0) {
 					info("preserve already existing symlink '%s' to '%s'", slink, target);
-					selinux_setfilecon(slink, NULL, S_IFLNK);
+					/*selinux_setfilecon(slink, NULL, S_IFLNK);*/
 					goto exit;
 				}
 			}
@@ -164,7 +164,7 @@ static int node_symlink(const char *node
 	strlcpy(slink_tmp, slink, sizeof(slink_tmp));
 	strlcat(slink_tmp, TMP_FILE_EXT, sizeof(slink_tmp));
 	unlink(slink_tmp);
-	selinux_setfscreatecon(slink_tmp, NULL, S_IFLNK);
+	selinux_setfscreatecon(slink, NULL, S_IFLNK);
 	retval = symlink(target, slink_tmp);
 	selinux_resetfscreatecon();
 	if (retval != 0) {


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- udev.spec	19 Feb 2008 04:41:57 -0000	1.232
+++ udev.spec	20 Feb 2008 17:05:41 -0000	1.233
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 118
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -23,9 +23,10 @@
 
 Patch100: udev-089-nopie.patch
 Patch101: udev-091-lib64.patch
+Patch102: udev-118-slink-selinux.patch
 
 ExclusiveOS: Linux
-URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
+URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): /bin/sh fileutils /sbin/chkconfig /sbin/service
 Requires(pre): MAKEDEV >= 0:3.11
@@ -74,6 +75,7 @@
 %patch2 -p1 -b .rhrules
 %patch100 -p1 -b .nopie
 %patch101 -p1 -b .lib64
+%patch102 -p1 -b .slink
 
 %build
 
@@ -180,6 +182,10 @@
 ln -sf ../../%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libvolume_id.so.*.*) \
 	$RPM_BUILD_ROOT%{_libdir}/libvolume_id.so
 
+ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_bindir}/udevinfo
+ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_bindir}/udevtest
+ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_sbindir}/udevmonitor
+
 %if %{with_static}
 for i in extras/scsi_id/scsi_id \
 	extras/ata_id/ata_id \
@@ -302,7 +308,7 @@
 %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices
 %attr(0755,root,root) %{udev_scriptdir}/fw_unit_symlinks.sh
 %attr(0755,root,root) %{udev_scriptdir}/firmware.sh
-%attr(0755,root,root) %{udev_scriptdir}/rule_generator.functions
+%attr(0644,root,root) %{udev_scriptdir}/rule_generator.functions
 %attr(0755,root,root) %{udev_scriptdir}/write_cd_rules
 %attr(0755,root,root) %{udev_scriptdir}/write_net_rules
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-post
@@ -322,7 +328,7 @@
 #%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
 
-%attr(0644,root,root) %{_sysconfdir}/modprobe.d/floppy-pnp
+%config %attr(0644,root,root) %{_sysconfdir}/modprobe.d/floppy-pnp
 
 %dir %attr(0755,root,root) %{firmwaredir}
 %attr(0644,root,root) %{_mandir}/man8/udev*.8*
@@ -366,6 +372,14 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Wed Feb 20 2008 Harald Hoyer <harald at redhat.com> 118-4
+- made symlinks relative (rhbz#432878)
+- removed the backgrounding of node creation (rhbz#381461)
+- do not change sg group ownership to disk for scanners (rhbz#432602)
+- attempt to fix selinux symlink bug (rhbz#345071)
+- fixed URL
+- made rpmlint mostly happy
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 118-3
 - Autorebuild for GCC 4.3