Merge ~slyon/ubuntu/+source/linuxptp:merge-lp2130003-resolute into ~slyon/ubuntu/+source/linuxptp:new-upstream-release

[Lukas Märdian]

Note: This merge is a bit special, as we're moving ahead of Debian, but actually basing our work on top of a pending Salsa MR: https://salsa.debian.org/multimedia-team/linuxptp/-/merge_requests/4

I decided to call that not-yet-in-Debian version 4.4-0~salsa1/experimental.
The branch that I've rebased onto is here: https://salsa.debian.org/vblut/linuxptp/-/tree/new-upstream-release

PPA: https://launchpad.net/~slyon/+archive/ubuntu/merge-lp2130003-resolute/+packages

DEP-8:
- passes locally:
$ autopkgtest ../*_4.4-0ubuntu1*.deb . -- lxd autopkgtest/ubuntu/resolute/amd64
[...]
autopkgtest [16:29:16]: @@@@@@@@@@@@@@@@@@@@ summary
simulation-test-suite PASS

$ ppa tests ppa:slyon/merge-lp2130003-resolute -r resolute
[...]
* Results:
  - linuxptp: resolute/linuxptp/4.4-0ubuntu1~ppa1 [amd64]
    + ✅ linuxptp on resolute for amd64 @ 11.12.25 17:27:07 Log️ 🗒️
  - linuxptp: resolute/linuxptp/4.4-0ubuntu1~ppa1 [arm64]
    + ✅ linuxptp on resolute for arm64 @ 11.12.25 17:21:14 Log️ 🗒️
  - linuxptp: resolute/linuxptp/4.4-0ubuntu1~ppa1 [armhf]
    + ✅ linuxptp on resolute for armhf @ 11.12.25 17:25:25 Log️ 🗒️
  - linuxptp: resolute/linuxptp/4.4-0ubuntu1~ppa1 [ppc64el]
    + ✅ linuxptp on resolute for ppc64el @ 11.12.25 17:21:13 Log️ 🗒️
  - linuxptp: resolute/linuxptp/4.4-0ubuntu1~ppa1 [s390x]
    + ✅ linuxptp on resolute for s390x @ 11.12.25 17:36:27 Log️ 🗒️

Range diff:
$ git range-diff lp2130003/old/debian..lp2130003/old/ubuntu lp2130003/new/debian..merge-lp2130003-resolute

[Athos Ribeiro (athos)]

Thanks, Lukas! I am reviewing this one

[Lukas Märdian (slyon)]

Important note from Salsa:

"""
Upstream supports 4 different cryptographic libraries to enable this features:

- GnuPG
- GnuTLS
- Nettle
- OpenSSL

I decided to go with Nettle because it was the least burdensome choice. OpenSSL enforces a license change to GPLv3 on LinuxPTP, GnuTLS depends on nettle-dev so we end up with both the Nettle and GnuTLS backends enabled if we don’t patch the upstream source and I did not considerate GnuPG.
"""

=> going with Nettle should be fine as long as the package stays in universe.

[Athos Ribeiro (athos)]

Thanks Lukas!
LGTM (thanks for taking the time to figure out all the tags for this non-conventional merge)

review: Approve

diff --git a/debian/changelog b/debian/changelog
index ff4f062..5af053d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,37 @@
-linuxptp (4.4-1) UNRELEASED; urgency=medium
+linuxptp (4.4-0ubuntu1) resolute; urgency=medium
+
+  * Merge with Salsa MR#4 (LP: #2130003, LP: #2115203). Remaining changes:
+    - Add autopkgtest to run linuxptp-testsuite.
+      + d/t/linuxptp-testsuite: Include a copy of linuxptp-testsuite from
+        https://github.com/mlichvar/linuxptp-testsuite.
+      + d/t/README: Instructions to update the test suite for new upstream
+        versions.
+      + Note that the tests use needs-internet to download clknetsim, like
+        in the chrony autopkgtests.
+    - d/copyright: Add test suite copyright clauses.
+    - Add AppArmor rules for ptp4l (LP #2083458)
+      + d/control: Add dh-apparmor dependency
+      + d/linuxptp.install: Add aa rules destdir
+      + d/rules: Add section for aa profile adition
+      + d/tests/simulation-test-suite: Add script function to inject additional
+        local aa rules needed for autopkgtest
+      + d/tests/control: Add needs-sudo capability
+      + d/usr.sbin.ptp4l: aa profile for ptp4l application
+    - Add AppArmor rules for timemaster (ref LP #2083458)
+      + d/linuxptp.install: Add aa rules destdir for timemaster
+      + d/rules: Add timemaster aa profile entry
+      + d/usr.sbin.timemaster: aa profile for timemaster service
+    - Add AppArmor rules for phc2sys (ref LP #2083458)
+      + d/linuxptp.install: Add aa rules destdir for phc2sys
+      + d/rules: Add phc2sys aa profile entry
+      + d/tests/simulation-test-suite: Insert rule on aa profile for autopkgtest
+      + d/usr.sbin.phc2sys: aa profile for phc2sys service
+  * Drop Changes:
+    - d/timemaster.conf: Fix path to chrony.conf. [applied in Debian]
+
+ -- Lukas Märdian <[e-mail]>  Thu, 11 Dec 2025 15:59:21 +0100
+
+linuxptp (4.4-0~salsa1) experimental; urgency=medium
 
   * New upstream version 4.4 (Closes: #1108202)
   * d/control: Update Homepage
@@ -23,6 +56,48 @@ linuxptp (4.4-1) UNRELEASED; urgency=medium
 
  -- Vincent Blut <[e-mail]>  Sun, 21 Sep 2025 20:42:49 +0200
 
+linuxptp (4.2-1ubuntu2) questing; urgency=medium
+
+  * Add AppArmor rules for ptp4l (LP: #2083458)
+    - d/control: Add dh-apparmor dependency
+    - d/linuxptp.install: Add aa rules destdir
+    - d/rules: Add section for aa profile adition
+    - d/tests/simulation-test-suite: Add script function to inject additional local
+        aa rules needed for autopkgtest
+    - d/tests/control: Add needs-sudo capability
+    - d/usr.sbin.ptp4l: aa profile for ptp4l application
+
+  * Add AppArmor rules for timemaster (ref LP #2083458)
+    - d/linuxptp.install: Add aa rules destdir for timemaster
+    - d/rules: Add timemaster aa profile entry
+    - d/usr.sbin.timemaster: aa profile for timemaster service
+
+  * Add AppArmor rules for phc2sys (ref LP #2083458)
+    - d/linuxptp.install: Add aa rules destdir for phc2sys
+    - d/rules: Add phc2sys aa profile entry
+    - d/tests/simulation-test-suite: Insert rule on aa profile for autopkgtest
+    - d/usr.sbin.phc2sys: aa profile for phc2sys service
+
+ -- Lincoln Wallace <[e-mail]>  Wed, 02 Oct 2024 15:50:17 -0300
+
+linuxptp (4.2-1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2073737). Remaining changes:
+    - d/timemaster.conf: Fix path to chrony.conf.
+      (LP #2032805)
+    - Add autopkgtest to run linuxptp-testsuite.
+      + d/t/linuxptp-testsuite: Include a copy of linuxptp-testsuite from
+        https://github.com/mlichvar/linuxptp-testsuite.
+      + d/t/README: Instructions to update the test suite for new upstream
+        versions.
+      + Note that the tests use needs-internet to download clknetsim, like
+        in the chrony autopkgtests.
+    - d/copyright: Add test suite copyright clauses.
+  * New Changes:
+    - d/tests: Update test suite for linuxptp 4.2
+
+ -- JP Meijers <[e-mail]>  Tue, 30 Jul 2024 10:15:18 +0200
+
 linuxptp (4.2-1) unstable; urgency=medium
 
   [ IOhannes m zmölnig (Debian/GNU) ]
@@ -36,6 +111,34 @@ linuxptp (4.2-1) unstable; urgency=medium
 
  -- Punit Agrawal <[e-mail]>  Sat, 30 Mar 2024 07:11:06 +0000
 
+linuxptp (4.0-1ubuntu3) oracular; urgency=medium
+
+  * Fix simulation-test-suite autopkgtest to properly pickup clknetsim
+    from wget-ed download instead of trying to git clone it.
+
+ -- JP Meijers <[e-mail]>  Thu, 13 Jun 2024 15:57:28 +0000
+
+linuxptp (4.0-1ubuntu2) oracular; urgency=medium
+
+  * Add autopkgtest to run linuxptp-testsuite.
+    - See https://code.launchpad.net/~jpm/ubuntu/+source/linuxptp/+git/linuxptp/+merge/466495
+    - Include a copy of linuxptp-testsuite from
+      https://github.com/mlichvar/linuxptp-testsuite under debian/tests;
+      instructions to update the snapshot for new upstream versions are in
+      debian/tests/README.
+    - Update debian/copyright.
+    - Note that the tests use needs-internet to download clknetsim, like
+      in the chrony autopkgtests.
+
+ -- JP Meijers <[e-mail]>  Wed, 12 Jun 2024 16:02:49 +0000
+
+linuxptp (4.0-1ubuntu1) noble; urgency=medium
+
+  * d/timemaster.conf: Fix path to chrony.conf.
+    (LP: #2032805)
+
+ -- Bryce Harrington <[e-mail]>  Mon, 01 Apr 2024 18:42:08 -0700
+
 linuxptp (4.0-1) unstable; urgency=medium
 
   * New upstream version 4.0
diff --git a/debian/control b/debian/control
index e793e8b..04464e9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,13 @@
 Source: linuxptp
 Section: utils
-Maintainer: Debian Multimedia Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Multimedia Maintainers <[e-mail]>
 Uploaders:
  Tino Mettler <[e-mail]>,
  Punit Agrawal <[e-mail]>,
 Build-Depends:
  debhelper-compat (= 13),
+ dh-apparmor,
  dh-exec,
  nettle-dev
 Standards-Version: 4.7.2
diff --git a/debian/copyright b/debian/copyright
index 70a7d26..5f14ca9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,6 +21,31 @@ Copyright: 2014-2015 Miroslav Lichvar <[e-mail]>
            2015 Tino Mettler <[e-mail]>
 License:   GPL-2.0+
 
+Files:     debian/tests/linuxptp-testsuite/*
+Copyright: 2013-2024 Miroslav Lichvar <[e-mail]>
+License:   GPL-2.0+
+
+Files:     debian/tests/simulation-test-suite
+Copyright: 2015-2023 Vincent Blut <[e-mail]>
+           2024 Canonical Ltd
+License:   GPL-2
+
+License: GPL-2
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as
+  published by the Free Software Foundation.
+  .
+  This package is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  .
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  .
+  On Debian systems, the complete text of the GNU General Public License
+  version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
+
 License: GPL-2.0+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/linuxptp.install b/debian/linuxptp.install
index ad008d9..f0706a0 100755
--- a/debian/linuxptp.install
+++ b/debian/linuxptp.install
@@ -1,3 +1,6 @@
 #!/usr/bin/dh-exec
 configs/default.cfg => /etc/linuxptp/ptp4l.conf
 debian/timemaster.conf /etc/linuxptp/
+debian/usr.sbin.ptp4l etc/apparmor.d
+debian/usr.sbin.timemaster etc/apparmor.d
+debian/usr.sbin.phc2sys etc/apparmor.d
diff --git a/debian/rules b/debian/rules
index 38cfc04..01e297f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,11 @@ export DH_VERBOSE = 1
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr mandir=/usr/share/man
 
+execute_after_dh_install:
+	dh_apparmor --profile-name=usr.sbin.ptp4l -plinuxptp
+	dh_apparmor --profile-name=usr.sbin.timemaster -plinuxptp
+	dh_apparmor --profile-name=usr.sbin.phc2sys -plinuxptp
+
 override_dh_installsystemd:
 	dh_installsystemd --no-enable --no-start --name=ptp4l@
 	dh_installsystemd --no-enable --no-start --name=phc2sys@
diff --git a/debian/tests/README b/debian/tests/README
new file mode 100644
index 0000000..cb21cb2
--- /dev/null
+++ b/debian/tests/README
@@ -0,0 +1,51 @@
+# linuxptp-testsuite
+
+The directory linuxptp-testsuite contains a snapshot of the test suite source 
+code from https://github.com/mlichvar/linuxptp-testsuite.git at commit hash 
+bf8eadc.
+
+The version of linuxptp-testsuite needs to be compatible with the version of 
+linuxptp in this package. A summary of known compatible versions are listed 
+below in the compatibility matrix.
+
+When the version of linuxptp is updated, these tests need to be updated too.
+
+
+## Copying test suite
+
+A tar archive of linuxptp-testsuite can be downloaded from Github and extracted
+to the linuxptp-testsuite directory with these commands:
+
+$ COMMIT_ID=bf8eadc
+$ wget https://github.com/mlichvar/linuxptp-testsuite/archive/$COMMIT_ID/linuxptp-testsuite-$COMMIT_ID.tar.gz
+$ mkdir linuxptp-testsuite
+$ tar -xvzf linuxptp-testsuite-$COMMIT_ID.tar.gz -C linuxptp-testsuite --strip-components=1
+$ rm linuxptp-testsuite-$COMMIT_ID.tar.gz
+
+
+git-ubuntu does not want .gitignore files in the archive package. Therefore remove it:
+
+$ rm linuxptp-testsuite/.gitignore
+
+
+## Automotive test
+
+The test script 36-automotive is taken from commit d27dbdb of the test-suite and 
+added manually here. This is for extra coverage of the automotive related 
+configurations of linuxptp. These are not properly covered by commit b4763bb of
+linuxptp-testsuite which is compatible with v4.0 of linuxptp. This will also be 
+required for linuxptp v4.0, v4.1 and v4.2. After that the upstream issue is 
+solved. See https://github.com/mlichvar/linuxptp-testsuite/issues/13
+
+$ wget https://raw.githubusercontent.com/mlichvar/linuxptp-testsuite/master/36-automotive -O linuxptp-testsuite/36-automotive
+$ chmod 775 linuxptp-testsuite/36-automotive
+
+
+## Version compatibility matrix
+
+linuxptp version  |  linuxptp-testsuite commit id
+------------------|------------------------------
+v4.0              |  b4763bb
+v4.1              |  248073c
+v4.2              |  bf8eadc
+v4.3              |  d27dbdb (includes 36-automotive)
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..147f518
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: simulation-test-suite
+Depends: wget, g++, make, linuxptp
+Restrictions: allow-stderr, isolation-container, build-needed, skippable, needs-internet, needs-sudo
diff --git a/debian/tests/linuxptp-testsuite/01-defaults b/debian/tests/linuxptp-testsuite/01-defaults
new file mode 100755
index 0000000..b2017de
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/01-defaults
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l in default test settings"
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/02-swts b/debian/tests/linuxptp-testsuite/02-swts
new file mode 100755
index 0000000..076fcab
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/02-swts
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with software time stamping"
+
+limit=2000
+min_sync_time=50
+max_sync_time=300
+
+master_conf="time_stamping software"
+slave_conf="time_stamping software"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+master_conf="time_stamping hardware"
+slave_conf="time_stamping software"
+run_ptp4l || test_fail
+# this should fail (UTC-TAI offset)
+check_sync && test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/03-p2pdm b/debian/tests/linuxptp-testsuite/03-p2pdm
new file mode 100755
index 0000000..6c24c14
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/03-p2pdm
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with P2P delay mechanism"
+
+nodes=2
+
+master_conf="delay_mechanism P2P"
+slave_conf="delay_mechanism P2P"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+master_conf="delay_mechanism P2P"
+slave_conf="delay_mechanism E2E"
+run_ptp4l || test_fail
+# this should fail
+check_sync && test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/04-manynodes b/debian/tests/linuxptp-testsuite/04-manynodes
new file mode 100755
index 0000000..3807b86
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/04-manynodes
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with many nodes"
+
+nodes=10
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/05-clockclass b/debian/tests/linuxptp-testsuite/05-clockclass
new file mode 100755
index 0000000..0919fa2
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/05-clockclass
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l master selection (clockClass, priority1, priority2)" 
+
+master_nodes="2"
+
+master_conf="clockClass 6"
+slave_conf=""
+run_ptp4l || test_fail
+check_sync || test_fail
+
+master_conf=""
+slave_conf="clockClass 249"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+master_conf="priority1 127"
+slave_conf=""
+run_ptp4l || test_fail
+check_sync || test_fail
+
+master_conf=""
+slave_conf="priority2 129"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/06-slaveonly b/debian/tests/linuxptp-testsuite/06-slaveonly
new file mode 100755
index 0000000..454fd48
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/06-slaveonly
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with slaveOnly option"
+
+nodes=3
+master_nodes="2"
+slave_conf="slaveOnly 1"
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/07-latereselect b/debian/tests/linuxptp-testsuite/07-latereselect
new file mode 100755
index 0000000..b05218c
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/07-latereselect
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with late master reselect"
+
+master_start=100.0
+slave_start=0.0
+slave_conf="logging_level 7
+pi_offset_const 0.05"
+min_sync_time=110
+max_sync_time=140
+
+run_ptp4l || test_fail
+check_sync || test_fail
+check_ptp4l_delay || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/08-largefreq b/debian/tests/linuxptp-testsuite/08-largefreq
new file mode 100755
index 0000000..88ecd9a
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/08-largefreq
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with large frequency offsets"
+
+# System clock allows larger frequency adjustment
+master_conf="time_stamping software"
+slave_conf="time_stamping software
+pi_proportional_scale 0.7
+pi_integral_scale 0.3"
+max_sync_time=80
+
+freq_offset=$(awk 'BEGIN { print 1 / 0.91 - 1 }')
+run_ptp4l || test_fail
+check_sync || test_fail
+
+freq_offset=$(awk 'BEGIN { print 1 / 1.09 - 1 }')
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/09-largeoffset b/debian/tests/linuxptp-testsuite/09-largeoffset
new file mode 100755
index 0000000..d51644b
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/09-largeoffset
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with large initial offsets"
+
+time_offset=1e9
+run_ptp4l || test_fail
+check_sync || test_fail
+
+time_offset=-1e9
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/10-largeslew b/debian/tests/linuxptp-testsuite/10-largeslew
new file mode 100755
index 0000000..ae203c2
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/10-largeslew
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with large initial slew"
+
+slave_conf="pi_f_offset_const 0.0"
+min_sync_time=330
+max_sync_time=360
+
+time_offset=10
+run_ptp4l || test_fail
+check_sync || test_fail
+
+time_offset=-10
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/11-syncinterval b/debian/tests/linuxptp-testsuite/11-syncinterval
new file mode 100755
index 0000000..9a0a73b
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/11-syncinterval
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with various sync intervals"
+
+max_sync_time=320
+
+for i in $(seq -4 2 4); do
+	update_interval=$i
+	master_conf="logSyncInterval $i"
+	freq_max_limit=$(awk 'BEGIN {print 2e-6 / (2**'$i')**0.5}')
+	run_ptp4l || test_fail
+	check_sync || test_fail
+done
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/12-phc2sys b/debian/tests/linuxptp-testsuite/12-phc2sys
new file mode 100755
index 0000000..05036d0
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/12-phc2sys
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+. test.common
+
+test_start "phc2sys"
+
+nodes=1
+master_nodes="0"
+phc2sys_node=1
+phc2sys_conf="-O 0 -s /dev/ptp0"
+
+run_test || test_fail
+check_sync || test_fail
+
+time_max_limit=1e-8
+phc2sys_conf="-O 0 -d /dev/pps0"
+
+run_test || test_fail
+check_sync || test_fail
+
+phc2sys_conf="-O 0 -s /dev/ptp0 -d /dev/pps0"
+
+run_test || test_fail
+check_sync || test_fail
+
+nodes=3
+subnets="1 2 3 | 1 2 3"
+master_nodes="1"
+master_conf="utc_offset 30"
+refclock_offset="-30"
+phc2sys_node=3
+phc2sys_uds="2:1"
+phc2sys_phc_base=2
+phc2sys_phc_swap=1
+time_max_limit=$default_time_max_limit
+
+phc2sys_conf="-w -s eth0"
+
+run_test || test_fail
+check_sync || test_fail
+
+phc2sys_conf="-a -r"
+# network down at 150-250 in subnet 1 and 100-200 in subnet 2
+base_delay=$(cat <<-EOF | tr -d '\n'
+  (+ $default_base_delay
+    (* -1
+      (equal 0.6 subnet 1.5)
+      (equal 0.1 (min (+ time (* subnet 50) -100) 100) 100)
+      (equal 0.1 (max (+ time (* subnet 50) -100) 200) 200)))
+EOF
+)
+# step at 170th second
+slave_step="(* $time_offset (equal 0.1 (sum 1.0) 170))"
+min_sync_time=215
+max_sync_time=240
+
+run_test || test_fail
+check_sync || test_fail
+
+nodes=4
+subnets="1 2 4 | 1 3 4"
+phc2sys_node=4
+phc2sys_phc_base=3
+phc2sys_uds="3:1 2:1"
+max_sync_time=290
+
+run_test || test_fail
+check_sync || test_fail
+
+check_any_log_message 4 "\[[12].\..*select.*out-of-domain" "eth1" || test_fail
+check_any_log_message 4 "\[10.\..*select.*out-of-domain" "eth0" || test_fail
+check_any_log_message 4 "\[20.\..*select.*out-of-domain" "eth1" || test_fail
+check_any_log_message 4 "\[25.\..*select.*out-of-domain" "eth1" || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/13-delayedfup b/debian/tests/linuxptp-testsuite/13-delayedfup
new file mode 100755
index 0000000..1624aee
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/13-delayedfup
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+. test.common
+
+# In linuxptp-1.2 and earlier cached followup message was incorrectly
+# paired with sync message when sequence id overflowed
+
+test_start "ptp4l with long delay between sync and followup"
+
+limit=67000
+jitter=0.0
+wander=0.0
+nodes=2
+base_delay="(+ 1e-6 (* 0.5 (+ port -319)))"
+max_sync_time=45
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/14-boundary b/debian/tests/linuxptp-testsuite/14-boundary
new file mode 100755
index 0000000..81709d1
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/14-boundary
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with boundary clocks"
+
+# 1 --- 2 --- 3
+#       |     |
+#       4 --- 5 --- 6,7
+subnets="1 2 | 2 3 | 2 4 | 3 5 | 4 5 | 5 6 7"
+nodes=7
+max_sync_time=100
+time_max_limit=5e-6
+freq_max_limit=5e-6
+master_conf="clockClass 6"
+
+for master_nodes in "1" "4" "7"; do
+	run_ptp4l || test_fail
+	check_sync || test_fail
+done
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/15-largejitter b/debian/tests/linuxptp-testsuite/15-largejitter
new file mode 100755
index 0000000..31fde99
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/15-largejitter
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with large jitter"
+
+time_offset=1e0
+jitter=1e-1
+time_max_limit=5e-1
+freq_max_limit=5e-1
+time_rms_limit=1e-1
+freq_rms_limit=1e-1
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/16-largewander b/debian/tests/linuxptp-testsuite/16-largewander
new file mode 100755
index 0000000..16f3af4
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/16-largewander
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with large wander"
+
+wander=1e-4
+time_max_limit=1e-3
+freq_max_limit=1e-3
+time_rms_limit=2e-4
+freq_rms_limit=2e-4
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/17-piservo b/debian/tests/linuxptp-testsuite/17-piservo
new file mode 100755
index 0000000..266fb35
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/17-piservo
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l and phc2sys with various PI servo configurations"
+
+wander=1e-9
+limit=4000
+max_sync_time=2000
+
+for jitter in 1e-8 1e-7 1e-6 1e-5; do
+	kp=$(awk 'BEGIN {x=1.5 / sqrt('$jitter'/'$wander'); print x < 0.7 ? x : 0.7}')
+	ki=$(awk 'BEGIN {x=1.2 / ('$jitter'/'$wander'); print x < 0.3 ? x : 0.3}')
+	time_rms_limit=$(awk 'BEGIN {print 1.5e-8 * ('$jitter'/1e-8)**0.75}')
+	freq_rms_limit=$(awk 'BEGIN {print 1.5e-8 * ('$jitter'/1e-8)**0.5}')
+	time_max_limit=$(awk 'BEGIN {print 8 * '$time_rms_limit'}')
+	freq_max_limit=$(awk 'BEGIN {print 8 * '$freq_rms_limit'}')
+
+	refclock_jitter=$jitter
+	master_conf=""
+	slave_conf=""
+	phc2sys_conf="-s /dev/ptp0 -O 0 -P $kp -I $ki"
+	nodes=1
+	master_nodes="0"
+	phc2sys_node=1
+	run_test || test_fail
+	check_sync || test_fail
+
+	master_conf="delay_mechanism P2P"
+	slave_conf="delay_mechanism P2P
+		pi_proportional_const $kp
+		pi_integral_const $ki"
+	phc2sys_conf=""
+	nodes=2
+	master_nodes="1"
+	phc2sys_node=0
+	run_ptp4l || test_fail
+	check_sync || test_fail
+done
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/18-autodm b/debian/tests/linuxptp-testsuite/18-autodm
new file mode 100755
index 0000000..0743493
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/18-autodm
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with Auto delay mechanism"
+
+nodes=2
+
+master_conf="delay_mechanism Auto"
+slave_conf="delay_mechanism P2P"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+master_conf="delay_mechanism P2P"
+slave_conf="delay_mechanism Auto"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+master_conf="delay_mechanism Auto"
+slave_conf="delay_mechanism E2E"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+master_conf="delay_mechanism E2E"
+slave_conf="delay_mechanism Auto"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/19-externalstep b/debian/tests/linuxptp-testsuite/19-externalstep
new file mode 100755
index 0000000..bd51ac9
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/19-externalstep
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with external clock step"
+
+# start the master so that the slaves are likely to have
+# the step between the sync and delay request messages
+freq_offset=0.0
+master_start=0.9
+# 100s step in 100th second
+slave_step="(* 100 (equal 0.1 (sum 1.0) 100))"
+min_sync_time=100
+max_sync_time=110
+nodes=6
+
+slave_conf="clock_servo pi
+delay_filter_length 20
+step_threshold 10.0"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+slave_conf="clock_servo linreg
+delay_filter_length 20
+step_threshold 10.0"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/20-pmc b/debian/tests/linuxptp-testsuite/20-pmc
new file mode 100755
index 0000000..ee32afb
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/20-pmc
@@ -0,0 +1,488 @@
+#!/bin/bash
+
+. test.common
+
+test_start "pmc"
+
+limit=51
+jitter=0.0
+subnets="1 2 | 2 3"
+pmc_node=3
+
+requests_replies=(
+"GET USER_DESCRIPTION"
+"sending: GET USER_DESCRIPTION
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT USER_DESCRIPTION 
+		userDescription  "
+
+"GET DEFAULT_DATA_SET"
+"sending: GET DEFAULT_DATA_SET
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT DEFAULT_DATA_SET 
+		twoStepFlag             1
+		slaveOnly               0
+		numberPorts             2
+		priority1               128
+		clockClass              248
+		clockAccuracy           0xfe
+		offsetScaledLogVariance 0xffff
+		priority2               128
+		clockIdentity           123456\.fffe\.780102
+		domainNumber            0"
+
+"GET CURRENT_DATA_SET"
+"sending: GET CURRENT_DATA_SET
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT CURRENT_DATA_SET 
+		stepsRemoved     1
+		offsetFromMaster -?[0-9]+\.[0-9]+
+		meanPathDelay    [0-9]+\.[0-9]+"
+
+"GET PARENT_DATA_SET"
+"sending: GET PARENT_DATA_SET
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT PARENT_DATA_SET 
+		parentPortIdentity                    123456\.fffe\.780101-1
+		parentStats                           0
+		observedParentOffsetScaledLogVariance 0xffff
+		observedParentClockPhaseChangeRate    0x7fffffff
+		grandmasterPriority1                  128
+		gm\.ClockClass                         248
+		gm\.ClockAccuracy                      0xfe
+		gm\.OffsetScaledLogVariance            0xffff
+		grandmasterPriority2                  128
+		grandmasterIdentity                   123456\.fffe\.780101"
+
+"GET TIME_PROPERTIES_DATA_SET"
+"sending: GET TIME_PROPERTIES_DATA_SET
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT TIME_PROPERTIES_DATA_SET 
+		currentUtcOffset      3[567]
+		leap61                0
+		leap59                0
+		currentUtcOffsetValid 0
+		ptpTimescale          1
+		timeTraceable         0
+		frequencyTraceable    0
+		timeSource            0xa0"
+
+"GET PRIORITY1"
+"sending: GET PRIORITY1
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT PRIORITY1 
+		priority1 128"
+
+"GET PRIORITY2"
+"sending: GET PRIORITY2
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT PRIORITY2 
+		priority2 128"
+
+"GET DOMAIN"
+"sending: GET DOMAIN
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT DOMAIN 
+		domainNumber 0"
+
+"GET SLAVE_ONLY"
+"sending: GET SLAVE_ONLY
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT SLAVE_ONLY 
+		slaveOnly 0"
+
+"GET CLOCK_ACCURACY"
+"sending: GET CLOCK_ACCURACY
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT CLOCK_ACCURACY 
+		clockAccuracy 0xfe"
+
+"GET TRACEABILITY_PROPERTIES"
+"sending: GET TRACEABILITY_PROPERTIES
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT TRACEABILITY_PROPERTIES 
+		timeTraceable      0
+		frequencyTraceable 0"
+
+"GET TIMESCALE_PROPERTIES"
+"sending: GET TIMESCALE_PROPERTIES
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT TIMESCALE_PROPERTIES 
+		ptpTimescale 1"
+
+"GET TIME_STATUS_NP"
+"sending: GET TIME_STATUS_NP
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT TIME_STATUS_NP 
+		master_offset              -?[0-9]+
+		ingress_time               1262304[0-9]+
+		cumulativeScaledRateOffset \+0\.000000000
+		scaledLastGmPhaseChange    0
+		gmTimeBaseIndicator        0
+		lastGmPhaseChange          0x0000'0000000000000000\.0000
+		gmPresent                  true
+		gmIdentity                 123456\.fffe\.780101"
+
+"GET GRANDMASTER_SETTINGS_NP"
+"sending: GET GRANDMASTER_SETTINGS_NP
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT GRANDMASTER_SETTINGS_NP 
+		clockClass              248
+		clockAccuracy           0xfe
+		offsetScaledLogVariance 0xffff
+		currentUtcOffset        3[567]
+		leap61                  0
+		leap59                  0
+		currentUtcOffsetValid   0
+		ptpTimescale            1
+		timeTraceable           0
+		frequencyTraceable      0
+		timeSource              0xa0"
+
+"GET NULL_MANAGEMENT"
+"sending: GET NULL_MANAGEMENT
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGE?MENT 
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT "
+
+"GET CLOCK_DESCRIPTION"
+"sending: GET CLOCK_DESCRIPTION
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGE?MENT CLOCK_DESCRIPTION 
+		clockType             0x4000
+		physicalLayerProtocol IEEE 802\.3
+		physicalAddress       12:34:56:78:01:02
+		protocolAddress       1 192\.168\.123\.2
+		manufacturerId        00:00:00
+		productDescription    ;;
+		revisionData          ;;
+		userDescription       
+		profileId             00:1b:19:00:01:00
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT CLOCK_DESCRIPTION 
+		clockType             0x4000
+		physicalLayerProtocol IEEE 802\.3
+		physicalAddress       12:34:56:78:02:02
+		protocolAddress       1 192\.168\.124\.2
+		manufacturerId        00:00:00
+		productDescription    ;;
+		revisionData          ;;
+		userDescription       
+		profileId             00:1b:19:00:01:00"
+
+"GET PORT_DATA_SET"
+"sending: GET PORT_DATA_SET
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGE?MENT PORT_DATA_SET 
+		portIdentity            123456\.fffe\.780102-1
+		portState               SLAVE
+		logMinDelayReqInterval  0
+		peerMeanPathDelay       0
+		logAnnounceInterval     1
+		announceReceiptTimeout  3
+		logSyncInterval         0
+		delayMechanism          1
+		logMinPdelayReqInterval 0
+		versionNumber           2
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT PORT_DATA_SET 
+		portIdentity            123456\.fffe\.780102-2
+		portState               MASTER
+		logMinDelayReqInterval  0
+		peerMeanPathDelay       0
+		logAnnounceInterval     1
+		announceReceiptTimeout  3
+		logSyncInterval         0
+		delayMechanism          1
+		logMinPdelayReqInterval 0
+		versionNumber           2"
+
+"GET LOG_ANNOUNCE_INTERVAL"
+"sending: GET LOG_ANNOUNCE_INTERVAL
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGE?MENT LOG_ANNOUNCE_INTERVAL 
+		logAnnounceInterval 1
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT LOG_ANNOUNCE_INTERVAL 
+		logAnnounceInterval 1"
+
+"GET ANNOUNCE_RECEIPT_TIMEOUT"
+"sending: GET ANNOUNCE_RECEIPT_TIMEOUT
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGE?MENT ANNOUNCE_RECEIPT_TIMEOUT 
+		announceReceiptTimeout 3
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT ANNOUNCE_RECEIPT_TIMEOUT 
+		announceReceiptTimeout 3"
+
+"GET LOG_SYNC_INTERVAL"
+"sending: GET LOG_SYNC_INTERVAL
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGE?MENT LOG_SYNC_INTERVAL 
+		logSyncInterval 0
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT LOG_SYNC_INTERVAL 
+		logSyncInterval 0"
+
+"GET VERSION_NUMBER"
+"sending: GET VERSION_NUMBER
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGE?MENT VERSION_NUMBER 
+		versionNumber 2
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT VERSION_NUMBER 
+		versionNumber 2"
+
+"GET DELAY_MECHANISM"
+"sending: GET DELAY_MECHANISM
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGE?MENT DELAY_MECHANISM 
+		delayMechanism 1
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT DELAY_MECHANISM 
+		delayMechanism 1"
+
+"GET LOG_MIN_PDELAY_REQ_INTERVAL"
+"sending: GET LOG_MIN_PDELAY_REQ_INTERVAL
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGE?MENT LOG_MIN_PDELAY_REQ_INTERVAL 
+		logMinPdelayReqInterval 0
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGE?MENT LOG_MIN_PDELAY_REQ_INTERVAL 
+		logMinPdelayReqInterval 0"
+
+"GET PORT_DATA_SET_NP"
+"sending: GET PORT_DATA_SET_NP
+	123456.fffe.780102-1 seq 0 RESPONSE MANAGE?MENT PORT_DATA_SET_NP 
+		neighborPropDelayThresh 20000000
+		asCapable               1
+	123456.fffe.780102-2 seq 0 RESPONSE MANAGE?MENT PORT_DATA_SET_NP 
+		neighborPropDelayThresh 20000000
+		asCapable               1"
+
+"GET PORT_STATS_NP"
+"sending: GET PORT_STATS_NP
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGEMENT PORT_STATS_NP 
+		portIdentity              123456\.fffe\.780102-1
+		rx_Sync                   [1234][0-9]
+		rx_Delay_Req              0
+		rx_Pdelay_Req             0
+		rx_Pdelay_Resp            0
+		rx_Follow_Up              [1234][0-9]
+		rx_Delay_Resp             [1234][0-9]
+		rx_Pdelay_Resp_Follow_Up  0
+		rx_Announce               [1234][0-9]
+		rx_Signaling              0
+		rx_Management             0
+		tx_Sync                   0
+		tx_Delay_Req              [1234][0-9]
+		tx_Pdelay_Req             0
+		tx_Pdelay_Resp            0
+		tx_Follow_Up              0
+		tx_Delay_Resp             0
+		tx_Pdelay_Resp_Follow_Up  0
+		tx_Announce               0
+		tx_Signaling              0
+		tx_Management             0
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGEMENT PORT_STATS_NP 
+		portIdentity              123456\.fffe\.780102-2
+		rx_Sync                   0
+		rx_Delay_Req              0
+		rx_Pdelay_Req             0
+		rx_Pdelay_Resp            0
+		rx_Follow_Up              0
+		rx_Delay_Resp             0
+		rx_Pdelay_Resp_Follow_Up  0
+		rx_Announce               0
+		rx_Signaling              0
+		rx_Management             1
+		tx_Sync                   [1234][0-9]
+		tx_Delay_Req              0
+		tx_Pdelay_Req             0
+		tx_Pdelay_Resp            0
+		tx_Follow_Up              [1234][0-9]
+		tx_Delay_Resp             0
+		tx_Pdelay_Resp_Follow_Up  0
+		tx_Announce               [1234][0-9]
+		tx_Signaling              0
+		tx_Management             1"
+
+"GET PORT_SERVICE_STATS_NP"
+"sending: GET PORT_SERVICE_STATS_NP
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGEMENT PORT_SERVICE_STATS_NP 
+		portIdentity              123456\.fffe\.780102-1
+		announce_timeout          0
+		sync_timeout              0
+		delay_timeout             [1234][0-9]
+		unicast_service_timeout   0
+		unicast_request_timeout   0
+		master_announce_timeout   0
+		master_sync_timeout       0
+		qualification_timeout     0
+		sync_mismatch             0
+		followup_mismatch         0
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGEMENT PORT_SERVICE_STATS_NP 
+		portIdentity              123456\.fffe\.780102-2
+		announce_timeout          1
+		sync_timeout              0
+		delay_timeout             0
+		unicast_service_timeout   0
+		unicast_request_timeout   0
+		master_announce_timeout   [1234][0-9]
+		master_sync_timeout       [1234][0-9]
+		qualification_timeout     0
+		sync_mismatch             0
+		followup_mismatch         0"
+"GET UNICAST_MASTER_TABLE_NP"
+"sending: GET UNICAST_MASTER_TABLE_NP
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGEMENT UNICAST_MASTER_TABLE_NP 
+		actual_table_size 0
+		BM  identity                 address                            state     clockClass clockQuality offsetScaledLogVariance p1  p2
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGEMENT UNICAST_MASTER_TABLE_NP 
+		actual_table_size 0
+		BM  identity                 address                            state     clockClass clockQuality offsetScaledLogVariance p1  p2"
+
+"GET ALTERNATE_TIME_OFFSET_ENABLE"
+"sending: GET ALTERNATE_TIME_OFFSET_ENABLE
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGEMENT ALTERNATE_TIME_OFFSET_ENABLE 
+		keyField       0
+		enable         0"
+
+"GET ALTERNATE_TIME_OFFSET_NAME"
+"sending: GET ALTERNATE_TIME_OFFSET_NAME
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGEMENT ALTERNATE_TIME_OFFSET_NAME 
+		keyField       0
+		displayName    "
+
+"GET ALTERNATE_TIME_OFFSET_PROPERTIES"
+"sending: GET ALTERNATE_TIME_OFFSET_PROPERTIES
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGEMENT ALTERNATE_TIME_OFFSET_PROPERTIES 
+		keyField       0
+		currentOffset  0
+		jumpSeconds    0
+		timeOfNextJump 0"
+
+"GET POWER_PROFILE_SETTINGS_NP"
+"sending: GET POWER_PROFILE_SETTINGS_NP
+	123456.fffe.780102-1 seq 0 RESPONSE MANAGEMENT POWER_PROFILE_SETTINGS_NP 
+		version                   0
+		grandmasterID             0x0000
+		grandmasterTimeInaccuracy 4294967295
+		networkTimeInaccuracy     4294967295
+		totalTimeInaccuracy       4294967295
+	123456.fffe.780102-2 seq 0 RESPONSE MANAGEMENT POWER_PROFILE_SETTINGS_NP 
+		version                   0
+		grandmasterID             0x0000
+		grandmasterTimeInaccuracy 4294967295
+		networkTimeInaccuracy     4294967295
+		totalTimeInaccuracy       4294967295"
+)
+
+for i in $(seq 0 $[${#requests_replies[*]} / 2 - 1]); do
+	pmc_conf=${requests_replies[$[i * 2]]}
+	run_ptp4l || test_fail
+	if ! check_pmc_output "^${requests_replies[$[i * 2 + 1]]}$"; then
+		cat tmp/log.$pmc_node
+		test_fail
+	fi
+done
+
+requests_replies=(
+"SET PRIORITY1 130"
+"sending: SET PRIORITY1
+	123456\.fffe\.780102-0 seq 0 RESPONSE MANAGEMENT PRIORITY1 
+		priority1 130"
+
+"SET PRIORITY2 130"
+"sending: SET PRIORITY2
+	123456\.fffe\.780102-0 seq 0 RESPONSE MANAGEMENT PRIORITY2 
+		priority2 130"
+
+"SET GRANDMASTER_SETTINGS_NP clockClass 6 clockAccuracy 0xfd offsetScaledLogVariance 0xfffe currentUtcOffset 50 leap61 1 leap59 0 currentUtcOffsetValid 1 ptpTimescale 0 timeTraceable 1 frequencyTraceable 1 timeSource 0xa1"
+"sending: SET GRANDMASTER_SETTINGS_NP
+	123456\.fffe\.780102-0 seq 0 RESPONSE MANAGEMENT GRANDMASTER_SETTINGS_NP 
+		clockClass              6
+		clockAccuracy           0xfd
+		offsetScaledLogVariance 0xfffe
+		currentUtcOffset        50
+		leap61                  1
+		leap59                  0
+		currentUtcOffsetValid   1
+		ptpTimescale            0
+		timeTraceable           1
+		frequencyTraceable      1
+		timeSource              0xa1"
+
+"SET SUBSCRIBE_EVENTS_NP duration 1 NOTIFY_PORT_STATE on NOTIFY_TIME_SYNC on NOTIFY_PARENT_DATA_SET on"
+"sending: SET SUBSCRIBE_EVENTS_NP
+	123456\.fffe\.780102-0 seq 0 RESPONSE MANAGEMENT SUBSCRIBE_EVENTS_NP 
+		duration               1
+		NOTIFY_PORT_STATE      on
+		NOTIFY_TIME_SYNC       on
+		NOTIFY_PARENT_DATA_SET on.*"
+
+"SET SYNCHRONIZATION_UNCERTAIN_NP 1"
+"sending: SET SYNCHRONIZATION_UNCERTAIN_NP
+	123456\.fffe\.780102-0 seq 0 RESPONSE MANAGEMENT SYNCHRONIZATION_UNCERTAIN_NP 
+		uncertain 1"
+
+# asCapable is ignored
+"SET PORT_DATA_SET_NP neighborPropDelayThresh 1000 asCapable 0"
+"sending: SET PORT_DATA_SET_NP
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGEMENT PORT_DATA_SET_NP 
+		neighborPropDelayThresh 1000
+		asCapable               1
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGEMENT PORT_DATA_SET_NP 
+		neighborPropDelayThresh 1000
+		asCapable               1"
+
+"SET ALTERNATE_TIME_OFFSET_ENABLE keyField 3 enable 1"
+"sending: SET ALTERNATE_TIME_OFFSET_ENABLE
+	123456\.fffe\.780102-0 seq 0 RESPONSE MANAGEMENT ALTERNATE_TIME_OFFSET_ENABLE 
+		keyField       3
+		enable         1"
+
+"SET ALTERNATE_TIME_OFFSET_NAME keyField 3 displayName CET"
+"sending: SET ALTERNATE_TIME_OFFSET_NAME
+	123456\.fffe\.780102-0 seq 0 RESPONSE MANAGEMENT ALTERNATE_TIME_OFFSET_NAME 
+		keyField       3
+		displayName    CET"
+
+"SET ALTERNATE_TIME_OFFSET_PROPERTIES keyField 3 currentOffset 36000 jumpSeconds -3600 timeOfNextJump 6000000000"
+"sending: SET ALTERNATE_TIME_OFFSET_PROPERTIES
+	123456\.fffe\.780102-0 seq 0 RESPONSE MANAGEMENT ALTERNATE_TIME_OFFSET_PROPERTIES 
+		keyField       3
+		currentOffset  36000
+		jumpSeconds    -3600
+		timeOfNextJump 6000000000"
+
+"SET POWER_PROFILE_SETTINGS_NP version 2 grandmasterID 1 grandmasterTimeInaccuracy 100 networkTimeInaccuracy 100 totalTimeInaccuracy 200"
+"sending: SET POWER_PROFILE_SETTINGS_NP
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGEMENT POWER_PROFILE_SETTINGS_NP 
+		version                   2
+		grandmasterID             0x0001
+		grandmasterTimeInaccuracy 100
+		networkTimeInaccuracy     100
+		totalTimeInaccuracy       200
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGEMENT POWER_PROFILE_SETTINGS_NP 
+		version                   2
+		grandmasterID             0x0001
+		grandmasterTimeInaccuracy 100
+		networkTimeInaccuracy     100
+		totalTimeInaccuracy       200"
+
+"GET PORT_PROPERTIES_NP"
+"sending: GET PORT_PROPERTIES_NP
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGEMENT PORT_PROPERTIES_NP 
+		portIdentity            123456\.fffe\.780102-1
+		portState               SLAVE
+		timestamping            HARDWARE
+		interface               eth0
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGEMENT PORT_PROPERTIES_NP 
+		portIdentity            123456\.fffe\.780102-2
+		portState               MASTER
+		timestamping            HARDWARE
+		interface               eth1"
+
+"GET PORT_HWCLOCK_NP"
+"sending: GET PORT_HWCLOCK_NP
+	123456\.fffe\.780102-1 seq 0 RESPONSE MANAGEMENT PORT_HWCLOCK_NP 
+		portIdentity            123456\.fffe\.780102-1
+		phcIndex                1
+		flags                   0
+	123456\.fffe\.780102-2 seq 0 RESPONSE MANAGEMENT PORT_HWCLOCK_NP 
+		portIdentity            123456\.fffe\.780102-2
+		phcIndex                1
+		flags                   0"
+)
+
+for i in $(seq 0 $[${#requests_replies[*]} / 2 - 1]); do
+	pmc_conf=${requests_replies[$[i * 2]]}
+
+	# UDS-RO
+	pmc_uds="2:2"
+	run_ptp4l || test_fail
+	if ! check_pmc_output "RESPONSE MANAGEMENT_ERROR_STATUS"; then
+		cat tmp/log.$pmc_node
+		test_fail
+	fi
+
+	# UDS-RW
+	pmc_uds="2:1"
+	run_ptp4l || test_fail
+	if ! check_pmc_output "^${requests_replies[$[i * 2 + 1]]}$"; then
+		cat tmp/log.$pmc_node
+		test_fail
+	fi
+done
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/21-linregservo b/debian/tests/linuxptp-testsuite/21-linregservo
new file mode 100755
index 0000000..82447aa
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/21-linregservo
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l and phc2sys with linreg servo"
+
+wander=1e-9
+limit=4000
+max_sync_time=2000
+
+while read jitter time_max_limit freq_max_limit time_rms_limit freq_rms_limit; do
+	refclock_jitter=$jitter
+	master_conf=""
+	slave_conf=""
+	phc2sys_conf="-s /dev/ptp0 -O 0 -E linreg"
+	nodes=1
+	master_nodes="0"
+	phc2sys_node=1
+	run_test || test_fail
+	check_sync || test_fail
+
+	master_conf="delay_mechanism P2P"
+	slave_conf="delay_mechanism P2P
+		clock_servo linreg"
+	phc2sys_conf=""
+	nodes=2
+	master_nodes="1"
+	phc2sys_node=0
+	run_ptp4l || test_fail
+	check_sync || test_fail
+done <<-EOF
+	1e-5 4.0e-05 4.8e-05 6.1e-06 1.5e-06
+	1e-6 4.2e-06 4.4e-06 7.0e-07 1.8e-07
+	1e-7 5.1e-07 7.5e-07 1.1e-07 3.3e-08
+	1e-8 9.5e-08 9.3e-08 1.9e-08 1.3e-08
+EOF
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/22-passiveport b/debian/tests/linuxptp-testsuite/22-passiveport
new file mode 100755
index 0000000..05b2ff1
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/22-passiveport
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with passive ports"
+
+subnets="1 2 | 1 2 | 1 2"
+nodes=2
+limit=2000
+time_max_limit=5e-6
+freq_max_limit=5e-6
+base_delay=$(cat <<-EOF | tr -d '\n'
+  (+ $default_base_delay
+    (* subnet 1e-5)
+    (* -1 (equal 0.1 subnet 1) (equal 0.1 (min (% (+ time 0) 300) 150) 150))
+    (* -1 (equal 0.1 subnet 2) (equal 0.1 (min (% (+ time 100) 300) 150) 150))
+    (* -1 (equal 0.1 subnet 3) (equal 0.1 (min (% (+ time 200) 300) 150) 150)))
+EOF
+)
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/23-basedelay b/debian/tests/linuxptp-testsuite/23-basedelay
new file mode 100755
index 0000000..cb99812
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/23-basedelay
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with various base delays"
+
+max_sync_time=320
+update_interval=-4
+master_conf="logSyncInterval -4
+	     logMinDelayReqInterval -4"
+
+for i in $(seq -7 1 -1); do
+	base_delay=$(awk 'BEGIN {print 1e'$i'}')
+	run_ptp4l || test_fail
+	check_sync || test_fail
+done
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/24-nsm b/debian/tests/linuxptp-testsuite/24-nsm
new file mode 100755
index 0000000..ff5343d
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/24-nsm
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+. test.common
+
+test_start "nsm monitoring master node and slave node"
+nsm_node=3
+master_conf="hybrid_e2e 1
+net_sync_monitor 1"
+slave_conf="hybrid_e2e 1
+net_sync_monitor 1"
+
+requests_replies=(
+"NSM 192.168.123.1"
+"NSM MEASUREMENT COMPLETE
+		offset                                -?[0-9]+
+		portState                             MASTER
+		parentPortAddress                     1 192.168.123.1
+	parentDataset
+		parentPortIdentity                    123456.fffe.780101-0
+		parentStats                           0
+		observedParentOffsetScaledLogVariance 0xffff
+		observedParentClockPhaseChangeRate    0x7fffffff
+		grandmasterPriority1                  128
+		gm.ClockClass                         248
+		gm.ClockAccuracy                      0xfe
+		gm.OffsetScaledLogVariance            0xffff
+		grandmasterPriority2                  128
+		grandmasterIdentity                   123456.fffe.780101
+	currentDataset
+		stepsRemoved                          0
+		offsetFromMaster                      0.0
+		meanPathDelay                         0.0
+	timePropertiesDataset
+		currentUtcOffset                      [0-9]+
+		leap61                                0
+		leap59                                0
+		currentUtcOffsetValid                 0
+		ptpTimescale                          1
+		timeTraceable                         0
+		frequencyTraceable                    0
+		timeSource                            0xa0
+	lastSyncTimestamp    0.000000000"
+
+"NSM 192.168.123.2"
+"NSM MEASUREMENT COMPLETE
+		offset                                -?[0-9]+
+		portState                             SLAVE
+		parentPortAddress                     1 192.168.123.1
+	parentDataset
+		parentPortIdentity                    123456.fffe.780101-1
+		parentStats                           0
+		observedParentOffsetScaledLogVariance 0xffff
+		observedParentClockPhaseChangeRate    0x7fffffff
+		grandmasterPriority1                  128
+		gm.ClockClass                         248
+		gm.ClockAccuracy                      0xfe
+		gm.OffsetScaledLogVariance            0xffff
+		grandmasterPriority2                  128
+		grandmasterIdentity                   123456.fffe.780101
+	currentDataset
+		stepsRemoved                          1
+		offsetFromMaster                      -?[0-9]+\.[0-9]+
+		meanPathDelay                         [0-9]+\.[0-9]+
+	timePropertiesDataset
+		currentUtcOffset                      [0-9]+
+		leap61                                0
+		leap59                                0
+		currentUtcOffsetValid                 0
+		ptpTimescale                          1
+		timeTraceable                         0
+		frequencyTraceable                    0
+		timeSource                            0xa0
+	lastSyncTimestamp    [0-9]+\.[0-9]+"
+)
+
+for i in $(seq 0 $[${#requests_replies[*]} / 2 - 1]); do
+	nsm_conf=${requests_replies[$[i * 2]]}
+	run_ptp4l || test_fail
+	if ! check_nsm_output "${requests_replies[$[i * 2 + 1]]}$"; then
+		cat tmp/log.$nsm_node
+		test_fail
+	fi
+done
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/25-telecomdscmp b/debian/tests/linuxptp-testsuite/25-telecomdscmp
new file mode 100755
index 0000000..51c9098
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/25-telecomdscmp
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with telecom_dscmp and various local priority"
+nodes=2
+
+# Using telecom_dscmp with default local priorities.
+# The first node will become master due to portIdentity.
+master_conf="dataset_comparison G.8275.x"
+slave_conf="dataset_comparison G.8275.x"
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+# Using telecom_dscmp with clock localPriority set.
+# The first node will now become slave and the second
+# master due to the local priority for the clock.
+master_nodes="2"
+master_conf="dataset_comparison G.8275.x
+G.8275.defaultDS.localPriority 127"
+slave_conf="dataset_comparison G.8275.x
+G.8275.defaultDS.localPriority 129"
+slave_start=0.0
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+# Using telecom_dscmp with port localPriority set.
+# The first node will become slave and the second
+# master due to the local priority for the port.
+master_nodes="2"
+master_conf="dataset_comparison G.8275.x
+G.8275.portDS.localPriority 129"
+slave_conf="dataset_comparison G.8275.x
+G.8275.portDS.localPriority 127"
+slave_start=0.0
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/26-transparent b/debian/tests/linuxptp-testsuite/26-transparent
new file mode 100755
index 0000000..fce2c7b
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/26-transparent
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with transparent clocks"
+
+# 1 --- 2 --- 3
+#       |     |
+#       4 --- 5 --- 6
+subnets="1 2 | 2 3 | 2 4 | 3 5 | 4 5 | 5 6"
+nodes=6
+max_sync_time=100
+
+for tc_type in E2E P2P; do
+	if [ "$tc_type" == "E2E" ]; then
+		time_max_limit=3e-8
+		freq_max_limit=2e-8
+		delay_correction="(+ delay (* 8e-11 (+ length 42)))"
+	else
+		time_max_limit=5e-6
+		freq_max_limit=5e-6
+		delay_correction=""
+	fi
+	for free_running in 0 1; do
+		master_conf="delay_mechanism $tc_type"
+		slave_conf="delay_mechanism $tc_type"
+		for transparent_nodes in "2" "3 4" "2 3 4 5"; do
+			transparent_conf="clock_type ${tc_type}_TC
+					free_running $free_running
+					delay_mechanism $tc_type"
+			[[ $transparent_nodes =~ "2 3 4 5" ]] &&
+				transparent_conf+="
+					tc_spanning_tree 1"
+			[ $free_running -eq 0 ] &&
+				free_running_nodes="" ||
+				free_running_nodes=$transparent_nodes
+			run_ptp4l || test_fail
+			check_sync || test_fail
+		done
+	done
+done
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/27-masteronly b/debian/tests/linuxptp-testsuite/27-masteronly
new file mode 100755
index 0000000..3d475b9
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/27-masteronly
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with masterOnly option"
+
+nodes=3
+pmc_node=3
+
+# The masterOnly option is set to prevent the port of the second node
+# from entering the SLAVE state. The portState will then become MASTER
+# for both first and second node.
+slave_conf="masterOnly 1"
+pmc_conf="GET PORT_DATA_SET"
+
+run_ptp4l || test_fail
+
+expected1="123456\.fffe\.780101-1 seq 0 RESPONSE MANAGEMENT PORT_DATA_SET 
+		portIdentity            123456\.fffe\.780101-1
+		portState               MASTER"
+expected2="123456\.fffe\.780102-1 seq 0 RESPONSE MANAGEMENT PORT_DATA_SET 
+		portIdentity            123456\.fffe\.780102-1
+		portState               MASTER"
+check_pmc_output "$expected1" || test_fail
+check_pmc_output "$expected2" || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/28-hybriddm b/debian/tests/linuxptp-testsuite/28-hybriddm
new file mode 100755
index 0000000..6ae35b7
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/28-hybriddm
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with hybrid delay mechanism"
+
+nodes=3
+master_conf="hybrid_e2e 1"
+slave_conf="hybrid_e2e 1"
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/29-unicast b/debian/tests/linuxptp-testsuite/29-unicast
new file mode 100755
index 0000000..020addb
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/29-unicast
@@ -0,0 +1,158 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with unicast-only messaging"
+
+# 1 GM, 2 unicast clients
+nodes=3
+master_conf="hybrid_e2e 1
+inhibit_multicast_service 1
+unicast_listen 1"
+slave_conf="
+inhibit_multicast_service 1
+unicast_req_duration 60
+unicast_master_table 1
+
+[unicast_master_table]
+table_id 1
+logQueryInterval 2
+UDPv4 192.168.123.1"
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+# 2 GMs, 1 unicast client, first one becomes best master because of portIdentity
+nodes=4
+master_nodes="1 2"
+
+max_sync_time=100
+
+master_conf="hybrid_e2e 1
+inhibit_multicast_service 1
+unicast_listen 1"
+slave_conf="
+inhibit_multicast_service 1
+unicast_req_duration 60
+unicast_master_table 1
+slaveOnly 1
+
+[unicast_master_table]
+table_id 1
+logQueryInterval 2
+UDPv4 192.168.123.1
+UDPv4 192.168.123.2"
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+
+# 3 GMs, one client. Second node will be selected as best master, then
+# the first node will start and become best master due to portIdentity.
+
+nodes=4
+master_nodes="1 2 3"
+node_start[1]=100
+max_sync_time=200
+master_conf="hybrid_e2e 1
+inhibit_multicast_service 1
+unicast_listen 1"
+slave_conf="
+inhibit_multicast_service 1
+unicast_req_duration 60
+unicast_master_table 1
+slaveOnly 1
+
+[unicast_master_table]
+table_id 1
+logQueryInterval 2
+UDPv4 192.168.123.1
+UDPv4 192.168.123.2
+UDPv4 192.168.123.3"
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+check_any_log_message 4 "selected best master clock" "123456\.fffe\.78..02" || test_fail
+check_last_log_message 4 "selected best master clock" "123456\.fffe\.78..01" || test_fail
+
+# First node will be selected as best master, then it will go offline and
+# the second node will become best master due to portIdentity.
+
+node_start[1]=0
+# (* -1 (equal 0.1 from 1) (equal 0.1 (min time 100) 100)) means that
+# negative delay applies when node is 1 and time is over 100s
+base_delay=$(cat <<-EOF | tr -d '\n'
+  (+ $default_base_delay
+    (* -1 (equal 0.1 from 1) (equal 0.1 (min time 100) 100)))
+EOF
+)
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+check_any_log_message 4 "selected best master clock" "123456\.fffe\.78..01" || test_fail
+check_last_log_message 4 "selected best master clock" "123456\.fffe\.78..02" || test_fail
+
+# First node will be selected as best master, then it will stop and
+# the second node will become best master due to portIdentity.
+# Finally, second node will also leave, and third one becomes only master.
+
+# (* -1 (equal 0.1 from 1) (equal 0.1 (min time 100) 100)) means that
+# negative delay applies when node is 1 and time is over 100s
+# (* -1 (equal 0.1 from 2) (equal 0.1 (min time 150) 150)) means that
+# negative delay applies when node is 2 and time is over 150s
+base_delay=$(cat <<-EOF | tr -d '\n'
+  (+ $default_base_delay
+    (* -1 (equal 0.1 from 1) (equal 0.1 (min time 100) 100))
+    (* -1 (equal 0.1 from 2) (equal 0.1 (min time 150) 150)))
+EOF
+)
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+check_any_log_message 4 "selected best master clock" "123456\.fffe\.78..01" || test_fail
+check_any_log_message 4 "selected best master clock" "123456\.fffe\.78..02" || test_fail
+check_last_log_message 4 "selected best master clock" "123456\.fffe\.78..03" || test_fail
+
+
+# First node will be selected as best master, then it will stop and
+# the second node will become best master due to portIdentity,
+# then first one comes back and becomes master again.
+
+# we lower the expectations because of all the constant switchovers
+time_max_limit=1e-5
+time_rms_limit=1e-5
+freq_max_limit=1e-5
+freq_rms_limit=1e-5
+
+# we have negative delay (node being offline)
+# if the packet is sent from node 1,
+# and time is in the intervals of (150, 200] and (350, 400] seconds.
+# Delay of $default_base_delay applies otherwise.
+# Which translates to the node 1 appearing offline twice,
+# and still being re-selected as best master in the end.
+
+# (equal 0.1 from 1) selects 1st node.
+# (% time 200) splits our 500s run time into 200s, 200s, 100s chunks.
+# (min (% time 200) 150) selects min between 150 and time % 200,
+# splitting each 200s chunk into intervals <=150s and >150s.
+#
+# (equal 0.1 (min (% time 200) 150) 150) checks if the chunked time is >150s
+base_delay=$(cat <<-EOF | tr -d '\n'
+  (+ $default_base_delay
+    (* -1
+      (equal 0.1 from 1)
+      (equal 0.1
+        (min (% time 200) 150) 150)))
+EOF
+)
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+check_any_log_message 4 "selected best master clock" "123456\.fffe\.78..02" || test_fail
+check_last_log_message 4 "selected best master clock" "123456\.fffe\.78..01" || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/30-telecombmca b/debian/tests/linuxptp-testsuite/30-telecombmca
new file mode 100755
index 0000000..d32b300
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/30-telecombmca
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with telecom BMCA"
+
+# 1 --> 3 --> 5 ->-
+#       ^     ^    \
+#       |     |     7
+#       v     v    /
+# 2 --> 4 --> 6 ->-
+
+subnets="1 3 | 2 4 | 3 5 | 4 6 | 5 7 | 6 7 | 3 4 | 5 6"
+nodes=7
+max_sync_time=100
+time_max_limit=5e-6
+freq_max_limit=5e-6
+master_nodes="1 2"
+master_conf="clockClass 6"
+slave_conf="dataset_comparison G.8275.x"
+
+extra_node_confs[1]="masterOnly 1"
+extra_node_confs[2]="masterOnly 1"
+extra_node_confs[3]="
+[eth0]
+G.8275.portDS.localPriority 127
+[eth2]
+masterOnly 1"
+extra_node_confs[4]="
+[eth1]
+G.8275.portDS.localPriority 127
+[eth3]
+masterOnly 1"
+extra_node_confs[5]="
+[eth2]
+G.8275.portDS.localPriority 127
+[eth4]
+masterOnly 1"
+extra_node_confs[6]="
+[eth3]
+G.8275.portDS.localPriority 127
+[eth5]
+masterOnly 1"
+extra_node_confs[7]="slaveOnly 1"
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+for i in 3 5 7; do
+	check_last_log_message $i "selected best master clock" "123456\.fffe\.78..01" || test_fail
+done
+for i in 4 6; do
+	check_last_log_message $i "selected best master clock" "123456\.fffe\.78..02" || test_fail
+done
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/31-leapsecond b/debian/tests/linuxptp-testsuite/31-leapsecond
new file mode 100755
index 0000000..dc39cbb
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/31-leapsecond
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l and phc2sys with leap second"
+
+export CLKNETSIM_START_DATE=$(TZ=UTC date -d 'Dec 31 2030 0:00:00' +'%s')
+
+limit=$[60 * 3600]
+leap_start=$[24 * 3600]
+utc_offset=37
+time_max_limit=5e-3
+time_rms_limit=1e-3
+freq_max_limit=5e-6
+freq_rms_limit=2e-6
+
+base_conf="logAnnounceInterval 10
+logSyncInterval 10
+logMinDelayReqInterval 10"
+
+pmc_node=3
+pmc_uds="1:1"
+pmc_start=$[12 * 3600]
+
+phc2sys_node=4
+phc2sys_uds="2:1"
+phc2sys_conf="-a -r -R 0.01 -E linreg"
+phc2sys_phc_base=2
+phc2sys_phc_swap=1
+
+for leap in "+1" "-1"; do
+	for master_ts in "software" "hardware"; do
+		for slave_ts in "software" "hardware"; do
+			master_conf="$base_conf
+			time_stamping $master_ts"
+			slave_conf="$base_conf
+			time_stamping $slave_ts
+			clock_servo linreg"
+
+			case "$master_ts+$slave_ts" in
+				software+software)
+					nodes=3
+					min_sync_time=$[$leap_start - 1]
+					max_sync_time=$[$leap_start]
+					step1=$leap
+					step2=$[-$leap]
+					ptp_timescale=0
+					refclock_offset=0.0
+					;;
+				software+hardware)
+					nodes=4
+					min_sync_time=$[$leap_start + 1000]
+					# This should be much smaller, but
+					# there is no reliable way to limit
+					# the number of points of the servo
+					max_sync_time=$[$leap_start + 30000]
+					step1=$leap
+					step2=$[-$leap]
+					ptp_timescale=0
+					refclock_offset=0.0
+					;;
+				hardware+software)
+					nodes=3
+					min_sync_time=$[$leap_start - 1]
+					max_sync_time=$[$leap_start]
+					step1=$[$utc_offset + $leap]
+					step2=0
+					ptp_timescale=1
+					refclock_offset=0.0
+					;;
+				hardware+hardware)
+					nodes=4
+					min_sync_time=11000
+					max_sync_time=$[$leap_start]
+					step1=0
+					step2=0
+					ptp_timescale=1
+					refclock_offset=$[-($utc_offset + $leap)]
+					;;
+			esac
+
+			case $leap in
+				+1)
+					leap_conf="leap61 1 leap59 0"
+					;;
+				-1)
+					leap_conf="leap61 0 leap59 1"
+					;;
+			esac
+
+			master_step="(+ (* $step1 (equal 0.1 (sum 1.0) 1)) (* $step2 (equal 0.1 (sum 1.0) 86400)))"
+			pmc_conf="SET GRANDMASTER_SETTINGS_NP clockClass 6 clockAccuracy 0xfe offsetScaledLogVariance 0xffff currentUtcOffset $utc_offset $leap_conf currentUtcOffsetValid 1 ptpTimescale $ptp_timescale timeTraceable 1 frequencyTraceable 1 timeSource 0xa1"
+
+			run_ptp4l || test_fail
+			check_sync || test_fail
+		done
+	done
+done
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/32-classthreshold b/debian/tests/linuxptp-testsuite/32-classthreshold
new file mode 100755
index 0000000..8d7251e
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/32-classthreshold
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with clock_class_threshold option"
+
+master_conf="clockClass 6"
+slave_conf="clock_class_threshold 7"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+master_conf="clockClass 7"
+slave_conf="clock_class_threshold 7"
+run_ptp4l || test_fail
+check_sync || test_fail
+
+master_conf="clockClass 140"
+slave_conf="clock_class_threshold 7"
+run_ptp4l || test_fail
+check_sync && test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/33-power b/debian/tests/linuxptp-testsuite/33-power
new file mode 100755
index 0000000..a7c0485
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/33-power
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with power profile"
+
+nodes=3
+pmc_node=3
+
+master_conf="power_profile.version 2017"
+pmc_conf="SET ALTERNATE_TIME_OFFSET_ENABLE keyField 2 enable 1
+SET ALTERNATE_TIME_OFFSET_NAME keyField 2 displayName CET
+SET ALTERNATE_TIME_OFFSET_PROPERTIES keyField 2 currentOffset 36000 jumpSeconds -3600 timeOfNextJump 6000000000"
+pmc_uds="1:1"
+log_packets=1
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_message 2 0 "checking length of announce message:"
+grep '	1	2	.*	320	' tmp/log.packets | \
+	awk '{ print $8 }' | grep -q 110 && test_ok || { test_bad; test_fail; }
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/36-automotive b/debian/tests/linuxptp-testsuite/36-automotive
new file mode 100755
index 0000000..b8d2dec
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/36-automotive
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+. test.common
+
+test_start "ptp4l with Automotive Profile"
+
+nodes=2
+max_sync_time=100
+
+# Automotive Profile options carried over from gPTP, common between master and slaves
+common_confs="
+gmCapable		1
+priority1		248
+priority2		248
+logSyncInterval		-3
+syncReceiptTimeout	3
+neighborPropDelayThresh	800
+min_neighbor_prop_delay	-20000000
+assume_two_step		1
+path_trace_enabled	1
+follow_up_info		1
+transportSpecific	0x1
+ptp_dst_mac		01:80:C2:00:00:0E
+inhibit_announce	1
+delay_mechanism		P2P
+
+BMCA			noop
+inhibit_announce	1
+asCapable		true
+"
+
+# Option not added.
+# network_transport	L2	# The default is UDPv4. clknetsim does not support L2.
+
+# Automotive Profile Master specific options
+master_conf="$common_confs
+masterOnly		1
+inhibit_delay_req	1
+"
+
+# Automotive Profile Slave specific options
+slave_conf="$common_confs
+slaveOnly			1
+ignore_source_id		1
+
+step_threshold			1
+operLogSyncInterval		0
+operLogPdelayReqInterval	2
+msg_interval_request		1
+servo_offset_threshold		30
+servo_num_offset_values		10
+"
+
+run_ptp4l || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/debian/tests/linuxptp-testsuite/COPYING b/debian/tests/linuxptp-testsuite/COPYING
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/COPYING
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/debian/tests/linuxptp-testsuite/README b/debian/tests/linuxptp-testsuite/README
new file mode 100644
index 0000000..65c67eb
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/README
@@ -0,0 +1,18 @@
+linuxptp-testsuite
+==================
+
+This is a set of tests developed for linuxptp. It uses the clknetsim simulator
+to run the tests quickly and with reproducible results.
+
+Links
+-----
+- http://linuxptp.sourceforge.net/
+- https://github.com/mlichvar/clknetsim
+
+Author
+------
+Miroslav Lichvar <[e-mail]>
+
+License
+-------
+GPLv2+
diff --git a/debian/tests/linuxptp-testsuite/run b/debian/tests/linuxptp-testsuite/run
new file mode 100755
index 0000000..18f4f46
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/run
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+passed=() failed=()
+
+[ $# -gt 0 ] && tests=($@) || tests=([0-9][0-9]-*[^_])
+
+for test in "${tests[@]}"; do
+	echo "$test ($[${#passed[@]} + ${#failed[@]} + 1]/${#tests[@]})"
+	./$test && passed=(${passed[@]} $test) || failed=(${failed[@]} $test)
+	echo
+done
+
+echo "SUMMARY:"
+echo "  TOTAL  $[${#passed[@]} + ${#failed[@]}]"
+echo "  PASSED ${#passed[@]}"
+echo "  FAILED ${#failed[@]}    (${failed[@]})"
+
+[ ${#failed} -eq 0 ]
diff --git a/debian/tests/linuxptp-testsuite/test.common b/debian/tests/linuxptp-testsuite/test.common
new file mode 100644
index 0000000..f5f325c
--- /dev/null
+++ b/debian/tests/linuxptp-testsuite/test.common
@@ -0,0 +1,367 @@
+# Copyright (C) 2013  Miroslav Lichvar <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+export LC_ALL=C
+export PATH=$(pwd):$PATH
+
+if [ ! -e clknetsim ]; then
+	git clone https://github.com/mlichvar/clknetsim.git || exit 1
+fi
+
+if [ ! -x clknetsim/clknetsim -o ! -e clknetsim/clknetsim.so ]; then
+	pushd clknetsim
+	make || exit 1
+	popd
+fi
+
+export CLKNETSIM_PATH=clknetsim
+
+. $CLKNETSIM_PATH/clknetsim.bash
+
+default_limit=500
+default_time_offset=1e-1
+default_freq_offset=1e-4
+default_base_delay=1e-7
+default_jitter=1e-7
+default_refclock_jitter=1e-7
+default_refclock_offset=0.0
+default_wander=1e-9
+default_time_rms_limit=1e-6
+default_freq_rms_limit=1e-6
+default_time_max_limit=2e-6
+default_freq_max_limit=2e-6
+default_min_sync_time=10
+default_max_sync_time=40
+default_max_ptp4l_delay_limit=1e-4
+default_nodes=3
+default_subnets=""
+default_master_nodes="1"
+default_transparent_nodes=""
+default_free_running_nodes=""
+default_delay_correction=""
+default_phc2sys_node=0
+default_pmc_node=0
+default_nsm_node=0
+default_master_start=0.0
+default_slave_start=9.0
+default_phc2sys_start=9.0
+default_pmc_start=50.0
+default_nsm_start=50.0
+default_master_step=""
+default_slave_step=""
+default_update_interval=0
+default_log_packets=0
+default_master_conf=""
+default_slave_conf=""
+default_transparent_conf=""
+default_phc2sys_conf=""
+default_pmc_conf=""
+default_nsm_conf=""
+default_phc2sys_uds=""
+default_pmc_uds=""
+default_phc2sys_phc_base=0
+default_phc2sys_phc_swap=0
+default_extra_ptp4l_options=""
+
+declare -a extra_node_confs
+declare -a node_start
+
+for defoptname in ${!default_*}; do
+	optname=${defoptname#default_}
+	[ -z "${!optname}" ] && declare "$optname"="${!defoptname}"
+done
+
+test_start() {
+	rm -f tmp/*
+	echo "Testing $@:"
+}
+
+test_pass() {
+	echo "PASS"
+	exit 0
+}
+
+test_fail() {
+	echo "FAIL"
+	exit 1
+}
+
+test_ok() {
+	pad_line
+	echo -e "\tOK"
+	return 0
+}
+
+test_bad() {
+	pad_line
+	echo -e "\tBAD"
+	return 1
+}
+
+test_error() {
+	pad_line
+	echo -e "\tERROR"
+	return 1
+}
+
+msg_length=0
+pad_line() {
+	local line_length=56
+	[ $msg_length -lt $line_length ] && \
+		printf "%$[$line_length - $msg_length]s" ""
+	msg_length=0
+}
+
+test_message() {
+	local level=$1 eol=$2
+	shift 2
+	local msg="$*"
+
+	while [ $level -gt 0 ]; do
+		echo -n "  "
+		level=$[$level - 1]
+		msg_length=$[$msg_length + 2]
+	done
+	echo -n "$msg"
+
+	msg_length=$[$msg_length + ${#msg}]
+	if [ $eol -ne 0 ]; then
+		echo
+		msg_length=0
+	fi
+}
+
+check_sync() {
+	local i sync_time max_time_error max_freq_error ret=0
+	local rms_time_error rms_freq_error
+
+	test_message 2 1 "checking clock sync time, max/rms time/freq error:"
+	
+	for i in $(seq 1 $nodes); do
+		[[ " $master_nodes " =~ [^0-9]$i[^0-9] ]] && continue
+		[ $i -eq $pmc_node ] && continue
+		[ $i -eq $nsm_node ] && continue
+		[[ " $free_running_nodes " =~ [^0-9]$i[^0-9] ]] && continue
+
+		sync_time=$(find_sync tmp/log.offset tmp/log.freq $i \
+			$time_max_limit $freq_max_limit 1.0)
+		max_time_error=$(get_stat 'Maximum absolute offset' $i)
+		max_freq_error=$(get_stat 'Maximum absolute frequency' $i)
+		rms_time_error=$(get_stat 'RMS offset' $i)
+		rms_freq_error=$(get_stat 'RMS frequency' $i)
+
+		test_message 3 0 "node $i: $sync_time $(printf '%.2e %.2e %.2e %.2e' \
+			$max_time_error $max_freq_error $rms_time_error $rms_freq_error)"
+
+		check_stat $sync_time $min_sync_time $max_sync_time && \
+			check_stat $max_time_error 0.0 $time_max_limit && \
+			check_stat $max_freq_error 0.0 $freq_max_limit && \
+			check_stat $rms_time_error 0.0 $time_rms_limit && \
+			check_stat $rms_freq_error 0.0 $freq_rms_limit && \
+			test_ok || test_bad
+
+		[ $? -eq 0 ] || ret=1
+	done
+
+	return $ret
+}
+
+check_ptp4l_delay() {
+	local i max_delay ret=0
+
+	test_message 2 1 "checking max abs path delay measured by ptp4l:"
+
+	for i in $(seq 1 $nodes); do
+		[[ " $master_nodes " =~ [^0-9]$i[^0-9] ]] && continue
+		[ $i -eq $pmc_node ] && continue
+		[ $i -eq $nsm_node ] && continue
+
+		max_delay=$(grep -oE 'delay +filtered +[-0-9]+ +raw +[-0-9]+$' tmp/log.$i | awk '
+			BEGIN {
+				max = 0.0
+			} { 
+				abs = $5 < 0 ? -$5 : $5
+				if (max < abs)
+					max = abs
+			} END {
+				print max / 1e9
+			}')
+
+		test_message 3 0 "node $i: $(printf '%.2e' $max_delay)"
+
+		check_stat $max_delay 0.0 $max_ptp4l_delay_limit && test_ok || test_bad
+
+		[ $? -eq 0 ] || ret=1
+	done
+
+	return $ret
+}
+	
+check_pmc_output() {
+	local pattern=$1
+	test_message 2 0 "checking pmc output:"
+	[[ "$(cat tmp/log.$pmc_node)" =~ $pattern ]] && test_ok || test_bad
+}
+
+check_nsm_output() {
+	local pattern=$1
+	test_message 2 0 "checking nsm output:"
+	[[ "$(cat tmp/log.$nsm_node)" =~ $pattern ]] && test_ok || test_bad
+}
+
+check_any_log_message() {
+	local matching_messages node=$1 match_pattern=$2 last_pattern=$3
+	matching_messages=$(grep "$match_pattern" tmp/log.$node)
+	test_message 2 0 "checking any \"$match_pattern\" in node $node log: "
+	[[ "$matching_messages" =~ $last_pattern ]] && test_ok || test_bad
+}
+
+check_last_log_message() {
+	local last_message node=$1 match_pattern=$2 last_pattern=$3
+	last_message=$(grep "$match_pattern" tmp/log.$node | tail -n 1)
+	test_message 2 0 "checking last \"$match_pattern\" in node $node log: "
+	[[ "$last_message" =~ $last_pattern ]] && test_ok || test_bad
+}
+
+print_nondefaults() {
+	local i defopt defoptname optname
+
+	test_message 2 1 "non-default settings:"
+	for defoptname in ${!default_*}; do
+		optname=${defoptname#default_}
+		[ "${!defoptname}" = "${!optname}" ] || \
+			test_message 3 1 $optname=${!optname}
+	done
+
+	for i in $(seq 1 $nodes); do
+		[ -z "${extra_node_confs[$i]}" ] || \
+			test_message 3 1 extra_node_confs[$i]=${extra_node_confs[$i]}
+	done
+}
+
+get_wander_expr() {
+	local scaled_wander
+
+	scaled_wander=$(awk "BEGIN {print $wander / \
+		sqrt($update_interval < 0 ? 2^-($update_interval) : 1)}")
+
+	echo "(+ $freq_offset (sum (* $scaled_wander (normal))))"
+}
+
+run_simulation() {
+	test_message 2 0 "running simulation:"
+
+	start_server $nodes \
+		-n $[$(echo "$subnets" | tr -cd '|' | wc -c) + 2] \
+		-o tmp/log.offset -f tmp/log.freq \
+		$([ $log_packets -ne 0 ] && echo -p tmp/log.packets) \
+		-R $(awk "BEGIN {print $update_interval < 0 ? 2^-($update_interval) : 1}") \
+		-r $(awk "BEGIN {print $max_sync_time * 2^$update_interval}") \
+		-l $(awk "BEGIN {print $limit * 2^$update_interval}") && test_ok || test_error
+}
+
+run_test() {
+	local i j s subnet ifaces test_subnets conf start
+
+	test_message 1 1 "network with $nodes nodes:"
+	print_nondefaults
+
+	[ -z "$subnets" ] && test_subnets=$(seq -s ' ' 1 $nodes) || test_subnets=$subnets
+
+	generate_config4 "$master_nodes $pmc_node $nsm_node" "$test_subnets" $time_offset \
+		"$(get_wander_expr)" \
+		"(+ $base_delay (* $jitter (exponential)))"
+
+	if [ -n "$delay_correction" ]; then
+		for i in $(seq 1 $nodes); do
+			for j in $(seq 1 $nodes); do
+				echo "node${i}_delay_correction${j} = $delay_correction" >> tmp/conf
+			done
+		done
+	fi
+
+	for i in $(seq 1 $nodes); do
+		ifaces="" subnet=0
+		for s in $test_subnets; do
+			[ $s = "|" ] && subnet=$[$subnet + 1] && continue
+			[ $s -eq $i ] && ifaces="$ifaces -i eth$subnet"
+		done
+
+		export CLKNETSIM_UNIX_SUBNET=$[$subnet + 2]
+
+		test_message 2 0 "starting node $i:"
+		if [ $i -eq $phc2sys_node ]; then
+			echo "node${i}_start = $phc2sys_start" >> tmp/conf
+			echo "node${i}_refclock = (+ $refclock_offset (* $refclock_jitter (normal)))" \
+				>> tmp/conf
+			if [ "$phc2sys_phc_base" -gt 0 ]; then
+				echo "node${i}_refclock_base = node${phc2sys_phc_base}" >> tmp/conf
+			fi
+			ifaces=""
+			for uds in $phc2sys_uds; do
+				ifaces="$ifaces -z /clknetsim/unix/$uds"
+			done
+			CLKNETSIM_PHC_SWAP=$phc2sys_phc_swap \
+				start_client $i phc2sys "$ifaces $phc2sys_conf" && \
+					test_ok || test_error
+		elif [ $i -eq $pmc_node ]; then
+			echo "node${i}_start = $pmc_start" >> tmp/conf
+			if [ "$pmc_uds" != "" ]; then
+				ifaces="-u -i /clknetsim/unix/pmc -s /clknetsim/unix/$pmc_uds"
+			fi
+			start_client $i pmc "$pmc_conf" "" "-b 0 $ifaces" && \
+				test_ok || test_error
+		elif [ $i -eq $nsm_node ]; then
+			echo "node${i}_start = $nsm_start" >> tmp/conf
+			start_client $i nsm "$nsm_conf" "" "$ifaces" && \
+				test_ok || test_error
+		else
+			if [[ " $transparent_nodes " =~ [^0-9]$i[^0-9] ]]; then
+				start=$slave_start
+				conf=$transparent_conf
+				step=$slave_step
+			elif [[ " $master_nodes " =~ [^0-9]$i[^0-9] ]]; then
+				start=$master_start
+				conf=$master_conf
+				step=$master_step
+			else
+				start=$slave_start
+				conf=$slave_conf
+				step=$slave_step
+			fi
+			conf=$( echo "uds_address /clknetsim/unix/ptp4l"
+				echo "uds_ro_address /clknetsim/unix/ptp4lro"
+				echo "${conf}"
+				echo "${extra_node_confs[$i]}")
+			[ -z "$step" ] || echo "node${i}_step = $step" >> tmp/conf
+
+			# override individual node start time if set
+			if [[ -n "${node_start[$i]}" ]]; then
+				start=${node_start[$i]}
+			fi
+			echo "node${i}_start = $start" >> tmp/conf
+			start_client $i ptp4l "$conf" "" "$ifaces $extra_ptp4l_options" && \
+				test_ok || test_error
+		fi
+
+		[ $? -ne 0 ] && return 1
+	done
+
+	run_simulation
+}
+
+run_ptp4l() {
+	run_test "$@"
+}
diff --git a/debian/tests/simulation-test-suite b/debian/tests/simulation-test-suite
new file mode 100755
index 0000000..0649aa0
--- /dev/null
+++ b/debian/tests/simulation-test-suite
@@ -0,0 +1,55 @@
+#!/bin/bash -e
+
+testdir="$PWD/debian/tests/linuxptp-testsuite"
+clknetsim_ver=0a11a35
+clknetsim_src=https://github.com/mlichvar/clknetsim/archive/"$clknetsim_ver"/clknetsim-"$clknetsim_ver".tar.gz
+clknetsim_archive=$(basename "$clknetsim_src")
+
+inject_local_aa() {
+  app="$1"
+  apparmor_profile=/etc/apparmor.d/usr.sbin.${app}
+  echo "-- Injecting complementary AppArmor rules for $app"
+
+  sudo -E bash -c "
+    if [ -f '$apparmor_profile' ]; then
+      if aa-status --enabled 2>/dev/null; then
+        cat <<EOF >>/etc/apparmor.d/local/usr.sbin.'${app}'
+/tmp/autopkgtest*/** rwm,
+/proc/[0-9]*/comm r,
+EOF
+        apparmor_parser -r -W -T '${apparmor_profile}' || {
+          echo 'Failed to reload the ${apparmor_profile} AppArmor profile, continuing anyway.'
+        }
+      fi
+    else
+      echo 'AppArmor profile for $app does not exist, skipping.'
+    fi
+  "
+}
+
+# Always use the same seed to get deterministic results
+export CLKNETSIM_RANDOM_SEED=24508
+
+# By default linuxptp-testsuite will look for clknetsim in a linuxptp-testsuite/clknetsim subdirectory
+echo ""
+cd "$testdir"
+mkdir clknetsim
+cd clknetsim
+
+echo "-- Downloading clknetsim"
+wget "$clknetsim_src"
+
+echo "-- Extracting clknetsim"
+tar -xzvf "$clknetsim_archive" --strip-components=1
+echo ""
+
+echo "-- Building clknetsim"
+make
+echo ""
+
+inject_local_aa "ptp4l"
+inject_local_aa "phc2sys"
+
+echo "-- Running test-suite"
+cd "$testdir"
+./run
diff --git a/debian/usr.sbin.phc2sys b/debian/usr.sbin.phc2sys
new file mode 100644
index 0000000..05d30e3
--- /dev/null
+++ b/debian/usr.sbin.phc2sys
@@ -0,0 +1,44 @@
+
+# vim:syntax=apparmor
+# Last Modified: Sun Sep 05 16:48:05 2021
+
+abi <abi/4.0>,
+include <tunables/global>
+
+profile phc2sys /usr/sbin/phc2sys {
+  include <abstractions/base>
+
+  # Needed phc2sys capabilities
+  capability dac_read_search,
+  capability dac_override,
+  capability sys_time,
+  capability sys_module,
+  capability net_admin,
+
+  # Allow dgram type for all net domains
+  network dgram,
+
+  # The phc2sys application it's own
+  /{usr/,}sbin/phc2sys mr,
+
+  # phc2sys runtime data
+  @{run}/phc2sys.[0-9]* rw,
+
+  # To be able to comunicate with ptp4l
+  @{run}/ptp4lro rw,
+
+  # Needed signals in case of being executed by other application
+  signal (receive) set=(term),
+
+  # Needed when being executed by timemaster
+  @{run}/timemaster/ptp4l.[0-9]*.socket rw,
+
+  # PTP devices
+  /dev/ptp[0-9]* rw,
+
+  # PPS devices
+  /dev/pps[0-9]* r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  include if exists <local/usr.sbin.ptp4l>
+}
diff --git a/debian/usr.sbin.ptp4l b/debian/usr.sbin.ptp4l
new file mode 100644
index 0000000..750d80b
--- /dev/null
+++ b/debian/usr.sbin.ptp4l
@@ -0,0 +1,64 @@
+# vim:syntax=apparmor
+# Last Modified: Sun Sep 05 16:48:05 2021
+
+abi <abi/4.0>,
+include <tunables/global>
+
+profile ptp4l /usr/sbin/ptp4l {
+  include <abstractions/base>
+
+  # The ptp4l application it's own
+  /{usr/,}sbin/ptp4l mr,
+
+  # Needed signals in case of being executed by other application
+  signal (receive) set=(term),
+
+  # Needed capabilities
+  capability net_admin,
+  capability sys_module,
+  capability net_bind_service,
+  capability net_raw,
+
+  # Needed Network domains
+  network netlink,
+  network packet,
+  network inet,
+  network inet6,
+  network unix,
+  network unspec,
+
+  # Needed to define mac address for
+  # a network interface
+  /sys/class/net/*/address r,
+
+  # ptp devices
+  /dev/ptp[0-9]* rw,
+
+  # serial devices
+  /dev/ttyS[0-9]* rw,
+  /dev/ttyACM[0-9]* rw,
+
+  # Needed for ipc and runtime status
+  @{run}/cmlds_client rw,
+  @{run}/cmlds_server rw,
+  @{run}/refclock.ptp.sock rw,
+  @{run}/run/ptp4l rw,
+  @{run}/ptp4lro rw,
+  @{run}/ptp4l rw,
+  @{run}/ptp4lro rw,
+  @{run}/phc2sys.[0-9]+ r,
+
+  # When being runned by timemaster
+  @{run}/timemaster/chrony.SOCK* rw,
+  @{run}/timemaster/ptp4l.*.conf r,
+  @{run}/timemaster/ptp4l.*.socket rw,
+  @{run}/timemaster/ptp4lro.*.socket rw,
+  @{run}/phc2sys.* rw,
+
+  # ptp4l config files
+  @{etc_ro}/linuxptp/** r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  include if exists <local/usr.sbin.ptp4l>
+}
+
diff --git a/debian/usr.sbin.timemaster b/debian/usr.sbin.timemaster
new file mode 100644
index 0000000..aaba051
--- /dev/null
+++ b/debian/usr.sbin.timemaster
@@ -0,0 +1,47 @@
+
+# vim:syntax=apparmor
+# Last Modified: Mon Sep 15 14:48:05 2024
+
+abi <abi/4.0>,
+include <tunables/global>
+
+profile timemaster /usr/sbin/timemaster {
+  include <abstractions/base>
+  include <abstractions/nameservice>
+
+  # To be able to kill child processes
+  capability kill,
+
+  # To be able to send the term signal
+  signal (send) set=(term),
+
+  # Runtime config files for timemaster
+  @{run}/timemaster/*.conf rw,
+  @{run}/timemaster/ rwk,
+
+  ## system files access
+
+  # RPi4 and RPi5 specific
+  @{sys}/devices/platform/axi/[0-9a-f]*.pcie/[0-9a-f]*.ethernet/net/*/ptp[0-9]*/ r,
+  @{sys}/devices/platform/axi/[0-9a-f]*.pcie/[0-9a-f]*.ethernet/net/*/ptp[0-9]*/n_vclocks rw,
+
+  # Generic arch's
+  @{sys}/ptp[0-9]+/ptp[0-9]* rw,
+  @{sys}/ptp[0-9]+/n_vclocks rw,
+  @{sys}/net/*/ptp[0-9]*/n_vclocks rw,
+
+  # Default location for config files
+  @{etc_ro}/linuxptp/** r,
+  @{etc_ro}/chrony/** r,
+  @{etc_ro}/ntpsec/** r,
+
+  # Backend applications
+  # Px = exec to apparmor profile that matches executable name, with environment variable scrubbing
+  /usr/sbin/chronyd Px,
+  /usr/sbin/ntpd Px,
+  /usr/sbin/ptp4l Px,
+  /usr/sbin/phc2sys Px,
+
+  # Site-specific additions and overrides. See local/README for details.
+  include if exists <local/usr.sbin.timemaster>
+}