From abe16912590ccbac0833f043645c507466dd7ec0 Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Mon, 23 Mar 2020 10:20:58 +0100 Subject: [PATCH 1/6] Bump libgit2 to 1.0.0 --- deps/Versions.make | 2 +- deps/libgit2.mk | 8 -------- deps/libgit2.version | 4 ++-- stdlib/LibGit2/src/LibGit2.jl | 2 +- stdlib/LibGit2/src/blob.jl | 2 +- stdlib/LibGit2/src/error.jl | 8 ++++++-- stdlib/LibGit2/src/oid.jl | 3 ++- stdlib/LibGit2/src/repository.jl | 2 +- stdlib/LibGit2/src/types.jl | 10 +++------- stdlib/LibGit2/src/utils.jl | 4 ++-- stdlib/LibGit2/src/walker.jl | 2 +- stdlib/LibGit2/test/libgit2.jl | 2 +- 12 files changed, 21 insertions(+), 28 deletions(-) diff --git a/deps/Versions.make b/deps/Versions.make index d07bd4f6333d2..0857694311c5d 100644 --- a/deps/Versions.make +++ b/deps/Versions.make @@ -26,7 +26,7 @@ LIBSSH2_VER = 1.9.0 LIBSSH2_BB_REL = 1 CURL_VER = 7.66.0 CURL_BB_REL = 1 -LIBGIT2_VER = 0.28.5 +LIBGIT2_VER = 1.0.0 LIBGIT2_BB_REL = 0 LIBUV_VER = 1.29.1 LIBUV_BB_REL = 8 diff --git a/deps/libgit2.mk b/deps/libgit2.mk index c04444be7e8fa..29b11b3688256 100644 --- a/deps/libgit2.mk +++ b/deps/libgit2.mk @@ -12,12 +12,6 @@ ifeq ($(USE_SYSTEM_MBEDTLS), 0) $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/mbedtls endif -ifneq ($(OS),WINNT) -ifeq ($(USE_SYSTEM_CURL), 0) -$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/curl -endif -endif - ifneq ($(USE_BINARYBUILDER_LIBGIT2),1) LIBGIT2_OPTS := $(CMAKE_COMMON) -DCMAKE_BUILD_TYPE=Release -DTHREADSAFE=ON -DUSE_BUNDLED_ZLIB=ON @@ -34,8 +28,6 @@ else LIBGIT2_OPTS += -DBUILD_CLAR=OFF -DDLLTOOL=`which $(CROSS_COMPILE)dlltool` LIBGIT2_OPTS += -DCMAKE_FIND_ROOT_PATH=/usr/$(XC_HOST) -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY endif -else -LIBGIT2_OPTS += -DCURL_INCLUDE_DIRS=$(build_includedir) -DCURL_LIBRARIES="curl" endif ifneq (,$(findstring $(OS),Linux FreeBSD)) diff --git a/deps/libgit2.version b/deps/libgit2.version index 66baf582ff3a3..dca9d0d277ab9 100644 --- a/deps/libgit2.version +++ b/deps/libgit2.version @@ -1,2 +1,2 @@ -LIBGIT2_BRANCH=v0.28.5 -LIBGIT2_SHA1=7a2b969d559b83798d93728f24d1729ffc97b717 +LIBGIT2_BRANCH=v1.0.0 +LIBGIT2_SHA1=7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0 diff --git a/stdlib/LibGit2/src/LibGit2.jl b/stdlib/LibGit2/src/LibGit2.jl index 50a39ca323aef..d231ca0ac8748 100644 --- a/stdlib/LibGit2/src/LibGit2.jl +++ b/stdlib/LibGit2/src/LibGit2.jl @@ -18,10 +18,10 @@ const REFCOUNT = Threads.Atomic{Int}(0) function ensure_initialized end +include("error.jl") include("utils.jl") include("consts.jl") include("types.jl") -include("error.jl") include("signature.jl") include("oid.jl") include("reference.jl") diff --git a/stdlib/LibGit2/src/blob.jl b/stdlib/LibGit2/src/blob.jl index b416fac7329e6..efd7a14c9c6f7 100644 --- a/stdlib/LibGit2/src/blob.jl +++ b/stdlib/LibGit2/src/blob.jl @@ -67,7 +67,7 @@ id = LibGit2.addblob!(repo, blob_file) function addblob!(repo::GitRepo, path::AbstractString) ensure_initialized() id_ref = Ref{GitHash}() - @check ccall((:git_blob_create_fromdisk, :libgit2), Cint, + @check ccall((:git_blob_create_from_disk, :libgit2), Cint, (Ptr{GitHash}, Ptr{Cvoid}, Cstring), id_ref, repo.ptr, path) return id_ref[] diff --git a/stdlib/LibGit2/src/error.jl b/stdlib/LibGit2/src/error.jl index 61eff41855ae4..3e56999d5a52c 100644 --- a/stdlib/LibGit2/src/error.jl +++ b/stdlib/LibGit2/src/error.jl @@ -25,9 +25,13 @@ export GitError ECERTIFICATE = Cint(-17), # server certificate is invalid EAPPLIED = Cint(-18), # patch/merge has already been applied EPEEL = Cint(-19), # the requested peel operation is not possible - EEOF = Cint(-20), # Unexpted EOF + EEOF = Cint(-20), # unexpected EOF PASSTHROUGH = Cint(-30), # internal only - ITEROVER = Cint(-31)) # signals end of iteration + ITEROVER = Cint(-31), # signals end of iteration + RETRY = Cint(-32), # internal only + EMISMATCH = Cint(-33), # hashsum mismatch in object + EINDEXDIRTY = Cint(-34), # unsaved changes in the index would be overwritten + EAPPLYFAIL = Cint(-35)) # patch application failed @enum(Class, None, NoMemory, diff --git a/stdlib/LibGit2/src/oid.jl b/stdlib/LibGit2/src/oid.jl index 069d725685a62..1074f003ebd2f 100644 --- a/stdlib/LibGit2/src/oid.jl +++ b/stdlib/LibGit2/src/oid.jl @@ -13,7 +13,8 @@ function GitHash(ptr::Ptr{UInt8}) end ensure_initialized() oid_ptr = Ref(GitHash()) - ccall((:git_oid_fromraw, :libgit2), Cvoid, (Ptr{GitHash}, Ptr{UInt8}), oid_ptr, ptr) + @check ccall((:git_oid_fromraw, :libgit2), Cint, + (Ptr{GitHash}, Ptr{UInt8}), oid_ptr, ptr) return oid_ptr[] end diff --git a/stdlib/LibGit2/src/repository.jl b/stdlib/LibGit2/src/repository.jl index eef9e8dba889e..994d0a9f32875 100644 --- a/stdlib/LibGit2/src/repository.jl +++ b/stdlib/LibGit2/src/repository.jl @@ -32,7 +32,7 @@ end function cleanup(r::GitRepo) if r.ptr != C_NULL ensure_initialized() - ccall((:git_repository__cleanup, :libgit2), Cvoid, (Ptr{Cvoid},), r.ptr) + @check ccall((:git_repository__cleanup, :libgit2), Cint, (Ptr{Cvoid},), r.ptr) end end diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl index fb76331c04e55..6f676cf16cd3a 100644 --- a/stdlib/LibGit2/src/types.jl +++ b/stdlib/LibGit2/src/types.jl @@ -197,7 +197,7 @@ end LibGit2.TransferProgress Transfer progress information used by the `transfer_progress` remote callback. -Matches the [`git_transfer_progress`](https://libgit2.org/libgit2/#HEAD/type/git_transfer_progress) struct. +Matches the [`git_indexer_progress`](https://libgit2.org/libgit2/#HEAD/type/git_indexer_progress) struct. """ @kwdef struct TransferProgress total_objects::Cuint = Cuint(0) @@ -328,12 +328,8 @@ end prune::Cint = Consts.FETCH_PRUNE_UNSPECIFIED update_fetchhead::Cint = Cint(1) download_tags::Cint = Consts.REMOTE_DOWNLOAD_TAGS_AUTO - @static if LibGit2.VERSION >= v"0.25.0" - proxy_opts::ProxyOptions = ProxyOptions() - end - @static if LibGit2.VERSION >= v"0.24.0" - custom_headers::StrArrayStruct = StrArrayStruct() - end + proxy_opts::ProxyOptions = ProxyOptions() + custom_headers::StrArrayStruct = StrArrayStruct() end """ diff --git a/stdlib/LibGit2/src/utils.jl b/stdlib/LibGit2/src/utils.jl index 147b0949f74c1..b601ea4efe601 100644 --- a/stdlib/LibGit2/src/utils.jl +++ b/stdlib/LibGit2/src/utils.jl @@ -37,8 +37,8 @@ function version() major = Ref{Cint}(0) minor = Ref{Cint}(0) patch = Ref{Cint}(0) - ccall((:git_libgit2_version, :libgit2), Cvoid, - (Ref{Cint}, Ref{Cint}, Ref{Cint}), major, minor, patch) + @check ccall((:git_libgit2_version, :libgit2), Cint, + (Ref{Cint}, Ref{Cint}, Ref{Cint}), major, minor, patch) return VersionNumber(major[], minor[], patch[]) end const VERSION = version() diff --git a/stdlib/LibGit2/src/walker.jl b/stdlib/LibGit2/src/walker.jl index 1d2fbcb52f9bc..e977590eafb88 100644 --- a/stdlib/LibGit2/src/walker.jl +++ b/stdlib/LibGit2/src/walker.jl @@ -77,7 +77,7 @@ end function Base.sort!(w::GitRevWalker; by::Cint = Consts.SORT_NONE, rev::Bool=false) ensure_initialized() rev && (by |= Consts.SORT_REVERSE) - ccall((:git_revwalk_sorting, :libgit2), Cvoid, (Ptr{Cvoid}, Cint), w.ptr, by) + @check ccall((:git_revwalk_sorting, :libgit2), Cint, (Ptr{Cvoid}, Cint), w.ptr, by) return w end diff --git a/stdlib/LibGit2/test/libgit2.jl b/stdlib/LibGit2/test/libgit2.jl index 4755f13466063..54950132ea3f8 100644 --- a/stdlib/LibGit2/test/libgit2.jl +++ b/stdlib/LibGit2/test/libgit2.jl @@ -111,7 +111,7 @@ function challenge_prompt(cmd::Cmd, challenges; timeout::Integer=60, debug::Bool nothing end -const LIBGIT2_MIN_VER = v"0.23.0" +const LIBGIT2_MIN_VER = v"1.0.0" const LIBGIT2_HELPER_PATH = joinpath(@__DIR__, "libgit2-helpers.jl") const KEY_DIR = joinpath(@__DIR__, "keys") From e3909b1385322ba70818b3c71408aa85d24e37e3 Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Tue, 4 Aug 2020 14:39:11 +0200 Subject: [PATCH 2/6] Remove curl --- LICENSE.md | 1 - Make.inc | 3 +- Makefile | 1 - base/Makefile | 1 - contrib/refresh_bb_tarballs.sh | 2 +- deps/Makefile | 11 +---- deps/Versions.make | 2 - deps/curl.mk | 77 ---------------------------------- doc/build/build.md | 2 - 9 files changed, 4 insertions(+), 96 deletions(-) delete mode 100644 deps/curl.mk diff --git a/LICENSE.md b/LICENSE.md index d1438a5f68bfc..f62635d5f27df 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -59,7 +59,6 @@ Julia's `stdlib` uses the following external libraries, which have their own lic - [OPENLIBM](https://github.com/JuliaMath/openlibm/blob/master/LICENSE.md) [MIT, BSD-2, ISC] - [GMP](https://gmplib.org/manual/Copying.html#Copying) [LGPL3+ or GPL2+] - [LIBGIT2](https://github.com/libgit2/libgit2/blob/development/COPYING) [GPL2+ with unlimited linking exception] -- [CURL](https://curl.haxx.se/docs/copyright.html) [MIT/X derivative] - [LIBSSH2](https://github.com/libssh2/libssh2/blob/master/COPYING) [BSD-3] - [MBEDTLS](https://tls.mbed.org/how-to-get) [either GPLv2 or Apache 2.0] - [MPFR](https://www.mpfr.org/mpfr-current/mpfr.html#Copying) [LGPL3+] diff --git a/Make.inc b/Make.inc index 21a0299318b51..6ec3127c3e897 100644 --- a/Make.inc +++ b/Make.inc @@ -49,7 +49,6 @@ USE_SYSTEM_LIBUV:=0 USE_SYSTEM_UTF8PROC:=0 USE_SYSTEM_MBEDTLS:=0 USE_SYSTEM_LIBSSH2:=0 -USE_SYSTEM_CURL:=0 USE_SYSTEM_LIBGIT2:=0 USE_SYSTEM_PATCHELF:=0 USE_SYSTEM_ZLIB:=0 @@ -1098,7 +1097,7 @@ USE_BINARYBUILDER ?= 0 endif # This is the set of projects that BinaryBuilder dependencies are hooked up for. -BB_PROJECTS := OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP +BB_PROJECTS := OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 MPFR LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP define SET_BB_DEFAULT # First, check to see if BB is disabled on a global setting ifeq ($$(USE_BINARYBUILDER),0) diff --git a/Makefile b/Makefile index 23d1bd5208f77..8ae3d9a610c0d 100644 --- a/Makefile +++ b/Makefile @@ -171,7 +171,6 @@ JL_PRIVATE_LIBS-$(USE_SYSTEM_GMP) += libgmp JL_PRIVATE_LIBS-$(USE_SYSTEM_MPFR) += libmpfr JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSSH2) += libssh2 JL_PRIVATE_LIBS-$(USE_SYSTEM_MBEDTLS) += libmbedtls libmbedcrypto libmbedx509 -JL_PRIVATE_LIBS-$(USE_SYSTEM_CURL) += libcurl JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBGIT2) += libgit2 ifeq ($(OS),WINNT) JL_PRIVATE_LIBS-$(USE_SYSTEM_ZLIB) += zlib diff --git a/base/Makefile b/base/Makefile index b3845753fe74c..adc0fcde8e6a2 100644 --- a/base/Makefile +++ b/base/Makefile @@ -192,7 +192,6 @@ $(eval $(call symlink_system_library,libmbedtls,MBEDTLS)) $(eval $(call symlink_system_library,libmbedcrypto,MBEDTLS)) $(eval $(call symlink_system_library,libmbedx509,MBEDTLS)) $(eval $(call symlink_system_library,libssh2,LIBSSH2)) -$(eval $(call symlink_system_library,libcurl,CURL)) $(eval $(call symlink_system_library,libgit2,LIBGIT2)) $(eval $(call symlink_system_library,libamd,SUITESPARSE)) $(eval $(call symlink_system_library,libcamd,SUITESPARSE)) diff --git a/contrib/refresh_bb_tarballs.sh b/contrib/refresh_bb_tarballs.sh index 867f66c74609d..9bd5524a6684b 100755 --- a/contrib/refresh_bb_tarballs.sh +++ b/contrib/refresh_bb_tarballs.sh @@ -12,7 +12,7 @@ TRIPLETS="i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu armv7l-linux-gnueabihf powerpc64le-linux-gnu i686-linux-musl x86_64-linux-musl aarch64-linux-musl armv7l-linux-musleabihf x86_64-apple-darwin14 x86_64-unknown-freebsd11.1 i686-w64-mingw32 x86_64-w64-mingw32" # These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded: -BB_PROJECTS="mbedtls libssh2 mpfr curl libgit2 pcre libuv unwind osxunwind dsfmt objconv p7zip zlib suitesparse openlibm" +BB_PROJECTS="mbedtls libssh2 mpfr libgit2 pcre libuv unwind osxunwind dsfmt objconv p7zip zlib suitesparse openlibm" BB_GCC_EXPANDED_PROJECTS="openblas" BB_CXX_EXPANDED_PROJECTS="gmp llvm" diff --git a/deps/Makefile b/deps/Makefile index 90e231f30e85d..2228405c193dc 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -23,7 +23,7 @@ BUILDDIR := $(BUILDDIR)$(MAYBE_HOST) # additionally all targets should be listed in the getall target for easier off-line compilation # if you are adding a new target, it can help to copy an similar, existing target # -# autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv curl +# autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv # custom Makefile rules: openlibm dsfmt suitesparse-wrapper suitesparse lapack openblas utf8proc objconv osxunwind libwhich # CMake libs: llvm libgit2 libssh2 mbedtls # @@ -111,12 +111,6 @@ ifeq ($(USE_SYSTEM_LIBSSH2), 0) DEP_LIBS += libssh2 endif -ifneq ($(OS), WINNT) -ifeq ($(USE_SYSTEM_CURL), 0) -DEP_LIBS += curl -endif -endif - DEP_LIBS += libgit2 endif # USE_SYSTEM_LIBGIT2 @@ -178,7 +172,7 @@ install: $(addprefix install-, $(DEP_LIBS)) cleanall: $(addprefix clean-, $(DEP_LIBS)) distcleanall: $(addprefix distclean-, $(DEP_LIBS)) rm -rf $(build_prefix) -getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-openblas get-lapack get-suitesparse get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-curl get-libgit2 get-libwhich +getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-openblas get-lapack get-suitesparse get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-libgit2 get-libwhich include $(SRCDIR)/llvm.mk include $(SRCDIR)/libuv.mk @@ -195,7 +189,6 @@ include $(SRCDIR)/mpfr.mk include $(SRCDIR)/patchelf.mk include $(SRCDIR)/mbedtls.mk include $(SRCDIR)/libssh2.mk -include $(SRCDIR)/curl.mk include $(SRCDIR)/libgit2.mk include $(SRCDIR)/libwhich.mk include $(SRCDIR)/zlib.mk diff --git a/deps/Versions.make b/deps/Versions.make index 0857694311c5d..d252bc607ff41 100644 --- a/deps/Versions.make +++ b/deps/Versions.make @@ -24,8 +24,6 @@ MBEDTLS_VER = 2.16.0 MBEDTLS_BB_REL = 1 LIBSSH2_VER = 1.9.0 LIBSSH2_BB_REL = 1 -CURL_VER = 7.66.0 -CURL_BB_REL = 1 LIBGIT2_VER = 1.0.0 LIBGIT2_BB_REL = 0 LIBUV_VER = 1.29.1 diff --git a/deps/curl.mk b/deps/curl.mk deleted file mode 100644 index c7d8d617cb062..0000000000000 --- a/deps/curl.mk +++ /dev/null @@ -1,77 +0,0 @@ -## CURL ## - -ifeq ($(USE_SYSTEM_LIBSSH2), 0) -$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/libssh2 -endif - -ifeq ($(USE_SYSTEM_MBEDTLS), 0) -$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/mbedtls -endif - -ifneq ($(USE_BINARYBUILDER_CURL),1) -CURL_LDFLAGS := $(RPATH_ESCAPED_ORIGIN) - -# On older Linuces (those that use OpenSSL < 1.1) we include `libpthread` explicitly. -# It doesn't hurt to include it explicitly elsewhere, so we do so. -ifeq ($(OS),Linux) -CURL_LDFLAGS += -lpthread -endif - -$(SRCCACHE)/curl-$(CURL_VER).tar.bz2: | $(SRCCACHE) - $(JLDOWNLOAD) $@ https://curl.haxx.se/download/curl-$(CURL_VER).tar.bz2 - -$(SRCCACHE)/curl-$(CURL_VER)/source-extracted: $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 - $(JLCHECKSUM) $< - cd $(dir $<) && $(TAR) jxf $(notdir $<) - touch -c $(SRCCACHE)/curl-$(CURL_VER)/configure # old target - echo 1 > $@ - -$(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted - mkdir -p $(dir $@) - cd $(dir $@) && \ - $(dir $<)/configure $(CONFIGURE_COMMON) --includedir=$(build_includedir) \ - --without-ssl --without-gnutls --without-gssapi --without-zlib \ - --without-libidn --without-libidn2 --without-libmetalink --without-librtmp \ - --without-nghttp2 --without-nss --without-polarssl \ - --without-spnego --without-libpsl --disable-ares \ - --disable-ldap --disable-ldaps --without-zsh-functions-dir \ - --with-libssh2=$(build_prefix) --with-mbedtls=$(build_prefix) \ - CFLAGS="$(CFLAGS) $(CURL_CFLAGS)" LDFLAGS="$(LDFLAGS) $(CURL_LDFLAGS)" - echo 1 > $@ - -$(BUILDDIR)/curl-$(CURL_VER)/build-compiled: $(BUILDDIR)/curl-$(CURL_VER)/build-configured - $(MAKE) -C $(dir $<) $(LIBTOOL_CCLD) - echo 1 > $@ - -$(BUILDDIR)/curl-$(CURL_VER)/build-checked: $(BUILDDIR)/curl-$(CURL_VER)/build-compiled -ifeq ($(OS),$(BUILD_OS)) - $(MAKE) -C $(dir $@) check -endif - echo 1 > $@ - -$(eval $(call staged-install, \ - curl,curl-$$(CURL_VER), \ - MAKE_INSTALL,$$(LIBTOOL_CCLD),, \ - $$(INSTALL_NAME_CMD)libcurl.$$(SHLIB_EXT) $$(build_shlibdir)/libcurl.$$(SHLIB_EXT))) - -clean-curl: - -rm $(BUILDDIR)/curl-$(CURL_VER)/build-configured $(BUILDDIR)/curl-$(CURL_VER)/build-compiled - -$(MAKE) -C $(BUILDDIR)/curl-$(CURL_VER) clean - -distclean-curl: - -rm -rf $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 $(SRCCACHE)/curl-$(CURL_VER) $(BUILDDIR)/curl-$(CURL_VER) - -get-curl: $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 -extract-curl: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted -configure-curl: $(BUILDDIR)/curl-$(CURL_VER)/build-configured -compile-curl: $(BUILDDIR)/curl-$(CURL_VER)/build-compiled -fastcheck-curl: #none -check-curl: $(BUILDDIR)/curl-$(CURL_VER)/build-checked - -else # USE_BINARYBUILDER_CURL - -CURL_BB_URL_BASE := https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v$(CURL_VER)+$(CURL_BB_REL) -CURL_BB_NAME := LibCURL.v$(CURL_VER) - -$(eval $(call bb-install,curl,CURL,false)) -endif diff --git a/doc/build/build.md b/doc/build/build.md index fd662459cc489..ca4070c39b981 100644 --- a/doc/build/build.md +++ b/doc/build/build.md @@ -181,7 +181,6 @@ uses are listed in [`deps/Versions.make`](https://github.com/JuliaLang/julia/blo - **[GMP]** — GNU multiple precision arithmetic library, needed for `BigInt` support. - **[MPFR]** — GNU multiple precision floating point library, needed for arbitrary precision floating point (`BigFloat`) support. - **[libgit2]** — Git linkable library, used by Julia's package manager. -- **[curl]** — libcurl provides download and proxy support for Julia's package manager. - **[libssh2]** — library for SSH transport, used by libgit2 for packages with SSH remotes. - **[mbedtls]** — library used for cryptography and transport layer security, used by libssh2 - **[utf8proc]** — a library for processing UTF-8 encoded Unicode strings. @@ -196,7 +195,6 @@ uses are listed in [`deps/Versions.make`](https://github.com/JuliaLang/julia/blo [clang]: https://clang.llvm.org [python]: https://www.python.org/ [gfortran]: https://gcc.gnu.org/fortran/ -[curl]: https://curl.haxx.se [fetch]: https://www.freebsd.org/cgi/man.cgi?fetch(1) [perl]: https://www.perl.org [cmake]: https://www.cmake.org From 4ba643dd79186fb5206207fa64dc310a6a187eb3 Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Thu, 27 Aug 2020 21:50:07 +0200 Subject: [PATCH 3/6] Use 1.0.1 --- deps/Versions.make | 2 +- deps/libgit2.version | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/Versions.make b/deps/Versions.make index d252bc607ff41..6682ce2e5f816 100644 --- a/deps/Versions.make +++ b/deps/Versions.make @@ -24,7 +24,7 @@ MBEDTLS_VER = 2.16.0 MBEDTLS_BB_REL = 1 LIBSSH2_VER = 1.9.0 LIBSSH2_BB_REL = 1 -LIBGIT2_VER = 1.0.0 +LIBGIT2_VER = 1.0.1 LIBGIT2_BB_REL = 0 LIBUV_VER = 1.29.1 LIBUV_BB_REL = 8 diff --git a/deps/libgit2.version b/deps/libgit2.version index dca9d0d277ab9..a2ab705d4567e 100644 --- a/deps/libgit2.version +++ b/deps/libgit2.version @@ -1,2 +1,2 @@ -LIBGIT2_BRANCH=v1.0.0 -LIBGIT2_SHA1=7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0 +LIBGIT2_BRANCH=v1.0.1 +LIBGIT2_SHA1=0ced29612dacb67eefe0c562a5c1d3aab21cce96 From 3a89930ca8e3a635048411c4416d6baaa406994d Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Wed, 9 Sep 2020 15:58:03 +0200 Subject: [PATCH 4/6] Revert "Remove curl" This reverts commit e3909b1385322ba70818b3c71408aa85d24e37e3. --- LICENSE.md | 1 + Make.inc | 3 +- Makefile | 1 + base/Makefile | 1 + contrib/refresh_bb_tarballs.sh | 2 +- deps/Makefile | 11 ++++- deps/Versions.make | 2 + deps/curl.mk | 77 ++++++++++++++++++++++++++++++++++ doc/build/build.md | 2 + 9 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 deps/curl.mk diff --git a/LICENSE.md b/LICENSE.md index f62635d5f27df..d1438a5f68bfc 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -59,6 +59,7 @@ Julia's `stdlib` uses the following external libraries, which have their own lic - [OPENLIBM](https://github.com/JuliaMath/openlibm/blob/master/LICENSE.md) [MIT, BSD-2, ISC] - [GMP](https://gmplib.org/manual/Copying.html#Copying) [LGPL3+ or GPL2+] - [LIBGIT2](https://github.com/libgit2/libgit2/blob/development/COPYING) [GPL2+ with unlimited linking exception] +- [CURL](https://curl.haxx.se/docs/copyright.html) [MIT/X derivative] - [LIBSSH2](https://github.com/libssh2/libssh2/blob/master/COPYING) [BSD-3] - [MBEDTLS](https://tls.mbed.org/how-to-get) [either GPLv2 or Apache 2.0] - [MPFR](https://www.mpfr.org/mpfr-current/mpfr.html#Copying) [LGPL3+] diff --git a/Make.inc b/Make.inc index 6ec3127c3e897..21a0299318b51 100644 --- a/Make.inc +++ b/Make.inc @@ -49,6 +49,7 @@ USE_SYSTEM_LIBUV:=0 USE_SYSTEM_UTF8PROC:=0 USE_SYSTEM_MBEDTLS:=0 USE_SYSTEM_LIBSSH2:=0 +USE_SYSTEM_CURL:=0 USE_SYSTEM_LIBGIT2:=0 USE_SYSTEM_PATCHELF:=0 USE_SYSTEM_ZLIB:=0 @@ -1097,7 +1098,7 @@ USE_BINARYBUILDER ?= 0 endif # This is the set of projects that BinaryBuilder dependencies are hooked up for. -BB_PROJECTS := OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 MPFR LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP +BB_PROJECTS := OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP define SET_BB_DEFAULT # First, check to see if BB is disabled on a global setting ifeq ($$(USE_BINARYBUILDER),0) diff --git a/Makefile b/Makefile index 8ae3d9a610c0d..23d1bd5208f77 100644 --- a/Makefile +++ b/Makefile @@ -171,6 +171,7 @@ JL_PRIVATE_LIBS-$(USE_SYSTEM_GMP) += libgmp JL_PRIVATE_LIBS-$(USE_SYSTEM_MPFR) += libmpfr JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSSH2) += libssh2 JL_PRIVATE_LIBS-$(USE_SYSTEM_MBEDTLS) += libmbedtls libmbedcrypto libmbedx509 +JL_PRIVATE_LIBS-$(USE_SYSTEM_CURL) += libcurl JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBGIT2) += libgit2 ifeq ($(OS),WINNT) JL_PRIVATE_LIBS-$(USE_SYSTEM_ZLIB) += zlib diff --git a/base/Makefile b/base/Makefile index adc0fcde8e6a2..b3845753fe74c 100644 --- a/base/Makefile +++ b/base/Makefile @@ -192,6 +192,7 @@ $(eval $(call symlink_system_library,libmbedtls,MBEDTLS)) $(eval $(call symlink_system_library,libmbedcrypto,MBEDTLS)) $(eval $(call symlink_system_library,libmbedx509,MBEDTLS)) $(eval $(call symlink_system_library,libssh2,LIBSSH2)) +$(eval $(call symlink_system_library,libcurl,CURL)) $(eval $(call symlink_system_library,libgit2,LIBGIT2)) $(eval $(call symlink_system_library,libamd,SUITESPARSE)) $(eval $(call symlink_system_library,libcamd,SUITESPARSE)) diff --git a/contrib/refresh_bb_tarballs.sh b/contrib/refresh_bb_tarballs.sh index 9bd5524a6684b..867f66c74609d 100755 --- a/contrib/refresh_bb_tarballs.sh +++ b/contrib/refresh_bb_tarballs.sh @@ -12,7 +12,7 @@ TRIPLETS="i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu armv7l-linux-gnueabihf powerpc64le-linux-gnu i686-linux-musl x86_64-linux-musl aarch64-linux-musl armv7l-linux-musleabihf x86_64-apple-darwin14 x86_64-unknown-freebsd11.1 i686-w64-mingw32 x86_64-w64-mingw32" # These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded: -BB_PROJECTS="mbedtls libssh2 mpfr libgit2 pcre libuv unwind osxunwind dsfmt objconv p7zip zlib suitesparse openlibm" +BB_PROJECTS="mbedtls libssh2 mpfr curl libgit2 pcre libuv unwind osxunwind dsfmt objconv p7zip zlib suitesparse openlibm" BB_GCC_EXPANDED_PROJECTS="openblas" BB_CXX_EXPANDED_PROJECTS="gmp llvm" diff --git a/deps/Makefile b/deps/Makefile index 2228405c193dc..90e231f30e85d 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -23,7 +23,7 @@ BUILDDIR := $(BUILDDIR)$(MAYBE_HOST) # additionally all targets should be listed in the getall target for easier off-line compilation # if you are adding a new target, it can help to copy an similar, existing target # -# autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv +# autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv curl # custom Makefile rules: openlibm dsfmt suitesparse-wrapper suitesparse lapack openblas utf8proc objconv osxunwind libwhich # CMake libs: llvm libgit2 libssh2 mbedtls # @@ -111,6 +111,12 @@ ifeq ($(USE_SYSTEM_LIBSSH2), 0) DEP_LIBS += libssh2 endif +ifneq ($(OS), WINNT) +ifeq ($(USE_SYSTEM_CURL), 0) +DEP_LIBS += curl +endif +endif + DEP_LIBS += libgit2 endif # USE_SYSTEM_LIBGIT2 @@ -172,7 +178,7 @@ install: $(addprefix install-, $(DEP_LIBS)) cleanall: $(addprefix clean-, $(DEP_LIBS)) distcleanall: $(addprefix distclean-, $(DEP_LIBS)) rm -rf $(build_prefix) -getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-openblas get-lapack get-suitesparse get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-libgit2 get-libwhich +getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-openblas get-lapack get-suitesparse get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-curl get-libgit2 get-libwhich include $(SRCDIR)/llvm.mk include $(SRCDIR)/libuv.mk @@ -189,6 +195,7 @@ include $(SRCDIR)/mpfr.mk include $(SRCDIR)/patchelf.mk include $(SRCDIR)/mbedtls.mk include $(SRCDIR)/libssh2.mk +include $(SRCDIR)/curl.mk include $(SRCDIR)/libgit2.mk include $(SRCDIR)/libwhich.mk include $(SRCDIR)/zlib.mk diff --git a/deps/Versions.make b/deps/Versions.make index 6682ce2e5f816..e11fa9ce18859 100644 --- a/deps/Versions.make +++ b/deps/Versions.make @@ -24,6 +24,8 @@ MBEDTLS_VER = 2.16.0 MBEDTLS_BB_REL = 1 LIBSSH2_VER = 1.9.0 LIBSSH2_BB_REL = 1 +CURL_VER = 7.66.0 +CURL_BB_REL = 1 LIBGIT2_VER = 1.0.1 LIBGIT2_BB_REL = 0 LIBUV_VER = 1.29.1 diff --git a/deps/curl.mk b/deps/curl.mk new file mode 100644 index 0000000000000..c7d8d617cb062 --- /dev/null +++ b/deps/curl.mk @@ -0,0 +1,77 @@ +## CURL ## + +ifeq ($(USE_SYSTEM_LIBSSH2), 0) +$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/libssh2 +endif + +ifeq ($(USE_SYSTEM_MBEDTLS), 0) +$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/mbedtls +endif + +ifneq ($(USE_BINARYBUILDER_CURL),1) +CURL_LDFLAGS := $(RPATH_ESCAPED_ORIGIN) + +# On older Linuces (those that use OpenSSL < 1.1) we include `libpthread` explicitly. +# It doesn't hurt to include it explicitly elsewhere, so we do so. +ifeq ($(OS),Linux) +CURL_LDFLAGS += -lpthread +endif + +$(SRCCACHE)/curl-$(CURL_VER).tar.bz2: | $(SRCCACHE) + $(JLDOWNLOAD) $@ https://curl.haxx.se/download/curl-$(CURL_VER).tar.bz2 + +$(SRCCACHE)/curl-$(CURL_VER)/source-extracted: $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 + $(JLCHECKSUM) $< + cd $(dir $<) && $(TAR) jxf $(notdir $<) + touch -c $(SRCCACHE)/curl-$(CURL_VER)/configure # old target + echo 1 > $@ + +$(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted + mkdir -p $(dir $@) + cd $(dir $@) && \ + $(dir $<)/configure $(CONFIGURE_COMMON) --includedir=$(build_includedir) \ + --without-ssl --without-gnutls --without-gssapi --without-zlib \ + --without-libidn --without-libidn2 --without-libmetalink --without-librtmp \ + --without-nghttp2 --without-nss --without-polarssl \ + --without-spnego --without-libpsl --disable-ares \ + --disable-ldap --disable-ldaps --without-zsh-functions-dir \ + --with-libssh2=$(build_prefix) --with-mbedtls=$(build_prefix) \ + CFLAGS="$(CFLAGS) $(CURL_CFLAGS)" LDFLAGS="$(LDFLAGS) $(CURL_LDFLAGS)" + echo 1 > $@ + +$(BUILDDIR)/curl-$(CURL_VER)/build-compiled: $(BUILDDIR)/curl-$(CURL_VER)/build-configured + $(MAKE) -C $(dir $<) $(LIBTOOL_CCLD) + echo 1 > $@ + +$(BUILDDIR)/curl-$(CURL_VER)/build-checked: $(BUILDDIR)/curl-$(CURL_VER)/build-compiled +ifeq ($(OS),$(BUILD_OS)) + $(MAKE) -C $(dir $@) check +endif + echo 1 > $@ + +$(eval $(call staged-install, \ + curl,curl-$$(CURL_VER), \ + MAKE_INSTALL,$$(LIBTOOL_CCLD),, \ + $$(INSTALL_NAME_CMD)libcurl.$$(SHLIB_EXT) $$(build_shlibdir)/libcurl.$$(SHLIB_EXT))) + +clean-curl: + -rm $(BUILDDIR)/curl-$(CURL_VER)/build-configured $(BUILDDIR)/curl-$(CURL_VER)/build-compiled + -$(MAKE) -C $(BUILDDIR)/curl-$(CURL_VER) clean + +distclean-curl: + -rm -rf $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 $(SRCCACHE)/curl-$(CURL_VER) $(BUILDDIR)/curl-$(CURL_VER) + +get-curl: $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 +extract-curl: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted +configure-curl: $(BUILDDIR)/curl-$(CURL_VER)/build-configured +compile-curl: $(BUILDDIR)/curl-$(CURL_VER)/build-compiled +fastcheck-curl: #none +check-curl: $(BUILDDIR)/curl-$(CURL_VER)/build-checked + +else # USE_BINARYBUILDER_CURL + +CURL_BB_URL_BASE := https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v$(CURL_VER)+$(CURL_BB_REL) +CURL_BB_NAME := LibCURL.v$(CURL_VER) + +$(eval $(call bb-install,curl,CURL,false)) +endif diff --git a/doc/build/build.md b/doc/build/build.md index ca4070c39b981..fd662459cc489 100644 --- a/doc/build/build.md +++ b/doc/build/build.md @@ -181,6 +181,7 @@ uses are listed in [`deps/Versions.make`](https://github.com/JuliaLang/julia/blo - **[GMP]** — GNU multiple precision arithmetic library, needed for `BigInt` support. - **[MPFR]** — GNU multiple precision floating point library, needed for arbitrary precision floating point (`BigFloat`) support. - **[libgit2]** — Git linkable library, used by Julia's package manager. +- **[curl]** — libcurl provides download and proxy support for Julia's package manager. - **[libssh2]** — library for SSH transport, used by libgit2 for packages with SSH remotes. - **[mbedtls]** — library used for cryptography and transport layer security, used by libssh2 - **[utf8proc]** — a library for processing UTF-8 encoded Unicode strings. @@ -195,6 +196,7 @@ uses are listed in [`deps/Versions.make`](https://github.com/JuliaLang/julia/blo [clang]: https://clang.llvm.org [python]: https://www.python.org/ [gfortran]: https://gcc.gnu.org/fortran/ +[curl]: https://curl.haxx.se [fetch]: https://www.freebsd.org/cgi/man.cgi?fetch(1) [perl]: https://www.perl.org [cmake]: https://www.cmake.org From bfbd7189d61354eb7fbf7e561c1346fa5b3c60c1 Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Wed, 9 Sep 2020 16:00:57 +0200 Subject: [PATCH 5/6] Ajust description of curl's uses --- doc/build/build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/build/build.md b/doc/build/build.md index fd662459cc489..6f9dc10c18c5e 100644 --- a/doc/build/build.md +++ b/doc/build/build.md @@ -181,7 +181,7 @@ uses are listed in [`deps/Versions.make`](https://github.com/JuliaLang/julia/blo - **[GMP]** — GNU multiple precision arithmetic library, needed for `BigInt` support. - **[MPFR]** — GNU multiple precision floating point library, needed for arbitrary precision floating point (`BigFloat`) support. - **[libgit2]** — Git linkable library, used by Julia's package manager. -- **[curl]** — libcurl provides download and proxy support for Julia's package manager. +- **[curl]** — libcurl provides download and proxy support. - **[libssh2]** — library for SSH transport, used by libgit2 for packages with SSH remotes. - **[mbedtls]** — library used for cryptography and transport layer security, used by libssh2 - **[utf8proc]** — a library for processing UTF-8 encoded Unicode strings. From 4e5c64da7ff855faa45433b5dc3ccf6fdd2aead3 Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Wed, 9 Sep 2020 18:27:23 +0200 Subject: [PATCH 6/6] Fix checksums and remove patch --- .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 - .../sha512 | 1 - deps/libgit2.mk | 8 +------ deps/patches/libgit2-case-sensitive.patch | 22 ------------------- 58 files changed, 29 insertions(+), 57 deletions(-) delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-gnu.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-gnu.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-musl.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-musl.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-gnueabihf.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-gnueabihf.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-musleabihf.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-musleabihf.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.i686-linux-gnu.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.i686-linux-gnu.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.i686-linux-musl.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.i686-linux-musl.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.i686-w64-mingw32.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.i686-w64-mingw32.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.powerpc64le-linux-gnu.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.powerpc64le-linux-gnu.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.x86_64-apple-darwin14.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.x86_64-apple-darwin14.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-gnu.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-gnu.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-musl.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-musl.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.x86_64-unknown-freebsd11.1.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.x86_64-w64-mingw32.tar.gz/md5 delete mode 100644 deps/checksums/LibGit2.v0.28.5-0.x86_64-w64-mingw32.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-gnu.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-gnu.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-musl.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-musl.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-gnueabihf.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-gnueabihf.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-musleabihf.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-musleabihf.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.i686-linux-gnu.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.i686-linux-gnu.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.i686-linux-musl.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.i686-linux-musl.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.i686-w64-mingw32.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.i686-w64-mingw32.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.powerpc64le-linux-gnu.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.powerpc64le-linux-gnu.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.x86_64-apple-darwin14.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.x86_64-apple-darwin14.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-gnu.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-gnu.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-musl.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-musl.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.x86_64-unknown-freebsd11.1.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.x86_64-w64-mingw32.tar.gz/md5 create mode 100644 deps/checksums/LibGit2.v1.0.1-0.x86_64-w64-mingw32.tar.gz/sha512 create mode 100644 deps/checksums/libgit2-0ced29612dacb67eefe0c562a5c1d3aab21cce96.tar.gz/md5 create mode 100644 deps/checksums/libgit2-0ced29612dacb67eefe0c562a5c1d3aab21cce96.tar.gz/sha512 delete mode 100644 deps/checksums/libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz/md5 delete mode 100644 deps/checksums/libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz/sha512 delete mode 100644 deps/patches/libgit2-case-sensitive.patch diff --git a/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-gnu.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-gnu.tar.gz/md5 deleted file mode 100644 index 37db6440e0521..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-gnu.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -84758d80ae042a3059c742c7797a9616 diff --git a/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-gnu.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-gnu.tar.gz/sha512 deleted file mode 100644 index 0e16d99f4b2f0..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-gnu.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -fce4ddb85caeb2a90ef33058098d0da771cd6531f05b88c1b8709e0513fb44442fb5bc07c1b97047388e2a0eccdadb9a6e029b97b043ba1a8b3b306f3b6f02a2 diff --git a/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-musl.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-musl.tar.gz/md5 deleted file mode 100644 index f5e64a432ddfa..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-musl.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -c4e79fbac7bda0564e1ef5e113eddc81 diff --git a/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-musl.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-musl.tar.gz/sha512 deleted file mode 100644 index 535cd1f668c50..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.aarch64-linux-musl.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -38192935167686d7843debc827877676f302561721ddba971e1cdaf91b586a931e2a87716702f62f38683f92f93f3d227d76ff171a4fd1e46c436c0c5c3125b9 diff --git a/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-gnueabihf.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-gnueabihf.tar.gz/md5 deleted file mode 100644 index 387c63d76f755..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-gnueabihf.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -fb9ae89f80ec929637791315eb8c8e13 diff --git a/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-gnueabihf.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-gnueabihf.tar.gz/sha512 deleted file mode 100644 index 72db6c1e52a26..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-gnueabihf.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -6bc8f057f8e8d50917ddbf2b0e7bb91d1dcb2353bc26139df7bea2e1fab3b2c27fc453cbeafde5577de5521b74ced010f6eb0d7e805b78f5a8b93595e4989c6b diff --git a/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-musleabihf.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-musleabihf.tar.gz/md5 deleted file mode 100644 index f85b89d0f59e1..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-musleabihf.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -4946a6ec5492e9d130d6693d1396d76a diff --git a/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-musleabihf.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-musleabihf.tar.gz/sha512 deleted file mode 100644 index 160f92a2b054a..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.armv7l-linux-musleabihf.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -35e81a473e8b540809048d59ff23bc8faaf582fd54a05a6220054f77e9fd2e33f2d120ec991b0e1cda2d0a1dd3934dfe6fb246543251c2a2940f5ef845a7ee46 diff --git a/deps/checksums/LibGit2.v0.28.5-0.i686-linux-gnu.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.i686-linux-gnu.tar.gz/md5 deleted file mode 100644 index 7e5633b2e4d6d..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.i686-linux-gnu.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -bb3e4b6bff6692b3ba8e1e4685bfda67 diff --git a/deps/checksums/LibGit2.v0.28.5-0.i686-linux-gnu.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.i686-linux-gnu.tar.gz/sha512 deleted file mode 100644 index 66fa99822bb11..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.i686-linux-gnu.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -3ed6266bd2c16ccb678d3a7e3e3508e4cb4f76d145106cef758e1a4cf293dd066b27c7774f81c2fc8137dde74a50f319b8e971c60cefc105743d9b150fce36ff diff --git a/deps/checksums/LibGit2.v0.28.5-0.i686-linux-musl.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.i686-linux-musl.tar.gz/md5 deleted file mode 100644 index 0614e8cedfc96..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.i686-linux-musl.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -17e8f2ef09ec24bcffd9b3e78b6eea75 diff --git a/deps/checksums/LibGit2.v0.28.5-0.i686-linux-musl.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.i686-linux-musl.tar.gz/sha512 deleted file mode 100644 index a88f3102d6a87..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.i686-linux-musl.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -92f0de1ad37912a03bb46112186ce9a636ec5e1821aa95a7623a04b1b2d953cc7fe65641865d86b0e09e7f3e9344c1f0cb0d270166aa6fafa00b78c14ebfd356 diff --git a/deps/checksums/LibGit2.v0.28.5-0.i686-w64-mingw32.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.i686-w64-mingw32.tar.gz/md5 deleted file mode 100644 index 30d86d37e1d51..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.i686-w64-mingw32.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -b670c243ac321543cfe91ecde315cf27 diff --git a/deps/checksums/LibGit2.v0.28.5-0.i686-w64-mingw32.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.i686-w64-mingw32.tar.gz/sha512 deleted file mode 100644 index ea4a631e29a35..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.i686-w64-mingw32.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -fe3e3963b7e22ae8fddd01c768dc5e2a32095a71a310bd67de50a88c8f4d35184e1e0617b02b3a600edebff391ab57dafdb79bd397b3c215282098d635527e28 diff --git a/deps/checksums/LibGit2.v0.28.5-0.powerpc64le-linux-gnu.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.powerpc64le-linux-gnu.tar.gz/md5 deleted file mode 100644 index 9a0d0af68bedc..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.powerpc64le-linux-gnu.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -aec4041aaeaa937313e7284946f90775 diff --git a/deps/checksums/LibGit2.v0.28.5-0.powerpc64le-linux-gnu.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.powerpc64le-linux-gnu.tar.gz/sha512 deleted file mode 100644 index 81e3370618bee..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.powerpc64le-linux-gnu.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -b358bba0dee00dbfb5377e8458f20666e2bb7af73915fd94907a3ca50a6155e08732145b7ce7f3c79492b58bdf4a895af2b5bf1bf6a59382c7dec4042756dab3 diff --git a/deps/checksums/LibGit2.v0.28.5-0.x86_64-apple-darwin14.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.x86_64-apple-darwin14.tar.gz/md5 deleted file mode 100644 index dc57f6a27e463..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.x86_64-apple-darwin14.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -2b7b91661556853a6fe3d33b9d1bf8c1 diff --git a/deps/checksums/LibGit2.v0.28.5-0.x86_64-apple-darwin14.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.x86_64-apple-darwin14.tar.gz/sha512 deleted file mode 100644 index 753606856371d..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.x86_64-apple-darwin14.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -e7a1e67081d65c7472bf41d981473d2db28aad8e9044a254ccb946f05d644b4b9032af61274afe7bcddac4548251db87ef221531ec5387985f468aa5b9c48a1e diff --git a/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-gnu.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-gnu.tar.gz/md5 deleted file mode 100644 index a9751dcb59ed5..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-gnu.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -79e4468f8b6e9976bc774095a775f878 diff --git a/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-gnu.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-gnu.tar.gz/sha512 deleted file mode 100644 index 38f84146a141a..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-gnu.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -ecc1e03726ec36182182f40e44d2ffdf4dcdd6b92a35a26ca25f890deffc2a661dfe79f92a283843ee1983fa8f10287adb71b58f354b84b9da2bbedd8398529a diff --git a/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-musl.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-musl.tar.gz/md5 deleted file mode 100644 index 243defb516da6..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-musl.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -bf88bd21c5b400649e6033953fbf8285 diff --git a/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-musl.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-musl.tar.gz/sha512 deleted file mode 100644 index ca82880a061e0..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.x86_64-linux-musl.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -e3432315a57c323f2d3f26cf8a26d7baab7415bdc4f1d7c8b3a6057462f670975a49f410623af21a09e456f36b5c9e6e4d58d600f9e1778affaee9b8b040be1d diff --git a/deps/checksums/LibGit2.v0.28.5-0.x86_64-unknown-freebsd11.1.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.x86_64-unknown-freebsd11.1.tar.gz/md5 deleted file mode 100644 index df33f9e81648d..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.x86_64-unknown-freebsd11.1.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -7b0bb0db8d49d36bdb57ddfcd03e2d08 diff --git a/deps/checksums/LibGit2.v0.28.5-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 deleted file mode 100644 index e99b0f554a384..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -b24e72995f400e7e28843da9387e55f98d2233d2aa99aa5cfc32728e91630a722ecc45fa2c90c81791f17ec95e338e512e91702ccdb8a4812ae5c883a8ee750b diff --git a/deps/checksums/LibGit2.v0.28.5-0.x86_64-w64-mingw32.tar.gz/md5 b/deps/checksums/LibGit2.v0.28.5-0.x86_64-w64-mingw32.tar.gz/md5 deleted file mode 100644 index 4f18dabf26671..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.x86_64-w64-mingw32.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -05b65eb29932eca28b9652209ad79bcb diff --git a/deps/checksums/LibGit2.v0.28.5-0.x86_64-w64-mingw32.tar.gz/sha512 b/deps/checksums/LibGit2.v0.28.5-0.x86_64-w64-mingw32.tar.gz/sha512 deleted file mode 100644 index 5f6dc1901eeb6..0000000000000 --- a/deps/checksums/LibGit2.v0.28.5-0.x86_64-w64-mingw32.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -23ca28fb2d74471f5caefa57db6844790670f07cca70b234fa765715e1725933849ed37d4fd123b1a9cd621261e65df360d26826952a3c8ed04437dc93f60416 diff --git a/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-gnu.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-gnu.tar.gz/md5 new file mode 100644 index 0000000000000..2e23fe9cc98c7 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-gnu.tar.gz/md5 @@ -0,0 +1 @@ +a39e6aded55f15bc3ece658671c99315 diff --git a/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-gnu.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-gnu.tar.gz/sha512 new file mode 100644 index 0000000000000..d9312fc10e287 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-gnu.tar.gz/sha512 @@ -0,0 +1 @@ +229bee6d28cd561af7e9d7f96cec430e85308cedc992d6c0ecf0da2ca7f3da117102a0d465da9348c87d99968f28d6fccb0c4dc8c63d8df60480d85b757fd420 diff --git a/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-musl.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-musl.tar.gz/md5 new file mode 100644 index 0000000000000..e1732849330b0 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-musl.tar.gz/md5 @@ -0,0 +1 @@ +23069d3105f557b3d549dd33fa2f695e diff --git a/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-musl.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-musl.tar.gz/sha512 new file mode 100644 index 0000000000000..fe8f5c4167998 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.aarch64-linux-musl.tar.gz/sha512 @@ -0,0 +1 @@ +fc129a3671512f5f3f1758f015080770d1dbfe9e5f835267e8a473e935a3b68caee10967b190936899b436670a1989983b27b6c3b7b400dfa9a8ab6a204a502c diff --git a/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-gnueabihf.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-gnueabihf.tar.gz/md5 new file mode 100644 index 0000000000000..77e4a73e6b002 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-gnueabihf.tar.gz/md5 @@ -0,0 +1 @@ +ffde5b5d4c9edcd8f09dccd2a69efd65 diff --git a/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-gnueabihf.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-gnueabihf.tar.gz/sha512 new file mode 100644 index 0000000000000..b08e3c2fab3d4 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-gnueabihf.tar.gz/sha512 @@ -0,0 +1 @@ +1be452350b0cb1da8729a29c9a9f76c238c6675ba327e73e7ba85ee3d5f6171518dbf232bc6983c10b41c1505ad9d3960e76215249824dc8538f6ffbd5652d02 diff --git a/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-musleabihf.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-musleabihf.tar.gz/md5 new file mode 100644 index 0000000000000..d72224cb4a28e --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-musleabihf.tar.gz/md5 @@ -0,0 +1 @@ +d6a676ba79525923294dfa98f6e6d2da diff --git a/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-musleabihf.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-musleabihf.tar.gz/sha512 new file mode 100644 index 0000000000000..9681b41947fd1 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.armv7l-linux-musleabihf.tar.gz/sha512 @@ -0,0 +1 @@ +78f1adc43b35848de695fd1a3ccf63028e38e997817c66a86113e66850ec05a39dfa9c994a7ae3296f85d59f50d759c3ff1082ef5e3b08433cd175bfd9f1749a diff --git a/deps/checksums/LibGit2.v1.0.1-0.i686-linux-gnu.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.i686-linux-gnu.tar.gz/md5 new file mode 100644 index 0000000000000..feb6a2b6aafd5 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.i686-linux-gnu.tar.gz/md5 @@ -0,0 +1 @@ +c35f04d41788f750415e7679fc5396c6 diff --git a/deps/checksums/LibGit2.v1.0.1-0.i686-linux-gnu.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.i686-linux-gnu.tar.gz/sha512 new file mode 100644 index 0000000000000..59e8e503971aa --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.i686-linux-gnu.tar.gz/sha512 @@ -0,0 +1 @@ +8b320e57220df522fce8fc74d5e0cd1f88f8e1c380b19ef1bb1ee6aa7dc137d1e19702569169d6cf435605743158cc95fc1a621f80a8f7283f6da305ff302ce2 diff --git a/deps/checksums/LibGit2.v1.0.1-0.i686-linux-musl.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.i686-linux-musl.tar.gz/md5 new file mode 100644 index 0000000000000..32668e9e8a9c3 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.i686-linux-musl.tar.gz/md5 @@ -0,0 +1 @@ +051b147a287c99cc9f07251f0be287f8 diff --git a/deps/checksums/LibGit2.v1.0.1-0.i686-linux-musl.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.i686-linux-musl.tar.gz/sha512 new file mode 100644 index 0000000000000..88a6caa681003 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.i686-linux-musl.tar.gz/sha512 @@ -0,0 +1 @@ +aaa4651605a0df3459bdd28ae733eb0798498f94493505d20c1dd55fe12e45a026dbd91fa02c1fcc27eddf4128d0c62ca042d3571463add685ad5ec6516a313e diff --git a/deps/checksums/LibGit2.v1.0.1-0.i686-w64-mingw32.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.i686-w64-mingw32.tar.gz/md5 new file mode 100644 index 0000000000000..ebff2e035f5a9 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.i686-w64-mingw32.tar.gz/md5 @@ -0,0 +1 @@ +8b9eb7667b2d28d00f32a7febdd24871 diff --git a/deps/checksums/LibGit2.v1.0.1-0.i686-w64-mingw32.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.i686-w64-mingw32.tar.gz/sha512 new file mode 100644 index 0000000000000..e2bf4cade2286 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.i686-w64-mingw32.tar.gz/sha512 @@ -0,0 +1 @@ +63cc2316291104baf852e318ea6d19718b3c44de8129bf516f6b3ae1ab45916e12800722382d1f9fa066def1643cc72282c2b0249636653fae766aafb265cb20 diff --git a/deps/checksums/LibGit2.v1.0.1-0.powerpc64le-linux-gnu.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.powerpc64le-linux-gnu.tar.gz/md5 new file mode 100644 index 0000000000000..0fc42239057ae --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.powerpc64le-linux-gnu.tar.gz/md5 @@ -0,0 +1 @@ +5be82b37f2b2ab4efb352ae614a13078 diff --git a/deps/checksums/LibGit2.v1.0.1-0.powerpc64le-linux-gnu.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.powerpc64le-linux-gnu.tar.gz/sha512 new file mode 100644 index 0000000000000..d744895dc4c5b --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.powerpc64le-linux-gnu.tar.gz/sha512 @@ -0,0 +1 @@ +80107205348fce11d66a073a18e1ba68c96f1e340c0eee4a56d60c24ac3841baca9fe9e258946914ef75444c023d75256af3e9f9f2566d784809f4ca18cd878f diff --git a/deps/checksums/LibGit2.v1.0.1-0.x86_64-apple-darwin14.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.x86_64-apple-darwin14.tar.gz/md5 new file mode 100644 index 0000000000000..0d69b2e98c966 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.x86_64-apple-darwin14.tar.gz/md5 @@ -0,0 +1 @@ +96ad7b7dc24971cdff6ff1a01310834a diff --git a/deps/checksums/LibGit2.v1.0.1-0.x86_64-apple-darwin14.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.x86_64-apple-darwin14.tar.gz/sha512 new file mode 100644 index 0000000000000..7ee94132aeb24 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.x86_64-apple-darwin14.tar.gz/sha512 @@ -0,0 +1 @@ +b629ac9e1167d13c8010f23427022cb94b5be0baaacbe216b3145d9fd7f67af3b8f817a7c58a67cdc30101c83bf82b9a3369df61e98fdf373035d17e38991b77 diff --git a/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-gnu.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-gnu.tar.gz/md5 new file mode 100644 index 0000000000000..be776a073217a --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-gnu.tar.gz/md5 @@ -0,0 +1 @@ +9c20406f23f08356e8d217b16a327164 diff --git a/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-gnu.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-gnu.tar.gz/sha512 new file mode 100644 index 0000000000000..c706c03498642 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-gnu.tar.gz/sha512 @@ -0,0 +1 @@ +85c953bff1539907ecef5201306b3bba152b64c814c26cd23e78e33f7f202cba67c6d162f63aa188ca6f024fdae47a61b7002676fdf53e2f02db78e057a2a86b diff --git a/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-musl.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-musl.tar.gz/md5 new file mode 100644 index 0000000000000..9da60d600c340 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-musl.tar.gz/md5 @@ -0,0 +1 @@ +26654010e9216b11f5ded2a062b5b709 diff --git a/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-musl.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-musl.tar.gz/sha512 new file mode 100644 index 0000000000000..eb2832318dd9e --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.x86_64-linux-musl.tar.gz/sha512 @@ -0,0 +1 @@ +0aa89f698b6140f54f27791ed6f750322e1c996e0b613f68d83251bcc1cc2f95d68431024fbfc45bbaec530a8b5f1c07be1b4adb31ca5a56afcaa64bd80f6ec6 diff --git a/deps/checksums/LibGit2.v1.0.1-0.x86_64-unknown-freebsd11.1.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.x86_64-unknown-freebsd11.1.tar.gz/md5 new file mode 100644 index 0000000000000..629171df686c3 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.x86_64-unknown-freebsd11.1.tar.gz/md5 @@ -0,0 +1 @@ +75b4d5260b09527df92daa4ce26cba05 diff --git a/deps/checksums/LibGit2.v1.0.1-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 new file mode 100644 index 0000000000000..a8b09eef78524 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 @@ -0,0 +1 @@ +b1e40c54afa69383f9e4ad6dfc71eba8b77bd48069c81f510be0f722376fa70c78e00011d6507c39973662f9b9338e151715e2ca903257d33761e7f0a191df31 diff --git a/deps/checksums/LibGit2.v1.0.1-0.x86_64-w64-mingw32.tar.gz/md5 b/deps/checksums/LibGit2.v1.0.1-0.x86_64-w64-mingw32.tar.gz/md5 new file mode 100644 index 0000000000000..fe72c995fa787 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.x86_64-w64-mingw32.tar.gz/md5 @@ -0,0 +1 @@ +76c12cc5794525bd5686ed9c9dcdd93a diff --git a/deps/checksums/LibGit2.v1.0.1-0.x86_64-w64-mingw32.tar.gz/sha512 b/deps/checksums/LibGit2.v1.0.1-0.x86_64-w64-mingw32.tar.gz/sha512 new file mode 100644 index 0000000000000..81a4d52c9c339 --- /dev/null +++ b/deps/checksums/LibGit2.v1.0.1-0.x86_64-w64-mingw32.tar.gz/sha512 @@ -0,0 +1 @@ +d378b89e8a3ebae357582b9ddd723cc25c6ada0b0b480bf6904fd0785d14773dbf9e15390763fb67e5d7265704d6b9bc5af9aa15298ec7802f544b32d43e0e75 diff --git a/deps/checksums/libgit2-0ced29612dacb67eefe0c562a5c1d3aab21cce96.tar.gz/md5 b/deps/checksums/libgit2-0ced29612dacb67eefe0c562a5c1d3aab21cce96.tar.gz/md5 new file mode 100644 index 0000000000000..af2b7907f077e --- /dev/null +++ b/deps/checksums/libgit2-0ced29612dacb67eefe0c562a5c1d3aab21cce96.tar.gz/md5 @@ -0,0 +1 @@ +0bd38ce98f6ba7b92b4afbd0ae7e3c96 diff --git a/deps/checksums/libgit2-0ced29612dacb67eefe0c562a5c1d3aab21cce96.tar.gz/sha512 b/deps/checksums/libgit2-0ced29612dacb67eefe0c562a5c1d3aab21cce96.tar.gz/sha512 new file mode 100644 index 0000000000000..afb5398771fe0 --- /dev/null +++ b/deps/checksums/libgit2-0ced29612dacb67eefe0c562a5c1d3aab21cce96.tar.gz/sha512 @@ -0,0 +1 @@ +4bd43d67356f14c9d9a7043e1f3c61c799e844dbbaeaf5250105723c774328b8aaba0fa8ecd2d7bac3ba1a50c2ef9009463e9e159011c75de97a6550b3ba097e diff --git a/deps/checksums/libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz/md5 b/deps/checksums/libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz/md5 deleted file mode 100644 index 50d86a7452310..0000000000000 --- a/deps/checksums/libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -4319ad9364f35bf2f4d2df523ff51437 diff --git a/deps/checksums/libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz/sha512 b/deps/checksums/libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz/sha512 deleted file mode 100644 index 1599b90bedb02..0000000000000 --- a/deps/checksums/libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -7384a7eeeb36ac79d4e7e1336546e48f8fc820653f887f944c3902fcaae4e59d855679b39c5279b7372995934e549e34c526e1459a82032206913f9747b3dd08 diff --git a/deps/libgit2.mk b/deps/libgit2.mk index 29b11b3688256..241b82cb3232a 100644 --- a/deps/libgit2.mk +++ b/deps/libgit2.mk @@ -41,14 +41,8 @@ $(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/so patch -p1 -f < $(SRCDIR)/patches/libgit2-agent-nonfatal.patch echo 1 > $@ -$(LIBGIT2_SRC_PATH)/libgit2-case-sensitive.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted - cd $(LIBGIT2_SRC_PATH) && \ - patch -p1 -f < $(SRCDIR)/patches/libgit2-case-sensitive.patch - echo 1 > $@ - $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: \ - $(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied \ - $(LIBGIT2_SRC_PATH)/libgit2-case-sensitive.patch-applied \ + $(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/source-extracted mkdir -p $(dir $@) diff --git a/deps/patches/libgit2-case-sensitive.patch b/deps/patches/libgit2-case-sensitive.patch deleted file mode 100644 index 13719b2e0c11b..0000000000000 --- a/deps/patches/libgit2-case-sensitive.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 44d5e47d8c486e149c262974bfab808737ac85c1 Mon Sep 17 00:00:00 2001 -From: Dan Skorupski -Date: Sat, 24 Aug 2019 10:39:56 -0500 -Subject: [PATCH] Fix include casing for case-sensitive filesystems. - ---- - src/path.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/path.c b/src/path.c -index 150e09eb60..732834fbef 100644 ---- a/src/path.c -+++ b/src/path.c -@@ -14,7 +14,7 @@ - #include "win32/w32_buffer.h" - #include "win32/w32_util.h" - #include "win32/version.h" --#include -+#include - #else - #include - #endif