[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 49fa5980aaddd8588b13231c3362de007b0f424a

public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed

From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 49fa5980aaddd8588b13231c3362de007b0f424a
Date: Tue, 03 Jul 2018 10:47:46 +0100	[thread overview]
Message-ID: <20180703094747.967661081BCF@git01.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 102862 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  49fa5980aaddd8588b13231c3362de007b0f424a (commit)
       via  15a3aa45cf27c61a581f892b5f3a3905335a12b0 (commit)
       via  8ae4010b312830bce82721325f0aeae524b2810a (commit)
       via  461d78b412ed4100113cdc08fefaae6a4be3eabe (commit)
       via  b9365dcc951aa6ecac1a902dfac3d3b0d31ceeab (commit)
       via  a4a1f16c170ecb914f316ca5dcd34dceb0935525 (commit)
       via  b4208f1845a5e31c7ef8147253727fbaa59bf939 (commit)
       via  373590b7c3fb00e60d928b1b660105d4473536e1 (commit)
       via  a65d07ec6d36a712882294b608e718db2d56b24e (commit)
       via  b07b1bef22eae7038e7d0fcba0bfd53813f85258 (commit)
       via  b06e1f696d146cd22fde03add13af6489efcbd81 (commit)
       via  d30edb595e433a72e4d218aae050d33451bb55b1 (commit)
       via  571cfa9718e7457f967a72f078153a5a2b893d45 (commit)
      from  e6aa297eb3b9b1f4d8047091a9cce5f5aa225ae8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 49fa5980aaddd8588b13231c3362de007b0f424a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jul 3 10:34:57 2018 +0100

    Update languages
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 15a3aa45cf27c61a581f892b5f3a3905335a12b0
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date:   Thu Jun 21 11:46:36 2018 +0200

    OpenVPN: Clarify fundamental crypto errors but also warnings in WUI
    
    Since OpenVPN-2.4.x, a lot of changes has been introduced. This patch should help the users for better understanding of errors in the cryptography.
    It includes also potential warnings for upcoming changes and needed adjustments in the system.
    This can also be extended in the future for upcoming configuration changes.
    
    Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 8ae4010b312830bce82721325f0aeae524b2810a
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date:   Thu Jun 21 11:12:53 2018 +0200

    OpenVPN: Prevent internal server error cause of bad header wrapper
    
    This fixes #11772 .
    
    If the X509 are deleted, the openvpnctrl output generates a bad header wrapper error from the CGI
    which causes an internal server error. The redirection of the openvpnctrl output fixes this.
    
    Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 461d78b412ed4100113cdc08fefaae6a4be3eabe
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date:   Thu Jun 21 13:52:13 2018 +0200

    hplip: Update to version 3.18.6
    
    Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b9365dcc951aa6ecac1a902dfac3d3b0d31ceeab
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Jun 27 19:39:14 2018 +0200

    guardian: Update to 2.0.2
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit a4a1f16c170ecb914f316ca5dcd34dceb0935525
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Jun 27 19:39:13 2018 +0200

    guardian.cgi: Remove support for owncloud
    
    Owncloud as an addon has been dropped for IPFire. As a result of this,
    we do not need this code anymore.
    
    Fixes #11572.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b4208f1845a5e31c7ef8147253727fbaa59bf939
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jul 3 10:33:23 2018 +0100

    core123: Ship updated sysctl.conf
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 373590b7c3fb00e60d928b1b660105d4473536e1
Author: Peter Müller <peter.mueller(a)link38.eu>
Date:   Sat Jun 30 11:44:06 2018 +0200

    hide kernel addresses in /proc
    
    Make sure kernel address space is hidden from files somewhere
    in /proc . This reduces attack surface and partially addresses #11659.
    
    Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit a65d07ec6d36a712882294b608e718db2d56b24e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jul 3 10:32:43 2018 +0100

    core123: Ship updated usbutils
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b07b1bef22eae7038e7d0fcba0bfd53813f85258
Author: Peter Müller <peter.mueller(a)link38.eu>
Date:   Sat Jun 30 17:04:42 2018 +0200

    usbutils: update to 010
    
    Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b06e1f696d146cd22fde03add13af6489efcbd81
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jul 3 10:32:08 2018 +0100

    core123: Ship updated GeoIP.dat
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d30edb595e433a72e4d218aae050d33451bb55b1
Author: Peter Müller <peter.mueller(a)link38.eu>
Date:   Sat Jun 30 17:10:12 2018 +0200

    update GeoIP.dat database
    
    There are two GeoIP databases used in IPFire: One for firewall
    rules, which is downloaded and installed automatically, and a
    second one ("GeoIP.dat") for WebUI lookups via the Perl interface.
    
    The latter one is not updated automatically and was outdated.
    libloc will make things much easier here...
    
    Fixes #11777.
    
    Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 571cfa9718e7457f967a72f078153a5a2b893d45
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jul 2 19:10:36 2018 +0100

    multipath-tools: Update to 0.7.7
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/etc/sysctl.conf                             |    6 +
 config/rootfiles/common/multipath-tools            |    4 +-
 config/rootfiles/core/123/filelists/files          |    2 +
 .../{oldcore/66 => core/123}/filelists/usbutils    |    0
 config/rootfiles/packages/hplip                    | 1020 +++++++++++++++++++-
 doc/language_issues.de                             |    1 -
 doc/language_issues.en                             |    1 -
 doc/language_issues.es                             |    6 +-
 doc/language_issues.fr                             |    6 +-
 doc/language_issues.it                             |    6 +-
 doc/language_issues.nl                             |    6 +-
 doc/language_issues.pl                             |    6 +-
 doc/language_issues.ru                             |    6 +-
 doc/language_issues.tr                             |    6 +-
 doc/language_missings                              |   35 +
 html/cgi-bin/guardian.cgi                          |   21 -
 html/cgi-bin/ovpnmain.cgi                          |   55 +-
 langs/de/cgi-bin/de.pl                             |    5 +
 langs/en/cgi-bin/en.pl                             |    5 +
 lfs/GeoIP                                          |    4 +-
 lfs/guardian                                       |    6 +-
 lfs/hplip                                          |   18 +-
 lfs/multipath-tools                                |    4 +-
 lfs/usbutils                                       |    4 +-
 24 files changed, 1143 insertions(+), 90 deletions(-)
 copy config/rootfiles/{oldcore/66 => core/123}/filelists/usbutils (100%)

Difference in files:
diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index f3897c3c7..011c4287e 100644
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -42,3 +42,9 @@ net.netfilter.nf_conntrack_acct=1
 net.bridge.bridge-nf-call-ip6tables = 0
 net.bridge.bridge-nf-call-iptables = 0
 net.bridge.bridge-nf-call-arptables = 0
+
+# Try to keep kernel address exposures out of various /proc files (kallsyms, modules, etc).
+kernel.kptr_restrict = 1
+
+# Avoid kernel memory address exposures via dmesg.
+kernel.dmesg_restrict = 1
diff --git a/config/rootfiles/common/multipath-tools b/config/rootfiles/common/multipath-tools
index b88962107..aa3f9d138 100644
--- a/config/rootfiles/common/multipath-tools
+++ b/config/rootfiles/common/multipath-tools
@@ -1,4 +1,4 @@
-#etc/udev/rules.d/kpartx.rules
-#lib/udev/kpartx_id
 #sbin/kpartx
+#usr/lib/udev/rules.d/11-dm-parts.rules
+#usr/lib/udev/rules.d/68-del-part-nodes.rules
 #usr/share/man/man8/kpartx.8.gz
diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files
index 52586b9d4..000df8f5f 100644
--- a/config/rootfiles/core/123/filelists/files
+++ b/config/rootfiles/core/123/filelists/files
@@ -3,12 +3,14 @@ etc/issue
 etc/rc.d/helper/aws-setup
 etc/rc.d/init.d/aws
 etc/rc.d/rcsysinit.d/S74aws
+etc/sysctl.conf
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/sbin/dhclient
+usr/share/GeoIP/GeoIP.dat
 var/ipfire/backup/exclude
 var/ipfire/langs
 var/ipfire/aws-functions.pl
diff --git a/config/rootfiles/core/123/filelists/usbutils b/config/rootfiles/core/123/filelists/usbutils
new file mode 120000
index 000000000..31db5a7ac
--- /dev/null
+++ b/config/rootfiles/core/123/filelists/usbutils
@@ -0,0 +1 @@
+../../../common/usbutils
\ No newline at end of file
diff --git a/config/rootfiles/packages/hplip b/config/rootfiles/packages/hplip
index 74a271140..424af5860 100644
--- a/config/rootfiles/packages/hplip
+++ b/config/rootfiles/packages/hplip
@@ -1,55 +1,86 @@
-#usr/share/doc/hplip-3.12.6
-#usr/share/doc/hplip-3.12.6/COPYING
-#usr/share/doc/hplip-3.12.6/README_LIBJPG
-#usr/share/doc/hplip-3.12.6/commandline.html
-#usr/share/doc/hplip-3.12.6/copying.html
-#usr/share/doc/hplip-3.12.6/copyright
-#usr/share/doc/hplip-3.12.6/devicemanager.html
-#usr/share/doc/hplip-3.12.6/faxtrouble.html
-#usr/share/doc/hplip-3.12.6/gettinghelp.html
-#usr/share/doc/hplip-3.12.6/hpscan.html
-#usr/share/doc/hplip-3.12.6/images
-#usr/share/doc/hplip-3.12.6/images/favicon.ico
-#usr/share/doc/hplip-3.12.6/images/print.png
-#usr/share/doc/hplip-3.12.6/images/toolbox_actions.png
-#usr/share/doc/hplip-3.12.6/images/toolbox_fax.png
-#usr/share/doc/hplip-3.12.6/images/toolbox_print_control.png
-#usr/share/doc/hplip-3.12.6/images/toolbox_print_settings.png
-#usr/share/doc/hplip-3.12.6/images/toolbox_status.png
-#usr/share/doc/hplip-3.12.6/images/toolbox_supplies.png
-#usr/share/doc/hplip-3.12.6/images/xsane.png
-#usr/share/doc/hplip-3.12.6/index.html
-#usr/share/doc/hplip-3.12.6/mainttask.html
-#usr/share/doc/hplip-3.12.6/plugins.html
-#usr/share/doc/hplip-3.12.6/print.html
-#usr/share/doc/hplip-3.12.6/printing.html
-#usr/share/doc/hplip-3.12.6/printoptions.html
-#usr/share/doc/hplip-3.12.6/printtroubleshooting.html
-#usr/share/doc/hplip-3.12.6/scanning.html
-#usr/share/doc/hplip-3.12.6/scantrouble.html
-#usr/share/doc/hplip-3.12.6/sendfax.html
-#usr/share/doc/hplip-3.12.6/setup.html
-#usr/share/doc/hplip-3.12.6/styles
-#usr/share/doc/hplip-3.12.6/styles/css.css
-#usr/share/doc/hplip-3.12.6/systray.html
-#usr/share/doc/hplip-3.12.6/troubleshooting.html
-#usr/share/doc/hplip-3.12.6/uninstalling.html
-#usr/share/doc/hplip-3.12.6/upgrading.html
-usr/share/hplip
-#usr/share/ppd
+#usr/share/doc/hplip-3.18.6
+#usr/share/doc/hplip-3.18.6/COPYING
+#usr/share/doc/hplip-3.18.6/README_LIBJPG
+#usr/share/doc/hplip-3.18.6/commandline.html
+#usr/share/doc/hplip-3.18.6/copying.html
+#usr/share/doc/hplip-3.18.6/copyright
+#usr/share/doc/hplip-3.18.6/devicemanager.html
+#usr/share/doc/hplip-3.18.6/faxtrouble.html
+#usr/share/doc/hplip-3.18.6/gettinghelp.html
+#usr/share/doc/hplip-3.18.6/hpscan.html
+#usr/share/doc/hplip-3.18.6/images
+#usr/share/doc/hplip-3.18.6/images/favicon.ico
+#usr/share/doc/hplip-3.18.6/images/print.png
+#usr/share/doc/hplip-3.18.6/images/toolbox_actions.png
+#usr/share/doc/hplip-3.18.6/images/toolbox_fax.png
+#usr/share/doc/hplip-3.18.6/images/toolbox_print_control.png
+#usr/share/doc/hplip-3.18.6/images/toolbox_print_settings.png
+#usr/share/doc/hplip-3.18.6/images/toolbox_status.png
+#usr/share/doc/hplip-3.18.6/images/toolbox_supplies.png
+#usr/share/doc/hplip-3.18.6/images/xsane.png
+#usr/share/doc/hplip-3.18.6/index.html
+#usr/share/doc/hplip-3.18.6/mainttask.html
+#usr/share/doc/hplip-3.18.6/plugins.html
+#usr/share/doc/hplip-3.18.6/print.html
+#usr/share/doc/hplip-3.18.6/printing.html
+#usr/share/doc/hplip-3.18.6/printoptions.html
+#usr/share/doc/hplip-3.18.6/printtroubleshooting.html
+#usr/share/doc/hplip-3.18.6/scanning.html
+#usr/share/doc/hplip-3.18.6/scantrouble.html
+#usr/share/doc/hplip-3.18.6/sendfax.html
+#usr/share/doc/hplip-3.18.6/setup.html
+#usr/share/doc/hplip-3.18.6/styles
+#usr/share/doc/hplip-3.18.6/styles/css.css
+#usr/share/doc/hplip-3.18.6/systray.html
+#usr/share/doc/hplip-3.18.6/troubleshooting.html
+#usr/share/doc/hplip-3.18.6/uninstalling.html
+#usr/share/doc/hplip-3.18.6/upgrading.html
+#usr/share/hplip
+usr/share/hplip/dat2drv
+usr/share/hplip/locatedriver
 usr/share/ppd/HP
+#usr/share/ppd/HP/apollo-2100.ppd.gz
+#usr/share/ppd/HP/apollo-2150.ppd.gz
+#usr/share/ppd/HP/apollo-2200.ppd.gz
+#usr/share/ppd/HP/apollo-2500.ppd.gz
+#usr/share/ppd/HP/apollo-2600.ppd.gz
+#usr/share/ppd/HP/apollo-2650.ppd.gz
+#usr/share/ppd/HP/apollo-p2000-u.ppd.gz
+#usr/share/ppd/HP/apollo-p2250.ppd.gz
+#usr/share/ppd/HP/hp-2000c.ppd.gz
+#usr/share/ppd/HP/hp-2500c.ppd.gz
+#usr/share/ppd/HP/hp-910.ppd.gz
+#usr/share/ppd/HP/hp-915.ppd.gz
+#usr/share/ppd/HP/hp-amp.ppd.gz
+#usr/share/ppd/HP/hp-business_inkjet_1000.ppd.gz
+#usr/share/ppd/HP/hp-business_inkjet_1100.ppd.gz
+#usr/share/ppd/HP/hp-business_inkjet_1200.ppd.gz
+#usr/share/ppd/HP/hp-business_inkjet_2200.ppd.gz
+#usr/share/ppd/HP/hp-business_inkjet_2230.ppd.gz
+#usr/share/ppd/HP/hp-business_inkjet_2250-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-business_inkjet_2250-ps.ppd.gz
+#usr/share/ppd/HP/hp-business_inkjet_2280-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-business_inkjet_2280-ps.ppd.gz
+#usr/share/ppd/HP/hp-business_inkjet_2300-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-business_inkjet_2300-ps.ppd.gz
+#usr/share/ppd/HP/hp-business_inkjet_2600-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-business_inkjet_2600-ps.ppd.gz
+#usr/share/ppd/HP/hp-business_inkjet_2800-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-business_inkjet_2800-ps.ppd.gz
+#usr/share/ppd/HP/hp-business_inkjet_3000-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-business_inkjet_3000-ps.ppd.gz
 #usr/share/ppd/HP/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
 #usr/share/ppd/HP/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_inkjet_cp1700.ppd.gz
+#usr/share/ppd/HP/hp-color_inkjet_printer_cp1700.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_1600.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_2500-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_2500-ps.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_2500_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_2500_series.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_2550_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_2600n.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_2605-ps.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_2605dn-ps.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_2605dtn-ps.ppd.gz
@@ -59,184 +90,1093 @@ usr/share/ppd/HP
 #usr/share/ppd/HP/hp-color_laserjet_2820-ps.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_2830-ps.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_2840-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_3000-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_3000-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_3500.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_3500n.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_3550.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_3550n.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_3600.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_3700-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_3700-ps.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_3700n-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_3700n.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_3800-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_3800-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_4500-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_4500-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_4550-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_4550-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_4600-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_4600-ps.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_4600_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_4600_series.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_4610-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_4610-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_4650-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_4650-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_4700-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_4700-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_4730mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_4730mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_5.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_5500-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_5500-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_5550-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_5550-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_5m-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_5m-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_8500-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_8500-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_8550-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_8550-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_9500-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_9500-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_9500_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_9500_mfp-ps.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm1015-ps.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm1017-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm1312_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm2320_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm3530_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm4540_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm4730_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm6030_mfp-ps.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm6040_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm6040_mfp.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cm6049_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cm6049_mfp.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp1215.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp1217.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp1514n-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp1514n-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp1515n-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp1515n-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp1518ni-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp1518ni-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp2025-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp2025-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp2025dn-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp2025dn-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp2025n-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp2025n-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp2025x-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp2025x-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp3505-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp3505-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp3525-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp3525-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp4005-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp4005-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp4020_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp4020_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp4520_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp4520_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp5225-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp5225-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp5225dn-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp5225dn-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp5225n-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp5225n-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp5520_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp5520_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_cp6015-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-color_laserjet_cp6015-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_e65050_e65060-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_e67550_e67560-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_m153-m154-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_m253-m254-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_m452-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_m452d-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_m552-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_m553-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_m651-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_m652_m653-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_m750-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_m855-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_pro_m252-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_pro_mfp_m176n.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_pro_mfp_m177fw.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz
+#usr/share/ppd/HP/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz
+#usr/share/ppd/HP/hp-cp1160.ppd.gz
 #usr/share/ppd/HP/hp-designjet_4000ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_4020ps-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_4500mfp.ppd.gz
 #usr/share/ppd/HP/hp-designjet_4500ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_4520mfp-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_4520ps-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_d5800-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t1100ps_24in-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t1100ps_44in-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t1120ps_24in-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t1120ps_44in-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t1200_postscript-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t1300_postscript-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_t1500-postscript.ppd.gz
+#usr/share/ppd/HP/hp-designjet_t1700_postscript-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_t1700dr_postscript-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t2300_postscript-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_t2500-postscript.ppd.gz
+#usr/share/ppd/HP/hp-designjet_t3500-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t7100ps-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t7100ps_monochrome-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_t7200-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t770_postscript-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t770ps_24in-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t790ps_24in-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_t790ps_44in-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_t795ps_44in-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_t920-postscript.ppd.gz
+#usr/share/ppd/HP/hp-designjet_z2600_postscript-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_z5200_postscript-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_z5400-postscript.ppd.gz
+#usr/share/ppd/HP/hp-designjet_z5600_postscript-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
 #usr/share/ppd/HP/hp-designjet_z6200_60in_photo-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_z6600-postscript.ppd.gz
+#usr/share/ppd/HP/hp-designjet_z6610ps_60in-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_z6800_photo-postscript.ppd.gz
+#usr/share/ppd/HP/hp-designjet_z6810ps_42in-ps.ppd.gz
+#usr/share/ppd/HP/hp-designjet_z6810ps_60in-ps.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1000_j110_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1010_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1050_j410_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1100.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1110_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1120.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1125.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1200c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1220c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1280.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1510_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1600c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1600cm.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_1600cn.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_2000_j210_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_2020_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_2050_j510_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_2130_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_2200_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_2510_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_2520_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_2540_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_2600_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_2640_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3000_j310_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3050_j610_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3050a_j611_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3070_b611_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3320.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3325.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3420.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3425.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3450.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3500.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3510_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3520_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3540_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3550.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3600.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3630_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3650.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3700_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3740.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3810.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3816.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3819.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3820.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3822.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3830_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3840.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3870.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3900.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3910.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3920.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_3940.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_400.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_400l.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_4510_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_4530_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_460.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_4610_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_4620_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_4640_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_4670_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_4720_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_500.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5000_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_500c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_505j.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_510.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5100.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_520.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5200_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_540.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5400_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_550c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5520_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5550.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5551.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5552.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5570_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5600.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5640_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5650.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5652.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5700.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5730_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5800.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5810_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5820_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5850.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_5900_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_600.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_610c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_610cl.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_6120.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_6122.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_6127.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_612c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_630c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_632c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_640c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_648c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_6500.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_6520_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_656c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_660.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_6600.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_670.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_670c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_670tv.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_672c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_680.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_6800.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_682.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_690.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_690c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_692.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_693.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_694.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_6940_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_695.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_697.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_6980_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_810c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_812c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_815c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_816c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_825c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_830c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_832c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_840c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_841c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_842c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_843c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_845c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_850c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_855c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_870c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_880c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_882c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_890c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_895c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_916c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_920c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_9300.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_930c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_932c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_933c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_934c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_935c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_940c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_948c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_950c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_952c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_955c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_957c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_959c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_9600.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_960c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_970c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_975c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_9800.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_980c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_990c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_995c.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d1300_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d1400_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d1500_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d1600_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d2300_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d2400_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d2500_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d2600_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d4100_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d4200_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d4300_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d5500_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_d730.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_f2100_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_f2200_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_f2400_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_f300_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_f4100_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_f4200_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_f4210_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_f4213_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_f4400_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_f4500_series.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_f735.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_ink_adv_2010_k010.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_ink_adv_2060_k110.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_ink_advant_k109a-z.ppd.gz
+#usr/share/ppd/HP/hp-deskjet_ink_advant_k209a-z.ppd.gz
+#usr/share/ppd/HP/hp-dj350.ppd.gz
+#usr/share/ppd/HP/hp-dj450.ppd.gz
+#usr/share/ppd/HP/hp-envy_100_d410_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_110_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_120_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_4500_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_4510_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_4520_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_5000_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_5530_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_5540_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_5640_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_5660_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_7640_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_8000_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_photo_6200_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_photo_7100_series.ppd.gz
+#usr/share/ppd/HP/hp-envy_photo_7800_series.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1000.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1005_series.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_100_color_mfp_m175-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1010.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1012.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1015.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1018.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1020.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1022-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1022n-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1022nw-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1100.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1100a.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1100xi.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1150.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1160.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1160_series.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1200-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1200-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1200n-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1200n.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1220-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1220-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1220se-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1220se.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1300-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1300-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1300n-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1300n-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1300xi-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1300xi-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1320-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1320.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1320_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1320_series-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1320n-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1320n.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1320nw-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1320nw.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_1320tn-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_1320tn.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_200_color_m251-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_200_colormfp_m276-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_2100-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_2100.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_2100_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_2100_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_2200-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_2200-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_2200_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_2200_series.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_2300-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_2300-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_2300_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_2300_series.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_2410-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_2410-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_2420-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_2420-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_2430-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_2430-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3015-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_3015-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3020-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_3020-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3030-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_3030-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3050-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_3050-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3052-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_3052-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3055.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3100.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3150.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3200.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3200m-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_3200m-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3200se.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3300_3310_3320-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3330.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3380-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_3380-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3390-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_3390-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_3392.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4000_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4000_series-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_400_m401-ps.ppd.gz
-#usr/share/ppd/HP/hp-laserjet_400_m401d-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_400_m401dne-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_400_mfp_m425-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4050_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4050_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4100_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4100_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4100_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4100_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4150_series.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4200-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4200-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4240-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4240-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4250-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4250-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4300-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4300-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4345_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4345_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4350-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4350-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4_plus-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4_plus-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4l.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4ml-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4ml.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4mp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4mp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4si-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4si-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_4v-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_4v-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_5000-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_5000.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_5000_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_5000_series-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_500_color_m551-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_500_color_mfp_m570-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_500_color_mfp_m575-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_500_mfp_m525-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_5100_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_5100_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_5200-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_5200-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_5200l-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_5200l-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_5200lx-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_5200lx.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_5l.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_5mp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_5mp-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_5p-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_5p.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_5si-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_5si-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_5si_mopier-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_5si_mopier-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_600_m601_m602_m603-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_6l.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_6mp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_6mp-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_6p-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_6p.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_700_color_mfp_m775-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_700_m712-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_8000-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_8000.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_8000_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_8000_series-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_8100_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_8100_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_8100_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_8100_series-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_8150_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_8150_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_8150_series-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_9000_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_9000_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_9000_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_9000_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_9040-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_9040-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_9040_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_9040_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_9050-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_9050-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_9050_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_9050_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_9055mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_9055mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_9065mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_9065mfp-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_cm1410_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cm1411fn-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cm1412fn-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cm1413fn-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cm1415fn-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cm1415fnw-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cm1416fnw-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cm1417fnw-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cm1418fnw-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cp1025.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cp1025nw.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_cp1520_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cp_1025.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_cp_1025nw.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_e60055-e60075-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_e62555-e62575-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_flow_mfp_m630-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m1005.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m101-m106.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m1120_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m1120n_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m1319f_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m14-m17.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m1522_mfp-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m1522n_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m1522nf_mfp-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m1530_mfp_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m2727_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m2727_mfp_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m3027_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m3027_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m3035_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m3035_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m4345_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m4345_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m4349_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m4349_mfp-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m4555_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m5025_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m5025_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m5035_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m5039_mfp-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m506-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m604_m605_m606-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m607_m608_m609-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m806-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m9040_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m9040_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m9050_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_m9059_mfp-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_m129-m134.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_m28-m31.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_m426_m427-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_m521-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_m527-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_m630-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_mfp_m725-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p1005.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p1006.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p1007.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p1008.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p1009.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p1505.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p1505n-zxs.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2014-zxs.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2014n-zxs.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2015_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_p2015_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2015d_series.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2015dn_series.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2015n_series.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2015x_series.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2035-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2035n-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2055-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_p2055_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2055d-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2055dn-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p2055x-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p3004-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_p3004-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p3005-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_p3005-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p3010_series-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_p3010_series-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_p4010_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4014.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4014dn.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4014n.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4015.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4015dn.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4015n.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4015tn.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4015x.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4515.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4515n.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4515tn.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4515x.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_p4515xm.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_m201_m202-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_m203_m206-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_m402_m403-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_m402_m403d-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_m501dn-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_m501n-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_m701-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_m706-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m125a.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m125nr.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m125nw.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m125r.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m125rnw.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m125s.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m126a.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m126nw.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m127fn.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m127fp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m127fs.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m127fw.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m128fn.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m128fp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m128fw.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m25a.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m25nw.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m26a.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m26nw.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m27c.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m27cnw.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1132_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1136_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1137_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1138_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1139_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1212nf_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1213nf_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1214nfh_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1216nfh_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1217nfw_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1218nfg_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1218nfs_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1219nf_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1219nfg_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_m1219nfs_mfp.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1102.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1102w.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1106.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1106w.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1107.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1107w.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1108.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1108w.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1109.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1109w.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1566.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1567.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1568.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1569.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1606dn.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1607dn.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1608dn.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p1609dn.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_professional_p_1102w.ppd.gz
 #usr/share/ppd/HP/hp-lj_300_400_color_m351_m451-ps.ppd.gz
 #usr/share/ppd/HP/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz
+#usr/share/ppd/HP/hp-mopier_240-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-mopier_240-ps.ppd.gz
+#usr/share/ppd/HP/hp-mopier_320-pcl3.ppd.gz
 #usr/share/ppd/HP/hp-mopier_320-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet.ppd.gz
+#usr/share/ppd/HP/hp-officejet_100_mobile_l411.ppd.gz
+#usr/share/ppd/HP/hp-officejet_150_mobile_l511.ppd.gz
+#usr/share/ppd/HP/hp-officejet_200_mobile_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_250_mobile_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_2620_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_3830_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4000_k210.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4100_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4105.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4115_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4200_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4255.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4300_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4400_k410.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4500_g510a-f.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4500_g510g-m.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4500_g510n-z.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4500_k710.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4610_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4620_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4630_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_4650_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_5100_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_5105.ppd.gz
+#usr/share/ppd/HP/hp-officejet_5110.ppd.gz
+#usr/share/ppd/HP/hp-officejet_5110v.ppd.gz
+#usr/share/ppd/HP/hp-officejet_5200_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_5500_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_5600_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_5740_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6000_e609a.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6000_e609n.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6100.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6100_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6150_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6200_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6300_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6500_e709a.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6500_e709n.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6500_e710a-f.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6500_e710n-z.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6600.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6700.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6800.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6950.ppd.gz
+#usr/share/ppd/HP/hp-officejet_6960.ppd.gz
+#usr/share/ppd/HP/hp-officejet_7000_e809a.ppd.gz
+#usr/share/ppd/HP/hp-officejet_7000_e809a_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_7100_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_7110_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_7200_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_7300_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_7400_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_7500_e910.ppd.gz
+#usr/share/ppd/HP/hp-officejet_7510_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_7610_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_8040_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_8700.ppd.gz
+#usr/share/ppd/HP/hp-officejet_9100_series-pcl3.ppd.gz
+#usr/share/ppd/HP/hp-officejet_color_mfp_x585.ppd.gz
+#usr/share/ppd/HP/hp-officejet_color_x555-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet_d_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_g55.ppd.gz
+#usr/share/ppd/HP/hp-officejet_g55xi.ppd.gz
+#usr/share/ppd/HP/hp-officejet_g85.ppd.gz
+#usr/share/ppd/HP/hp-officejet_g85xi.ppd.gz
+#usr/share/ppd/HP/hp-officejet_g95.ppd.gz
+#usr/share/ppd/HP/hp-officejet_h470.ppd.gz
+#usr/share/ppd/HP/hp-officejet_j3500_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_j3600_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_j4500_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_j4660_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_j4680_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_j5500_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_j5700_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_j6400_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_k60.ppd.gz
+#usr/share/ppd/HP/hp-officejet_k60xi.ppd.gz
+#usr/share/ppd/HP/hp-officejet_k7100.ppd.gz
+#usr/share/ppd/HP/hp-officejet_k80.ppd.gz
+#usr/share/ppd/HP/hp-officejet_k80xi.ppd.gz
+#usr/share/ppd/HP/hp-officejet_lx.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_1150c.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_1170c_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_251dw_printer-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_276dw_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_3610.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_3620.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_451_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_476_576_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_551_series-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_6230.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_6830.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_6960.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_6970.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_7720_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_7730_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_7740_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8000_a809.ppd.gz
 #usr/share/ppd/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8100.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8210-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8500_a909a.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8500_a909g.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8500_a909n.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8500_a910.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8600.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8610.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8620.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8630.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8640.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8660.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8710.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8720.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8730-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8732-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_8740-ps.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_k5300.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_k5400.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_k550.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_k850.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_k8600.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_l7300.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_l7400.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_l7500.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_l7600.ppd.gz
+#usr/share/ppd/HP/hp-officejet_pro_l7700.ppd.gz
+#usr/share/ppd/HP/hp-officejet_r40.ppd.gz
+#usr/share/ppd/HP/hp-officejet_r40xi.ppd.gz
+#usr/share/ppd/HP/hp-officejet_r45.ppd.gz
+#usr/share/ppd/HP/hp-officejet_r60.ppd.gz
+#usr/share/ppd/HP/hp-officejet_r65.ppd.gz
+#usr/share/ppd/HP/hp-officejet_r80.ppd.gz
+#usr/share/ppd/HP/hp-officejet_r80xi.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_300.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_310.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_320.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_330.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_350.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_520.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_570.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_580.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_590.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_600.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_610.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_630.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_700.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_710.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_720.ppd.gz
+#usr/share/ppd/HP/hp-officejet_series_725.ppd.gz
+#usr/share/ppd/HP/hp-officejet_t_series.ppd.gz
+#usr/share/ppd/HP/hp-officejet_v30.ppd.gz
+#usr/share/ppd/HP/hp-officejet_v40.ppd.gz
+#usr/share/ppd/HP/hp-officejet_v40xi.ppd.gz
+#usr/share/ppd/HP/hp-officejet_v45.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_352_printer-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_377_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_P77440_P77940-60-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_color_556-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_color_765-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_color_P75250-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_color_e55650-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_color_e75160-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_color_e77650-e77660-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_color_flow_mfp_586-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_color_mfp_586-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_color_mfp_780-785-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_color_mfp_e58650-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_mfp_p57750-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_p55250-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_p75050-60-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_pro_452_printer-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_pro_477_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_pro_552_printer-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_pro_577_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_pro_750-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_pro_mfp_772-777-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_4000ps-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_4500ps-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_5000ps-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_5100ps-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_6000ps-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_8000ps-ps.ppd.gz
+#usr/share/ppd/HP/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_100.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_1115.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_1215.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_1218.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_130.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_1315.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_140_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_230.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_240_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_2570_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_2600_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_2700_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_3100_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_3200_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_320_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_3300_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_330_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_370_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_380_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_420_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_470_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_5510_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_5510d_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_5520_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_6510_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_6520_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7150.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7200_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7345.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7350.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7400_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7510_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7520_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7550.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7600_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7700_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7800_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_7900_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_8000_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_8100_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_8200_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_8400_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_8700_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a310_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a320_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a430_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a440_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a510_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a520_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a530_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a610_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a620_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a630_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a640_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a710_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_a820_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_b010_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_b109a-m.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_b109a_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_b110_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_b8500_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c309a_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c3100_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c4100_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c4200_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c4340_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c4380_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c4400_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c4500_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c4600_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c4700_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c5100_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c5200_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c5300_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c5500_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c6100_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c6200_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c6300_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c7100_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c7200_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_c8100_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_d110_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_d5060_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_d5100_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_d5300_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_d5400_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_d6100_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_d7100_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_d7200_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_d7300_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_d7400_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_d7500_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_estn_c510_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_ink_adv_k510.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_p1000.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_p1100.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_plus_b209a-m.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_plus_b210_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_prem-web_c309n-s.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_prem_c310_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_prem_c410_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_premium_c309g-m.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_pro_b8300_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_pro_b8800_series.ppd.gz
+#usr/share/ppd/HP/hp-photosmart_wireless_b109n-z.ppd.gz
+#usr/share/ppd/HP/hp-postscript-inkjet.ppd.gz
+#usr/share/ppd/HP/hp-postscript-laserjet-pro.ppd.gz
+#usr/share/ppd/HP/hp-postscript-laserjet.ppd.gz
+#usr/share/ppd/HP/hp-printer_scanner_copier_300.ppd.gz
+#usr/share/ppd/HP/hp-psc_1000_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_1100_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_1200_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_1300_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_1310_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_1358_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_1400_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_1500_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_1510_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_1600_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_2100_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_2150_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_2170_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_2200_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_2210_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_2300_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_2350_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_2400_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_2500_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_500.ppd.gz
+#usr/share/ppd/HP/hp-psc_720.ppd.gz
+#usr/share/ppd/HP/hp-psc_750.ppd.gz
+#usr/share/ppd/HP/hp-psc_750xi.ppd.gz
+#usr/share/ppd/HP/hp-psc_760.ppd.gz
+#usr/share/ppd/HP/hp-psc_780.ppd.gz
+#usr/share/ppd/HP/hp-psc_780xi.ppd.gz
+#usr/share/ppd/HP/hp-psc_900_series.ppd.gz
+#usr/share/ppd/HP/hp-psc_920.ppd.gz
+#usr/share/ppd/HP/hp-psc_950.ppd.gz
+#usr/share/ppd/HP/hp-psc_950vr.ppd.gz
+#usr/share/ppd/HP/hp-psc_950xi.ppd.gz
diff --git a/doc/language_issues.de b/doc/language_issues.de
index ecc53d749..d99efac74 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -707,7 +707,6 @@ WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: guardian
 WARNING: untranslated string: guardian block a host
 WARNING: untranslated string: guardian block httpd brute-force
-WARNING: untranslated string: guardian block owncloud brute-force
 WARNING: untranslated string: guardian block ssh brute-force
 WARNING: untranslated string: guardian blockcount
 WARNING: untranslated string: guardian blocked hosts
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 27cacec22..60b6cbb46 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -740,7 +740,6 @@ WARNING: untranslated string: fwhost cust geoipgrp
 WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: guardian block a host
 WARNING: untranslated string: guardian block httpd brute-force
-WARNING: untranslated string: guardian block owncloud brute-force
 WARNING: untranslated string: guardian block ssh brute-force
 WARNING: untranslated string: guardian blockcount
 WARNING: untranslated string: guardian blocked hosts
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 93396ec02..a9bf73f69 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -728,6 +728,8 @@ WARNING: untranslated string: count
 WARNING: untranslated string: countries
 WARNING: untranslated string: country codes and flags
 WARNING: untranslated string: countrycode
+WARNING: untranslated string: crypto error
+WARNING: untranslated string: crypto warning
 WARNING: untranslated string: dead peer detection
 WARNING: untranslated string: default
 WARNING: untranslated string: deprecated fs warn
@@ -978,7 +980,6 @@ WARNING: untranslated string: grouptype
 WARNING: untranslated string: guardian
 WARNING: untranslated string: guardian block a host
 WARNING: untranslated string: guardian block httpd brute-force
-WARNING: untranslated string: guardian block owncloud brute-force
 WARNING: untranslated string: guardian block ssh brute-force
 WARNING: untranslated string: guardian blockcount
 WARNING: untranslated string: guardian blocked hosts
@@ -1090,6 +1091,8 @@ WARNING: untranslated string: ovpn dh parameters
 WARNING: untranslated string: ovpn dh upload
 WARNING: untranslated string: ovpn errmsg green already pushed
 WARNING: untranslated string: ovpn errmsg invalid ip or mask
+WARNING: untranslated string: ovpn error dh
+WARNING: untranslated string: ovpn error md5
 WARNING: untranslated string: ovpn generating the root and host certificates
 WARNING: untranslated string: ovpn ha
 WARNING: untranslated string: ovpn hmac
@@ -1099,6 +1102,7 @@ WARNING: untranslated string: ovpn no connections
 WARNING: untranslated string: ovpn port in root range
 WARNING: untranslated string: ovpn routes push
 WARNING: untranslated string: ovpn routes push options
+WARNING: untranslated string: ovpn warning rfc3280
 WARNING: untranslated string: p2p block
 WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: pakfire ago
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 376fa2146..4aaf5d3fb 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -736,6 +736,8 @@ WARNING: untranslated string: count
 WARNING: untranslated string: countries
 WARNING: untranslated string: country codes and flags
 WARNING: untranslated string: countrycode
+WARNING: untranslated string: crypto error
+WARNING: untranslated string: crypto warning
 WARNING: untranslated string: dead peer detection
 WARNING: untranslated string: default
 WARNING: untranslated string: deprecated fs warn
@@ -994,7 +996,6 @@ WARNING: untranslated string: grouptype
 WARNING: untranslated string: guardian
 WARNING: untranslated string: guardian block a host
 WARNING: untranslated string: guardian block httpd brute-force
-WARNING: untranslated string: guardian block owncloud brute-force
 WARNING: untranslated string: guardian block ssh brute-force
 WARNING: untranslated string: guardian blockcount
 WARNING: untranslated string: guardian blocked hosts
@@ -1104,6 +1105,8 @@ WARNING: untranslated string: ovpn dh
 WARNING: untranslated string: ovpn dh new key
 WARNING: untranslated string: ovpn dh parameters
 WARNING: untranslated string: ovpn dh upload
+WARNING: untranslated string: ovpn error dh
+WARNING: untranslated string: ovpn error md5
 WARNING: untranslated string: ovpn generating the root and host certificates
 WARNING: untranslated string: ovpn ha
 WARNING: untranslated string: ovpn hmac
@@ -1111,6 +1114,7 @@ WARNING: untranslated string: ovpn mgmt in root range
 WARNING: untranslated string: ovpn mtu-disc
 WARNING: untranslated string: ovpn no connections
 WARNING: untranslated string: ovpn port in root range
+WARNING: untranslated string: ovpn warning rfc3280
 WARNING: untranslated string: p2p block
 WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: pakfire ago
diff --git a/doc/language_issues.it b/doc/language_issues.it
index c8382ad0f..448c96bb1 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -753,6 +753,8 @@ WARNING: untranslated string: block
 WARNING: untranslated string: bytes
 WARNING: untranslated string: captive
 WARNING: untranslated string: check all
+WARNING: untranslated string: crypto error
+WARNING: untranslated string: crypto warning
 WARNING: untranslated string: dhcp dns enable update
 WARNING: untranslated string: dhcp dns key name
 WARNING: untranslated string: dhcp dns update
@@ -810,7 +812,6 @@ WARNING: untranslated string: guaranteed bandwith
 WARNING: untranslated string: guardian
 WARNING: untranslated string: guardian block a host
 WARNING: untranslated string: guardian block httpd brute-force
-WARNING: untranslated string: guardian block owncloud brute-force
 WARNING: untranslated string: guardian block ssh brute-force
 WARNING: untranslated string: guardian blockcount
 WARNING: untranslated string: guardian blocked hosts
@@ -868,6 +869,9 @@ WARNING: untranslated string: one year
 WARNING: untranslated string: outgoing compression in bytes per second
 WARNING: untranslated string: outgoing overhead in bytes per second
 WARNING: untranslated string: ovpn add conf
+WARNING: untranslated string: ovpn error dh
+WARNING: untranslated string: ovpn error md5
+WARNING: untranslated string: ovpn warning rfc3280
 WARNING: untranslated string: pptp netconfig
 WARNING: untranslated string: pptp peer
 WARNING: untranslated string: pptp route
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 4eb22c477..a0216f0f7 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -752,6 +752,8 @@ WARNING: untranslated string: bytes
 WARNING: untranslated string: capabilities
 WARNING: untranslated string: captive
 WARNING: untranslated string: check all
+WARNING: untranslated string: crypto error
+WARNING: untranslated string: crypto warning
 WARNING: untranslated string: default
 WARNING: untranslated string: dh
 WARNING: untranslated string: dh key move failed
@@ -824,7 +826,6 @@ WARNING: untranslated string: geoipblock enable feature
 WARNING: untranslated string: guardian
 WARNING: untranslated string: guardian block a host
 WARNING: untranslated string: guardian block httpd brute-force
-WARNING: untranslated string: guardian block owncloud brute-force
 WARNING: untranslated string: guardian block ssh brute-force
 WARNING: untranslated string: guardian blockcount
 WARNING: untranslated string: guardian blocked hosts
@@ -905,9 +906,12 @@ WARNING: untranslated string: ovpn dh
 WARNING: untranslated string: ovpn dh new key
 WARNING: untranslated string: ovpn dh parameters
 WARNING: untranslated string: ovpn dh upload
+WARNING: untranslated string: ovpn error dh
+WARNING: untranslated string: ovpn error md5
 WARNING: untranslated string: ovpn generating the root and host certificates
 WARNING: untranslated string: ovpn ha
 WARNING: untranslated string: ovpn hmac
+WARNING: untranslated string: ovpn warning rfc3280
 WARNING: untranslated string: pptp netconfig
 WARNING: untranslated string: pptp peer
 WARNING: untranslated string: pptp route
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 93396ec02..a9bf73f69 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -728,6 +728,8 @@ WARNING: untranslated string: count
 WARNING: untranslated string: countries
 WARNING: untranslated string: country codes and flags
 WARNING: untranslated string: countrycode
+WARNING: untranslated string: crypto error
+WARNING: untranslated string: crypto warning
 WARNING: untranslated string: dead peer detection
 WARNING: untranslated string: default
 WARNING: untranslated string: deprecated fs warn
@@ -978,7 +980,6 @@ WARNING: untranslated string: grouptype
 WARNING: untranslated string: guardian
 WARNING: untranslated string: guardian block a host
 WARNING: untranslated string: guardian block httpd brute-force
-WARNING: untranslated string: guardian block owncloud brute-force
 WARNING: untranslated string: guardian block ssh brute-force
 WARNING: untranslated string: guardian blockcount
 WARNING: untranslated string: guardian blocked hosts
@@ -1090,6 +1091,8 @@ WARNING: untranslated string: ovpn dh parameters
 WARNING: untranslated string: ovpn dh upload
 WARNING: untranslated string: ovpn errmsg green already pushed
 WARNING: untranslated string: ovpn errmsg invalid ip or mask
+WARNING: untranslated string: ovpn error dh
+WARNING: untranslated string: ovpn error md5
 WARNING: untranslated string: ovpn generating the root and host certificates
 WARNING: untranslated string: ovpn ha
 WARNING: untranslated string: ovpn hmac
@@ -1099,6 +1102,7 @@ WARNING: untranslated string: ovpn no connections
 WARNING: untranslated string: ovpn port in root range
 WARNING: untranslated string: ovpn routes push
 WARNING: untranslated string: ovpn routes push options
+WARNING: untranslated string: ovpn warning rfc3280
 WARNING: untranslated string: p2p block
 WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: pakfire ago
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 11fc67e66..cbcaca1ec 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -731,6 +731,8 @@ WARNING: untranslated string: count
 WARNING: untranslated string: countries
 WARNING: untranslated string: country codes and flags
 WARNING: untranslated string: countrycode
+WARNING: untranslated string: crypto error
+WARNING: untranslated string: crypto warning
 WARNING: untranslated string: dead peer detection
 WARNING: untranslated string: default
 WARNING: untranslated string: deprecated fs warn
@@ -979,7 +981,6 @@ WARNING: untranslated string: grouptype
 WARNING: untranslated string: guardian
 WARNING: untranslated string: guardian block a host
 WARNING: untranslated string: guardian block httpd brute-force
-WARNING: untranslated string: guardian block owncloud brute-force
 WARNING: untranslated string: guardian block ssh brute-force
 WARNING: untranslated string: guardian blockcount
 WARNING: untranslated string: guardian blocked hosts
@@ -1089,6 +1090,8 @@ WARNING: untranslated string: ovpn dh
 WARNING: untranslated string: ovpn dh new key
 WARNING: untranslated string: ovpn dh parameters
 WARNING: untranslated string: ovpn dh upload
+WARNING: untranslated string: ovpn error dh
+WARNING: untranslated string: ovpn error md5
 WARNING: untranslated string: ovpn generating the root and host certificates
 WARNING: untranslated string: ovpn ha
 WARNING: untranslated string: ovpn hmac
@@ -1096,6 +1099,7 @@ WARNING: untranslated string: ovpn mgmt in root range
 WARNING: untranslated string: ovpn mtu-disc
 WARNING: untranslated string: ovpn no connections
 WARNING: untranslated string: ovpn port in root range
+WARNING: untranslated string: ovpn warning rfc3280
 WARNING: untranslated string: p2p block
 WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: pptp netconfig
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 85212e18d..8a7ca44c1 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -736,12 +736,13 @@ WARNING: untranslated string: Captive clients
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
 WARNING: untranslated string: captive
+WARNING: untranslated string: crypto error
+WARNING: untranslated string: crypto warning
 WARNING: untranslated string: fwdfw all subnets
 WARNING: untranslated string: fwhost cust geoipgrp
 WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: guardian block a host
 WARNING: untranslated string: guardian block httpd brute-force
-WARNING: untranslated string: guardian block owncloud brute-force
 WARNING: untranslated string: guardian block ssh brute-force
 WARNING: untranslated string: guardian blockcount
 WARNING: untranslated string: guardian blocked hosts
@@ -778,6 +779,9 @@ WARNING: untranslated string: guardian watch snort alertfile
 WARNING: untranslated string: ike lifetime should be between 1 and 8 hours
 WARNING: untranslated string: info messages
 WARNING: untranslated string: no data
+WARNING: untranslated string: ovpn error dh
+WARNING: untranslated string: ovpn error md5
+WARNING: untranslated string: ovpn warning rfc3280
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
diff --git a/doc/language_missings b/doc/language_missings
index 7b2f04941..4e60485ce 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -185,6 +185,8 @@
 < countries
 < countrycode
 < country codes and flags
+< crypto error
+< crypto warning
 < dead peer detection
 < default
 < default ip
@@ -579,6 +581,8 @@
 < ovpn engines
 < ovpn errmsg green already pushed
 < ovpn errmsg invalid ip or mask
+< ovpn error dh
+< ovpn error md5
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn hmac
@@ -595,6 +599,7 @@
 < ovpn reneg sec
 < ovpn routes push
 < ovpn routes push options
+< ovpn warning rfc3280
 < p2p block
 < p2p block save notice
 < pptp netconfig
@@ -902,6 +907,8 @@
 < countries
 < countrycode
 < country codes and flags
+< crypto error
+< crypto warning
 < dead peer detection
 < default
 < default ip
@@ -1293,6 +1300,8 @@
 < ovpn dh parameters
 < ovpn dh upload
 < ovpn engines
+< ovpn error dh
+< ovpn error md5
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn hmac
@@ -1307,6 +1316,7 @@
 < ovpn no connections
 < ovpn port in root range
 < ovpn reneg sec
+< ovpn warning rfc3280
 < p2p block
 < p2p block save notice
 < pptp netconfig
@@ -1573,6 +1583,8 @@
 < Captive WiFi coupon
 < Captive wrong ext
 < check all
+< crypto error
+< crypto warning
 < dhcp dns enable update
 < dhcp dns key name
 < dhcp dns update
@@ -1657,6 +1669,9 @@
 < outgoing compression in bytes per second
 < outgoing overhead in bytes per second
 < ovpn add conf
+< ovpn error dh
+< ovpn error md5
+< ovpn warning rfc3280
 < pptp netconfig
 < pptp peer
 < pptp route
@@ -1781,6 +1796,8 @@
 < Captive WiFi coupon
 < Captive wrong ext
 < check all
+< crypto error
+< crypto warning
 < default
 < dh
 < dhcp dns enable update
@@ -1907,10 +1924,13 @@
 < ovpn dh parameters
 < ovpn dh upload
 < ovpn engines
+< ovpn error dh
+< ovpn error md5
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn hmac
 < ovpn reneg sec
+< ovpn warning rfc3280
 < pptp netconfig
 < pptp peer
 < pptp route
@@ -2105,6 +2125,8 @@
 < countries
 < countrycode
 < country codes and flags
+< crypto error
+< crypto warning
 < dead peer detection
 < default
 < default ip
@@ -2487,6 +2509,8 @@
 < ovpn engines
 < ovpn errmsg green already pushed
 < ovpn errmsg invalid ip or mask
+< ovpn error dh
+< ovpn error md5
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn hmac
@@ -2503,6 +2527,7 @@
 < ovpn reneg sec
 < ovpn routes push
 < ovpn routes push options
+< ovpn warning rfc3280
 < p2p block
 < p2p block save notice
 < pptp netconfig
@@ -2810,6 +2835,8 @@
 < countries
 < countrycode
 < country codes and flags
+< crypto error
+< crypto warning
 < day-graph
 < dead peer detection
 < default
@@ -3198,6 +3225,8 @@
 < ovpn dh parameters
 < ovpn dh upload
 < ovpn engines
+< ovpn error dh
+< ovpn error md5
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn hmac
@@ -3212,6 +3241,7 @@
 < ovpn no connections
 < ovpn port in root range
 < ovpn reneg sec
+< ovpn warning rfc3280
 < p2p block
 < p2p block save notice
 < pptp netconfig
@@ -3391,7 +3421,12 @@
 ############################################################################
 # Checking cgi-bin translations for language: tr                           #
 ############################################################################
+< crypto error
+< crypto warning
 < fwdfw all subnets
+< ovpn error dh
+< ovpn error md5
+< ovpn warning rfc3280
 < ssh active sessions
 < ssh login time
 < ssh no active logins
diff --git a/html/cgi-bin/guardian.cgi b/html/cgi-bin/guardian.cgi
index e15501ef5..6144aca02 100644
--- a/html/cgi-bin/guardian.cgi
+++ b/html/cgi-bin/guardian.cgi
@@ -52,7 +52,6 @@ my $ignorefile ='/var/ipfire/guardian/guardian.ignore';
 # file locations on IPFire systems.
 my %module_file_locations = (
 	"HTTPD" => "/var/log/httpd/error_log",
-	"OWNCLOUD" => "/var/owncloud/data/owncloud.log",
 	"SNORT" => "/var/log/snort/alert",
 	"SSH" => "/var/log/messages",
 );
@@ -65,11 +64,6 @@ our %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
-# Pakfire meta file for owncloud.
-# (File exists when the addon is installed.)
-my $owncloud_meta = "/opt/pakfire/db/installed/meta-owncloud";
-
-
 # File declarations.
 my $settingsfile = "${General::swroot}/guardian/settings";
 my $ignoredfile = "${General::swroot}/guardian/ignored";
@@ -96,11 +90,6 @@ $settings{'GUARDIAN_FIREWALL_ACTION'} = 'DROP';
 $settings{'GUARDIAN_LOGFILE'} = '/var/log/guardian/guardian.log';
 $settings{'GUARDIAN_SNORT_PRIORITY_LEVEL'} = '3';
 
-# Default settings for owncloud if installed.
-if ( -e "$owncloud_meta") {
-	$settings{'GUARDIAN_MONITOR_OWNCLOUD'} = 'off';
-}
-
 my $errormessage = '';
 
 &Header::showhttpheaders();
@@ -561,17 +550,7 @@ END
 				<td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_HTTPD' value='on' $checked{'GUARDIAN_MONITOR_HTTPD'}{'on'} /> /
 				<input type='radio' name='GUARDIAN_MONITOR_HTTPD' value='off' $checked{'GUARDIAN_MONITOR_HTTPD'}{'off'} /> off</td>
 			</tr>
-END
 
-			# Display owncloud checkbox when the addon is installed.
-			if ( -e "$owncloud_meta" ) {
-				print"<tr>\n";
-				print"<td width='25%' class='base'>$Lang::tr{'guardian block owncloud brute-force'}</td>\n";
-				print"<td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_OWNCLOUD' value='on' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'on'} /> /\n";
-				print"<input type='radio' name='GUARDIAN_MONITOR_OWNCLOUD' value='off' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'off'} /> off</td>\n";
-				print"</tr>\n";
-			}
-	print <<END;
 			<tr>
 				<td colspan='2'><br></td>
 			</tr>
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 4bc3473ab..c0c7cff6d 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -64,6 +64,8 @@ my %cahash=();
 my %selected=();
 my $warnmessage = '';
 my $errormessage = '';
+my $cryptoerror = '';
+my $cryptowarning = '';
 my %settings=();
 my $routes_push_file = '';
 my $confighost="${General::swroot}/fwhosts/customhosts";
@@ -1069,7 +1071,42 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   close(CLIENTCONF);
 
 }
-  
+
+###
+### Check for cryptography problems
+###
+
+# Warning if DH parameter is 1024 bit
+if (-f "${General::swroot}/ovpn/ca/dh1024.pem") {
+	my $dhlenght = `/usr/bin/openssl dhparam -text -in ${General::swroot}/ovpn/ca/dh1024.pem`;
+	if ($dhlenght =~ /1024 bit/) {
+		$cryptoerror = "$Lang::tr{'ovpn error dh'}";
+		goto CRYPTO_ERROR;
+	}
+}
+
+# Warning if md5 is in usage
+if (-f "${General::swroot}/ovpn/certs/servercert.pem") {
+	my $signature = `/usr/bin/openssl x509 -noout -text -in ${General::swroot}/ovpn/certs/servercert.pem`;
+	if ($signature =~ /md5WithRSAEncryption/) {
+		$cryptoerror = "$Lang::tr{'ovpn error md5'}";
+		goto CRYPTO_ERROR;
+	}
+}
+
+CRYPTO_ERROR:
+
+# Warning if certificate is not compliant to RFC3280 TLS rules
+if (-f "${General::swroot}/ovpn/openssl/ovpn.cnf") {
+	my $extendkeyusage = `/usr/bin/openssl x509 -noout -text -in ${General::swroot}/ovpn/certs/servercert.pem`;
+	if ($extendkeyusage =~ /TLS Web Server Authentication/) {
+		$cryptowarning = "$Lang::tr{'ovpn warning rfc3280'}";
+		goto CRYPTO_WARNING;
+	}
+}
+
+CRYPTO_WARNING:
+
 ###
 ### Save main settings
 ###
@@ -1181,7 +1218,7 @@ SETTINGS_ERROR:
 	    delete $confighash{$cgiparams{'$key'}};
 	}
 
-	system ("/usr/local/bin/openvpnctrl -drrd $name");
+	system ("/usr/local/bin/openvpnctrl -drrd $name &>/dev/null");
     }
     while ($file = glob("${General::swroot}/ovpn/ca/*")) {
 	unlink $file;
@@ -5135,6 +5172,20 @@ END
 	&Header::closebox();
     }
 
+	if ($cryptoerror) {
+		&Header::openbox('100%', 'LEFT', $Lang::tr{'crypto error'});
+		print "<class name='base'>$cryptoerror";
+		print "&nbsp;</class>";
+		&Header::closebox();
+	}
+
+	if ($cryptowarning) {
+		&Header::openbox('100%', 'LEFT', $Lang::tr{'crypto warning'});
+		print "<class name='base'>$cryptowarning";
+		print "&nbsp;</class>";
+		&Header::closebox();
+	}
+
 	if ($warnmessage) {
 		&Header::openbox('100%', 'LEFT', $Lang::tr{'warning messages'});
 		print "$warnmessage<br>";
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 630d9b2f0..e1e9c970c 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -661,6 +661,8 @@
 'credits' => 'Credits',
 'crl' => 'Certificate Revocation List',
 'cron server' => 'Cron-Server',
+'crypto error' => 'Kryptografiefehler',
+'crypto warning' => 'Kryptografiewarnungen',
 'current' => 'Aktuell',
 'current aliases' => 'Aktuelle Alias-Adresse',
 'current class' => 'Aktuelle Klasse',
@@ -1817,6 +1819,8 @@
 'ovpn engines' => 'Krypto Engine',
 'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt',
 'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske',
+'ovpn error dh' => 'Der Diffie-Hellman Parameter muss mindestens 2048 bit lang sein! <br>Bitte einen neuen Diffie-Hellman Parameter erzeugen oder hochladen, dies kann unten über den Bereich "Diffie-Hellman-Parameter Optionen" gemacht werden.</br>',
+'ovpn error md5' => 'Das Host Zertifikat nutzt einen MD5 Algorithmus welcher nicht mehr akzeptiert wird. <br>Bitte IPFire auf die neueste Version updaten und generieren sie ein neues Root und Host Zertifikate.</br><br>Es müssen dann alle OpenVPN clients erneuert werden!</br>',
 'ovpn generating the root and host certificates' => 'Die Erzeugung der Root- und Host-Zertifikate kann lange Zeit dauern.',
 'ovpn ha' => 'Hash-Algorithmus',
 'ovpn hmac' => 'HMAC-Optionen',
@@ -1841,6 +1845,7 @@
 'ovpn subnet' => 'OpenVPN-Subnetz:',
 'ovpn subnet is invalid' => 'Das OpenVPN-Subnetz ist ungültig.',
 'ovpn subnet overlap' => 'OpenVPNSubnetz überschneidet sich mit  ',
+'ovpn warning rfc3280' => 'Das Host Zertifikat ist nicht RFC3280 Regelkonform. <br>Bitte IPFire auf die letzte Version updaten und generieren sie ein neues Root und Host Zertifikat so bald wie möglich.</br><br>Es müssen dann alle OpenVPN clients erneuert werden!</br>',
 'ovpn_fastio' => 'Fast-IO',
 'ovpn_fragment' => 'Fragmentgrösse',
 'ovpn_mssfix' => 'MSSFIX-Grösse',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 8ec5bf486..d3847c92d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -682,6 +682,8 @@
 'credits' => 'Credits',
 'crl' => 'Certificate Revocation List',
 'cron server' => 'CRON Server',
+'crypto error' => 'Cryptographic error',
+'crypto warning' => 'Cryptographic warning',
 'current' => 'Current',
 'current aliases' => 'Current aliases',
 'current class' => 'Current class',
@@ -1850,6 +1852,8 @@
 'ovpn engines' => 'Crypto engine',
 'ovpn errmsg green already pushed' => 'Route for green network is always set',
 'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
+'ovpn error dh' => 'The Diffie-Hellman parameter needs to be in minimum 2048 bit! <br>Please generate or upload a new Diffie-Hellman parameter, this can be made below in the section "Diffie-Hellman parameters options".</br>',
+'ovpn error md5' => 'You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>',
 'ovpn generating the root and host certificates' => 'Generating the root and host certifictae can take a long time.',
 'ovpn ha' => 'Hash algorithm',
 'ovpn hmac' => 'HMAC options',
@@ -1874,6 +1878,7 @@
 'ovpn subnet' => 'OpenVPN subnet:',
 'ovpn subnet is invalid' => 'OpenVPN subnet is invalid.',
 'ovpn subnet overlap' => 'OpenVPN Subnet overlaps with : ',
+'ovpn warning rfc3280' => 'Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>',
 'ovpn_fastio' => 'Fast-IO',
 'ovpn_mssfix' => 'MSSFIX Size',
 'ovpn_mtudisc' => 'MTU-Discovery',
diff --git a/lfs/GeoIP b/lfs/GeoIP
index 3e79da544..013da0e52 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
 include Config
 
 VER        = 1.25
-DATVER     = 07012017
+DATVER     = 30062018
 
 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE)_MD5 = a47a1b71f7cd7c46cca9efcc448e0726
-GeoIP.dat-$(DATVER).gz_MD5 = fac676d18785585568312f30b7851657
+GeoIP.dat-$(DATVER).gz_MD5 = d538e57ad9268fdc7955c6cf9a37c4a9
 
 install : $(TARGET)
 
diff --git a/lfs/guardian b/lfs/guardian
index f3001c821..45c571d05 100644
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0
+VER        = 2.0.2
 
 THISAPP    = guardian-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = guardian
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = "perl-inotify2 perl-Net-IP"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 15be3b14a70e21502368deca74903f5c
+$(DL_FILE)_MD5 = f83a7ca312cd3cb3ddf79fb33826027d
 
 install : $(TARGET)
 
diff --git a/lfs/hplip b/lfs/hplip
index a08bab96a..0afadc459 100644
--- a/lfs/hplip
+++ b/lfs/hplip
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2018  IPFire Team   <info(a)ipfire.org>                         #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.12.6
+VER        = 3.18.6
 
 THISAPP    = hplip-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hplip
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5303938e8630775ea6fb383af85775e5
+$(DL_FILE)_MD5 = 3857eae76c49c00fa185628d4dce7d61
 
 install : $(TARGET)
 
@@ -78,10 +78,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr \
-											 --enable-hpijs-only-build \
-											--disable-network-build --disable-scan-build
+	cd $(DIR_APP) && ./configure		\
+		--prefix=/usr			\
+		--enable-hpijs-only-build	\
+		--disable-network-build		\
+		--disable-scan-build
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/multipath-tools b/lfs/multipath-tools
index 18cce86ed..4da9484dc 100644
--- a/lfs/multipath-tools
+++ b/lfs/multipath-tools
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = be1191b
+VER        = 386d288
 
 THISAPP    = multipath-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4a055e84c9ced857bc9c996cb6180d2a
+$(DL_FILE)_MD5 = 51288dc6cabd580f0b6c30c77624b9d7
 
 install : $(TARGET)
 
diff --git a/lfs/usbutils b/lfs/usbutils
index 51192e7e7..41494cf10 100644
--- a/lfs/usbutils
+++ b/lfs/usbutils
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 007
+VER        = 010
 
 THISAPP    = usbutils-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c9df5107ae9d26b10a1736a261250139
+$(DL_FILE)_MD5 = 938e3707593974be99a0dd6d1de76671
 
 install : $(TARGET)
 


hooks/post-receive
--
IPFire 2.x development tree

                 reply	other threads:[~2018-07-03  9:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180703094747.967661081BCF@git01.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox