Update to latest commit.

While there, move named-journalprint from bind-tools to bind9, it is
only useful on machines with BIND9 running, where journal files actually
exist.  The man page was already in the correct port.
This commit is contained in:
Mathieu Arnold 2020-07-20 13:50:17 +00:00
parent 093041dd65
commit bf3db438d8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=542641
7 changed files with 40 additions and 31 deletions

View File

@ -12,32 +12,31 @@ bin/dnssec-signzone
bin/dnssec-verify
bin/host
bin/mdig
bin/named-journalprint
bin/named-rrchecker
bin/nsec3hash
bin/nslookup
bin/nsupdate
lib/bind-tools/libbind9.so
lib/bind-tools/libbind9.so.1701
lib/bind-tools/libbind9.so.1701.0.0
lib/bind-tools/libbind9.so.1701.0.1
lib/bind-tools/libdns.so
lib/bind-tools/libdns.so.1702
lib/bind-tools/libdns.so.1702.0.0
lib/bind-tools/libdns.so.1703
lib/bind-tools/libdns.so.1703.0.0
lib/bind-tools/libirs.so
lib/bind-tools/libirs.so.1701
lib/bind-tools/libirs.so.1701.0.0
lib/bind-tools/libisc.so
lib/bind-tools/libisc.so.1702
lib/bind-tools/libisc.so.1702.0.0
lib/bind-tools/libisc.so.1703
lib/bind-tools/libisc.so.1703.0.0
lib/bind-tools/libisccc.so
lib/bind-tools/libisccc.so.1701
lib/bind-tools/libisccc.so.1701.0.0
lib/bind-tools/libisccfg.so
lib/bind-tools/libisccfg.so.1701
lib/bind-tools/libisccfg.so.1701.0.0
lib/bind-tools/libisccfg.so.1701.0.1
lib/bind-tools/libns.so
lib/bind-tools/libns.so.1702
lib/bind-tools/libns.so.1702.0.0
lib/bind-tools/libns.so.1703
lib/bind-tools/libns.so.1703.0.0
man/man1/arpaname.1.gz
man/man1/delv.1.gz
man/man1/dig.1.gz

View File

@ -48,13 +48,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
# XXX: remove tar:bz2
USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.17.0a0.2020.07.06
ISCVERSION= 9.17.3a0.2020.07.06
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
GL_COMMIT= f34b179d12f74ad1851488d0363ee1471a6926ed
GL_COMMIT= 9dcf229634968dc7d808c1d23f4bab5d3ba7f47f
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1594033999
SHA256 (isc-projects-bind9-f34b179d12f74ad1851488d0363ee1471a6926ed_GL0.tar.gz) = 708fcc1b193fb149ac814cd7d1b32279b70e36ceb78bf54e7f05638e1634965a
SIZE (isc-projects-bind9-f34b179d12f74ad1851488d0363ee1471a6926ed_GL0.tar.gz) = 4496597
TIMESTAMP = 1595247830
SHA256 (isc-projects-bind9-9dcf229634968dc7d808c1d23f4bab5d3ba7f47f_GL0.tar.gz) = 6346405add0b0e0624f8df1c6b180f24d2a7aeb6d40bcc799ebcb602a6c74c7b
SIZE (isc-projects-bind9-9dcf229634968dc7d808c1d23f4bab5d3ba7f47f_GL0.tar.gz) = 4249231

View File

@ -1,6 +1,6 @@
Only select the "tools" part of bind for building.
--- Makefile.am.orig 2020-06-06 05:02:12 UTC
--- Makefile.am.orig 2020-07-20 08:13:37 UTC
+++ Makefile.am
@@ -8,8 +8,6 @@ CLEANFILES = bind.keys.h
bind.keys.h: bind.keys Makefile
@ -11,7 +11,7 @@ Only select the "tools" part of bind for building.
.PHONY: doc
EXTRA_DIST = \
--- bin/Makefile.am.orig 2020-06-06 05:02:12 UTC
--- bin/Makefile.am.orig 2020-07-20 08:13:37 UTC
+++ bin/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins
@ -19,3 +19,13 @@ Only select the "tools" part of bind for building.
if HAVE_PKCS11
SUBDIRS += pkcs11
--- bin/tools/Makefile.am.orig 2020-07-20 08:13:37 UTC
+++ bin/tools/Makefile.am
@@ -11,7 +11,6 @@ LDADD = \
bin_PROGRAMS = \
arpaname \
mdig \
- named-journalprint \
named-rrchecker \
nsec3hash

View File

@ -1,6 +1,6 @@
Exclude the "tools" from building and installing.
--- bin/Makefile.am.orig 2020-06-11 06:07:21 UTC
--- bin/Makefile.am.orig 2020-07-20 08:13:37 UTC
+++ bin/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins
@ -8,19 +8,18 @@ Exclude the "tools" from building and installing.
if HAVE_PKCS11
SUBDIRS += pkcs11
--- bin/tools/Makefile.am.orig 2020-06-11 06:07:21 UTC
--- bin/tools/Makefile.am.orig 2020-07-20 08:13:37 UTC
+++ bin/tools/Makefile.am
@@ -8,12 +8,7 @@ LDADD = \
$(LIBISC_LIBS) \
@@ -9,11 +9,7 @@ LDADD = \
$(LIBDNS_LIBS)
-bin_PROGRAMS = \
bin_PROGRAMS = \
- arpaname \
- mdig \
- named-journalprint \
- named-rrchecker \
- nsec3hash
+bin_PROGRAMS =
+ named-journalprint
arpaname_LDADD = \
$(LIBISC_LIBS)

View File

@ -385,7 +385,7 @@ named_prestart()
local checkconf
checkconf="${_named_program_root}/sbin/named-checkconf"
checkconf="${_named_program_root}/bin/named-checkconf"
if ! checkyesno named_chroot_autoupdate && [ -n "${named_chrootdir}" ]; then
checkconf="${checkconf} -t ${named_chrootdir}"
fi

View File

@ -2,6 +2,7 @@
bin/named-checkconf
bin/named-checkzone
bin/named-compilezone
bin/named-journalprint
%%LMDB%%bin/named-nzd2nzf
%%NATIVE_PKCS11%%bin/pkcs11-destroy
%%NATIVE_PKCS11%%bin/pkcs11-keygen
@ -263,25 +264,25 @@ include/pk11/site.h
include/pkcs11/pkcs11.h
lib/libbind9.so
lib/libbind9.so.1701
lib/libbind9.so.1701.0.0
lib/libbind9.so.1701.0.1
lib/libdns.so
lib/libdns.so.1702
lib/libdns.so.1702.0.0
lib/libdns.so.1703
lib/libdns.so.1703.0.0
lib/libirs.so
lib/libirs.so.1701
lib/libirs.so.1701.0.0
lib/libisc.so
lib/libisc.so.1702
lib/libisc.so.1702.0.0
lib/libisc.so.1703
lib/libisc.so.1703.0.0
lib/libisccc.so
lib/libisccc.so.1701
lib/libisccc.so.1701.0.0
lib/libisccfg.so
lib/libisccfg.so.1701
lib/libisccfg.so.1701.0.0
lib/libisccfg.so.1701.0.1
lib/libns.so
lib/libns.so.1702
lib/libns.so.1702.0.0
lib/libns.so.1703
lib/libns.so.1703.0.0
@comment lib/named/filter-aaaa.so
@comment man/man1/arpaname.1.gz
@comment man/man1/delv.1.gz