Update to hplip 3.13.8:

Release Notes/Change Log:

HPLIP 3.13.8 - This release has the following changes:
Added Support for the Following New Printers:

- HP Deskjet 1510 All-in-One Printer
- HP Deskjet 1512 All-in-One Printer
- HP Deskjet 1513 All-in-One Printer
- HP Deskjet 2540 All-in-One Printer
- HP Deskjet 2542 All-in-One Printer
- HP Deskjet Ink Advantage 1010 Printer Series
- HP Deskjet Ink Advantage 1015 Printer
- HP Deskjet Ink Advantage 1510 All-in-One Printer Series
- HP Deskjet Ink Advantage 1515 All-in-One Printer
- HP Deskjet Ink Advantage 1516 All-in-One Printer
- HP Deskjet Ink Advantage 3540 e-All-in-One Printer Series
- HP Deskjet Ink Advantage 3545 e-All-in-One Printer
- HP Deskjet Ink Advantage 3546 e-All-in-One Printer

Launchpad fixes:

233393  - Smart install disable popup is coming for HP pen drive and HP
          CD/DVD ROM

Change log:

- Added support for Avahi network printer browsing
- Using SLP protocol by default to browse printer in hp-setup
- Fix for Failing to install libtool package in Fedora 18 during HPLIP
  installation


HPLIP 3.13.7 - This release has the following changes:
Added Support for the Following New Printers:

- HP Deskjet 1010 Printer
- HP Deskjet 1012 Printer
- HP ENVY 5530 e-All-in-One Printer
- HP ENVY 5535 e-All-in-One Printer
- HP Officejet 7610 Wide Format e-All-in-One Printer

Added support for the following new Distro's:

- Debian 7.1
- Fedora 19

Launchpad fixes:

746814  - CVE-2010-4267 Remote Stack Overflow Vulnerability
1195221 - Unable to install plugin for network printer Laserjet 2600n
1197306 - HP laserjet 1020 not printing on Ubuntu12.10 after power cycle
	  the printer
1196335 - HPLIP 3.13.6 stop working after shutting down/rebooting the
	  computer

Issues fixed:

- Unable to launch "Align Cartrides" and "Clean Cartridges" interfaces
  from HP Device Manager
- Lot of debug prints(File Pointer is NULL) are found in syslog even
  when hpLogLevel is not 15
- Updated plugin-reason for HP LaserJet Professional P1607dn Printer
  Series

4 files changed, 21 insertions, 24 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index f025a30dfa5..b7adead8ee9 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2013/07/21 15:56:37 schnoebe Exp $
+# $NetBSD: Makefile,v 1.26 2013/08/24 16:44:15 schnoebe Exp $
 #
 
-DISTNAME=		hplip-3.13.6
+DISTNAME=		hplip-3.13.8
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
 
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index 26323a7ac00..5b04431947f 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.7 2013/07/21 15:56:37 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.8 2013/08/24 16:44:15 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -97,6 +97,8 @@ share/hplip/base/LedmWifi.py
 share/hplip/base/LedmWifi.pyc
 share/hplip/base/__init__.py
 share/hplip/base/__init__.pyc
+share/hplip/base/avahi.py
+share/hplip/base/avahi.pyc
 share/hplip/base/codes.py
 share/hplip/base/codes.pyc
 share/hplip/base/device.py
@@ -515,6 +517,8 @@ share/hplip/ppd/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6200_60in_photo-ps.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1000_j110_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1000_j110_series.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_1010_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_1010_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1050_j410_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1050_j410_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1100-hpijs.ppd.gz
@@ -529,6 +533,8 @@ share/hplip/ppd/HP/hp-deskjet_1220c-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1220c.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1280-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1280.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_1510_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_1510_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1600c-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1600c.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1600cm-hpijs.ppd.gz
@@ -545,6 +551,8 @@ share/hplip/ppd/HP/hp-deskjet_2510_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2510_series.ppd.gz
 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_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
@@ -569,6 +577,8 @@ share/hplip/ppd/HP/hp-deskjet_3510_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3510_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3520_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3520_series.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_3540_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_3540_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3550-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3550.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3600-hpijs.ppd.gz
@@ -865,6 +875,8 @@ share/hplip/ppd/HP/hp-envy_120_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-envy_120_series.ppd.gz
 share/hplip/ppd/HP/hp-envy_4500_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-envy_4500_series.ppd.gz
+share/hplip/ppd/HP/hp-envy_5530_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-envy_5530_series.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1000-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1000.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1005_series-hpijs.ppd.gz
@@ -1487,6 +1499,8 @@ share/hplip/ppd/HP/hp-officejet_7400_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7400_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7500_e910-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7500_e910.ppd.gz
+share/hplip/ppd/HP/hp-officejet_7610_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_7610_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_9100_series-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-officejet_9100_series-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-officejet_d_series-hpijs.ppd.gz
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index e8f72af4fe8..6ec1ed88d6c 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.7 2013/07/21 15:56:37 schnoebe Exp $
+$NetBSD: distinfo,v 1.8 2013/08/24 16:44:15 schnoebe Exp $
 
-SHA1 (hplip-3.13.6.tar.gz) = eb48fa8fa669593601c411cd22f0b5cd8ed825c4
-RMD160 (hplip-3.13.6.tar.gz) = 2acd684afbb0610232bad7402b8239f0d34ec88f
-Size (hplip-3.13.6.tar.gz) = 20785825 bytes
+SHA1 (hplip-3.13.8.tar.gz) = c91fd5231e056f03dc7e715a84afcb13074364d1
+RMD160 (hplip-3.13.8.tar.gz) = b693ecbd06acf3217a292e9465eabb4874431071
+Size (hplip-3.13.8.tar.gz) = 20836354 bytes
 SHA1 (patch-aa) = bad4a3a9570d9bbd1e0fe226b625f1ddc3f31b8c
 SHA1 (patch-ab) = ce2775ef74746aefd942bda49c4e548f7c771ff5
 SHA1 (patch-ad) = 468fbf167e1f20bb8617e444977969e46b19f3be
 SHA1 (patch-ae) = 0a4b30b841822ea3c268442d9ac1d81b3a59ad1e
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
-SHA1 (patch-io_hpmud_pml.c) = 9bd341140afbc9ddb8eb8dff7eee05365231f94f
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
 SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
 SHA1 (patch-scan.py) = 6f861843ee3b990cc1eaaa0d957cdfd5e6f5f262
diff --git a/print/hplip/patches/patch-io_hpmud_pml.c b/print/hplip/patches/patch-io_hpmud_pml.c
deleted file mode 100644
index 250aa469aa0..00000000000
--- a/print/hplip/patches/patch-io_hpmud_pml.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-io_hpmud_pml.c,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
-
-Should fix CVE-2010-4267 according to:
-https://bugzilla.redhat.com/attachment.cgi?id=468455&action=diff
-
---- io/hpmud/pml.c.orig	2011-05-14 18:26:04.000000000 +0000
-+++ io/hpmud/pml.c
-@@ -504,6 +504,8 @@ enum HPMUD_RESULT hpmud_get_pml(HPMUD_DE
-       p += 2;                               /* eat type and length */
-    }
-    
-+   if (dLen > buf_size)
-+      dLen = buf_size;
-    memcpy(buf, p, dLen);
-    *bytes_read = dLen; 
-    *type = dt;