diff --git a/.cvsignore b/.cvsignore index 58b6d19..1c4c219 100644 --- a/.cvsignore +++ b/.cvsignore @@ -17,3 +17,4 @@ hplip-1.7.2.tar.gz hplip-1.7.4a.tar.gz hplip-2.7.6.tar.gz hplip-2.7.7.tar.gz +hplip-2.7.9.tar.gz diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch index 6f60a10..b69dd67 100644 --- a/hplip-udev-rules.patch +++ b/hplip-udev-rules.patch @@ -1,12 +1,31 @@ ---- hplip-2.7.6/55-hpmud.rules.udev-rules 2007-07-20 14:13:01.000000000 +0100 -+++ hplip-2.7.6/55-hpmud.rules 2007-07-20 14:13:32.000000000 +0100 -@@ -1,5 +1,7 @@ - # TODO: add PROGRAM rule for 7/xx/xx printer class interface +diff -up hplip-2.7.9/data/rules/55-hpmud.rules.udev-rules hplip-2.7.9/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.9/data/rules/55-hpmud.rules 2007-10-03 10:41:28.000000000 +0100 +@@ -1,18 +1,20 @@ + # 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" +ATTR{devnum}!="?*", GOTO="hpmud_rules_end" +ATTR{busnum}!="?*", GOTO="hpmud_rules_end" - ACTION!="add", GOTO="hpmud_rules_end" --SYSFS{idVendor}=="03f0", GROUP="lp" -+SYSFS{idVendor}=="03f0", GROUP="lp", MODE="0664" + + # Check for AiO products (0x03f0xx11). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="lp", GROUP="lp", MODE="0666" ++SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", GROUP="lp", MODE="0664" + # Check for Photosmart products (0x03f0xx02). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="lp", GROUP="lp", MODE="0666" ++SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", GROUP="lp", MODE="0664" + # Check for Business Inkjet products (0x03f0xx12). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="lp", GROUP="lp", MODE="0666" ++SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", GROUP="lp", MODE="0664" + # Check for Deskjet products (0x03f0xx04). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="lp", GROUP="lp", MODE="0666" ++SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", GROUP="lp", MODE="0664" + # Check for LaserJet products (0x03f0xx17). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="lp", GROUP="lp", MODE="0666" ++SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", GROUP="lp", MODE="0664" + LABEL="hpmud_rules_end" diff --git a/hplip.spec b/hplip.spec index 9fdbcab..8bee96d 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 2.7.7 -Release: 5%{?dist} +Version: 2.7.9 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -221,7 +221,6 @@ rm -rf %{buildroot} %{_datadir}/hplip/base %{_datadir}/hplip/copier %dir %{_datadir}/hplip/data -%{_datadir}/hplip/data/firmware %{_datadir}/hplip/data/ldl %{_datadir}/hplip/data/localization %{_datadir}/hplip/data/models @@ -278,6 +277,11 @@ fi exit 0 %changelog +* Wed Oct 3 2007 Tim Waugh 2.7.9-1 +- 2.7.9. +- Adjusted udev rules to be less permissive. We use ConsoleKit to add + ACLs to the device nodes, so world-writable device nodes can be avoided. + * Tue Sep 25 2007 Tim Waugh 2.7.7-5 - Prevent hpfax trying to load configuration files as user lp. diff --git a/sources b/sources index 1eb5d19..53d0ab9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -086bd6a306fa2dfbd6e8c962fddcdef4 hplip-2.7.7.tar.gz +a05aeb5679c3ce429bea7f3335609aee hplip-2.7.9.tar.gz