From 5408b59920c45b4e8eada8b7675c1ec3b2f199b4 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 13 Feb 2023 15:03:45 -0500 Subject: [PATCH] fractal: patch for openssl3 --- srcpkgs/fractal/patches/openssl3.patch | 224 +++++++++++++++++++++++++ srcpkgs/fractal/template | 2 +- 2 files changed, 225 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/fractal/patches/openssl3.patch diff --git a/srcpkgs/fractal/patches/openssl3.patch b/srcpkgs/fractal/patches/openssl3.patch new file mode 100644 index 0000000000000..d073e0205d797 --- /dev/null +++ b/srcpkgs/fractal/patches/openssl3.patch @@ -0,0 +1,224 @@ +From: https://git.alpinelinux.org/aports/plain/community/fractal/openssl3.patch + +diff --git a/Cargo.lock b/Cargo.lock +index c0b5e5e..d064f35 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "addr2line" + version = "0.13.0" +@@ -169,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" + dependencies = [ + "addr2line", +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "miniz_oxide", + "object", +@@ -326,6 +328,12 @@ version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ + [[package]] + name = "chrono" + version = "0.4.13" +@@ -407,7 +415,7 @@ version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + ] + + [[package]] +@@ -417,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" + dependencies = [ + "autocfg 1.0.0", +- "cfg-if", ++ "cfg-if 0.1.10", + "lazy_static", + ] + +@@ -455,7 +463,7 @@ version = "2.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "dirs-sys", + ] + +@@ -465,7 +473,7 @@ version = "2.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "dirs-sys", + ] + +@@ -506,7 +514,7 @@ version = "0.8.23" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + ] + + [[package]] +@@ -549,7 +557,7 @@ version = "1.0.16" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "crc32fast", + "libc", + "miniz_oxide", +@@ -842,7 +850,7 @@ version = "0.1.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "wasi", + ] +@@ -979,7 +987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163" + dependencies = [ + "bitflags", +- "cfg-if", ++ "cfg-if 0.1.10", + "futures-channel", + "futures-core", + "futures-util", +@@ -1543,7 +1551,7 @@ version = "0.4.11" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + ] + + [[package]] +@@ -1648,7 +1656,7 @@ version = "0.6.22" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", +@@ -1703,7 +1711,7 @@ version = "0.2.34" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", + ] +@@ -1809,9 +1817,9 @@ checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" + + [[package]] + name = "once_cell" +-version = "1.4.0" ++version = "1.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" ++checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" + + [[package]] + name = "opaque-debug" +@@ -1821,15 +1829,15 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + + [[package]] + name = "openssl" +-version = "0.10.30" ++version = "0.10.38" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" ++checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" + dependencies = [ + "bitflags", +- "cfg-if", ++ "cfg-if 1.0.0", + "foreign-types", +- "lazy_static", + "libc", ++ "once_cell", + "openssl-sys", + ] + +@@ -1841,9 +1849,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + + [[package]] + name = "openssl-sys" +-version = "0.9.58" ++version = "0.9.72" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" ++checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" + dependencies = [ + "autocfg 1.0.0", + "cc", +@@ -2527,7 +2535,7 @@ version = "0.3.12" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "redox_syscall", + "winapi 0.3.9", +@@ -2678,7 +2686,7 @@ version = "3.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "rand 0.7.3", + "redox_syscall", +@@ -2818,7 +2826,7 @@ version = "0.1.18" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "log", + "tracing-core", + ] +@@ -2998,7 +3006,7 @@ version = "0.2.67" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "serde", + "serde_json", + "wasm-bindgen-macro", +@@ -3025,7 +3033,7 @@ version = "0.4.17" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "js-sys", + "wasm-bindgen", + "web-sys", diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template index fe462fc6e2d2d..145e35bec5972 100644 --- a/srcpkgs/fractal/template +++ b/srcpkgs/fractal/template @@ -1,7 +1,7 @@ # Template file for 'fractal' pkgname=fractal version=4.4.0 -revision=1 +revision=2 build_style=meson build_helper="rust" hostmakedepends="cargo pkg-config glib-devel gettext"