Your message dated Thu, 15 Jun 2023 11:31:00 +0000
with message-id <e1q9lbs-00dcda...@fasolo.debian.org>
and subject line Bug#1037977: fixed in rust-ureq 2.7.0-1
has caused the Debian Bug report #1037977,
regarding rust-ureq - update for base64 0.21
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
1037977: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1037977
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: rust-ureq
Version: 2.6.2-3
Severity: serious
Tags: trixie, sid, patch, ftbfs

rust-base64 was recently updated to 0.21 making rust-ureq unbuildable and 
uninstallable.

Upstream already has a fix, I grabbed it and added it to the Debian package and 
it
built and passed autopkgtests fine.

Debdiff attached, I may or may not NMU this later.
diff -Nru rust-ureq-2.6.2/debian/changelog rust-ureq-2.6.2/debian/changelog
--- rust-ureq-2.6.2/debian/changelog    2023-02-12 16:16:54.000000000 +0000
+++ rust-ureq-2.6.2/debian/changelog    2023-06-15 02:17:59.000000000 +0000
@@ -1,3 +1,10 @@
+rust-ureq (2.6.2-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply upstream patch for base64 0.21.
+
+ -- Peter Michael Green <plugw...@debian.org>  Thu, 15 Jun 2023 02:17:59 +0000
+
 rust-ureq (2.6.2-3) unstable; urgency=medium
 
   * avoid initial dash in autopkgtest test name;
diff -Nru rust-ureq-2.6.2/debian/control rust-ureq-2.6.2/debian/control
--- rust-ureq-2.6.2/debian/control      2023-01-26 16:13:56.000000000 +0000
+++ rust-ureq-2.6.2/debian/control      2023-06-15 02:17:57.000000000 +0000
@@ -4,7 +4,7 @@
 Build-Depends:
  debhelper-compat (= 13),
  dh-cargo (>= 25),
- librust-base64-0.13+default-dev <!nocheck>,
+ librust-base64-0.21+default-dev <!nocheck>,
  librust-brotli-decompressor-2+default-dev <!nocheck>,
  librust-chunked-transfer-1+default-dev <!nocheck>,
  librust-cookie-0.16-dev <!nocheck>,
@@ -37,7 +37,7 @@
 Architecture: all
 Multi-Arch: foreign
 Depends:
- librust-base64-0.13+default-dev,
+ librust-base64-0.21+default-dev,
  librust-brotli-decompressor-2+default-dev,
  librust-chunked-transfer-1+default-dev,
  librust-cookie-0.16-dev,
diff -Nru rust-ureq-2.6.2/debian/patches/0001_base64.patch 
rust-ureq-2.6.2/debian/patches/0001_base64.patch
--- rust-ureq-2.6.2/debian/patches/0001_base64.patch    1970-01-01 
00:00:00.000000000 +0000
+++ rust-ureq-2.6.2/debian/patches/0001_base64.patch    2023-06-15 
02:16:54.000000000 +0000
@@ -0,0 +1,59 @@
+commit abda74c4d8d1235c6eddccafd3c4bd690dc10ea7
+Author: Martin Algesten <mar...@algesten.se>
+Date:   Mon Jan 30 23:39:55 2023 +0100
+
+    Upgrade deps
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 00dc9f0ea..418ae582b 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -26,7 +26,7 @@ gzip = ["flate2"]
+ brotli = ["brotli-decompressor"]
+ 
+ [dependencies]
+-base64 = "0.13"
++base64 = "0.21"
+ cookie = { version = "0.16", default-features = false, optional = true}
+ once_cell = "1"
+ url = "2"
+diff --git a/src/proxy.rs b/src/proxy.rs
+index ff9413917..0148904a1 100644
+--- a/src/proxy.rs
++++ b/src/proxy.rs
+@@ -1,3 +1,5 @@
++use base64::{prelude::BASE64_STANDARD, Engine};
++
+ use crate::error::{Error, ErrorKind};
+ 
+ /// Proxy protocol
+@@ -131,7 +133,7 @@ impl Proxy {
+ 
+     pub(crate) fn connect<S: AsRef<str>>(&self, host: S, port: u16) -> String 
{
+         let authorization = if self.use_authorization() {
+-            let creds = base64::encode(format!(
++            let creds = BASE64_STANDARD.encode(format!(
+                 "{}:{}",
+                 self.user.clone().unwrap_or_default(),
+                 self.password.clone().unwrap_or_default()
+diff --git a/src/unit.rs b/src/unit.rs
+index 895067ff0..2011bb673 100644
+--- a/src/unit.rs
++++ b/src/unit.rs
+@@ -3,6 +3,7 @@ use std::io::{self, Write};
+ use std::ops::Range;
+ use std::time;
+ 
++use base64::{prelude::BASE64_STANDARD, Engine};
+ use log::debug;
+ use url::Url;
+ 
+@@ -87,7 +88,7 @@ impl Unit {
+             if (!username.is_empty() || !password.is_empty())
+                 && get_header(&headers, "authorization").is_none()
+             {
+-                let encoded = base64::encode(format!("{}:{}", username, 
password));
++                let encoded = BASE64_STANDARD.encode(format!("{}:{}", 
username, password));
+                 extra.push(Header::new("Authorization", &format!("Basic {}", 
encoded)));
+             }
+ 
diff -Nru rust-ureq-2.6.2/debian/patches/series 
rust-ureq-2.6.2/debian/patches/series
--- rust-ureq-2.6.2/debian/patches/series       2023-01-26 16:08:45.000000000 
+0000
+++ rust-ureq-2.6.2/debian/patches/series       2023-06-15 02:17:14.000000000 
+0000
@@ -1,3 +1,4 @@
+0001_base64.patch
 2001_native_certs.patch
 2002_env_logger.patch
 2003_cookie-store.patch

--- End Message ---
--- Begin Message ---
Source: rust-ureq
Source-Version: 2.7.0-1
Done: Jonas Smedegaard <d...@jones.dk>

We believe that the bug you reported is fixed in the latest version of
rust-ureq, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1037...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Jonas Smedegaard <d...@jones.dk> (supplier of updated rust-ureq package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Thu, 15 Jun 2023 08:56:39 +0200
Source: rust-ureq
Architecture: source
Version: 2.7.0-1
Distribution: unstable
Urgency: medium
Maintainer: Jonas Smedegaard <d...@jones.dk>
Changed-By: Jonas Smedegaard <d...@jones.dk>
Closes: 1037977
Changes:
 rust-ureq (2.7.0-1) unstable; urgency=medium
 .
   [ upstream ]
   * new release
     + upgrade crate base64 to v0.21;
       closes: bug#1037977, thanks to Peter Green
 .
   [ Jonas Smedegaard ]
   * unfuzz patches
   * add patch 2004 to use crate webpki instead of rustls-webpki
   * (build-)depend on package for crate http
   * add patch 2005 to relax dependency on crate rustls
   * tighten (build-)dependency on package for crate serde_json
   * bump version for provided virtual packages and autopkgtest hints
   * bump (build-)dependency for crate base64
Checksums-Sha1:
 78c58d21fdda1efe75316b52830760577d96e0a4 3486 rust-ureq_2.7.0-1.dsc
 acbe3c9c92aeb8f36de79c2b9fe2e7b84e434024 104609 rust-ureq_2.7.0.orig.tar.gz
 ee5e6a96c7523b08d4457c81a536873ced4180f1 14524 rust-ureq_2.7.0-1.debian.tar.xz
 3386e09606f8f888ff9a8b6983fda719327f24bc 16483 
rust-ureq_2.7.0-1_amd64.buildinfo
Checksums-Sha256:
 b3345eda54cbc171ef2b0154b4ab0db13a1564a738889d9e1dea71c79d538585 3486 
rust-ureq_2.7.0-1.dsc
 d5963f2c700d685000f8e5855f01b67613634d1d727db3f5cd10c93cd18a753a 104609 
rust-ureq_2.7.0.orig.tar.gz
 2d259f699cbcc264c6db005c94a18c8d63dcb581bafb26510ffd4b0705746042 14524 
rust-ureq_2.7.0-1.debian.tar.xz
 a64dd4c23540cbc54904dc40ee98575c96f0ba7281e25eb378c951236e0330c1 16483 
rust-ureq_2.7.0-1_amd64.buildinfo
Files:
 3c00cbe0e4505d8c71f59271c36dd6b5 3486 rust optional rust-ureq_2.7.0-1.dsc
 c134f43b520d42777b2adc4043b0d6dc 104609 rust optional 
rust-ureq_2.7.0.orig.tar.gz
 1daeb558c69434170a43ac97fa11f8ae 14524 rust optional 
rust-ureq_2.7.0-1.debian.tar.xz
 bf66a9ef087760a8ec7cc9796c97b8c6 16483 rust optional 
rust-ureq_2.7.0-1_amd64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAmSK5C8ACgkQLHwxRsGg
ASHQhQ//RlYwJ4R+UDcqw8afj2q+OKdzcsAtfPJiv061Q2j8wVXpbTlCSKCoj6pB
Z7cuEhjWvHiCQe7L7cm/iRHDe/RbWx9T6ipVvuYFS2+0tqmoTO6RGoDkFELKZJSc
w077rkSyhmm48znZ7RIklglGRlVjbVV7Qp8tRn9rFYuaL4FzltzwJPoEcqpHo6WQ
qKWtCVlkgzsGiyGt6o97FpeDICJOayCDrvTsd3WdcL9BaKhSW96ljeA4SlbeBuz/
1Y0IY61m/ZEUI8OJfauXlNucP97qY0Xu+esHg+pd5kJIUUMUrOM7uaPQphzugLaY
+qVOUCnezHvgIsmHvs95bP1YmpuXWdGgJ6UTHgruvzIT4HIpG6YjGYmUyuxtyE3Z
Chp6VIGShif/j46Jqk4j6gYhvPfUYLkYgMrFSrBE1C5m3GidogXfZwQ7jUXvMkCI
VPj2+fvvR2EFf7flNIkNrvf9w86JyCeU4e3wcUOXhuKuTAalNY4cfv/3Fk9/jF56
m+R1Xi1PpLoUZiI5/b7eq1iRyDuOak7h/8pVFMnulTCzpcL2gqTfte7/F/aqEf4u
WjfJJ5vPzuExAQ6QRjyn7YbonjTOOCw9ylVSINKafLvEQVLpoqNHmxNdHMKCPaZ6
ux3KIDLzk0BhTMcYqF8exap1hJytPC6V0r0GVJEdyK0iW5axGDs=
=fJ5w
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to