package/libgit2: Bump to version 1.0.0
PATCH 1/1 package/libgit2: Bump to version 1.0.0
This version changes the required dependencies as well as introducing new bundled ones...
- Start depending on httpparser, instead of using the bundled one.
- Force using regcomp instead of using a bundled pcre.
- Add license for a bundled wildmatch and sha1.
Tested with multiple check-pkg -a invocations, with multiple dependencies configurations.
--- package/libgit2/Config.in | 2 ++ package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-)
package/libgit2/Config.in +2 -0
@@ -1,5 +1,7 @@ config BR2_PACKAGE_LIBGIT2 bool "libgit2" + depends on !BR2_STATIC_LIBS # libhttpparser + select BR2_PACKAGE_LIBHTTPPARSER select BR2_PACKAGE_ZLIB help libgit2 is a portable, pure C implementation of the Git core
package/libgit2/libgit2.hash +2 -2
@@ -1,3 +1,3 @@ # Locally calculated -sha256 30f3877469d09f2e4a21be933b4e2800560d16646028dd800744dc5f7fb0c749 libgit2-0.28.4.tar.gz -sha256 d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813 COPYING +sha256 6a1fa16a7f6335ce8b2630fbdbb5e57c4027929ebc56fcd1ac55edb141b409b4 libgit2-1.0.0.tar.gz +sha256 afc8bde99ba630012107c25d3c42dde628ec5f0cd3f428131f7e3a0f7d58ff42 COPYING
package/libgit2/libgit2.mk +6 -4
@@ -4,9 +4,9 @@ # ################################################################################ -LIBGIT2_VERSION = 0.28.4 -LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception +LIBGIT2_VERSION = 1.0.0 +LIBGIT2_SITE = https://github.com/libgit2/libgit2/releases/download/v1.0.0 +LIBGIT2_LICENSE = GPL-2.0 with linking exception, BSD 4-clause variant (wildmatch), MIT (sha1) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_INSTALL_STAGING = YES
@@ -14,9 +14,11 @@ LIBGIT2_CONF_OPTS = \ -DUSE_GSSAPI=OFF \ -DBUILD_CLAR=OFF \ -DUSE_ICONV=ON \ + -DREGEX_BACKEND=regcomp \ + -DUSE_HTTP_PARSER=system \ -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) -LIBGIT2_DEPENDENCIES = zlib +LIBGIT2_DEPENDENCIES = zlib libhttpparser # If libiconv is available (for !locale toolchains), then we can use # it for iconv support. Note that USE_ICONV=ON is still correct even
Signature · 1 line
2.25.1
PATCH 1/1 package/libgit2: Bump to version 1.0.0
package/libgit2/Config.in line 3
Quoted 8 lines · On Tue, 14 Apr 2020 11:14:39 +0200 Nicolas Cavallari…
package/libgit2/Config.in +1
-0@@ -1,5 +1,7 @@ config BR2_PACKAGE_LIBGIT2 bool "libgit2" + depends on !BR2_STATIC_LIBS # libhttpparser
This requires the addition of a Config.in comment.
package/libgit2/Config.in line 5
Quoted 5 lines
package/libgit2/Config.in +2
-3-LIBGIT2_VERSION = 0.28.4 -LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception +LIBGIT2_VERSION = 1.0.0 +LIBGIT2_SITE = https://github.com/libgit2/libgit2/releases/download/v1.0.0
Instead of hardcoding v1.0.0 in the URL, use $(LIBGIT2_VERSION)
package/libgit2/Config.in line 6
Quoted 1 line
package/libgit2/Config.in +1
-0+LIBGIT2_LICENSE = GPL-2.0 with linking exception, BSD 4-clause variant (wildmatch), MIT (sha1)
But here is the part that made me not apply the patch: this BSD 4-clause variant thing. The license text is at
https://github.com/libgit2/libgit2/blob/master/COPYING#L995 and it doesn't seem to be a license known at https://spdx.org/licenses/. I'm not sure how to properly encode it.
Yann, Arnout, any suggestion?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/libgit2: Bump to version 1.0.0
Thomas, All,
On 2020-04-15 22:32 +0200, Thomas Petazzoni spake thusly:
Quoted 2 lines
On Tue, 14 Apr 2020 11:14:39 +0200
Nicolas Cavallari <[email protected]> wrote:
[--SNIP--]
Quoted 8 lines
Quoted 1 line
+LIBGIT2_LICENSE = GPL-2.0 with linking exception, BSD 4-clause variant (wildmatch), MIT (sha1)
But here is the part that made me not apply the patch: this BSD 4-clause variant thing. The license text is at
https://github.com/libgit2/libgit2/blob/master/COPYING#L995 and it doesn't seem to be a license known at https://spdx.org/licenses/. I'm not sure how to properly encode it.Yann, Arnout, any suggestion?
We should only encode known, exact matches. Otherwise, we should only list it like we do unknown license, like:
libgit2 license (wildmatch)
What does not help in fact, is that the code does not originate libgit2, but from git, which itself got it from rsync before it turned GPLv3, which got it from somewhere.
However, the code is credited to a certain Rich Salz, in 1986, 34 years ago now. There is even a Wikipedia page [0] about something really closely related, wildmat, which is also described as bsing a pattern matching library writen in 1986 by said Rich Salz. There is a wildmat on github [1], also posted by Rich Salz, where they dedicate it to the public domain.
[0] https://en.wikipedia.org/wiki/Wildmat
[1] https://github.com/richsalz/wildmat
Still, that does not say much about the actual copy in libgit2...
So, I'd just say something like
wildmatch license (wildmatch)
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'