From 935156025a8211d2220109a0a587f82c9d9ed7de Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:12:27 -0500 Subject: [PATCH 01/10] add curl fix to v1.6 --- recipe/meta.yaml | 4 +++- recipe/patches/fix_curl_issues.patch | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 recipe/patches/fix_curl_issues.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0979e9a6..d67f2342 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,9 @@ source: ## - patches/0002-disable-testing-Baz.baz-1.patch # [linux] ## see PR upstream: https://github.com/JuliaLang/julia/pull/42358 ## - patches/0003-correct-test-for-julia-depot-path.patch - + ## fix the curl issues: + ## see: https://github.com/JuliaLang/Downloads.jl/issues/172 + - fix_curl_issues.patch build: skip: true # [win] number: 1 diff --git a/recipe/patches/fix_curl_issues.patch b/recipe/patches/fix_curl_issues.patch new file mode 100644 index 00000000..4ca9cf0b --- /dev/null +++ b/recipe/patches/fix_curl_issues.patch @@ -0,0 +1,23 @@ +From 96f8f3061dcd50e100454a65d885f36c669c2508 Mon Sep 17 00:00:00 2001 +From: ngam <67342040+ngam@users.noreply.github.com> +Date: Sat, 8 Jan 2022 18:05:35 -0500 +Subject: [PATCH] upgrade downloads temp + +--- + stdlib/Downloads.version | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/stdlib/Downloads.version b/stdlib/Downloads.version +index 056fc38d82..92b057c3b6 100644 +--- a/stdlib/Downloads.version ++++ b/stdlib/Downloads.version +@@ -1,4 +1,4 @@ +-DOWNLOADS_BRANCH = release-1.5 +-DOWNLOADS_SHA1 = 26d79afcde9cf837a331fce023b31f1d3699700c ++DOWNLOADS_BRANCH = release-1.6 ++DOWNLOADS_SHA1 = 43899e71eed709866f96dd624f1c369a1c8e26a3 + DOWNLOADS_GIT_URL := git://github.com/JuliaLang/Downloads.jl.git + DOWNLOADS_TAR_URL = https://api.github.com/repos/JuliaLang/Downloads.jl/tarball/$1 +-- +2.34.1 + From bb108cbe4d66805aa13f69dd6f2265a4d3447f15 Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:12:53 -0500 Subject: [PATCH 02/10] bump bld --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d67f2342..eedacfc8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,9 +26,10 @@ source: ## fix the curl issues: ## see: https://github.com/JuliaLang/Downloads.jl/issues/172 - fix_curl_issues.patch + build: skip: true # [win] - number: 1 + number: 2 features: requirements: From 9750faef33f801b30b1f4f2b6d7e2e19debf8d4d Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:15:56 -0500 Subject: [PATCH 03/10] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eedacfc8..9dabb134 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -25,7 +25,7 @@ source: ## - patches/0003-correct-test-for-julia-depot-path.patch ## fix the curl issues: ## see: https://github.com/JuliaLang/Downloads.jl/issues/172 - - fix_curl_issues.patch + - patches/fix_curl_issues.patch build: skip: true # [win] From 18776e0f72516d972b16ed0367cfa090825710ea Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:38:49 -0500 Subject: [PATCH 04/10] Update fix_curl_issues.patch --- recipe/patches/fix_curl_issues.patch | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/patches/fix_curl_issues.patch b/recipe/patches/fix_curl_issues.patch index 4ca9cf0b..d730c205 100644 --- a/recipe/patches/fix_curl_issues.patch +++ b/recipe/patches/fix_curl_issues.patch @@ -20,4 +20,3 @@ index 056fc38d82..92b057c3b6 100644 DOWNLOADS_TAR_URL = https://api.github.com/repos/JuliaLang/Downloads.jl/tarball/$1 -- 2.34.1 - From 27699d0d80290cf4eb99f11936c50fe5b5ed2e9a Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:53:19 -0500 Subject: [PATCH 05/10] checksums --- recipe/meta.yaml | 1 + recipe/patches/checksums.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 recipe/patches/checksums.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9dabb134..4f49d463 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,6 +26,7 @@ source: ## fix the curl issues: ## see: https://github.com/JuliaLang/Downloads.jl/issues/172 - patches/fix_curl_issues.patch + - patches/checksums.patch build: skip: true # [win] diff --git a/recipe/patches/checksums.patch b/recipe/patches/checksums.patch new file mode 100644 index 00000000..ca761aeb --- /dev/null +++ b/recipe/patches/checksums.patch @@ -0,0 +1,27 @@ +From ddf2e1efdffc43ec7fe9029ae210a380a81d3f33 Mon Sep 17 00:00:00 2001 +From: ngam <67342040+ngam@users.noreply.github.com> +Date: Sat, 8 Jan 2022 18:50:11 -0500 +Subject: [PATCH 2/2] checksums + +--- + .../md5 | 2 +- + .../sha512 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 +index 02c7e0f491..eaadf785c8 100644 +--- a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 ++++ b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 +@@ -1 +1 @@ +-2265854c26d1ff5a061ef9033eb3b9d4 ++32aa90dbb437530c9da687340339c1aa +diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 +index 19d71e70f6..278d52a7c8 100644 +--- a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 ++++ b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 +@@ -1 +1 @@ +-7817f2ab0ccd3224420e65ae7525c2a801f0dbd7e5986e3a0eeac29e3842ea94933e494b895a78e0495ab1188a7375cd98033f507d270aea38eeeb5532226873 ++b433a964ec78fdfdc0c159a6330ca465b62c2911d84de4a020a78aa2f8dd2f760ae9313e3b64c72937dfbb30bde23ad8effa0ce3179488cdd7e05af2c101bb0c +-- +2.34.1 + From fcacb41f662cba0cd6709afc869d12118185af1e Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 19:03:46 -0500 Subject: [PATCH 06/10] fixing checksums --- recipe/meta.yaml | 1 + recipe/patches/checksums2.patch | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 recipe/patches/checksums2.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4f49d463..723f6e8d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,6 +27,7 @@ source: ## see: https://github.com/JuliaLang/Downloads.jl/issues/172 - patches/fix_curl_issues.patch - patches/checksums.patch + - patches/checksums_2.patch build: skip: true # [win] diff --git a/recipe/patches/checksums2.patch b/recipe/patches/checksums2.patch new file mode 100644 index 00000000..743c7177 --- /dev/null +++ b/recipe/patches/checksums2.patch @@ -0,0 +1,23 @@ +From 11ecdbccd226baa18aa8f2636488691c888e0d6d Mon Sep 17 00:00:00 2001 +From: ngam <67342040+ngam@users.noreply.github.com> +Date: Sat, 8 Jan 2022 19:02:08 -0500 +Subject: [PATCH 3/3] checksum_2 + +--- + .../md5 | 0 + .../sha512 | 0 + 2 files changed, 0 insertions(+), 0 deletions(-) + rename deps/checksums/{Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz => Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz}/md5 (100%) + rename deps/checksums/{Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz => Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz}/sha512 (100%) + +diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 +similarity index 100% +rename from deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 +rename to deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 +diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 +similarity index 100% +rename from deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 +rename to deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 +-- +2.34.1 + From 596614316e2d9909d19f15b914153f81ebe59543 Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 19:10:06 -0500 Subject: [PATCH 07/10] Update fix_curl_issues.patch --- recipe/patches/fix_curl_issues.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipe/patches/fix_curl_issues.patch b/recipe/patches/fix_curl_issues.patch index d730c205..892093a8 100644 --- a/recipe/patches/fix_curl_issues.patch +++ b/recipe/patches/fix_curl_issues.patch @@ -12,11 +12,9 @@ index 056fc38d82..92b057c3b6 100644 --- a/stdlib/Downloads.version +++ b/stdlib/Downloads.version @@ -1,4 +1,4 @@ --DOWNLOADS_BRANCH = release-1.5 --DOWNLOADS_SHA1 = 26d79afcde9cf837a331fce023b31f1d3699700c +-DOWNLOADS_BRANCH = release-1.4 +-DOWNLOADS_SHA1 = b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8 +DOWNLOADS_BRANCH = release-1.6 +DOWNLOADS_SHA1 = 43899e71eed709866f96dd624f1c369a1c8e26a3 - DOWNLOADS_GIT_URL := git://github.com/JuliaLang/Downloads.jl.git - DOWNLOADS_TAR_URL = https://api.github.com/repos/JuliaLang/Downloads.jl/tarball/$1 -- 2.34.1 From 1a34f19102ff6a9ea8fc79f2879f28e919b483ac Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 19:11:49 -0500 Subject: [PATCH 08/10] Update checksums.patch --- recipe/patches/checksums.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/patches/checksums.patch b/recipe/patches/checksums.patch index ca761aeb..de9e3989 100644 --- a/recipe/patches/checksums.patch +++ b/recipe/patches/checksums.patch @@ -10,18 +10,18 @@ Subject: [PATCH 2/2] checksums diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 index 02c7e0f491..eaadf785c8 100644 ---- a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 +--- a/deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/md5 +++ b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 @@ -1 +1 @@ --2265854c26d1ff5a061ef9033eb3b9d4 +-4355616cfaa57276d9873dd96387aca4 +32aa90dbb437530c9da687340339c1aa diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 index 19d71e70f6..278d52a7c8 100644 ---- a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 +--- a/deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/sha512 +++ b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 @@ -1 +1 @@ -7817f2ab0ccd3224420e65ae7525c2a801f0dbd7e5986e3a0eeac29e3842ea94933e494b895a78e0495ab1188a7375cd98033f507d270aea38eeeb5532226873 -+b433a964ec78fdfdc0c159a6330ca465b62c2911d84de4a020a78aa2f8dd2f760ae9313e3b64c72937dfbb30bde23ad8effa0ce3179488cdd7e05af2c101bb0c ++902d82694a77d153f1327dcc469ac6bd9913f30e67db8c81ccfd1c8dc2a6eeae69437218e28ced646a92f7c80dd5e0a338eb739c3c3d35021bc999b4371218a7 -- 2.34.1 From 9d92061e272781b537eafeeaad26371a96ab05e7 Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 19:13:18 -0500 Subject: [PATCH 09/10] Update checksums2.patch --- recipe/patches/checksums2.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/patches/checksums2.patch b/recipe/patches/checksums2.patch index 743c7177..1996601f 100644 --- a/recipe/patches/checksums2.patch +++ b/recipe/patches/checksums2.patch @@ -7,16 +7,16 @@ Subject: [PATCH 3/3] checksum_2 .../md5 | 0 .../sha512 | 0 2 files changed, 0 insertions(+), 0 deletions(-) - rename deps/checksums/{Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz => Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz}/md5 (100%) - rename deps/checksums/{Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz => Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz}/sha512 (100%) + rename deps/checksums/{Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz => Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz}/md5 (100%) + rename deps/checksums/{Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz => Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz}/sha512 (100%) -diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 +diff --git a/deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/md5 b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 similarity index 100% -rename from deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 +rename from deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/md5 rename to deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 -diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 +diff --git a/deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/sha512 b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 similarity index 100% -rename from deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 +rename from deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/sha512 rename to deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 -- 2.34.1 From 1d78f859bb10f356edd1c3b38650d59361f5f91c Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 19:30:36 -0500 Subject: [PATCH 10/10] fixing downloads v1.6.5 --- recipe/meta.yaml | 4 +- .../0001-upgrading-downloads-v1.6.5.patch | 57 +++++++++++++++++++ recipe/patches/checksums.patch | 27 --------- recipe/patches/checksums2.patch | 23 -------- recipe/patches/fix_curl_issues.patch | 22 ------- 5 files changed, 58 insertions(+), 75 deletions(-) create mode 100644 recipe/patches/0001-upgrading-downloads-v1.6.5.patch delete mode 100644 recipe/patches/checksums.patch delete mode 100644 recipe/patches/checksums2.patch delete mode 100644 recipe/patches/fix_curl_issues.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 723f6e8d..8054d068 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -25,9 +25,7 @@ source: ## - patches/0003-correct-test-for-julia-depot-path.patch ## fix the curl issues: ## see: https://github.com/JuliaLang/Downloads.jl/issues/172 - - patches/fix_curl_issues.patch - - patches/checksums.patch - - patches/checksums_2.patch + - patches/0001-upgrading-downloads-v1.6.5.patch build: skip: true # [win] diff --git a/recipe/patches/0001-upgrading-downloads-v1.6.5.patch b/recipe/patches/0001-upgrading-downloads-v1.6.5.patch new file mode 100644 index 00000000..1b215b24 --- /dev/null +++ b/recipe/patches/0001-upgrading-downloads-v1.6.5.patch @@ -0,0 +1,57 @@ +From 9ca7b1967bfa1f29477424e89255c642ec410607 Mon Sep 17 00:00:00 2001 +From: ngam <67342040+ngam@users.noreply.github.com> +Date: Sat, 8 Jan 2022 19:28:53 -0500 +Subject: [PATCH] upgrading downloads v1.6.5 + +--- + .../md5 | 1 + + .../sha512 | 1 + + .../md5 | 1 - + .../sha512 | 1 - + stdlib/Downloads.version | 4 ++-- + 5 files changed, 4 insertions(+), 4 deletions(-) + create mode 100644 deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 + create mode 100644 deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 + delete mode 100644 deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/md5 + delete mode 100644 deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/sha512 + +diff --git a/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 +new file mode 100644 +index 0000000000..eaadf785c8 +--- /dev/null ++++ b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 +@@ -0,0 +1 @@ ++32aa90dbb437530c9da687340339c1aa +diff --git a/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 +new file mode 100644 +index 0000000000..278d52a7c8 +--- /dev/null ++++ b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 +@@ -0,0 +1 @@ ++b433a964ec78fdfdc0c159a6330ca465b62c2911d84de4a020a78aa2f8dd2f760ae9313e3b64c72937dfbb30bde23ad8effa0ce3179488cdd7e05af2c101bb0c +diff --git a/deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/md5 b/deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/md5 +deleted file mode 100644 +index 2afbb9d0e6..0000000000 +--- a/deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/md5 ++++ /dev/null +@@ -1 +0,0 @@ +-4355616cfaa57276d9873dd96387aca4 +diff --git a/deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/sha512 b/deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/sha512 +deleted file mode 100644 +index 9a65a12573..0000000000 +--- a/deps/checksums/Downloads-b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8.tar.gz/sha512 ++++ /dev/null +@@ -1 +0,0 @@ +-902d82694a77d153f1327dcc469ac6bd9913f30e67db8c81ccfd1c8dc2a6eeae69437218e28ced646a92f7c80dd5e0a338eb739c3c3d35021bc999b4371218a7 +diff --git a/stdlib/Downloads.version b/stdlib/Downloads.version +index cf98e7d232..2d99b025ab 100644 +--- a/stdlib/Downloads.version ++++ b/stdlib/Downloads.version +@@ -1,2 +1,2 @@ +-DOWNLOADS_BRANCH = release-1.4 +-DOWNLOADS_SHA1 = b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8 ++DOWNLOADS_BRANCH = release-1.6 ++DOWNLOADS_SHA1 = 43899e71eed709866f96dd624f1c369a1c8e26a3 +-- +2.34.1 + diff --git a/recipe/patches/checksums.patch b/recipe/patches/checksums.patch deleted file mode 100644 index ca761aeb..00000000 --- a/recipe/patches/checksums.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ddf2e1efdffc43ec7fe9029ae210a380a81d3f33 Mon Sep 17 00:00:00 2001 -From: ngam <67342040+ngam@users.noreply.github.com> -Date: Sat, 8 Jan 2022 18:50:11 -0500 -Subject: [PATCH 2/2] checksums - ---- - .../md5 | 2 +- - .../sha512 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 -index 02c7e0f491..eaadf785c8 100644 ---- a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 -+++ b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 -@@ -1 +1 @@ --2265854c26d1ff5a061ef9033eb3b9d4 -+32aa90dbb437530c9da687340339c1aa -diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 -index 19d71e70f6..278d52a7c8 100644 ---- a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 -+++ b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 -@@ -1 +1 @@ --7817f2ab0ccd3224420e65ae7525c2a801f0dbd7e5986e3a0eeac29e3842ea94933e494b895a78e0495ab1188a7375cd98033f507d270aea38eeeb5532226873 -+b433a964ec78fdfdc0c159a6330ca465b62c2911d84de4a020a78aa2f8dd2f760ae9313e3b64c72937dfbb30bde23ad8effa0ce3179488cdd7e05af2c101bb0c --- -2.34.1 - diff --git a/recipe/patches/checksums2.patch b/recipe/patches/checksums2.patch deleted file mode 100644 index 743c7177..00000000 --- a/recipe/patches/checksums2.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 11ecdbccd226baa18aa8f2636488691c888e0d6d Mon Sep 17 00:00:00 2001 -From: ngam <67342040+ngam@users.noreply.github.com> -Date: Sat, 8 Jan 2022 19:02:08 -0500 -Subject: [PATCH 3/3] checksum_2 - ---- - .../md5 | 0 - .../sha512 | 0 - 2 files changed, 0 insertions(+), 0 deletions(-) - rename deps/checksums/{Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz => Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz}/md5 (100%) - rename deps/checksums/{Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz => Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz}/sha512 (100%) - -diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 -similarity index 100% -rename from deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 -rename to deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 -diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 b/deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 -similarity index 100% -rename from deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 -rename to deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 --- -2.34.1 - diff --git a/recipe/patches/fix_curl_issues.patch b/recipe/patches/fix_curl_issues.patch deleted file mode 100644 index d730c205..00000000 --- a/recipe/patches/fix_curl_issues.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 96f8f3061dcd50e100454a65d885f36c669c2508 Mon Sep 17 00:00:00 2001 -From: ngam <67342040+ngam@users.noreply.github.com> -Date: Sat, 8 Jan 2022 18:05:35 -0500 -Subject: [PATCH] upgrade downloads temp - ---- - stdlib/Downloads.version | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/stdlib/Downloads.version b/stdlib/Downloads.version -index 056fc38d82..92b057c3b6 100644 ---- a/stdlib/Downloads.version -+++ b/stdlib/Downloads.version -@@ -1,4 +1,4 @@ --DOWNLOADS_BRANCH = release-1.5 --DOWNLOADS_SHA1 = 26d79afcde9cf837a331fce023b31f1d3699700c -+DOWNLOADS_BRANCH = release-1.6 -+DOWNLOADS_SHA1 = 43899e71eed709866f96dd624f1c369a1c8e26a3 - DOWNLOADS_GIT_URL := git://github.com/JuliaLang/Downloads.jl.git - DOWNLOADS_TAR_URL = https://api.github.com/repos/JuliaLang/Downloads.jl/tarball/$1 --- -2.34.1