--- a/components/hplip/Makefile Thu Nov 17 13:22:24 2016 -0800
+++ b/components/hplip/Makefile Fri Nov 04 02:29:54 2016 -0700
@@ -27,9 +27,9 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= hplip
-COMPONENT_VERSION= 3.15.7
-TPNO= 24589
-COMPONENT_ARCHIVE_HASH= sha256:d310903048f3600f93422e5a8c39ddd682511e0849cd9abc5e943f9a10bdd49d
+COMPONENT_VERSION= 3.16.9
+TPNO= 31664
+COMPONENT_ARCHIVE_HASH= sha256:cc8cf2a7baa1403cddd6503f120c58780c786b42fad073da6caec7535d3797a6
COMPONENT_ARCHIVE_URL= http://prdownloads.sourceforge.net/hplip/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL= http://hplipopensource.com/hplip-web/index.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/hplip/hplip-core.p5m Fri Nov 04 02:29:54 2016 -0700
@@ -0,0 +1,73 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+# HPLIP support for CUPS
+<transform file path=usr/lib/cups/backend/.* -> default mode 0555>
+<transform file path=usr/lib/cups/filter/.* -> default mode 0555>
+<transform dir file path=usr/lib/lp/? -> default group lp>
+<transform dir file path=usr/share/ppd/? -> default group lp>
+
+# hplip install its PYTHON modules into usr/share/hplip so it brings problems:
+<transform file path=usr/share/hplip/.*\.py$ -> emit file path=%(path)c>
+<transform file path=usr/share/hplip/.+\.py(c)?$ -> default mode 0555>
+<transform file path=usr/share/hplip/.+\.py$ -> default pkg.depend.bypass-generate .*>
+<transform file path=usr/share/hplip/.+\.py$ -> default pkg.linted.userland.action001.3 true>
+
+<transform file path=usr/lib/cups/backend/hpfax -> default pkg.depend.bypass-generate .*>
+<transform file path=usr/lib/cups/backend/hpfax -> default pkg.linted.userland.action001.3 true>
+<transform file path=usr/lib/cups/filter/hpps -> default pkg.depend.bypass-generate .*>
+<transform file path=usr/lib/cups/filter/hpps -> default pkg.linted.userland.action001.3 true>
+
+# depend on pygobject
+<transform file path=usr/share/hplip/base/pkit\.py.* -> drop>
+<transform file path=usr/share/hplip/hpssd\.py.* -> drop>
+<transform file path=usr/share/hplip/installer/pluginhandler\.py.* -> drop>
+<transform file path=usr/share/hplip/toolbox\.py.* -> drop>
+
+# do not deliver general dirs
+<transform dir path=etc$ -> drop>
+<transform dir path=usr.* -> drop>
+<transform dir path=var$ -> drop>
+
+# Objects defined in "proto-objects" are generated by:
+# "gmake sample-manifest METADATA_TEMPLATE="
+# then .pyc files are removed from such list:
+# "/usr/xpg4/bin/egrep -v '\.pyc' build/manifest-$(uname -p)-generated.p5m > hplip.proto-objects"
+# all special attributes should be set by "<transform ...> actions
+# Please do not edit the "proto-objects" manually use the tranform actions above to change it.
+<include hplip.proto-objects>
+
+# package metadata
+set name=pkg.fmri \
+ value=pkg:/print/filter/hplip-core@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="hplip - HP Linux Printing (core)"
+set name=com.oracle.info.description \
+ value="Support of HP InkJet, Laser printers for CUPS. (core)"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+ value="org.opensolaris.category.2008:System/Printing "
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2004/262
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+license COPYING license="GPLv2 BSD MIT"
--- a/components/hplip/hplip.license Thu Nov 17 13:22:24 2016 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,355 +0,0 @@
-The GPL license applies to the files in these directories:
-
-base
-data
-data/pcl
-data/ps
-data/ldl
-data/xml
-data/images
-ip
-pcard
-pcard/pcardext
-prnt
-prnt/cupsext
-scan
-ui
-io/mudext
-
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
-
-
-The MIT license applies to the files in these directories:
-
-prnt/backend
-io/hpmud
-scan/sane
-
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-The BSD license applies to the files in these directories:
-
-prnt/hpijs
-
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. Neither the name of the Hewlett-Packard nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PATENT INFRINGEMENT; PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
--- a/components/hplip/hplip.p5m Thu Nov 17 13:22:24 2016 -0800
+++ b/components/hplip/hplip.p5m Fri Nov 04 02:29:54 2016 -0700
@@ -42,8 +42,6 @@
<transform dir path=etc$ -> drop>
<transform dir path=usr.* -> drop>
<transform dir path=var$ -> drop>
-<transform dir path=var/lib$ -> drop>
-<transform dir path=var/lib/hp -> default group lp>
# Objects defined in "proto-objects" are generated by:
# "gmake sample-manifest METADATA_TEMPLATE="
@@ -66,5 +64,5 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
legacy pkg=SUNWhpijs desc="hpijs - HP InkJet Server" \
name="hpijs - HP InkJet Server"
-license hplip.license license=GPLv2
+license COPYING license="GPLv2 BSD MIT"
depend type=require fmri=pkg:/library/python/pygobject-27
--- a/components/hplip/hplip.proto-objects Thu Nov 17 13:22:24 2016 -0800
+++ b/components/hplip/hplip.proto-objects Fri Nov 04 02:29:54 2016 -0700
@@ -48,6 +48,9 @@
file path=usr/lib/cups/filter/hpcupsfax
file path=usr/lib/cups/filter/hpps
file path=usr/lib/cups/filter/pstotiff
+link path=usr/lib/libhpdiscovery.so target=libhpdiscovery.so.0.0.1
+link path=usr/lib/libhpdiscovery.so.0 target=libhpdiscovery.so.0.0.1
+file path=usr/lib/libhpdiscovery.so.0.0.1
link path=usr/lib/libhpip.so target=libhpip.so.0.0.1
link path=usr/lib/libhpip.so.0 target=libhpip.so.0.0.1
file path=usr/lib/libhpip.so.0.0.1
@@ -151,15 +154,22 @@
file path=usr/share/cups/model/hplip/hp-color_laserjet_cp6015-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-color_laserjet_m452-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-color_laserjet_m452d-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-color_laserjet_m552-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-color_laserjet_m553-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-color_laserjet_m651-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-color_laserjet_m750-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-color_laserjet_m855-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-color_laserjet_mfp_m274-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-color_laserjet_mfp_m577-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-color_laserjet_mfp_m680-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-color_laserjet_pro_m252-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-designjet_4000ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-designjet_4020ps-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-designjet_4500mfp.ppd.gz
@@ -297,12 +307,15 @@
file path=usr/share/cups/model/hplip/hp-laserjet_m4555_mfp-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_m5025_mfp-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_m5035_mfp-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-laserjet_m506-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_m604_m605_m606-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_m806-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_m9040_mfp-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_m9050_mfp-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_m9059_mfp-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-laserjet_mfp_m426_m427-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_mfp_m521-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-laserjet_mfp_m527-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_mfp_m630-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_mfp_m725-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_p2015_series-ps.ppd.gz
@@ -312,6 +325,10 @@
file path=usr/share/cups/model/hplip/hp-laserjet_p3010_series-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_p4010_series-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_pro_m201_m202-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-laserjet_pro_m402_m403-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-laserjet_pro_m402_m403d-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-laserjet_pro_m501dn-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-laserjet_pro_m501n-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_pro_m701-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_pro_m706-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
@@ -328,6 +345,18 @@
file path=usr/share/cups/model/hplip/hp-officejet_pro_476_576_series-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-officejet_pro_551_series-ps.ppd.gz
file path=usr/share/cups/model/hplip/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-officejet_pro_8210-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-officejet_pro_8730-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-officejet_pro_8740-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-pagewide_color_556-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-pagewide_color_flow_mfp_586-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-pagewide_color_mfp_586-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-pagewide_mfp_p57750-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-pagewide_p55250-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-pagewide_pro_452_printer-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-pagewide_pro_477_mfp-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-pagewide_pro_552_printer-ps.ppd.gz
+file path=usr/share/cups/model/hplip/hp-pagewide_pro_577_mfp-ps.ppd.gz
dir path=usr/share/doc
dir path=usr/share/doc/hplip-$(COMPONENT_VERSION)
file path=usr/share/doc/hplip-$(COMPONENT_VERSION)/COPYING
@@ -373,106 +402,53 @@
file path=usr/share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
dir path=usr/share/hplip
file path=usr/share/hplip/__init__.py
-file path=usr/share/hplip/__init__.pyc
file path=usr/share/hplip/align.py
-file path=usr/share/hplip/align.pyc
dir path=usr/share/hplip/base
file path=usr/share/hplip/base/LedmWifi.py
-file path=usr/share/hplip/base/LedmWifi.pyc
file path=usr/share/hplip/base/__init__.py
-file path=usr/share/hplip/base/__init__.pyc
file path=usr/share/hplip/base/avahi.py
-file path=usr/share/hplip/base/avahi.pyc
file path=usr/share/hplip/base/codes.py
-file path=usr/share/hplip/base/codes.pyc
file path=usr/share/hplip/base/device.py
-file path=usr/share/hplip/base/device.pyc
file path=usr/share/hplip/base/dime.py
-file path=usr/share/hplip/base/dime.pyc
file path=usr/share/hplip/base/exif.py
-file path=usr/share/hplip/base/exif.pyc
file path=usr/share/hplip/base/g.py
-file path=usr/share/hplip/base/g.pyc
file path=usr/share/hplip/base/imagesize.py
-file path=usr/share/hplip/base/imagesize.pyc
file path=usr/share/hplip/base/ldif.py
-file path=usr/share/hplip/base/ldif.pyc
file path=usr/share/hplip/base/logger.py
-file path=usr/share/hplip/base/logger.pyc
file path=usr/share/hplip/base/magic.py
-file path=usr/share/hplip/base/magic.pyc
file path=usr/share/hplip/base/maint.py
-file path=usr/share/hplip/base/maint.pyc
file path=usr/share/hplip/base/mdns.py
-file path=usr/share/hplip/base/mdns.pyc
file path=usr/share/hplip/base/mfpdtf.py
-file path=usr/share/hplip/base/mfpdtf.pyc
file path=usr/share/hplip/base/models.py
-file path=usr/share/hplip/base/models.pyc
file path=usr/share/hplip/base/module.py
-file path=usr/share/hplip/base/module.pyc
file path=usr/share/hplip/base/os_utils.py
-file path=usr/share/hplip/base/os_utils.pyc
file path=usr/share/hplip/base/password.py
-file path=usr/share/hplip/base/password.pyc
dir path=usr/share/hplip/base/pexpect
file path=usr/share/hplip/base/pexpect/__init__.py
-file path=usr/share/hplip/base/pexpect/__init__.pyc
file path=usr/share/hplip/base/pkit.py
-file path=usr/share/hplip/base/pkit.pyc
file path=usr/share/hplip/base/pml.py
-file path=usr/share/hplip/base/pml.pyc
file path=usr/share/hplip/base/queues.py
-file path=usr/share/hplip/base/queues.pyc
file path=usr/share/hplip/base/services.py
-file path=usr/share/hplip/base/services.pyc
file path=usr/share/hplip/base/six.py
-file path=usr/share/hplip/base/six.pyc
file path=usr/share/hplip/base/sixext.py
-file path=usr/share/hplip/base/sixext.pyc
file path=usr/share/hplip/base/slp.py
-file path=usr/share/hplip/base/slp.pyc
file path=usr/share/hplip/base/smart_install.py
-file path=usr/share/hplip/base/smart_install.pyc
file path=usr/share/hplip/base/status.py
-file path=usr/share/hplip/base/status.pyc
file path=usr/share/hplip/base/strings.py
-file path=usr/share/hplip/base/strings.pyc
file path=usr/share/hplip/base/tui.py
-file path=usr/share/hplip/base/tui.pyc
file path=usr/share/hplip/base/utils.py
-file path=usr/share/hplip/base/utils.pyc
file path=usr/share/hplip/base/validation.py
-file path=usr/share/hplip/base/validation.pyc
file path=usr/share/hplip/base/vcard.py
-file path=usr/share/hplip/base/vcard.pyc
file path=usr/share/hplip/base/wifi.py
-file path=usr/share/hplip/base/wifi.pyc
file path=usr/share/hplip/check-plugin.py
-file path=usr/share/hplip/check-plugin.pyc
file path=usr/share/hplip/check.py
-file path=usr/share/hplip/check.pyc
file path=usr/share/hplip/clean.py
-file path=usr/share/hplip/clean.pyc
file path=usr/share/hplip/colorcal.py
-file path=usr/share/hplip/colorcal.pyc
file path=usr/share/hplip/config_usb_printer.py
-file path=usr/share/hplip/config_usb_printer.pyc
dir path=usr/share/hplip/copier
file path=usr/share/hplip/copier/__init__.py
-file path=usr/share/hplip/copier/__init__.pyc
file path=usr/share/hplip/copier/copier.py
-file path=usr/share/hplip/copier/copier.pyc
dir path=usr/share/hplip/data
-dir path=usr/share/hplip/data/images
-dir path=usr/share/hplip/data/images/128x128
-dir path=usr/share/hplip/data/images/16x16
-dir path=usr/share/hplip/data/images/24x24
-dir path=usr/share/hplip/data/images/256x256
-dir path=usr/share/hplip/data/images/32x32
-dir path=usr/share/hplip/data/images/64x64
-dir path=usr/share/hplip/data/images/devices
-dir path=usr/share/hplip/data/images/other
dir path=usr/share/hplip/data/ldl
file path=usr/share/hplip/data/ldl/cb2pcal.ldl.gz
file path=usr/share/hplip/data/ldl/cb2pcal_done.ldl.gz
@@ -514,120 +490,64 @@
file path=usr/share/hplip/data/ps/clean_page.pdf.gz
file path=usr/share/hplip/data/ps/testpage.ps.gz
file path=usr/share/hplip/devicesettings.py
-file path=usr/share/hplip/devicesettings.pyc
file path=usr/share/hplip/diagnose_plugin.py
-file path=usr/share/hplip/diagnose_plugin.pyc
file path=usr/share/hplip/diagnose_queues.py
-file path=usr/share/hplip/diagnose_queues.pyc
file path=usr/share/hplip/doctor.py
-file path=usr/share/hplip/doctor.pyc
file path=usr/share/hplip/fab.py
-file path=usr/share/hplip/fab.pyc
dir path=usr/share/hplip/fax
file path=usr/share/hplip/fax/__init__.py
-file path=usr/share/hplip/fax/__init__.pyc
file path=usr/share/hplip/fax/coverpages.py
-file path=usr/share/hplip/fax/coverpages.pyc
file path=usr/share/hplip/fax/fax.py
-file path=usr/share/hplip/fax/fax.pyc
file path=usr/share/hplip/fax/faxdevice.py
-file path=usr/share/hplip/fax/faxdevice.pyc
file path=usr/share/hplip/fax/ledmfax.py
-file path=usr/share/hplip/fax/ledmfax.pyc
file path=usr/share/hplip/fax/ledmsoapfax.py
-file path=usr/share/hplip/fax/ledmsoapfax.pyc
file path=usr/share/hplip/fax/marvellfax.py
-file path=usr/share/hplip/fax/marvellfax.pyc
file path=usr/share/hplip/fax/pmlfax.py
-file path=usr/share/hplip/fax/pmlfax.pyc
file path=usr/share/hplip/fax/pstotiff
file path=usr/share/hplip/fax/pstotiff.convs
file path=usr/share/hplip/fax/pstotiff.types
file path=usr/share/hplip/fax/soapfax.py
-file path=usr/share/hplip/fax/soapfax.pyc
file path=usr/share/hplip/faxsetup.py
-file path=usr/share/hplip/faxsetup.pyc
file path=usr/share/hplip/firmware.py
-file path=usr/share/hplip/firmware.pyc
file path=usr/share/hplip/hpdio.py
-file path=usr/share/hplip/hpdio.pyc
file path=usr/share/hplip/hplip_clean.sh
file path=usr/share/hplip/hpssd.py
-file path=usr/share/hplip/hpssd.pyc
file path=usr/share/hplip/info.py
-file path=usr/share/hplip/info.pyc
dir path=usr/share/hplip/installer
file path=usr/share/hplip/installer/__init__.py
-file path=usr/share/hplip/installer/__init__.pyc
file path=usr/share/hplip/installer/core_install.py
-file path=usr/share/hplip/installer/core_install.pyc
file path=usr/share/hplip/installer/dcheck.py
-file path=usr/share/hplip/installer/dcheck.pyc
file path=usr/share/hplip/installer/distros.dat
file path=usr/share/hplip/installer/pluginhandler.py
-file path=usr/share/hplip/installer/pluginhandler.pyc
file path=usr/share/hplip/levels.py
-file path=usr/share/hplip/levels.pyc
file path=usr/share/hplip/linefeedcal.py
-file path=usr/share/hplip/linefeedcal.pyc
file path=usr/share/hplip/logcapture.py
-file path=usr/share/hplip/logcapture.pyc
file path=usr/share/hplip/makecopies.py
-file path=usr/share/hplip/makecopies.pyc
file path=usr/share/hplip/makeuri.py
-file path=usr/share/hplip/makeuri.pyc
dir path=usr/share/hplip/pcard
file path=usr/share/hplip/pcard/__init__.py
-file path=usr/share/hplip/pcard/__init__.pyc
file path=usr/share/hplip/pcard/photocard.py
-file path=usr/share/hplip/pcard/photocard.pyc
file path=usr/share/hplip/pkservice.py
-file path=usr/share/hplip/pkservice.pyc
file path=usr/share/hplip/plugin.py
-file path=usr/share/hplip/plugin.pyc
file path=usr/share/hplip/pqdiag.py
-file path=usr/share/hplip/pqdiag.pyc
file path=usr/share/hplip/print.py
-file path=usr/share/hplip/print.pyc
file path=usr/share/hplip/printsettings.py
-file path=usr/share/hplip/printsettings.pyc
dir path=usr/share/hplip/prnt
file path=usr/share/hplip/prnt/__init__.py
-file path=usr/share/hplip/prnt/__init__.pyc
file path=usr/share/hplip/prnt/colorcal.py
-file path=usr/share/hplip/prnt/colorcal.pyc
file path=usr/share/hplip/prnt/cups.py
-file path=usr/share/hplip/prnt/cups.pyc
file path=usr/share/hplip/prnt/ldl.py
-file path=usr/share/hplip/prnt/ldl.pyc
file path=usr/share/hplip/prnt/pcl.py
-file path=usr/share/hplip/prnt/pcl.pyc
file path=usr/share/hplip/probe.py
-file path=usr/share/hplip/probe.pyc
file path=usr/share/hplip/query.py
-file path=usr/share/hplip/query.pyc
file path=usr/share/hplip/scan.py
-file path=usr/share/hplip/scan.pyc
file path=usr/share/hplip/sendfax.py
-file path=usr/share/hplip/sendfax.pyc
file path=usr/share/hplip/setup.py
-file path=usr/share/hplip/setup.pyc
file path=usr/share/hplip/systray.py
-file path=usr/share/hplip/systray.pyc
file path=usr/share/hplip/testpage.py
-file path=usr/share/hplip/testpage.pyc
file path=usr/share/hplip/timedate.py
-file path=usr/share/hplip/timedate.pyc
file path=usr/share/hplip/toolbox.py
-file path=usr/share/hplip/toolbox.pyc
file path=usr/share/hplip/uninstall.py
-file path=usr/share/hplip/uninstall.pyc
file path=usr/share/hplip/unload.py
-file path=usr/share/hplip/unload.pyc
file path=usr/share/hplip/upgrade.py
-file path=usr/share/hplip/upgrade.pyc
file path=usr/share/hplip/wificonfig.py
-file path=usr/share/hplip/wificonfig.pyc
-dir path=var
-dir path=var/lib
-dir path=var/lib/hp
--- a/components/hplip/patches/02_HPCupsFilter.cpp.patch Thu Nov 17 13:22:24 2016 -0800
+++ b/components/hplip/patches/02_HPCupsFilter.cpp.patch Fri Nov 04 02:29:54 2016 -0700
@@ -21,80 +21,6 @@
while (cupsRasterReadHeader2(cups_raster, &cups_header))
---- a/prnt/hpcups/CommonDefinitions.h 2014-04-04 03:39:07.000000000 -0700
-+++ b/prnt/hpcups/CommonDefinitions.h 2014-04-11 12:03:54.025798599 -0700
-@@ -305,7 +305,7 @@
- /* 0x68 */ ZJI_BITMAP_PIXELS,
- /* 0x69 */ ZJI_BITMAP_LINES,
- /* 0x6A */ ZJI_BITMAP_BPP,
--/* 0x6B */ ZJI_BITMAP_STRIDE,
-+/* 0x6B */ ZJI_BITMAP_STRIDE
-
- } ZJ_ITEM;
-
---- a/io/hpmud/hpmud.h 2014-04-04 03:42:17.000000000 -0700
-+++ b/io/hpmud/hpmud.h 2014-04-11 12:12:13.756537138 -0700
-@@ -46,7 +46,7 @@
- HPMUD_R_INVALID_TIMEOUT = 47,
- HPMUD_R_DATFILE_ERROR = 48,
- HPMUD_R_IO_TIMEOUT = 49,
-- HPMUD_R_INVALID_MDNS = 50,
-+ HPMUD_R_INVALID_MDNS = 50
- };
-
- enum HPMUD_IO_MODE
-@@ -57,7 +57,7 @@
- HPMUD_DOT4_PHOENIX_MODE=4, /* (ie: clj2550, clj2840, lj3050, lj3055, clj4730mfp) */
- HPMUD_DOT4_BRIDGE_MODE=5, /* (ie: clj2500) not USB compatable, use HPMUD_RAW_MODE, tested on F10 12/10/08 DES */
- HPMUD_MLC_GUSHER_MODE=6, /* most new devices */
-- HPMUD_MLC_MISER_MODE=7, /* old stuff */
-+ HPMUD_MLC_MISER_MODE=7 /* old stuff */
- };
-
- enum HPMUD_BUS_ID
-@@ -78,7 +78,7 @@
- HPMUD_SCANTYPE_SOAPHT = 5, /* HorseThief (ie: ljm1522) */
- HPMUD_SCANTYPE_SCL_DUPLEX = 6,
- HPMUD_SCANTYPE_LEDM = 7,
-- HPMUD_SCANTYPE_MARVELL2 = 8, /* (Tsunami lj 1212 and series) */
-+ HPMUD_SCANTYPE_MARVELL2 = 8 /* (Tsunami lj 1212 and series) */
- };
-
- enum HPMUD_SCANSRC
-@@ -86,7 +86,7 @@
- HPMUD_SCANSRC_NA = 0,
- HPMUD_SCANSRC_FLATBED = 0x1,
- HPMUD_SCANSRC_ADF= 0x2,
-- HPMUD_SCANSRC_CAMERA = 0x4,
-+ HPMUD_SCANSRC_CAMERA = 0x4
- };
-
- enum HPMUD_STATUSTYPE
-@@ -97,21 +97,21 @@
- HPMUD_STATUSTYPE_PML = 3, /* laserjet pml */
- HPMUD_STATUSTYPE_EWS = 6, /* laserjet hp ews */
- HPMUD_STATUSTYPE_PJL = 8, /* laserjet pjl */
-- HPMUD_STATUSTYPE_PJLPML = 9, /* laserjet pjl and pml */
-+ HPMUD_STATUSTYPE_PJLPML = 9 /* laserjet pjl and pml */
- };
-
- enum HPMUD_SUPPORT_TYPE
- {
- HPMUD_SUPPORT_TYPE_NONE = 0, /* not supported */
- HPMUD_SUPPORT_TYPE_HPIJS = 1, /* supported by hpijs only */
-- HPMUD_SUPPORT_TYPE_HPLIP = 2, /* supported by hpijs and "hp" backend */
-+ HPMUD_SUPPORT_TYPE_HPLIP = 2 /* supported by hpijs and "hp" backend */
- };
-
- enum HPMUD_PLUGIN_TYPE
- {
- HPMUD_PLUGIN_TYPE_NONE = 0,
- HPMUD_PLUGIN_TYPE_REQUIRED = 1,
-- HPMUD_PLUGIN_TYPE_OPTIONAL = 2,
-+ HPMUD_PLUGIN_TYPE_OPTIONAL = 2
- };
-
-
--- a/common/utils.h 2014-04-04 03:42:15.000000000 -0700
+++ b/common/utils.h 2014-04-11 12:49:00.832008556 -0700
@@ -22,7 +22,8 @@
@@ -107,29 +33,3 @@
enum UTILS_CONF_RESULT
{
-@@ -30,7 +31,7 @@
- UTILS_CONF_FILE_NOT_FOUND, // =1,
- UTILS_CONF_SECTION_NOT_FOUND, // =2,
- UTILS_CONF_KEY_NOT_FOUND, // =3,
-- UTILS_CONF_DATFILE_ERROR, // = 4,
-+ UTILS_CONF_DATFILE_ERROR // = 4,
- };
-
-
-@@ -38,14 +39,14 @@
- {
- UTILS_PLUGIN_STATUS_OK = 0,
- UTILS_PLUGIN_STATUS_MISMATCH, // = 1,
-- UTILS_PLUGIN_STATUS_NOT_INSTALLED, // = 2,
-+ UTILS_PLUGIN_STATUS_NOT_INSTALLED // = 2,
- };
-
- enum UTILS_PLUGIN_LIBRARY_TYPE
- {
- UTILS_PRINT_PLUGIN_LIBRARY = 0, // = 0,
- UTILS_SCAN_PLUGIN_LIBRARY, // =1,
-- UTILS_FAX_PLUGIN_LIBRARY, // =2,
-+ UTILS_FAX_PLUGIN_LIBRARY//, // =2,
- // UTILS_GENERAL_PLUGIN_LIBRARY //=4, // Future use..
- };
-