# HG changeset patch # User Rich Burridge # Date 1493073859 25200 # Node ID e5a7b6f8f14cbe4f92d7b04525023dd771271ff9 # Parent 20e6442c6ceebe6250d2961b83771d1f7fdb44e2 25869943 Update libsndfile to version 1.0.28 25890331 problem in LIBRARY/LIBSNDFILE diff -r 20e6442c6cee -r e5a7b6f8f14c components/libsndfile/Makefile --- a/components/libsndfile/Makefile Fri Apr 21 10:43:44 2017 -0700 +++ b/components/libsndfile/Makefile Mon Apr 24 15:44:19 2017 -0700 @@ -18,43 +18,54 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. # +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= libsndfile -COMPONENT_VERSION= 1.0.23 +COMPONENT_VERSION= 1.0.28 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_PROJECT_URL= http://www.mega-nerd.com/libsndfile/ COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:54c9c375598538263395a691f9b30987a2faa3d8a166d27e6a09ba4700223d4d + sha256:1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9 COMPONENT_ARCHIVE_URL= http://www.mega-nerd.com/libsndfile/files/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= library/libsndfile -TPNO= 8890 +TPNO= 34734 include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk -# Needed for __func__ in cpp_test.cc -CXXFLAGS += $(studio_FEATURES_EXTENSIONS) -CFLAGS += $(studio_PIC) +# Needed to get tests/header_test.c to compile successfully on SPARC. +gcc_XREGS.sparc= -mapp-regs CONFIGURE_ENV += CFLAGS="$(CFLAGS)" CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)" -# common targets +# Get correct libsndfile.so.1 from the proto area. +TEST_LIBPATH.32 = $(PROTOUSRLIBDIR) +TEST_LIBPATH.64 = $(PROTOUSRLIBDIR64) +COMPONENT_TEST_ENV += LD_LIBRARY_PATH=$(TEST_LIBPATH.$(BITS)) + +# Need to use GNU sed otherwise we get a: +# Error : sfversion and PACKAGE_VERSION don't match." +# failure from the test_wrapper.sh script. +COMPONENT_TEST_ENV += PATH="$(GNUBIN):$(PATH)" + build: $(BUILD_32_and_64) install: $(INSTALL_32_and_64) -test: $(TEST_32_and_64) +test: install $(TEST_32_and_64) REQUIRED_PACKAGES += codec/flac REQUIRED_PACKAGES += codec/ogg-vorbis REQUIRED_PACKAGES += database/sqlite-3 REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime REQUIRED_PACKAGES += system/library/math diff -r 20e6442c6cee -r e5a7b6f8f14c components/libsndfile/libsndfile.license --- a/components/libsndfile/libsndfile.license Fri Apr 21 10:43:44 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,500 +0,0 @@ -GNU LESSER GENERAL PUBLIC LICENSE -Version 2.1, February 1999 - -Copyright (C) 1991, 1999 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. - -[This is the first released version of the Lesser GPL. It also counts -as the successor of the GNU Library Public License, version 2, hence -the version number 2.1.] - -Preamble - -The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - -This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - -When we speak of free software, we are referring to freedom of use, -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 and use pieces of -it in new free programs; and that you are informed that you can do -these things. - -To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - -For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - -We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - -To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - -Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - -Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - -When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - -We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - -For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - -In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - -Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - -The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - -GNU LESSER GENERAL PUBLIC LICENSE -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - -A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - -The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - -"Source code" for a work means the preferred form of the work for -making modifications to it. For a library, 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 library. - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - -1. You may copy and distribute verbatim copies of the Library's -complete 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 distribute a copy of this License along with the -Library. - -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 Library or any portion -of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. - -b) You must cause the files modified to carry prominent notices -stating that you changed the files and the date of any change. - -c) You must cause the whole of the work to be licensed at no -charge to all third parties under the terms of this License. - -d) If a facility in the modified Library refers to a function or a -table of data to be supplied by an application program that uses -the facility, other than as an argument passed when the facility -is invoked, then you must make a good faith effort to ensure that, -in the event an application does not supply such function or -table, the facility still operates, and performs whatever part of -its purpose remains meaningful. - -(For example, a function in a library to compute square roots has -a purpose that is entirely well-defined independent of the -application. Therefore, Subsection 2d requires that any -application-supplied function or table used by this function must -be optional: if the application does not supply it, the square -root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -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 Library, 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 Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - -3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - -Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - -This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - -4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you 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. - -If distribution of 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 satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - -5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - -However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - -When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - -If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - -Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - -6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - -You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - -a) Accompany the work with the complete corresponding -machine-readable source code for the Library including whatever -changes were used in the work (which must be distributed under -Sections 1 and 2 above); and, if the work is an executable linked -with the Library, with the complete machine-readable "work that -uses the Library", as object code and/or source code, so that the -user can modify the Library and then relink to produce a modified -executable containing the modified Library. (It is understood -that the user who changes the contents of definitions files in the -Library will not necessarily be able to recompile the application -to use the modified definitions.) - -b) Use a suitable shared library mechanism for linking with the -Library. A suitable mechanism is one that (1) uses at run time a -copy of the library already present on the user's computer system, -rather than copying library functions into the executable, and (2) -will operate properly with a modified version of the library, if -the user installs one, as long as the modified version is -interface-compatible with the version that the work was made with. - -c) Accompany the work with a written offer, valid for at -least three years, to give the same user the materials -specified in Subsection 6a, above, for a charge no more -than the cost of performing this distribution. - -d) If distribution of the work is made by offering access to copy -from a designated place, offer equivalent access to copy the above -specified materials from the same place. - -e) Verify that the user has already received a copy of these -materials or that you have already sent this user a copy. - -For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be 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 may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - -7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - -a) Accompany the combined library with a copy of the same work -based on the Library, uncombined with any other library -facilities. This must be distributed under the terms of the -Sections above. - -b) Give prominent notice with the combined library of the fact -that part of it is a work based on the Library, and explaining -where to find the accompanying uncombined form of the same work. - -8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library 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. - -9. 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 Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - -10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -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 with -this License. - -11. 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 Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library 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 Library. - -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. - -12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library 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. - -13. The Free Software Foundation may publish revised and/or new -versions of the Lesser 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 Library -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 Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - -14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -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 - -15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. 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 LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Libraries - -If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - -To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - -Yoyodyne, Inc., hereby disclaims all copyright interest in the -library `Frob' (a library for tweaking knobs) written by James Random Hacker. - -, 1 April 1990 -Ty Coon, President of Vice diff -r 20e6442c6cee -r e5a7b6f8f14c components/libsndfile/libsndfile.p5m --- a/components/libsndfile/libsndfile.p5m Fri Apr 21 10:43:44 2017 -0700 +++ b/components/libsndfile/libsndfile.p5m Mon Apr 24 15:44:19 2017 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability uncommitted> set name=pkg.fmri \ @@ -33,76 +33,56 @@ value=org.opensolaris.category.2008:System/Libraries 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=PSARC/2008/767 +set name=org.opensolaris.arc-caseid value=PSARC/2008/767 value=PSARC/2016/467 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -dir path=usr -dir path=usr/bin +file path=usr/bin/sndfile-cmp +file path=usr/bin/sndfile-concat file path=usr/bin/sndfile-convert +file path=usr/bin/sndfile-deinterleave file path=usr/bin/sndfile-info +file path=usr/bin/sndfile-interleave +file path=usr/bin/sndfile-metadata-get +file path=usr/bin/sndfile-metadata-set file path=usr/bin/sndfile-play file path=usr/bin/sndfile-regtest -dir path=usr/include +file path=usr/bin/sndfile-salvage file path=usr/include/sndfile.h file path=usr/include/sndfile.hh -dir path=usr/lib -dir path=usr/lib/$(MACH64) link path=usr/lib/$(MACH64)/libsndfile.so \ target=libsndfile.so.$(COMPONENT_VERSION) file path=usr/lib/$(MACH64)/libsndfile.so.$(COMPONENT_VERSION) link path=usr/lib/$(MACH64)/libsndfile.so.1 \ target=libsndfile.so.$(COMPONENT_VERSION) -dir path=usr/lib/$(MACH64)/pkgconfig file path=usr/lib/$(MACH64)/pkgconfig/sndfile.pc link path=usr/lib/libsndfile.so target=libsndfile.so.$(COMPONENT_VERSION) file path=usr/lib/libsndfile.so.$(COMPONENT_VERSION) link path=usr/lib/libsndfile.so.1 target=libsndfile.so.$(COMPONENT_VERSION) -dir path=usr/lib/pkgconfig file path=usr/lib/pkgconfig/sndfile.pc -dir path=usr/share -dir path=usr/share/doc -dir path=usr/share/doc/libsndfile -dir path=usr/share/doc/libsndfile/html -file usr/share/doc/libsndfile1-dev/html/FAQ.html \ - path=usr/share/doc/libsndfile/html/FAQ.html -file usr/share/doc/libsndfile1-dev/html/api.html \ - path=usr/share/doc/libsndfile/html/api.html -file usr/share/doc/libsndfile1-dev/html/bugs.html \ - path=usr/share/doc/libsndfile/html/bugs.html -file usr/share/doc/libsndfile1-dev/html/command.html \ - path=usr/share/doc/libsndfile/html/command.html -file usr/share/doc/libsndfile1-dev/html/dither.html \ - path=usr/share/doc/libsndfile/html/dither.html -file usr/share/doc/libsndfile1-dev/html/embedded_files.html \ - path=usr/share/doc/libsndfile/html/embedded_files.html -file usr/share/doc/libsndfile1-dev/html/index.html \ - path=usr/share/doc/libsndfile/html/index.html -file usr/share/doc/libsndfile1-dev/html/libsndfile.css \ - path=usr/share/doc/libsndfile/html/libsndfile.css -file usr/share/doc/libsndfile1-dev/html/libsndfile.jpg \ - path=usr/share/doc/libsndfile/html/libsndfile.jpg -file usr/share/doc/libsndfile1-dev/html/lists.html \ - path=usr/share/doc/libsndfile/html/lists.html -file usr/share/doc/libsndfile1-dev/html/new_file_type.HOWTO \ - path=usr/share/doc/libsndfile/html/new_file_type.HOWTO -file usr/share/doc/libsndfile1-dev/html/octave.html \ - path=usr/share/doc/libsndfile/html/octave.html -file usr/share/doc/libsndfile1-dev/html/pkgconfig.html \ - path=usr/share/doc/libsndfile/html/pkgconfig.html -file usr/share/doc/libsndfile1-dev/html/sndfile_info.html \ - path=usr/share/doc/libsndfile/html/sndfile_info.html -file usr/share/doc/libsndfile1-dev/html/tutorial.html \ - path=usr/share/doc/libsndfile/html/tutorial.html -file usr/share/doc/libsndfile1-dev/html/win32.html \ - path=usr/share/doc/libsndfile/html/win32.html -dir path=usr/share/man -dir path=usr/share/man/man1 +file path=usr/share/doc/libsndfile/FAQ.html +file path=usr/share/doc/libsndfile/api.html +file path=usr/share/doc/libsndfile/bugs.html +file path=usr/share/doc/libsndfile/command.html +file path=usr/share/doc/libsndfile/embedded_files.html +file path=usr/share/doc/libsndfile/index.html +file path=usr/share/doc/libsndfile/libsndfile.css +file path=usr/share/doc/libsndfile/libsndfile.jpg +file path=usr/share/doc/libsndfile/lists.html +file path=usr/share/doc/libsndfile/new_file_type.HOWTO +file path=usr/share/doc/libsndfile/octave.html +file path=usr/share/doc/libsndfile/sndfile_info.html +file path=usr/share/doc/libsndfile/tutorial.html +file path=usr/share/doc/libsndfile/win32.html +file path=usr/share/man/man1/sndfile-cmp.1 +file path=usr/share/man/man1/sndfile-concat.1 file path=usr/share/man/man1/sndfile-convert.1 +file path=usr/share/man/man1/sndfile-deinterleave.1 file path=usr/share/man/man1/sndfile-info.1 +file path=usr/share/man/man1/sndfile-interleave.1 +file path=usr/share/man/man1/sndfile-metadata-get.1 +file path=usr/share/man/man1/sndfile-metadata-set.1 file path=usr/share/man/man1/sndfile-play.1 -dir path=usr/share/octave -dir path=usr/share/octave/site -dir path=usr/share/octave/site/m +file path=usr/share/man/man1/sndfile-salvage.1 file Octave/sndfile_load.m path=usr/share/octave/site/m/sndfile_load.m file Octave/sndfile_play.m path=usr/share/octave/site/m/sndfile_play.m file Octave/sndfile_save.m path=usr/share/octave/site/m/sndfile_save.m -license libsndfile.license license=LGPLv2.1 +license COPYING license=LGPLv2.1 diff -r 20e6442c6cee -r e5a7b6f8f14c components/libsndfile/patches/CVE-2014-9496.patch --- a/components/libsndfile/patches/CVE-2014-9496.patch Fri Apr 21 10:43:44 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -Fix two potential buffer read overflows. - -Upstream bug report: -https://github.com/erikd/libsndfile/issues/93 - -Upstream fix: -https://github.com/erikd/libsndfile/commit/dbe14f00030af5d3577f4cabbf9861db59e9c378 - ---- libsndfile-1.0.23/src/sd2.c.orig 2015-01-07 13:06:58.205315569 -0800 -+++ libsndfile-1.0.23/src/sd2.c 2015-01-07 13:15:21.501444431 -0800 -@@ -496,6 +496,11 @@ - - rsrc.type_offset = rsrc.map_offset + 30 ; - -+ if (rsrc.map_offset + 28 > rsrc.rsrc_len) -+ { psf_log_printf (psf, "Bad map offset.\n") ; -+ goto parse_rsrc_fork_cleanup ; -+ } ; -+ - rsrc.type_count = read_short (rsrc.rsrc_data, rsrc.map_offset + 28) + 1 ; - if (rsrc.type_count < 1) - { psf_log_printf (psf, "Bad type count.\n") ; -@@ -512,7 +517,12 @@ - - rsrc.str_index = -1 ; - for (k = 0 ; k < rsrc.type_count ; k ++) -- { marker = read_marker (rsrc.rsrc_data, rsrc.type_offset + k * 8) ; -+ { if (rsrc.type_offset + k * 8 > rsrc.rsrc_len) -+ { psf_log_printf (psf, "Bad rsrc marker.\n") ; -+ goto parse_rsrc_fork_cleanup ; -+ } ; -+ -+ marker = read_marker (rsrc.rsrc_data, rsrc.type_offset + k * 8) ; - - if (marker == STR_MARKER) - { rsrc.str_index = k ; diff -r 20e6442c6cee -r e5a7b6f8f14c components/libsndfile/patches/adjust-tests.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/libsndfile/patches/adjust-tests.patch Mon Apr 24 15:44:19 2017 -0700 @@ -0,0 +1,15 @@ +Prevent the tests from exiting when they encounter an error. + +This change will not be sent upstream. + +--- libsndfile-1.0.28/tests/test_wrapper.sh.in.orig 2017-04-10 10:18:14.892226937 +0000 ++++ libsndfile-1.0.28/tests/test_wrapper.sh.in 2017-04-10 10:18:29.399953955 +0000 +@@ -61,7 +61,7 @@ + fi + + # Force exit on errors. +-set -e ++#set -e + + # Generic-tests + uname -a diff -r 20e6442c6cee -r e5a7b6f8f14c components/libsndfile/patches/test_strncpy_crlf.c.patch --- a/components/libsndfile/patches/test_strncpy_crlf.c.patch Fri Apr 21 10:43:44 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -*** libsndfile-1.0.23/src/test_strncpy_crlf.c Mon Oct 4 04:14:50 2010 ---- libsndfile-1.0.23/src/test_strncpy_crlf.c.new Mon Jun 6 08:22:40 2011 -*************** -*** 28,34 **** - void - test_strncpy_crlf (void) - { const char *src = "a\nb\nc\n" ; -! char *dest ; - int dest_len ; - - print_test_name ("Testing psf_strncpy_crlf") ; ---- 28,34 ---- - void - test_strncpy_crlf (void) - { const char *src = "a\nb\nc\n" ; -! unsigned char *dest ; - int dest_len ; - - print_test_name ("Testing psf_strncpy_crlf") ;