From dd3c169cb73e59c0f8a44f4d8732aa09dc1d8c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20H=C3=B6ft?= Date: Wed, 22 Jun 2022 12:37:44 +0200 Subject: [PATCH 1/2] openssl: add 3.0.4 and 1.1.1p --- recipes/openssl/1.x.x/conandata.yml | 9 +++++++++ recipes/openssl/3.x.x/conandata.yml | 3 +++ recipes/openssl/config.yml | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/recipes/openssl/1.x.x/conandata.yml b/recipes/openssl/1.x.x/conandata.yml index fe913a0552bba..f72967e0b2252 100644 --- a/recipes/openssl/1.x.x/conandata.yml +++ b/recipes/openssl/1.x.x/conandata.yml @@ -107,6 +107,12 @@ sources: "https://www.openssl.org/source/openssl-1.1.1o.tar.gz", "https://www.openssl.org/source/old/openssl-1.1.1o.tar.gz" ] + 1.1.1p: + sha256: bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f + url: [ + "https://www.openssl.org/source/openssl-1.1.1p.tar.gz", + "https://www.openssl.org/source/old/openssl-1.1.1p.tar.gz" + ] patches: 1.0.2s: - patch_file: patches/1.0.2u-darwin-arm64.patch @@ -144,3 +150,6 @@ patches: 1.1.1o: - patch_file: patches/1.1.1-tvos-watchos.patch base_path: source_subfolder + 1.1.1p: + - patch_file: patches/1.1.1-tvos-watchos.patch + base_path: source_subfolder diff --git a/recipes/openssl/3.x.x/conandata.yml b/recipes/openssl/3.x.x/conandata.yml index 96637bf58eb8d..917e1ac299121 100644 --- a/recipes/openssl/3.x.x/conandata.yml +++ b/recipes/openssl/3.x.x/conandata.yml @@ -1,4 +1,7 @@ sources: + 3.0.4: + url: https://www.openssl.org/source/openssl-3.0.4.tar.gz + sha256: 2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f 3.0.3: url: https://www.openssl.org/source/openssl-3.0.3.tar.gz sha256: ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b diff --git a/recipes/openssl/config.yml b/recipes/openssl/config.yml index c5939cc078cf0..022a22129b928 100644 --- a/recipes/openssl/config.yml +++ b/recipes/openssl/config.yml @@ -1,5 +1,7 @@ versions: # 3.0.x releases + 3.0.4: + folder: "3.x.x" 3.0.3: folder: "3.x.x" 3.0.2: @@ -9,6 +11,8 @@ versions: 3.0.0: folder: "3.x.x" # 1.1.1x releases + 1.1.1p: + folder: "1.x.x" 1.1.1o: folder: "1.x.x" 1.1.1n: From 56eeb862889fb0058007871a2939af66aa87eae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20H=C3=B6ft?= Date: Tue, 5 Jul 2022 21:40:22 +0200 Subject: [PATCH 2/2] openssl: add 3.0.5 and 1.1.1q --- recipes/openssl/1.x.x/conandata.yml | 9 +++++++++ recipes/openssl/3.x.x/conandata.yml | 3 +++ recipes/openssl/config.yml | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/recipes/openssl/1.x.x/conandata.yml b/recipes/openssl/1.x.x/conandata.yml index f72967e0b2252..09bd40d6f2825 100644 --- a/recipes/openssl/1.x.x/conandata.yml +++ b/recipes/openssl/1.x.x/conandata.yml @@ -113,6 +113,12 @@ sources: "https://www.openssl.org/source/openssl-1.1.1p.tar.gz", "https://www.openssl.org/source/old/openssl-1.1.1p.tar.gz" ] + 1.1.1q: + sha256: d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca + url: [ + "https://www.openssl.org/source/openssl-1.1.1q.tar.gz", + "https://www.openssl.org/source/old/openssl-1.1.1q.tar.gz" + ] patches: 1.0.2s: - patch_file: patches/1.0.2u-darwin-arm64.patch @@ -153,3 +159,6 @@ patches: 1.1.1p: - patch_file: patches/1.1.1-tvos-watchos.patch base_path: source_subfolder + 1.1.1q: + - patch_file: patches/1.1.1-tvos-watchos.patch + base_path: source_subfolder diff --git a/recipes/openssl/3.x.x/conandata.yml b/recipes/openssl/3.x.x/conandata.yml index 917e1ac299121..be71137f79e82 100644 --- a/recipes/openssl/3.x.x/conandata.yml +++ b/recipes/openssl/3.x.x/conandata.yml @@ -1,4 +1,7 @@ sources: + 3.0.5: + url: https://www.openssl.org/source/openssl-3.0.5.tar.gz + sha256: aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9349dcea6d3e4f0b024a7a 3.0.4: url: https://www.openssl.org/source/openssl-3.0.4.tar.gz sha256: 2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f diff --git a/recipes/openssl/config.yml b/recipes/openssl/config.yml index 022a22129b928..370d161c04d8d 100644 --- a/recipes/openssl/config.yml +++ b/recipes/openssl/config.yml @@ -1,5 +1,7 @@ versions: # 3.0.x releases + 3.0.5: + folder: "3.x.x" 3.0.4: folder: "3.x.x" 3.0.3: @@ -11,6 +13,8 @@ versions: 3.0.0: folder: "3.x.x" # 1.1.1x releases + 1.1.1q: + folder: "1.x.x" 1.1.1p: folder: "1.x.x" 1.1.1o: