-
-
Notifications
You must be signed in to change notification settings - Fork 5
Package as cascade-dnst instead of dnst. #131
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
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
7108196
Package as cascade-dnst instead of dnst.
ximon18 c90af9b
cargo-deb complains that the lock file needs updating.
ximon18 d0dae2c
Fix package names.
ximon18 bd0e69b
Try using cascade-dnst by its new name and path.
ximon18 e7207fe
Also update man page names.
ximon18 8faa267
Also install the main cascade-dnst man page.
ximon18 9c0f257
Oops.
ximon18 b66b121
Review feedback
ximon18 636d413
Review feedback
ximon18 47e7de3
Fix path to cascade-dnst.
ximon18 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| #!/bin/sh -e | ||
|
|
||
| case "$1" in | ||
| configure) | ||
| # Create symbolic links | ||
| ln -f -s /usr/bin/dnst /usr/bin/ldns-keygen | ||
| ln -f -s /usr/bin/dnst /usr/bin/ldns-key2ds | ||
| ln -f -s /usr/bin/dnst /usr/bin/ldns-nsec3-hash | ||
| ln -f -s /usr/bin/dnst /usr/bin/ldns-notify | ||
| ln -f -s /usr/bin/dnst /usr/bin/ldns-signzone | ||
| ln -f -s /usr/bin/dnst /usr/bin/ldns-update | ||
| ;; | ||
| esac | ||
| # case "$1" in | ||
| # configure) | ||
| # # Create symbolic links | ||
| # ln -f -s /usr/bin/dnst /usr/bin/ldns-keygen | ||
| # ln -f -s /usr/bin/dnst /usr/bin/ldns-key2ds | ||
| # ln -f -s /usr/bin/dnst /usr/bin/ldns-nsec3-hash | ||
| # ln -f -s /usr/bin/dnst /usr/bin/ldns-notify | ||
| # ln -f -s /usr/bin/dnst /usr/bin/ldns-signzone | ||
| # ln -f -s /usr/bin/dnst /usr/bin/ldns-update | ||
| # ;; | ||
| # esac |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| #!/bin/sh -e | ||
|
|
||
| case "$1" in | ||
| upgrade|remove) | ||
| # Remove symbolic links | ||
| rm -f /usr/bin/ldns-nsec3-hash | ||
| ;; | ||
| esac | ||
| # case "$1" in | ||
| # upgrade|remove) | ||
| # # Remove symbolic links | ||
| # rm -f /usr/bin/ldns-nsec3-hash | ||
| # ;; | ||
| # esac |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,38 @@ | ||
| post_trans_script = ''' | ||
| #!/bin/bash -e | ||
|
|
||
| # This script will be run _after_ upgrade in the presence of an obsoleted ldns-utils | ||
| # package. This is useful because the ldns-utils uninstall script will have been run | ||
| # _after_ installation of dnst and so the symbolic links that we create will be | ||
| # removed, and we have to make sure here that they get put back | ||
|
|
||
| FORCE= | ||
| # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax | ||
| if [ $1 -eq 2 ]; then | ||
| # Upgrade | ||
| FORCE=-f | ||
| fi | ||
|
|
||
| # Create symbolic links | ||
| ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-keygen | ||
| ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-key2ds | ||
| ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-nsec3-hash | ||
| ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-notify | ||
| ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-signzone | ||
| ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-update | ||
| # # This script will be run _after_ upgrade in the presence of an obsoleted ldns-utils | ||
| # # package. This is useful because the ldns-utils uninstall script will have been run | ||
| # # _after_ installation of dnst and so the symbolic links that we create will be | ||
| # # removed, and we have to make sure here that they get put back | ||
| # | ||
| # FORCE= | ||
| # # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax | ||
| # if [ $1 -eq 2 ]; then | ||
| # # Upgrade | ||
| # FORCE=-f | ||
| # fi | ||
| # | ||
| # # Create symbolic links | ||
| # ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-keygen | ||
| # ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-key2ds | ||
| # ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-nsec3-hash | ||
| # ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-notify | ||
| # ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-signzone | ||
| # ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-update | ||
| ''' | ||
|
|
||
| post_uninstall_script = ''' | ||
| #!/bin/bash -e | ||
| #RPM_SYSTEMD_MACROS# | ||
|
|
||
| # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax | ||
| if [ $1 -eq 0 ] ; then | ||
| # Uninstallation | ||
| # Remove symbolic links | ||
| rm -f /usr/bin/ldns-keygen | ||
| rm -f /usr/bin/ldns-key2ds | ||
| rm -f /usr/bin/ldns-nsec3-hash | ||
| rm -f /usr/bin/ldns-notify | ||
| rm -f /usr/bin/ldns-signzone | ||
| rm -f /usr/bin/ldns-update | ||
| fi | ||
| # # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax | ||
| # if [ $1 -eq 0 ] ; then | ||
| # # Uninstallation | ||
| # # Remove symbolic links | ||
| # rm -f /usr/bin/ldns-keygen | ||
| # rm -f /usr/bin/ldns-key2ds | ||
| # rm -f /usr/bin/ldns-nsec3-hash | ||
| # rm -f /usr/bin/ldns-notify | ||
| # rm -f /usr/bin/ldns-signzone | ||
| # rm -f /usr/bin/ldns-update | ||
| # fi | ||
| ''' |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.