Updated to 3.16.8

.abf.yml

@@ -3,6 +3,7 @@ removed_sources:
   hplip-3.14.6.tar.gz: 3688ce1378be1372ce00b13ef1cd74d687ecd1ac
   hplip-3.15.2.tar.gz: efebad73f29ab9f77d5a866c1c5d3857cc5f1df5
   hplip-3.15.6.tar.gz: dba9839d3daf1a2dc464a0d3094ba9b71fea422c
+  hplip-3.16.3.tar.gz: fad988c34fc070431cb3c9a73062073a7e6ba6a1
 sources:
   hp-sendfax.png: 2201320c59c2eaba10abce5c40306c6461e79beb
-  hplip-3.16.3.tar.gz: fad988c34fc070431cb3c9a73062073a7e6ba6a1
+  hplip-3.16.8.tar.gz: 0331d810702983e15c3a3b8cfe48d262fa23aac5

add-mga-support.patch

@@ -0,0 +1,286 @@
+diff -up ./base/password.py.tv ./base/password.py
+--- ./base/password.py.tv	2016-02-26 19:07:20.146540331 +0100
++++ ./base/password.py	2016-02-26 19:07:26.254585805 +0100
+@@ -35,6 +35,7 @@ PASSWORD_RETRY_COUNT = 3
+ AUTH_TYPES ={'mepis':'su',
+              'debian':'su',
+              'suse':'su',
++             'mageia':'su',
+              'mandriva':'su',
+              'fedora':'su',
+              'redhat':'su',
+diff -up ./installer/distros.dat.tv ./installer/distros.dat
+--- ./installer/distros.dat.tv	2016-02-26 18:39:22.607131997 +0100
++++ ./installer/distros.dat	2016-02-26 21:54:31.609804377 +0100
+@@ -92,7 +92,7 @@
+ # ****************************************
+ 
+ [distros]
+-distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs
++distros=unknown,mepis,debian,suse,mageia,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs
+ 
+ # ****************************************
+ 
+@@ -4810,6 +4810,262 @@ packages=wget
+ packages=avahi-utils
+ # ********************
+ # ****************************************
++[mageia]
++index=4
++versions=5,6
++display_name=Mageia
++alt_names=Mageia
++display=1
++notes=
++package_mgrs=urpmi
++package_mgr_cmd=su - -c "urpmi --allow-force --force --auto $packages_to_install"
++pre_install_cmd=su - -c "/etc/init.d/cups restart",su - -c "touch /etc/security/console.perms.d/60-hplip.perms && echo '<usb>=/dev/usb/dabusb* /dev/usb/mdc800* /dev/usb/rio500 /dev/ttyUSB*' | tee /etc/security/console.perms.d/60-hplip.perms"
++pre_depend_cmd=su - -c "rm /etc/hp/hplip.conf"
++post_depend_cmd=su - -c "/etc/init.d/cups restart", su - -c "chmod 700 /usr/lib/cups/backend/hp"
++hplip_remove_cmd=su - -c "urpme hplip task-printing-hp"
++su_sudo=su
++ppd_install=drv
++udev_mode_fix=1
++ppd_dir=/usr/share/cups/model/HP
++fix_ppd_symlink=0
++drv_dir=/usr/share/cups/drv/HP
++[mageia:5]
++code_name=
++supported=0
++scan_supported=1
++fax_supported=1
++pcard_supported=1
++network_supported=1
++parallel_supported=1
++usb_supported=1
++packaged_version=3.9.12
++release_date=2009-11-03
++notes=Before proceeding, please add the "contrib", "main", and "updates" installation sources to your URPMI configuration./n Open your browser and go to http://easyurpmi.zarb.org/ and follow the instructions provided and then proceed with the HPLIP install. Also you may wish to turn off the cdrom1-12 media sources to speed up the process.
++ppd_install=drv
++udev_mode_fix=1
++ppd_dir=/usr/share/ppd/HP
++fix_ppd_symlink=0
++drv_dir=/usr/share/cups/drv/HP
++ui_toolkit=qt4
++policykit=1
++
++[mageia:5:cups]
++packages=cups,cups-common
++
++[mageia:5:cups-devel]
++packages=libcups2-devel
++
++[mageia:5:gcc]
++packages=gcc-c++
++
++[mageia:5:gs]
++packages=ghostscript
++
++[mageia:5:libcrypto]
++packages=libopenssl0.9.8-devel
++
++[mageia:5:libjpeg]
++packages=libjpeg-devel
++
++[mageia:5:libnetsnmp-devel]
++packages=libnet-snmp-devel
++
++[mageia:5:libpthread]
++packages=glibc-i18ndata,glibc_lsb
++
++[mageia:5:libtool]
++packages=libtool,libgphoto-devel
++
++[mageia:5:libusb]
++packages=libusb1.0-devel
++
++[mageia:5:make]
++packages=make
++
++[mageia:5:pil]
++packages=python-imaging
++
++[mageia:5:ppdev]
++packages=
++commands=su -c "modprobe ppdev"
++
++[mageia:5:pyqt]
++packages=python-qt4
++
++[mageia:5:python-devel]
++packages=libpython2.6-devel
++
++[mageia:5:pyqt4]
++packages=python-qt4
++
++[mageia:5:pyqt4-dbus]
++packages=qt4-qtdbus
++
++[mageia:5:python23]
++packages=python
++
++[mageia:5:python2X]
++packages=python
++
++[mageia:5:reportlab]
++packages=python-reportlab
++
++[mageia:5:sane]
++packages=saned
++
++[mageia:5:sane-devel]
++packages=libsane1-devel,sane-backends
++
++[mageia:5:scanimage]
++packages=libsane1
++
++[mageia:5:xsane]
++packages=xsane,sane-frontends
++
++[mageia:5:cups-ddk]
++packages=cups
++
++[mageia:5:python-dbus]
++packages=python-dbus,python-gobject
++
++[mageia:5:dbus]
++packages=libdbus-1-devel,python-gobject
++
++[mageia:5:python-ctypes]
++packages=python
++
++[mageia:5:cups-image]
++packages=libcups2
++
++[mageia:5:policykit]
++packages=policykit,policykit-gnome
++
++[mageia:5:network]
++packages=wget
++
++[mageia:5:avahi-utils]
++packages=avahi
++
++[mageia:6]
++code_name=
++supported=0
++scan_supported=1
++fax_supported=1
++pcard_supported=1
++network_supported=1
++parallel_supported=1
++usb_supported=1
++packaged_version=3.9.12
++release_date=2009-11-03
++notes=Before proceeding, please add the "contrib", "main", and "updates" installation sources to your URPMI configuration./n Open your browser and go to http://easyurpmi.zarb.org/ and follow the instructions provided and then proceed with the HPLIP install. Also you may wish to turn off the cdrom1-12 media sources to speed up the process.
++ppd_install=drv
++udev_mode_fix=1
++ppd_dir=/usr/share/ppd/HP
++fix_ppd_symlink=0
++drv_dir=/usr/share/cups/drv/HP
++ui_toolkit=qt4
++policykit=1
++
++[mageia:6:cups]
++packages=cups,cups-common
++
++[mageia:6:cups-devel]
++packages=libcups2-devel
++
++[mageia:6:gcc]
++packages=gcc-c++
++
++[mageia:6:gs]
++packages=ghostscript
++
++[mageia:6:libcrypto]
++packages=libopenssl0.9.8-devel
++
++[mageia:6:libjpeg]
++packages=libjpeg-devel
++
++[mageia:6:libnetsnmp-devel]
++packages=libnet-snmp-devel
++
++[mageia:6:libpthread]
++packages=glibc-i18ndata,glibc_lsb
++
++[mageia:6:libtool]
++packages=libtool,libgphoto-devel
++
++[mageia:6:libusb]
++packages=libusb1.0-devel
++
++[mageia:6:make]
++packages=make
++
++[mageia:6:pil]
++packages=python-imaging
++
++[mageia:6:ppdev]
++packages=
++commands=su -c "modprobe ppdev"
++
++[mageia:6:pyqt]
++packages=python-qt4
++
++[mageia:6:python-devel]
++packages=libpython2.6-devel
++
++[mageia:6:pyqt4]
++packages=python-qt4
++
++[mageia:6:pyqt4-dbus]
++packages=qt4-qtdbus
++
++[mageia:6:python23]
++packages=python
++
++[mageia:6:python2X]
++packages=python
++
++[mageia:6:reportlab]
++packages=python-reportlab
++
++[mageia:6:sane]
++packages=saned
++
++[mageia:6:sane-devel]
++packages=libsane1-devel,sane-backends
++
++[mageia:6:scanimage]
++packages=libsane1
++
++[mageia:6:xsane]
++packages=xsane,sane-frontends
++
++[mageia:6:cups-ddk]
++packages=cups
++
++[mageia:6:python-dbus]
++packages=python-dbus,python-gobject
++
++[mageia:6:dbus]
++packages=libdbus-1-devel,python-gobject
++
++[mageia:6:python-ctypes]
++packages=python
++
++[mageia:6:cups-image]
++packages=libcups2
++
++[mageia:6:policykit]
++packages=policykit,policykit-gnome
++
++[mageia:6:network]
++packages=wget
++
++[mageia:6:avahi-utils]
++packages=avahi
++
++
++# ********************
++# ****************************************
+ [mandriva]
+ index=4
+ versions=2010.0,2011.0

hplip-3.16.8-cups-2.2.patch

@@ -0,0 +1,28 @@
+From: David Geiger <david.david@mageialinux-online.org>
+Date: Tue, 22 Sep 2016 10:30:12 -0500
+Subject: [PATCH] fix FTBFS against cups-2.2
+
+'ppd_file_t' moved to cups/ppd.h
+
+diff -Nru a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+--- a/prnt/hpcups/HPCupsFilter.h	2016-08-26 12:03:22.000000000 +0200
++++ b/prnt/hpcups/HPCupsFilter.h	2016-09-22 10:30:28.847713112 +0200
+@@ -31,6 +31,7 @@
+ #ifndef HP_CUPSFILTER_H
+ #define HP_CUPSFILTER_H
+ 
++#include <cups/ppd.h>
+ #include "CommonDefinitions.h"
+ #include "SystemServices.h"
+ #include "Compressor.h"
+diff -Nru a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+--- a/prnt/hpijs/hpcupsfax.cpp	2016-08-26 12:03:15.000000000 +0200
++++ b/prnt/hpijs/hpcupsfax.cpp	2016-09-22 09:53:38.281873443 +0200
+@@ -43,6 +43,7 @@
+ #include <arpa/inet.h>
+ #include <math.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <cups/raster.h>
+ #include <string>
+ #ifdef FALSE

hplip-3.16.8-ui-optional.patch

@@ -0,0 +1,27 @@
+diff -Naur hplip-3.16.8.orig/base/utils.py hplip-3.16.8/base/utils.py
+--- hplip-3.16.8.orig/base/utils.py	2016-09-26 10:11:28.239375103 +0300
++++ hplip-3.16.8/base/utils.py	2016-09-26 10:12:09.905940491 +0300
+@@ -733,6 +733,13 @@
+         if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
+             no_qt_message_gtk()
+ 
++        # hplip-gui sub-package (Fedora)
++        try:
++            import ui
++        except ImportError:
++            log.error("hplip-gui not installed.  GUI not available. Exiting.")
++            return False
++
+         log.error("PyQt not installed. GUI not available. Exiting.")
+         return False
+ 
+@@ -783,7 +790,8 @@
+         import PyQt5
+         import ui5
+     else:
+-        log.debug("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP again")
++        # hplip-gui sub-package (Fedora) requires PyQt4
++        log.error("Install the hplip-gui package for graphical support.")
+         return False
+     return True
+ 

hplip-udev-rules.patch

@@ -1,18 +1,18 @@
-diff -up hplip-3.15.6/data/rules/56-hpmud.rules.udev-rules hplip-3.15.6/data/rules/56-hpmud.rules
---- hplip-3.15.6/data/rules/56-hpmud.rules.udev-rules	2015-06-10 19:27:31.068051786 +0200
-+++ hplip-3.15.6/data/rules/56-hpmud.rules	2015-06-10 19:28:46.533854350 +0200
-@@ -12,7 +12,4 @@ ENV{ID_USB_INTERFACES}=="", IMPORT{built
+diff -Naur hplip-3.16.8.orig/data/rules/56-hpmud.rules hplip-3.16.8/data/rules/56-hpmud.rules
+--- hplip-3.16.8.orig/data/rules/56-hpmud.rules	2016-09-26 10:12:48.935470054 +0300
++++ hplip-3.16.8/data/rules/56-hpmud.rules	2016-09-26 10:12:49.004470990 +0300
+@@ -12,7 +12,4 @@
  # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl
- ATTR{idVendor}=="03f0", ENV{ID_USB_INTERFACES}=="*:0701??:*|*:08????:", OWNER="root", GROUP="lp", MODE="0664", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1"
+ ATTR{idVendor}=="03f0", ENV{ID_USB_INTERFACES}=="*:0701??:*|*:ffcc00:", OWNER="root", GROUP="lp", MODE="0664", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1"
  
 -# This rule will check the smart install feature, plugin status and firmware download for the required printers.
 -ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM}'"
 -
  LABEL="hpmud_rules_end"
-diff -up hplip-3.15.6/Makefile.in.udev-rules hplip-3.15.6/Makefile.in
---- hplip-3.15.6/Makefile.in.udev-rules	2015-06-07 21:26:22.000000000 +0200
-+++ hplip-3.15.6/Makefile.in	2015-06-10 19:27:31.069051784 +0200
-@@ -4591,7 +4591,7 @@ cups_drv = prnt/drv/hpcups.drv
+diff -Naur hplip-3.16.8.orig/Makefile.in hplip-3.16.8/Makefile.in
+--- hplip-3.16.8.orig/Makefile.in	2016-09-26 10:12:48.850468901 +0300
++++ hplip-3.16.8/Makefile.in	2016-09-26 10:12:49.007471031 +0300
+@@ -4914,7 +4914,7 @@
  @HPLIP_BUILD_TRUE@dist_rulessystem_DATA = data/rules/hplip-printer@.service
  
  # hpmud.rules

hplip.spec

@@ -19,8 +19,8 @@
 
 Summary:	HP printer/all-in-one driver infrastructure
 Name:		hplip
-Version:	3.16.3
-Release:	4
+Version:	3.16.8
+Release:	1
 License:	GPLv2+ and MIT
 Group:		System/Printing
 Url:		http://hplip.sourceforge.net/
@@ -43,7 +43,7 @@ Patch2:		hplip-apply-udev-rules-on-action-change.patch
 # Fedora patches
 Patch101:	hplip-pstotiff-is-rubbish.patch
 Patch102:	hplip-strstr-const.patch
-Patch103:	hplip-ui-optional.patch
+Patch103:	hplip-3.16.8-ui-optional.patch
 Patch104:	hplip-no-asm.patch
 Patch105:       hplip-deviceIDs-drv.patch
 Patch107:       hplip-deviceIDs-ppd.patch
@@ -83,6 +83,7 @@ Patch226:	hp-systray-make-menu-title-visible-in-sni-qt-indicator.dpatch
 Patch227:	hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.dpatch
 Patch228:	hpaio-option-duplex.diff
 
+Patch301:       hplip-3.16.8-cups-2.2.patch
 Patch302:	hplip-CVE-2013-4325.patch
 Patch303:	hplip-3.13.10-fix-systray-x.patch
 Patch304:	hplip-3.15.6-hpipp_linkage.patch
@@ -458,6 +459,8 @@ sed -i.duplex-constraints \
 
 %patch228 -p1 -b .hpaio-option-duplex
 
+%patch301 -p1
+
 %patch302 -p0
 
 %patch303 -p1