Changes 3.15.11:

Bug fixes.

6 files changed, 80 insertions, 43 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 43548d17108..a3e37375b7e 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.46 2015/08/27 23:53:24 khorben Exp $
+# $NetBSD: Makefile,v 1.47 2015/12/07 11:02:26 adam Exp $
 
-DISTNAME=		hplip-3.15.7
-PKGREVISION=		2
-CATEGORIES=		print
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
+DISTNAME=	hplip-3.15.11
+CATEGORIES=	print
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hplip/}
 
-MAINTAINER=		schnoebe@NetBSD.org
-HOMEPAGE=		http://hplipopensource.com/
-COMMENT=		HP Linux Imaging and Printing
-LICENSE=		gnu-gpl-v2 AND mit AND modified-bsd
+MAINTAINER=	schnoebe@NetBSD.org
+HOMEPAGE=	http://hplipopensource.com/
+COMMENT=	HP Linux Imaging and Printing
+LICENSE=	gnu-gpl-v2 AND mit AND modified-bsd
 
 CONFLICTS+=		hpijs-[0-9]*
 
@@ -20,17 +19,16 @@ PKG_USERS_VARS+=        CUPS_USER
 
 BUILD_DEFS+=            CUPS_USER CUPS_GROUP VARBASE
 
-GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		aclocal autoconf automake gmake pkg-config
 USE_TOOLS+=		perl:run
-
-CONFIGURE_ARGS=		--sysconfdir=${PKG_SYSCONFDIR} \
-			--localstatedir=${VARBASE} \
-			--with-cupsbackenddir=${PREFIX}/libexec/cups/backend \
-			--with-cupsfilterdir=${PREFIX}/libexec/cups/filter \
-			--with-hpppddir=${PREFIX}/share/hplip/ppd/HP
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--with-cupsbackenddir=${PREFIX}/libexec/cups/backend
+CONFIGURE_ARGS+=	--with-cupsfilterdir=${PREFIX}/libexec/cups/filter
+CONFIGURE_ARGS+=	--with-hpppddir=${PREFIX}/share/hplip/ppd/HP
 CONFIGURE_ARGS+=	--enable-network-build
 CONFIGURE_ARGS+=	--disable-pp-build
 CONFIGURE_ARGS+=	--enable-hpcups-install
@@ -53,7 +51,6 @@ INSTALL_MAKE_FLAGS+=	mimedir=${EGDIR}/cups
 OWN_DIRS+=		${PKG_SYSCONFDIR}/hp
 OWN_DIRS+=		${VARBASE}/lib/hp
 OWN_DIRS+=		${PREFIX}/share/examples/hplip/log/hp
-
 OWN_DIRS_PERMS+=	${PREFIX}/share/examples/hplip/log/hp ${CUPS_USER} ${CUPS_GROUP} 0774
 
 PLIST_SRC=		PLIST.base
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index d9096f16aa5..6d3f4422ae3 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.17 2015/08/14 19:45:29 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.18 2015/12/07 11:02:26 adam Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -35,6 +35,7 @@ bin/hp-unload
 bin/hp-upgrade
 bin/hp-wificonfig
 bin/hpijs
+lib/libhpdiscovery.la
 lib/libhpip.la
 lib/libhpipp.la
 lib/libhpmud.la
@@ -493,11 +494,15 @@ share/hplip/ppd/HP/hp-color_laserjet_cp6015-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_cp6015-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_m452-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_m452d-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m552-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m553-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m651-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m750-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m855-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_m252-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz
@@ -506,6 +511,8 @@ share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m177fw.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz
 share/hplip/ppd/HP/hp-cp1160-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-cp1160.ppd.gz
 share/hplip/ppd/HP/hp-designjet_4000ps.ppd.gz
@@ -652,6 +659,8 @@ share/hplip/ppd/HP/hp-deskjet_400l-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_400l.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_4510_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_4510_series.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_4530_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_4530_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_460-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_460.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_4610_series-hpijs.ppd.gz
@@ -660,6 +669,10 @@ share/hplip/ppd/HP/hp-deskjet_4620_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_4620_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_4640_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_4640_series.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_4670_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_4670_series.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_4720_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_4720_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_500-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_500.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_500c-hpijs.ppd.gz
@@ -686,8 +699,12 @@ share/hplip/ppd/HP/hp-deskjet_5551-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5551.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5552-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5552.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_5570_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_5570_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5600-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5600.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_5640_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_5640_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5650-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5650.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5652-hpijs.ppd.gz
@@ -916,8 +933,14 @@ 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_4510_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-envy_4510_series.ppd.gz
+share/hplip/ppd/HP/hp-envy_4520_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-envy_4520_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-envy_5540_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-envy_5540_series.ppd.gz
 share/hplip/ppd/HP/hp-envy_5640_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-envy_5640_series.ppd.gz
 share/hplip/ppd/HP/hp-envy_5660_series-hpijs.ppd.gz
@@ -1285,6 +1308,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_m506-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m604_m605_m606-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m806-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz
@@ -1296,7 +1320,9 @@ share/hplip/ppd/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9059_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_mfp_m426_m427-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_mfp_m521-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_mfp_m527-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_mfp_m630-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_mfp_m725-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p1005-hpijs.ppd.gz
@@ -1388,6 +1414,8 @@ share/hplip/ppd/HP/hp-laserjet_p4515x.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p4515xm-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p4515xm.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m201_m202-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_m402_m403-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_m402_m403d-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m701-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m706-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz
@@ -1534,6 +1562,8 @@ share/hplip/ppd/HP/hp-officejet_4620_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4620_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4630_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4630_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_4650_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_4650_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5100_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5100_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5105-hpijs.ppd.gz
@@ -2036,6 +2066,8 @@ share/hplip/ppd/HP/hp-psc_950vr-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-psc_950vr.ppd.gz
 share/hplip/ppd/HP/hp-psc_950xi-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-psc_950xi.ppd.gz
+share/hplip/ppd/HP/hp-scanjet_pro_3500_f1-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-scanjet_pro_3500_f1.ppd.gz
 share/hplip/pqdiag.py
 share/hplip/pqdiag.pyc
 share/hplip/print.py
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index bdc397525e5..84a487142cc 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.20 2015/11/03 15:08:50 schnoebe Exp $
+$NetBSD: distinfo,v 1.21 2015/12/07 11:02:26 adam Exp $
 
-SHA1 (hplip-3.15.7.tar.gz) = f84e33b749ef34939c11b253767686c00ca2c30c
-RMD160 (hplip-3.15.7.tar.gz) = b8f5b9be838ed9261cb208df46b5aa7ef6680e31
-SHA512 (hplip-3.15.7.tar.gz) = 45458b74ec496816292c40a9c1d5aed4a288f84be62e79378e701fff5fb1cb55cc77e8415884b824602ec6af8d1155b7dc288ef7382a2e4d96b337520d541a1c
-Size (hplip-3.15.7.tar.gz) = 21979938 bytes
-SHA1 (patch-aa) = 8eb162708a48e9b1720245f65f01177418a4ed85
+SHA1 (hplip-3.15.11.tar.gz) = c28f373e85a1355c10c3112e1274138372a9c832
+RMD160 (hplip-3.15.11.tar.gz) = 1d6c50650f2e6e1d4549d0b539023e4ce51bd8c6
+SHA512 (hplip-3.15.11.tar.gz) = 003789e30f45d71a78ebcd2fa57231381ba7bf7aba0ebbcfffda5b01a9c4e8bf763c03488883aba77368920d0dea31a2e80da2d036cf5cb7d07cf65511a7eb49
+Size (hplip-3.15.11.tar.gz) = 22277756 bytes
 SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
 SHA1 (patch-ae) = c4bae69fce7d9061d4c7dc53f1f8c5404577c605
+SHA1 (patch-configure.in) = 329ff2e27acf3acb57c1afc182e8e32da45aab9a
 SHA1 (patch-diagnose_queues.py) = aa3e544dc131accf4f799d26924b50f511c8c69f
-SHA1 (patch-installer_dcheck.py) = c37121080a605b35de04af13f8ce284b0c1e7784
+SHA1 (patch-installer_dcheck.py) = e381086ccdfbdcd84d3ffe29995d5d3643709be6
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
 SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = a94c7bbdc90dd68d001ce0325b7aabcd470233eb
 SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
+SHA1 (patch-protocol_discovery_mdns.c) = 3923ebc318e702b45ea69c533d275cc16986c979
 SHA1 (patch-scan.py) = 4d942ee0580d5f1818e43164c07edd018529395d
diff --git a/print/hplip/patches/patch-aa b/print/hplip/patches/patch-configure.in
index 96f6c654063..84d92a517ef 100644
--- a/print/hplip/patches/patch-aa
+++ b/print/hplip/patches/patch-configure.in
@@ -1,11 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2015/08/27 23:53:24 khorben Exp $
+$NetBSD: patch-configure.in,v 1.1 2015/12/07 11:02:26 adam 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	2015-06-07 19:25:40.000000000 +0000
+--- configure.in.orig	2015-11-12 10:29:29.000000000 +0000
 +++ configure.in
 @@ -34,14 +34,15 @@ AC_DISABLE_STATIC
  # Checks for programs.
@@ -24,7 +19,7 @@ $NetBSD: patch-aa,v 1.4 2015/08/27 23:53:24 khorben Exp $
  
  # Checks for required header files.
  AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([cannot find pthread-devel support], 7)])
-@@ -316,25 +317,25 @@ else
+@@ -333,29 +334,29 @@ else
  fi
  AM_CONDITIONAL(LIBUSB01_BUILD, test x$libusb01_build = xyes)
  
@@ -50,6 +45,12 @@ $NetBSD: patch-aa,v 1.4 2015/08/27 23:53:24 khorben Exp $
  
  AC_ARG_WITH(hpppddir, AC_HELP_STRING([--with-hpppddir=DIR], [set hp ppd install directory [default=datadir/ppd/HP]]),
     hpppddir=$withval, hpppddir="$datadir/ppd/HP")
+    
+ # AppArmor Changes
+-AC_ARG_WITH(apparmordir, AC_HELP_STRING([--with-apparmordir=DIR], [set apparmor profile install directory [default=/etc/apparmor.d]]),
+-   apparmordir=$withval, apparmordir="/etc/apparmor.d")
++AC_ARG_WITH(apparmordir, AC_HELP_STRING([--with-apparmordir=DIR], [set apparmor profile install directory [default=sysconfdir/apparmor.d]]),
++   apparmordir=$withval, apparmordir="$sysconfdir/apparmor.d")
  
 -if test -f "/usr/share/cups/mime/mime.types"; then 
 -   abs_mimedir="/usr/share/cups/mime/"
@@ -57,11 +58,11 @@ $NetBSD: patch-aa,v 1.4 2015/08/27 23:53:24 khorben Exp $
 +   abs_mimedir="$datadir/cups/mime/"
  else
 -   abs_mimedir="/etc/cups/"
-+   abs_mimedir="$sysconfdir/etc/cups/"
++   abs_mimedir="$sysconfdir/cups/"
  fi
  AC_ARG_WITH(mimedir, AC_HELP_STRING([--with-mimedir=DIR], [set cups mime.types location [default=abs_mimedir]]),
     mimedir=$withval, mimedir="$abs_mimedir")
-@@ -467,12 +468,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
+@@ -488,12 +489,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
  
  # Determine where the PolicyKit policy file goes
  if test "$policykit" = "yes"; then
@@ -79,7 +80,7 @@ $NetBSD: patch-aa,v 1.4 2015/08/27 23:53:24 khorben Exp $
     fi
  else
     policykit_dir=
-@@ -581,6 +582,7 @@ AC_DEFINE_DIR([abs_sbindir], [sbindir])
+@@ -602,6 +603,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])
diff --git a/print/hplip/patches/patch-installer_dcheck.py b/print/hplip/patches/patch-installer_dcheck.py
index 73c7ebf88cd..610a44c415b 100644
--- a/print/hplip/patches/patch-installer_dcheck.py
+++ b/print/hplip/patches/patch-installer_dcheck.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-installer_dcheck.py,v 1.2 2015/11/03 15:08:50 schnoebe Exp $
+$NetBSD: patch-installer_dcheck.py,v 1.3 2015/12/07 11:02:26 adam Exp $
 
 Locate libraries on systems without ldconfig(8)
 
@@ -6,12 +6,6 @@ This only looks for libraries in pkgsrc's own library folder.
 
 --- installer/dcheck.py.orig	2015-06-07 19:25:11.000000000 +0000
 +++ installer/dcheck.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python2.7
- # -*- coding: utf-8 -*-
- #
- # (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P.
 @@ -99,6 +99,8 @@ def check_lib(lib, min_ver=0):
          #    pass
          #else:
diff --git a/print/hplip/patches/patch-protocol_discovery_mdns.c b/print/hplip/patches/patch-protocol_discovery_mdns.c
new file mode 100644
index 00000000000..050307123c5
--- /dev/null
+++ b/print/hplip/patches/patch-protocol_discovery_mdns.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-protocol_discovery_mdns.c,v 1.1 2015/12/07 11:02:26 adam Exp $
+
+--- protocol/discovery/mdns.c.orig	2015-12-05 13:17:06.000000000 +0000
++++ protocol/discovery/mdns.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <syslog.h>
+ #include <sys/socket.h>
++#include <sys/time.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <arpa/inet.h>