LOG Updated to 3.13.8 (sync with cooker)

2025-02-23 16:32:58 +00:00 · 2013-08-26 10:37:49 +04:00 · 2013-08-26 10:37:49 +04:00 · 77ea0b61c5
commit 77ea0b61c5
parent 6999ce57cc
37 changed files with 1231 additions and 722 deletions
--- a/.abf.yml
+++ b/.abf.yml
@ -1,5 +1,4 @@
-removed_sources:
-  hplip-3.12.10.tar.gz: de6c47c3503ca96de0f4ef4182d5a84f5c9e429e
+---
 sources:
  hp-sendfax.png: 2201320c59c2eaba10abce5c40306c6461e79beb
-  hplip-3.13.5.tar.gz: a28ebd754a94a83e493aa91673def890564c85f1
+  hplip-3.13.8.tar.gz: c91fd5231e056f03dc7e715a84afcb13074364d1
--- a/01_rss.dpatch
+++ b/01_rss.dpatch
@ -5,9 +5,10 @@
 ## DP: Blank-ink-only patch by Richard Spencer-Smith

@DPATCH@
-diff -urNad hplip~/prnt/hpijs/breaks_open.cpp hplip/prnt/hpijs/breaks_open.cpp
--- hplip~/prnt/hpijs/breaks_open.cpp	2006-03-16 11:12:00.000000000 -0300
-+++ hplip/prnt/hpijs/breaks_open.cpp	2006-03-16 11:22:28.984082881 -0300
+Index: hplip-3.12.4/prnt/hpijs/breaks_open.cpp
+===================================================================
+--- hplip-3.12.4.orig/prnt/hpijs/breaks_open.cpp	2012-04-10 18:39:32.000000000 +1000
+++ hplip-3.12.4/prnt/hpijs/breaks_open.cpp	2012-05-26 10:21:29.000000000 +1000
@@ -1078,7 +1078,10 @@
 
 {
@ -20,9 +21,10 @@ diff -urNad hplip~/prnt/hpijs/breaks_open.cpp hplip/prnt/hpijs/breaks_open.cpp
 0,  3,  255,    0,
 0,  5,  255,    0,
 0,  7,  255,    0,
-diff -urNad hplip~/prnt/hpijs/dj660_maps.cpp hplip/prnt/hpijs/dj660_maps.cpp
--- hplip~/prnt/hpijs/dj660_maps.cpp	2006-03-16 11:12:00.000000000 -0300
-+++ hplip/prnt/hpijs/dj660_maps.cpp	2006-03-16 11:22:28.984082881 -0300
+Index: hplip-3.12.4/prnt/hpijs/dj660_maps.cpp
+===================================================================
+--- hplip-3.12.4.orig/prnt/hpijs/dj660_maps.cpp	2012-04-10 18:39:32.000000000 +1000
+++ hplip-3.12.4/prnt/hpijs/dj660_maps.cpp	2012-05-26 10:21:29.000000000 +1000
@@ -38,7 +38,10 @@
 //const
 uint32_t ulMapDJ660_CCM_KCMY[ 9 * 9 * 9 ]=
@ -35,9 +37,10 @@ diff -urNad hplip~/prnt/hpijs/dj660_maps.cpp hplip/prnt/hpijs/dj660_maps.cpp
 2519110233UL, 807846483UL, 391693109UL, 260029471UL, 143570703UL, 42776580UL, 8501760UL, 7782400UL, 6539520UL,
 3072173868UL, 1881129514UL, 841465387UL, 524792087UL, 358391818UL, 174364420UL, 40408577UL, 6920704UL, 6530560UL,
 3407591425UL, 2551891200UL, 1612695808UL, 824489479UL, 506699268UL, 306153730UL, 105283329UL, 5144320UL, 5737216UL,
-diff -urNad hplip~/prnt/hpijs/dj690_maps.cpp hplip/prnt/hpijs/dj690_maps.cpp
--- hplip~/prnt/hpijs/dj690_maps.cpp	2006-03-16 11:12:00.000000000 -0300
-+++ hplip/prnt/hpijs/dj690_maps.cpp	2006-03-16 11:22:28.984082881 -0300
+Index: hplip-3.12.4/prnt/hpijs/dj690_maps.cpp
+===================================================================
+--- hplip-3.12.4.orig/prnt/hpijs/dj690_maps.cpp	2012-04-10 18:39:32.000000000 +1000
+++ hplip-3.12.4/prnt/hpijs/dj690_maps.cpp	2012-05-26 10:21:29.000000000 +1000
@@ -38,7 +38,10 @@
 uint32_t ulMapDJ690_CMYK[ 9 * 9 * 9 ]=
 // DJ690_CMYK
@ -50,9 +53,10 @@ diff -urNad hplip~/prnt/hpijs/dj690_maps.cpp hplip/prnt/hpijs/dj690_maps.cpp
    2179072UL,    2051072UL,    1733120UL, 2013280119UL,  385897321UL,  303379741UL,
  270610688UL,  102772224UL,    1844992UL,    1911552UL,    1847296UL,    1784832UL,
 2080387626UL, 1157643294UL,  452996881UL,  335555072UL,  202384384UL,   50991872UL,
-diff -urNad hplip~/prnt/hpijs/dj895_maps.cpp hplip/prnt/hpijs/dj895_maps.cpp
--- hplip~/prnt/hpijs/dj895_maps.cpp	2006-03-16 11:12:00.000000000 -0300
-+++ hplip/prnt/hpijs/dj895_maps.cpp	2006-03-16 11:22:28.985082758 -0300
+Index: hplip-3.12.4/prnt/hpijs/dj895_maps.cpp
+===================================================================
+--- hplip-3.12.4.orig/prnt/hpijs/dj895_maps.cpp	2012-04-10 18:39:32.000000000 +1000
+++ hplip-3.12.4/prnt/hpijs/dj895_maps.cpp	2012-05-26 10:21:29.000000000 +1000
@@ -37,7 +37,10 @@
 
 uint32_t ulMapDJ895_KCMY[ 9*9*9 ]=
@ -65,9 +69,10 @@ diff -urNad hplip~/prnt/hpijs/dj895_maps.cpp hplip/prnt/hpijs/dj895_maps.cpp
 4230922555UL, 655358293UL, 176553263UL, 128253208UL, 61209869UL, 60751368UL, 26606852UL, 9305345UL, 8650496UL,
 4248940299UL, 3776766759UL, 756415798UL, 308083743UL, 142671120UL, 59440646UL, 9239553UL, 9109248UL, 8779520UL,
 4248086274UL, 4214276619UL, 2786390812UL, 942206231UL, 491516427UL, 224131588UL, 6616320UL, 7399168UL, 7857664UL,
-diff -urNad hplip~/prnt/hpijs/dj895_maps2.cpp hplip/prnt/hpijs/dj895_maps2.cpp
--- hplip~/prnt/hpijs/dj895_maps2.cpp	2006-03-16 11:12:00.000000000 -0300
-+++ hplip/prnt/hpijs/dj895_maps2.cpp	2006-03-16 11:22:28.985082758 -0300
+Index: hplip-3.12.4/prnt/hpijs/dj895_maps2.cpp
+===================================================================
+--- hplip-3.12.4.orig/prnt/hpijs/dj895_maps2.cpp	2012-04-10 18:39:32.000000000 +1000
+++ hplip-3.12.4/prnt/hpijs/dj895_maps2.cpp	2012-05-26 10:21:29.000000000 +1000
@@ -163,7 +163,10 @@
 
 uint32_t ulMapDJ895_Binary_KCMY[ 9*9*9 ]=
@ -80,9 +85,10 @@ diff -urNad hplip~/prnt/hpijs/dj895_maps2.cpp hplip/prnt/hpijs/dj895_maps2.cpp
   60292615UL,   42401028UL,    7601920UL, 4230922301UL,  571406681UL,  160889651UL,
  113048859UL,   62717200UL,   45415944UL,   27917573UL,   10419457UL,    9238272UL,
 4248940557UL, 3743081259UL,  790296119UL,  325515810UL,  127007505UL,   27196678UL,
-diff -urNad hplip~/prnt/hpijs/dj970_maps.cpp hplip/prnt/hpijs/dj970_maps.cpp
--- hplip~/prnt/hpijs/dj970_maps.cpp	2006-03-16 11:12:00.000000000 -0300
-+++ hplip/prnt/hpijs/dj970_maps.cpp	2006-03-16 11:22:28.985082758 -0300
+Index: hplip-3.12.4/prnt/hpijs/dj970_maps.cpp
+===================================================================
+--- hplip-3.12.4.orig/prnt/hpijs/dj970_maps.cpp	2012-04-10 18:39:32.000000000 +1000
+++ hplip-3.12.4/prnt/hpijs/dj970_maps.cpp	2012-05-26 10:21:29.000000000 +1000
@@ -127,7 +127,11 @@
 
 uint32_t ulMapDJ970_KCMY[ 9*9*9 ]=
@ -96,9 +102,10 @@ diff -urNad hplip~/prnt/hpijs/dj970_maps.cpp hplip/prnt/hpijs/dj970_maps.cpp
   10285066UL,   10416133UL,    9169408UL, 3405886809UL,      59743UL,   23980849UL, 
    9366812UL,   10153744UL,   10285066UL,   10153990UL,   10087424UL,    9169408UL, 
 3858807091UL, 2197868343UL,      60220UL,    4714015UL,    7270155UL,    8646656UL, 
-diff -urNad hplip~/prnt/hpijs/dj970_maps3.cpp hplip/prnt/hpijs/dj970_maps3.cpp
--- hplip~/prnt/hpijs/dj970_maps3.cpp	2006-03-16 11:12:00.000000000 -0300
-+++ hplip/prnt/hpijs/dj970_maps3.cpp	2006-03-16 11:22:28.985082758 -0300
+Index: hplip-3.12.4/prnt/hpijs/dj970_maps3.cpp
+===================================================================
+--- hplip-3.12.4.orig/prnt/hpijs/dj970_maps3.cpp	2012-04-10 18:39:32.000000000 +1000
+++ hplip-3.12.4/prnt/hpijs/dj970_maps3.cpp	2012-05-26 10:21:29.000000000 +1000
@@ -37,7 +37,8 @@
 
 uint32_t ulMapDJ970_Draft_KCMY[ 9*9*9 ]=
--- a/10_shebang_fixes.dpatch
+++ b/10_shebang_fixes.dpatch
@ -5,9 +5,10 @@
 ## DP: Fix missing, weird or otherwise broken shebang lines

@DPATCH@
-diff -urNad hplip~/__init__.py hplip/__init__.py
--- hplip~/__init__.py	2007-01-26 12:24:33.000000000 -0200
-+++ hplip/__init__.py	2007-01-26 15:21:09.158181349 -0200
+Index: hplip-3.12.4/__init__.py
+===================================================================
+--- hplip-3.12.4.orig/__init__.py	2012-04-10 18:35:13.000000000 +1000
+++ hplip-3.12.4/__init__.py	2012-05-26 10:21:29.000000000 +1000
@@ -1,3 +1,4 @@
 +#!/usr/bin/env python
 # -*- coding: utf-8 -*-
--- a/14_charsign_fixes.dpatch
+++ b/14_charsign_fixes.dpatch
@ -5,10 +5,11 @@
 ## DP: some missing charsign

@DPATCH@
-diff -urNad hplip-1.7.3~/scan/sane/scl.c hplip-1.7.3/scan/sane/scl.c
--- hplip-1.7.3~/scan/sane/scl.c	2007-03-19 16:26:48.000000000 +0000
-+++ hplip-1.7.3/scan/sane/scl.c	2007-03-26 22:48:39.000000000 +0100
-@@ -36,10 +36,11 @@
+Index: hplip-3.12.4/scan/sane/scl.c
+===================================================================
+--- hplip-3.12.4.orig/scan/sane/scl.c	2012-04-10 18:34:05.000000000 +1000
+++ hplip-3.12.4/scan/sane/scl.c	2012-05-26 10:21:29.000000000 +1000
+@@ -37,10 +37,11 @@
 #define DEBUG_DECLARE_ONLY
 #include "sanei_debug.h"
 
--- a/85_rebuild_python_ui.dpatch
+++ b/85_rebuild_python_ui.dpatch
@ -1,6 +1,27 @@
--- hplip-3.12.6/configure.in.85_rebuild_python_ui	2012-06-18 12:44:24.000000000 +0200
-+++ hplip-3.12.6/configure.in	2012-06-26 18:19:33.461239894 +0200
-@@ -536,6 +536,8 @@ if test "$hpijs_only_build" = "no" && te
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 85_rebuild_python_ui.dpatch by  <till.kamppeter@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -3,6 +3,11 @@
+ #
+ #  (c) 2004-2015 Copyright Hewlett-Packard Development Company, LP
+ #  Author: David Suffield, Naga Samrat Chowdary Narla, Sarbeswar Meher
+
+# Generic rules
+%.py: %.ui
+	$(PYUIC4) -x -o $@ $<
+
+ INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/
+ CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
+ CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
+--- a/configure.in
+++ b/configure.in
+@@ -536,6 +536,8 @@
    AC_MSG_RESULT("using $PYTHONINCLUDEDIR")
    AC_ARG_VAR(PYTHONINCLUDEDIR, [path to Python.h C header file])
    AC_CHECK_HEADERS(python$PYTHON_VERSION/Python.h, ,[AC_MSG_ERROR([cannot find python-devel support], 6)])
@ -9,16 +30,3 @@
 fi
 
 if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then
--- hplip-3.12.6/Makefile.am.85_rebuild_python_ui	2012-06-26 18:19:33.000000000 +0200
-+++ hplip-3.12.6/Makefile.am	2012-06-26 18:20:26.406237403 +0200
-@@ -4,6 +4,10 @@
- #  (c) 2004-2015 Copyright Hewlett-Packard Development Company, LP
- #  Author: David Suffield, Naga Samrat Chowdary Narla, Sarbeswar Meher
- 
-+# Generic rules
-+%.py: %.ui
-+	$(PYUIC4) -x -o $@ $<
-+
- INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs
- 
- hplipdir = $(datadir)/hplip
--- a/87_move_documentation.dpatch
+++ b/87_move_documentation.dpatch
@ -1,6 +1,13 @@
--- hplip-3.12.6/Makefile.am.87_move_documentation	2012-06-26 18:20:47.000000000 +0200
-+++ hplip-3.12.6/Makefile.am	2012-06-26 18:21:22.582234758 +0200
-@@ -27,11 +27,11 @@ include cups_drv.inc
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 87_move_documentation.dpatch by  <till.kamppeter@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: place html documentation under hplip-doc/HTML/
+
+@DPATCH@
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -29,11 +29,11 @@
 
 if DOC_BUILD
 wwwsrc = doc
--- a/add-lidil-two-cartridge-modes.dpatch
+++ b/add-lidil-two-cartridge-modes.dpatch
@ -5,10 +5,11 @@
 ## DP: No description.

@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.10.6~/prnt/drv/hpijs.drv.in hplip-3.10.6/prnt/drv/hpijs.drv.in
--- hplip-3.10.6~/prnt/drv/hpijs.drv.in	2010-09-14 16:08:45.936316029 +0200
-+++ hplip-3.10.6/prnt/drv/hpijs.drv.in	2010-09-14 16:08:46.506315314 +0200
-@@ -4411,16 +4411,16 @@
+Index: hplip-3.12.4/prnt/drv/hpijs.drv.in
+===================================================================
+--- hplip-3.12.4.orig/prnt/drv/hpijs.drv.in	2012-05-26 10:21:29.000000000 +1000
+++ hplip-3.12.4/prnt/drv/hpijs.drv.in	2012-05-26 10:21:29.000000000 +1000
+@@ -4376,16 +4376,16 @@
 r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3320&quot;"
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
@ -29,7 +30,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
   Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A"
   Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&&
 dDEVICEHEIGHTPOINTS=792"
-@@ -4879,13 +4879,13 @@
+@@ -4844,13 +4844,13 @@
 r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3600&quot;"
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
@ -46,7 +47,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
 eK"
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&
-@@ -5347,13 +5347,13 @@
+@@ -5312,13 +5312,13 @@
 "
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftColorCM&&
@ -63,9 +64,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
 eK"
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.10.6~/prnt/drv/hpijs.drv.in.template hplip-3.10.6/prnt/drv/hpijs.drv.in.template
--- hplip-3.10.6~/prnt/drv/hpijs.drv.in.template	2010-07-19 04:15:11.000000000 +0200
-+++ hplip-3.10.6/prnt/drv/hpijs.drv.in.template	2010-09-14 16:08:57.346301718 +0200
+Index: hplip-3.12.4/prnt/drv/hpijs.drv.in.template
+===================================================================
+--- hplip-3.12.4.orig/prnt/drv/hpijs.drv.in.template	2012-04-10 18:32:37.000000000 +1000
+++ hplip-3.12.4/prnt/drv/hpijs.drv.in.template	2012-05-26 10:21:29.000000000 +1000
@@ -2221,16 +2221,16 @@
 r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3320&quot;"
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
--- a/hp-check-groups.dpatch
+++ b/hp-check-groups.dpatch
@ -1,19 +1,19 @@
--- hplip-3.12.6/check.py.hp-check-groups	2012-06-18 12:44:13.000000000 +0200
-+++ hplip-3.12.6/check.py	2012-06-26 18:24:26.417226100 +0200
-@@ -918,6 +918,16 @@ try:
-                 if disable_selinux == False:
-                     log.info("%-15s %-15s %-10s %-3s %-3s %-8s %s"\
-                                               %("SELinux",  "disabled", "Optional", "-", "-", "OK", "-"))
+--- hplip-3.13.2/check.py.hp-check-groups	2013-02-15 21:34:56.655478959 +0100
+++ hplip-3.13.2/check.py	2013-02-15 21:37:18.924786671 +0100
+@@ -746,6 +746,16 @@ class DependenciesCheck(CoreInstall):
+                         log.info("%-15s %-15s %-10s %-3s %-3s %-8s %s"\
+                                                   %("SELinux",  "disabled", "Optional", "-", "-", "OK", "-"))
+ 
+            if "lp " in output:
+                log.info(log.green("User member of group 'lp'. Enables print/ scan/ fax."))
+            else:
+                log.error("User needs to be member of group 'lp' to enable print, scan & fax.")
 +
-+        if "lp " in output:
-+            log.info(log.green("User member of group 'lp'. Enables print/ scan/ fax."))
-+        else:
-+            log.error("User needs to be member of group 'lp' to enable print, scan & fax.")
+            if "lpadmin" in output:
+                log.info(log.green("User member of group 'lpadmin'."))
+            else:
+                log.error("User needs to be member of group 'lpadmin' to manage printers.")
 +
-+        if "lpadmin" in output:
-+            log.info(log.green("User member of group 'lpadmin'."))
-+        else:
-+            log.error("User needs to be member of group 'lpadmin' to manage printers.")
-                                               
-         package_mgr_cmd = core.get_distro_data('package_mgr_cmd')
-         pre_depend_cmd  = core.get_distro_data('pre_depend_cmd')
+             self.smart_install_devices = smart_install.get_smartinstall_enabled_devices()
+             if len(self.smart_install_devices):
+                 tui.header("'CD-ROM'/'Smart Install' Detected Devices")
--- a/hp-check_debian.dpatch
+++ b/hp-check_debian.dpatch
@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## hp-check_debian.dpatch by  <msp@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debian/ Ubuntu place hpaio in /etc/sane.d/dll.d/hplip, so lets check there too
-
-@DPATCH@
-diff -urNad hplip-2.8.12~/check.py hplip-2.8.12/check.py
--- hplip-2.8.12~/check.py	2008-12-18 07:41:18.000000000 +1100
-+++ hplip-2.8.12/check.py	2009-01-22 14:01:40.000000000 +1100
-@@ -693,6 +693,21 @@
-                     if 'hpaio' in line:
-                         found = True
- 
-+		# Debian/ Ubuntu place hpaio in /etc/sane.d/dll.d/hplip, so lets check there too
-+
-+		if not found:
-+		    log.info(log.bold("'hpaio' in '/etc/sane.d/dll.d/hplip'..."))
-+		    try:
-+                       f = file('/etc/sane.d/dll.d/hplip', 'r')
-+                    except IOError:
-+                       log.error("'/etc/sane.d/dll.d/hplip' not found.")
-+                       num_errors += 1
-+                    else:
-+                        found = False
-+                        for line in f:
-+                            if 'hpaio' in line:
-+                                found = True
-+
-                 if found:
-                     log.info("OK, found. SANE backend 'hpaio' is properly set up.")
-                 else:
--- a/hp-mkuri-take-into-account-already-installed-plugin-also-for-exit-value.dpatch
+++ b/hp-mkuri-take-into-account-already-installed-plugin-also-for-exit-value.dpatch
@ -5,9 +5,10 @@
 ## DP: No description.

@DPATCH@
-diff -urNad hplip-3.10.2~/io/hpmud/hp-mkuri.c hplip-3.10.2/io/hpmud/hp-mkuri.c
--- hplip-3.10.2~/io/hpmud/hp-mkuri.c	2010-03-17 22:42:56.682033355 +0100
-+++ hplip-3.10.2/io/hpmud/hp-mkuri.c	2010-03-17 22:45:36.370765292 +0100
+Index: hplip-3.12.4/io/hpmud/hp-mkuri.c
+===================================================================
+--- hplip-3.12.4.orig/io/hpmud/hp-mkuri.c	2012-04-10 18:35:06.000000000 +1000
+++ hplip-3.12.4/io/hpmud/hp-mkuri.c	2012-05-26 10:23:52.000000000 +1000
@@ -385,17 +385,23 @@
    }
 
--- a/hp-setup-prompt-for-custom-PPD.dpatch
+++ b/hp-setup-prompt-for-custom-PPD.dpatch
@ -5,10 +5,11 @@
 ## DP: No description.

@DPATCH@
-diff -urNad hplip-3.9.8~/setup.py hplip-3.9.8/setup.py
--- hplip-3.9.8~/setup.py	2009-08-04 23:37:39.000000000 +0200
-+++ hplip-3.9.8/setup.py	2009-10-02 18:42:39.000000000 +0200
-@@ -473,14 +473,13 @@
+Index: hplip-3.12.4/setup.py
+===================================================================
+--- hplip-3.12.4.orig/setup.py	2012-04-10 18:35:14.000000000 +1000
+++ hplip-3.12.4/setup.py	2012-05-26 10:21:29.000000000 +1000
+@@ -487,14 +487,13 @@
                 print_ppd, desc = print_ppd
                 log.info("\nFound PPD file: %s" % print_ppd)
 
--- a/hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.dpatch
+++ b/hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.dpatch
@ -5,10 +5,9 @@
 ## DP: No description.

@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.11.7~/ui4/systemtray.py hplip-3.11.7/ui4/systemtray.py
--- hplip-3.11.7~/ui4/systemtray.py	2011-09-27 16:36:29.656301152 +0200
-+++ hplip-3.11.7/ui4/systemtray.py	2011-09-27 16:38:47.716834875 +0200
-@@ -473,6 +473,9 @@
+--- a/ui4/systemtray.py
+++ b/ui4/systemtray.py
+@@ -550,6 +550,9 @@
 
         elif reason == QSystemTrayIcon.Trigger:
             #print "single click"
--- a/hp-systray-make-menu-title-visible-in-sni-qt-indicator.dpatch
+++ b/hp-systray-make-menu-title-visible-in-sni-qt-indicator.dpatch
@ -5,10 +5,9 @@
 ## DP: No description.

@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.11.7~/ui4/systemtray.py hplip-3.11.7/ui4/systemtray.py
--- hplip-3.11.7~/ui4/systemtray.py	2011-09-27 16:29:05.930588497 +0200
-+++ hplip-3.11.7/ui4/systemtray.py	2011-09-27 16:34:42.891888674 +0200
-@@ -348,29 +348,11 @@
+--- a/ui4/systemtray.py
+++ b/ui4/systemtray.py
+@@ -418,29 +418,11 @@
     def setMenu(self):
         self.menu = QMenu()
 
--- a/hpcups-update-ppds.sh
+++ b/hpcups-update-ppds.sh
--- a/hpfax-bug-function-used-before-importing-log.dpatch
+++ b/hpfax-bug-function-used-before-importing-log.dpatch
@ -5,9 +5,10 @@
 ## DP: No description.

@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.11.7~/fax/backend/hpfax.py hplip-3.11.7/fax/backend/hpfax.py
--- hplip-3.11.7~/fax/backend/hpfax.py	2011-07-24 21:06:43.000000000 +0200
-+++ hplip-3.11.7/fax/backend/hpfax.py	2011-09-23 10:53:26.338256601 +0200
+Index: hplip-3.12.4/fax/backend/hpfax.py
+===================================================================
+--- hplip-3.12.4.orig/fax/backend/hpfax.py	2012-04-10 18:34:59.000000000 +1000
+++ hplip-3.12.4/fax/backend/hpfax.py	2012-05-26 10:21:30.000000000 +1000
@@ -52,7 +52,10 @@
 
 def bug(msg):
--- a/hplip-3.12.9-CVE-2013-0200.patch
+++ b/hplip-3.12.9-CVE-2013-0200.patch
@ -1,90 +0,0 @@
--- hplip-3.12.9/prnt/hpcups/HPCupsFilter.cpp~	2013-02-21 17:11:06.356373425 -0500
-+++ hplip-3.12.9/prnt/hpcups/HPCupsFilter.cpp	2013-02-21 17:17:44.826579491 -0500
-@@ -649,20 +649,23 @@ int HPCupsFilter::processRasterData(cups
-         {
-             char    szFileName[64];
-             memset(szFileName, 0, sizeof(szFileName));
-            snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterc_%d.bmp", current_page_number);
-+            snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterc_%d.bmp.XXXXXX", current_page_number);
- 
-             if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
-                 cups_header.cupsColorSpace == CUPS_CSPACE_RGB)
-             {
-                cfp = fopen (szFileName, "w");
-                chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-+	        int fd = mkstemp (szFileName);
-+                if (fd != -1)
-+		    cfp = fdopen(fd, "w");
-             }
-             if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
-                 cups_header.cupsColorSpace == CUPS_CSPACE_K)
-             {
-                szFileName[17] = 'k';
-                kfp = fopen (szFileName, "w");
-                chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-+                int fd;
-+		snprintf (szFileName, sizeof(szFileName), "/tmp/hpcupsfilterk_%d.bmp.XXXXXX", current_page_number);
-+                fd = mkstemp (szFileName);
-+                if (fd != -1)
-+		    kfp = fdopen(fd, "w");
-             }
- 
-             WriteBMPHeader (cfp, cups_header.cupsWidth, cups_header.cupsHeight, COLOR_RASTER);
--- hplip-3.12.9/prnt/hpcups/SystemServices.cpp~	2012-09-04 08:31:10.000000000 -0400
-+++ hplip-3.12.9/prnt/hpcups/SystemServices.cpp	2013-02-21 17:20:58.096677737 -0500
-@@ -36,10 +36,12 @@ SystemServices::SystemServices(int iLogL
-     m_fp = NULL;
-     if (iLogLevel & SAVE_PCL_FILE)
-     {
-+        int     fd;
-         char    fname[64];
-	sprintf(fname, "%s/hpcups_job%d.out", "/var/log/hp/tmp",job_id);
-        m_fp = fopen(fname, "w");
-        chmod(fname, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-+	sprintf(fname, "%s/hpcups_job%d.out.XXXXXX", "/var/log/hp/tmp",job_id);
-+	fd = mkstemp (fname);
-+	if (fd != -1)
-+	    m_fp = fdopen(fd, "w");
-     }
- }
- 
--- hplip-3.12.9/prnt/hpijs/hpijs.cpp~	2013-02-21 17:11:06.356373425 -0500
-+++ hplip-3.12.9/prnt/hpijs/hpijs.cpp	2013-02-21 17:23:08.696743534 -0500
-@@ -96,14 +96,12 @@ void setLogLevel(UXServices *pSS)
- 
-     if (pSS->m_iLogLevel & SAVE_PCL_FILE)
-     {
-+        int     fd;
-         char    szFileName[64];
-	snprintf (szFileName,sizeof(szFileName), "/var/log/hp/tmp/hpijs_%d.out", getpid());
-
-	pSS->outfp = fopen (szFileName, "w");
-	if (pSS->outfp)
-	{
-	    chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-	}
-+	snprintf (szFileName,sizeof(szFileName), "/var/log/hp/tmp/hpijs_%d.out.XXXXXX", getpid());
-+	fd = mkstemp (szFileName);
-+	if (fd != -1)
-+	    pSS->outfp = fdopen (fd, "w");
-     }
- }
- 
--- hplip-3.12.9/prnt/hpps/hppsfilter.c~	2012-09-04 08:31:10.000000000 -0400
-+++ hplip-3.12.9/prnt/hpps/hppsfilter.c	2013-02-21 17:25:50.566824441 -0500
-@@ -93,10 +93,12 @@ void open_dbg_outfile(char* szjob_id)
-     g_fp_outdbgps = NULL;
-     if (g_savepsfile & SAVE_PS_FILE)
-     {
-+        int     fd;
-         char    sfile_name[FILE_NAME_SIZE] = {0};
-	sprintf(sfile_name, "%s/%s_%d.out",DBG_TMP_FOLDER,DBG_PSFILE, szjob_id);
-        g_fp_outdbgps= fopen(sfile_name, "w");
-        chmod(sfile_name, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-+	sprintf(sfile_name, "%s/%s_%d.out.XXXXXX",DBG_TMP_FOLDER,DBG_PSFILE, szjob_id);
-+	fd = mkstemp (sfile_name);
-+	if (fd != -1)
-+	    g_fp_outdbgps= fdopen(fd, "w");
-     }
- }
- 
--- a/hplip-3.12.9-makefile-chgrp.patch
+++ b/hplip-3.12.9-makefile-chgrp.patch
@ -1,52 +0,0 @@
--- hplip-3.12.9/Makefile.am.chgrp	2012-09-11 17:10:08.359579504 +0200
-+++ hplip-3.12.9/Makefile.am	2012-09-11 17:10:25.370821335 +0200
-@@ -552,24 +552,20 @@ endif
- install-dist_hplip_LogDATA:
- if FULL_BUILD
- 	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
- 	chmod 774 $(DESTDIR)$(hplip_Logdir)
- endif	#FULL_BUILD
- if HPLIP_BUILD
- 	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
- 	chmod 774 $(DESTDIR)$(hplip_Logdir)
- endif	#FULL_BUILD
- 
- install-dist_hplip_tmpDATA:
- if FULL_BUILD
- 	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
- 	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
- endif	#FULL_BUILD
- if HPLIP_BUILD
- 	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
- 	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
- endif	#FULL_BUILD
- 
--- hplip-3.12.9/Makefile.in.chgrp	2012-09-04 14:35:24.000000000 +0200
-+++ hplip-3.12.9/Makefile.in	2012-09-11 17:09:13.179795069 +0200
-@@ -8841,18 +8841,18 @@ uninstall-am: uninstall-binPROGRAMS unin
- 
- install-dist_hplip_LogDATA:
- @FULL_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-@FULL_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
-+#@FULL_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
- @FULL_BUILD_TRUE@	chmod 774 $(DESTDIR)$(hplip_Logdir)
- @HPLIP_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-@HPLIP_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
-+#@HPLIP_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
- @HPLIP_BUILD_TRUE@	chmod 774 $(DESTDIR)$(hplip_Logdir)
- 
- install-dist_hplip_tmpDATA:
- @FULL_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-@FULL_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
-+#@FULL_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
- @FULL_BUILD_TRUE@	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
- @HPLIP_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-@HPLIP_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
-+#@HPLIP_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
- @HPLIP_BUILD_TRUE@	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
- 
- install-dist_cronDATA:$(dist_cron_DATA)
--- a/hplip-IEEE-1284-4.patch
+++ b/hplip-IEEE-1284-4.patch
@ -0,0 +1,23 @@
+diff -up hplip-3.12.11/io/hpmud/musb.c.hplip-IEEE-1284-4 hplip-3.12.11/io/hpmud/musb.c
+--- hplip-3.12.11/io/hpmud/musb.c.hplip-IEEE-1284-4	2012-11-20 10:55:09.000000000 +0100
+++ hplip-3.12.11/io/hpmud/musb.c	2012-11-27 11:49:16.633107366 +0100
+@@ -712,7 +712,8 @@ static libusb_device *get_libusb_device(
+ 				{
+ 					if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */
+ 							(altptr->bInterfaceSubClass == 1) &&
+-							(altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2)) /* Unidirectional or Bidirectional*/
+							(altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2
+							|| altptr->bInterfaceProtocol == 3)) /* Unidirectional, Bidirectional or 1284.4 */
+ 					{
+ 						if (is_uri(dev, uri))
+ 						{
+@@ -2065,7 +2066,8 @@ int __attribute__ ((visibility ("hidden"
+ 				{
+ 					if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */
+ 							(altptr->bInterfaceSubClass == 1) &&
+-							(altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2)) /* Unidirectional or Bidirectional*/
+							(altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2
+							|| altptr->bInterfaceProtocol == 3)) /* Unidirectional, Bidirectional or 1284.4 */
+ 					{
+ 						libusb_open(dev, &hd);
+ 						if (hd == NULL)
--- a/hplip-apply-udev-rules-on-action-change.patch
+++ b/hplip-apply-udev-rules-on-action-change.patch
@ -1,50 +1,22 @@
-Index: hplip-3.12.6/data/rules/40-hplip.rules
-===================================================================
--- hplip-3.12.6/data/rules/40-hplip.rules
-+++ hplip-3.12.6/data/rules/40-hplip.rules	2012-09-19 22:33:00.601844136 +0200
-@@ -4,7 +4,7 @@
- # For older distros that use HAL ACL support use the 55-hpmud.rules. 
- #
- 
-ACTION!="add", GOTO="hpmud_rules_end"
-+ACTION=="remove", GOTO="hpmud_rules_end"
- SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test"
- SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
- 
-Index: hplip-3.12.6/data/rules/55-hpmud.rules
-===================================================================
--- hplip-3.12.6/data/rules/55-hpmud.rules
-+++ hplip-3.12.6/data/rules/55-hpmud.rules	2012-09-19 22:33:00.601844136 +0200
-@@ -13,7 +13,7 @@
- #      changes are not distro specific please send your patch to us. 2/11/2009, D Suffield
- #
- 
-ACTION!="add", GOTO="hpmud_rules_end"
-+ACTION=="remove", GOTO="hpmud_rules_end"
- SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0660"
- SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hplip_pid_test"
- SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
-Index: hplip-3.12.6/data/rules/56-hpmud_support.rules
-===================================================================
--- hplip-3.12.6/data/rules/56-hpmud_support.rules
-+++ hplip-3.12.6/data/rules/56-hpmud_support.rules	2012-09-19 22:33:00.601844136 +0200
+diff -Naur hplip-3.13.8/data/rules/56-hpmud.rules hplip-3.13.8.tpg/data/rules/56-hpmud.rules
+--- hplip-3.13.8/data/rules/56-hpmud.rules	2013-08-07 06:02:33.000000000 +0000
+++ hplip-3.13.8.tpg/data/rules/56-hpmud.rules	2013-08-19 11:24:05.938453838 +0000
@@ -1,6 +1,6 @@
 # HPLIP udev rules file. Notify console user if plugin support is required for this device.
 
 -ACTION!="add", GOTO="hpmud_rules_end"
-+ACTION=="remove", GOTO="hpmud_rules_end"
- SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test"
- SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
+ACTION="remove", GOTO="hpmud_rules_end"
+ SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0660"
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_usb_rules"
 
-Index: hplip-3.12.6/data/rules/86-hpmud_plugin.rules
-===================================================================
--- hplip-3.12.6/data/rules/86-hpmud_plugin.rules
-+++ hplip-3.12.6/data/rules/86-hpmud_plugin.rules	2012-09-19 22:33:00.601844136 +0200
+diff -Naur hplip-3.13.8/data/rules/56-hpmud_sysfs.rules hplip-3.13.8.tpg/data/rules/56-hpmud_sysfs.rules
+--- hplip-3.13.8/data/rules/56-hpmud_sysfs.rules	2013-08-07 06:02:33.000000000 +0000
+++ hplip-3.13.8.tpg/data/rules/56-hpmud_sysfs.rules	2013-08-19 11:23:51.843080742 +0000
@@ -1,6 +1,6 @@
- # Load hp firmware for this printer.
+ # HPLIP udev rules file. Notify console user if plugin support is required for this device.
 
 -ACTION!="add", GOTO="hpmud_rules_end"
-+ACTION=="change", GOTO="hpmud_rules_end"
+ACTION="remove", GOTO="hpmud_rules_end"
+ SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0660"
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_usb_rules"
 
- #Check and add printer for Suse 10.3 distro
- # hp_Marvel_Device (These printer requires the plugin files. installling when device is detected)
--- a/hplip-check.patch
+++ b/hplip-check.patch
@ -0,0 +1,41 @@
+diff -up hplip-3.12.10a/check.py.check hplip-3.12.10a/check.py
+diff -up hplip-3.12.10a/installer/core_install.py.check hplip-3.12.10a/installer/core_install.py
+--- hplip-3.12.10a/installer/core_install.py.check	2012-11-22 13:22:58.527444444 +0000
+++ hplip-3.12.10a/installer/core_install.py	2012-11-22 13:27:11.319338942 +0000
+@@ -1153,18 +1153,24 @@ class CoreInstall(object):
+ 
+     def check_hpaio(self):
+         found = False
+-        log.debug("'Checking for hpaio' in '/etc/sane.d/dll.conf'...")
+-        try:
+-            f = file('/etc/sane.d/dll.conf', 'r')
+-        except IOError:
+-            log.error("'/etc/sane.d/dll.conf' not found. Is SANE installed?")
+-        else:
+-            for line in f:
+-                lineNoSpace = re.sub(r'\s', '', line) 
+-                hpaiomatched=re.match('hpaio',lineNoSpace)
+-                if hpaiomatched:
+-                    found = True
+-                    break
+        for path in ['/etc/sane.d/dll.conf',
+                     '/etc/sane.d/dll.d/hpaio']:
+            log.debug("'Checking for hpaio' in '%s'..." % path)
+            try:
+                f = file(path, 'r')
+            except IOError:
+                log.error("'%s' not found. Is SANE installed?" % path)
+            else:
+                for line in f:
+                    lineNoSpace = re.sub(r'\s', '', line) 
+                    hpaiomatched=re.match('hpaio',lineNoSpace)
+                    if hpaiomatched:
+                        found = True
+                        break
+
+            if found:
+                break
+
+         return found
+ 
+     def update_hpaio(self):
--- a/hplip-dbglog-newline.patch
+++ b/hplip-dbglog-newline.patch
@ -1,5 +1,6 @@
--- hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline	2012-06-26 18:16:45.000000000 +0200
-+++ hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp	2012-06-26 18:18:22.244243250 +0200
+diff -up hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline	2012-06-19 11:01:38.000000000 +0200
+++ hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp	2012-06-19 11:02:52.150529477 +0200
@@ -440,7 +440,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
             m_DBusComm.sendEvent(EVENT_PRINT_FAILED_MISSING_PLUGIN, "Plugin missing", m_JA.job_id, m_JA.user_name);
 
@ -9,7 +10,7 @@
         ppdClose(m_ppd);
         m_ppd = NULL;
         return err;
-@@ -534,7 +534,7 @@ int HPCupsFilter::StartPrintJob(int  arg
+@@ -533,7 +533,7 @@ int HPCupsFilter::StartPrintJob(int  arg
             close(fd);
         }
         if (m_iLogLevel & BASIC_LOG)
@ -18,7 +19,7 @@
         closeFilter();
         cupsRasterClose(cups_raster);
         return 1;
-@@ -544,7 +544,7 @@ int HPCupsFilter::StartPrintJob(int  arg
+@@ -543,7 +543,7 @@ int HPCupsFilter::StartPrintJob(int  arg
         close(fd);
     }
     if (m_iLogLevel & BASIC_LOG)
@ -27,7 +28,7 @@
     closeFilter();
     cupsRasterClose(cups_raster);
     return 0;
-@@ -679,7 +679,7 @@ int HPCupsFilter::processRasterData(cups
+@@ -678,7 +678,7 @@ int HPCupsFilter::processRasterData(cups
 				//Need to revisit to crosscheck if it is a firmware issue.
 				
 				*m_pPrinterBuffer = 0x01;  
@ -36,8 +37,9 @@
 			}
 			
             if (this->isBlankRaster((BYTE *) m_pPrinterBuffer, &cups_header)) {
+diff -up hplip-3.12.6/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Lidil.cpp
 --- hplip-3.12.6/prnt/hpcups/Lidil.cpp.dbglog-newline	2012-06-18 12:40:17.000000000 +0200
-+++ hplip-3.12.6/prnt/hpcups/Lidil.cpp	2012-06-26 18:16:45.945247783 +0200
+++ hplip-3.12.6/prnt/hpcups/Lidil.cpp	2012-06-19 11:01:39.598521705 +0200
@@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline *
     if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
         m_pPM->BaseResY != m_pQA->vertical_resolution)
@ -92,8 +94,9 @@
     return false;
 }
 
+diff -up hplip-3.12.6/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Pcl3.cpp
 --- hplip-3.12.6/prnt/hpcups/Pcl3.cpp.dbglog-newline	2012-06-18 12:40:17.000000000 +0200
-+++ hplip-3.12.6/prnt/hpcups/Pcl3.cpp	2012-06-26 18:16:45.945247783 +0200
+++ hplip-3.12.6/prnt/hpcups/Pcl3.cpp	2012-06-19 11:01:39.599521691 +0200
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline **
 
     if (!selectPrintMode())
@ -137,8 +140,9 @@
     return false;
 }
 
+diff -up hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp
 --- hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline	2012-06-18 12:40:17.000000000 +0200
-+++ hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp	2012-06-26 18:16:45.946247783 +0200
+++ hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp	2012-06-19 11:01:39.599521691 +0200
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline
 
     if (!selectPrintMode())
--- a/hplip-fax-ppd.patch
+++ b/hplip-fax-ppd.patch
@ -1,24 +0,0 @@
-diff -up hplip-3.11.1/ui/setupform.py.fax-ppd hplip-3.11.1/ui/setupform.py
--- hplip-3.11.1/ui/setupform.py.fax-ppd	2011-01-19 06:18:26.000000000 +0100
-+++ hplip-3.11.1/ui/setupform.py	2011-01-24 12:00:48.000000000 +0100
-@@ -886,16 +886,16 @@ class SetupForm(SetupForm_base):
-         QApplication.setOverrideCursor(QApplication.waitCursor)
- 
-         if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_MARVELL:
-            fax_ppd_name = "HP-Fax3-hplip" # Fixed width (2528 pixels) and 300dpi rendering
-+            fax_ppd_name = "HP-Fax3-hpcups" # Fixed width (2528 pixels) and 300dpi rendering
-             nick = "HP Fax 3"
-         if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP or self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_LEDMSOAP:
-            fax_ppd_name = "HP-Fax2-hplip" # Fixed width (2528 pixels) and 300dpi rendering
-+            fax_ppd_name = "HP-Fax2-hpcups" # Fixed width (2528 pixels) and 300dpi rendering
-             nick = "HP Fax 2"
-         if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_LEDM:
-            fax_ppd_name = "HP-Fax4-hplip" # Fixed width (1728 pixels) and 200dpi rendering
-+            fax_ppd_name = "HP-Fax4-hpcups" # Fixed width (1728 pixels) and 200dpi rendering
-             nick = "HP Fax 4"
-         else:
-            fax_ppd_name = "HP-Fax-hplip" # Standard
-+            fax_ppd_name = "HP-Fax-hpcups" # Standard
-             nick = "HP Fax"
- 
-         ppds = []
--- a/hplip-hpcups-sigpipe.patch
+++ b/hplip-hpcups-sigpipe.patch
@ -1,6 +1,5 @@
-diff -up hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe hplip-3.9.8/prnt/hpijs/services.cpp
--- hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe	2009-08-04 22:35:41.000000000 +0100
-+++ hplip-3.9.8/prnt/hpijs/services.cpp	2009-10-29 11:56:23.015022337 +0000
+--- hplip-3.13.8/prnt/hpijs/services.cpp	2013-08-07 05:59:17.000000000 +0000
+++ hplip-3.13.8/prnt/hpijs/services.cpp.tpg	2013-08-19 11:57:23.889340643 +0000
@@ -29,6 +29,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 \*****************************************************************************/
@ -9,7 +8,7 @@ diff -up hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe hplip-3.9.8/prnt/hpi
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
-@@ -382,8 +383,16 @@ DRIVER_ERROR UXServices::ToDevice(const 
+@@ -385,8 +386,16 @@
    if (write(OutputPath, pBuffer, *Count) != (ssize_t)*Count) 
    {
       static int cnt=0;
--- a/hplip-ipp-accessors.patch
+++ b/hplip-ipp-accessors.patch
@ -0,0 +1,392 @@
+diff -up hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors hplip-3.12.6/prnt/cupsext/cupsext.c
+--- hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors	2012-06-18 12:41:19.000000000 +0200
+++ hplip-3.12.6/prnt/cupsext/cupsext.c	2012-07-19 17:11:47.606524137 +0200
+@@ -87,6 +87,46 @@ typedef int Py_ssize_t;
+ #define PY_SSIZE_T_MIN INT_MIN
+ #endif
+ 
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetCount(attr)     attr->num_values
+#define ippGetGroupTag(attr)  attr->group_tag
+#define ippGetValueTag(attr)  attr->value_tag
+#define ippGetName(attr)      attr->name
+#define ippGetBoolean(attr, element) attr->values[element].boolean
+#define ippGetInteger(attr, element) attr->values[element].integer
+#define ippGetStatusCode(ipp) ipp->request.status.status_code
+#define ippGetString(attr, element, language) attr->values[element].string.text
+
+static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
+{
+    if (!ipp)
+        return (NULL);
+    return (ipp->current = ipp->attrs);
+}
+
+static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
+{
+    if (!ipp || !ipp->current)
+        return (NULL);
+    return (ipp->current = ipp->current->next);
+}
+
+static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
+{
+    ipp->request.op.operation_id = op;
+    return (1);
+}
+
+static int ippSetRequestId( ipp_t *ipp, int request_id )
+{
+    ipp->request.any.request_id = request_id;
+    return (1);
+}
+#endif
+ 
+ int g_num_options = 0;
+ cups_option_t * g_options;
+@@ -333,8 +373,8 @@ PyObject * getPrinters( PyObject * self,
+     request = ippNew();
+     language = cupsLangDefault();
+ 
+-    request->request.op.operation_id = CUPS_GET_PRINTERS;
+-    request->request.any.request_id = 1;
+    ippSetOperation( request, CUPS_GET_PRINTERS );
+    ippSetRequestId ( request, 1);
+ 
+     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                   "attributes-charset", NULL, cupsLangEncoding( language ) );
+@@ -378,10 +418,10 @@ PyObject * getPrinters( PyObject * self,
+         ipp_pstate_t state;
+         int i = 0;
+ 
+-        for ( attr = response->attrs; attr != NULL; attr = attr->next )
+        for ( attr = ippFirstAttribute( response ); attr != NULL; attr = ippNextAttribute( response ) )
+         {
+-            while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER )
+-                attr = attr->next;
+            while ( attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER )
+                attr = ippNextAttribute( response );
+ 
+             if ( attr == NULL )
+                 break;
+@@ -390,41 +430,41 @@ PyObject * getPrinters( PyObject * self,
+             state = IPP_PRINTER_IDLE;
+             accepting = 0;
+ 
+-            while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER )
+            while ( attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER )
+             {
+-                if ( strcmp( attr->name, "printer-name" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_NAME )
+-                    name = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "device-uri" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_URI )
+-                    device_uri = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_URI )
+-                    printer_uri = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-info" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    info = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-location" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    location = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    make_model = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-state" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_ENUM )
+-                    state = ( ipp_pstate_t ) attr->values[ 0 ].integer;
+-
+-                else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
+-                        attr->value_tag == IPP_TAG_BOOLEAN)
+-                    accepting = attr->values[ 0 ].boolean;
+                if ( strcmp( ippGetName( attr ), "printer-name" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_NAME )
+                    name = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "device-uri" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_URI )
+                    device_uri = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "printer-uri-supported" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_URI )
+                    printer_uri = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "printer-info" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
+                    info = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "printer-location" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
+                    location = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "printer-make-and-model" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
+                    make_model = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "printer-state" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_ENUM )
+                    state = ( ipp_pstate_t ) ippGetInteger( attr, 0 );
+
+                else if (!strcmp(ippGetName( attr ), "printer-is-accepting-jobs") &&
+                        ippGetValueTag( attr ) == IPP_TAG_BOOLEAN)
+                    accepting = ippGetBoolean( attr, 0 );
+ 
+-                attr = attr->next;
+                attr = ippNextAttribute( response );
+             }
+ 
+             if ( device_uri == NULL )
+@@ -522,8 +562,8 @@ PyObject * addPrinter( PyObject * self,
+     request = ippNew();
+     language = cupsLangDefault();
+ 
+-    request->request.op.operation_id = CUPS_ADD_PRINTER;
+-    request->request.any.request_id = 1;
+    ippSetOperation( request, CUPS_ADD_PRINTER );
+    ippSetRequestId ( request, 1 );
+ 
+     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                   "attributes-charset", NULL, cupsLangEncoding( language ) );
+@@ -568,7 +608,7 @@ PyObject * addPrinter( PyObject * self,
+     }
+     else
+     {
+-        status = response->request.status.status_code;
+        status = ippGetStatusCode( response );
+         //ippDelete( response );
+         r = 1;
+     }
+@@ -631,8 +671,8 @@ PyObject * delPrinter( PyObject * self,
+        */
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_DELETE_PRINTER;
+-    request->request.op.request_id = 1;
+    ippSetOperation( request, CUPS_DELETE_PRINTER );
+    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -650,7 +690,7 @@ PyObject * delPrinter( PyObject * self,
+      */
+     response = cupsDoRequest( http, request, "/admin/" );
+ 
+-    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
+    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
+     {
+         r = 1;
+     }
+@@ -721,8 +761,8 @@ PyObject * setDefaultPrinter( PyObject *
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_SET_DEFAULT;
+-    request->request.op.request_id = 1;
+    ippSetOperation( request, CUPS_SET_DEFAULT );
+    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -743,7 +783,7 @@ PyObject * setDefaultPrinter( PyObject *
+ 
+     response = cupsDoRequest( http, request, "/admin/" );
+ 
+-    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
+    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
+     {
+         r = 1;
+     }
+@@ -797,8 +837,8 @@ PyObject * controlPrinter( PyObject * se
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = op;
+-    request->request.op.request_id = 1;
+    ippSetOperation( request, op );
+    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -822,7 +862,7 @@ PyObject * controlPrinter( PyObject * se
+ 
+     response = cupsDoRequest(http, request, "/admin/");
+ 
+-    if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT))
+    if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT))
+     {
+         r = 1;
+     }
+@@ -837,7 +877,7 @@ abort:
+     if ( response != NULL )
+         ippDelete( response );
+ 
+-    return Py_BuildValue( "i", r );;
+    return Py_BuildValue( "i", r );
+ }
+ 
+ 
+@@ -1116,8 +1156,8 @@ PyObject * getPPDList( PyObject * self,
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_GET_PPDS;
+-    request->request.op.request_id   = 1;
+    ippSetOperation( request, CUPS_GET_PPDS );
+    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -1143,43 +1183,43 @@ PyObject * getPPDList( PyObject * self,
+     if ((response = cupsDoRequest(http, request, "/")) != NULL)
+     {
+ 
+-        for (attr = response->attrs; attr; attr = attr->next)
+        for (attr = ippFirstAttribute( response ); attr; attr = ippNextAttribute( response ))
+         {
+             PyObject *dict;
+             char *ppdname = NULL;
+ 
+-            while (attr && attr->group_tag != IPP_TAG_PRINTER)
+-                attr = attr->next;
+            while (attr && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
+                attr = ippNextAttribute( response );
+ 
+             if (!attr)
+                 break;
+ 
+             dict = PyDict_New ();
+ 
+-            for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
+            for (; attr && ippGetGroupTag( attr ) == IPP_TAG_PRINTER; attr = ippNextAttribute( response ))
+             {
+                 PyObject *val = NULL;
+ 
+-                if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME)
+                if (!strcmp (ippGetName( attr ), "ppd-name") && ippGetValueTag( attr ) == IPP_TAG_NAME)
+                 {
+-                    ppdname = attr->values[0].string.text;
+                    ppdname = ippGetString( attr, 0, NULL );
+ 
+                     //sprintf( buf, "print '%s'", ppdname);
+                     //PyRun_SimpleString( buf );
+                 }
+ 
+-                else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD)
+-                //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) ||
+-                //    (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) ||
+-                //    (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) ||
+-                //    (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT))
+                else if (ippGetValueTag( attr ) == IPP_TAG_TEXT || ippGetValueTag( attr ) == IPP_TAG_NAME || ippGetValueTag( attr ) == IPP_TAG_KEYWORD)
+                //else if ((!strcmp (ippGetName( attr ), "ppd-natural-language") && ippGetValueTag( attr ) == IPP_TAG_LANGUAGE) ||
+                //    (!strcmp (ippGetName( attr ), "ppd-make-and-model") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
+                //    (!strcmp (ippGetName( attr ), "ppd-make") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
+                //    (!strcmp (ippGetName( attr ), "ppd-device-id") && ippGetValueTag( attr ) == IPP_TAG_TEXT))
+                 {
+-                    val = PyObj_from_UTF8(attr->values[0].string.text);
+                    val = PyObj_from_UTF8(ippGetString( attr, 0, NULL ));
+                 }
+ 
+                 if (val)
+                 {
+-                    PyDict_SetItemString (dict, attr->name, val);
+                    PyDict_SetItemString (dict, ippGetName( attr ), val);
+                     Py_DECREF (val);
+                 }
+             }
+diff -up hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors hplip-3.12.6/scan/sane/hpaio.c
+--- hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors	2012-06-18 12:42:51.000000000 +0200
+++ hplip-3.12.6/scan/sane/hpaio.c	2012-07-19 17:12:34.557848760 +0200
+@@ -47,6 +47,43 @@
+ #define DEBUG_DECLARE_ONLY
+ #include "sanei_debug.h"
+ 
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetGroupTag(attr)  attr->group_tag
+#define ippGetValueTag(attr)  attr->value_tag
+#define ippGetName(attr)      attr->name
+#define ippGetString(attr, element, language) attr->values[element].string.text
+
+static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
+{
+    if (!ipp)
+        return (NULL);
+    return (ipp->current = ipp->attrs);
+}
+
+static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
+{
+    if (!ipp || !ipp->current)
+        return (NULL);
+    return (ipp->current = ipp->current->next);
+}
+
+static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
+{
+    ipp->request.op.operation_id = op;
+    return (1);
+}
+
+static int ippSetRequestId( ipp_t *ipp, int request_id )
+{
+    ipp->request.any.request_id = request_id;
+    return (1);
+}
+#endif
+
+ static SANE_Device **DeviceList = NULL;
+ 
+ static int AddDeviceList(char *uri, char *model, SANE_Device ***pd)
+@@ -186,8 +223,8 @@ static int GetCupsPrinters(char ***print
+    /* Assemble the IPP request */
+    request = ippNew();
+ 
+-   request->request.op.operation_id = CUPS_GET_PRINTERS;
+-   request->request.any.request_id  = 1;
+   ippSetOperation( request, CUPS_GET_PRINTERS );
+   ippSetRequestId( request, 1 );
+ 
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, "en");
+@@ -197,20 +234,20 @@ static int GetCupsPrinters(char ***print
+    if ((response = cupsDoRequest(http, request, "/")) == NULL)
+       goto bugout;
+ 
+-   for (attr = response->attrs; attr != NULL; attr = attr->next)
+   for (attr = ippFirstAttribute ( response ); attr != NULL; attr = ippNextAttribute( response ))
+    {
+       /* Skip leading attributes until we hit a printer. */
+-      while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
+-         attr = attr->next;
+      while (attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
+         attr = ippNextAttribute( response );
+ 
+       if (attr == NULL)
+          break;
+ 
+-      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
+      while (attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER)
+       {
+-         if (strcmp(attr->name, "device-uri") == 0 && attr->value_tag == IPP_TAG_URI && AddCupsList(attr->values[0].string.text, printer) == 0)
+         if (strcmp(ippGetName( attr ), "device-uri") == 0 && ippGetValueTag( attr ) == IPP_TAG_URI && AddCupsList(ippGetString( attr, 0, NULL ), printer) == 0)
+             cnt++;
+-         attr = attr->next;
+         attr = ippNextAttribute( response );
+       }
+ 
+       if (attr == NULL)
--- a/hplip-logdir.patch
+++ b/hplip-logdir.patch
@ -0,0 +1,299 @@
+diff -up hplip-3.12.11/fax/backend/hpfax.py.logdir hplip-3.12.11/fax/backend/hpfax.py
+--- hplip-3.12.11/fax/backend/hpfax.py.logdir	2012-11-20 10:55:06.000000000 +0100
+++ hplip-3.12.11/fax/backend/hpfax.py	2012-11-27 10:09:25.298698254 +0100
+@@ -244,7 +244,7 @@ else:
+         input_fd = 0
+ 
+     # REVISIT:
+-    tmp_dir = '/var/log/hp/tmp'
+    tmp_dir = os.environ.get ('TMPDIR', '/var/log/hp/tmp')
+ 
+ 
+     pipe_name = os.path.join(tmp_dir, "hpfax-pipe-%d" % job_id)
+diff -up hplip-3.12.11/logcapture.py.logdir hplip-3.12.11/logcapture.py
+--- hplip-3.12.11/logcapture.py.logdir	2012-11-20 10:55:15.000000000 +0100
+++ hplip-3.12.11/logcapture.py	2012-11-27 10:09:25.298698254 +0100
+@@ -39,7 +39,7 @@ CUPS_BACKUP_FILE='/etc/cups/cupsd.conf_o
+ LOG_FOLDER_PATH='./'
+ LOG_FOLDER_NAME='hplip_troubleshoot_logs'
+ LOG_FILES=LOG_FOLDER_PATH + LOG_FOLDER_NAME
+-TMP_DIR='/var/log/hp/tmp'
+TMP_DIR='/var/spool/cups/tmp'
+ ############ enable_log() function ############
+ #This function changes CUPS conf log level to debug and restarts CUPS service.
+ 
+@@ -268,7 +268,7 @@ if os.path.exists('/var/log/cups/error_l
+       log.error("Failed to capture %s log file."%("/var/log/cups/error_log"))
+ 
+ 
+-File_list, File_list_str = utils.expand_list('/var/log/hp/*.log')
+File_list, File_list_str = utils.expand_list('%s/*.log'%TMP_DIR)
+ if File_list:
+     sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES))
+     if sts != 0:
+diff -up hplip-3.12.11/prnt/filters/hplipjs.c.logdir hplip-3.12.11/prnt/filters/hplipjs.c
+--- hplip-3.12.11/prnt/filters/hplipjs.c.logdir	2012-11-20 10:50:44.000000000 +0100
+++ hplip-3.12.11/prnt/filters/hplipjs.c	2012-11-27 10:09:25.299698225 +0100
+@@ -275,7 +275,8 @@ int main (int argc, char **argv)
+     {
+         fprintf (stderr, "DEBUG: HPLIPJS: argv[%d] = %s\n", i, argv[i]);
+     }
+-    snprintf(szPSFile, sizeof(szPSFile), "%s/output.ps","/var/log/hp/tmp");
+    snprintf(szPSFile, sizeof(szPSFile), "%s/output.ps",
+	     getenv ("TMPDIR") ? : "/var/log/hp/tmp");
+ 
+     HPFp = fopen (szPSFile, "w");
+ #endif
+diff -up hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir	2012-11-27 10:09:25.291698453 +0100
+++ hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp	2012-11-27 10:13:34.958640524 +0100
+@@ -31,16 +31,24 @@
+ \*****************************************************************************/
+ 
+ #include "HPCupsFilter.h"
+#include <limits.h>
+ #include <signal.h>
+#include <stdlib.h>
+ #include <sys/wait.h>
+ #include <sys/utsname.h>
+ #include <time.h>
+ 
+ #define HP_FILE_VERSION_STR    "03.09.08.0"
+ 
+char *env_tmpdir = NULL;
+
+ static HPCupsFilter    filter;
+ int main (int  argc, char *argv[])
+ {
+    env_tmpdir = getenv ("TMPDIR");
+    if (!env_tmpdir)
+	env_tmpdir = "/var/log/hp/tmp";
+
+     openlog("hpcups", LOG_PID,  LOG_DAEMON);
+ 
+     if (argc < 6 || argc > 7) {
+@@ -583,9 +591,10 @@ int HPCupsFilter::processRasterData(cups
+     DRIVER_ERROR           err;
+     int                    ret_status = 0;
+ 
+-    char hpPreProcessedRasterFile[64]; //temp file needed to store raster data with swaped pages.
+    char hpPreProcessedRasterFile[PATH_MAX]; //temp file needed to store raster data with swaped pages.
+ 
+-    strcpy(hpPreProcessedRasterFile, "/var/log/hp/tmp/hplipSwapedPagesXXXXXX");
+    snprintf(hpPreProcessedRasterFile, sizeof (hpPreProcessedRasterFile),
+	     "%s/hplipSwapedPagesXXXXXX", env_tmpdir);
+        
+ 
+     while (cupsRasterReadHeader2(cups_raster, &cups_header))
+@@ -647,13 +656,13 @@ int HPCupsFilter::processRasterData(cups
+         
+         if (m_iLogLevel & SAVE_INPUT_RASTERS)
+         {
+-            char    szFileName[64];
+            char    szFileName[PATH_MAX];
+             memset(szFileName, 0, sizeof(szFileName));
+ 
+             if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
+                 cups_header.cupsColorSpace == CUPS_CSPACE_RGB)
+             {
+-                snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterc_%d.bmp", current_page_number);
+                snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterc_%d.bmp", env_tmpdir, current_page_number);
+                 cfp = fopen (szFileName, "w");
+                 chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+             }
+@@ -661,7 +670,7 @@ int HPCupsFilter::processRasterData(cups
+             if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
+                 cups_header.cupsColorSpace == CUPS_CSPACE_K)
+             {
+-                snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterk_%d.bmp", current_page_number);
+                snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterk_%d.bmp", env_tmpdir, current_page_number);
+                 kfp = fopen (szFileName, "w");
+                 chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+             }
+diff -up hplip-3.12.11/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.12.11/prnt/hpcups/LJZjStream.cpp
+--- hplip-3.12.11/prnt/hpcups/LJZjStream.cpp.logdir	2012-11-20 10:49:20.000000000 +0100
+++ hplip-3.12.11/prnt/hpcups/LJZjStream.cpp	2012-11-27 10:16:24.878547224 +0100
+@@ -42,9 +42,12 @@
+ #include "LJZjStream.h"
+ #include "Utils.h"
+ #include "hpjbig_wrapper.h"
+#include <limits.h>
+ 
+ #define ZJC_BAND_HEIGHT    100
+ 
+extern char *env_tmpdir;
+
+ LJZjStream::LJZjStream () : Encapsulator ()
+ {
+     memset(&m_PM, 0, sizeof(m_PM));
+@@ -675,10 +678,10 @@ DRIVER_ERROR LJZjStream::preProcessRaste
+ 	cups_raster_t *even_pages_raster=NULL;
+ 	cups_raster_t *odd_pages_raster = NULL;
+ 	BYTE* pPageDataBuffer = NULL;
+-	char hpEvenPagesFile[64]={0,};
+-	char hpOddPagesFile[64]={0,};
+-	snprintf(hpEvenPagesFile, sizeof(hpEvenPagesFile), "%s/hplipEvenPagesXXXXXX","/var/log/hp/tmp");
+-	snprintf(hpOddPagesFile, sizeof(hpOddPagesFile), "%s/hplipOddPagesXXXXXX", "/var/log/hp/tmp");
+	char hpEvenPagesFile[PATH_MAX]={0,};
+	char hpOddPagesFile[PATH_MAX]={0,};
+	snprintf(hpEvenPagesFile, sizeof(hpEvenPagesFile), "%s/hplipEvenPagesXXXXXX", env_tmpdir);
+	snprintf(hpOddPagesFile, sizeof(hpOddPagesFile), "%s/hplipOddPagesXXXXXX", env_tmpdir);
+ 	
+ 	if (1 != m_pJA->pre_process_raster || !firstpage_cups_header->Duplex){		                                  
+ 		return  NO_ERROR;                                  
+diff -up hplip-3.12.11/prnt/hpcups/SystemServices.cpp.logdir hplip-3.12.11/prnt/hpcups/SystemServices.cpp
+--- hplip-3.12.11/prnt/hpcups/SystemServices.cpp.logdir	2012-11-20 10:49:20.000000000 +0100
+++ hplip-3.12.11/prnt/hpcups/SystemServices.cpp	2012-11-27 10:09:25.300698197 +0100
+@@ -30,14 +30,17 @@
+ 
+ #include "CommonDefinitions.h"
+ #include "SystemServices.h"
+#include <limits.h>
+
+extern char *env_tmpdir;
+ 
+ SystemServices::SystemServices(int iLogLevel, int job_id) : m_iLogLevel(iLogLevel)
+ {
+     m_fp = NULL;
+     if (iLogLevel & SAVE_PCL_FILE)
+     {
+-        char    fname[64];
+-	sprintf(fname, "%s/hpcups_job%d.out", "/var/log/hp/tmp",job_id);
+        char    fname[PATH_MAX];
+	sprintf(fname, "%s/hpcups_job%d.out", env_tmpdir, job_id);
+         m_fp = fopen(fname, "w");
+         chmod(fname, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+     }
+diff -up hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp
+--- hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir	2012-11-20 10:50:48.000000000 +0100
+++ hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp	2012-11-27 10:09:25.300698197 +0100
+@@ -29,6 +29,7 @@
+     POSSIBILITY OF SUCH DAMAGE.
+ \*****************************************************************************/
+ 
+#include <limits.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -66,6 +67,7 @@ uint16_t (*convert_endian_s)(uint16_t);
+ 
+ static int iLogLevel = 1;
+ char hpFileName[64] ;
+static char *env_tmpdir;
+ 
+ #define TIFF_HDR_SIZE 8
+ #define LITTLE_ENDIAN_MODE I
+@@ -439,9 +441,9 @@ int ProcessTiffData(int fromFD, int toFD
+     int bytes_written = 0;
+     int ret_status = 0;
+     int bytes_read = 0;
+-    char hpTiffFileName[64];
+    char hpTiffFileName[PATH_MAX];
+     long input_file_size = 0;
+-    snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hpliptiffXXXXXX","/var/log/hp/tmp");
+    snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hpliptiffXXXXXX",env_tmpdir);
+ 
+ 
+     fdTiff = mkstemp (hpTiffFileName);
+@@ -656,6 +658,10 @@ int main (int argc, char **argv)
+ 
+     /*********** PROLOGUE ***********/
+ 
+    env_tmpdir = getenv ("TMPDIR");
+    if (!env_tmpdir)
+	env_tmpdir = "/var/log/hp/tmp";
+
+     GetLogLevel();
+     openlog("hpcupsfax", LOG_PID,  LOG_DAEMON);
+ 
+@@ -679,7 +685,7 @@ int main (int argc, char **argv)
+          i++;
+     }
+ 
+-    snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxLog_XXXXXX","/var/log/hp/tmp");
+    snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxLog_XXXXXX",env_tmpdir);
+ 
+     fdFax = mkstemp (hpFileName);
+     if (fdFax < 0)
+diff -up hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir hplip-3.12.11/prnt/hpijs/hpijs.cpp
+--- hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir	2012-11-27 10:09:25.288698537 +0100
+++ hplip-3.12.11/prnt/hpijs/hpijs.cpp	2012-11-27 10:09:25.301698169 +0100
+@@ -29,6 +29,7 @@
+     POSSIBILITY OF SUCH DAMAGE.
+ \*****************************************************************************/
+ 
+#include <limits.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -43,6 +44,8 @@
+ #include "hpijs.h"
+ #include "services.h"
+ 
+static char *env_tmpdir;
+
+ extern void SendDbusMessage (const char *dev, const char *printer, int code, 
+                              const char *username, const int jobid, const char *title);
+ 
+@@ -96,8 +99,8 @@ void setLogLevel(UXServices *pSS)
+ 
+     if (pSS->m_iLogLevel & SAVE_PCL_FILE)
+     {
+-        char    szFileName[64];
+-	snprintf (szFileName,sizeof(szFileName), "/var/log/hp/tmp/hpijs_%d.out", getpid());
+        char    szFileName[PATH_MAX];
+	snprintf (szFileName,sizeof(szFileName), "%s/hpijs_%d.out", env_tmpdir, getpid());
+ 
+ 	pSS->outfp = fopen (szFileName, "w");
+ 	if (pSS->outfp)
+@@ -588,6 +591,10 @@ int main (int argc, char *argv[], char *
+    int ret, n, i, kn=0, width, k_width;
+    int low_marker = 0;
+ 
+   env_tmpdir = getenv ("TMPDIR");
+   if (!env_tmpdir)
+       env_tmpdir = "/var/log/hp/tmp";
+
+    openlog("hpijs", LOG_PID,  LOG_DAEMON);
+ 
+    if (argc > 1)
+@@ -627,8 +634,8 @@ int main (int argc, char *argv[], char *
+    setLogLevel(pSS);
+ 
+ #ifdef CAPTURE
+-   char szCapOutFile[64];
+-   snprintf(szCapOutFile, sizeof(szCapOutFile),"%s/capout_XXXXXX","/var/log/hp/tmp");
+   char szCapOutFile[PATH_MAX];
+   snprintf(szCapOutFile, sizeof(szCapOutFile),"%s/capout_XXXXXX",env_tmpdir);
+    if ((pSS->InitScript(szCapOutFile, TRUE)) != NO_ERROR)
+       BUG("unable to init capture");
+ #endif
+diff -up hplip-3.12.11/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/hpijsfax.cpp
+--- hplip-3.12.11/prnt/hpijs/hpijsfax.cpp.logdir	2012-11-20 10:50:48.000000000 +0100
+++ hplip-3.12.11/prnt/hpijs/hpijsfax.cpp	2012-11-27 10:09:25.301698169 +0100
+@@ -31,6 +31,7 @@
+ 
+ #ifdef HAVE_LIBHPIP
+ 
+#include <limits.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -270,14 +271,15 @@ int hpijsFaxServer (int argc, char **arg
+ 	IP_IMAGE_TRAITS	traits;
+ 	IP_HANDLE		hJob;
+ 
+-	char					hpFileName[64]; 
+	char					hpFileName[PATH_MAX]; 
+ 	int					fdFax = -1;
+ 	BYTE					szFileHeader[68];
+ 	BYTE					szPageHeader[64];
+ 	BYTE					*p;
+ 	unsigned	int			uiPageNum = 0;
+ 
+-	snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxXXXXXX","/var/log/hp/tmp");
+	snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxXXXXXX",
+		 getenv ("TMPDIR") ? : "/var/log/hp/tmp");
+ 
+ 
+ 	pFaxStruct = new HPIJSFax ();
--- a/hplip-snmp-quirks.patch
+++ b/hplip-snmp-quirks.patch
@ -1,7 +1,7 @@
--- hplip-3.12.6/prnt/drv/hpcups.drv.in.snmp-quirks	2012-06-18 12:44:26.000000000 +0200
-+++ hplip-3.12.6/prnt/drv/hpcups.drv.in	2012-06-26 18:14:40.661253685 +0200
-@@ -6653,6 +6653,8 @@ Manufacturer "HP"
-       Attribute "NickName" "" "HP Officejet Pro 8500 a909a, $Version"
+--- hplip-3.13.8/prnt/drv/hpcups.drv.in	2013-08-07 06:04:59.000000000 +0000
+++ hplip-3.13.8/prnt/drv/hpcups.drv.in.tpg	2013-08-19 11:40:08.402350402 +0000
+@@ -6913,6 +6913,8 @@
+       Attribute "NickName" "" "HP Officejet Pro 8500 a909a, hpcups $Version"
       Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a"
       Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909a;DES:officejet pro 8500 a909a;"
 +      // This device lies about its supplies capacity.
@ -9,8 +9,8 @@
       PCFileName "hp-officejet_pro_8500_a909a.ppd"
       Attribute "Product" "" "(HP Officejet Pro 8500 All-in-one Printer - a909a)"
     }
-@@ -6669,6 +6671,8 @@ Manufacturer "HP"
-       Attribute "NickName" "" "HP Officejet Pro 8500 a909g, $Version"
+@@ -6929,6 +6931,8 @@
+       Attribute "NickName" "" "HP Officejet Pro 8500 a909g, hpcups $Version"
       Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g"
       Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;"
 +      // This device lies about its supplies capacity.
--- a/hplip-3.12.9-syslog-fix-debug-messages-to-error.dpatch
+++ b/hplip-3.12.9-syslog-fix-debug-messages-to-error.dpatch
@ -1,5 +1,7 @@
--- hplip-3.12.9/prnt/hpcups/CommonDefinitions.h.hplip-syslog-fix-debug-messages-to-error	2012-09-04 14:31:10.000000000 +0200
-+++ hplip-3.12.9/prnt/hpcups/CommonDefinitions.h	2012-09-11 16:45:05.873220203 +0200
+Index: hplip-3.12.9/prnt/hpcups/CommonDefinitions.h
+===================================================================
+--- hplip-3.12.9/prnt/hpcups/CommonDefinitions.h
+++ hplip-3.12.9/prnt/hpcups/CommonDefinitions.h	2012-09-19 23:22:28.839354278 +0200
@@ -68,7 +68,7 @@
 #define _STRINGIZE(x) #x
 #define STRINGIZE(x) _STRINGIZE(x)
--- a/hplip-systray-dbus-exception.patch
+++ b/hplip-systray-dbus-exception.patch
@ -0,0 +1,18 @@
+diff -up hplip-3.12.11/ui4/systemtray.py.systray-dbus-exception hplip-3.12.11/ui4/systemtray.py
+--- hplip-3.12.11/ui4/systemtray.py.systray-dbus-exception	2012-11-20 10:51:40.000000000 +0100
+++ hplip-3.12.11/ui4/systemtray.py	2012-11-27 10:08:51.333805871 +0100
+@@ -802,7 +802,13 @@ def run(read_pipe):
+     log.set_module("hp-systray(qt4)")
+     log.debug("PID=%d" % os.getpid())
+ 
+-    app = SystemTrayApp(sys.argv, read_pipe)
+    try:
+        app = SystemTrayApp(sys.argv, read_pipe)
+    except DBusException, e:
+        # No session bus
+        log.debug("Caught exception: %s" % e)
+        sys.exit(1)
+
+     app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app
+ 
+     i = 0
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@ -1,11 +0,0 @@
-diff -up hplip-3.11.12/data/rules/56-hpmud_support.rules.udev-rules hplip-3.11.12/data/rules/56-hpmud_support.rules
--- hplip-3.11.12/data/rules/56-hpmud_support.rules.udev-rules	2011-12-09 12:19:54.000000000 +0100
-+++ hplip-3.11.12/data/rules/56-hpmud_support.rules	2011-12-19 12:12:13.205617985 +0100
-@@ -6,6 +6,7 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
- 
- LABEL="pid_test"
- 
-+ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
- # Check for LaserJet products (0x03f0xx17).
- ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attrs{product}", ENV{hp_test}="yes"
- # Check for LaserJet products (0x03f0xx2a).
--- a/hplip.rpmlintrc
+++ b/hplip.rpmlintrc
@ -0,0 +1 @@
+addFilter("E: hardcoded-library-path")
--- a/hplip.spec
+++ b/hplip.spec
@ -1,33 +1,33 @@
 # Define if you want to build the sane backend (default)
-%define sane_backend		1
-%{?_with_sane:			%global sane_backend 1}
-%{?_without_sane:		%global sane_backend 0}
+%define sane_backend 1
+%{?_with_sane: %global sane_backend 1}
+%{?_without_sane: %global sane_backend 0}

-%define hpip_major		0
-%define hpip_libname		%mklibname hpip %{hpip_major}
-
-%define sane_hpaio_major	1
-%define sane_hpaio_libname	%mklibname sane-hpaio %{sane_hpaio_major}
+%define major 0
+%define libhpip %mklibname hpip %{major}
+%define libhpmud %mklibname hpmud %{major}
+%define sanemaj 1
+%define libsane %mklibname sane-hpaio %{sanemaj}
+%define devname %mklibname hpip -d

 # Suppress automatically generated Requires for devel packages
 %define __noautoreq 'devel\(.*\)'

-#define extraversion -RC1
 %define extraversion %nil

 Summary:	HP printer/all-in-one driver infrastructure
 Name:		hplip
-Version:	3.13.5
-Release:	1
+Version:	3.13.8
+Release:	2
 License:	GPLv2+ and MIT
 Group:		System/Printing
 Url:		http://hplip.sourceforge.net/
-Source0:	http://heanet.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}%{extraversion}.tar.gz
+Source0:	http://garr.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}%{extraversion}.tar.gz
 Source1:	hpcups-update-ppds.sh
 Source2:	%{name}-tmpfiles.conf
 # http://www.iconfinder.com/icondetails/6393/128/fax_hardware_icon
 Source3:	hp-sendfax.png
-
+Source4:	hplip.rpmlintrc
 # (doktor5000) fix linking with python and libsane
 # taken from mandriva
 Patch1:		hplip-3.11.3-mdv-link.patch
@ -36,89 +36,92 @@ Patch1:		hplip-3.11.3-mdv-link.patch
 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
-Patch104: hplip-no-asm.patch
-Patch106: hplip-mucks-with-spooldir.patch
-Patch107: hplip-udev-rules.patch
-Patch108: hplip-retry-open.patch
-Patch109: hplip-snmp-quirks.patch
-Patch110: hplip-discovery-method.patch
-Patch111: hplip-hpijs-marker-supply.patch
-Patch112: hplip-clear-old-state-reasons.patch
-Patch114: hplip-hpcups-sigpipe.patch
-Patch115: hplip-fax-ppd.patch
-Patch116: hplip-bad-low-ink-warning.patch
-Patch118: hplip-skip-blank-lines.patch
-Patch119: hplip-dbglog-newline.patch
-Patch121: hplip-ppd-ImageableArea.patch
-Patch122: hplip-raw_deviceID-traceback.patch
-Patch123: hplip-UnicodeDecodeError.patch
-Patch124: hplip-3.12.9-addprinter.patch
-Patch125: hplip-dbus-exception.patch
-Patch126: hplip-notification-exception.patch
-Patch127: hplip-CVE-2010-4267.patch
-Patch128: hplip-wifisetup.patch
-# recreated from makefile-chgrp.patch against Makefile.am 
-Patch129: hplip-3.12.9-makefile-chgrp.patch
-Patch130: hplip-hpaio-localonly.patch
-Patch131: hplip-3.12.9-CVE-2013-0200.patch
+Patch101:	hplip-pstotiff-is-rubbish.patch
+Patch102:	hplip-strstr-const.patch
+Patch103:	hplip-ui-optional.patch
+Patch104:	hplip-no-asm.patch
+Patch106:	hplip-mucks-with-spooldir.patch
+Patch108:	hplip-retry-open.patch
+Patch109:	hplip-snmp-quirks.patch
+Patch110:	hplip-discovery-method.patch
+Patch111:	hplip-hpijs-marker-supply.patch
+Patch112:	hplip-clear-old-state-reasons.patch
+Patch113:	hplip-systray-dbus-exception.patch
+Patch114:	hplip-hpcups-sigpipe.patch
+Patch115:	hplip-logdir.patch
+Patch116:	hplip-bad-low-ink-warning.patch
+Patch118:	hplip-skip-blank-lines.patch
+Patch119:	hplip-dbglog-newline.patch
+Patch121:	hplip-ppd-ImageableArea.patch
+Patch122:	hplip-raw_deviceID-traceback.patch
+Patch123:	hplip-UnicodeDecodeError.patch
+Patch124:	hplip-3.12.9-addprinter.patch
+Patch125:	hplip-dbus-exception.patch
+Patch126:	hplip-notification-exception.patch
+Patch127:	hplip-CVE-2010-4267.patch
+Patch128:	hplip-wifisetup.patch
+# fedora patch not necessary. done via sed call
+#Patch129: hplip-makefile-chgrp.patch
+Patch130:	hplip-hpaio-localonly.patch
+Patch131:	hplip-ipp-accessors.patch
+Patch132: hplip-IEEE-1284-4.patch
+Patch133: hplip-check.patch

 # Debian/Ubuntu patches
 # taken from http://patch-tracker.debian.org/package/hplip/3.11.7-1
-Patch201: 01_rss.dpatch
-Patch202: 10_shebang_fixes.dpatch
-Patch203: 14_charsign_fixes.dpatch
-Patch204: 85_rebuild_python_ui.dpatch
-Patch205: 87_move_documentation.dpatch
-Patch206: hplip-photosmart_b9100_support.patch
-Patch207: hplip-pjl-duplex-binding.patch
-Patch208: mga-kde4-kdesudo-support.dpatch
-Patch209: hp-check-groups.dpatch
-Patch210: hp-check_debian.dpatch
-Patch211: hp-setup-prompt-for-custom-PPD.dpatch
-Patch213: hp-mkuri-take-into-account-already-installed-plugin-also-for-exit-value.dpatch
-Patch214: ubuntu-hp-mkuri-notification-text.dpatch
-Patch215: simple-scan-as-default.dpatch
-Patch216: make-commafy-correctly-work-with-python-2.dpatch
+Patch201:	01_rss.dpatch
+Patch202:	10_shebang_fixes.dpatch
+Patch203:	14_charsign_fixes.dpatch
+Patch204:	85_rebuild_python_ui.dpatch
+Patch205:	87_move_documentation.dpatch
+Patch206:	hplip-photosmart_b9100_support.patch
+Patch207:	pjl-duplex-binding.dpatch
+#hplip-pjl-duplex-binding.patch
+Patch208:	mga-kde4-kdesudo-support.dpatch
+Patch209:	hp-check-groups.dpatch
+#Patch210:	hp-check_debian.dpatch
+Patch211:	hp-setup-prompt-for-custom-PPD.dpatch
+Patch213:	hp-mkuri-take-into-account-already-installed-plugin-also-for-exit-value.dpatch
+#Patch214:	ubuntu-hp-mkuri-notification-text.dpatch
+Patch215:	simple-scan-as-default.dpatch
+Patch216:	make-commafy-correctly-work-with-python-2.dpatch
 # (doktor5000) rediff original debian patch for hplip 3.11.10
-Patch217: hplip-3.11.10-mga-remove-duplicate-entry-for-cp1700-in-drv-files.patch
-Patch219: try_libhpmud.so.0.dpatch
-Patch220: add-lidil-two-cartridge-modes.dpatch
-Patch221: add_missing_newline_for_error_log.dpatch
-Patch224: hplip-3.12.9-syslog-fix-debug-messages-to-error.dpatch
-Patch225: hpfax-bug-function-used-before-importing-log.dpatch
-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
+Patch217:	hplip-3.11.10-mga-remove-duplicate-entry-for-cp1700-in-drv-files.patch
+Patch219:	try_libhpmud.so.0.dpatch
+Patch220:	add-lidil-two-cartridge-modes.dpatch
+Patch221:	add_missing_newline_for_error_log.dpatch
+Patch224:	hplip-syslog-fix-debug-messages-to-error.dpatch
+Patch225:	hpfax-bug-function-used-before-importing-log.dpatch
+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

-# OpenSUSE patches
 Patch301: fix-uninitialized-variables.patch

-%if %{sane_backend}
-BuildRequires:	libsane-devel, xsane
-%endif
-%py_requires -d
+BuildRequires:	desktop-file-utils
+BuildRequires:	imagemagick
+BuildRequires:	polkit
 BuildRequires:	python-sip >= 4.1.1
 BuildRequires:	net-snmp-devel
-BuildRequires:	libusb-devel >= 0.1.8
-BuildRequires:	imagemagick
-BuildRequires:	autoconf
 BuildRequires:	cups-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	python-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	dbus-devel
-BuildRequires:	udev-devel
-BuildRequires:	polkit
+BuildRequires:	jpeg-devel
+BuildRequires:	pkgconfig(dbus-1)
 BuildRequires:	pkgconfig(libgphoto2)
-BuildRequires:  libv4l-devel
-Requires(post): systemd
+BuildRequires:	pkgconfig(libusb)
+BuildRequires:	pkgconfig(libv4l1)
+BuildRequires:	pkgconfig(python)
+BuildRequires:	pkgconfig(udev)
+%if %{sane_backend}
+BuildRequires:	pkgconfig(sane-backends)
+BuildRequires:	xsane
+Requires(post):	hplip
+%endif
+Requires(post):	systemd
 Requires:	cups
 # For dynamic ppd generation.
 Requires:	foomatic-filters
-Requires:	hplip-model-data hplip-hpijs
+Requires:	hplip-model-data
+Requires:	hplip-hpijs
 Requires:	hplip-hpijs-ppds
 Requires:	python-sip >= 4.1.1
 # Needed for communicating with ethernet-connected printers
@ -135,18 +138,17 @@ Requires:	python-imaging
 Requires:	sane-backends-hpaio
 # Needed to avoid misleading errors about network connectivity (RH bug #705843)
 Requires:	wget
+# (tpg) hp-check needs this
+Requires:	acl
 # hplip tools use internal symbols from libhplip that can change among versions
-Requires:	%{hpip_libname} = %{version}
+Requires:	%{libhpip} = %{version}
+%py_requires -d
 # Some HP ppds are in foomatic-db and foomatic-db-hpijs (mdv bug #47415)
 Suggests:	foomatic-db-hpijs
-# (cg) needed by at least hp-check
-Requires:	acl

 # foomatic-db-hpijs drivers are provided by hp and by this package now
 # NOTE: remove the foomatic-db-hpijs deps sometime in 2010-10-?? ?
 Provides:	foomatic-db-hpijs = %{version}-%{release}
-Obsoletes:	foomatic-db-hpijs
-

 %description
 This is the HP driver package to supply Linux support for most
@ -165,42 +167,50 @@ For status and consumable checking and also for inkjet maintenance
 there is the graphical tool "hp-toolbox" available (Menu:
 "System"/"Monitoring"/"HP Printer Toolbox").

-%package -n %{hpip_libname}
-Summary: Dynamic library for the "hplip" HP printer/all-in-one drivers
-Group: System/Printing
+%package -n %{libhpip}
+Summary:	Dynamic library for the "hplip" HP printer/all-in-one drivers
+Group:		System/Printing

-%description -n %{hpip_libname}
+%description -n %{libhpip}
 Library needed for the "hplip" HP printer/all-in-one drivers

-%package -n %{hpip_libname}-devel
-Summary: Headers and links to compile against the "%{hpip_libname}" ("hplip") library
-Group: Development/C
-Requires: %{hpip_libname} >= %{version}-%{release}
-Provides: libhpip-devel = %{version}-%{release}
+%package -n %{libhpmud}
+Summary:	Dynamic library for the "hplip" HP printer/all-in-one drivers
+Group:		System/Printing
+Conflicts:	%{_lib}hpip0 < 3.13.2-4

-%description -n %{hpip_libname}-devel
+%description -n %{libhpmud}
+Library needed for the "hplip" HP printer/all-in-one drivers
+
+%package -n %{devname}
+Summary:	Headers and links to compile against the "%{libhpip}" ("hplip") library
+Group:		Development/C
+Requires:	%{libhpip} >= %{version}-%{release}
+Requires:	%{libhpmud} >= %{version}-%{release}
+Requires:	%{libsane} >= %{version}-%{release}
+Provides:	libhpip-devel = %{version}-%{release}
+Obsoletes:	%{_lib}hpip0-devel < 3.13.2-4
+
+%description -n %{devname}
 This package contains all files which one needs to compile programs using
-the "%{hpip_libname}" library.
+the "%{libhpip}" library.

 %if %{sane_backend}
-%package -n %{sane_hpaio_libname}
-Summary: SANE driver for scanners in HP's multi-function devices (from HPLIP)
-Group: System/Printing
-Requires: sane-backends
-Provides: sane-backends-hpaio = %{version}-%{release}
+%package -n %{libsane}
+Summary:	SANE driver for scanners in HP's multi-function devices (from HPLIP)
+Group:		System/Printing
+Suggests:	sane-backends
+Provides:	sane-backends-hpaio = %{version}-%{release}
 # (cjw) for system-config-printer
-Provides: libsane-hpaio
-%define __noautoreq 'devel(libcrypto)\\|devel(libdl)\\|devel(libhpip)\\|devel(libm)\\|devel(libsnmp)'
-%endif
+Provides:	libsane-hpaio

-%if %{sane_backend}
-%description -n %{sane_hpaio_libname}
+%description -n %{libsane}
 SANE driver for scanners in HP's multi-function devices (from HPLIP)
 %endif

 %package model-data
-Summary: Data file listing the HP printer models supported by HPLIP
-Group: System/Printing
+Summary:	Data file listing the HP printer models supported by HPLIP
+Group:		System/Printing

 %description model-data
 HPLIP supports most current HP printers and multifunction devices, but
@ -209,21 +219,20 @@ list of supported models. Printerdrake installs it automatically to
 determine whether HPLIP has to be installed or not.

 %package gui
-Summary: HPLIP graphical tools
-Group: System/Printing
-Requires: python-qt4-gui
-Requires: %{name} = %{version}-%{release}
-Requires: usermode
+Summary:	HPLIP graphical tools
+Group:		System/Printing
+Requires:	python-qt4-gui
+Requires:	%{name} = %{version}-%{release}
+Requires:	usermode

 %description gui
 HPLIP graphical tools.

-
 %package hpijs
-Summary: HPs printer driver IJS plug-in for GhostScript
-Group: System/Printing
-Requires: ghostscript
-Provides: hpijs
+Summary:	HPs printer driver IJS plug-in for GhostScript
+Group:		System/Printing
+Requires:	ghostscript
+Provides:	hpijs = %{EVRD}

 %description hpijs
 HPs printer driver IJS plug-in for GhostScript. This driver gives full
@ -231,9 +240,10 @@ printing support for nearly all non-PostScript inkjet and laser
 printers made by HP.

 %package hpijs-ppds
-Summary: PPD files for the HPIJS printer driver
-Group: System/Printing
-Requires: foomatic-filters, hplip-hpijs
+Summary:	PPD files for the HPIJS printer driver
+Group:		System/Printing
+Requires:	foomatic-filters
+Requires:	hplip-hpijs

 %description hpijs-ppds
 PPD files to use the HPIJS printer driver with foomatic-rip and a
@ -253,7 +263,7 @@ Peripherals or MFPs), which can print, scan, copy, fax, and/or access
 flash memory cards.

 %prep
-%setup -q -n %{name}-%{version}%{extraversion}
+%setup -qn %{name}-%{version}%{extraversion}

 %patch2 -p1 -b .udev~

@ -290,11 +300,12 @@ flash memory cards.
 # Clear old printer-state-reasons we used to manage (RH bug #510926).
 %patch112 -p1 -b .clear-old-state-reasons

+%patch113 -p1 -b .systray-dbus-exception
+
 # Avoid busy loop in hpcups when backend has exited (RH bug #525944).
 %patch114 -p1 -b .hpcups-sigpipe

-# Use correct fax PPD name for Qt3 UI.
-#patch115 -p1 -b .fax-ppd
+#patch115 -p1 -b .logdir

 # Fixed Device ID parsing code in hpijs's dj9xxvip.c (RH bug #510926).
 %patch116 -p1 -b .bad-low-ink-warning
@ -303,7 +314,7 @@ flash memory cards.
 %patch118 -p1 -b .skip-blank-lines

 # Added missing newline to string argument in dbglog() call (RH bug #585275).
-%patch119 -p1 -b .dbglog-newline
+#patch119 -p1 -b .dbglog-newline

 # Fix ImageableArea for Laserjet 8150/9000 (RH bug #596298).
 for ppd_file in $(grep '^diff' %{PATCH121} | cut -d " " -f 4);
@ -330,17 +341,17 @@ done
 %patch125 -p1 -b .dbus-exception

 # Catch GError exception when notification showing failed (RH bug #665577).
-%patch126 -p1 -b .notification-exception
+#patch126 -p1 -b .notification-exception

 # Applied patch to fix CVE-2010-4267, remote stack overflow
 # vulnerability (RH bug #670252).
-%patch127 -p1 -b .CVE-2010-4267
+#patch127 -p1 -b .CVE-2010-4267

 # Avoid KeyError in ui4/wifisetupdialog.py (RH bug #680939).
 %patch128 -p1 -b .wifisetup

-# Don't run 'chgrp lp /var/log/hp' in makefile
-%patch129 -p1 -b .chgrp
+# Don't run 'chgrp lp /var/log/hp' in makefile (removes all lines with "chgrp")
+sed -i '/chgrp/d' Makefile.am

 # Pay attention to the SANE localOnly flag in hpaio (RH bug #743593).
 %patch130 -p1 -b .hpaio-localonly
@ -349,8 +360,9 @@ sed -i.duplex-constraints \
    -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
    prnt/drv/hpcups.drv.in

-# Use mkstemp to create temporary files to avoid symlink attacks (RH#902163).
-%patch131 -p1 -b .CVE-2013-0200
+#patch131 -p1 -b .ipp-accessors
+#patch132 -p1 -b .hplip-IEEE-1284-4
+#patch133 -p1 -b .check

 # Debian/Ubuntu patches

@ -394,16 +406,16 @@ sed -i.duplex-constraints \

 %patch216 -p1 -b .make-commafy-correctly-work-with-python-2

-%patch217 -p1 -b .mga-remove-duplicate-entry-for-cp1700-in-drv-files
+#patch217 -p1 -b .mga-remove-duplicate-entry-for-cp1700-in-drv-files

-# dlopen libhpmud.so.0 instad of libhpmud.so, in order not to depend on
+# dlopen libhpmud.so.0 instead of libhpmud.so, in order not to depend on
 # devel package (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=548379)
 # obsoletes hplip-3.9.8-dlopen-libhpmud.patch, newer & extended version
 %patch219 -p1 -b .try_libhpmud.so.0

 %patch220 -p1 -b .add-lidil-two-cartridge-modes
-
-%patch224 -p1 -b .hplip-syslog-fix-debug-messages-to-error
+# fixed by upstream
+#patch224 -p1 -b .hplip-syslog-fix-debug-messages-to-error

 %patch225 -p1 -b .hpfax-bug-function-used-before-importing-log

@ -413,8 +425,7 @@ sed -i.duplex-constraints \

 %patch228 -p1 -b .hpaio-option-duplex

-# OpenSUSE patches
-%patch301 -p0 -b  .fix-uninitialized-variables
+%patch301 -p0 -b .fix-uninitialized-variables

 # Use filter foomatic-rip instead of foomatic-rip-hplip (fix from Mandriva)
 for PPDGZ in ppd/hpijs/*.ppd.gz
@ -429,17 +440,16 @@ chmod -R u+w .

 %build
 %serverbuild
-#needed by patch204
-libtoolize --copy --force
-aclocal --force
-autoconf -f
 #needed by patches 204 and 205
-automake -f --foreign
+# create required files as placeholder, otherwise autoreconf fails
+touch NEWS README AUTHORS ChangeLog
+autoreconf -ifv

 %if !%{sane_backend}
 WITHOUT_SANE="--without-sane"
 %endif
-%configure2_5x $WITHOUT_SANE \
+%configure2_5x \
+	$WITHOUT_SANE \
 	--disable-foomatic-rip-hplip-install \
 	--enable-scan-build \
 	--enable-gui-build \
@ -449,10 +459,9 @@ WITHOUT_SANE="--without-sane"
 	--enable-hpcups-install \
 	--enable-cups-drv-install \
 	--enable-cups-ppd-install \
-	--enable-foomatic-drv-install \
 	--enable-hpijs-install \
 	--enable-udev-acl-rules \
-	--disable-policykit \
+	--enable-policykit \
 	--with-mimedir=%{_datadir}/cups/mime

 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -460,22 +469,13 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

 %make

-# convert icons to required sizes
-#convert data/images/print.png -resize 16x16 %{name}.mini.png
-#convert data/images/print.png -resize 32x32 %{name}.png
-#convert data/images/print.png -resize 48x48 %{name}.large.png
-
 %install
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_includedir}
 mkdir -p %{buildroot}%{_initrddir}
 mkdir -p %{buildroot}%{_sysconfdir}/hp
-mkdir -p %{buildroot}/var/run/hplip

-# Do not use the macro here, use the standard DESTDIR method as it works
-# with HPLIP, in contrary to the non-standard Mandriva method
-#make test-destdir DESTDIR=%{buildroot}
-make install DESTDIR=%{buildroot}
+%makeinstall_std

 # Install files which the "make install" missed to install
 install -m 644 ip/hpip.h %{buildroot}%{_includedir}
@ -485,12 +485,20 @@ install -m 644 ip/xform.h %{buildroot}%{_includedir}
 mv %{buildroot}%{_docdir}/%{name}-%{version}%{extraversion} %{buildroot}%{_docdir}/%{name}-doc-%{version}%{extraversion}

 # Remove static libraries of SANE driver
-rm -f %{buildroot}%{_libdir}/sane/libsane-hpaio*.so
 rm -f %{buildroot}%{_libdir}/sane/libsane-hpaio*.la
 rm -f %{buildroot}%{_sysconfdir}/sane.d/dll.conf

-# Remove other unneeded files
+# Remove other unneeded/unwanted files
 rm -f %{buildroot}%{py_platsitedir}/*.la
+rm -f %{buildroot}%{_datadir}/hplip/uninstall.*
+rm -f %{buildroot}%{_bindir}/hp-uninstall
+rm -f %{buildroot}%{_datadir}/hplip/upgrade.*
+rm -f %{buildroot}%{_bindir}/hp-upgrade
+rm -f %{buildroot}%{_bindir}/hp-config_usb_printer
+rm -f %{buildroot}%{_datadir}/hplip/config_usb_printer.*
+rm -f %{buildroot}%{_libdir}/*.la
+rm -rf %{buildroot}%{python_sitearch}/*.la
+rm -rf %{buildroot}%{_libdir}/sane/*.la

 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor='' \
@ -502,21 +510,22 @@ desktop-file-install --vendor='' \
 	--add-category='Printing' \
 	--add-category='Qt' \
 	--add-category='HardwareSettings' \
-	--add-category='X-MandrivaLinux-CrossDesktop' \
 	--remove-key='Version' \
 	%{buildroot}%{_datadir}/applications/hplip.desktop

 cat > %{buildroot}%{_datadir}/applications/%{_vendor}-hp-sendfax.desktop << EOF
 [Desktop Entry]
 Name=HP Sendfax
-Comment=Utility for sending faxes with HP's multi-function devices
+Comment=Utility for sending faxes with HPs multi-function devices
 Exec=%{_bindir}/hp-sendfax
 Icon=hp-sendfax
 Terminal=false
 Type=Application
-Categories=TelephonyTools;Qt;Printing;Utility;X-MandrivaLinux-CrossDesktop;
+Categories=TelephonyTools;Qt;Printing;Utility;
 EOF

+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+
 # install menu icons
 for N in 16 32 48 64; do convert %{SOURCE3} -resize ${N}x${N} $N.png; done
 install -D -m 0644 16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/hp-sendfax.png
@ -525,19 +534,8 @@ install -D -m 0644 48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/hp-sendfax
 install -D -m 0644 64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/hp-sendfax.png
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_iconsdir}/hicolor/128x128/apps/hp-sendfax.png

-# tmpfiles.d for folders on transient media
-install -D -p -m 0644 %{SOURCE2} %{buildroot}/usr/lib/tmpfiles.d/%{name}.conf
-
-# (cg) Correct the udev rules dir
-mkdir -p %{buildroot}/lib/udev/
-mv %{buildroot}%{_sysconfdir}/udev/* %{buildroot}/lib/udev/
-
 # switched to udev, no need for hal information
-rm -rf  %{buildroot}%{_datadir}/hal/fdi 
-
-rm -f   %{buildroot}%{_libdir}/*.la \
-        %{buildroot}%{python_sitearch}/*.la \
-        %{buildroot}%{_libdir}/sane/*.la
+rm -rf  %{buildroot}%{_datadir}/hal/fdi

 # Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
 install -p -m755 %{SOURCE1} %{buildroot}%{_bindir}/hpcups-update-ppds
@ -557,31 +555,17 @@ mkdir -p %{buildroot}%{_sbindir}
 mv %{buildroot}%{_bindir}/hp-setup %{buildroot}%{_sbindir}/hp-setup
 ln -s consolehelper %{buildroot}%{_bindir}/hp-setup

-# console user, ask for root password
-        mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
-        cat > %{buildroot}%{_sysconfdir}/security/console.apps/hp-setup <<EOF
-USER=root
-PROGRAM=/usr/sbin/hp-setup
-FALLBACK=false
-SESSION=true
-EOF
-        mkdir -p %{buildroot}%{_sysconfdir}/pam.d
-        cat > %{buildroot}%{_sysconfdir}/pam.d/hp-setup  <<EOF
-#%PAM-1.0
-auth        include     config-util
-account     include     config-util
-session     include     config-util
-EOF
-
-
 # Make sure pyc files are generated, otherwise we can get
 # difficult to debug problems
 pushd %{buildroot}%{_datadir}/%{name}
 python -m compileall .
 popd

-%post
-/bin/systemd-tmpfiles --create %{name}.conf
+mkdir -p %{buildroot}%{_localstatedir}/lib/hp/
+touch %{buildroot}%{_localstatedir}/lib/hp/hplip.state
+
+mkdir -p %{buildroot}%{_unitdir}
+mv -f %{buildroot}/usr/lib/systemd/system/hplip-printer@.service %{buildroot}%{_unitdir}/hplip-printer@.service

 %triggerin -- hplip < 2.7.7
 chkconfig --del hplip
@ -591,6 +575,9 @@ if [ -f /etc/init.d/cups ]; then
 	/sbin/service cups condrestart || :
 fi

+%post
+%tmpfiles_create %{name}
+
 %post -n hplip-hpijs-ppds
 # Restart CUPS to make the printing PPDs known to it
 if [ -f /etc/init.d/cups ]; then
@ -607,7 +594,7 @@ fi
 :

 %if %{sane_backend}
-%post -n %{sane_hpaio_libname}
+%post -n %{libsane}

 # Add HPLIP driver to /etc/sane.d/dll.conf
 if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
@ -616,7 +603,7 @@ fi
 %endif

 %if %{sane_backend}
-%preun -n %{sane_hpaio_libname}
+%preun -n %{libsane}
 # Remove HPLIP driver from /etc/sane.d/dll.conf
 if [ "$1" = 0 ]; then \
 	if grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
@ -640,15 +627,16 @@ fi

 %files
 %config(noreplace) %{_sysconfdir}/hp
-%dir /var/run/hplip/
+%dir %{_localstatedir}/lib/hp/
 %{_bindir}/hp-align
-%{_bindir}/hp-check-plugin
 %{_bindir}/hp-clean
 %{_bindir}/hp-colorcal
-%{_bindir}/hp-config_usb_printer
+#%{_bindir}/hp-config_usb_printer
 %{_bindir}/hp-devicesettings
 %{_bindir}/hp-diagnose_plugin
 %{_bindir}/hp-diagnose_queues
+%{_bindir}/hp-doctor
+%{_datadir}/hplip/doctor.py*
 %{_bindir}/hp-fab
 %{_bindir}/hp-faxsetup
 %{_bindir}/hp-firmware
@ -671,9 +659,9 @@ fi
 %{_sbindir}/hp-setup
 %{_bindir}/hp-testpage
 %{_bindir}/hp-timedate
-%{_bindir}/hp-uninstall
+#%{_bindir}/hp-uninstall
 %{_bindir}/hp-unload
-%{_bindir}/hp-upgrade
+#%{_bindir}/hp-upgrade
 %{_bindir}/hp-wificonfig

 %exclude %{_datadir}/hplip/data/models
@ -699,7 +687,7 @@ fi
 %{_datadir}/hplip/check-plugin.py*
 %{_datadir}/hplip/clean.py*
 %{_datadir}/hplip/colorcal.py*
-%{_datadir}/hplip/config_usb_printer.py*
+#%{_datadir}/hplip/config_usb_printer.py*
 %{_datadir}/hplip/devicesettings.py*
 %{_datadir}/hplip/diagnose_plugin.py*
 %{_datadir}/hplip/diagnose_queues.py*
@ -727,9 +715,9 @@ fi
 %{_datadir}/hplip/setup.py*
 %{_datadir}/hplip/testpage.py*
 %{_datadir}/hplip/timedate.py*
-%{_datadir}/hplip/uninstall.py*
+#%{_datadir}/hplip/uninstall.py*
 %{_datadir}/hplip/unload.py*
-%{_datadir}/hplip/upgrade.py*
+#%{_datadir}/hplip/upgrade.py*
 %{_datadir}/hplip/wificonfig.py*
 # Directories
 %{_datadir}/hplip/base
@ -744,35 +732,40 @@ fi
 %{_datadir}/hplip/pcard
 %{_datadir}/hplip/prnt
 %{_datadir}/hplip/scan
-#{_datadir}/polkit-1/actions/com.hp.hplip.policy
-#{_datadir}/dbus-1/system-services/com.hp.hplip.service
-#%{_localstatedir}/lib/hp/hplip.state
-#config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.hp.hplip.conf
-%{_sysconfdir}/cron.daily/hplip_cron
-%{_sysconfdir}/pam.d/*
-%{_sysconfdir}/security/console.apps/*
-/usr/lib/tmpfiles.d/*.conf
+%{_datadir}/polkit-1/actions/com.hp.hplip.policy
+%{_datadir}/dbus-1/system-services/com.hp.hplip.service
+%{_localstatedir}/lib/hp/hplip.state
+%dir %attr(0774,root,lp) %{_localstatedir}/log/hp
+%dir %attr(1774,root,lp) %{_localstatedir}/log/hp/tmp
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.hp.hplip.conf
+#%{_sysconfdir}/cron.daily/hplip_cron
+%{_sysconfdir}/tmpfiles.d/hplip.conf
+%{_unitdir}/hplip-printer@.service
+%{_datadir}/hplip/hplip_clean.sh

 %files doc
 %doc %{_docdir}/%{name}-doc-%{version}%{extraversion}

-%files -n %{hpip_libname}
-%{_libdir}/libhpip*.so.*
-%{_libdir}/libhpmud.so.*
+%files -n %{libhpip}
+%{_libdir}/libhpip.so.%{major}*

-%files -n %{hpip_libname}-devel
+%files -n %{libhpmud}
+%{_libdir}/libhpmud.so.%{major}*
+
+%files -n %{devname}
 %{_includedir}/hpip.h
 %{_includedir}/xform.h
-%{_libdir}/libhpip*.so
+%{_libdir}/libhpip.so
 %{_libdir}/libhpmud.so
-
 %if %{sane_backend}
-%files -n %{sane_hpaio_libname}
-%{_libdir}/sane/libsane-hpaio*.so.*
+%{_libdir}/sane/libsane-hpaio.so
+
+%files -n %{libsane}
+%{_libdir}/sane/libsane-hpaio.so.%{sanemaj}*
 %endif

 %files model-data
-/lib/udev/rules.d/*.rules
+%{_sysconfdir}/udev/rules.d/*.rules
 %{_datadir}/hplip/data/models

 %files gui
@ -799,8 +792,8 @@ fi
 %dir %{_datadir}/ppd
 %dir %{_datadir}/ppd/HP
 %{_bindir}/hpcups-update-ppds
-%{_datadir}/cups/drv/hp/hpijs.drv

 %files hpijs-ppds
 %{_datadir}/ppd/HP/apollo*.ppd*
 %{_datadir}/ppd/HP/hp-*.ppd*
+
--- a/make-commafy-correctly-work-with-python-2.dpatch
+++ b/make-commafy-correctly-work-with-python-2.dpatch
@ -5,10 +5,9 @@
 ## DP: No description.

@DPATCH@
-diff -urNad hplip-3.10.2~/base/utils.py hplip-3.10.2/base/utils.py
--- hplip-3.10.2~/base/utils.py	2010-04-09 21:20:22.085486637 +0200
-+++ hplip-3.10.2/base/utils.py	2010-04-09 21:22:19.865465070 +0200
-@@ -362,7 +362,7 @@
+--- a/base/utils.py
+++ b/base/utils.py
+@@ -462,7 +462,7 @@
 
 
 def commafy(val):
--- a/mga-kde4-kdesudo-support.dpatch
+++ b/mga-kde4-kdesudo-support.dpatch
@ -1,26 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## kde4-kdesudo-support.dpatch by  <till.kamppeter@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad hplip-3.9.4b~/base/utils.py hplip-3.9.4b/base/utils.py
--- hplip-3.9.4b~/base/utils.py	2009-04-29 22:39:01.000000000 +0200
-+++ hplip-3.9.4b/base/utils.py	2009-05-16 00:06:50.000000000 +0200
-@@ -1572,6 +1572,15 @@
-     if which('kdesu'):
-         su_sudo_str = 'kdesu -- %s'
- 
-+    elif utils.which('/usr/lib/kde4/libexec/kdesu'):
-+        su_sudo_str = '/usr/lib/kde4/libexec/kdesu -- %s'
-+
-+    elif utils.which('/usr/lib64/kde4/libexec/kdesu'):
-+        su_sudo_str = '/usr/lib/kde4/libexec/kdesu -- %s'
-+
-+    elif utils.which('kdesudo'):
-+        su_sudo_str = 'kdesudo -- %s'
-+
-     elif which('gnomesu'):
-         su_sudo_str = 'gnomesu -c "%s"'
+--- hplip-3.13.8/base/password.py	2013-08-07 06:04:02.000000000 +0000
+++ hplip-3.13.8/base/password.py.tpg	2013-08-19 12:11:46.144834603 +0000
+@@ -271,6 +271,10 @@
 
+         if utils.which('kdesu'):
+             AuthType, AuthCmd = 'kdesu', 'kdesu -- %s'
+	elif utils.which('/usr/lib64/kde4/libexec/kdesu'):
+            AuthType, AuthCmd = '/usr/lib64/kde4/libexec/kdesu', 'kdesu -- %s'
+	elif utils.which('/usr/lib/kde4/libexec/kdesu'):
+            AuthType, AuthCmd = '/usr/lib/kde4/libexec/kdesu', 'kdesu -- %s'
+         elif utils.which('kdesudo'):
+             AuthType, AuthCmd = 'kdesudo', 'kdesudo -- %s'
+         elif utils.which('gnomesu'):
--- a/hplip-pjl-duplex-binding.patch
+++ b/hplip-pjl-duplex-binding.patch
@ -5,10 +5,11 @@
 ## DP: https://bugs.launchpad.net/hplip/+bug/244295

@DPATCH@
-diff -urNad hplip-2.8.7~/prnt/hpijs/ljcolor.cpp hplip-2.8.7/prnt/hpijs/ljcolor.cpp
--- hplip-2.8.7~/prnt/hpijs/ljcolor.cpp	2008-07-30 18:44:30.000000000 +0200
-+++ hplip-2.8.7/prnt/hpijs/ljcolor.cpp	2008-09-23 13:17:01.000000000 +0200
-@@ -325,6 +325,19 @@
+Index: hplip-3.12.4/prnt/hpijs/ljcolor.cpp
+===================================================================
+--- hplip-3.12.4.orig/prnt/hpijs/ljcolor.cpp	2012-04-10 18:39:32.000000000 +1000
+++ hplip-3.12.4/prnt/hpijs/ljcolor.cpp	2012-05-26 10:21:29.000000000 +1000
+@@ -330,6 +330,19 @@
 
     err = thePrinter->Send ((const BYTE *) res, strlen (res));
 
@ -28,10 +29,11 @@ diff -urNad hplip-2.8.7~/prnt/hpijs/ljcolor.cpp hplip-2.8.7/prnt/hpijs/ljcolor.c
 
     err = thePrinter->Send ((const BYTE*) EnterLanguage, sizeof (EnterLanguage));
     ERRCHECK;
-diff -urNad hplip-2.8.7~/prnt/hpijs/ljjetready.cpp hplip-2.8.7/prnt/hpijs/ljjetready.cpp
--- hplip-2.8.7~/prnt/hpijs/ljjetready.cpp	2008-07-30 18:44:30.000000000 +0200
-+++ hplip-2.8.7/prnt/hpijs/ljjetready.cpp	2008-09-23 13:17:01.000000000 +0200
-@@ -324,6 +324,17 @@
+Index: hplip-3.12.4/prnt/hpijs/ljjetready.cpp
+===================================================================
+--- hplip-3.12.4.orig/prnt/hpijs/ljjetready.cpp	2012-04-10 18:39:32.000000000 +1000
+++ hplip-3.12.4/prnt/hpijs/ljjetready.cpp	2012-05-26 10:21:29.000000000 +1000
+@@ -329,6 +329,17 @@
     err = thePrinter->Send ((const BYTE *) szScratchStr, strlen (szScratchStr));
     ERRCHECK;
 
@ -49,10 +51,11 @@ diff -urNad hplip-2.8.7~/prnt/hpijs/ljjetready.cpp hplip-2.8.7/prnt/hpijs/ljjetr
     //Set the resolution to 600
     err = thePrinter->Send ((const BYTE*)ccpPJLSetRes,sizeof(ccpPJLSetRes));
     ERRCHECK;
-diff -urNad hplip-2.8.7~/prnt/hpijs/ljmono.cpp hplip-2.8.7/prnt/hpijs/ljmono.cpp
--- hplip-2.8.7~/prnt/hpijs/ljmono.cpp	2008-07-30 18:44:30.000000000 +0200
-+++ hplip-2.8.7/prnt/hpijs/ljmono.cpp	2008-09-23 13:17:01.000000000 +0200
-@@ -207,6 +207,19 @@
+Index: hplip-3.12.4/prnt/hpijs/ljmono.cpp
+===================================================================
+--- hplip-3.12.4.orig/prnt/hpijs/ljmono.cpp	2012-04-10 18:39:32.000000000 +1000
+++ hplip-3.12.4/prnt/hpijs/ljmono.cpp	2012-05-26 10:21:29.000000000 +1000
+@@ -212,6 +212,19 @@
     err = thePrinter->Send ((const BYTE *) res, strlen (res));
     ERRCHECK;
 
--- a/simple-scan-as-default.dpatch
+++ b/simple-scan-as-default.dpatch
@ -5,10 +5,9 @@
 ## DP: No description.

@DPATCH@
-diff -urNad hplip-3.10.2~/base/utils.py hplip-3.10.2/base/utils.py
--- hplip-3.10.2~/base/utils.py	2010-02-25 00:07:40.000000000 +0100
-+++ hplip-3.10.2/base/utils.py	2010-03-24 09:05:57.660740026 +0100
-@@ -450,18 +450,21 @@
+--- a/base/utils.py
+++ b/base/utils.py
+@@ -550,18 +550,21 @@
 
         # Scan
         self.cmd_scan = ''
@ -37,10 +36,9 @@ diff -urNad hplip-3.10.2~/base/utils.py hplip-3.10.2/base/utils.py
 
         # Photo Card
         path = which('hp-unload')
-diff -urNad hplip-3.10.2~/ui4/ui_utils.py hplip-3.10.2/ui4/ui_utils.py
--- hplip-3.10.2~/ui4/ui_utils.py	2010-02-25 00:07:15.000000000 +0100
-+++ hplip-3.10.2/ui4/ui_utils.py	2010-03-24 09:07:08.200766557 +0100
-@@ -136,7 +136,7 @@
+--- a/ui4/ui_utils.py
+++ b/ui4/ui_utils.py
+@@ -141,7 +141,7 @@
 
 
     def loadDefaults(self):
--- a/try_libhpmud.so.0.dpatch
+++ b/try_libhpmud.so.0.dpatch
@ -6,60 +6,60 @@

@DPATCH@

-diff --git a/scan/sane/marvell.c b/scan/sane/marvell.c
-index c36caa7..465342e 100644
 --- a/scan/sane/marvell.c
 +++ b/scan/sane/marvell.c
-@@ -63,8 +63,11 @@ static int bb_load(struct marvell_session *ps, const char *so)
-    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
-    if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
-    {
-      BUG("unable to load restricted library: %s\n", dlerror());
-      goto bugout;
-+      if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
-+      {
-+         BUG("unable to load restricted library: %s\n", dlerror());
-+         goto bugout;
-+      }
-    } 
- 
-    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
-diff --git a/scan/sane/soap.c b/scan/sane/soap.c
-index 28b83cc..698f58c 100644
--- a/scan/sane/soap.c
-+++ b/scan/sane/soap.c
-@@ -71,8 +71,11 @@ static int bb_load(struct soap_session *ps, const char *so)
-    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
-    if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
-    {
-      BUG("unable to load restricted library: %s\n", dlerror());
-      goto bugout;
-+      if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
-+      {
-+         BUG("unable to load restricted library: %s\n", dlerror());
-+         goto bugout;
-+      }
-    } 
- 
-    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
-diff --git a/scan/sane/soapht.c b/scan/sane/soapht.c
-index 5535245..e6039c1 100644
--- a/scan/sane/soapht.c
-+++ b/scan/sane/soapht.c
-@@ -62,10 +62,13 @@ static int bb_load(struct soap_session *ps, const char *so)
+@@ -60,8 +60,14 @@
    int stat=1;
 
    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
-   if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
-+   if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
-    {
-      BUG("unable to load restricted library: %s\n", dlerror());
+-   if ((ps->hpmud_handle = load_library("libhpmud.so")) == NULL)
 -      goto bugout;
-+      if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
-+      {
-+         BUG("unable to load restricted library: %s\n", dlerror());
-+         goto bugout;
-+      }
-    } 
+   if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+   {
+     if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+     {
+       BUG("unable to load restricted library: %s\n", dlerror());
+       goto bugout;
+     }
+   } 
 
    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
+    if ((ps->math_handle = load_library("libm.so")) == NULL)
+--- a/scan/sane/soap.c
+++ b/scan/sane/soap.c
+@@ -68,8 +68,14 @@
+    int stat=1;
+ 
+    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
+-   if ((ps->hpmud_handle = load_library("libhpmud.so")) == NULL)
+-      goto bugout;
+   if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+   {
+     if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+     {
+       BUG("unable to load restricted library: %s\n", dlerror());
+       goto bugout;
+     }
+   } 
+ 
+    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
+    if ((ps->math_handle = load_library("libm.so")) == NULL)
+--- a/scan/sane/soapht.c
+++ b/scan/sane/soapht.c
+@@ -62,8 +62,14 @@
+    int stat=1;
+ 
+    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
+-   if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
+-      goto bugout;
+   if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+   {
+     if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+     {
+       BUG("unable to load restricted library: %s\n", dlerror());
+       goto bugout;
+     }
+   } 
+ 
+    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
+    if ((ps->math_handle = load_library("libm.so")) == NULL)
--- a/ubuntu-hp-mkuri-notification-text.dpatch
+++ b/ubuntu-hp-mkuri-notification-text.dpatch
@ -1,39 +0,0 @@
-#! /bin/sh -e
-## ubuntu-hp-mkuri-notification-text.dpatch by  <till.kamppeter@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Ubuntu-only!
-
-[ "`lsb_release -is 2>/dev/null`" = "Ubuntu" ] || { echo -n '(ignored)' >&2; exit 0; }
-. /usr/share/dpatch/dpatch-run
-
-@DPATCH@
-diff -urNad hplip-3.10.2~/io/hpmud/hp-mkuri.c hplip-3.10.2/io/hpmud/hp-mkuri.c
--- hplip-3.10.2~/io/hpmud/hp-mkuri.c	2010-03-17 22:56:18.000737637 +0100
-+++ hplip-3.10.2/io/hpmud/hp-mkuri.c	2010-03-17 23:00:11.610781053 +0100
-@@ -355,6 +355,8 @@
-    if (hpmud_get_key_value(datfile, model, "fax-type", value, sizeof(value)) != HPMUD_R_OK)
-       goto bugout;
-    fax = strtol(value, NULL, 10);
-+   if (hpmud_get_key_value(datfile, model, "model1", m, sizeof(m)) != HPMUD_R_OK)
-+      goto bugout;
- 
-    /* See if device is supported by hplip. */
-    if (support == HPMUD_SUPPORT_TYPE_NONE)
-@@ -372,12 +374,12 @@
-       switch (plugin)
-       {
-          case HPMUD_PLUGIN_TYPE_REQUIRED:
-            BUG("%s requires a proprietary plugin\n", pm);
-            notify(pm, "requires a proprietary plugin, run hp-setup", 30000);
-+            BUG("%s requires a proprietary plugin\n", m);
-+            notify(m, "requires a proprietary plugin, downloading and installing the plugin ...", 30000);
-             break;
-          case HPMUD_PLUGIN_TYPE_OPTIONAL:
-            BUG("%s has a optional proprietary plugin\n", pm);
-            notify(pm, "has a optional proprietary plugin, run hp-setup", 30000);
-+            BUG("%s has an optional proprietary plugin\n", m);
-+            notify(m, "has an optional proprietary plugin, run hp-plugin-ubuntu", 30000);
-             break;
-          default:
-             break;