summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-12 04:45:08 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-12 04:45:08 +0000
commit2e3a7e3caf3d0a017d85a9c3a9d992e9c41ec956 (patch)
treeb5e520fdeb98d77339c5b246b42ba0ddbf08fa17
parentMerging upstream version 3.4.0. (diff)
downloadknot-debian/3.4.0-1.tar.xz
knot-debian/3.4.0-1.zip
Adding debian version 3.4.0-1.debian/3.4.0-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog10
-rw-r--r--debian/control25
-rw-r--r--debian/gbp.conf2
-rw-r--r--debian/libdnssec9t64.lintian-overrides1
-rw-r--r--debian/libknot14t64.lintian-overrides1
l---------debian/libknot14t64.symbols.alpha1
l---------debian/libknot14t64.symbols.arc1
l---------debian/libknot14t64.symbols.hppa1
l---------debian/libknot14t64.symbols.hurd-amd641
l---------debian/libknot14t64.symbols.ia641
l---------debian/libknot14t64.symbols.loong641
l---------debian/libknot14t64.symbols.m68k1
l---------debian/libknot14t64.symbols.powerpc1
l---------debian/libknot14t64.symbols.sh41
l---------debian/libknot14t64.symbols.sparc641
l---------debian/libknot14t64.symbols.x321
-rw-r--r--debian/libknot15t64.install (renamed from debian/libknot14t64.install)0
-rw-r--r--debian/libknot15t64.symbols (renamed from debian/libknot14t64.symbols)31
l---------debian/libknot15t64.symbols.alpha1
l---------debian/libknot15t64.symbols.arc1
l---------debian/libknot15t64.symbols.hppa1
l---------debian/libknot15t64.symbols.hurd-amd641
-rw-r--r--debian/libknot15t64.symbols.hurd-i386 (renamed from debian/libknot14t64.symbols.hurd-i386)29
l---------debian/libknot15t64.symbols.ia641
l---------debian/libknot15t64.symbols.loong641
l---------debian/libknot15t64.symbols.m68k1
l---------debian/libknot15t64.symbols.powerpc1
l---------debian/libknot15t64.symbols.sh41
l---------debian/libknot15t64.symbols.sparc641
l---------debian/libknot15t64.symbols.x321
-rw-r--r--debian/libzscanner4t64.lintian-overrides1
31 files changed, 77 insertions, 45 deletions
diff --git a/debian/changelog b/debian/changelog
index 7791a37..1dad4f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+knot (3.4.0-1) unstable; urgency=medium
+
+ * New upstream version 3.4.0
+ * d/gbp.conf: Use upstream/3.4 branch for 3.4.x
+ * SONAME bump: libknot 14 -> 15
+ * Move Build-Depends-Indep to Build-Depends
+ * Remove unused lintian-overrides
+
+ -- Jakub Ružička <jru@debian.org> Tue, 03 Sep 2024 12:47:35 +0200
+
knot (3.3.9-1) unstable; urgency=medium
* New upstream version 3.3.9 (Closes: #1078625)
diff --git a/debian/control b/debian/control
index 9f0aa43..0905200 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,6 @@ Uploaders:
Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
Robert Edmonds <edmonds@debian.org>,
Jakub Ružička <jru@debian.org>,
-Build-Depends-Indep:
- python3-setuptools,
- python3-sphinx,
- python3-sphinx-panels,
Build-Depends:
autoconf,
automake,
@@ -40,6 +36,9 @@ Build-Depends:
pkgconf,
protobuf-c-compiler,
python3-all,
+ python3-setuptools,
+ python3-sphinx,
+ python3-sphinx-panels,
Standards-Version: 4.7.0
Homepage: https://www.knot-dns.cz/
Vcs-Browser: https://salsa.debian.org/dns-team/knot-dns
@@ -51,7 +50,7 @@ Architecture: any
Depends:
adduser,
libdnssec9t64 (= ${binary:Version}),
- libknot14t64 (= ${binary:Version}),
+ libknot15t64 (= ${binary:Version}),
libzscanner4t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -69,10 +68,10 @@ 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: libknot14t64
+Package: libknot15t64
Provides: ${t64:Provides}
-Replaces: libknot14
-Breaks: libknot14 (<< ${source:Version})
+Replaces: libknot15
+Breaks: libknot15 (<< ${source:Version})
Architecture: any
Depends:
${misc:Depends},
@@ -134,7 +133,7 @@ Architecture: any
Depends:
libdnssec9t64 (= ${binary:Version}),
libgnutls28-dev,
- libknot14t64 (= ${binary:Version}),
+ libknot15t64 (= ${binary:Version}),
libzscanner4t64 (= ${binary:Version}),
${misc:Depends},
Section: libdevel
@@ -153,7 +152,7 @@ Package: knot-dnsutils
Architecture: any
Depends:
libdnssec9t64 (= ${binary:Version}),
- libknot14t64 (= ${binary:Version}),
+ libknot15t64 (= ${binary:Version}),
libzscanner4t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -186,7 +185,7 @@ Package: knot-dnssecutils
Architecture: any
Depends:
libdnssec9t64 (= ${binary:Version}),
- libknot14t64 (= ${binary:Version}),
+ libknot15t64 (= ${binary:Version}),
libzscanner4t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -214,7 +213,7 @@ Package: knot-host
Architecture: any
Depends:
libdnssec9t64 (= ${binary:Version}),
- libknot14t64 (= ${binary:Version}),
+ libknot15t64 (= ${binary:Version}),
libzscanner4t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -301,7 +300,7 @@ Description: Prometheus exporter for Knot DNS
Package: python3-libknot
Architecture: all
Depends:
- libknot14t64 (>= ${source:Version}),
+ libknot15t64 (>= ${source:Version}),
${misc:Depends},
${python3:Depends},
Section: python
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 346c603..148bde7 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
[DEFAULT]
debian-branch = debian/master
pristine-tar = True
-upstream-branch = upstream/3.3
+upstream-branch = upstream/3.4
upstream-vcs-tag = v%(version)s
[dch]
diff --git a/debian/libdnssec9t64.lintian-overrides b/debian/libdnssec9t64.lintian-overrides
deleted file mode 100644
index 2776c3a..0000000
--- a/debian/libdnssec9t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libdnssec9t64: package-name-doesnt-match-sonames libdnssec9
diff --git a/debian/libknot14t64.lintian-overrides b/debian/libknot14t64.lintian-overrides
deleted file mode 100644
index 1bce072..0000000
--- a/debian/libknot14t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64: package-name-doesnt-match-sonames libknot14
diff --git a/debian/libknot14t64.symbols.alpha b/debian/libknot14t64.symbols.alpha
deleted file mode 120000
index cb14217..0000000
--- a/debian/libknot14t64.symbols.alpha
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.symbols.arc b/debian/libknot14t64.symbols.arc
deleted file mode 120000
index cb14217..0000000
--- a/debian/libknot14t64.symbols.arc
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.symbols.hppa b/debian/libknot14t64.symbols.hppa
deleted file mode 120000
index cb14217..0000000
--- a/debian/libknot14t64.symbols.hppa
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.symbols.hurd-amd64 b/debian/libknot14t64.symbols.hurd-amd64
deleted file mode 120000
index cb14217..0000000
--- a/debian/libknot14t64.symbols.hurd-amd64
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.symbols.ia64 b/debian/libknot14t64.symbols.ia64
deleted file mode 120000
index cb14217..0000000
--- a/debian/libknot14t64.symbols.ia64
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.symbols.loong64 b/debian/libknot14t64.symbols.loong64
deleted file mode 120000
index cb14217..0000000
--- a/debian/libknot14t64.symbols.loong64
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.symbols.m68k b/debian/libknot14t64.symbols.m68k
deleted file mode 120000
index cb14217..0000000
--- a/debian/libknot14t64.symbols.m68k
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.symbols.powerpc b/debian/libknot14t64.symbols.powerpc
deleted file mode 120000
index cb14217..0000000
--- a/debian/libknot14t64.symbols.powerpc
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.symbols.sh4 b/debian/libknot14t64.symbols.sh4
deleted file mode 120000
index cb14217..0000000
--- a/debian/libknot14t64.symbols.sh4
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.symbols.sparc64 b/debian/libknot14t64.symbols.sparc64
deleted file mode 120000
index cb14217..0000000
--- a/debian/libknot14t64.symbols.sparc64
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.symbols.x32 b/debian/libknot14t64.symbols.x32
deleted file mode 120000
index cb14217..0000000
--- a/debian/libknot14t64.symbols.x32
+++ /dev/null
@@ -1 +0,0 @@
-libknot14t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.install b/debian/libknot15t64.install
index f9b9f93..f9b9f93 100644
--- a/debian/libknot14t64.install
+++ b/debian/libknot15t64.install
diff --git a/debian/libknot14t64.symbols b/debian/libknot15t64.symbols
index 1be1ea7..8bfc8b8 100644
--- a/debian/libknot14t64.symbols
+++ b/debian/libknot15t64.symbols
@@ -1,4 +1,4 @@
-libknot.so.14 libknot14t64 #MINVER#
+libknot.so.15 libknot15t64 #MINVER#
* Build-Depends-Package: libknot-dev
KNOT_DB_LMDB_DUPSORT@Base 3.3.0
KNOT_DB_LMDB_INTEGERKEY@Base 3.3.0
@@ -8,10 +8,15 @@ libknot.so.14 libknot14t64 #MINVER#
KNOT_DB_LMDB_RDONLY@Base 3.3.0
KNOT_DB_LMDB_WRITEMAP@Base 3.3.0
KNOT_DUMP_STYLE_DEFAULT@Base 3.3.0
+ knot_creds_cert@Base 3.4.0
+ knot_creds_free@Base 3.4.0
+ knot_creds_init@Base 3.4.0
+ knot_creds_init_peer@Base 3.4.0
+ knot_creds_update@Base 3.4.0
knot_ctl_accept@Base 3.3.0
knot_ctl_alloc@Base 3.3.0
knot_ctl_bind@Base 3.3.0
- knot_ctl_bind2@Base 3.3.6
+ knot_ctl_clone@Base 3.4.0
knot_ctl_close@Base 3.3.0
knot_ctl_connect@Base 3.3.0
knot_ctl_free@Base 3.3.0
@@ -116,19 +121,15 @@ libknot.so.14 libknot14t64 #MINVER#
knot_probe_tcp_rtt@Base 3.3.0
knot_quic_cleanup@Base 3.3.0
knot_quic_client@Base 3.3.0
+ knot_quic_conn_block@Base 3.4.0
knot_quic_conn_get_stream@Base 3.3.0
knot_quic_conn_local_port@Base 3.3.0
knot_quic_conn_new_stream@Base 3.3.0
knot_quic_conn_next_timeout@Base 3.3.3
- knot_quic_conn_pin@Base 3.3.0
knot_quic_conn_rtt@Base 3.3.0
knot_quic_conn_stream_free@Base 3.3.0
- knot_quic_creds_cert@Base 3.3.0
- knot_quic_free_creds@Base 3.3.0
knot_quic_handle@Base 3.3.0
knot_quic_hanle_expiry@Base 3.3.3
- knot_quic_init_creds@Base 3.3.0
- knot_quic_init_creds_peer@Base 3.3.0
knot_quic_send@Base 3.3.0
knot_quic_session_available@Base 3.3.0
knot_quic_session_load@Base 3.3.0
@@ -145,8 +146,8 @@ libknot.so.14 libknot14t64 #MINVER#
knot_rdataset_clear@Base 3.3.0
knot_rdataset_copy@Base 3.3.0
knot_rdataset_eq@Base 3.3.0
- knot_rdataset_intersect@Base 3.3.0
knot_rdataset_intersect2@Base 3.3.0
+ knot_rdataset_intersect@Base 3.3.0
knot_rdataset_member@Base 3.3.0
knot_rdataset_merge@Base 3.3.0
knot_rdataset_subset@Base 3.3.0
@@ -188,6 +189,17 @@ libknot.so.14 libknot14t64 #MINVER#
knot_tcp_sweep@Base 3.3.0
knot_tcp_table_free@Base 3.3.0
knot_tcp_table_new@Base 3.3.0
+ knot_tls_conn_block@Base 3.4.0
+ knot_tls_conn_del@Base 3.4.0
+ knot_tls_conn_new@Base 3.4.0
+ knot_tls_ctx_free@Base 3.4.0
+ knot_tls_ctx_new@Base 3.4.0
+ knot_tls_handshake@Base 3.4.0
+ knot_tls_pin@Base 3.4.0
+ knot_tls_pin_check@Base 3.4.0
+ knot_tls_recv_dns@Base 3.4.0
+ knot_tls_send_dns@Base 3.4.0
+ knot_tls_session@Base 3.4.0
knot_tsig_add@Base 3.3.0
knot_tsig_append@Base 3.3.0
knot_tsig_client_check@Base 3.3.0
@@ -232,8 +244,9 @@ libknot.so.14 libknot14t64 #MINVER#
knot_xdp_send_finish@Base 3.3.0
knot_xdp_send_free@Base 3.3.0
knot_xdp_send_prepare@Base 3.3.0
- knot_xdp_socket_info@Base 3.3.0
knot_xdp_socket_fd@Base 3.3.0
+ knot_xdp_socket_info@Base 3.3.0
+ knot_xdp_socket_stats@Base 3.4.0
yp_addr@Base 3.3.0
yp_addr_noport@Base 3.3.0
yp_addr_noport_to_bin@Base 3.3.0
diff --git a/debian/libknot15t64.symbols.alpha b/debian/libknot15t64.symbols.alpha
new file mode 120000
index 0000000..8ddac81
--- /dev/null
+++ b/debian/libknot15t64.symbols.alpha
@@ -0,0 +1 @@
+libknot15t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot15t64.symbols.arc b/debian/libknot15t64.symbols.arc
new file mode 120000
index 0000000..8ddac81
--- /dev/null
+++ b/debian/libknot15t64.symbols.arc
@@ -0,0 +1 @@
+libknot15t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot15t64.symbols.hppa b/debian/libknot15t64.symbols.hppa
new file mode 120000
index 0000000..8ddac81
--- /dev/null
+++ b/debian/libknot15t64.symbols.hppa
@@ -0,0 +1 @@
+libknot15t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot15t64.symbols.hurd-amd64 b/debian/libknot15t64.symbols.hurd-amd64
new file mode 120000
index 0000000..8ddac81
--- /dev/null
+++ b/debian/libknot15t64.symbols.hurd-amd64
@@ -0,0 +1 @@
+libknot15t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot14t64.symbols.hurd-i386 b/debian/libknot15t64.symbols.hurd-i386
index 613152d..eb301fb 100644
--- a/debian/libknot14t64.symbols.hurd-i386
+++ b/debian/libknot15t64.symbols.hurd-i386
@@ -1,4 +1,5 @@
-libknot.so.14 libknot14t64 #MINVER#
+libknot.so.15 libknot15t64 #MINVER#
+* Build-Depends-Package: libknot-dev
KNOT_DB_LMDB_DUPSORT@Base 3.3.0
KNOT_DB_LMDB_INTEGERKEY@Base 3.3.0
KNOT_DB_LMDB_MAPASYNC@Base 3.3.0
@@ -7,10 +8,15 @@ libknot.so.14 libknot14t64 #MINVER#
KNOT_DB_LMDB_RDONLY@Base 3.3.0
KNOT_DB_LMDB_WRITEMAP@Base 3.3.0
KNOT_DUMP_STYLE_DEFAULT@Base 3.3.0
+ knot_creds_cert@Base 3.4.0
+ knot_creds_free@Base 3.4.0
+ knot_creds_init@Base 3.4.0
+ knot_creds_init_peer@Base 3.4.0
+ knot_creds_update@Base 3.4.0
knot_ctl_accept@Base 3.3.0
knot_ctl_alloc@Base 3.3.0
knot_ctl_bind@Base 3.3.0
- knot_ctl_bind2@Base 3.3.6
+ knot_ctl_clone@Base 3.4.0
knot_ctl_close@Base 3.3.0
knot_ctl_connect@Base 3.3.0
knot_ctl_free@Base 3.3.0
@@ -109,19 +115,15 @@ libknot.so.14 libknot14t64 #MINVER#
knot_probe_tcp_rtt@Base 3.3.0
knot_quic_cleanup@Base 3.3.0
knot_quic_client@Base 3.3.0
+ knot_quic_conn_block@Base 3.4.0
knot_quic_conn_get_stream@Base 3.3.0
knot_quic_conn_local_port@Base 3.3.0
knot_quic_conn_new_stream@Base 3.3.0
knot_quic_conn_next_timeout@Base 3.3.3
- knot_quic_conn_pin@Base 3.3.0
knot_quic_conn_rtt@Base 3.3.0
knot_quic_conn_stream_free@Base 3.3.0
- knot_quic_creds_cert@Base 3.3.0
- knot_quic_free_creds@Base 3.3.0
knot_quic_handle@Base 3.3.0
knot_quic_hanle_expiry@Base 3.3.3
- knot_quic_init_creds@Base 3.3.0
- knot_quic_init_creds_peer@Base 3.3.0
knot_quic_send@Base 3.3.0
knot_quic_session_available@Base 3.3.0
knot_quic_session_load@Base 3.3.0
@@ -138,8 +140,8 @@ libknot.so.14 libknot14t64 #MINVER#
knot_rdataset_clear@Base 3.3.0
knot_rdataset_copy@Base 3.3.0
knot_rdataset_eq@Base 3.3.0
- knot_rdataset_intersect@Base 3.3.0
knot_rdataset_intersect2@Base 3.3.0
+ knot_rdataset_intersect@Base 3.3.0
knot_rdataset_member@Base 3.3.0
knot_rdataset_merge@Base 3.3.0
knot_rdataset_subset@Base 3.3.0
@@ -174,6 +176,17 @@ libknot.so.14 libknot14t64 #MINVER#
knot_tcp_outbufs_add@Base 3.3.0
knot_tcp_outbufs_can_send@Base 3.3.0
knot_tcp_outbufs_usage@Base 3.3.0
+ knot_tls_conn_block@Base 3.4.0
+ knot_tls_conn_del@Base 3.4.0
+ knot_tls_conn_new@Base 3.4.0
+ knot_tls_ctx_free@Base 3.4.0
+ knot_tls_ctx_new@Base 3.4.0
+ knot_tls_handshake@Base 3.4.0
+ knot_tls_pin@Base 3.4.0
+ knot_tls_pin_check@Base 3.4.0
+ knot_tls_recv_dns@Base 3.4.0
+ knot_tls_send_dns@Base 3.4.0
+ knot_tls_session@Base 3.4.0
knot_tsig_add@Base 3.3.0
knot_tsig_append@Base 3.3.0
knot_tsig_client_check@Base 3.3.0
diff --git a/debian/libknot15t64.symbols.ia64 b/debian/libknot15t64.symbols.ia64
new file mode 120000
index 0000000..8ddac81
--- /dev/null
+++ b/debian/libknot15t64.symbols.ia64
@@ -0,0 +1 @@
+libknot15t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot15t64.symbols.loong64 b/debian/libknot15t64.symbols.loong64
new file mode 120000
index 0000000..8ddac81
--- /dev/null
+++ b/debian/libknot15t64.symbols.loong64
@@ -0,0 +1 @@
+libknot15t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot15t64.symbols.m68k b/debian/libknot15t64.symbols.m68k
new file mode 120000
index 0000000..8ddac81
--- /dev/null
+++ b/debian/libknot15t64.symbols.m68k
@@ -0,0 +1 @@
+libknot15t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot15t64.symbols.powerpc b/debian/libknot15t64.symbols.powerpc
new file mode 120000
index 0000000..8ddac81
--- /dev/null
+++ b/debian/libknot15t64.symbols.powerpc
@@ -0,0 +1 @@
+libknot15t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot15t64.symbols.sh4 b/debian/libknot15t64.symbols.sh4
new file mode 120000
index 0000000..8ddac81
--- /dev/null
+++ b/debian/libknot15t64.symbols.sh4
@@ -0,0 +1 @@
+libknot15t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot15t64.symbols.sparc64 b/debian/libknot15t64.symbols.sparc64
new file mode 120000
index 0000000..8ddac81
--- /dev/null
+++ b/debian/libknot15t64.symbols.sparc64
@@ -0,0 +1 @@
+libknot15t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libknot15t64.symbols.x32 b/debian/libknot15t64.symbols.x32
new file mode 120000
index 0000000..8ddac81
--- /dev/null
+++ b/debian/libknot15t64.symbols.x32
@@ -0,0 +1 @@
+libknot15t64.symbols.hurd-i386 \ No newline at end of file
diff --git a/debian/libzscanner4t64.lintian-overrides b/debian/libzscanner4t64.lintian-overrides
deleted file mode 100644
index 3b05fc3..0000000
--- a/debian/libzscanner4t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libzscanner4t64: package-name-doesnt-match-sonames libzscanner4