[udev] - fixed: network device renaming 2-step exceeds IFNAMSIZ Resolves: rhbz#673675

[Harald Hoyer]

commit 243a0734e5ca5fe6e4170f552ee735a95501bdbf
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Feb 2 18:59:23 2011 +0100

    - fixed: network device renaming 2-step exceeds IFNAMSIZ
    Resolves: rhbz#673675

 udev-164-no-v4l1.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 udev.spec              |    3 +++
 2 files changed, 45 insertions(+), 0 deletions(-)
---
diff --git a/udev-164-no-v4l1.patch b/udev-164-no-v4l1.patch
new file mode 100644
index 0000000..9d9ef7c
--- /dev/null
+++ b/udev-164-no-v4l1.patch
@@ -0,0 +1,42 @@
+diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c
+index d530a6d..e4b22bf 100644
+--- a/extras/v4l_id/v4l_id.c
++++ b/extras/v4l_id/v4l_id.c
+@@ -28,7 +28,6 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+-#include <linux/videodev.h>
+ #include <linux/videodev2.h>
+ 
+ int main (int argc, char *argv[])
+@@ -39,7 +38,6 @@ int main (int argc, char *argv[])
+ 	};
+ 	int fd;
+ 	char *device;
+-	struct video_capability v1cap;
+ 	struct v4l2_capability v2cap;
+ 
+ 	while (1) {
+@@ -82,20 +80,7 @@ int main (int argc, char *argv[])
+ 		if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0)
+ 			printf("radio:");
+ 		printf("\n");
+-	} else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
+-		printf("ID_V4L_VERSION=1\n");
+-		printf("ID_V4L_PRODUCT=%s\n", v1cap.name);
+-		printf("ID_V4L_CAPABILITIES=:");
+-		if ((v1cap.type & VID_TYPE_CAPTURE) > 0)
+-			printf("capture:");
+-		if ((v1cap.type & VID_TYPE_OVERLAY) > 0)
+-			printf("video_overlay:");
+-		if (v1cap.audios > 0)
+-			printf("audio:");
+-		if ((v1cap.type & VID_TYPE_TUNER) > 0)
+-			printf("tuner:");
+-		printf("\n");
+-	}
++	} 
+ 
+ 	close (fd);
+ 	return 0;
diff --git a/udev.spec b/udev.spec
index d744c3a..24ca8bd 100644
--- a/udev.spec
+++ b/udev.spec
@@ -22,6 +22,7 @@ Patch2: udev-pda-acl.patch
 Patch3: 0001-keymap-Add-force-release-for-HP-touchpad-off.patch
 Patch4: 0001-extras-keymap-Make-touchpad-buttons-consistent.patch
 Patch5: udev-random_temporary_ifname.patch
+Patch6: udev-164-no-v4l1.patch
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -124,6 +125,7 @@ glib-based applications using libudev functionality.
 %patch3 -p1 
 %patch4 -p1 
 %patch5 -p1 
+%patch6 -p1 
 
 %build
 libtoolize -f -c
@@ -362,6 +364,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 02 2011 Harald Hoyer <harald at redhat.com> 164-8
 - fixed: network device renaming 2-step exceeds IFNAMSIZ
 Resolves: rhbz#673675
+- removed v4l version 1
 
 * Fri Jan 21 2011 Harald Hoyer <harald at redhat.com> 164-7
 - removed unnecessary devices from /lib/udev/devices