testing/vector: upgrade to 0.34.1

Link against system-provided librdkafka and zlib-ng (instead of zlib).

testing/vector/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=vector
-pkgver=0.32.2
+pkgver=0.34.1
-pkgrel=1
+pkgrel=0
 pkgdesc="High-performance observability data pipeline"
 url="https://vector.dev/"
 # s390x, ppc64le, riscv64: blocked by ring crate
@@ -18,15 +18,15 @@ makedepends="
 	protobuf-dev
 	protoc
 	python3
+	zlib-ng-dev
 	zstd-dev
 	"
 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
+	use-system-libs.patch
-	skip-pkcs12-test.patch
+	skip-failed-tests.patch
-	use-system-zstd.patch
 	vector.initd
 	vector.confd
 	logrotate
@@ -37,6 +37,16 @@ export OPENSSL_NO_VENDOR=1
 prepare() {
 	default_prepare
 
+	# Rust target triple.
+	local target=$(rustc -vV | sed -n 's/host: //p')
+
+	# Build against system-provided zlib-ng
+	mkdir -p .cargo
+	cat >> .cargo/config.toml <<-EOF
+		[target.$target]
+		z-ng = { rustc-link-lib = ["z-ng"], rustc-cfg = ["zng"] }
+	EOF
+
 	# "cargo auditable build" still tries to pull dependencies for other platforms
 	cargo fetch --locked
 }
@@ -66,7 +76,7 @@ check() {
 
 package() {
 	install -Dm755 releasebuild/vector -t "$pkgdir"/usr/bin/
-	install -Dm644 config/vector.toml -t "$pkgdir"/etc/vector/
+	install -Dm644 config/vector.yaml -t "$pkgdir"/etc/vector/
 	install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/vector
 
 	mkdir -p "$pkgdir"/usr/share/doc/vector
@@ -77,10 +87,9 @@ package() {
 }
 
 sha512sums="
-bdac3160a18e72da34f6d75f7c13c395da4bd334a3bd22d4087083c7bd138f35ee8bdd5e03c660097989fcda6ea8393848fa82177ca8f0b7ba53c7f375862d47  vector-0.32.2.tar.gz
+5bb1cb9bce8dbe5b75ac54107f521238367a5be871cb112b1471dc6b8b93ff3ff009628a75990d629054314bd85ff4c222c46e5d0892d4baa9d7eb4852802164  vector-0.34.1.tar.gz
-006c7f4c2b544e4a973350a038d648d8ce1be388f7a0c6c93cd5b24c49694e94a2ced003b2d75554be139ff8cf61d246470fdbff334e846d59cd7746dd77ea7b  openssl-sys.patch
+7f4ed2bdfc8cf8116909e32f9b9caa70bd60d4c63763c8d8f2f47adfe725ea058e05d1e9891415433596260c9264cefdbcae9a70033fceca1c98ac24e964f087  use-system-libs.patch
-7c7383005235eaba9bc050273d885b4348c0a3246abfc26da13acef495961e5930f1e309d9bb715216d14a35141a86de719804001cd5d10d33079384a06af5c5  skip-pkcs12-test.patch
+3e0d61d64411ce679241effccbe858ff2c68b20e96d8f9f12089671d8dcc84b0583f6db7512be90b716e3655e18d8a47e1359f4013444f448ec12f0de12f9c25  skip-failed-tests.patch
-d8326d3fab619eb7c0efa9d4cca924d7463b7144cb489188533f6463bc1a1e86f53bfbf7bc738a32a81182a9115769acb1c522bf78b7210a40fe54b2bd1b1a61  use-system-zstd.patch
 806c2594d9d7b4bf1c24436a3982801a37ec3d8784acb97266eb7111fe35d8d05a64ef981100bd8aa35a71ad9c7c98de634428f696bded31993143ca572b6757  vector.initd
 313f79e65e61754e8a611f8221d7c0cf36ee5af6f30aeff720924e64bb03d7f44c54fc31ae20926c354905f61df347830a7cba0c37afd41c1f59a25c52fa6f06  vector.confd
 62db792de321655558bdb23ab9b3a7b35b84de445657011d88e8205cce4a926ff7b20f5304ec48fa646f1f259ad2136eceb5a377c4520071799da502eeff7592  logrotate

testing/vector/openssl-sys.patch

@@ -1,40 +0,0 @@
-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

testing/vector/skip-failed-tests.patch

@@ -0,0 +1,12 @@
+diff --git a/lib/codecs/src/encoding/format/native_json.rs b/lib/codecs/src/encoding/format/native_json.rs
+index 94fd6b3..715e554 100644
+--- a/lib/codecs/src/encoding/format/native_json.rs
++++ b/lib/codecs/src/encoding/format/native_json.rs
+@@ -87,6 +87,7 @@ mod tests {
+     }
+ 
+     #[test]
++    #[ignore]
+     fn serialize_aggregated_histogram() {
+         let histogram_event = Event::from(Metric::new(
+             "histogram",

testing/vector/skip-pkcs12-test.patch

@@ -1,12 +0,0 @@
-diff --git a/lib/vector-core/src/tls/settings.rs b/lib/vector-core/src/tls/settings.rs
-index 6406e43..3e94208 100644
---- a/lib/vector-core/src/tls/settings.rs
-+++ b/lib/vector-core/src/tls/settings.rs
-@@ -625,6 +625,7 @@ mod test {
-     }
- 
-     #[test]
-+    #[ignore]
-     fn from_options_pkcs12() {
-         let options = TlsConfig {
-             crt_file: Some(TEST_PKCS12_PATH.into()),

testing/vector/use-system-libs.patch

@@ -0,0 +1,77 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index d5b347b..81f95c4 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -3407,6 +3407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+ dependencies = [
+  "crc32fast",
++ "libz-ng-sys",
+  "miniz_oxide",
+ ]
+ 
+@@ -4890,6 +4891,16 @@ version = "0.2.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+ 
++[[package]]
++name = "libz-ng-sys"
++version = "1.1.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63"
++dependencies = [
++ "cmake",
++ "libc",
++]
++
+ [[package]]
+ name = "libz-sys"
+ version = "1.1.12"
+@@ -4897,6 +4908,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
+ dependencies = [
+  "cc",
++ "cmake",
+  "libc",
+  "pkg-config",
+  "vcpkg",
+@@ -9950,6 +9962,7 @@ dependencies = [
+  "kube",
+  "lapin",
+  "libc",
++ "libz-sys",
+  "listenfd",
+  "logfmt",
+  "loki-logproto",
+diff --git a/Cargo.toml b/Cargo.toml
+index 21d8aa1..069db37 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -253,7 +253,7 @@ dyn-clone = { version = "1.0.16", default-features = false }
+ encoding_rs = { version = "0.8.33", default-features = false, features = ["serde"] }
+ enum_dispatch = { version = "0.3.12", default-features = false }
+ exitcode = { version = "1.1.2", default-features = false }
+-flate2 = { version = "1.0.28", default-features = false, features = ["default"] }
++flate2 = { version = "1.0.28", default-features = false, features = ["zlib-ng"] }
+ futures-util = { version = "0.3.29", default-features = false }
+ glob = { version = "0.3.1", default-features = false }
+ governor = { version = "0.6.0", default-features = false, features = ["dashmap", "jitter", "std"], optional = true }
+@@ -318,7 +318,8 @@ typetag = { version = "0.2.13", default-features = false }
+ url = { version = "2.4.1", default-features = false, features = ["serde"] }
+ uuid = { version = "1", default-features = false, features = ["serde", "v4"] }
+ warp = { version = "0.3.6", default-features = false }
+-zstd = { version = "0.13.0", default-features = false }
++zstd = { version = "0.13.0", default-features = false, features = ["pkg-config"] }
++libz-sys = { version = "1.1.12", default-features = false, features = ["zlib-ng"] }
+ arr_macro = { version = "0.2.1" }
+ 
+ # depending on fork for bumped nix dependency
+@@ -385,7 +386,7 @@ default-cmake = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build
+ # Default features for *-pc-windows-msvc
+ # TODO: Enable SASL https://github.com/vectordotdev/vector/pull/3081#issuecomment-659298042
+ default-msvc = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "transforms", "enterprise"]
+-default-musl = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "enterprise"]
++default-musl = ["api", "api-client", "enrichment-tables", "rdkafka?/dynamic-linking", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi", "enterprise"]
+ default-no-api-client = ["api", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "enterprise"]
+ default-no-vrl-cli = ["api", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "enterprise"]
+ tokio-console = ["dep:console-subscriber", "tokio/tracing"]

testing/vector/use-system-zstd.patch

@@ -1,11 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -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.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