Merging debian version 4.6-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 54 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 675d10a..b8e4b90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+chrony (4.6-1) unstable; urgency=medium
+
+  * Import upstream version 4.6-1:
+    - Please see /usr/share/doc/chrony/NEWS.gz for the release notes.
+
+  * debian/copyright:
+    - Update copyright years.
+    - Add Files stanzas.
+
+  * debian/tests/upstream-simulation-test-suite:
+    - Update clknetsim version.
+
+ -- Vincent Blut <vincent.debian@free.fr>  Mon, 02 Sep 2024 19:37:15 +0200
+
+chrony (4.6~pre1-1) experimental; urgency=medium
+
+  * Import upstream version 4.6-pre1:
+    - Please see /usr/share/doc/chrony/NEWS.gz for the release notes.
+
+  * debian/chrony.conf:
+    - Use the leapseclist directive to read NIST/IERS leap-seconds.list file.
+
+  * debian/control:
+    - Revert "d/control: Depend on tzdata-legacy". chronyd is now able to read
+    the NIST/IERS leap-seconds.list file so we don't need to rely on the
+    right/UTC timezone to get the TAI-UTC offsets. This renders the dependency
+    on tzdata-legacy unnecessary.
+
+  * debian/tests/control:
+    - Revert "d/t/control: Let upstream-simulation-test-suite depend on
+    tzdata-legacy".
+
+ -- Vincent Blut <vincent.debian@free.fr>  Tue, 30 Jul 2024 15:01:19 +0200
+
 chrony (4.5-3~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/chrony.conf b/debian/chrony.conf
index 13570c4..db6da14 100644
--- a/debian/chrony.conf
+++ b/debian/chrony.conf
@@ -44,4 +44,4 @@ makestep 1 3
 # Get TAI-UTC offset and leap seconds from the system tz database.
 # This directive must be commented out when using time sources serving
 # leap-smeared time.
-leapsectz right/UTC
+leapseclist /usr/share/zoneinfo/leap-seconds.list
diff --git a/debian/control b/debian/control
index 84fad34..90e1068 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: adduser (>= 3.130),
          iproute2 [linux-any],
-         tzdata-legacy,
+         tzdata,
          ucf,
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/copyright b/debian/copyright
index 5b4e5e6..0621c43 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Miroslav Lichvar <mlichvar@redhat.com>
 Source: https://chrony-project.org/releases/
 
 Files: *
-Copyright: 2009-2021, Miroslav Lichvar
+Copyright: 2009-2024, Miroslav Lichvar
            1997-2007, Richard P. Curnow
 License: GPL-2
 
@@ -56,7 +56,7 @@ Copyright: 2015, Bryan Christianson
 License: GPL-2
 
 Files: test/unit/*
-Copyright: 2016-2023, Miroslav Lichvar
+Copyright: 2016-2024, Miroslav Lichvar
 License: GPL-2
 
 Files: hwclock.?
@@ -74,7 +74,7 @@ License: GPL-2
 Files: client.c
 Copyright: 1997-2003, Richard P. Curnow
            2016, Lonnie Abelbeck
-           2009-2023, Miroslav Lichvar
+           2009-2024, Miroslav Lichvar
 License: GPL-2
 
 Files: configure
@@ -87,7 +87,7 @@ License: GPL-2
 Files: doc/chrony.conf.adoc
 Copyright: 1997-2003, Richard P. Curnow
            2016, Stephen Wadeley
-           2009-2023, Miroslav Lichvar
+           2009-2024, Miroslav Lichvar
            2017, Bryan Christianson
 License: GPL-2
 
@@ -100,7 +100,7 @@ License: GPL-2
 Files: doc/faq.adoc
 Copyright: 1997-2003, Richard P. Curnow
            2023, Luke Valenta
-           2014-2016, 2020-2023, Miroslav Lichvar
+           2014-2016, 2020-2024, Miroslav Lichvar
 License: GPL-2
 
 Files: refclock.c
@@ -145,6 +145,17 @@ Files: test/system/*
 Copyright: 2019, Miroslav Lichvar
 License: GPL-2
 
+Files: leapdb.h
+       test/unit/leapdb.c
+Copyright: 2024, Patrick Oppenlander
+License: GPL-2
+
+Files: reference.c
+Copyright: 1997-2003, Richard P. Curnow
+           2009-2018, 2020, 2022, Miroslav Lichvar
+           2024, Andy Fiddaman
+License: GPL-2
+
 Files: md5.*
 Copyright: 1990, RSA Data Security, Inc. All rights reserved.
 License: RSA-MD
diff --git a/debian/tests/control b/debian/tests/control
index 98b9106..5586711 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: upstream-simulation-test-suite
-Depends: @builddeps@, build-essential, ca-certificates, tzdata-legacy, wget
+Depends: @builddeps@, build-essential, ca-certificates, wget
 Restrictions: isolation-container, build-needed, skippable, needs-root, needs-internet
 
 Tests: time-sources-from-dhcp-servers
diff --git a/debian/tests/upstream-simulation-test-suite b/debian/tests/upstream-simulation-test-suite
index ac9545f..c00cfa8 100644
--- a/debian/tests/upstream-simulation-test-suite
+++ b/debian/tests/upstream-simulation-test-suite
@@ -7,7 +7,7 @@
 set -e
 
 testdir="$PWD/test/simulation"
-clknetsim_ver=633a0be
+clknetsim_ver=64df92c5
 clknetsim_src=https://github.com/mlichvar/clknetsim/archive/"$clknetsim_ver"/clknetsim-"$clknetsim_ver".tar.gz
 clknetsim_archive=$(basename "$clknetsim_src")