bump library version to libknot8, libdnssec6

diff --git a/configure.ac b/configure.ac
index 0dbc622af4f359bfa2c5ad74ac915dc13cce11dd..4122cfccb476c05cbe9a69900484abdf098a3e70 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,9 +21,9 @@ AC_CANONICAL_HOST
 
 # Update library versions
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([libknot_VERSION_INFO],["-version-info 7:0:0"])
-AC_SUBST([libdnssec_VERSION_INFO],["-version-info 5:0:0"])
-AC_SUBST([libzscanner_VERSION_INFO],["-version-info 1:0:0"])
+AC_SUBST([libknot_VERSION_INFO],["-version-info 8:0:0"])
+AC_SUBST([libdnssec_VERSION_INFO],["-version-info 6:0:0"])
+AC_SUBST([libzscanner_VERSION_INFO],["-version-info 2:0:0"])
 
 AC_SUBST([KNOT_VERSION_MAJOR], knot_VERSION_MAJOR)
 AC_SUBST([KNOT_VERSION_MINOR], knot_VERSION_MINOR)

diff --git a/distro/deb/control b/distro/deb/control
index 05ce4b3c4dc1a6a4e4aca71e757fb7bd3e145527..731c321cb251cea52ba4277725407b98e21eb461 100644 (file)
--- a/distro/deb/control
+++ b/distro/deb/control
@@ -33,9 +33,9 @@ Package: knot
 Architecture: any
 Depends:
  adduser,
- libdnssec5 (= ${binary:Version}),
- libknot7 (= ${binary:Version}),
- libzscanner1 (= ${binary:Version}),
+ libdnssec6 (= ${binary:Version}),
+ libknot8 (= ${binary:Version}),
+ libzscanner2 (= ${binary:Version}),
  lsb-base (>= 3.0-6),
  ${misc:Depends},
  ${shlibs:Depends},
@@ -49,7 +49,7 @@ Description: Authoritative domain name server
  registry and hence is well suited to run anything from the root
  zone, the top-level domain, to many smaller standard domain names.
 
-Package: libknot7
+Package: libknot8
 Architecture: any
 Multi-Arch: same
 Depends:
@@ -58,10 +58,10 @@ Depends:
 Section: libs
 Replaces:
  knot-libs (<< 2.0.1-4),
- libknot6 (<< 2.6.1-1~)
+ libknot7 (<< 2.6.8-2~)
 Breaks:
  knot-libs (<< 2.0.1-4),
- libknot6 (<< 2.6.1-1~)
+ libknot7 (<< 2.6.8-2~)
 Description: Authoritative domain name server (shared library)
  Knot DNS is a fast, authoritative only, high performance, feature
  full and open source name server.
@@ -73,7 +73,7 @@ Description: Authoritative domain name server (shared library)
  This package provides libknot shared library used by Knot DNS and
  Knot Resolver.
 
-Package: libzscanner1
+Package: libzscanner2
 Architecture: any
 Multi-Arch: same
 Depends:
@@ -82,10 +82,10 @@ Depends:
 Section: libs
 Replaces:
  knot-libs (<< 2.0.1-4),
- libzscanner0 (<< 2.3.0~),
+ libzscanner1 (<< 2.6.8-2~),
 Breaks:
  knot-libs (<< 2.0.1-4),
- libzscanner0 (<< 2.3.0~),
+ libzscanner1 (<< 2.6.8-2~),
 Description: DNS zone-parsing library from Knot
  Knot DNS is a fast, authoritative only, high performance, feature
  full and open source name server.
@@ -97,7 +97,7 @@ Description: DNS zone-parsing library from Knot
  This package provides a fast zone parser shared library used by Knot
  DNS and Knot Resolver.
 
-Package: libdnssec5
+Package: libdnssec6
 Architecture: any
 Multi-Arch: same
 Depends:
@@ -106,10 +106,10 @@ Depends:
 Section: libs
 Replaces:
  knot-libs (<< 2.0.1-4),
- libdnssec4 (<< 2.6.1-1~),
+ libdnssec5 (<< 2.6.8-2~),
 Breaks:
  knot-libs (<< 2.0.1-4),
- libdnssec4 (<< 2.6.1-1~),
+ libdnssec5 (<< 2.6.8-2~),
 Description: DNSSEC shared library from Knot
  Knot DNS is a fast, authoritative only, high performance, feature
  full and open source name server.
@@ -125,11 +125,11 @@ Package: libknot-dev
 Architecture: any
 Multi-Arch: same
 Depends:
- libdnssec5 (= ${binary:Version}),
+ libdnssec6 (= ${binary:Version}),
  libgnutls28-dev,
  libjansson-dev,
- libknot7 (= ${binary:Version}),
- libzscanner1 (= ${binary:Version}),
+ libknot8 (= ${binary:Version}),
+ libzscanner2 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Section: libdevel
@@ -151,9 +151,9 @@ Description: Knot DNS shared library development files
 Package: knot-dnsutils
 Architecture: any
 Depends:
- libdnssec5 (= ${binary:Version}),
- libknot7 (= ${binary:Version}),
- libzscanner1 (= ${binary:Version}),
+ libdnssec6 (= ${binary:Version}),
+ libknot8 (= ${binary:Version}),
+ libzscanner2 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: Clients provided with Knot DNS (kdig, knslookup, knsupdate)
@@ -179,9 +179,9 @@ Description: Clients provided with Knot DNS (kdig, knslookup, knsupdate)
 Package: knot-host
 Architecture: any
 Depends:
- libdnssec5 (= ${binary:Version}),
- libknot7 (= ${binary:Version}),
- libzscanner1 (= ${binary:Version}),
+ libdnssec6 (= ${binary:Version}),
+ libknot8 (= ${binary:Version}),
+ libzscanner2 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: Version of 'host' bundled with Knot DNS

diff --git a/distro/deb/libdnssec5.install b/distro/deb/libdnssec6.install
similarity index 100%
rename from distro/deb/libdnssec5.install
rename to distro/deb/libdnssec6.install

diff --git a/distro/deb/libdnssec5.symbols b/distro/deb/libdnssec6.symbols
similarity index 86%
rename from distro/deb/libdnssec5.symbols
rename to distro/deb/libdnssec6.symbols
index 845ccc02c3422325e84487c856b3d705f41b4cbd..955e5b69949801e536544879044a498bca702793 100644 (file)
--- a/distro/deb/libdnssec5.symbols
+++ b/distro/deb/libdnssec6.symbols
@@ -1,13 +1,4 @@
-libdnssec.so.5 libdnssec5 #MINVER#
- bignum_size_s@Base 2.3.0
- bignum_size_u@Base 2.3.0
- bignum_write@Base 2.3.0
- bin_to_hex@Base 2.3.0
- bin_to_hex_static@Base 2.3.0
- dname_copy@Base 2.3.0
- dname_equal@Base 2.3.0
- dname_length@Base 2.3.0
- dname_normalize@Base 2.3.0
+libdnssec.so.6 libdnssec6 #MINVER#
  dnssec_algorithm_digest_support@Base 2.6.0
  dnssec_algorithm_key_size_check@Base 2.3.0
  dnssec_algorithm_key_size_default@Base 2.3.0
@@ -90,6 +81,7 @@ libdnssec.so.5 libdnssec5 #MINVER#
  dnssec_nsec3_params_from_rdata@Base 2.3.0
  dnssec_nsec_bitmap_add@Base 2.3.0
  dnssec_nsec_bitmap_clear@Base 2.3.0
+ dnssec_nsec_bitmap_contains@Base 2.7.0
  dnssec_nsec_bitmap_free@Base 2.3.0
  dnssec_nsec_bitmap_new@Base 2.3.0
  dnssec_nsec_bitmap_size@Base 2.3.0
@@ -114,15 +106,3 @@ libdnssec.so.5 libdnssec5 #MINVER#
  dnssec_tsig_optimal_key_size@Base 2.3.0
  dnssec_tsig_size@Base 2.3.0
  dnssec_tsig_write@Base 2.3.0
- fs_mkdir@Base 2.3.0
- hex_to_bin@Base 2.3.0
- hex_to_bin_static@Base 2.3.0
- keyid_pubkey@Base 2.3.0
- keyid_pubkey_hex@Base 2.3.0
- keyid_x509@Base 2.3.0
- keyid_x509_hex@Base 2.3.0
- pem_from_x509@Base 2.3.0
- pem_generate@Base 2.3.0
- pem_keyid@Base 2.3.0
- pem_privkey@Base 2.3.0
- pem_x509@Base 2.3.0

diff --git a/distro/deb/libknot7.install b/distro/deb/libknot8.install
similarity index 100%
rename from distro/deb/libknot7.install
rename to distro/deb/libknot8.install

diff --git a/distro/deb/libknot7.symbols b/distro/deb/libknot8.symbols
similarity index 63%
rename from distro/deb/libknot7.symbols
rename to distro/deb/libknot8.symbols
index 231f677e5bf3379371618481c7b1541ec193b4a2..4d99f34a253a6d8efafb7d322e07127c7da753ed 100644 (file)
--- a/distro/deb/libknot7.symbols
+++ b/distro/deb/libknot8.symbols
@@ -1,4 +1,4 @@
-libknot.so.7 libknot7 #MINVER#
+libknot.so.8 libknot8 #MINVER#
  KNOT_DB_LMDB_DUPSORT@Base 2.5.0
  KNOT_DB_LMDB_INTEGERKEY@Base 2.4.0
  KNOT_DB_LMDB_MAPASYNC@Base 2.5.0
@@ -7,16 +7,6 @@ libknot.so.7 libknot7 #MINVER#
  KNOT_DB_LMDB_RDONLY@Base 2.3.0
  KNOT_DB_LMDB_WRITEMAP@Base 2.5.0
  KNOT_DUMP_STYLE_DEFAULT@Base 2.3.0
- knot_a_addr@Base 2.3.0
- knot_aaaa_addr@Base 2.3.0
- knot_binary_dup@Base 2.3.0
- knot_binary_free@Base 2.3.0
- knot_binary_from_base64@Base 2.3.0
- knot_binary_from_string@Base 2.3.0
- knot_cc_alg_fnv64@Base 2.3.0
- knot_cc_check@Base 2.3.0
- knot_cc_input_is_valid@Base 2.3.0
- knot_compr_put_dname@Base 2.3.0
  knot_ctl_accept@Base 2.3.0
  knot_ctl_alloc@Base 2.3.0
  knot_ctl_bind@Base 2.3.0
@@ -34,84 +24,62 @@ libknot.so.7 libknot7 #MINVER#
  knot_db_lmdb_iter_del@Base 2.3.0
  knot_db_lmdb_txn_begin@Base 2.3.0
  knot_db_trie_api@Base 2.3.0
- knot_dname_align@Base 2.3.0
- knot_dname_cat@Base 2.3.0
  knot_dname_cmp@Base 2.3.0
  knot_dname_copy@Base 2.3.0
- knot_dname_copy_part@Base 2.3.0
  knot_dname_free@Base 2.3.0
  knot_dname_from_str@Base 2.3.0
+ knot_dname_in_bailiwick@Base 2.7.0
  knot_dname_is_equal@Base 2.3.0
- knot_dname_is_wildcard@Base 2.3.0
- knot_dname_label_is_equal@Base 2.6.0
  knot_dname_labels@Base 2.3.0
- knot_dname_lf@Base 2.3.0
+ knot_dname_lf@Base 2.7.0
  knot_dname_matched_labels@Base 2.3.0
- knot_dname_parse@Base 2.3.0
  knot_dname_prefixlen@Base 2.3.0
  knot_dname_realsize@Base 2.3.0
  knot_dname_replace_suffix@Base 2.3.0
  knot_dname_size@Base 2.3.0
+ knot_dname_store@Base 2.7.0
  knot_dname_to_lower@Base 2.3.0
  knot_dname_to_str@Base 2.3.0
  knot_dname_to_wire@Base 2.3.0
  knot_dname_unpack@Base 2.3.0
  knot_dname_wire_check@Base 2.3.0
- knot_dnskey_flags@Base 2.3.0
  knot_dnssec_alg_names@Base 2.3.0
- knot_ds_alg@Base 2.3.0
- knot_ds_digest@Base 2.3.0
- knot_ds_digest_type@Base 2.3.0
- knot_ds_key_tag@Base 2.3.0
  knot_edns_add_option@Base 2.3.0
+ knot_edns_alignment_size@Base 2.7.0
  knot_edns_chain_parse@Base 2.4.0
  knot_edns_chain_size@Base 2.4.0
  knot_edns_chain_write@Base 2.4.0
- knot_edns_check_record@Base 2.3.0
  knot_edns_client_subnet_get_addr@Base 2.3.1
  knot_edns_client_subnet_parse@Base 2.3.0
  knot_edns_client_subnet_set_addr@Base 2.3.1
  knot_edns_client_subnet_size@Base 2.3.1
  knot_edns_client_subnet_write@Base 2.3.1
- knot_edns_default_padding_size@Base 2.5.0
- knot_edns_do@Base 2.3.0
+ knot_edns_cookie_client_check@Base 2.7.0
+ knot_edns_cookie_client_generate@Base 2.7.0
+ knot_edns_cookie_parse@Base 2.7.0
+ knot_edns_cookie_server_check@Base 2.7.0
+ knot_edns_cookie_server_generate@Base 2.7.0
+ knot_edns_cookie_size@Base 2.7.0
+ knot_edns_cookie_write@Base 2.7.0
  knot_edns_get_ext_rcode@Base 2.3.0
  knot_edns_get_option@Base 2.3.0
- knot_edns_get_payload@Base 2.3.0
+ knot_edns_get_options@Base 2.7.0
  knot_edns_get_version@Base 2.3.0
- knot_edns_has_option@Base 2.3.0
  knot_edns_init@Base 2.3.0
  knot_edns_keepalive_parse@Base 2.4.0
  knot_edns_keepalive_size@Base 2.4.0
  knot_edns_keepalive_write@Base 2.4.0
- knot_edns_opt_cookie_data_len@Base 2.3.0
- knot_edns_opt_cookie_parse@Base 2.3.0
- knot_edns_opt_cookie_write@Base 2.3.0
- knot_edns_opt_get_code@Base 2.3.0
- knot_edns_opt_get_length@Base 2.3.0
- knot_edns_remove_options@Base 2.3.0
  knot_edns_reserve_option@Base 2.3.0
- knot_edns_reserve_unique_option@Base 2.3.0
- knot_edns_set_do@Base 2.3.0
  knot_edns_set_ext_rcode@Base 2.3.0
- knot_edns_set_payload@Base 2.3.0
  knot_edns_set_version@Base 2.3.0
- knot_edns_wire_size@Base 2.3.0
  knot_error_from_libdnssec@Base 2.5.0
  knot_get_obsolete_rdata_descriptor@Base 2.3.0
  knot_get_rdata_descriptor@Base 2.3.0
  knot_naptr_header_size@Base 2.3.0
- knot_nsec3_bitmap@Base 2.3.0
- knot_nsec3_iterations@Base 2.3.0
- knot_nsec3param_algorithm@Base 2.3.0
- knot_nsec3param_flags@Base 2.3.0
- knot_nsec3param_iterations@Base 2.3.0
- knot_nsec3param_salt@Base 2.3.0
- knot_nsec3param_salt_length@Base 2.3.0
  knot_opcode_names@Base 2.3.0
+ knot_opt_code_to_string@Base 2.7.0
  knot_pkt_begin@Base 2.3.0
  knot_pkt_clear@Base 2.3.0
- knot_pkt_clear_payload@Base 2.3.0
  knot_pkt_copy@Base 2.3.0
  knot_pkt_ext_rcode@Base 2.4.0
  knot_pkt_ext_rcode_name@Base 2.4.0
@@ -119,88 +87,46 @@ libknot.so.7 libknot7 #MINVER#
  knot_pkt_init_response@Base 2.3.0
  knot_pkt_new@Base 2.3.0
  knot_pkt_parse@Base 2.3.0
- knot_pkt_parse_payload@Base 2.3.0
  knot_pkt_parse_question@Base 2.3.0
- knot_pkt_parse_rr@Base 2.3.0
- knot_pkt_parse_section@Base 2.3.0
- knot_pkt_put@Base 2.3.0
  knot_pkt_put_question@Base 2.3.0
- knot_pkt_qclass@Base 2.3.0
- knot_pkt_qname@Base 2.3.0
- knot_pkt_qtype@Base 2.3.0
- knot_pkt_question_size@Base 2.3.0
+ knot_pkt_put_rotate@Base 2.7.0
  knot_pkt_reclaim@Base 2.3.0
  knot_pkt_reserve@Base 2.3.0
- knot_pkt_rr@Base 2.3.0
- knot_pkt_rr_offset@Base 2.3.0
- knot_pkt_section@Base 2.3.0
  knot_rcode_names@Base 2.3.0
- knot_rdata_array_size@Base 2.3.0
- knot_rdata_cmp@Base 2.3.0
- knot_rdata_data@Base 2.3.0
- knot_rdata_init@Base 2.3.0
- knot_rdata_rdlen@Base 2.3.0
- knot_rdata_set_rdlen@Base 2.3.0
- knot_rdata_set_ttl@Base 2.3.0
- knot_rdata_ttl@Base 2.3.0
  knot_rdataset_add@Base 2.3.0
  knot_rdataset_at@Base 2.3.0
  knot_rdataset_clear@Base 2.3.0
  knot_rdataset_copy@Base 2.3.0
  knot_rdataset_eq@Base 2.3.0
- knot_rdataset_gather@Base 2.3.1
- knot_rdataset_init@Base 2.3.0
  knot_rdataset_intersect@Base 2.3.0
  knot_rdataset_member@Base 2.3.0
  knot_rdataset_merge@Base 2.3.0
  knot_rdataset_reserve@Base 2.3.0
- knot_rdataset_set_ttl@Base 2.3.0
  knot_rdataset_size@Base 2.3.0
- knot_rdataset_sort_at@Base 2.3.0
- knot_rdataset_subtract@Base 2.3.0
- knot_rdataset_ttl@Base 2.3.0
+ knot_rdataset_subtract@Base 2.7.0
  knot_rdataset_unreserve@Base 2.3.0
  knot_rrclass_from_string@Base 2.3.0
  knot_rrclass_to_string@Base 2.3.0
- knot_rrset_add_rdata@Base 2.3.0
+ knot_rrset_add_rdata@Base 2.7.0
  knot_rrset_clear@Base 2.3.0
  knot_rrset_copy@Base 2.3.0
- knot_rrset_empty@Base 2.3.0
  knot_rrset_equal@Base 2.3.0
  knot_rrset_free@Base 2.3.0
- knot_rrset_init@Base 2.3.0
- knot_rrset_init_empty@Base 2.3.0
  knot_rrset_is_nsec3rel@Base 2.3.0
- knot_rrset_new@Base 2.3.0
+ knot_rrset_new@Base 2.7.0
  knot_rrset_rr_from_wire@Base 2.3.0
  knot_rrset_rr_to_canonical@Base 2.3.0
  knot_rrset_size@Base 2.3.0
- knot_rrset_to_wire@Base 2.3.0
- knot_rrset_ttl@Base 2.3.0
+ knot_rrset_to_wire_rotate@Base 2.7.0
  knot_rrset_txt_dump@Base 2.3.0
  knot_rrset_txt_dump_data@Base 2.3.0
  knot_rrset_txt_dump_header@Base 2.3.0
- knot_rrsig_key_tag@Base 2.3.0
- knot_rrsig_original_ttl@Base 2.3.0
- knot_rrsig_sig_expiration@Base 2.3.0
- knot_rrsig_sig_inception@Base 2.3.0
- knot_rrsig_type_covered@Base 2.3.0
  knot_rrtype_additional_needed@Base 2.3.0
  knot_rrtype_from_string@Base 2.3.0
  knot_rrtype_is_dnssec@Base 2.3.0
  knot_rrtype_is_metatype@Base 2.3.0
  knot_rrtype_should_be_lowercased@Base 2.3.0
  knot_rrtype_to_string@Base 2.3.0
- knot_sc_alg_fnv64@Base 2.3.0
- knot_sc_check@Base 2.3.0
- knot_sc_input_is_valid@Base 2.3.0
- knot_sc_parse@Base 2.3.0
- knot_soa_expire@Base 2.3.0
- knot_soa_minimum@Base 2.3.0
- knot_soa_refresh@Base 2.3.0
- knot_soa_retry@Base 2.3.0
- knot_soa_serial@Base 2.3.0
- knot_soa_serial_set@Base 2.3.0
  knot_strerror@Base 2.3.0
  knot_tsig_add@Base 2.3.0
  knot_tsig_append@Base 2.3.0
@@ -236,22 +162,6 @@ libknot.so.7 libknot7 #MINVER#
  knot_tsig_sign_next@Base 2.3.0
  knot_tsig_wire_maxsize@Base 2.3.0
  knot_tsig_wire_size@Base 2.4.1
- knot_wire_add_ancount@Base 2.3.0
- knot_wire_add_arcount@Base 2.3.0
- knot_wire_add_nscount@Base 2.3.0
- knot_wire_add_qdcount@Base 2.3.0
- knot_wire_get_ancount@Base 2.3.0
- knot_wire_get_arcount@Base 2.3.0
- knot_wire_get_id@Base 2.3.0
- knot_wire_get_nscount@Base 2.3.0
- knot_wire_get_pointer@Base 2.3.0
- knot_wire_get_qdcount@Base 2.3.0
- knot_wire_put_pointer@Base 2.3.0
- knot_wire_set_ancount@Base 2.3.0
- knot_wire_set_arcount@Base 2.3.0
- knot_wire_set_id@Base 2.3.0
- knot_wire_set_nscount@Base 2.3.0
- knot_wire_set_qdcount@Base 2.3.0
  yp_addr@Base 2.5.0
  yp_addr_noport@Base 2.5.0
  yp_addr_noport_to_bin@Base 2.5.0
@@ -262,7 +172,6 @@ libknot.so.7 libknot7 #MINVER#
  yp_addr_to_txt@Base 2.5.0
  yp_base64_to_bin@Base 2.5.0
  yp_base64_to_txt@Base 2.5.0
- yp_bin_len@Base 2.5.0
  yp_bool_to_bin@Base 2.5.0
  yp_bool_to_txt@Base 2.5.0
  yp_deinit@Base 2.5.0
@@ -274,7 +183,6 @@ libknot.so.7 libknot7 #MINVER#
  yp_hex_to_bin@Base 2.5.0
  yp_hex_to_txt@Base 2.5.0
  yp_init@Base 2.5.0
- yp_int@Base 2.5.0
  yp_int_to_bin@Base 2.5.0
  yp_int_to_txt@Base 2.5.0
  yp_item_to_bin@Base 2.5.0

diff --git a/distro/deb/libzscanner1.install b/distro/deb/libzscanner2.install
similarity index 100%
rename from distro/deb/libzscanner1.install
rename to distro/deb/libzscanner2.install

diff --git a/distro/deb/libzscanner1.symbols b/distro/deb/libzscanner2.symbols
similarity index 85%
rename from distro/deb/libzscanner1.symbols
rename to distro/deb/libzscanner2.symbols
index 9c2c17f7b435bbffa1b2314764ba48b96072e1ca..95995bfccedcd7ab300fbd0e3e366e629f01434d 100644 (file)
--- a/distro/deb/libzscanner1.symbols
+++ b/distro/deb/libzscanner2.symbols
@@ -1,4 +1,4 @@
-libzscanner.so.1 libzscanner1 #MINVER#
+libzscanner.so.2 libzscanner2 #MINVER#
  zs_deinit@Base 2.3.0
  zs_errorname@Base 2.3.0
  zs_init@Base 2.3.0

diff --git a/src/knot/include/module.h b/src/knot/include/module.h
index 6d7b21184d5f1c51b89523952662d3dad1968d05..dd9118b22878314590fa54c12a66934f2820d78c 100644 (file)
--- a/src/knot/include/module.h
+++ b/src/knot/include/module.h
@@ -35,7 +35,7 @@
 /*** Query module API. ***/
 
 /*! Current module ABI version. */
-#define KNOTD_MOD_ABI_VERSION  100
+#define KNOTD_MOD_ABI_VERSION  200
 /*! Module configuration name prefix. */
 #define KNOTD_MOD_NAME_PREFIX  "mod-"