21696841 Update HPLIP to 3.15.7 s11u3-sru
authorJiri Sasek <Jiri.Sasek@Oracle.COM>
Wed, 13 Jan 2016 06:39:34 -0800
branchs11u3-sru
changeset 5296 fe5e30c5a9ac
parent 5294 aab231e23f51
child 5300 7c8e8ab492d5
21696841 Update HPLIP to 3.15.7
components/hplip/Makefile
components/hplip/hplip.license
components/hplip/hplip.p5m
components/hplip/hplip.proto-objects
components/hplip/patches/01_build.patch
components/hplip/patches/02_HPCupsFilter.cpp.patch
components/hplip/patches/05_hpps.patch
components/hplip/patches/06_hpfax.patch
components/hplip/patches/07_core_install.patch
components/hplip/patches/07_facls.detect.patch
components/hplip/patches/08_posix.ps.patch
components/hplip/patches/09_nonGNUlibc.patch
--- a/components/hplip/Makefile	Tue Jan 19 14:07:25 2016 -0800
+++ b/components/hplip/Makefile	Wed Jan 13 06:39:34 2016 -0800
@@ -19,18 +19,18 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=         hplip
-COMPONENT_VERSION=      3.14.6
-TPNO=			18296
-COMPONENT_PROJECT_URL=	http://hplipopensource.com/hplip-web/index.html
+COMPONENT_VERSION=      3.15.7
+TPNO=			24589
+COMPONENT_ARCHIVE_HASH= sha256:d310903048f3600f93422e5a8c39ddd682511e0849cd9abc5e943f9a10bdd49d
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:a57233cd0e2db1dcf1d34d8b90c6a9d3e027e522695aada6c3c411a839868b8e
-COMPONENT_ARCHIVE_URL=  http://sourceforge.net/projects/hplip/files/hplip/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	http://prdownloads.sourceforge.net/hplip/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://hplipopensource.com/hplip-web/index.html
 COMPONENT_BUGDB=	utility/hplip
 
 include $(WS_MAKE_RULES)/prep.mk
--- a/components/hplip/hplip.license	Tue Jan 19 14:07:25 2016 -0800
+++ b/components/hplip/hplip.license	Wed Jan 13 06:39:34 2016 -0800
@@ -1,317 +1,331 @@
-
-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 GPL license applies to the files in these directories:
 
-  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.) 
+base
+data
+data/pcl
+data/ps
+data/ldl
+data/xml
+data/images
+ip
+pcard
+pcard/pcardext
+prnt
+prnt/cupsext
+scan
+ui
+io/mudext
 
 
-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. 
+            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
 
-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. 
+  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.
 
-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. 
+    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.
 
-  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: 
+    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.
 
-    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, 
+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, 
+    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.
 
-    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.) 
+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.
 
-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. 
+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.
 
-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. 
+  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
 
 
-  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. 
+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:
 
-  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. 
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
 
-  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. 
+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.
 
-  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 
-            
-             
-
-   io.c - HP SANE backend for multi-function peripherals (libsane-hpaio)
-
-   (c) 2001-2008 Copyright Hewlett-Packard Development Company, LP
+
+The BSD license applies to the files in these directories:
 
-   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.
-
-   Contributing Authors: Don Welch, David Suffield
-
-
-   Copyright (c) 1996 - 2001, Hewlett-Packard Co.
-   All rights reserved.
+prnt/hpijs
 
 
 Redistribution and use in source and binary forms, with or without
@@ -338,3 +352,4 @@
 IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
+
--- a/components/hplip/hplip.p5m	Tue Jan 19 14:07:25 2016 -0800
+++ b/components/hplip/hplip.p5m	Wed Jan 13 06:39:34 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -44,14 +44,14 @@
 <transform file path=etc/sane.d/dll.conf -> drop>
 
 # dirs
-<transform dir path=etc -> drop>
-<transform dir path=usr -> drop>
-<transform dir path=usr/bin -> drop>
-<transform dir path=usr/lib -> drop>
-<transform dir path=usr/share -> drop>
-<transform dir path=usr/share/doc -> drop>
-<transform dir path=var -> drop>
-<transform dir path=var/lib -> drop>
+<transform dir path=etc$ -> drop>
+<transform dir path=usr$ -> drop>
+<transform dir path=usr/bin$ -> drop>
+<transform dir path=usr/lib$ -> drop>
+<transform dir path=usr/share$ -> drop>
+<transform dir path=usr/share/doc$ -> 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 directly taken from "sample-manifest"
--- a/components/hplip/hplip.proto-objects	Tue Jan 19 14:07:25 2016 -0800
+++ b/components/hplip/hplip.proto-objects	Wed Jan 13 06:39:34 2016 -0800
@@ -1,4 +1,3 @@
-# Files/Dirs below are taken from sample-manifest
 dir  path=etc
 dir  path=etc/hal
 dir  path=etc/hal/fdi
@@ -64,6 +63,10 @@
 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
+file path=usr/lib/libhpipp.la
+link path=usr/lib/libhpipp.so target=libhpipp.so.0.0.1
+link path=usr/lib/libhpipp.so.0 target=libhpipp.so.0.0.1
+file path=usr/lib/libhpipp.so.0.0.1
 file path=usr/lib/libhpmud.la
 link path=usr/lib/libhpmud.so target=libhpmud.so.0.0.6
 link path=usr/lib/libhpmud.so.0 target=libhpmud.so.0.0.6
@@ -176,10 +179,14 @@
 file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp6015-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_m552-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_m553-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_m651-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_m750-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_m855-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_mfp_m680-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_pro_m252-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-designjet_4000ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-designjet_4020ps-ps.ppd.gz
@@ -304,6 +311,7 @@
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_cp1520_series-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_flow_mfp_m525-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_flow_mfp_m630-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_flow_mfp_m830-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1522_mfp-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1522n_mfp-ps.ppd.gz
@@ -317,11 +325,13 @@
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m4555_mfp-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m5025_mfp-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m5035_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m604_m605_m606-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m806-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9040_mfp-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9050_mfp-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9059_mfp-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_mfp_m521-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_mfp_m630-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_mfp_m725-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015_series-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055_series-ps.ppd.gz
@@ -329,8 +339,10 @@
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p3005-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p3010_series-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4010_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_pro_m201_m202-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_pro_m701-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_pro_m706-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-laserjet_pro_mfp_m435-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-lj_300_400_color_m351_m451-ps.ppd.gz
 file path=usr/share/cups/model/SUNWhplip/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz
@@ -431,8 +443,9 @@
 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
-file path=usr/share/hplip/base/pexpect.py
-file path=usr/share/hplip/base/pexpect.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
@@ -441,6 +454,10 @@
 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
@@ -797,12 +814,16 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp6015-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_m552-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_m553-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_m651-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_m750-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_m855-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_pro_m252-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-cp1160-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4000ps.ppd.gz
@@ -843,6 +864,7 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1010_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1050_j410_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1100-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1110_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1120-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1125-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1200c-hpijs.ppd.gz
@@ -855,6 +877,7 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2000_j210_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2020_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2050_j510_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2130_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2510_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2520_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2540_series-hpijs.ppd.gz
@@ -874,6 +897,7 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3540_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3550-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3600-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3630_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3650-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3740-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3810-hpijs.ppd.gz
@@ -881,6 +905,7 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3819-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3820-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3822-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3830_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3840-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3870-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3900-hpijs.ppd.gz
@@ -1023,6 +1048,9 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-envy_120_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-envy_4500_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-envy_5530_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-envy_5640_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-envy_5660_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-envy_7640_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1000-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1005_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_100_color_mfp_m175-ps.ppd.gz
@@ -1225,6 +1253,7 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cp_1025-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cp_1025nw-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_flow_mfp_m630-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1005-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz
@@ -1254,6 +1283,7 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m604_m605_m606-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m806-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9040_mfp-ps.ppd.gz
@@ -1262,6 +1292,7 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_mfp_m521-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_mfp_m630-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_mfp_m725-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1005-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1006-hpijs.ppd.gz
@@ -1310,10 +1341,13 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515tn-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515x-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515xm-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_m201_m202-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_m701-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_m706-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m125r-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m125ra-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz
@@ -1323,6 +1357,7 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz
@@ -1368,6 +1403,7 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_100_mobile_l411-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_2620_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_3830_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4000_k210-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4100_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4105-hpijs.ppd.gz
@@ -1389,6 +1425,7 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5110v-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5500_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5600_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5740_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6000_e609a-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6000_e609n-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6100-hpijs.ppd.gz
@@ -1402,6 +1439,7 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e710n-z-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6600-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6700-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6800-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7000_e809a-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7100_series-hpijs.ppd.gz
@@ -1410,7 +1448,9 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7300_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7400_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7500_e910-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7510_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7610_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_8040_series-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_9100_series-hpijs-pcl3.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_color_mfp_x585.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_color_x555-ps.ppd.gz
@@ -1444,6 +1484,8 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_451_series-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_476_576_series-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_551_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_6230-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_6830-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8100-hpijs.ppd.gz
--- a/components/hplip/patches/01_build.patch	Tue Jan 19 14:07:25 2016 -0800
+++ b/components/hplip/patches/01_build.patch	Wed Jan 13 06:39:34 2016 -0800
@@ -1,7 +1,7 @@
-Home brewed patch
+source: in-house
 
 --- a/prnt/hpijs/hpijsfax.cpp	2014-04-04 03:39:55.000000000 -0700
-+++ hplip-3.14.4/prnt/hpijs/hpijsfax.cpp	2014-04-11 09:25:59.404997356 -0700
++++ b/prnt/hpijs/hpijsfax.cpp	2014-04-11 09:25:59.404997356 -0700
 @@ -598,7 +598,7 @@
  		ijs_server_done (ctx);
  	}
--- a/components/hplip/patches/02_HPCupsFilter.cpp.patch	Tue Jan 19 14:07:25 2016 -0800
+++ b/components/hplip/patches/02_HPCupsFilter.cpp.patch	Wed Jan 13 06:39:34 2016 -0800
@@ -1,7 +1,8 @@
-Home brewed patch
+source: in-house
+SPRO C++ changes.
 
 --- a/prnt/hpcups/HPCupsFilter.cpp	2014-04-04 03:39:07.000000000 -0700
-+++ hplip-3.14.4/prnt/hpcups/HPCupsFilter.cpp	2014-04-11 12:24:59.109386019 -0700
++++ b/prnt/hpcups/HPCupsFilter.cpp	2014-04-11 12:24:59.109386019 -0700
 @@ -37,6 +37,8 @@
  #include <time.h>
  #include "utils.h"
@@ -21,7 +22,7 @@
  
      while (cupsRasterReadHeader2(cups_raster, &cups_header))
 --- a/prnt/hpcups/CommonDefinitions.h	2014-04-04 03:39:07.000000000 -0700
-+++ hplip-3.14.4/prnt/hpcups/CommonDefinitions.h	2014-04-11 12:03:54.025798599 -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,
@@ -32,7 +33,7 @@
  } ZJ_ITEM;
  
 --- a/io/hpmud/hpmud.h	2014-04-04 03:42:17.000000000 -0700
-+++ hplip-3.14.4/io/hpmud/hpmud.h	2014-04-11 12:12:13.756537138 -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,
@@ -95,7 +96,7 @@
  
  
 --- a/common/utils.h	2014-04-04 03:42:15.000000000 -0700
-+++ hplip-3.14.4/common/utils.h	2014-04-11 12:49:00.832008556 -0700
++++ b/common/utils.h	2014-04-11 12:49:00.832008556 -0700
 @@ -22,7 +22,8 @@
  #define SCAN_PLUGIN_SOAPHT "bb_soapht.so"
  
--- a/components/hplip/patches/05_hpps.patch	Tue Jan 19 14:07:25 2016 -0800
+++ b/components/hplip/patches/05_hpps.patch	Wed Jan 13 06:39:34 2016 -0800
@@ -1,7 +1,8 @@
-Home brewed patch
+source: in-house
+Freeze python version for pkglint.
 
 --- a/prnt/filters/hpps	2014-04-04 03:39:47.000000000 -0700
-+++ hplip-3.14.4/prnt/filters/hpps	2014-05-22 02:13:25.977568700 -0700
++++ b/prnt/filters/hpps	2014-05-22 02:13:25.977568700 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python2.7
--- a/components/hplip/patches/06_hpfax.patch	Tue Jan 19 14:07:25 2016 -0800
+++ b/components/hplip/patches/06_hpfax.patch	Wed Jan 13 06:39:34 2016 -0800
@@ -1,7 +1,8 @@
-Home brewed patch
+source: in-house
+Freeze python version for pkglint.
 
 --- a/fax/backend/hpfax.py	2014-04-04 03:42:15.000000000 -0700
-+++ hplip-3.14.4/fax/backend/hpfax.py	2014-05-22 02:16:18.325960600 -0700
++++ b/fax/backend/hpfax.py	2014-05-22 02:16:18.325960600 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python2.7
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/hplip/patches/07_core_install.patch	Wed Jan 13 06:39:34 2016 -0800
@@ -0,0 +1,14 @@
+source: in-house
+Set dbus-daemon path to (non-standard) /usr/lib.
+
+--- a/installer/core_install.py	2015-08-26 04:38:39.244369710 -0700
++++ b/installer/core_install.py	2015-08-26 04:39:29.269396882 -0700
[email protected]@ -345,7 +345,7 @@
+             'scanimage':        (False, ['scan'], SCANIMAGE_STR, self.check_scanimage, DEPENDENCY_RUN_TIME, '1.0','scanimage --version', EXTERNALDEP),
+ 
+             # Required fax packages
+-            'dbus':             (True,  ['fax'], DBUS_STR, self.check_dbus, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','dbus-daemon --version', EXTERNALDEP),
++            'dbus':             (True,  ['fax'], DBUS_STR, self.check_dbus, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','/usr/lib/dbus-daemon --version', EXTERNALDEP),
+ 
+             # Required and optional qt4 GUI packages
+             'policykit':        (False, ['gui_qt4'], POLKIT_STR, self.check_policykit, DEPENDENCY_RUN_TIME,'-','pkexec --version', EXTERNALDEP), # optional for non-sudo behavior of plugins (only optional for Qt4 option)
--- a/components/hplip/patches/07_facls.detect.patch	Tue Jan 19 14:07:25 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Home brewed patch
-
---- a/check.py	2014-06-02 23:33:10.000000000 -0700
-+++ hplip-3.14.6/check.py	2014-07-01 15:06:22.376141177 -0700
[email protected]@ -196,7 +197,7 @@
-         self.hplip_dependencies ={ EXTERNALDEP:
-              {
- #            <packageName>: (<Is Req/Opt Pack>, <Module>, <Package description>, <Installed check>, <min vrsion>, <cmd for installed version>),
--            'dbus':             (True,  ['fax'], "DBus", self.check_dbus,'-','dbus-daemon --version'),
-+            'dbus':             (True,  ['fax'], "DBus", self.check_dbus,'-','/usr/lib/dbus-daemon --version'),
-             'cups' :            (True,  ['base'], 'CUPS', self.check_cups,'1.1','cups-config --version'),
-             'gs':               (True,  ['base'], "Ghostscript", self.check_gs,'7.05','gs --version'),
-             'policykit':        (False, ['gui_qt4'], "Admin-Policy-framework", self.check_policykit,'-','pkexec --version'), # optional for non-sudo behavior of plugins (only optional for Qt4 option)
--- a/components/hplip/patches/08_posix.ps.patch	Tue Jan 19 14:07:25 2016 -0800
+++ b/components/hplip/patches/08_posix.ps.patch	Wed Jan 13 06:39:34 2016 -0800
@@ -1,7 +1,8 @@
-Home brewed patch
+source: in-house
+"de-linuxize" the ps args
 
 --- a/base/utils.py	2014-06-02 23:33:10.000000000 -0700
-+++ hplip-3.14.6/base/utils.py	2014-07-01 13:44:00.526366599 -0700
++++ b/base/utils.py	2014-07-01 13:44:00.526366599 -0700
 @@ -2214,7 +2214,7 @@
  
      try:
--- a/components/hplip/patches/09_nonGNUlibc.patch	Tue Jan 19 14:07:25 2016 -0800
+++ b/components/hplip/patches/09_nonGNUlibc.patch	Wed Jan 13 06:39:34 2016 -0800
@@ -1,14 +1,17 @@
-Home brewed patch
+source: in-house
+Do not crash on "non-GNU system" (no GNU libc).
 
---- a/installer/dcheck.py	2014-06-02 23:31:24.000000000 -0700
-+++ hplip-3.14.6/installer/dcheck.py	2014-07-01 14:58:22.329268435 -0700
[email protected]@ -365,8 +365,11 @@
-             LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True)
-         except:
-             LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None) #python2.4 and below syntax
+--- a/installer/dcheck.py	2015-08-26 04:52:23.900974542 -0700
++++ b/installer/dcheck.py	2015-08-26 04:56:35.111537299 -0700
[email protected]@ -365,9 +365,12 @@
+         return '-'
+     else:
+ #        LIBC = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True)
+-        LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True)
 -        LIBC.gnu_get_libc_version.restype = ctypes.c_char_p
 -        return LIBC.gnu_get_libc_version()
 +        try:
++            LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True)
 +            LIBC.gnu_get_libc_version.restype = ctypes.c_char_p
 +            return LIBC.gnu_get_libc_version()
 +        except: