Merge branch 'nix-2' into 'main'

nix: Make a compat function for last errno as Errno

See merge request iwj/hippotat!38

Merge branch 'build-rs-multi' into 'main'

build.rs: Prepare to handle multiple packages

See merge request iwj/hippotat!37

nix: Make a compat function for last errno as Errno

This fixes a warning.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build.rs: Prepare to handle multiple packages

We'll want this for hyper.  (Which is nontrivial.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'nix' into 'main'

Relax dependencies and handle compat for nix 0.28

See merge request iwj/hippotat!35

Merge branch 'nix-0' into 'main'

Allow use of nix 0.28 (but don't update the lockfile yet)

See merge request iwj/hippotat!36

Update to nix 0.28

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Allow use of nix 0.28

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

nix: Provide a compat version of pipe for 0.28

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

nix: Provide a compat version of write for 0.28

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build.rs: Set --cfg=nix_ge_0_28

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'nix-1' into 'main'

build.rs and compat: use ge not equality

See merge request iwj/hippotat!34

Merge branch 'metadata' into 'main'

Use cargo metadata rather than trait hackery to cope with nix

See merge request iwj/hippotat!33

build.rs: Set --cfg=nix_ge_0_27, not nix_0_27

Don't use exact semver matching.  Use the test for all later versions,
in the hope that the later version will be similar.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

nix: Use cfg rather than trait hackery

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

nix: Introduce a build.rs script

This uses "cargo metadata" to find the nix version.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/update-build-deps: Handle build-dependencies too

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'update' into 'main'

Dependencies: cargo update

See merge request iwj/hippotat!32

Merge branch 'clean2' into 'main'

Makefile: Improve upstream clean target

See merge request iwj/hippotat!31

Dependencies: cargo update

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Makefile: clean target Remove tmp/

This is generated by tests, which the package build skips.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Makefile: clean target Move various rm's from debian/rules

These are applicable to upstream too.

And run very-clean rather than open-coding rm target.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'clean' into 'main'

Fix package clean target

See merge request iwj/hippotat!30

Fix package clean target

The package's clean target was not functional.  Add manual
cleanup.

Closes: #1064524
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'release' into 'main'

Update version to 1.1.10

See merge request iwj/hippotat!28

Update version to 1.1.10

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Document changes since 1.1.9

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Makefile: Add a clean to the release checklist

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'minimal' into 'main'

Reduce many versions in minimal lockfile

See merge request iwj/hippotat!29

Reduce many versions in minimal lockfile

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'nix' into 'main'

Allow building with nix 0.27

See merge request iwj/hippotat!26

Merge branch 'rename' into 'main'

Rename a maintenance script

See merge request iwj/hippotat!27

nix: Update to 0.27 in Cargo.lock

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

nix: Allow update to 0.27 in Cargo.toml

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

nix: Gross hack to enable compat with 0.26 *and* 0.27

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

nix: Explicitly enable the features we need

Prep for 0.27.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Declare MSRV of 1.63

That's what's in Debian bookworm.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Rename a maintenance script

This is better in maint/ (which exists now).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'upgrades' into 'main'

Relax/update dependencies

See merge request iwj/hippotat!25

Fix/relax itertools dependency in macros

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'misc' into 'main'

Misc prep work

See merge request iwj/hippotat!22

Relax env-logger dependency

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Relax lazy-regex dependency

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Relax itertools dependency

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Relax educe dependency

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Cargo update

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Suppress a warning.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'minimal' into 'main'

Fix minimal-versions tests (2)

See merge request iwj/hippotat!23

Merge branch 'minimal-1' into 'main'

Fix minimal-versions tests (1)

See merge request iwj/hippotat!24

Minimal versions test: Make into two tests

This also tests our MSRV, via the "bookworm" image.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Minimal versions test: Break out update-minimal-versions

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Minimal versions test: force hyper downgrade

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Dependencies: Demand lazy-regex 2.4

lazy-regexp-proc_macros 2.2 seems to have some kind of panic bug.
bookworm has librust-lazy-regex-dev 2.4.1-2 so that'll be fine I
think.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'release' into 'main'

Prepare 1.1.9

See merge request iwj/hippotat!21

changelog: Document 1.1.9 including its changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Bump crate versions to 1.1.9

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'update' into 'main'

cargo update

See merge request iwj/hippotat!20

Merge branch 'base64' into 'main'

base64: Tolerate lack of padding when decoding

See merge request iwj/hippotat!19

cargo update

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

base64: Tolerate lack of padding when decoding

This restores the behaviour of hippotat 1.1.7.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'reldoc' into 'main'

Makefile: update release checklist for experience with 1.1.8

See merge request iwj/hippotat!18

Makefile: update release checklist for experience with 1.1.8

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'changelog' into 'main'

changelog: Finalise 1.1.8

See merge request iwj/hippotat!17

changelog: Finalise 1.1.8

Actually

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'changelog' into 'main'

Bump versions for 1.1.8 release

See merge request iwj/hippotat!16

Changelog: Document changes and finalise 1.1.8

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Cargo.toml: Bump versions to 1.1.8

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Makefile: release checklist: document MR workflow

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'clap4' into 'main'

Update to clap 4

See merge request iwj/hippotat!15

Cargo.toml: Remove a now-obsolete comment

The versions are now tested and reasonably accurate.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

clap: Update to clap 4

Now that everything is working nicely, we can upgrade.

 * Change Cargo.toml to specify 4, not 3.  Enable the `wrap_help`
   feature as per the migration guide.  (Apart from that, we could
   specify ">=3, <5".)

 * Update debian/update-build-deps to remove the special case
   to avoid picking up clap 4, and run it to update the build-dep.

 * Consequential changes to Cargo.lock.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

clap: Rename hippotat crate's Opts type to CommonOpts

clap 4 seems to index these by bare type name (!)
and panics if they aren't unique (!!)

    running 1 test
    test verify_cli ... FAILED

    failures:

    ---- verify_cli stdout ----
    thread 'verify_cli' panicked at 'Command hippotat: Argument group name must be unique

    'Opts' is already in use', /home/rustcargo/.cargo/registry/src/index.crates.io-6f17d22bba15001f/clap_builder-4.3.4/src/builder/debug_asserts.rs:278:9
    stack backtrace:
       0: rust_begin_unwind
 at /rustc/071f14baae931e17a5a99366bf216e76384cc4f6/library/std/src/panicking.rs:578:5
       1: core::panicking::panic_fmt
 at /rustc/071f14baae931e17a5a99366bf216e76384cc4f6/library/core/src/panicking.rs:67:14
       2: clap_builder::builder::debug_asserts::assert_app
 at /home/rustcargo/.cargo/registry/src/index.crates.io-6f17d22bba15001f/clap_builder-4.3.4/src/builder/debug_asserts.rs:278:9
       3: clap_builder::builder::command::Command::_build_self
 at /home/rustcargo/.cargo/registry/src/index.crates.io-6f17d22bba15001f/clap_builder-4.3.4/src/builder/command.rs:3945:13
       4: clap_builder::builder::command::Command::_build_recursive
 at /home/rustcargo/.cargo/registry/src/index.crates.io-6f17d22bba15001f/clap_builder-4.3.4/src/builder/command.rs:3843:9
       5: clap_builder::builder::command::Command::build
 at /home/rustcargo/.cargo/registry/src/index.crates.io-6f17d22bba15001f/clap_builder-4.3.4/src/builder/command.rs:3838:9
       6: clap_builder::builder::command::Command::debug_assert
 at /home/rustcargo/.cargo/registry/src/index.crates.io-6f17d22bba15001f/clap_builder-4.3.4/src/builder/command.rs:489:9
       7: hippotat::utils::verify_cli
 at ./src/utils.rs:236:3
       8: hippotat::verify_cli
 at ./client/client.rs:383:3
       9: hippotat::verify_cli::{{closure}}
 at ./client/client.rs:382:17
      10: core::ops::function::FnOnce::call_once
 at /rustc/071f14baae931e17a5a99366bf216e76384cc4f6/library/core/src/ops/function.rs:250:5
      11: core::ops::function::FnOnce::call_once
 at /rustc/071f14baae931e17a5a99366bf216e76384cc4f6/library/core/src/ops/function.rs:250:5
    note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

    failures:
verify_cli

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

clap: Use ArgAction::Append

Gets rid of this 3 to 4 deprecation warning.

The warning's suggestion to use "multiple_occurrences" seems wrong
since that is also deprecated ?!  It links to Arg::action, and
emprically this construction DTRT.

    warning: use of deprecated method `clap::Arg::<'help>::multiple`: Split into `Arg::multiple_occurrences` (most likely what you want)  and `Arg::multiple_values`
      --> src/config.rs:89:16
       |
    89 |   #[clap(long, multiple=true, number_of_values=1)]
       |                ^^^^^^^^
       |
       = note: `#[warn(deprecated)]` on by default

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

clap: Use Command, not App

    warning: use of deprecated struct `clap::App`: Replaced with `Command`
       --> src/utils.rs:235:18
|
    235 |   let app: clap::App = F::command();
|                  ^^^
|
= note: `#[warn(deprecated)]` on by default

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

clap: use value_parser

Removes a deprecation warning (this is recommended by the clap 3 to 4
migration guide).

    warning: use of deprecated function `<reporter::LogOpts as clap::Args>::augment_args::parse_try_from_str`: Replaced with `#[clap(value_parser = ...)]`
      --> src/reporter.rs:22:35
       |
    22 |   #[clap(long, parse(try_from_str=parse_syslog_facility))]
       |                                   ^^^^^^^^^^^^^^^^^^^^^
       |
       = note: `#[warn(deprecated)]` on by default

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

clap: Use ArgAction::Count for debug level

Removes a deprecation warning (this is recommended by the clap 3 to 4
migration guide).

    Checking hippotat v1.1.7 (/volatile/rustcargo/Rustup/Hippotat/hippotat)
warning: use of deprecated function `<reporter::LogOpts as clap::Args>::augment_args::parse_from_occurrences`: Replaced with `#[clap(action = ArgAction::Count)]` with a field type of `u8`
  --> src/reporter.rs:18:33
   |
18 |   #[clap(long, short='D', parse(from_occurrences))]
   |                                 ^^^^^^^^^^^^^^^^
   |
   = note: `#[warn(deprecated)]` on by default

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

clap: Factor verify_cli out into utils

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

clap: Add verify_cli tests

As recommended by clap 3 to 4 migration guide.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'rename' into 'main'

CI: rename "test-*" jobs to "package-*"

See merge request iwj/hippotat!14

Merge branch 'depver' into 'main'

Use versioned dependencies for build deps

See merge request iwj/hippotat!13

CI: rename "test-*" jobs to "package-*"

These all use dpkg-buildpackage.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/update-build-deps: Add versions (actual update)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/update-build-deps: Add versions

This ensures that we will migrate only after our actual build-deps do.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/update-build-deps: Scan macros/ too

As it happens, these dependencies were never actually violated since
other of our deps pulled them in.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

CI: maint-checks: Use default Debian image, not Rust one

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/update-build-deps: Use a real TOML parser

That old code was quite horrible.

No change to the output.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'audit' into 'main'

Run cargo-audit

See merge request iwj/hippotat!12

CI: run cargo audit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Copy test/via-cargo-install-in-ci from derive-adhoc.git

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'toml' into 'main'

Cargo.toml: Remove an obsolete comment

See merge request iwj/hippotat!10

Merge branch 'todo' into 'main'

CI: Check for blocking todos (three X comments)

See merge request iwj/hippotat!7

Cargo.toml: Remove an obsolete comment

This was written when we were trying to figure out how to get this
thing into Debian and what dependencies were actually needed.

And, it seems to have become detached from whatever it referred to.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'minimal' into 'main'

Bump dependency minimal versions, and test them

See merge request iwj/hippotat!9

Merge branch 'update' into 'main'

cargo update

See merge request iwj/hippotat!8

Add a minimal-versions test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

CI: maint-checks: Do in "check" stage

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

CI: Check for blocking todos (three X comments)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

bump deps: tokio

We need improvements including write_all_buf on ChildStdin, and
improvements to select!.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

bump deps: hyper

We need http1_preserve_header_case.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

bump deps: itertools

We need chain!

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>