kzonesign: move from sbin to bin

This commit is contained in:
Daniel Salzman 2020-08-05 19:17:40 +02:00
parent 9aa157c0aa
commit 58a3a5ae21
9 changed files with 23 additions and 23 deletions

8
.gitignore vendored
View file

@ -65,18 +65,18 @@ version.h
src/libknot/libknot.h
# Binaries
/src/kdig
/src/khost
/src/kcatalogprint
/src/kdig
/src/keymgr
/src/khost
/src/kjournalprint
/src/knotc
/src/knotd
/src/knsec3hash
/src/knsupdate
/src/kzonesign
/src/kzonecheck
/src/kxdpgun
/src/kzonecheck
/src/kzonesign
# Generated tarballs
/knot-*.tar.xz

View file

@ -2,18 +2,18 @@ debian/ufw/knot etc/ufw/applications.d/
etc/knot/knot.conf
usr/bin/knsec3hash
usr/bin/kzonecheck
usr/bin/kzonesign
usr/sbin/kcatalogprint
usr/sbin/keymgr
usr/sbin/kjournalprint
usr/sbin/knotc
usr/sbin/knotd
usr/sbin/kzonesign
usr/share/man/man1/knsec3hash.1
usr/share/man/man1/kzonecheck.1
usr/share/man/man1/kzonesign.1
usr/share/man/man5/knot.conf.5
usr/share/man/man8/kcatalogprint.8
usr/share/man/man8/keymgr.8
usr/share/man/man8/kjournalprint.8
usr/share/man/man8/knotc.8
usr/share/man/man8/knotd.8
usr/share/man/man8/kzonesign.8

View file

@ -225,6 +225,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || :
%{_unitdir}/knot.service
%{_tmpfilesdir}/%{name}.conf
%{_bindir}/kzonecheck
%{_bindir}/kzonesign
%{_sbindir}/kcatalogprint
%{_sbindir}/kjournalprint
%{_sbindir}/keymgr
@ -234,6 +235,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || :
%{_sbindir}/rcknot
%endif
%{_mandir}/man1/kzonecheck.*
%{_mandir}/man1/kzonesign.*
%{_mandir}/man5/knot.conf.*
%{_mandir}/man8/kcatalogprint.*
%{_mandir}/man8/kjournalprint.*

7
doc/.gitignore vendored
View file

@ -5,16 +5,15 @@
# sphinx-build manpages
/man/knot.conf.5
/man/knotc.8
/man/knotd.8
/man/kcatalogprint.8
/man/keymgr.8
/man/kjournalprint.8
/man/knotc.8
/man/knotd.8
/man/kdig.1
/man/khost.1
/man/knot1to2.1
/man/knsec3hash.1
/man/knsupdate.1
/man/kzonesign.8
/man/kzonecheck.1
/man/kzonesign.1
/man/kxdpgun.8

View file

@ -9,8 +9,8 @@ MANPAGES_IN = \
man/khost.1in \
man/knsupdate.1in \
man/knsec3hash.1in \
man/kzonesign.8in \
man/kzonecheck.1in \
man/kzonesign.1in \
man/kxdpgun.8in
MANPAGES_RST = \
@ -23,8 +23,8 @@ MANPAGES_RST = \
man_khost.rst \
man_knsupdate.rst \
man_knsec3hash.rst \
man_kzonesign.rst \
man_kzonecheck.rst \
man_kzonesign.rst \
man_kxdpgun.rst
EXTRA_DIST = \
@ -99,8 +99,8 @@ man_MANS += \
man/kcatalogprint.8 \
man/keymgr.8 \
man/kjournalprint.8 \
man/kzonesign.8 \
man/kzonecheck.1
man/kzonecheck.1 \
man/kzonesign.1
endif # HAVE_DAEMON
man_MANS += \
@ -124,8 +124,8 @@ man/kdig.1: man/kdig.1in
man/khost.1: man/khost.1in
man/knsupdate.1: man/knsupdate.1in
man/knsec3hash.1: man/knsec3hash.1in
man/kzonesign.8: man/kzonesign.8in
man/kzonecheck.1: man/kzonecheck.1in
man/kzonesign.1: man/kzonesign.1in
man/kxdpgun.8: man/kxdpgun.8in
man_SUBST = $(AM_V_GEN)mkdir -p man; \

View file

@ -233,8 +233,8 @@ man_pages = [
('man_khost', 'khost', 'Simple DNS lookup utility', author, 1),
('man_knsec3hash', 'knsec3hash', 'Simple utility to compute NSEC3 hash', author, 1),
('man_knsupdate', 'knsupdate', 'Dynamic DNS update utility', author, 1),
('man_kzonesign', 'kzonesign', 'DNSSEC signing utility', author, 8),
('man_kzonecheck', 'kzonecheck', 'Knot DNS zone check tool', author, 1),
('man_kzonesign', 'kzonesign', 'DNSSEC signing utility', author, 1),
('man_kxdpgun', 'kxdpgun', 'XDP-powered DNS benchmarking tool', author, 8),
]

View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "KZONESIGN" "8" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.TH "KZONESIGN" "1" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
kzonesign \- DNSSEC signing utility
.

View file

@ -16,9 +16,9 @@ the server. This section collects manual pages for all provided binaries:
man_kjournalprint
man_kcatalogprint
man_kzonecheck
man_kzonesign
man_kdig
man_khost
man_knsec3hash
man_knsupdate
man_kzonesign
man_kxdpgun

View file

@ -129,8 +129,8 @@ knotd_LDADD = $(malloc_LIBS) libcontrib.la libknotd.la $(liburcu_LIBS
knotd_LDFLAGS = $(AM_LDFLAGS) -rdynamic
if HAVE_UTILS
bin_PROGRAMS += kzonecheck
sbin_PROGRAMS += keymgr kjournalprint kcatalogprint kzonesign
bin_PROGRAMS += kzonecheck kzonesign
sbin_PROGRAMS += keymgr kjournalprint kcatalogprint
kzonecheck_SOURCES = \
utils/kzonecheck/main.c \
@ -157,9 +157,8 @@ kcatalogprint_SOURCES = \
kzonecheck_CPPFLAGS = $(AM_CPPFLAGS) $(lmdb_CFLAGS)
kzonecheck_LDADD = libcontrib.la libknotd.la
kzonesign_CPPFLAGS = $(AM_CPPFLAGS) $(gnutls_CFLAGS) $(lmdb_CFLAGS)
kzonesign_LDADD = libcontrib.la libknotd.la libknotus.la libdnssec.la \
libzscanner.la
kzonesign_CPPFLAGS = $(AM_CPPFLAGS) $(lmdb_CFLAGS)
kzonesign_LDADD = libcontrib.la libknotd.la
keymgr_CPPFLAGS = $(AM_CPPFLAGS) $(gnutls_CFLAGS) $(lmdb_CFLAGS)
keymgr_LDADD = libcontrib.la libknotd.la libknotus.la libdnssec.la \
libzscanner.la