- 2.7.10.

.cvsignore

@@ -18,3 +18,4 @@ hplip-1.7.4a.tar.gz
 hplip-2.7.6.tar.gz
 hplip-2.7.7.tar.gz
 hplip-2.7.9.tar.gz
+hplip-2.7.10.tar.gz

hplip-subprocess-replacement.patch

@@ -1,105 +0,0 @@
-diff -up hplip-2.7.9/hpssd.py.subprocess-replacement hplip-2.7.9/hpssd.py
---- hplip-2.7.9/hpssd.py.subprocess-replacement	2007-10-12 09:34:06.000000000 +0100
-+++ hplip-2.7.9/hpssd.py	2007-10-12 09:36:28.000000000 +0100
-@@ -53,7 +53,7 @@ __doc__ = "Provides persistent data and 
- 
- # Std Lib
- import sys, socket, os, os.path, signal, getopt, time, select
--import popen2, threading, tempfile
-+import subprocess, threading, tempfile
- 
- from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
-      ENOTCONN, ESHUTDOWN, EINTR, EISCONN
-@@ -560,21 +560,23 @@ class MailThread(threading.Thread):
- 
-         if sendmail:
-             sendmail = os.path.join(sendmail, 'sendmail')
--            sendmail += ' -t -r %s' % self.from_address
--
--            log.debug(sendmail)
--            std_out, std_in, std_err = popen2.popen3(sendmail) 
--            log.debug(repr(self.message))
--            std_in.write(self.message)
--            std_in.close()
--
--            r, w, e = select.select([std_err], [], [], 2.0)
--
--            if r:
--                err = std_err.read()
--                if err:
--                    log.error(repr(err))
--                    self.result = ERROR_TEST_EMAIL_FAILED
-+            cmd = [sendmail,'-t','-r',self.from_address]
-+            
-+            log.debug(repr(cmd))
-+            err = None
-+            try:
-+                sp = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-+                std_out, std_err = sp.communicate(self.message)
-+                log.debug(repr(self.message))
-+                if std_err != '':
-+                    err = std_err
-+
-+            except OSError, e:
-+                err = str(e)
-+
-+            if err:
-+                log.error(repr(err))
-+                self.result = ERROR_TEST_EMAIL_FAILED
- 
-         else:
-             log.error("Mail send failed. sendmail not found.")
-diff -up hplip-2.7.9/scan.py.subprocess-replacement hplip-2.7.9/scan.py
---- hplip-2.7.9/scan.py.subprocess-replacement	2007-10-12 09:36:36.000000000 +0100
-+++ hplip-2.7.9/scan.py	2007-10-12 09:40:45.000000000 +0100
-@@ -829,7 +829,7 @@ else: # NON_INTERACTIVE_MODE
-     from scan import sane
-     import scanext
-     import cStringIO
--    import popen2
-+    import subprocess
- 
-     try:
-         import Image
-@@ -1311,26 +1311,25 @@ else: # NON_INTERACTIVE_MODE
- 
-             if sendmail:
-                 sendmail = os.path.join(sendmail, 'sendmail')
--                sendmail += ' -t -r %s' % email_from
-+                cmd = [sendmail,'-t','-r',email_from]
- 
--                log.debug(sendmail)
--                std_out, std_in, std_err = popen2.popen3(sendmail) 
--                std_in.write(msg.as_string())
--                std_in.close()
--
--                while True:
--                    update_spinner()
--                    r, w, e = select.select([std_err], [], [], 1.0)
--
--                    if r:
--                        break
-+                log.debug(repr(cmd))
-+                err = None
-+                try:
-+                    sp = subprocess.Popen(cmd, stdin=subprocess.PIPE,
-+                                          stdout=subprocess.PIPE,
-+                                          stderr=subprocess.PIPE)
-+                    std_out, std_err = sp.communicate(msg.as_string())
-+                    if std_err != '':
-+                        err = std_err
-+                except OSError, e:
-+                    err = str(e)
- 
-+                update_spinner()
-                 cleanup_spinner()
- 
--                if r:
--                    err = std_err.read()
--                    if err:
--                        log.error(repr(err))
-+                if err:
-+                    log.error(repr(err))
- 
-             else:
-                 log.error("Mail send failed. 'sendmail' not found.")

hplip-udev-rules.patch

@@ -1,16 +1,16 @@
-diff -up hplip-2.7.9/data/rules/55-hpmud.rules.udev-rules hplip-2.7.9/data/rules/55-hpmud.rules
+diff -up hplip-2.7.10/data/rules/55-hpmud.rules.udev-rules hplip-2.7.10/data/rules/55-hpmud.rules
---- hplip-2.7.9/data/rules/55-hpmud.rules.udev-rules	2007-10-03 10:36:09.000000000 +0100
+--- hplip-2.7.10/data/rules/55-hpmud.rules.udev-rules	2007-10-17 23:50:47.000000000 +0100
-+++ hplip-2.7.9/data/rules/55-hpmud.rules	2007-10-03 10:41:28.000000000 +0100
++++ hplip-2.7.10/data/rules/55-hpmud.rules	2007-10-22 12:57:37.000000000 +0100
-@@ -1,18 +1,20 @@
+@@ -1,21 +1,21 @@
  # Udev rules file for HP printer products.
  
  ACTION!="add", GOTO="hpmud_rules_end"
 -SUBSYSTEM=="ppdev", OWNER="lp", GROUP="lp", MODE="0666"
--SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
 +SUBSYSTEM=="ppdev", GROUP="lp", MODE="0664"
-+SUBSYSTEM!="usb", GOTO="hpmud_rules_end"
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test"
-+ATTR{devnum}!="?*", GOTO="hpmud_rules_end"
+ SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
-+ATTR{busnum}!="?*", GOTO="hpmud_rules_end"
+ 
+ LABEL="pid_test"
  
  # Check for AiO products (0x03f0xx11).
 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="lp", GROUP="lp", MODE="0666"

hplip.spec

@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 2.7.9
+Version: 2.7.10
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -20,7 +20,6 @@ Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-libm.patch
 Patch6: hplip-udev-rules.patch
-Patch7: hplip-subprocess-replacement.patch
 Patch8: hplip-libsane.patch
 Patch9: hplip-media-empty.patch
 Patch11: hplip-unload-traceback.patch
@@ -112,9 +111,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Fix the udev rules file (bug #248740).
 %patch6 -p1 -b .udev-rules
 
-# Applied patch to fix remnants of CVE-2007-5208 (bug #329111).
-%patch7 -p1 -b .subprocess-replacement
-
 # Link libsane-hpaio against libsane (bug #234813).
 %patch8 -p1 -b .libsane
 
@@ -286,6 +282,9 @@ fi
 exit 0
 
 %changelog
+* Mon Oct 22 2007 Tim Waugh <twaugh@redhat.com> 2.7.10-1
+- 2.7.10.
+
 * Fri Oct 12 2007 Tim Waugh <twaugh@redhat.com> 2.7.9-3
 - Applied patch to fix remnants of CVE-2007-5208 (bug #329111).
 

sources

@@ -1 +1 @@
-a05aeb5679c3ce429bea7f3335609aee  hplip-2.7.9.tar.gz
+eafb815ca4b4bb5a2f35a76ee3c2dc72  hplip-2.7.10.tar.gz