Update to hplip 3.13.10:

Significant Changes:
- Users will not be added to "lp" group. For administrative
  operation(example - Add, remove, start and stop queue etc.), which
  requires "lp" group privileges, users will be prompted to provide
  necessary authentication

Added Support for the Following New Printers:
- HP ENVY 5531 e-All-in-One Printer
- HP ENVY 5532 e-All-in-One Printer
- HP DesignJet T2500 36-in PostScript eMultifunction Printer
- HP Deskjet 1514 All-in-One Printer
- HP Deskjet 2544 All-in-One Printer
- HP Deskjet Ink Advantage 2645 All-in-One Printer
- HP Deskjet Ink Advantage 2646 All-in-One Printer
- HP Deskjet Ink Advantage 2548 All-in-One Printer
- HP LaserJet Enterprise M806 Printer Series
- HP LaserJet Enterprise M806dn Printer
- HP LaserJet Enterprise M806x+ Printer
- HP LaserJet Enterprise flow M830z Multifunction Printer
- HP LaserJet Enterprise flow M830 Mutlifunction Printer Series


Added support for the following new Distro's:
- Ubuntu 13.10 Beta
- OpenSuse 13.1 Beta

Launchpad fixes:
483217  - Possibility to install html documentation to a different
	  destination than text documentation in docdir
1220628 - Added firmware upload functionality during 'hp-setup' for
	  firmware devices.
1197416 - unsolicited "usermod -a -G sys,lp <user>" plus
	  incomprehensible request popup for root password

Issues fixed:
- Password utilities(example - gksu, kdesu and gnomesu etc.)dependency
  removed to validate password
- Supported duplex scan for HP OfficeJet Pro 7410
- Fix for CVE-2013-4325:Insecure Polkit use

7 files changed, 41 insertions, 77 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 3d949a0d58e..7f27f25f13c 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2013/09/12 16:12:13 schnoebe Exp $
+# $NetBSD: Makefile,v 1.28 2013/10/30 23:37:31 schnoebe Exp $
 #
 
-DISTNAME=		hplip-3.13.9
+DISTNAME=		hplip-3.13.10
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
 
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index c5beece91d6..f94a41c29e5 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.9 2013/09/12 16:12:13 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.10 2013/10/30 23:37:31 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -17,7 +17,6 @@ bin/hp-linefeedcal
 bin/hp-logcapture
 bin/hp-makecopies
 bin/hp-makeuri
-bin/hp-mkuri
 bin/hp-pkservice
 bin/hp-plugin
 bin/hp-pqdiag
@@ -41,7 +40,6 @@ lib/libhpmud.la
 ${PYSITELIB}/cupsext.la
 ${PYSITELIB}/hpmudext.la
 ${PYSITELIB}/pcardext.la
-lib/systemd/system/hplip-printer@.service
 libexec/cups/backend/hp
 libexec/cups/filter/foomatic-rip-hplip
 libexec/cups/filter/hpcups
@@ -85,6 +83,7 @@ share/doc/${PKGNAME}/troubleshooting.html
 share/doc/${PKGNAME}/uninstalling.html
 share/doc/${PKGNAME}/upgrading.html
 share/examples/hplip/hp/hplip.conf
+share/examples/hplip/systemd/system/hplip-printer@.service
 share/examples/hplip/udev/rules.d/56-hpmud.rules
 share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 share/hplip/__init__.py
@@ -501,6 +500,7 @@ share/hplip/ppd/HP/hp-designjet_t1200_postscript-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t1300_postscript-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t1500-postscript.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t2300_postscript-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_t2500-postscript.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t7100ps-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t7100ps_monochrome-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t770_postscript-ps.ppd.gz
@@ -552,6 +552,8 @@ share/hplip/ppd/HP/hp-deskjet_2520_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2520_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2540_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2540_series.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_2640_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_2640_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3000_j310_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3000_j310_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3050_j610_series-hpijs.ppd.gz
@@ -1193,6 +1195,7 @@ share/hplip/ppd/HP/hp-laserjet_cp_1025.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp_1025nw-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp_1025nw.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1005-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1005.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz
@@ -1237,6 +1240,7 @@ share/hplip/ppd/HP/hp-laserjet_m5035_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m5039_mfp-pcl3.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_m806-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9040_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9040_mfp-ps.ppd.gz
@@ -1969,4 +1973,3 @@ share/hplip/upgrade.py
 share/hplip/upgrade.pyc
 share/hplip/wificonfig.py
 share/hplip/wificonfig.pyc
-@pkgdir share/examples/hplip/log/hp/tmp
diff --git a/print/hplip/PLIST.scan b/print/hplip/PLIST.scan
index c54c58bbbd0..fd8249c2844 100644
--- a/print/hplip/PLIST.scan
+++ b/print/hplip/PLIST.scan
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST.scan,v 1.2 2012/11/18 00:50:42 schnoebe Exp $
+@comment $NetBSD: PLIST.scan,v 1.3 2013/10/30 23:37:31 schnoebe Exp $
 ${PYSITELIB}/scanext.la
 lib/sane/libsane-hpaio.la
 share/hplip/scan/__init__.py
 share/hplip/scan/__init__.pyc
 share/hplip/scan/sane.py
 share/hplip/scan/sane.pyc
+share/examples/hplip/sane.d/dll.conf
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 30c717845c4..624c2296ecb 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.9 2013/09/12 16:12:13 schnoebe Exp $
+$NetBSD: distinfo,v 1.10 2013/10/30 23:37:31 schnoebe Exp $
 
-SHA1 (hplip-3.13.9.tar.gz) = 208f4816661e35cc32850c0ed2b402e0c54350c6
-RMD160 (hplip-3.13.9.tar.gz) = 13983458847b1fd17019f15cf3e4c3b6f9587294
-Size (hplip-3.13.9.tar.gz) = 20878480 bytes
-SHA1 (patch-aa) = bad4a3a9570d9bbd1e0fe226b625f1ddc3f31b8c
-SHA1 (patch-ab) = ce2775ef74746aefd942bda49c4e548f7c771ff5
+SHA1 (hplip-3.13.10.tar.gz) = 8c570ea4ed64a7e1a199f70de0f72178e07de026
+RMD160 (hplip-3.13.10.tar.gz) = a0dba3605ecd64a15facfb82cbbbbb044e1a9bf8
+Size (hplip-3.13.10.tar.gz) = 20951136 bytes
+SHA1 (patch-aa) = 68bede16003a2d43c93a0ef547857b9e4196312e
+SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
 SHA1 (patch-ad) = e993aee9ffc51b32861d7cd17798b2bfd7742fb5
-SHA1 (patch-ae) = 0a4b30b841822ea3c268442d9ac1d81b3a59ad1e
+SHA1 (patch-ae) = 0dfdef7ebb56b04c7d910bf0add1a035fc32a7e7
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
 SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
diff --git a/print/hplip/patches/patch-aa b/print/hplip/patches/patch-aa
index efd20a3f2c3..1ea1950b438 100644
--- a/print/hplip/patches/patch-aa
+++ b/print/hplip/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2012/06/23 04:50:07 schnoebe Exp $
+$NetBSD: patch-aa,v 1.3 2013/10/30 23:37:31 schnoebe Exp $
 
 # lots of portability changes to configure.in, removing hard-coded paths
 # and pulling in the dynamic library loading modules..
 
 # pushed upstream as https://bugs.launchpad.net/hplip/+bug/726207
 
---- configure.in.orig	2012-06-05 09:32:41.000000000 +0000
+--- configure.in.orig	2013-10-11 09:40:26.000000000 +0000
 +++ configure.in
 @@ -34,14 +34,15 @@ AC_DISABLE_STATIC
  # Checks for programs.
@@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.2 2012/06/23 04:50:07 schnoebe Exp $
  fi
  AC_ARG_WITH(mimedir, AC_HELP_STRING([--with-mimedir=DIR], [set cups mime.types location [default=abs_mimedir]]),
     mimedir=$withval, mimedir="$abs_mimedir")
-@@ -469,12 +470,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
+@@ -471,12 +472,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
  
  # Determine where the PolicyKit policy file goes
  if test "$policykit" = "yes"; then
@@ -79,19 +79,11 @@ $NetBSD: patch-aa,v 1.2 2012/06/23 04:50:07 schnoebe Exp $
     fi
  else
     policykit_dir=
-@@ -579,6 +580,7 @@ AC_DEFINE_DIR([abs_datadir], [datadir])
- AC_DEFINE_DIR([abs_sbindir], [sbindir])
+@@ -582,6 +583,7 @@ AC_DEFINE_DIR([abs_sbindir], [sbindir])
  AC_DEFINE_DIR([abs_hpppddir], [hpppddir])
  AC_DEFINE_DIR([abs_docdir], [hpdocdir])
+ AC_DEFINE_DIR([abs_htmldir], [hphtmldir])
 +AC_DEFINE_DIR([abs_icondir], [icondir])
  abs_ppddir=${abs_hpppddir%/*}
  AC_DEFINE_DIR([abs_drvdir], [drvdir])
  
-@@ -586,6 +588,7 @@ AC_SUBST(abs_datadir) 
- AC_SUBST(abs_sbindir) 
- AC_SUBST(abs_hpppddir) 
- AC_SUBST(abs_docdir) 
-+AC_SUBST(abs_icondir) 
- AC_SUBST(abs_ppddir) 
- AC_SUBST(abs_drvdir) 
- AC_SUBST(abs_mimedir) 
diff --git a/print/hplip/patches/patch-ab b/print/hplip/patches/patch-ab
index 83b15644a26..4f240980616 100644
--- a/print/hplip/patches/patch-ab
+++ b/print/hplip/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
+$NetBSD: patch-ab,v 1.2 2013/10/30 23:37:31 schnoebe Exp $
 
 # reported upstream as https://bugs.launchpad.net/hplip/+bug/726211
 
---- hplip.conf.in.orig	2010-07-19 02:17:45.000000000 +0000
+--- hplip.conf.in.orig	2013-10-11 09:40:14.000000000 +0000
 +++ hplip.conf.in
-@@ -9,7 +9,7 @@ run=/var/run
- ppd=@abs_hpppddir@
+@@ -10,7 +10,7 @@ ppd=@abs_hpppddir@
  ppdbase=@abs_ppddir@
  doc=@abs_docdir@
+ html=@abs_htmldir@
 -icon=@icondir@
 +icon=@abs_icondir@
  cupsbackend=@cupsbackenddir@
diff --git a/print/hplip/patches/patch-ae b/print/hplip/patches/patch-ae
index 474f657941e..bdb1f116138 100644
--- a/print/hplip/patches/patch-ae
+++ b/print/hplip/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.7 2013/07/21 15:56:37 schnoebe Exp $
+$NetBSD: patch-ae,v 1.8 2013/10/30 23:37:31 schnoebe Exp $
 
 # Conform to autoconf's standard variable usage, making it easier
 # to install on pkgsrc platforms
@@ -8,14 +8,14 @@ $NetBSD: patch-ae,v 1.7 2013/07/21 15:56:37 schnoebe Exp $
 # still needs to handle the buildlink path for libusb-1.0 :(
 # schnoebe -- Fri May 24 14:55:57 CDT 2013
 
---- Makefile.am.orig	2013-06-21 06:57:55.000000000 +0000
+--- Makefile.am.orig	2013-10-11 09:40:14.000000000 +0000
 +++ Makefile.am
-@@ -110,22 +110,22 @@ hp_mkuri_LDADD = -ldl libhpmud.la
- hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
+@@ -105,22 +105,22 @@ libhpip_la_SOURCES = ip/xconvolve.c ip/x
+ 
  
  #hpmud rules data dir
 -rulessystemdir=/usr/lib/systemd/system
-+rulessystemdir=$(libdir)/systemd/system
++rulessystemdir=$(sysconfdir)/systemd/system
  dist_rulessystem_DATA =data/rules/hplip-printer@.service
  
  # hpmud.rules
@@ -37,7 +37,7 @@ $NetBSD: patch-ae,v 1.7 2013/07/21 15:56:37 schnoebe Exp $
  hplip_conf_DATA = hplip.conf
  
  #pstotiff filter
-@@ -133,12 +133,12 @@ pstotiffdir = $(cupsfilterdir)
+@@ -128,7 +128,7 @@ pstotiffdir = $(cupsfilterdir)
  pstotiff_SCRIPTS = fax/filters/pstotiff
  
  # hplip.state
@@ -45,15 +45,8 @@ $NetBSD: patch-ae,v 1.7 2013/07/21 15:56:37 schnoebe Exp $
 +hplip_statedir = $(localstatedir)/lib/hp
  dist_hplip_state_DATA =
  
- # Log Files
--hplip_Logdir=/var/log/hp
--hplip_tmpdir=/var/log/hp/tmp
-+hplip_Logdir= $(localstatedir)/log/hp
-+hplip_tmpdir= $(localstatedir)/log/hp/tmp
- 
  if FULL_BUILD
- 
-@@ -355,9 +355,9 @@ endif
+@@ -344,9 +344,9 @@ endif
  
  # PolicyKit
  if POLICYKIT_INSTALL
@@ -65,48 +58,23 @@ $NetBSD: patch-ae,v 1.7 2013/07/21 15:56:37 schnoebe Exp $
  dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service
  policykit_policydir = $(policykit_dir)
  dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy
-@@ -546,38 +546,30 @@ 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 775 $(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 775 $(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 0775 $(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 0775 $(DESTDIR)$(hplip_tmpdir)
- endif	#FULL_BUILD
- 
- install-data-hook:
+@@ -525,13 +525,13 @@ install-data-hook:
  if HPLIP_BUILD
  #	   If scanner build, add hpaio entry to sane dll.conf.
  	if [ "$(scan_build)" = "yes" ]; then \
 -	   $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
 -	   if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
 -		  touch $(DESTDIR)/etc/sane.d/dll.conf; \
-+	   $(mkinstalldirs) $(DESTDIR)$(sysconfidir)/sane.d; \
-+	   if [ ! -f $(DESTDIR)$(sysconfidir)/sane.d/dll.conf ]; then \
-+		  touch $(DESTDIR)$(sysconfidir)/sane.d/dll.conf; \
++	   $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/sane.d; \
++	   if [ ! -f $(DESTDIR)$(sysconfdir)/sane.d/dll.conf ]; then \
++		  touch $(DESTDIR)$(sysconfdir)/sane.d/dll.conf; \
  	   fi; \
 -	   if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
 -		  echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
 -		  echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
-+	   if ! grep ^hpaio $(DESTDIR)$(sysconfidir)/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
-+		  echo "Adding hpaio entry to $(sysconfidir)/sane.d/dll.conf." ; \
-+		  echo hpaio >>$(DESTDIR)$(sysconfidir)/sane.d/dll.conf ; \
++	   if ! grep ^hpaio $(DESTDIR)$(sysconfdir)/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
++		  echo "Adding hpaio entry to $(sysconfdir)/sane.d/dll.conf." ; \
++		  echo hpaio >>$(DESTDIR)$(sysconfdir)/sane.d/dll.conf ; \
  	   fi \
  	fi
  if FULL_BUILD