From bf3608578666c8ed47c1ff16f0134a8de02b0a85 Mon Sep 17 00:00:00 2001
From: Samuel Roberts <sproberts92@outlook.com>
Date: Thu, 22 Dec 2022 19:29:26 +1100
Subject: [PATCH 1/2] Add feature for scram-vendored

---
 Cargo.lock             | 10 +++++-----
 Cargo.toml             |  1 +
 rdkafka-sys/Cargo.toml |  5 ++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8f986059e..9d174ca2c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -657,12 +657,11 @@ dependencies = [
 
 [[package]]
 name = "krb5-src"
-version = "0.2.1+1.18.1"
+version = "0.3.2+1.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "921e9fb269b7852b030f22435963c6ea15cac68d5136ff1f2f55924eb713b4a8"
+checksum = "44cd3b7e7735d48bc3793837041294f2eb747bd0f63bbc081e89972abb9e48fb"
 dependencies = [
  "duct",
- "openssl-sys",
 ]
 
 [[package]]
@@ -1157,14 +1156,15 @@ checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1"
 
 [[package]]
 name = "sasl2-sys"
-version = "0.1.12"
+version = "0.1.20+2.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b82548e259466e09971e8b1d1adfffba6005c83a2ca2aca5b5d00a61f6b8058"
+checksum = "9e645bd98535fc8fd251c43ba7c7c1f9be1e0369c99b6a5ea719052a773e655c"
 dependencies = [
  "cc",
  "duct",
  "krb5-src",
  "libc",
+ "openssl-sys",
  "pkg-config",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 87a343c5a..8348407e6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,6 +56,7 @@ ssl-vendored = ["rdkafka-sys/ssl-vendored"]
 gssapi = ["rdkafka-sys/gssapi"]
 gssapi-vendored = ["rdkafka-sys/gssapi-vendored"]
 sasl = ["rdkafka-sys/sasl"]
+scram-vendored = ["rdkafka-sys/scram-vendored"]
 libz = ["rdkafka-sys/libz"]
 libz-static = ["rdkafka-sys/libz-static"]
 curl = ["rdkafka-sys/curl"]
diff --git a/rdkafka-sys/Cargo.toml b/rdkafka-sys/Cargo.toml
index 2b7dcdfb4..2fda859c5 100644
--- a/rdkafka-sys/Cargo.toml
+++ b/rdkafka-sys/Cargo.toml
@@ -19,7 +19,7 @@ libz-sys = { version = "1.0.0", optional = true }
 curl-sys = { version = "0.4.55", optional = true }
 zstd-sys = { version = "2.0.0", optional = true }
 lz4-sys = { version = "1.8.3", optional = true }
-sasl2-sys = { version = "0.1.6", optional = true }
+sasl2-sys = { version = "0.1.20", optional = true }
 
 [build-dependencies]
 pkg-config = "0.3.9"
@@ -70,6 +70,9 @@ libz = ["libz-sys"]
 # the system's version.
 libz-static = ["libz", "libz-sys/static"]
 
+# Enable SASL/SCRAM support
+scram-vendored = ["ssl-vendored", "sasl2-sys/scram"]
+
 # Enable support for HTTP client via curl.
 curl = ["curl-sys"]
 

From 0cf6b8e29e6dcb516cc6be9923dc6f28ff0c5c34 Mon Sep 17 00:00:00 2001
From: Samuel Roberts <sproberts92@outlook.com>
Date: Thu, 22 Dec 2022 19:37:47 +1100
Subject: [PATCH 2/2] Update readme and changelog

---
 rdkafka-sys/README.md    | 2 ++
 rdkafka-sys/changelog.md | 1 +
 2 files changed, 3 insertions(+)

diff --git a/rdkafka-sys/README.md b/rdkafka-sys/README.md
index af475d049..b2466b310 100644
--- a/rdkafka-sys/README.md
+++ b/rdkafka-sys/README.md
@@ -60,6 +60,8 @@ flags you would pass to `configure` if you were compiling manually).
     libsasl2. By default the system's libsasl2 is dynamically linked, but
     static linking of the version bundled with the [sasl2-sys] crate can be
     requested with the `gssapi-vendored` feature.
+  * The **`scram-vendored`** feature enables SASL SCRAM support with Cyrus
+    libsasl2. This requires linking against OpenSSL via the [openssl-sys] crate.
   * The **`libz`** feature enables support for zlib compression. This
     feature is enabled by default. By default, the system's libz is
     dynamically linked, but static linking of the version bundled with the
diff --git a/rdkafka-sys/changelog.md b/rdkafka-sys/changelog.md
index 1dfae5b1a..7033fa221 100644
--- a/rdkafka-sys/changelog.md
+++ b/rdkafka-sys/changelog.md
@@ -4,6 +4,7 @@
 
 * Add the `RDKafkaDeleteGroup` and `RDKafkaGroupResult` type aliases to the
   `types` module.
+* Add `scram-vendored` feature.
 
 ## v4.3.0+1.9.2 (2022-10-29)