Source: rust-rustls Version: 0.21.12-6 Severity: normal Tags: patch X-Debbugs-Cc: [email protected]
Hi, env_logger v0.11 has been in experimental for a while now, and we intend to upload it to unstable over the following weeks. The version of src:rust-rustls currently in unstable (v0.21.12-6) builds and its autopkgtests pass just fine with v0.11. Bumping the version is straightforward, but I'm attaching a patch nonetheless. Cheers!
>From 6dc5f11dadff33963c216a5f117989f13739a72a Mon Sep 17 00:00:00 2001 From: NoisyCoil <[email protected]> Date: Wed, 18 Dec 2024 00:53:23 +0100 Subject: [PATCH] Bump env_logger to v0.11 --- debian/control | 2 +- debian/patches/2002_env_logger.patch | 28 ++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/tests/control | 16 ++++++++-------- 4 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 debian/patches/2002_env_logger.patch diff --git a/debian/control b/debian/control index 800d09a2..25b5618c 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: librust-base64-0.22+default-dev, librust-bencher-0.1+default-dev, librust-docopt-1+default-dev, - librust-env-logger-0.10+default-dev, + librust-env-logger-0.11+default-dev, librust-log-0.4+default-dev, librust-mio-dev (<< 2), librust-regex-1+default-dev, diff --git a/debian/patches/2002_env_logger.patch b/debian/patches/2002_env_logger.patch new file mode 100644 index 00000000..372b0e7e --- /dev/null +++ b/debian/patches/2002_env_logger.patch @@ -0,0 +1,28 @@ +Description: accept newer branch of crate env_logger +Author: NoisyCoil <[email protected]> +Forwarded: not-needed +Last-Update: 2024-12-18 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/rustls/Cargo.toml ++++ b/rustls/Cargo.toml +@@ -32,7 +32,7 @@ + + [dev-dependencies] + bencher = "0.1.5" +-env_logger = "0.10" ++env_logger = ">= 0.10, <= 0.11" + log = "0.4.4" + rustls-native-certs = "0.6" + rustls-pemfile = "1.0.3" +--- a/examples/Cargo.toml ++++ b/examples/Cargo.toml +@@ -12,7 +12,7 @@ + + [dependencies] + docopt = "~1.1" +-env_logger = "0.10" ++env_logger = ">= 0.10, <= 0.11" + log = { version = "0.4.4" } + mio = { version = ">= 0.8, <= 1", features = ["net", "os-poll"] } + rustls = { path = "../rustls", features = [ "logging" ]} diff --git a/debian/patches/series b/debian/patches/series index c60a9f2d..c64d7829 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,6 @@ 1002_mio.patch 1002_ring.patch 2001_native_certs.patch +2002_env_logger.patch 2003_network_access.patch 2004_no_feature_read_buf.patch diff --git a/debian/tests/control b/debian/tests/control index 6739767c..95a4fbd6 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -8,7 +8,7 @@ Depends: librust-base64-0.22+default-dev, librust-bencher-0.1+default-dev, librust-docopt-1+default-dev, - librust-env-logger-0.10+default-dev, + librust-env-logger-0.11+default-dev, librust-mio-dev (<< 2), librust-regex-1+default-dev, librust-rustls-0.21+default-dev, @@ -26,7 +26,7 @@ Depends: librust-base64-0.22+default-dev, librust-bencher-0.1+default-dev, librust-docopt-1+default-dev, - librust-env-logger-0.10+default-dev, + librust-env-logger-0.11+default-dev, librust-log-0.4+default-dev, librust-mio-dev (<< 2), librust-regex-1+default-dev, @@ -46,7 +46,7 @@ Depends: librust-base64-0.22+default-dev, librust-bencher-0.1+default-dev, librust-docopt-1+default-dev, - librust-env-logger-0.10+default-dev, + librust-env-logger-0.11+default-dev, librust-mio-dev (<< 2), librust-regex-1+default-dev, librust-rustls-0.21-dev, @@ -64,7 +64,7 @@ Depends: librust-base64-0.22+default-dev, librust-bencher-0.1+default-dev, librust-docopt-1+default-dev, - librust-env-logger-0.10+default-dev, + librust-env-logger-0.11+default-dev, librust-mio-dev (<< 2), librust-regex-1+default-dev, librust-rustls-0.21+dangerous-configuration-dev, @@ -83,7 +83,7 @@ Depends: librust-base64-0.22+default-dev, librust-bencher-0.1+default-dev, librust-docopt-1+default-dev, - librust-env-logger-0.10+default-dev, + librust-env-logger-0.11+default-dev, librust-log-0.4+default-dev, librust-mio-dev (<< 2), librust-regex-1+default-dev, @@ -103,7 +103,7 @@ Depends: librust-base64-0.22+default-dev, librust-bencher-0.1+default-dev, librust-docopt-1+default-dev, - librust-env-logger-0.10+default-dev, + librust-env-logger-0.11+default-dev, librust-mio-dev (<< 2), librust-regex-1+default-dev, librust-rustls-0.21+quic-dev, @@ -122,7 +122,7 @@ Depends: librust-base64-0.22+default-dev, librust-bencher-0.1+default-dev, librust-docopt-1+default-dev, - librust-env-logger-0.10+default-dev, + librust-env-logger-0.11+default-dev, librust-mio-dev (<< 2), librust-regex-1+default-dev, librust-rustls-0.21+secret-extraction-dev, @@ -141,7 +141,7 @@ Depends: librust-base64-0.22+default-dev, librust-bencher-0.1+default-dev, librust-docopt-1+default-dev, - librust-env-logger-0.10+default-dev, + librust-env-logger-0.11+default-dev, librust-mio-dev (<< 2), librust-regex-1+default-dev, librust-rustls-0.21+tls12-dev, -- 2.45.2
