Merge ~paelzer/ubuntu/+source/chrony:lp-fix-1867036-focal into ubuntu/+source/chrony:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4000

[Robie Basak (racb)]

lgtm

review: Approve

[Christian Ehrhardt  (paelzer)]

uploaded

diff --git a/debian/changelog b/debian/changelog
index 0ea8e2f..73c55aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+chrony (3.5-6ubuntu2) focal; urgency=medium
+
+  * fix capsh usage in focal avoiding to always fall back to -x (LP: #1867036)
+    - d/control: add versioned dependency to libcap2-bin new enough to
+      support --has-p
+    - d/chronyd-starter.sh: update capsh usage to use --has-p
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 31 Mar 2020 10:19:20 +0200
+
 chrony (3.5-6ubuntu1) focal; urgency=medium
 
   * Merge with Debian unstable (LP: #1866753). Remaining changes:
diff --git a/debian/chronyd-starter.sh b/debian/chronyd-starter.sh
index c175db5..55cc285 100755
--- a/debian/chronyd-starter.sh
+++ b/debian/chronyd-starter.sh
@@ -47,7 +47,7 @@ if [ ${X_SET} -ne 1 ]; then
   HAS_CAP=1
   CAPSH="/sbin/capsh"
   if [ -x "${CAPSH}" ]; then
-      ${CAPSH} --print | grep -q "^Current.*${CAP}" || HAS_CAP=0
+      ${CAPSH} --has-p="${CAP}" || HAS_CAP=0
   fi
 
   if [ ${HAS_CAP} -eq 0 ]; then
diff --git a/debian/control b/debian/control
index 830ff1f..8f9ec5c 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: adduser,
          iproute2 [linux-any],
-         libcap2-bin,
+         libcap2-bin (>= 1:2.32-1),
          ucf,
          ${misc:Depends},
          ${shlibs:Depends}