From d3697d9f3932cb1e2430e8a20beefddcdff7458578d098f7f03a87e4ee290080 Mon Sep 17 00:00:00 2001
From: Johannes Meixner <jsmeix@suse.com>
Date: Tue, 1 Apr 2014 12:09:12 +0000
Subject: [PATCH 1/2] Accepting request 228244 from home:mcaj:branches:Printing
Hi I updated the hplip to the latest stable version 3.14.3. The patch change-udev-rules.diff Needs a push a bit, but changes there are still valid for suse.
I tested it on my home printer and works fine.
OBS-URL: https://build.opensuse.org/request/show/228244
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=88
---
change-udev-rules.diff | 25 ++++++++-----------------
hplip-3.13.11.tar.gz | 3 ---
hplip-3.13.11.tar.gz.asc | 7 -------
hplip-3.14.3.tar.gz | 3 +++
hplip-3.14.3.tar.gz.asc | 7 +++++++
hplip.spec | 4 ++--
6 files changed, 20 insertions(+), 29 deletions(-)
delete mode 100644 hplip-3.13.11.tar.gz
delete mode 100644 hplip-3.13.11.tar.gz.asc
create mode 100644 hplip-3.14.3.tar.gz
create mode 100644 hplip-3.14.3.tar.gz.asc
diff --git a/change-udev-rules.diff b/change-udev-rules.diff
index d4a6ffe..d6ba680 100644
--- a/change-udev-rules.diff
+++ b/change-udev-rules.diff
@@ -1,8 +1,7 @@
---- data/rules/56-hpmud.rules.change-udev-rules.orig 2013-10-11 11:38:53.000000000 +0200
-+++ data/rules/56-hpmud.rules 2013-10-16 16:04:54.000000000 +0200
-@@ -1,18 +1,43 @@
+--- data/rules/56-hpmud.rules.orig 2014-03-28 20:51:31.600138795 +0100
++++ data/rules/56-hpmud.rules 2014-03-28 21:29:10.461761052 +0100
+@@ -1,9 +1,31 @@
# HPLIP udev rules file. Notify console user if plugin support is required for this device.
-
+# SUSE changed:
+#
+# Exchanged the rule to GOTO hpmud_usb_rules if SUBSYSTEM is "usb"
@@ -25,7 +24,7 @@
+# is also used to upload firmware into printers that need it
+# see https://bugs.launchpad.net/bugs/1220628
+# a rule that only uploads firmware into printers that need it is added.
-+
+
ACTION!="add", GOTO="hpmud_rules_end"
-SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_usb_rules"
@@ -35,23 +34,15 @@
LABEL="hpmud_usb_rules"
- # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl
- 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"
+@@ -12,7 +34,10 @@
+
--
# 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/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 &'"
++#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 &'"
+
+# This rule uploads firmware to HP USB printer devices if needed:
+ENV{hp_test}=="yes", PROGRAM="/bin/logger -p user.info udev hpmud.rules runs hp-firmware to test if HP device with USB vendor ID $attr{idVendor} and USB product ID $attr{idProduct} at USB bus ID $env{BUSNUM} and USB device ID $env{DEVNUM} needs firmware and if yes to upload it", RUN+="/usr/bin/hp-firmware -s $env{BUSNUM}:$env{DEVNUM}"
# 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'"
-@@ -20,5 +45,5 @@ ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c
- # The following rule will disable USB autosuspend for the device
- ENV{libsane_matched}=="yes", RUN+="/bin/sh -c 'test -e /sys/$env{DEVPATH}/power/level && echo on > /sys/$env{DEVPATH}/power/level'"
-
--
- LABEL="hpmud_rules_end"
-+
diff --git a/hplip-3.13.11.tar.gz b/hplip-3.13.11.tar.gz
deleted file mode 100644
index 28bd742..0000000
--- a/hplip-3.13.11.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ea0ed020ab54e08620fe6ea7c30e93dbb8be505f2e6994e7222a7be63ca3b34
-size 21104424
diff --git a/hplip-3.13.11.tar.gz.asc b/hplip-3.13.11.tar.gz.asc
deleted file mode 100644
index 2ebf61a..0000000
--- a/hplip-3.13.11.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlJyRPYACgkQc9dwzaWQR7k5dQCgsaBp0n2Yw+U4f+idkFfxmrEk
-FycAoOgf1EFe+P3pmL+yy7w+aY9INQYk
-=puTl
------END PGP SIGNATURE-----
diff --git a/hplip-3.14.3.tar.gz b/hplip-3.14.3.tar.gz
new file mode 100644
index 0000000..e6fbb96
--- /dev/null
+++ b/hplip-3.14.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1805b103639b51b9d908921e1e77db66c6e78b792aa51e405a5415e8e1c55e6e
+size 21178745
diff --git a/hplip-3.14.3.tar.gz.asc b/hplip-3.14.3.tar.gz.asc
new file mode 100644
index 0000000..cfcb5e0
--- /dev/null
+++ b/hplip-3.14.3.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlMYBFQACgkQc9dwzaWQR7nF7wCgmTFH79zVq0fDhCE1ztzQ2l89
+TLYAnigVq7D7loSaYOBYbiWdwtpj2u0C
+=tobK
+-----END PGP SIGNATURE-----
diff --git a/hplip.spec b/hplip.spec
index 4ee8f57..a11f6fe 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
#
# spec file for package hplip
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -59,7 +59,7 @@ Group: Hardware/Printing
# where 'a' or 'b' do not mean 'alpha' or 'beta' but 'second' or 'third' release in the month
# (usually bugfix releases have the suffix like 3.12.10a = first bugfix release for 3.12.10).
# Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
-Version: 3.13.11
+Version: 3.14.3
Release: 0
Url: http://hplipopensource.com
# Source0...Source9 is for sources from HP:
From 4b1e68ed301786d3d424281b0ef13c5779c57c9e390364a75db56a9d85b2c212 Mon Sep 17 00:00:00 2001
From: Johannes Meixner <jsmeix@suse.com>
Date: Wed, 9 Apr 2014 15:57:19 +0000
Subject: [PATCH 2/2] Accepting request 229529 from
home:jsmeix:branches:Printing
Version upgrade to 3.14.4
OBS-URL: https://build.opensuse.org/request/show/229529
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=89
---
do_not_open_mdns_port.diff | 22 ++-----------
hplip-3.14.3.tar.gz | 3 --
hplip-3.14.3.tar.gz.asc | 7 -----
hplip-3.14.4.tar.gz | 3 ++
hplip-3.14.4.tar.gz.asc | 7 +++++
hplip.changes | 64 ++++++++++++++++++++++++++++++++++++++
hplip.spec | 8 ++---
7 files changed, 80 insertions(+), 34 deletions(-)
delete mode 100644 hplip-3.14.3.tar.gz
delete mode 100644 hplip-3.14.3.tar.gz.asc
create mode 100644 hplip-3.14.4.tar.gz
create mode 100644 hplip-3.14.4.tar.gz.asc
diff --git a/do_not_open_mdns_port.diff b/do_not_open_mdns_port.diff
index 30aaf88..9e8f99f 100644
--- a/do_not_open_mdns_port.diff
+++ b/do_not_open_mdns_port.diff
@@ -1,14 +1,5 @@
---- installer/distros.dat.orig 2013-10-11 11:36:44.000000000 +0200
-+++ installer/distros.dat 2013-10-16 16:25:27.000000000 +0200
-@@ -141,7 +141,7 @@ parallel_supported=0
- usb_supported=1
- packaged_version=3.11.6
- release_date=2012-07-11
--notes=Please be sure to disable the CD repositories in YaST and after installation you must log out and back in to become a member of the lp and sys group to enable printing.
-+notes=Please be sure to disable the CD repositories in YaST.
- ppd_install=drv
- udev_mode_fix=1
- ppd_dir=/usr/share/cups/model/HP
+--- installer/distros.dat.orig 2014-04-04 12:40:20.000000000 +0200
++++ installer/distros.dat 2014-04-09 16:01:30.000000000 +0200
@@ -150,7 +150,7 @@ drv_dir=/usr/share/cups/drv/HP
cups_path_with_bitness=0
ui_toolkit=qt4
@@ -18,15 +9,6 @@
pre_depend_cmd=su -c "zypper refresh"
[suse:12.2:cups]
-@@ -261,7 +261,7 @@ parallel_supported=0
- usb_supported=1
- packaged_version=3.12.11
- release_date=2013-03-13
--notes=Please be sure to disable the CD repositories in YaST and after installation you must log out and back in to become a member of the lp and sys group to enable printing.
-+notes=Please be sure to disable the CD repositories in YaST.
- ppd_install=drv
- udev_mode_fix=1
- ppd_dir=/usr/share/cups/model/HP
@@ -270,7 +270,7 @@ drv_dir=/usr/share/cups/drv/HP
cups_path_with_bitness=0
ui_toolkit=qt4
diff --git a/hplip-3.14.3.tar.gz b/hplip-3.14.3.tar.gz
deleted file mode 100644
index e6fbb96..0000000
--- a/hplip-3.14.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1805b103639b51b9d908921e1e77db66c6e78b792aa51e405a5415e8e1c55e6e
-size 21178745
diff --git a/hplip-3.14.3.tar.gz.asc b/hplip-3.14.3.tar.gz.asc
deleted file mode 100644
index cfcb5e0..0000000
--- a/hplip-3.14.3.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlMYBFQACgkQc9dwzaWQR7nF7wCgmTFH79zVq0fDhCE1ztzQ2l89
-TLYAnigVq7D7loSaYOBYbiWdwtpj2u0C
-=tobK
------END PGP SIGNATURE-----
diff --git a/hplip-3.14.4.tar.gz b/hplip-3.14.4.tar.gz
new file mode 100644
index 0000000..073d0e0
--- /dev/null
+++ b/hplip-3.14.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce50c2e0ebc0f469599500257d291ca170c6559a99c8eb312f89be881c2110c9
+size 21414140
diff --git a/hplip-3.14.4.tar.gz.asc b/hplip-3.14.4.tar.gz.asc
new file mode 100644
index 0000000..8064bf1
--- /dev/null
+++ b/hplip-3.14.4.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlM+jW8ACgkQc9dwzaWQR7n+2wCfXptHk0qzrbrh4zl20WZ2zibb
+v6IAn1fBYSZwVTLCAhbgDXiHwhLcDPTJ
+=ksSW
+-----END PGP SIGNATURE-----
diff --git a/hplip.changes b/hplip.changes
index b5844cc..2a1443a 100644
--- a/hplip.changes
+++ b/hplip.changes
@@ -1,3 +1,67 @@
+-------------------------------------------------------------------
+Wed Apr 9 16:02:02 CEST 2014 - jsmeix@suse.de
+
+- do_not_open_mdns_port.diff: Adapted for HPLIP 3.14.4.
+- Version upgrade to 3.14.4:
+ Added Support for the Following New Printers:
+ HP Color LaserJet Enterprise M651dn Printer
+ HP Color LaserJet Enterprise M651n Printer
+ HP Color LaserJet Enterprise M651xh Printer
+ HP Color LaserJet Enterprise Multifunction M680dn Printer
+ HP Color LaserJet Enterprise Multifunction M680f Printer
+ HP Color LaserJet Enterprise Flow Multifunction M680z Printer
+ HP Color Laserjet Pro MFP M476dw
+ HP Color Laserjet Pro MFP M476nw
+ HP Color Laserjet Pro MFP M476dn
+ HP Designjet T795 44-in ePrinter
+ HP DeskJet 1511 All-in-One Printer
+ HP DeskJet 1011 Printer
+ HP LaserJet Pro MFP M128fn
+ HP LaserJet Pro MFP M128fp
+ HP LaserJet Pro MFP M128fw
+ HP LaserJet Pro M701a Printer
+ HP LaserJet Pro M701n Printer
+ HP LaserJet Pro M706n Printer
+ HP Officejet Enterprise Color X555dn Printer
+ HP Officejet Enterprise Color X555xh Printer
+ HP Officejet Enterprise Color X585dn Multifunction Printer
+ HP Officejet Enterprise Color X585f Multifunction Printer
+ HP Officejet Enterprise Color Flow X585z Multifunction Printer
+ HP OfficeJet Pro 8610 e-All-in-One Printer
+ HP OfficeJet Pro 8615 e-All-in-One Printer
+ HP OfficeJet Pro 8620 e-All-in-One Printer
+ HP OfficeJet Pro 8625 e-All-in-One Printer
+ HP OfficeJet Pro 8630 e-All-in-One Printer
+ HP OfficeJet 4631 e-All-in-One Printer
+ HP OfficeJet 4634 e-All-in-One printer
+ HP OfficeJet 4636 e-All-in-One Printer
+ Fixed hp-logcapture (captured personal information), see
+ http://hplipopensource.com/hplip-web/release_notes.html
+- change-udev-rules.diff: Adapted for HPLIP 3.14.3.
+- Version upgrade to 3.14.3:
+ Added Support for the Following New Printers:
+ HP Deskjet Ink Advantage 4640 e-All-in-One Printer series
+ HP Deskjet Ink Advantage 4645 e-All-in-One Printer
+ HP Deskjet Ink Advantage 4646 e-All-in-One Printer
+ HP Deskjet Ink Advantage 4648 e-All-in-One Printer
+ HP LaserJet Pro MFP M125a
+ HP LaserJet Pro MFP M125nw
+ HP LaserJet Pro MFP M125rnw
+ HP LaserJet Pro MFP M126a
+ HP LaserJet Pro MFP M126nw
+ HP LaserJet Pro MFP M127fp
+ Fixed hpcups filter crash.
+ Run hp-firmware from udev separately.
+ Some other bug fixes.
+ For details see
+ http://hplipopensource.com/hplip-web/release_notes.html
+- Version upgrade to 3.14.1:
+ Added digital signature validation in HPLIP upgrade feature.
+ CVE-2013-6427: insecure auto update feature.
+ CVE-2013-6402: insecure temporary file handling in pkit.py.
+- The whole HPLIP upgrade feature is still disabled, see the
+ entry dated "Wed Dec 4 14:25:51 CET 2013" below.
+
-------------------------------------------------------------------
Wed Dec 4 14:25:51 CET 2013 - jsmeix@suse.de
diff --git a/hplip.spec b/hplip.spec
index a11f6fe..5924ce3 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -59,15 +59,15 @@ Group: Hardware/Printing
# where 'a' or 'b' do not mean 'alpha' or 'beta' but 'second' or 'third' release in the month
# (usually bugfix releases have the suffix like 3.12.10a = first bugfix release for 3.12.10).
# Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
-Version: 3.14.3
+Version: 3.14.4
Release: 0
Url: http://hplipopensource.com
# Source0...Source9 is for sources from HP:
-# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.13.9.tar.gz
-# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.13.9.tar.gz.asc
+# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.14.4.tar.gz
+# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.14.4.tar.gz.asc
# How to verify Source0 see: http://hplipopensource.com/node/327
# For example: /usr/bin/gpg --keyserver pgp.mit.edu --recv-keys 0xA59047B9
-# /usr/bin/gpg --verify hplip-3.13.9.tar.gz.asc hplip-3.13.9.tar.gz
+# /usr/bin/gpg --verify hplip-3.14.4.tar.gz.asc hplip-3.14.4.tar.gz
# must result: Good signature from "HPLIP (HP Linux Imaging and Printing) <hplip@hp.com>"
Source0: http://prdownloads.sourceforge.net/hplip/hplip-%{version}.tar.gz
Source1: http://prdownloads.sourceforge.net/hplip/hplip-%{version}.tar.gz.asc