- updated to 3.14.4 (fixes CVE-2013-6402 CVE-2013-6427; adds many printers support)

- updated udev-rules patch

diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
index 9c32bbad516ccc94ae63370f32e48a8f81307304..7d2e5e4e30535aa1c9fb7d0481f029d1fa14c3fe 100644 (file)
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@@ -1,12 +1,11 @@
-diff -up hplip-3.13.6/data/rules/56-hpmud.rules.udev-rules hplip-3.13.6/data/rules/56-hpmud.rules
---- hplip-3.13.6/data/rules/56-hpmud.rules.udev-rules  2013-06-24 10:28:19.865301396 +0200
-+++ hplip-3.13.6/data/rules/56-hpmud.rules     2013-06-24 10:31:21.283926852 +0200
+--- hplip-3.14.4/data/rules/56-hpmud.rules.orig        2014-05-27 15:39:55.510795837 +0200
++++ hplip-3.14.4/data/rules/56-hpmud.rules     2014-05-27 15:42:45.834125604 +0200
 @@ -11,8 +11,6 @@ LABEL="hpmud_usb_rules"
  ATTR{idVendor}=="03f0", ATTR{idProduct}=="????", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1"
  
  
 -# This rule will add the printer and install plugin
--ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi'"
+-ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/python /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi &'"
  
  # If sane-bankends is installed add hpaio backend support to dll.conf if needed.
  ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'"

diff --git a/hplip.spec b/hplip.spec
index 07bc20551adba6041dce9cc2b3a3feae77a551a4..6d9e0584fbc26103fdb025ca287413d170959f14 100644 (file)
--- a/hplip.spec
+++ b/hplip.spec
@@ -13,12 +13,12 @@
 Summary:       Hewlett-Packard Linux Imaging and Printing suite - printing and scanning using HP devices
 Summary(pl.UTF-8):     Narzędzia Hewlett-Packard Linux Imaging and Printing - drukowanie i skanowanie przy użyciu urządzeń HP
 Name:          hplip
-Version:       3.13.11
-Release:       2
+Version:       3.14.4
+Release:       1
 License:       BSD (hpijs), MIT (low-level scanning and printing code), GPL v2 (the rest)
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/hplip/%{name}-%{version}.tar.gz
-# Source0-md5: 8ee362d9bc45fd4eddd3c9d9e583d728
+# Source0-md5: 6e8d53fb2284271505d2e1706c01f6c5
 Patch0:                %{name}-desktop.patch
 Patch1:                unresolved.patch
 Patch2:                pld-distro.patch
@@ -30,7 +30,7 @@ Patch5:               %{name}-udev-rules.patch
 URL:           http://hplipopensource.com/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: cups-devel
+BuildRequires: cups-devel >= 1.2
 %{?with_dbus:BuildRequires:    dbus-devel >= 1.0.0}
 BuildRequires: libjpeg-devel
 BuildRequires: libstdc++-devel
@@ -189,7 +189,6 @@ CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti"
        --enable-hpijs-install \
        --enable-policykit \
        --enable-pp-build \
-       --enable-udev-acl-rules \
        --with-cupsbackenddir=%{cups_backenddir} \
        --with-cupsfilterdir=%{cups_filterdir} \
        --with-hpppddir=%{cups_ppddir} \