diff --git a/testing/vector/APKBUILD b/testing/vector/APKBUILD index 6ccd07d5e7b35d0c98d33fdaa78b9e28925e806f..8faf41e36740caaa55a7d1417a710b4c63403507 100644 --- a/testing/vector/APKBUILD +++ b/testing/vector/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=vector -pkgver=0.29.1 -pkgrel=1 +pkgver=0.32.1 +pkgrel=0 pkgdesc="High-performance observability data pipeline" url="https://vector.dev/" # s390x, ppc64le, riscv64: blocked by ring crate @@ -24,6 +24,7 @@ checkdepends="bash cargo-nextest tzdata" subpackages="$pkgname-doc $pkgname-openrc" source=" $pkgname-$pkgver.tar.gz::https://github.com/vectordotdev/vector/archive/refs/tags/v$pkgver.tar.gz + openssl-sys.patch skip-pkcs12-test.patch use-system-zstd.patch vector.initd @@ -76,9 +77,10 @@ package() { } sha512sums=" -96e754696cddec99d8c24af0484609e7e2f63de753216b761d49d547c89df7ba4998d2a199bb995676b1c0aa7e15ac11e58aec43a2b55e636cab4df51bc6224a vector-0.29.1.tar.gz +5a6546b603925e8df90b67b59f023ffd6ae4877a94f5b1fa4270e16a243d0ba7997cef7ab5cd2d99d3e4f8b653c6d9ab96a6ec1ce8b84a38958aa3ca3c8909a8 vector-0.32.1.tar.gz +006c7f4c2b544e4a973350a038d648d8ce1be388f7a0c6c93cd5b24c49694e94a2ced003b2d75554be139ff8cf61d246470fdbff334e846d59cd7746dd77ea7b openssl-sys.patch 7c7383005235eaba9bc050273d885b4348c0a3246abfc26da13acef495961e5930f1e309d9bb715216d14a35141a86de719804001cd5d10d33079384a06af5c5 skip-pkcs12-test.patch -82cbfc8458aad8282b00c9b3ae25ec6503caa915d2eb271f125576dc5cdefc5f41dc51b441a7acd82f698c29d9efdc2b9e3de6d6b6f6457fdbcd19acb8fb2ad1 use-system-zstd.patch +d8326d3fab619eb7c0efa9d4cca924d7463b7144cb489188533f6463bc1a1e86f53bfbf7bc738a32a81182a9115769acb1c522bf78b7210a40fe54b2bd1b1a61 use-system-zstd.patch 806c2594d9d7b4bf1c24436a3982801a37ec3d8784acb97266eb7111fe35d8d05a64ef981100bd8aa35a71ad9c7c98de634428f696bded31993143ca572b6757 vector.initd 313f79e65e61754e8a611f8221d7c0cf36ee5af6f30aeff720924e64bb03d7f44c54fc31ae20926c354905f61df347830a7cba0c37afd41c1f59a25c52fa6f06 vector.confd 62db792de321655558bdb23ab9b3a7b35b84de445657011d88e8205cce4a926ff7b20f5304ec48fa646f1f259ad2136eceb5a377c4520071799da502eeff7592 logrotate diff --git a/testing/vector/openssl-sys.patch b/testing/vector/openssl-sys.patch new file mode 100644 index 0000000000000000000000000000000000000000..6a4f0e0dc4d40b81cb80e88c16111ebbd768dd74 --- /dev/null +++ b/testing/vector/openssl-sys.patch @@ -0,0 +1,40 @@ +adapted from upstream commit https://github.com/vectordotdev/vector/commit/8ec87eb43073b4242f489ea91cc56f684905e006 +---- +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -5808,15 +5808,16 @@ + [[package]] + name = "openssl-src" + version = "300.1.3+3.1.2" +-source = "git+https://github.com/vectordotdev/openssl-src-rs.git?tag=release-300-force-engine+3.1.2#98b1172bcef15358ad7bbf4baa3a3aa59d831e81" ++source = "git+https://github.com/alexcrichton/openssl-src-rs#26dc3c81d8ebee5f7ec40835e29bf9f37e648ab2" + dependencies = [ + "cc", + ] + + [[package]] + name = "openssl-sys" +-version = "0.9.91" +-source = "git+https://github.com/vectordotdev/rust-openssl.git?tag=openssl-sys-v0.9.91+3.0.0#c3a8b494e0a8ab88db692c239d30c903353b56a3" ++version = "0.9.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" + dependencies = [ + "cc", + "libc", +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -381,11 +381,8 @@ + # The `heim` crates depend on `ntapi` 0.3.7 on Windows, but that version has an + # unaligned access bug fixed in the following revision. + ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "24fc1e47677fc9f6e38e5f154e6011dc9b270da6" } +-# The current `openssl-sys` crate will vendor the OpenSSL sources via +-# `openssl-src` at version 1.1.1*, but we want version 3.1.*. Bring in forked +-# version of that crate with the appropriate dependency patched in. +-openssl-sys = { git = "https://github.com/vectordotdev/rust-openssl.git", tag = "openssl-sys-v0.9.91+3.0.0" } +-openssl-src = { git = "https://github.com/vectordotdev/openssl-src-rs.git", tag = "release-300-force-engine+3.1.2"} ++# 300.1.3+3.1.2 + a commit that re-adds force-engine flag. Can be removed after next release of openssl-src. ++openssl-src = { git = "https://github.com/alexcrichton/openssl-src-rs", ref = "26dc3c81d8ebee5f7ec40835e29bf9f37e648ab2" } + + [features] + # Default features for *-unknown-linux-gnu and *-apple-darwin diff --git a/testing/vector/use-system-zstd.patch b/testing/vector/use-system-zstd.patch index 6662a13d33336d908951a5a65e9a9b9cb67c19cf..4680d73348714cdf2ddc4107f3f349d92651351c 100644 --- a/testing/vector/use-system-zstd.patch +++ b/testing/vector/use-system-zstd.patch @@ -1,23 +1,11 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 089fbf4..512de88 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -10573,4 +10573,5 @@ checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0" - dependencies = [ - "cc", - "libc", -+ "pkg-config", - ] -diff --git a/Cargo.toml b/Cargo.toml -index 0864cdb..a558066 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -317,7 +317,7 @@ typetag = { version = "0.2.7", default-features = false } - url = { version = "2.3.1", default-features = false, features = ["serde"] } +@@ -325,7 +325,7 @@ + url = { version = "2.4.0", default-features = false, features = ["serde"] } uuid = { version = "1", default-features = false, features = ["serde", "v4"] } - warp = { version = "0.3.4", default-features = false } --zstd = { version = "0.12.3", default-features = false } -+zstd = { version = "0.12.3", features = ["pkg-config"] } + warp = { version = "0.3.5", default-features = false } +-zstd = { version = "0.12.4", default-features = false } ++zstd = { version = "0.12.4", features = ["pkg-config"] } arr_macro = { version = "0.2.1" } # depending on fork for bumped nix dependency