From a9d9a3745793721b3831de2166f9f6a73dd125fd Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:06:46 -0500 Subject: [PATCH 1/8] fixing the curl issues --- recipe/patches/fix_curl_temp.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 recipe/patches/fix_curl_temp.patch diff --git a/recipe/patches/fix_curl_temp.patch b/recipe/patches/fix_curl_temp.patch new file mode 100644 index 00000000..5b7efc68 --- /dev/null +++ b/recipe/patches/fix_curl_temp.patch @@ -0,0 +1,24 @@ +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 ff2b7351a15584c3414f830243c39c3f0be157f1 Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:08:25 -0500 Subject: [PATCH 2/8] add patch and bump bld --- recipe/meta.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 24b35b1a..6ecd5537 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,10 +23,12 @@ 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_temp.patch build: skip: true # [win] - number: 2 + number: 3 features: requirements: From 18eb59f341b4317e34520072ac027f705a357cd0 Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:15:41 -0500 Subject: [PATCH 3/8] 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 6ecd5537..2ad85921 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_temp.patch + - patches/fix_curl_temp.patch build: skip: true # [win] number: 3 From 7cf0deb4aa4b3def1de9774c3cc1d12b5aa14cbe Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:39:29 -0500 Subject: [PATCH 4/8] Update fix_curl_temp.patch --- recipe/patches/fix_curl_temp.patch | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/patches/fix_curl_temp.patch b/recipe/patches/fix_curl_temp.patch index 5b7efc68..d730c205 100644 --- a/recipe/patches/fix_curl_temp.patch +++ b/recipe/patches/fix_curl_temp.patch @@ -20,5 +20,3 @@ index 056fc38d82..92b057c3b6 100644 DOWNLOADS_TAR_URL = https://api.github.com/repos/JuliaLang/Downloads.jl/tarball/$1 -- 2.34.1 - - From b435c1994bde3f53d9e5b2a9e0b3c11a99a324d9 Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:52:31 -0500 Subject: [PATCH 5/8] checksums --- recipe/meta.yaml | 2 ++ recipe/patches/checksums.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 recipe/patches/checksums.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2ad85921..e4254e33 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,6 +26,8 @@ source: ## fix the curl issues: ## see: https://github.com/JuliaLang/Downloads.jl/issues/172 - patches/fix_curl_temp.patch + - patches/checksums.patch + build: skip: true # [win] number: 3 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 fc26f2b77872d9e2019f4ac7c0567b6a638b0c0c Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 19:04:33 -0500 Subject: [PATCH 6/8] 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 e4254e33..bbc859ae 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_temp.patch - patches/checksums.patch + - patches/checksums2.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 411580f8e44a3d54c9924d5f51f2775bf52f82d6 Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 19:24:42 -0500 Subject: [PATCH 7/8] fixing downloads --- recipe/meta.yaml | 4 +--- recipe/patches/checksums.patch | 27 --------------------------- recipe/patches/checksums2.patch | 23 ----------------------- recipe/patches/fix_curl_temp.patch | 22 ---------------------- 4 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 recipe/patches/checksums.patch delete mode 100644 recipe/patches/checksums2.patch delete mode 100644 recipe/patches/fix_curl_temp.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bbc859ae..aebbcc27 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_temp.patch - - patches/checksums.patch - - patches/checksums2.patch + - patches/0001-upgrading-downloads-v1.7.1.patch build: skip: true # [win] 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_temp.patch b/recipe/patches/fix_curl_temp.patch deleted file mode 100644 index d730c205..00000000 --- a/recipe/patches/fix_curl_temp.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 From f34c2466ee5558951ac403feb0c0bd5023adb211 Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sat, 8 Jan 2022 19:26:04 -0500 Subject: [PATCH 8/8] fixing downloads --- .../0001-upgrading-downloads-v1.7.1.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 recipe/patches/0001-upgrading-downloads-v1.7.1.patch diff --git a/recipe/patches/0001-upgrading-downloads-v1.7.1.patch b/recipe/patches/0001-upgrading-downloads-v1.7.1.patch new file mode 100644 index 00000000..40b75c26 --- /dev/null +++ b/recipe/patches/0001-upgrading-downloads-v1.7.1.patch @@ -0,0 +1,59 @@ +From 0d37f74d2b4152a7d4b7c32585bb666451db6838 Mon Sep 17 00:00:00 2001 +From: ngam <67342040+ngam@users.noreply.github.com> +Date: Sat, 8 Jan 2022 19:22:45 -0500 +Subject: [PATCH] upgrading downloads v1.7.1 + +--- + .../md5 | 1 - + .../sha512 | 1 - + .../md5 | 1 + + .../sha512 | 1 + + stdlib/Downloads.version | 4 ++-- + 5 files changed, 4 insertions(+), 4 deletions(-) + delete mode 100644 deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 + delete mode 100644 deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 + create mode 100644 deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/md5 + create mode 100644 deps/checksums/Downloads-43899e71eed709866f96dd624f1c369a1c8e26a3.tar.gz/sha512 + +diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 +deleted file mode 100644 +index 02c7e0f491..0000000000 +--- a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/md5 ++++ /dev/null +@@ -1 +0,0 @@ +-2265854c26d1ff5a061ef9033eb3b9d4 +diff --git a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 b/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 +deleted file mode 100644 +index 19d71e70f6..0000000000 +--- a/deps/checksums/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz/sha512 ++++ /dev/null +@@ -1 +0,0 @@ +-7817f2ab0ccd3224420e65ae7525c2a801f0dbd7e5986e3a0eeac29e3842ea94933e494b895a78e0495ab1188a7375cd98033f507d270aea38eeeb5532226873 +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/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 +