Merging debian version 4.5-2.

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

6 files changed, 50 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index bbbec50..ced1d2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+chrony (4.5-2) unstable; urgency=medium
+
+  * debian/copyright:
+    - Update copyright year for debian/*.
+
+  * debian/control:
+    - Build depend on pkgconf instead of pkg-config.
+    - Bump Standards-Version to 4.7.0 (no changes needed).
+
+  * debian/rules:
+    - Disable seccomp on loong64 until libseccomp in Debian supports it.
+
+  * debian/tests/upstream-simulation-test-suite:
+    - Build clknetsim with extra CFLAGS on armel and armhf architectures as it
+    needs to use the same time_t as the chronyd binary.
+    - Update clknetsim version.
+    - Prevent connection timeout on slow architectures.
+    - Remove unused environment variable.
+
+  [ Bryce Harrington ]
+  * debian/usr.sbin.chronyd:
+    - Fix failure to start timemaster due to lack of rw permissions on chrony
+    socket. (LP: #2032805)
+    - Allow the default UNIX domain socket address to be used by the
+    reflock_sock service in the AppArmor configuration.
+
+ -- Vincent Blut <vincent.debian@free.fr>  Thu, 25 Apr 2024 15:52:18 +0200
+
 chrony (4.5-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index f1424f1..84fad34 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
 XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
 XSBC-Original-Maintainer: Vincent Blut <vincent.debian@free.fr>
 Bugs: mailto:maintainers@lists.progress-linux.org
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Build-Depends: asciidoctor,
                bison,
                debhelper-compat (= 13),
@@ -17,7 +17,7 @@ Build-Depends: asciidoctor,
                libgnutls28-dev,
                libseccomp-dev (>= 2.4.3-1~) [amd64 arm64 armel armhf hppa i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el riscv64 s390x x32],
                nettle-dev,
-               pkg-config,
+               pkgconf,
                pps-tools [linux-any],
                procps <!nocheck>
 Homepage: https://chrony-project.org
diff --git a/debian/copyright b/debian/copyright
index 8b67760..5b4e5e6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,7 +33,7 @@ Copyright: 2001, J. Hannken-Illjes
 License: GPL-2
 
 Files: debian/*
-Copyright: 2015-2023, Vincent Blut
+Copyright: 2015-2024, Vincent Blut
            2012-2014, Joachim Wiedorn
            2000-2012, John Hasler
 License: GPL-2
diff --git a/debian/rules b/debian/rules
index 2bb8023..ed6d9b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ override_dh_installinit:
 	dh_installinit
 # Disable the system call filter on architectures mentioned below
 # due to missing support in libseccomp and/or in the Linux kernel.
-ifneq (,$(filter $(DEB_HOST_ARCH), alpha ia64 m68k sh4 sparc64))
+ifneq (,$(filter $(DEB_HOST_ARCH), alpha ia64 loong64 m68k sh4 sparc64))
 	sed -i '/DAEMON_OPTS=/s/"-F 1"/""/' $(BASE)/etc/default/chrony
 endif
 
diff --git a/debian/tests/upstream-simulation-test-suite b/debian/tests/upstream-simulation-test-suite
index 427c710..a43d340 100644
--- a/debian/tests/upstream-simulation-test-suite
+++ b/debian/tests/upstream-simulation-test-suite
@@ -7,16 +7,17 @@
 set -e
 
 testdir="$PWD/test/simulation"
-clknetsim_ver=5d1dc05
+clknetsim_ver=0a11a35
 clknetsim_src=https://github.com/mlichvar/clknetsim/archive/"$clknetsim_ver"/clknetsim-"$clknetsim_ver".tar.gz
 clknetsim_archive=$(basename "$clknetsim_src")
 
 export CLKNETSIM_PATH="$AUTOPKGTEST_TMP"
+export CLKNETSIM_CONNECT_TIMEOUT=100
 
 # Always use the same seed to get deterministic results
 export CLKNETSIM_RANDOM_SEED=24508
 
-DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_BUILD_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
 
 # The simulation tests are only supported on Linux.
 dpkg-architecture -ilinux-any || exit 77
@@ -27,7 +28,14 @@ prepare_clknetsim() {
         -C "$CLKNETSIM_PATH" --strip-components=1 2>&1 || exit 77
 
     if [ ! -x "$CLKNETSIM_PATH/clknetsim" ] && [ ! -e "$CLKNETSIM_PATH/clknetsim.so" ]; then
-        make -C "$CLKNETSIM_PATH" 2>&1
+        case "$DEB_BUILD_ARCH" in
+            armel|armhf)
+                CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64" make -C "$CLKNETSIM_PATH" 2>&1
+                ;;
+            *)
+                make -C "$CLKNETSIM_PATH" 2>&1
+                ;;
+        esac
     fi
 }
 
diff --git a/debian/usr.sbin.chronyd b/debian/usr.sbin.chronyd
index bc52d4f..33254ac 100644
--- a/debian/usr.sbin.chronyd
+++ b/debian/usr.sbin.chronyd
@@ -62,6 +62,8 @@ abi <abi/3.0>,
   @{run}/chrony.*.sock rw,
   # To sign replies to MS-SNTP clients by the smbd daemon
   /var/lib/samba/ntp_signd/socket rw,
+  # Default path of the socket to sync with ptp4l
+  @{run}/refclock.ptp.sock rw,
 
   # rtc
   /etc/adjtime r,
@@ -71,8 +73,11 @@ abi <abi/3.0>,
   /dev/pps[0-9]* rw,
   /dev/ptp[0-9]* rw,
 
-  # Allow reading the chronyd configuration file that timemaster(8) generates
-  @{run}/timemaster/chrony.conf r,
+  # 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,
 
   # 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