diff --git a/meta/recipes-support/libgit2/libgit2_1.9.4.bb b/meta/recipes-support/libgit2/libgit2_1.9.6.bb similarity index 10% rename from meta/recipes-support/libgit2/libgit2_1.9.4.bb rename to meta/recipes-support/libgit2/libgit2_1.9.6.bb index e46e5d49fd..773147e326 100644 --- a/meta/recipes-support/libgit2/libgit2_1.9.4.bb +++ b/meta/recipes-support/libgit2/libgit2_1.9.6.bb @@ -1,12 +1,141 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. +# The following is the difference between the old and the new license text. +# Please update the LICENSE value if needed, and summarize the changes in +# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- COPYING +# +++ COPYING +# @@ -406,23 +406,85 @@ +# +# ---------------------------------------------------------------------- +# +# -The bundled PCRE implementation (deps/pcre/) is licensed under the BSD +# -license. +# +The bundled PCRE implementation (deps/pcre2/) is licensed under the +# +PCRE2 Licence. +# + +# +PCRE2 is a library of functions to support regular expressions whose syntax +# +and semantics are as close as possible to those of the Perl 5 language. +# + +# +Releases 10.00 and above of PCRE2 are distributed under the terms of the "BSD" +# +licence, as specified below, with one exemption for certain binary +# +redistributions. The documentation for PCRE2, supplied in the "doc" directory, +# +is distributed under the same terms as the software itself. The data in the +# +testdata directory is not copyrighted and is in the public domain. +# + +# +The basic library functions are written in C and are freestanding. Also +# +included in the distribution is a just-in-time compiler that can be used to +# +optimize pattern matching. This is an optional feature that can be omitted when +# +the library is built. The just-in-time compiler is separately licensed under the +# +"2-clause BSD" licence. +# + +# + +# +COPYRIGHT +# +--------- +# + +# +### The basic library functions +# + +# + Written by: Philip Hazel +# + Email local part: Philip.Hazel +# + Email domain: gmail.com +# + +# + Retired from University of Cambridge Computing Service, +# + Cambridge, England. +# + +# + Copyright (c) 1997-2007 University of Cambridge +# + Copyright (c) 2007-2024 Philip Hazel +# + All rights reserved. +# + +# +### PCRE2 Just-In-Time compilation support +# + +# + Written by: Zoltan Herczeg +# + Email local part: hzmester +# + Email domain: freemail.hu +# + +# + Copyright (c) 2010-2024 Zoltan Herczeg +# + All rights reserved. +# + +# +### Stack-less Just-In-Time compiler +# + +# + Written by: Zoltan Herczeg +# + Email local part: hzmester +# + Email domain: freemail.hu +# + +# + Copyright (c) 2009-2024 Zoltan Herczeg +# + All rights reserved. +# + +# +The code in the `deps/sljit` directory has its own LICENSE file. +# + +# +### All other contributions +# + +# +Many other contributors have participated in the authorship of PCRE2. As PCRE2 +# +has never required a Contributor Licensing Agreement, or other copyright +# +assignment agreement, all contributions have copyright retained by each +# +original contributor or their employer. +# + +# + +# +THE "BSD" LICENCE +# +----------------- +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# - * Redistributions of source code must retain the above copyright notice, +# - this list of conditions and the following disclaimer. +# - +# - * Redistributions in binary form must reproduce the above copyright +# - notice, this list of conditions and the following disclaimer in the +# - documentation and/or other materials provided with the distribution. +# - +# - * Neither the name of the University of Cambridge nor the name of Google +# - Inc. nor the names of their contributors may be used to endorse or +# - promote products derived from this software without specific prior +# - written permission. +# +* Redistributions of source code must retain the above copyright notices, +# + this list of conditions and the following disclaimer. +# + +# +* Redistributions in binary form must reproduce the above copyright +# + notices, this list of conditions and the following disclaimer in the +# + documentation and/or other materials provided with the distribution. +# + +# +* Neither the name of the University of Cambridge nor the names of any +# + contributors may be used to endorse or promote products derived from this +# + software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# @@ -435,6 +497,16 @@ +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +# + +# +EXEMPTION FOR BINARY LIBRARY-LIKE PACKAGES +# +------------------------------------------ +# + +# +The second condition in the BSD licence (covering binary redistributions) does +# +not apply all the way down a chain of software. If binary package A includes +# +PCRE2, it must respect the condition, but if package B is software that +# +includes package A, the condition is not imposed on package B unless it uses +# +PCRE2 independently. +# +# ---------------------------------------------------------------------- +# +# +# + SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/" LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & Zlib & ISC & LGPL-2.1-or-later & CC0-1.0 & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=8eacfdc17c8f4d219e131a073973b97d" +LIC_FILES_CHKSUM = "file://COPYING;md5=8289345c8713c385f45ec0c6c8a0d080" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.9;protocol=https;tag=v${PV}" -SRCREV = "f7164261c9bc0a7e0ebf767c584e5192810a8b24" +SRCREV = "26055f5af74ab1cf636d272e8a34315496d3f06f" inherit cmake