summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-26 06:27:41 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-26 06:27:41 +0000
commitd07c1378a94355391bce13c14f644cdc41c909a1 (patch)
tree57a62c0aad7e6788fe2353249256d26552a91e2f /debian
parentReleasing progress-linux version 4.5-2~progress7.99u1. (diff)
downloadchrony-d07c1378a94355391bce13c14f644cdc41c909a1.tar.xz
chrony-d07c1378a94355391bce13c14f644cdc41c909a1.zip
Merging debian version 4.5-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--debian/changelog10
-rw-r--r--debian/tests/upstream-simulation-test-suite2
-rw-r--r--debian/usr.sbin.chronyd4
3 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 7f29393..35f1e01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+chrony (4.5-3) unstable; urgency=medium
+
+ * debian/upstream-simulation-test-suite:
+ - Update clknetsim version (Closes: #1073861)
+
+ * debian/usr.sbin.chronyd:
+ - Don't be too strict on allowed socket paths (LP: #2068526)
+
+ -- Vincent Blut <vincent.debian@free.fr> Thu, 20 Jun 2024 00:41:37 +0200
+
chrony (4.5-2~progress7.99u1) graograman-backports; urgency=medium
* Uploading to graograman-backports, remaining changes:
diff --git a/debian/tests/upstream-simulation-test-suite b/debian/tests/upstream-simulation-test-suite
index a43d340..ac9545f 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=0a11a35
+clknetsim_ver=633a0be
clknetsim_src=https://github.com/mlichvar/clknetsim/archive/"$clknetsim_ver"/clknetsim-"$clknetsim_ver".tar.gz
clknetsim_archive=$(basename "$clknetsim_src")
diff --git a/debian/usr.sbin.chronyd b/debian/usr.sbin.chronyd
index 33254ac..0014977 100644
--- a/debian/usr.sbin.chronyd
+++ b/debian/usr.sbin.chronyd
@@ -76,8 +76,8 @@ abi <abi/3.0>,
# Allow reading the chronyd configuration file that timemaster(8)
# generates, along with any other config files and sockets.
@{run}/timemaster/* r,
- # Allow read-write on the default socket path for coodination.
- @{run}/timemaster/chrony.SOCK0 rw,
+ # Allow read-write access to the socket path(s).
+ @{run}/timemaster/chrony.SOCK[0-9]* rw,
# For use with clocks that report via shared memory (e.g. gpsd),
# you may need to give ntpd access to all of shared memory, though