From a179c663e27b3f8d135795b2a8fb6f0231c4ff7e Mon Sep 17 00:00:00 2001 From: Emanuele Sabellico Date: Mon, 1 Apr 2024 13:44:17 +0200 Subject: [PATCH] Fix pipeline inclusion of static binaries without gssapi dependency --- CHANGELOG.md | 15 +++++++++++++++ packaging/nuget/packaging.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf3ee31396..f2fa163544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,21 @@ librdkafka v2.3.1 is a maintenance release: check the [release notes](https://www.openssl.org/news/cl30.txt). * Integration tests can be started in KRaft mode and run against any GitHub Kafka branch other than the released versions. + * Fix pipeline inclusion of static binaries (#4666) + + +## Fixes + +### General fixes + + * In librdkafka release pipeline a static build containing libsasl2 + could be chosen instead of the alternative one without it. + That caused the libsasl2 dependency to be required in confluent-kafka-go + v2.1.0-linux-musl-arm64 and v2.3.0-linux-musl-arm64. + Solved by correctly excluding the binary configured with that library, + when targeting a static build. + Happening since v2.0.2, with specified platforms, when using static binaries (#4666). + # librdkafka v2.3.0 diff --git a/packaging/nuget/packaging.py b/packaging/nuget/packaging.py index c4dab806d6..c020198029 100755 --- a/packaging/nuget/packaging.py +++ b/packaging/nuget/packaging.py @@ -380,7 +380,7 @@ def apply_mappings(self): attr = attr[1:] if attr in a.info and \ - a.info[attr] != m.attributes[origattr]: + a.info[attr] == m.attributes[origattr]: found = False break else: