diff -Nru rust-rustls-0.21.6/debian/changelog rust-rustls-0.21.6/debian/changelog --- rust-rustls-0.21.6/debian/changelog 2023-08-10 23:42:55.000000000 +0000 +++ rust-rustls-0.21.6/debian/changelog 2023-08-19 17:28:42.000000000 +0000 @@ -1,3 +1,13 @@ +rust-rustls (0.21.6-3) unstable; urgency=medium + + * re-release targeted unstable; + closes: bug#1049977, #1050028, thanks to Peter Green + * update DEP-3 patch headers + * update dh-cargo fork; + closes: bug#1047861, thanks to Lucas Nussbaum + + -- Jonas Smedegaard Sat, 19 Aug 2023 19:28:42 +0200 + rust-rustls (0.21.6-2) unstable; urgency=medium * drop patch 2002, obsoleted by Debian package changes; diff -Nru rust-rustls-0.21.6/debian/dh-cargo/bin/cargo rust-rustls-0.21.6/debian/dh-cargo/bin/cargo --- rust-rustls-0.21.6/debian/dh-cargo/bin/cargo 2023-07-29 22:16:26.000000000 +0000 +++ rust-rustls-0.21.6/debian/dh-cargo/bin/cargo 2023-08-18 15:00:37.000000000 +0000 @@ -222,11 +222,14 @@ newargs.append("--release") elif noopt and subcmd == "install": newargs.append("--debug") - elif (subcmd is None) and (a in ("check", "clean", "run")): + elif (subcmd is None) and (a in ("check", "run")): subcmd = a newargs.extend([a] + verbose) if not noopt: newargs.append("--release") + elif (subcmd is None) and (a == "clean"): + subcmd = a + newargs.extend([a] + verbose) else: newargs.append(a) diff -Nru rust-rustls-0.21.6/debian/dh-cargo/lib/Debian/Debhelper/Buildsystem/cargo.pm rust-rustls-0.21.6/debian/dh-cargo/lib/Debian/Debhelper/Buildsystem/cargo.pm --- rust-rustls-0.21.6/debian/dh-cargo/lib/Debian/Debhelper/Buildsystem/cargo.pm 2023-08-07 22:25:50.000000000 +0000 +++ rust-rustls-0.21.6/debian/dh-cargo/lib/Debian/Debhelper/Buildsystem/cargo.pm 2023-08-18 15:00:37.000000000 +0000 @@ -54,6 +54,7 @@ my %object = ( cratename => join( '-', $key->{name}, $key->{version} ), cratespec => join( '_', $key->{name}, $key->{version} ), + pkgid => join( '@', $key->{name}, $key->{version} ), ); $object{sourcepath} = File::Spec->abs2rel( $key->{manifest_path} =~ s{/Cargo\.toml$}{}r, @@ -291,13 +292,11 @@ foreach my $crate ( map { @{ $_->{crates} } } sort values %{ $this->{libpkg} } ) { my $target = tmpdir( $crate->{libpkg}{name} ) . $crate->{systempath}; install_dir($target); - $this->doit_in_somedir( - $crate->{sourcepath}, - "env", "DEB_CARGO_CRATE=$crate->{cratespec}", - qw(cargo package --offline --allow-dirty --no-verify)); + $this->doit_in_sourcedir( + qw(cargo package --offline --allow-dirty --no-verify --package), $crate->{pkgid} ); $this->doit_in_somedir( "$target/..", - qw(tar --exclude debian/* --exclude debian --exclude Cargo.lock --exclude COPYING* --exclude LICENSE* -xvf), + 'tar', map( { ( '--exclude', $_ ) } qw(debian/* debian Cargo.toml.orig Cargo.lock COPYING* LICENSE*) ), '-xvf', $this->_rel2rel( $crate->{packagepath}, "$target/.." ), $crate->{cratename} ); complex_doit( diff -Nru rust-rustls-0.21.6/debian/dh-cargo/README.md rust-rustls-0.21.6/debian/dh-cargo/README.md --- rust-rustls-0.21.6/debian/dh-cargo/README.md 2023-08-07 22:25:50.000000000 +0000 +++ rust-rustls-0.21.6/debian/dh-cargo/README.md 2023-08-18 15:00:37.000000000 +0000 @@ -15,11 +15,9 @@ * generate cargo-checksum during install * pass cargo --remap-path-prefix option sets in RUSTFLAGS * allow overriding CARGO_HOME - * omit installing crate metadata in binary library packages: - * use "cargo package" to install crate contents - * omit license files - * omit debian/patches - (see bug#880689) + * install crate contents using "cargo package" + * omit license files, Cargo.toml.orig, and debian/patches + (see bug#880689) * use debian/Cargo.lock or Cargo.lock (in that order) during build, if Cargo.lock exists * use crates below debian/vendorlibs when available @@ -64,4 +62,4 @@ ``` - -- Jonas Smedegaard Sat, Sat, 29 Jul 2023 20:14:19 +0200 + -- Jonas Smedegaard Mon, 14 Aug 2023 10:43:00 +0200 diff -Nru rust-rustls-0.21.6/debian/patches/2001_native_certs.patch rust-rustls-0.21.6/debian/patches/2001_native_certs.patch --- rust-rustls-0.21.6/debian/patches/2001_native_certs.patch 2023-08-07 22:25:50.000000000 +0000 +++ rust-rustls-0.21.6/debian/patches/2001_native_certs.patch 2023-08-18 15:00:37.000000000 +0000 @@ -1,6 +1,7 @@ Description: use crate rustls-native-certs (not webpki-roots) Author: Jonas Smedegaard -Last-Update: 2022-06-25 +Forwarded: not-needed +Last-Update: 2023-08-14 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/rustls/Cargo.toml diff -Nru rust-rustls-0.21.6/debian/patches/2003_network_access.patch rust-rustls-0.21.6/debian/patches/2003_network_access.patch --- rust-rustls-0.21.6/debian/patches/2003_network_access.patch 2023-08-07 22:25:50.000000000 +0000 +++ rust-rustls-0.21.6/debian/patches/2003_network_access.patch 2023-08-18 15:00:37.000000000 +0000 @@ -1,6 +1,7 @@ Description: skip flaky network-depending tests by default Author: Jonas Smedegaard -Last-Update: 2022-06-25 +Forwarded: not-needed +Last-Update: 2023-08-14 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/rustls/src/verifybench.rs diff -Nru rust-rustls-0.21.6/debian/patches/2004_no_feature_read_buf.patch rust-rustls-0.21.6/debian/patches/2004_no_feature_read_buf.patch --- rust-rustls-0.21.6/debian/patches/2004_no_feature_read_buf.patch 2023-08-10 23:42:55.000000000 +0000 +++ rust-rustls-0.21.6/debian/patches/2004_no_feature_read_buf.patch 2023-08-18 15:00:37.000000000 +0000 @@ -1,6 +1,7 @@ Description: drop nightly-only feature read_buf Author: Jonas Smedegaard -Last-Update: 2022-08-04 +Forwarded: not-needed +Last-Update: 2023-08-14 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/rustls/Cargo.toml