hplip: Update to 3.10.9.

diff --git a/pkgs/core/hplip/hplip.nm b/pkgs/core/hplip/hplip.nm
index 396f7dcdeba03f64ce2eee20450fd1f5325f0cc6..6b787d931215b1d12ae184b8be5dee48ad4e595d 100644 (file)
--- a/pkgs/core/hplip/hplip.nm
+++ b/pkgs/core/hplip/hplip.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = hplip
-PKG_VER        = 3.10.2
+PKG_VER        = 3.10.9
 PKG_REL        = 0
 
 PKG_MAINTAINER =

diff --git a/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch b/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch
deleted file mode 100644 (file)
index 49cb808..0000000
--- a/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.2/data/rules/56-hpmud_support.rules
---- hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules  2010-03-01 11:21:01.049740484 +0000
-+++ hplip-3.10.2/data/rules/56-hpmud_support.rules     2010-03-01 11:21:07.288609454 +0000
-@@ -7,8 +7,9 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
- LABEL="pid_test"
- 
- # Check for LaserJet products (0x03f0xx17).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
-+ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes"
- 
--ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'"
-+ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'"
- 
--LABEL="hpmud_rules_end"
-\ No newline at end of file
-+LABEL="hpmud_rules_end"

diff --git a/pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch b/pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch
new file mode 100644 (file)
index 0000000..d56fe6c
--- /dev/null
+++ b/pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch
@@ -0,0 +1,21 @@
+diff -up hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.5/data/rules/56-hpmud_support.rules
+--- hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules  2010-05-13 01:44:22.000000000 +0200
++++ hplip-3.10.5/data/rules/56-hpmud_support.rules     2010-05-17 16:12:42.000000000 +0200
+@@ -6,10 +6,11 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
+ 
+ LABEL="pid_test"
+ 
++ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
+ # Check for LaserJet products (0x03f0xx17).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes"
+ # Check for LaserJet products (0x03f0xx2a).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
+-ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes"
++ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'"
+ 
+-LABEL="hpmud_rules_end"
+\ No newline at end of file
++LABEL="hpmud_rules_end"
+