rpms/hal-cups-utils/F-9 hal-cups-utils-hal-fd.patch, NONE, 1.1 hal-cups-utils.spec, 1.69, 1.70

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hal-cups-utils/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3546

Modified Files:
	hal-cups-utils.spec 
Added Files:
	hal-cups-utils-hal-fd.patch 
Log Message:
* Mon May 12 2008 Tim Waugh <twaugh at redhat.com>
- Explicitly set stdin to be /dev/null to avoid using HAL's file
  descriptor (bug #442191).


hal-cups-utils-hal-fd.patch:

--- NEW FILE hal-cups-utils-hal-fd.patch ---
diff -U0 hal-cups-utils-0.6.16/ChangeLog.hal-fd hal-cups-utils-0.6.16/ChangeLog
--- hal-cups-utils-0.6.16/ChangeLog.hal-fd	2008-05-12 15:37:26.000000000 +0100
+++ hal-cups-utils-0.6.16/ChangeLog	2008-05-12 15:37:38.000000000 +0100
@@ -0,0 +1,6 @@
+2008-05-12  Tim Waugh  <twaugh at redhat.com>
+
+	* systemv/hal_lpadmin (get_hplip_uris_for_usb): Explicitly set
+	stdin to be /dev/null to avoid using HAL's file descriptor (bug
+	#442191).
+
diff -up hal-cups-utils-0.6.16/systemv/hal_lpadmin.hal-fd hal-cups-utils-0.6.16/systemv/hal_lpadmin
--- hal-cups-utils-0.6.16/systemv/hal_lpadmin.hal-fd	2008-05-12 15:37:26.000000000 +0100
+++ hal-cups-utils-0.6.16/systemv/hal_lpadmin	2008-05-12 15:37:38.000000000 +0100
@@ -24,7 +24,7 @@ def get_hplip_uris_for_usb (fax=False, c
         else:
             type="-c"
         cmd = \
-            "LC_ALL=C hp-makeuri -lnone %s %s:%s 2>/dev/null" % \
+            "LC_ALL=C hp-makeuri -lnone %s %s:%s 2>/dev/null </dev/null" % \
             (type, bus, device)
         try:
             uri = os.popen (cmd, 'r').readlines ()[0].strip ()


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/F-9/hal-cups-utils.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- hal-cups-utils.spec	4 Apr 2008 17:07:28 -0000	1.69
+++ hal-cups-utils.spec	12 May 2008 14:39:07 -0000	1.70
@@ -7,6 +7,7 @@
 Source: %{name}-%{version}.tar.gz
 Source1: cups-config-daemon
 Patch1: hal-cups-utils-no-compare-queue-name.patch
+Patch2: hal-cups-utils-hal-fd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
@@ -29,6 +30,7 @@
 
 %setup -q
 %patch1 -p1 -b .no-compare-queue-name
+%patch2 -p1 -b .hal-fd
 
 %build
 
@@ -60,6 +62,10 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Mon May 12 2008 Tim Waugh <twaugh at redhat.com>
+- Explicitly set stdin to be /dev/null to avoid using HAL's file
+  descriptor (bug #442191).
+
 * Fri Apr  4 2008 Tim Waugh <twaugh at redhat.com> 0.6.16-3
 - Applied patch from upstream to use only the device URI to see if the
   printer has been configured already, and to make the queue name unique.