Update upstream source from tag 'upstream/1.71.1+dfsg1'

Update to upstream version '1.71.1+dfsg1'
with Debian dir 992d343549ce99fe09de0b3c14d0a99cebd2ac62

New upstream version 1.71.1+dfsg1

update unsuspicious list

Gbp-Dch: Ignore

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

debian/update-versions.sh: drop cargo special casing

its version number is now identical to that of rustc

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

Update Files-Excluded for new upstream version 1.71.1

d/prune-unused-deps: handle cargo-as-workspace

with 1.71.x, src/tools/cargo is a workspace (embedded as a git submodule
upstream), and no longer a member of the main workspace.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

Update early-stage patches for 1.71.1+dfsg1

bump version to 1.70.0+dfsg2-1

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

bump version to 1.70.0+dfsg2-1~exp3

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

d/rules: fix last package cache removal

the build can be racy otherwise.

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

bumpv ersion to 1.70.0+dfsg2-1~exp2

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

autopkgtest: disable full build test

I am not sure we want to subject debci to that (yet)

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

d/rules: allow removal of package cache to fail

to allow all+any and separate builds to work.

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

bump version to 1.70.0+dfsg2-1~exp1

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

d/copyright: add missing section for prodash

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

Update upstream source from tag 'upstream/1.70.0+dfsg2'

Update to upstream version '1.70.0+dfsg2'
with Debian dir 3ac19a81e0800b1f187e72e20be4f282a5674dc2

New upstream version 1.70.0+dfsg2

extend lintian overrides

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

update d/copyright

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

update upstream tarball whitelist

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

d/check-orig-suspicious: support extra tar ball

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

d/rules: properly install cargo docs

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

d/rules: remove package cache

to avoid it being shipped in the cargo package

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

fix autopkgtest control file

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

d/check-orig-suspicious.sh: remove duplicate comment stripping

this has been part of audit-vendor-source in the cargo package since 0.47.0 ..

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

guess-crate-copyright: switch to python3-toml

form pytoml, which is no longer available in bookworm or later

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

rules: handle extra vendored dependencies

such as git2 updates

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

add extra component

for updating cargo's git2 dependency

Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>

cargo: actually install, not just  build

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

drop pruned vendored dependencies

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

update d/copyright exclusions

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

remove handling of cargo Cargo.lock

it's part of the main workspace, so has no separate lock file..

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

rustix: simplify patch

won't be needed at all at some point, since later rustix versions have dropped
this altogether.

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

d/control: temporarily downgrade cargo b-d

since we not yet have one available using the "new" version scheme

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

rebase and adapt patches

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

cargo: sync test disabling changes

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

update libgit2

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

d/copyright: remove Windows/macOS credential helpers

d/patches: remove non-Linux submodules

d/copyright: exclude Windows dependencies

d/patches: remove Windows dependencies

d/cargo.bash-completion: fix file path

d/not-installed: ignore backup files

d/cargo.bash-completion, d/not-installed: ...

... fix completion installation path

d/rules: remove src/tools/cargo/Cargo.lock ...

... prior to build to avoid mismatching dependency versions

d/prune-unused-deps: do the re-locking process for cargo ...

... now cargo uses its own workspace as well

d/tests/control: remove architecture restrictions ...

... for the create-and-build-crate test. It's a very small program, it
should not run out of memory.

d/patches/c-2201-always-enable-nightly-features.patch: remove ...

... it's no longer used

d/tests: add a new smoke test for Cargo ...

... the test has been adapted by Zixing to include some new CLI
functions introduced in newer version of Cargo (like `cargo add`)

Co-Authored-By: Nick Rosbrook <nick.rosbrook@canonical.com>

d/tests: remove Cargo self-build test ...

... it is already covered by a more comprehensive Rust full-self-build
test.
This also fixes (or avoids) the test failure caused by this Cargo
self-build test, since this rebuild test no longer works when Cargo is
included as a sub-project inside the Rust source tree.

d/tests: merge cargo tests into the unified source package

d/control: lock rustc and cargo versions ...

... in the dependency directives. Since Cargo will now report the rustc
version, it will no longer make sense to install a Cargo package that
has a version does not match the rustc version.

d/control: add rust-doc as a recommended package to cargo-doc

d/p/d-0012-cargo-always-return-dev-channel.patch: ...

... add a patch to make Cargo return dev channel and enable nightly
features. Because debhelper does use some nightly features

d/p/c-2201-always-enable-nightly-features: ...

... always enable nightly features, regardless of actual release
channel. This is because dh-cargo and cargo helper scripts always use
some nightly features to avoid pulling dev dependencies into the build

d/patches: add DEP-3 headers to new patches

d/rules: remove .package-cache before installation ...

... otherwise debhelper will confuse the cache files with the actual
installed artifacts

d/not-installed: workaround dh_missing reporting ...

... bash-completion not installed

d/control, d/rules: install Cargo bash completion

d/rules, d/cargo.*: build and install Cargo API docs

d/patches: restore the usage of rustc-workspace-hack ...

... this unbreak the joint build of rustc and Cargo where some of the
crates have conflict features enabled. Using rustc-workspace-hack is the
officially recognized way to get around this impasse.

d/rules: use system libssh2 ...

... because now we have Cargo in the tree and by default it will use
bundled libssh2

d/patches: remove non-Linux platform modules

d/config: enable Cargo module in the rustbuild configuration

d/cargo.*: install Cargo-specific files

d/rules: revise openssl source check

d/patches, vendor: remove vendored C sources and prebuilt blobs

d/patches: adapt Cargo-specific patches to the new source tree structure

d/*: initial merge of cargo into rustc source package

bump version to 1.70.0+dfsg1-9

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

temporarily skip git(-cli) tests

git currently FTBFS, so it hasn't t64-transitioned yet, which makes this
build-dep unsatisfiable on armhf/armel and some ports.

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

d/changelog: fold in NMU

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

bump version to 1.70.0+dfsg1-8

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

d/rules: fix make warning in filter invocation

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

d/control: switch to pkgconf

instead of the transitional pkg-config

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

d/control: switch to libllvm16t64

will still require a rebootstrap+binNMU on armel/armhf..

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

bump to 1.70.0+dfsg1-7

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

profiler: disable on mips64el for now

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

bump version to 1.70.0+dfsg1-6

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

disable LLVM profiler support on sparc64

and allow easily extending the list of architectures where it doesn't
work (yet), if needed.

Closes: #1061125
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

stage0: use current release architectures as default

dropping those which are no more, and adding riscv64. porters can still
override this as they see fit for their builds anyway.

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

don't allow upstream's bootstrap.py to delete .cargo/ directory.

When we call bootstrap.bootstrap(args), the check_vendored_status()
upstream function will happily delete .cargo/. This is a problem
because the quilt source package wants .cargo/config.toml to not be
modified without a patch. Without this, after running
'debian/rules source_orig-stage0', further builds will fail with:

dpkg-source: warning: ignoring deletion of directory .cargo
dpkg-source: info: local changes detected, the modified files are:
 rustc-1.70.0+dfsg1/.cargo/config.toml
dpkg-source: info: Hint: make sure the version in debian/changelog matches the unpacked source tree
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/rustc_1.70.0+dfsg1-6.diff.nkvdQ1

Rather than patching the upstream bootstrap.py, we just move .cargo out
of the way temporarily and move it back after the bootstrap() function
finishes.

clean up after running make_orig-stage0_tarball.sh

Without this, the build/ directory will stick around after having run
make_orig-stage0_tarball.sh. When you then run the suggested command
'dpkg-source -b .', you'll get tons of these types of errors:

dpkg-source: error: cannot represent change to build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-89bc084783fdc439.rlib: binary file contents changed

fix bootstrap build (source_orig-stage0 rule) to include all archs

In order to expand the various DEB_HOST_* variables when running
make_orig-stage0_tarball.sh, we were calling out to dpkg-architecture,
specifying for example -a<arch> -qDEB_HOST_ARCH. However, the
dpkg-architecture man page states:

      You can specify the host architecture by providing one or both of the options
       --host-arch and --host-type, otherwise the DEB_HOST_ARCH variable is used if set
       (and --force not being specified).

[--host-arch is equivalent to -a]

DEB_HOST_ARCH is set somewhere else during the build, and is overriding
what dpkg-architecture returns. That's why, if run on an amd64 machine,
the bootstrap stage0.orig.tar.xz would only include the amd64 rustc
binary. We must pass --force (aka -f) to dpkg-architecture to get it to
return the proper results we're expecting.

This fixes https://bugs.debian.org/1021711

rustix: also patch second vendored copy

else this exposes a racy bug potentially breaking the arch:all build.

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

fix bootstrap helpers

this got out of sync with upstream's bootstrap.py since it's not exercised often within Debian.

Closes: #1060808
Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

bump version to 1.70.0+dfsg1-5

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

adapt LLVM_PROFILER_RT_LIB path

to work in the absense of clang-16 being pulled in, as is the case for split
any/all builds like on buildds.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

bump version to 1.70.0+dfsg1-4

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

d/control: move libclang-rt dep to arch B-D

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

bump version to 1.70.0+dfsg1-3

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

Merge branch 'profiler' into 'debian/sid'

enable profiler builtin (#1043311)

See merge request rust-team/rust!28

enable profiler builtin (#1043311)

This is needed by chromium's new rust dependency.

Signed-off-by: Andres Salomon <dilinger@debian.org>

bump version to 1.70.0+dfsg1-2

Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>

bump version to 1.70.0+dsfg1-2~exp1

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

riscv: disable split debuginfo support

cargo started picking this up, but split debuginfo is broken for the
time being:

https://github.com/rust-lang/rust/issues/110224
https://github.com/llvm/llvm-project/issues/56642

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

bump version to 1.70.0+dfsg1-1

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

bump version to 1.70.0+dfsg1-1~exp3

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

download tests: properly disable

it's actually the call to parse() that triggers the download, not the internal
test() helper..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

fix typo in test patch

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>