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>

bump deps: mime

We need FromStrError to be std::error::Error.

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

bump deps: backtrace

We need the unresolved backtraces feature.

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

bump deps: either

We need it to implement several traits including Debug and AsRef.

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

bump deps: log

We need some improvements to Level.

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

bump deps: ipnet

We need IpNet to be Default.

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

bump deps: thiserror

We need `#[from]`

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

bump deps: lazy-regex

We use regex_replace_all

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

bump deps: educe

0.4.0 has a bug where it fails to ask for a new enough syn.

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

cargo update

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

Merge branch 'ci' into 'main'

CI: Target trixie

See merge request iwj/hippotat!4

CI: Expand explanation of allow_failure

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

CI: Target trixie

With the update to base64 this doesn't work on bookworm any more.

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

Merge branch 'deps' into 'main'

build-deps: Actually get rid of versioned dep on base64

See merge request iwj/hippotat!6

build-deps: Actually get rid of versioned dep on base64

update-build-deps mishandled packages with versions in the names.

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

Merge branch 'ci' into 'main'

CI: check that build-deps in d/control are as autogenerated

See merge request iwj/hippotat!3

Merge branch 'base64' into 'main'

Bump base64 dependency to 0.21 and fix code to build with it

See merge request iwj/hippotat!2

CI: Check that build-deps in d/control are as autogenerated

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

CI: Remove unused `early` stage

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

debian/update-build-deps: Add --check mode

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

debian/control: Go back to un-versioned dep on base64

I would rather deal with API breakage as compiler errors, than
dependency errors.

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

Cargo.toml: drop a now-obsolete comment about versions

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

Do not import the name Engine from base64.

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

Correct lockfile following base64 version bump

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

Bump base64 dependency to 0.21 and fix code to build with it

Make debian dependency on base64 match the versioning in Cargo.toml.

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

Merge branch 'ci' into 'main'

Add CI tests

See merge request iwj/hippotat!1

Add a gitlab CI file

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

test/capture-log: Make it possible to disable capturing

When running in CI, we want everything to come out in one scrool.

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

Update version to 1.1.7 and document chnages

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

init script: Demote userv and $syslog to Should-Start

These aren't necessarily required (depending on config), and we need
to not break things if it isn't.

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

cargo update

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

debian: Run dh_missing --fail-missing

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

debian: ship the hippotat-setup-permissions(8) manpage

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

Install the hippotat-setup-permissions(8) manpage to the right place

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

Change source format to 1.0 (native) so we can have a revision

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

debian: Declare that we need clap 3, with +derive

Recently, Debian unstable changed so that "clap" is clap 4.

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

debian/update-build-deps: Replacement (override)

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

cargo: Set version to 1.1.6

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

changelog: 1.1.6: Document changes and elide 1.1.5+exp versions

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

Cargo.toml: write down that there's no base64 0.14

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

cargo update

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

Makefile: Improve release checklist

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

autopkgtests: Add an ad-hoc restriction to disable in CI

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

Install docs: Mention new script

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

Install docs: Say to do the hippotat config first

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

init script: Add default GROUP setting (for doc purposes only)

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

New configuration setup script: install

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

New configuration setup script: use in test

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

New configuration setup script

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

Config inspection: Print nothing on no associations

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

Config inspection: tidying

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

Config inspection: support "server" key on server

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

Pass server name to startup code

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

Config inspection: Document the instance keys

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

Config inspection: tab-separate the output

This would let you distinguish the different keys from values within
the key.

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

Config inspection: Allow printing multiple instances

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

Config inspection: Break out split()

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

Config inspection: Make PrintConfigOpt type

This will let us hang more things on it

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

Config inspection: Move extra keys into trait

This involves splitting the trait.  I've chosen the structure to
minimise work done by the macro.

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

Implement Debug manually for LinkName

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

Config inspection: docs (wip)

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

Config inspection: "pretty" dump option, replaces --dump

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

Config inspection: Move process::exit call

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

Config inspection: Centralise loop

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

Config inspection: Centralise inspectable lookup

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

Config inspection: --dump-config experimental option

This is going to go away, actually, since I don't like it.

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

Config inspection: Allow inspection of multiple keys

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

Config inspection: Support link names on client

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

Config inspection: Reorganise implement_print_config

We want this to be able to
 - handle out-of-course keys
 - do word splitting in the implementaton

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

Config inspection: make InspectableConfig impl dyn despatch

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

Config inspection: Support --print-config in hippotat

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

Config inspection: impl InspectableConfig for InstanceConfig

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