Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Package dnst as DEB & RPM packages, and Docker images. #22

Draft
wants to merge 70 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
20c5df3
Use domain WIP NSEC3 support.
ximon18 Oct 15, 2024
d0addc7
Update to latest version of domain branch. Note: now breaks if alg ar…
ximon18 Oct 29, 2024
445d989
Remove commented out line left behind accidentally in Cargo.toml.
ximon18 Oct 29, 2024
49131ef
Update to latest version of domain branch.
ximon18 Oct 29, 2024
7e4dae9
Work around missing max length enforcement in Nsec3Salt::from_str().
ximon18 Oct 29, 2024
4610832
Proof-of-concept automated sanity check against ldns-nsec3-hash using…
ximon18 Oct 29, 2024
5980ca7
More closely match ldns-nsec3-hash error output.
ximon18 Oct 29, 2024
7fb5b7a
Match ldns-nsec3-hash exit code behaviour.
ximon18 Oct 29, 2024
76f31bf
Cargo fmt.
ximon18 Oct 29, 2024
1b70e5b
Minor cleanup.
ximon18 Oct 30, 2024
6a38c36
Use host based ldns tools for testing and only if ignored tests are run.
ximon18 Oct 30, 2024
f5e644a
Revert exit code change as this has been moved into PR #13.
ximon18 Oct 30, 2024
0f9aa5b
Update to use nsec3_hash() at its new module location in doman.
ximon18 Oct 30, 2024
0ac8540
Merge branch 'main' into use-domain-nsec3-support
ximon18 Oct 31, 2024
6a57f4b
Better help message for default value of -a.
ximon18 Nov 5, 2024
7a6a983
Change short arg for iterations to match ldns-signzone.
ximon18 Nov 5, 2024
837a2ff
Cargo fmt.
ximon18 Nov 6, 2024
67bb9e7
Closer alignment to ldns-nsec3-hash.
ximon18 Nov 6, 2024
fcbfb2e
Cleanup dependencies.
ximon18 Nov 6, 2024
caf8adf
Cleanup dependencies (Cargo.lock too).
ximon18 Nov 6, 2024
00f30e9
Add initial fuzz testing of the nsec3-hash subcommand.
ximon18 Nov 6, 2024
592410b
Replace expect() with map_err()?.
ximon18 Nov 6, 2024
e125524
Add a fuzz testing readme.
ximon18 Nov 6, 2024
c35f9cf
Fix fuzz command.
ximon18 Nov 6, 2024
a3bdf63
Added some unit tests. Made the output written to configurable so tha…
ximon18 Nov 6, 2024
e629388
Extend the integration test to compare exit codes, and also to give a…
ximon18 Nov 6, 2024
39fb4cf
Clippy.
ximon18 Nov 6, 2024
4e73709
Inlcude the dnst binary name in the error mesage.
ximon18 Nov 6, 2024
08a3450
Merge branch 'main' into use-domain-nsec3-support
ximon18 Nov 6, 2024
0008736
Merge branch 'main' into use-domain-nsec3-support
ximon18 Nov 11, 2024
4495279
Minor fixes and tweaks. Use 0 extra iterations by default in dnst, bu…
ximon18 Nov 11, 2024
0d5434d
Cargo fmt.
ximon18 Nov 11, 2024
0d3ef7e
Compare dnst as ldns to ldns using symbolic linking.
ximon18 Nov 11, 2024
3932d4d
Clippy.
ximon18 Nov 11, 2024
b590823
Integration test is unix only.
ximon18 Nov 11, 2024
b60280d
Make help text more closely match the actual ldns-nsec3-hash output.
ximon18 Nov 12, 2024
20b4e29
Add ldns-nsec3-hash man page based on the original, and adjust the dn…
ximon18 Nov 12, 2024
19e95a5
Don't test with sym link in integration test, do that later in Plouto…
ximon18 Nov 12, 2024
88809ae
Remove wrongly committed sym link.
ximon18 Nov 12, 2024
456db24
Clippy.
ximon18 Nov 12, 2024
3c91c50
Update dnst-nsec3-hash.rst
ximon18 Nov 12, 2024
bbd6e6d
Merge branch 'main' into use-domain-nsec3-support
ximon18 Nov 13, 2024
f9d7da4
More tests and fix a couple of argument parsing bugs. Changes the cal…
ximon18 Nov 13, 2024
e7f2158
Review feedback: inverted assert comments.
ximon18 Nov 13, 2024
e852f25
Initial packaging attempt.
ximon18 Nov 13, 2024
cd60612
Merge branch 'main' into use-domain-nsec3-support
ximon18 Nov 13, 2024
27ae143
Merge branch 'use-domain-nsec3-support' into packaging
ximon18 Nov 13, 2024
8e056dc
Update pkg.yml
ximon18 Nov 13, 2024
afb9c6c
Remove file in wrong directory.
ximon18 Nov 13, 2024
68dd251
No dockerfile yet.
ximon18 Nov 13, 2024
d7e51b2
Add required metadata and a symbolic link via assets (if that works o…
ximon18 Nov 13, 2024
65771d9
Merge branch 'packaging' of github.com:NLnetLabs/dnst into packaging
ximon18 Nov 13, 2024
fcb522e
Fix incorrect links paths.
ximon18 Nov 13, 2024
2e5c0c0
Does 777 help for a symlink?
ximon18 Nov 13, 2024
69dd0c7
And without preserve-symlinks?
ximon18 Nov 13, 2024
b5dc5b4
Try maintainer scripts for creating symlinks instead.
ximon18 Nov 13, 2024
43440ec
Invert ln args. Use scripts for symlink creation for RPMs too.
ximon18 Nov 13, 2024
3d5373d
FIX: -V/--version output shouldn't output the module prefix or set th…
ximon18 Nov 13, 2024
46d46db
Remove unused symlink.
ximon18 Nov 13, 2024
2caa3a6
Fix upgrade failure due to existing sym link.
ximon18 Nov 13, 2024
d3884fe
Remove symlinks in prerm, not postrm, to attempt to fix package upgrade.
ximon18 Nov 13, 2024
be163b6
Overwrite existing symlinks on RPM upgrade.
ximon18 Nov 13, 2024
ed7d058
Instruct package managers that dnst replaces/obsoletes ldns utilities.
ximon18 Nov 13, 2024
6601204
cargo-generate-rpm obsoletes must be a string.
ximon18 Nov 13, 2024
32bd39c
cargo-generate-rpm obsoletes must be a string: second attempt (the co…
ximon18 Nov 13, 2024
5937ad7
Use conflicts instead of replaces because uninstall of obsolete ldns …
ximon18 Nov 14, 2024
7dd9ffb
FIX: ldns-xxx parse error should not cause dnst command to be tried.
ximon18 Nov 14, 2024
19ef71f
Add a dnst docker image.
ximon18 Nov 14, 2024
5cd885b
Oops, add tini.
ximon18 Nov 14, 2024
771ce14
We need libgcc too.
ximon18 Nov 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Overwrite existing symlinks on RPM upgrade.
ximon18 committed Nov 13, 2024

Verified

This commit was signed with the committer’s verified signature.
ajlouie Aaron Louie
commit be163b6140c52088ab676b41b0c4494c0741cdc8
14 changes: 9 additions & 5 deletions pkg/rpm/scriptlets.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
post_install_script = '''
#!/bin/bash -e
if [ $1 -eq 1 ] ; then
# Initial installation
# Create symbolic links
ln -s /usr/bin/dnst /usr/bin/ldns-nsec3-hash
FORCE=
if [ $1 -eq 2 ]; then
# Upgrade
FORCE=-f
fi
# Create symbolic links
ln -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-nsec3-hash
'''

post_uninstall_script = '''
#!/bin/bash -e
#RPM_SYSTEMD_MACROS#
if [ $1 -ge 1 ] ; then
if [ $1 -eq 0 ] ; then
# Uninstallation
# Remove symbolic links
rm -f /usr/bin/ldns-nsec3-hash
fi

Unchanged files with check annotations Beta

[package]

Check notice on line 1 in Cargo.toml

GitHub Actions / package / pkg (dnst, ubuntu:xenial, x86_64)

Cargo deb variant 'ubuntu-xenial' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

GitHub Actions / package / pkg (dnst, ubuntu:bionic, x86_64)

Cargo deb variant 'ubuntu-bionic' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

GitHub Actions / package / pkg (dnst, ubuntu:focal, x86_64)

Cargo deb variant 'ubuntu-focal' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

GitHub Actions / package / pkg (dnst, ubuntu:jammy, x86_64)

Cargo deb variant 'ubuntu-jammy' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

GitHub Actions / package / pkg (dnst, debian:stretch, x86_64)

Cargo deb variant 'debian-stretch' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

GitHub Actions / package / pkg (dnst, debian:buster, x86_64)

Cargo deb variant 'debian-buster' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

GitHub Actions / package / pkg (dnst, debian:bullseye, x86_64)

Cargo deb variant 'debian-bullseye' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

GitHub Actions / package / pkg (dnst, debian:bookworm, x86_64)

Cargo deb variant 'debian-bookworm' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

GitHub Actions / package / pkg (dnst, debian:bullseye, armv7-unknown-linux-musleabihf)

Cargo deb variant 'debian-bullseye-armv7-unknown-linux-musleabihf' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

GitHub Actions / package / pkg (dnst, debian:buster, arm-unknown-linux-musleabihf)

Cargo deb variant 'debian-buster-arm-unknown-linux-musleabihf' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

GitHub Actions / package / pkg (dnst, debian:buster, aarch64-unknown-linux-musl)

Cargo deb variant 'debian-buster-aarch64-unknown-linux-musl' not found, using defaults instead.
name = "dnst"
version = "0.1.0"
edition = "2021"