@platformatic/rdkafka 4.0.1 → 4.1.0

package/deps/librdkafka/examples/consumer.c

@@ -41,7 +41,7 @@
 
 /* Typical include path would be <librdkafka/rdkafka.h>, but this program
  * is builtin from within the librdkafka source tree and thus differs. */
-//#include <librdkafka/rdkafka.h>
+// #include <librdkafka/rdkafka.h>
 #include "rdkafka.h"
 
 
@@ -77,8 +77,9 @@ int main(int argc, char **argv) {
         char errstr[512];        /* librdkafka API error reporting buffer */
         const char *brokers;     /* Argument: broker list */
         const char *groupid;     /* Argument: Consumer group id */
-        char **topics;           /* Argument: list of topics to subscribe to */
-        int topic_cnt;           /* Number of topics to subscribe to */
+        const char *group_protocol;
+        char **topics; /* Argument: list of topics to subscribe to */
+        int topic_cnt; /* Number of topics to subscribe to */
         rd_kafka_topic_partition_list_t *subscription; /* Subscribed topics */
         int i;
 
@@ -88,15 +89,17 @@ int main(int argc, char **argv) {
         if (argc < 4) {
                 fprintf(stderr,
                         "%% Usage: "
-                        "%s <broker> <group.id> <topic1> <topic2>..\n",
+                        "%s <broker> <group.id> <group.protocol> <topic1> "
+                        "<topic2>..\n",
                         argv[0]);
                 return 1;
         }
 
-        brokers   = argv[1];
-        groupid   = argv[2];
-        topics    = &argv[3];
-        topic_cnt = argc - 3;
+        brokers        = argv[1];
+        groupid        = argv[2];
+        group_protocol = argv[3];
+        topics         = &argv[4];
+        topic_cnt      = argc - 4;
 
 
         /*
@@ -127,6 +130,13 @@ int main(int argc, char **argv) {
                 return 1;
         }
 
+        if (rd_kafka_conf_set(conf, "group.protocol", group_protocol, errstr,
+                              sizeof(errstr)) != RD_KAFKA_CONF_OK) {
+                fprintf(stderr, "%s\n", errstr);
+                rd_kafka_conf_destroy(conf);
+                return 1;
+        }
+
         /* If there is no previously committed offset for a partition
          * the auto.offset.reset strategy will be used to decide where
          * in the partition to start fetching messages.

package/deps/librdkafka/examples/describe_consumer_groups.c

@@ -164,15 +164,31 @@ print_group_member_info(const rd_kafka_MemberDescription_t *member) {
             rd_kafka_MemberDescription_host(member));
         const rd_kafka_MemberAssignment_t *assignment =
             rd_kafka_MemberDescription_assignment(member);
-        const rd_kafka_topic_partition_list_t *topic_partitions =
+        const rd_kafka_topic_partition_list_t *assigned_topic_partitions =
             rd_kafka_MemberAssignment_partitions(assignment);
-        if (!topic_partitions) {
+        const rd_kafka_MemberAssignment_t *target_assignment =
+            rd_kafka_MemberDescription_target_assignment(member);
+        const rd_kafka_topic_partition_list_t *target_topic_partitions =
+            target_assignment
+                ? rd_kafka_MemberAssignment_partitions(target_assignment)
+                : NULL;
+        if (!assigned_topic_partitions) {
                 printf("    No assignment\n");
-        } else if (topic_partitions->cnt == 0) {
+        } else if (assigned_topic_partitions->cnt == 0) {
                 printf("    Empty assignment\n");
         } else {
                 printf("    Assignment:\n");
-                print_partition_list(stdout, topic_partitions, 0, "      ");
+                print_partition_list(stdout, assigned_topic_partitions, 0,
+                                     "      ");
+        }
+        if (!target_topic_partitions) {
+                printf("    No target assignment\n");
+        } else if (target_topic_partitions->cnt == 0) {
+                printf("    Empty target assignment\n");
+        } else {
+                printf("    Target assignment:\n");
+                print_partition_list(stdout, target_topic_partitions, 0,
+                                     "      ");
         }
 }
 
@@ -194,6 +210,8 @@ static void print_group_info(const rd_kafka_ConsumerGroupDescription_t *group) {
             rd_kafka_ConsumerGroupDescription_partition_assignor(group);
         rd_kafka_consumer_group_state_t state =
             rd_kafka_ConsumerGroupDescription_state(group);
+        rd_kafka_consumer_group_type_t type =
+            rd_kafka_ConsumerGroupDescription_type(group);
         authorized_operations =
             rd_kafka_ConsumerGroupDescription_authorized_operations(
                 group, &authorized_operations_cnt);
@@ -212,9 +230,10 @@ static void print_group_info(const rd_kafka_ConsumerGroupDescription_t *group) {
                          rd_kafka_Node_port(coordinator));
         }
         printf(
-            "Group \"%s\", partition assignor \"%s\", "
-            " state %s%s, with %" PRId32 " member(s)\n",
+            "Group \"%s\", partition assignor \"%s\", type \"%s\""
+            " state \"%s\"%s, with %" PRId32 " member(s)\n",
             group_id, partition_assignor,
+            rd_kafka_consumer_group_type_name(type),
             rd_kafka_consumer_group_state_name(state), coordinator_desc,
             member_cnt);
         for (j = 0; j < authorized_operations_cnt; j++) {

package/deps/librdkafka/examples/incremental_alter_configs.c

@@ -183,11 +183,10 @@ cmd_incremental_alter_configs(rd_kafka_conf_t *conf, int argc, char **argv) {
                 rd_kafka_ConfigResource_t *config;
                 rd_kafka_AlterConfigOpType_t op_type;
                 rd_kafka_ResourceType_t restype =
-                    !strcmp(restype_s, "TOPIC")
-                        ? RD_KAFKA_RESOURCE_TOPIC
-                        : !strcmp(restype_s, "BROKER")
-                              ? RD_KAFKA_RESOURCE_BROKER
-                              : RD_KAFKA_RESOURCE_UNKNOWN;
+                    !strcmp(restype_s, "TOPIC")    ? RD_KAFKA_RESOURCE_TOPIC
+                    : !strcmp(restype_s, "BROKER") ? RD_KAFKA_RESOURCE_BROKER
+                    : !strcmp(restype_s, "GROUP")  ? RD_KAFKA_RESOURCE_GROUP
+                                                   : RD_KAFKA_RESOURCE_UNKNOWN;
 
                 if (restype == RD_KAFKA_RESOURCE_UNKNOWN) {
                         usage("Invalid resource type: %s", restype_s);

package/deps/librdkafka/examples/kafkatest_verifiable_client.cpp

@@ -194,14 +194,11 @@ static void errorString(const std::string &name,
                         const std::string &topic,
                         const std::string *key,
                         const std::string &value) {
-  std::cout << "{ "
-            << "\"name\": \"" << name << "\", "
-            << "\"_time\": \"" << now() << "\", "
-            << "\"message\": \"" << errmsg << "\", "
-            << "\"topic\": \"" << topic << "\", "
-            << "\"key\": \"" << (key ? *key : "NULL") << "\", "
-            << "\"value\": \"" << value << "\" "
-            << "}" << std::endl;
+  std::cout << "{ " << "\"name\": \"" << name << "\", " << "\"_time\": \""
+            << now() << "\", " << "\"message\": \"" << errmsg << "\", "
+            << "\"topic\": \"" << topic << "\", " << "\"key\": \""
+            << (key ? *key : "NULL") << "\", " << "\"value\": \"" << value
+            << "\" " << "}" << std::endl;
 }
 
 
@@ -211,15 +208,12 @@ static void successString(const std::string &name,
                           int64_t offset,
                           const std::string *key,
                           const std::string &value) {
-  std::cout << "{ "
-            << "\"name\": \"" << name << "\", "
-            << "\"_time\": \"" << now() << "\", "
-            << "\"topic\": \"" << topic << "\", "
+  std::cout << "{ " << "\"name\": \"" << name << "\", " << "\"_time\": \""
+            << now() << "\", " << "\"topic\": \"" << topic << "\", "
             << "\"partition\": " << partition << ", "
-            << "\"offset\": " << offset << ", "
-            << "\"key\": \"" << (key ? *key : "NULL") << "\", "
-            << "\"value\": \"" << value << "\" "
-            << "}" << std::endl;
+            << "\"offset\": " << offset << ", " << "\"key\": \""
+            << (key ? *key : "NULL") << "\", " << "\"value\": \"" << value
+            << "\" " << "}" << std::endl;
 }
 
 
@@ -231,15 +225,11 @@ static void offsetStatus(bool success,
                          const std::string &errstr) {
   std::cout << "{ "
                "\"name\": \"offsets_committed\", "
-            << "\"success\": " << success << ", "
-            << "\"offsets\": [ "
-            << " { "
+            << "\"success\": " << success << ", " << "\"offsets\": [ " << " { "
             << " \"topic\": \"" << topic << "\", "
             << " \"partition\": " << partition << ", "
-            << " \"offset\": " << (int)offset << ", "
-            << " \"error\": \"" << errstr << "\" "
-            << " } "
-            << "] }" << std::endl;
+            << " \"offset\": " << (int)offset << ", " << " \"error\": \""
+            << errstr << "\" " << " } " << "] }" << std::endl;
 }
 #endif
 
@@ -341,8 +331,7 @@ static void report_records_consumed(int immediate) {
             << "\"count\": "
             << (state.consumer.consumedMessages -
                 state.consumer.consumedMessagesLastReported)
-            << ", "
-            << "\"partitions\": [ ";
+            << ", " << "\"partitions\": [ ";
 
   for (std::map<std::string, Assignment>::iterator ii = assignments->begin();
        ii != assignments->end(); ii++) {
@@ -352,8 +341,7 @@ static void report_records_consumed(int immediate) {
               << " \"topic\": \"" << a->topic << "\", "
               << " \"partition\": " << a->partition << ", "
               << " \"minOffset\": " << a->minOffset << ", "
-              << " \"maxOffset\": " << a->maxOffset << " "
-              << " } ";
+              << " \"maxOffset\": " << a->maxOffset << " " << " } ";
     a->minOffset = -1;
   }
 
@@ -378,8 +366,7 @@ class ExampleOffsetCommitCb : public RdKafka::OffsetCommitCb {
      */
     report_records_consumed(1);
 
-    std::cout << "{ "
-              << "\"name\": \"offsets_committed\", "
+    std::cout << "{ " << "\"name\": \"offsets_committed\", "
               << "\"success\": " << (err ? "false" : "true") << ", "
               << "\"error\": \"" << (err ? RdKafka::err2str(err) : "") << "\", "
               << "\"_autocommit\": "
@@ -387,15 +374,14 @@ class ExampleOffsetCommitCb : public RdKafka::OffsetCommitCb {
               << "\"offsets\": [ ";
     assert(offsets.size() > 0);
     for (unsigned int i = 0; i < offsets.size(); i++) {
-      std::cout << (i == 0 ? "" : ", ") << "{ "
-                << " \"topic\": \"" << offsets[i]->topic() << "\", "
+      std::cout << (i == 0 ? "" : ", ") << "{ " << " \"topic\": \""
+                << offsets[i]->topic() << "\", "
                 << " \"partition\": " << offsets[i]->partition() << ", "
                 << " \"offset\": " << (int)offsets[i]->offset() << ", "
                 << " \"error\": \""
                 << (offsets[i]->err() ? RdKafka::err2str(offsets[i]->err())
                                       : "")
-                << "\" "
-                << " }";
+                << "\" " << " }";
     }
     std::cout << " ] }" << std::endl;
   }
@@ -427,8 +413,8 @@ static void do_commit(RdKafka::KafkaConsumer *consumer, int immediate) {
   RdKafka::ErrorCode err;
   err = consumer->commitSync(&ex_offset_commit_cb);
 
-  std::cerr << now() << ": "
-            << "sync commit returned " << RdKafka::err2str(err) << std::endl;
+  std::cerr << now() << ": " << "sync commit returned " << RdKafka::err2str(err)
+            << std::endl;
 
   state.consumer.consumedMessagesAtLastCommit = state.consumer.consumedMessages;
 }
@@ -526,8 +512,8 @@ class ExampleRebalanceCb : public RdKafka::RebalanceCb {
       const std::vector<RdKafka::TopicPartition *> &partitions) {
     std::ostringstream out;
     for (unsigned int i = 0; i < partitions.size(); i++)
-      out << (i == 0 ? "" : ", ") << "{ "
-          << " \"topic\": \"" << partitions[i]->topic() << "\", "
+      out << (i == 0 ? "" : ", ") << "{ " << " \"topic\": \""
+          << partitions[i]->topic() << "\", "
           << " \"partition\": " << partitions[i]->partition() << " }";
     return out.str();
   }
@@ -549,13 +535,11 @@ class ExampleRebalanceCb : public RdKafka::RebalanceCb {
       consumer->unassign();
     }
 
-    std::cout << "{ "
-              << "\"name\": \"partitions_"
+    std::cout << "{ " << "\"name\": \"partitions_"
               << (err == RdKafka::ERR__ASSIGN_PARTITIONS ? "assigned"
                                                          : "revoked")
-              << "\", "
-              << "\"partitions\": [ " << part_list_json(partitions) << "] }"
-              << std::endl;
+              << "\", " << "\"partitions\": [ " << part_list_json(partitions)
+              << "] }" << std::endl;
   }
 };
 

package/deps/librdkafka/examples/openssl_engine_example.cpp

@@ -74,10 +74,9 @@ class PrintingSSLVerifyCb : public RdKafka::SslCertificateVerifyCb {
                           const char *buf,
                           size_t size,
                           std::string &errstr) {
-    std::cout << "ssl_cert_verify_cb :"
-              << ": broker_name=" << broker_name << ", broker_id=" << broker_id
-              << ", x509_error=" << *x509_error << ", depth=" << depth
-              << ", buf size=" << size << std::endl;
+    std::cout << "ssl_cert_verify_cb :" << ": broker_name=" << broker_name
+              << ", broker_id=" << broker_id << ", x509_error=" << *x509_error
+              << ", depth=" << depth << ", buf size=" << size << std::endl;
 
     return true;
   }

package/deps/librdkafka/examples/producer.cpp

@@ -133,8 +133,8 @@ int main(int argc, char **argv) {
   /*
    * Read messages from stdin and produce to broker.
    */
-  std::cout << "% Type message value and hit enter "
-            << "to produce message." << std::endl;
+  std::cout << "% Type message value and hit enter " << "to produce message."
+            << std::endl;
 
   for (std::string line; run && std::getline(std::cin, line);) {
     if (line.empty()) {

package/deps/librdkafka/examples/user_scram.c

@@ -138,11 +138,10 @@ int64_t parse_int(const char *what, const char *str) {
 }
 
 rd_kafka_ScramMechanism_t parse_mechanism(const char *arg) {
-        return !strcmp(arg, "SCRAM-SHA-256")
-                   ? RD_KAFKA_SCRAM_MECHANISM_SHA_256
-                   : !strcmp(arg, "SCRAM-SHA-512")
-                         ? RD_KAFKA_SCRAM_MECHANISM_SHA_512
-                         : RD_KAFKA_SCRAM_MECHANISM_UNKNOWN;
+        return !strcmp(arg, "SCRAM-SHA-256") ? RD_KAFKA_SCRAM_MECHANISM_SHA_256
+               : !strcmp(arg, "SCRAM-SHA-512")
+                   ? RD_KAFKA_SCRAM_MECHANISM_SHA_512
+                   : RD_KAFKA_SCRAM_MECHANISM_UNKNOWN;
 }
 
 static void print_descriptions(

package/deps/librdkafka/examples/win_ssl_cert_store.cpp

@@ -211,9 +211,10 @@ class PrintingSSLVerifyCb : public RdKafka::SslCertificateVerifyCb {
     CertGetNameStringA(ctx, CERT_NAME_FRIENDLY_DISPLAY_TYPE,
                        CERT_NAME_ISSUER_FLAG, NULL, issuer, sizeof(issuer));
 
-    std::cerr << "Broker " << broker_name << " (" << broker_id << "): "
-              << "certificate depth " << depth << ", X509 error " << *x509_error
-              << ", subject " << subject << ", issuer " << issuer << std::endl;
+    std::cerr << "Broker " << broker_name << " (" << broker_id
+              << "): " << "certificate depth " << depth << ", X509 error "
+              << *x509_error << ", subject " << subject << ", issuer " << issuer
+              << std::endl;
 
     if (ctx)
       CertFreeCertificateContext(ctx);

package/deps/librdkafka/packaging/RELEASE.md

@@ -45,6 +45,14 @@ Error strings must not contain a trailing period.
           will be a breaking API change.
 
 
+### Max Apache Kafka RPC versions
+
+Copy the first three columns of the table in `INTRODUCTION.md` to a temporary file
+and run the script
+`./packaging/tools/update_rpcs_max_versions.py <kafka_folder> <input_file>`
+for getting the updated columns in stdout.
+
+
 ## Run regression tests
 
 **Build tests:**

package/deps/librdkafka/packaging/cp/README.md

@@ -4,10 +4,13 @@ This small set of scripts verifies the librdkafka packages that
 are part of the Confluent Platform.
 
 The base_url is the http S3 bucket path to the a PR job, or similar.
+Pass the platform (e.g. linux/arm64) and the expected librdkafka version too.
 
 ## How to use
 
-    $ ./verify-packages.sh 7.6 https://packages.confluent.io
+```
+$ ./verify-packages.sh https://packages.confluent.io linux/amd64 2.8.0
+```
 
 Requires docker and patience.
 

package/deps/librdkafka/packaging/cp/check_features.c

@@ -15,9 +15,17 @@ int main(int argc, char **argv) {
         printf("librdkafka %s (0x%x, define: 0x%x)\n", rd_kafka_version_str(),
                rd_kafka_version(), RD_KAFKA_VERSION);
 
-        if (argc > 1 && !(argc & 1)) {
-                printf("Usage: %s [config.property config-value ..]\n",
-                       argv[0]);
+        if (argc < 2 || (argc > 2 && (argc & 1))) {
+                printf(
+                    "Usage: %s  <version_string> [config.property config-value "
+                    "..]\n",
+                    argv[0]);
+                return 1;
+        }
+
+        if (!strstr(rd_kafka_version_str(), argv[1])) {
+                printf("ERROR: version string mismatch: expected %s, got %s\n",
+                       argv[1], rd_kafka_version_str());
                 return 1;
         }
 
@@ -46,7 +54,7 @@ int main(int argc, char **argv) {
         printf("all expected features matched: %s\n", expected_features);
 
         /* Apply config from argv key value pairs */
-        for (i = 1; i + 1 < argc; i += 2) {
+        for (i = 2; i + 1 < argc; i += 2) {
                 printf("verifying config %s=%s\n", argv[i], argv[i + 1]);
                 if (rd_kafka_conf_set(conf, argv[i], argv[i + 1], errstr,
                                       sizeof(errstr)) != RD_KAFKA_CONF_OK) {

package/deps/librdkafka/packaging/cp/verify-deb.sh

@@ -3,22 +3,22 @@
 
 set -e
 
-cpver=$1
-base_url=$2
+base_url=$1
+version=$2
 
 if [[ -z $base_url ]]; then
-    echo "Usage: $0 <cp-base-ver> <base_url>"
+    echo "Usage: $0 <base_url>"
     exit 1
 fi
 
 apt-get update
 apt-get install -y apt-transport-https wget gnupg2 lsb-release
 
-wget -qO - ${base_url}/deb/${cpver}/archive.key | apt-key add -
+wget -qO - ${base_url}/clients/deb/archive.key | apt-key add -
 
 release=$(lsb_release -cs)
 cat >/etc/apt/sources.list.d/Confluent.list <<EOF
-deb [arch=amd64] $base_url/clients/deb ${release} main
+deb $base_url/clients/deb ${release} main
 EOF
 
 apt-get update
@@ -26,7 +26,7 @@ apt-get install -y librdkafka-dev gcc
 
 gcc /v/check_features.c -o /tmp/check_features -lrdkafka
 
-/tmp/check_features
+/tmp/check_features $version
 
 # FIXME: publish plugins in newer versions
 # apt-get install -y confluent-librdkafka-plugins

package/deps/librdkafka/packaging/cp/verify-packages.sh

@@ -2,47 +2,68 @@
 #
 # Verifies RPM and DEB packages from Confluent Platform
 #
+base_url=$1
+platform=$2
+version=$3
 
-cpver=$1
-base_url=$2
-
-if [[ -z $base_url ]]; then
-    echo "Usage: $0 <CP-M.m-version> <base-url>"
+if [[ -z $base_url || -z $version ]]; then
+    echo "Usage: $0 <base-url> <platform> <version>"
     echo ""
-    echo " <CP-M.m-version> is the Major.minor version of CP, e.g., 5.3"
     echo " <base-url> is the release base bucket URL"
+    echo " <platform> is platform to verify (e.g. linux/amd64)"
+    echo " <version> is the expected version"
     exit 1
 fi
 
 thisdir="$( cd "$(dirname "$0")" ; pwd -P )"
 
-echo "#### Verifying RPM packages ####"
-docker run -v $thisdir:/v rockylinux:8 /v/verify-rpm.sh $cpver $base_url
-docker run -v $thisdir:/v rockylinux:9 /v/verify-rpm.sh $cpver $base_url
-rpm_status=$?
-
-echo "#### Verifying Debian packages ####"
-docker run -v $thisdir:/v debian:10 /v/verify-deb.sh $cpver $base_url
-docker run -v $thisdir:/v debian:11 /v/verify-deb.sh $cpver $base_url
-docker run -v $thisdir:/v debian:12 /v/verify-deb.sh $cpver $base_url
-docker run -v $thisdir:/v ubuntu:20.04 /v/verify-deb.sh $cpver $base_url
-docker run -v $thisdir:/v ubuntu:22.04 /v/verify-deb.sh $cpver $base_url
-deb_status=$?
+verify_debian() {
+    local version=$2
+    docker run -v $thisdir:/v $1 /v/verify-deb.sh $base_url $version
+    deb_status=$?
+    if [[ $deb_status == 0 ]]; then
+        echo "SUCCESS: Debian based $1 $2 packages verified"
+    else
+        echo "ERROR: Debian based $1 $2 package verification failed"
+        exit 1
+    fi
+}
 
+verify_rpm() {
+    local version=$2
+    docker run -v $thisdir:/v $1 /v/verify-rpm.sh $base_url $version
+    rpm_status=$?
+    if [[ $rpm_status == 0 ]]; then
+        echo "SUCCESS: RPM $1 $2 packages verified"
+    else
+        echo "ERROR: RPM $1 $2 package verification failed"
+        exit 1
+    fi
+}
 
-if [[ $rpm_status == 0 ]]; then
-    echo "SUCCESS: RPM packages verified"
-else
-    echo "ERROR: RPM package verification failed"
-fi
+verify_rpm_distros() {
+    local platform=$1
+    local version=$2
+    echo "#### Verifying RPM packages for $platform ####"
+    # Last RHEL 8 version is 2.4.0
+    verify_rpm rockylinux:8 "2.4.0"
+    verify_rpm rockylinux:9 $version
+}
 
-if [[ $deb_status == 0 ]]; then
-    echo "SUCCESS: Debian packages verified"
-else
-    echo "ERROR: Debian package verification failed"
-fi
+verify_debian_distros() {
+    local platform=$1
+    local version=$2
+    echo "#### Verifying Debian packages for $platform ####"
+    verify_debian debian:11 $version
+    verify_debian debian:12 $version
+    verify_debian ubuntu:20.04 $version
+    verify_debian ubuntu:22.04 $version
+    verify_debian ubuntu:24.04 $version
+}
 
-if [[ $deb_status != 0 || $rpm_status != 0 ]]; then
-    exit 1
-fi
+verify_distros() {
+    verify_rpm_distros $1 $2
+    verify_debian_distros $1 $2
+}
 
+verify_distros $platform $version

package/deps/librdkafka/packaging/cp/verify-rpm.sh

@@ -3,22 +3,15 @@
 
 set -e
 
-cpver=$1
-base_url=$2
+base_url=$1
+version=$2
 
 if [[ -z $base_url ]]; then
-    echo "Usage: $0 <cp-base-ver> <base_url>"
+    echo "Usage: $0 <base_url>"
     exit 1
 fi
 
 cat >/etc/yum.repos.d/Confluent.repo <<EOF
-[Confluent]
-name=Confluent repository
-baseurl=$base_url/rpm/${cpver}
-gpgcheck=1
-gpgkey=$base_url/rpm/${cpver}/archive.key
-enabled=1
-
 [Confluent-Clients]
 name=Confluent Clients repository
 baseurl=$base_url/clients/rpm/centos/\$releasever/\$basearch
@@ -31,9 +24,9 @@ yum install -y librdkafka-devel gcc
 
 gcc /v/check_features.c -o /tmp/check_features -lrdkafka
 
-/tmp/check_features
+/tmp/check_features $version
 
 # Verify plugins
-yum install -y confluent-librdkafka-plugins
+# yum install -y confluent-librdkafka-plugins
 
-/tmp/check_features plugin.library.paths monitoring-interceptor
+# /tmp/check_features plugin.library.paths monitoring-interceptor

package/deps/librdkafka/packaging/mingw-w64/{travis-before-install.sh → export-variables.sh}

@@ -8,13 +8,6 @@ export msys2+='& C:\\msys64\\msys2_shell.cmd -defterm -no-start'
 export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
 export msys2+=" -msys2 -c "\"\$@"\" --"
 
-# Have to update pacman first or choco upgrade will failure due to migration
-# to zstd instead of xz compression
-$msys2 pacman -Sy --noconfirm pacman
-
-## Install more MSYS2 packages from https://packages.msys2.org/base here
-$msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake mingw-w64-x86_64-openssl mingw-w64-x86_64-lz4 mingw-w64-x86_64-zstd
-
 taskkill //IM gpg-agent.exe //F  || true  # https://travis-ci.community/t/4967
 export PATH=/C/msys64/mingw64/bin:$PATH
 export MAKE=mingw32-make  # so that Autotools can find it

package/deps/librdkafka/packaging/mingw-w64/semaphoreci-build.sh

@@ -17,7 +17,7 @@ fi
 
 archive="${PWD}/$1"
 
-source ./packaging/mingw-w64/travis-before-install.sh
+source ./packaging/mingw-w64/export-variables.sh
 
 if [[ $linkage == "static" ]]; then
     ./packaging/mingw-w64/configure-build-msys2-mingw-static.sh

package/deps/librdkafka/packaging/nuget/requirements.txt

@@ -1,3 +1,3 @@
-boto3==1.18.45
-rpmfile==1.0.8
-filemagic==1.6
+boto3~=1.38
+rpmfile~=1.1
+filemagic~=1.6