summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-10-12 17:14:35 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-10-12 17:14:35 +0000
commita27467546ff779d4b605b58295cf088568c4d2cc (patch)
treeb5aeca91a23203add7deb1f3b0cbe15b58861901
parentAdding upstream version 3.1.1. (diff)
downloadlinuxptp-a27467546ff779d4b605b58295cf088568c4d2cc.tar.xz
linuxptp-a27467546ff779d4b605b58295cf088568c4d2cc.zip
Adding debian version 3.1.1-1.debian/3.1.1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/README.Debian30
-rw-r--r--debian/README.source23
-rw-r--r--debian/changelog105
-rw-r--r--debian/control32
-rw-r--r--debian/copyright40
-rwxr-xr-xdebian/gbp/postclone.sh14
-rw-r--r--debian/linuxptp.docs2
-rwxr-xr-xdebian/linuxptp.install6
-rw-r--r--debian/phc2sys@.service13
-rw-r--r--debian/ptp4l@.service11
-rwxr-xr-xdebian/rules13
-rw-r--r--debian/salsa-ci.yml3
-rw-r--r--debian/source/format1
-rw-r--r--debian/timemaster.conf33
-rw-r--r--debian/timemaster.service12
-rw-r--r--debian/watch5
16 files changed, 343 insertions, 0 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..aca248d
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,30 @@
+1. Default configuration
+
+The default configuration can be found in /etc/linuxptp/ptp4l.conf.
+This is the default.cfg provided by the upstream source.
+
+2. Systemd services
+
+The service ptp4l invokes ptp4l on eth0 by default. To adjust the
+parameters, follow these steps:
+
+1. create a directory /etc/systemd/system/ptp4l.service.d
+
+2. place a file with its name ending in .conf there
+
+3. put these lines into the file, with the parameters adjusted to your needs:
+
+[Service]
+ExecStart=
+ExecStart=/usr/sbin/ptp4l -f /etc/linuxptp/ptp4l.conf -i eth0
+
+The service phc2sys syncs the system clock with the PTP clock. It is not
+enabled and started by default. To activate this service, invoke the
+following commands as root:
+
+$ systemctl enable phc2sys
+$ systemctl start phc2sys
+
+It also uses eth0 as the default and can be customized as described above.
+
+The service timemaster also isn't enabled and started by default
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..2483246
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,23 @@
+gbp clone
+---------
+
+Starting with gbp>0.8.1, here's an simple way to automatically fine-tune the
+repository in the following ways:
+- make git ignore any .pc/ directory (created by quilt)
+- enable the "--follow-tags" when running 'git-push', so it's harder
+ to forget to push packaging tags along with the branches.
+
+To enable this, run gbp-clone with the '--postclone debian/gbp/postclone.sh'
+option.
+To enable this for ALL repositories cloned via 'gbp' (in the future), do
+something like the following:
+
+ $ mkdir -p ~/bin
+ $ cp debian/gbp/postclone.sh ~/bin/gbphook-postclone
+ $ cat >> ~/.gbp.conf <<EOF
+ [clone]
+ postclone = ~/bin/gbphook-postclone
+ EOF
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org> Mon, 1 Aug 2016 12:15:50 +0200
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..9cb4bac
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,105 @@
+linuxptp (3.1.1-1) unstable; urgency=medium
+
+ [ IOhannes m zmölnig (Debian/GNU) ]
+ * Add Salsa-CI configuration
+
+ [ Punit Agrawal ]
+ * New upstream version 3.1.1
+ * Update patches for new upstream release 3.1.1
+
+ -- Punit Agrawal <punit@debian.org> Mon, 30 Aug 2021 22:11:52 +0900
+
+linuxptp (3.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Validate the messageLength field of incoming messages (CVE-2021-3570)
+ (Closes: #990748)
+ * tc: Fix length of follow-up message of one-step sync (CVE-2021-3571)
+ (Closes: #990749)
+
+ -- Salvatore Bonaccorso <carnil@debian.org> Tue, 06 Jul 2021 20:16:00 +0200
+
+linuxptp (3.1-2) unstable; urgency=medium
+
+ [ Punit Agrawal ]
+ * Version bump for source only upload
+
+ -- Punit Agrawal <punit@debian.org> Mon, 14 Dec 2020 07:33:39 +0900
+
+linuxptp (3.1-1) unstable; urgency=medium
+
+ [ Punit Agrawal ]
+ * New upstream version 3.1 (Closes: 969194)
+
+ [ Ondřej Nový ]
+ * Use https protocol for watchfile
+
+ [ Punit Agrawal ]
+ * Drop unnecessary debhelper parameter in rules
+ * Update standards version to 4.5.1
+ * Update debhelper version to 13
+ * Add example configurations to package docs
+ * Add Punit Agrawal to the uploaders for the package
+ * Convert service files to service templates (Closes: #855834)
+
+ -- Punit Agrawal <punit@debian.org> Sun, 13 Dec 2020 16:07:39 +0900
+
+linuxptp (1.9.2-1) unstable; urgency=medium
+
+ [ Ondřej Nový ]
+ * d/copyright: Use https protocol in Format field
+ * d/control: Set Vcs-* to salsa.debian.org
+
+ [ Felipe Sateler ]
+ * Change maintainer address to debian-multimedia@lists.debian.org
+
+ [ Tino Mettler ]
+ * New upstream version 1.9.2
+ * Replace obsolete build-dep on dh-systemd by matching debhelber build-dep
+ * Move package to salsa.debian.org, thanks to Ondřej and Felipe for the
+ help
+
+ -- Tino Mettler <tino+debian@tikei.de> Mon, 02 Jul 2018 15:20:30 +0200
+
+linuxptp (1.8-1) unstable; urgency=medium
+
+ * New upstream version 1.8
+ * Add new delay option to the default timemaster.conf
+ * Provide links to the manpages for "systemctl help <unit>"
+
+ -- Tino Mettler <tino+debian@tikei.de> Fri, 11 Nov 2016 13:23:42 +0100
+
+linuxptp (1.7-1) unstable; urgency=medium
+
+ * New upstream version 1.7
+
+ * Document how to properly checkout the repository
+ * Removed debian/git-tuneclone.sh script
+ * Updated Vcs-Git stanza to use https://
+ * Bumped standards version to 3.9.8
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org> Mon, 08 Aug 2016 15:23:37 +0200
+
+linuxptp (1.6-1) unstable; urgency=medium
+
+ * Imported Upstream version 1.6
+
+ * Removed patches no longer necessary
+ * Fixed install destination in debian/rules
+ * Update Vcs-Browser stanza
+ * Added debian/git-tuneclone.sh script
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org> Tue, 10 Nov 2015 20:26:00 +0100
+
+linuxptp (1.5-2) unstable; urgency=medium
+
+ * Renamed debian/install to debian/linuxptp.install (Closes: #802103)
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org> Sat, 17 Oct 2015 20:04:02 +0200
+
+linuxptp (1.5-1) unstable; urgency=medium
+
+ [ Tino Mettler ]
+ * Initial release. (Closes: #771843)
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org> Sun, 07 Jun 2015 22:40:10 +0200
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..acedcbf
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,32 @@
+Source: linuxptp
+Section: utils
+Priority: optional
+Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
+Uploaders: Tino Mettler <tino+debian@tikei.de>,
+ IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>,
+ Punit Agrawal <punit@debian.org>
+Build-Depends: debhelper-compat (= 13), dh-exec
+Standards-Version: 4.5.1
+Homepage: http://linuxptp.sourceforge.net/
+Vcs-Git: https://salsa.debian.org/multimedia-team/linuxptp.git
+Vcs-Browser: https://salsa.debian.org/multimedia-team/linuxptp
+
+Package: linuxptp
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Precision Time Protocol (PTP, IEEE1588) implementation for Linux
+ Linuxptp is an implementation of the Precision Time Protocol (PTP)
+ according to IEEE standard 1588 for Linux. Features include:
+ - support for hardware and software time stamping via the Linux
+ SO_TIMESTAMPING socket option.
+ - support for the Linux PTP Hardware Clock (PHC) subsystem by using the
+ clock_gettime family of calls, including the new clock_adjtimex
+ system call
+ - implementation of Boundary Clock (BC) and Ordinary Clock (OC)
+ - transport over UDP/IPv4, UDP/IPv6, and raw Ethernet (Layer 2)
+ - support for IEEE 802.1AS-2011 in the role of end station
+ .
+ PTP provides higher precision and faster synchronization than NTP even
+ without hardware support. With hardware support, sub-microsecond
+ accuracy can be expected. Whereas NTP is intended for WAN use, PTP is
+ designed for LAN environments and makes use of UDP multicast.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..b981d7e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,40 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: linuxptp
+Upstream-Contact: Richard Cochran <richardcochran@gmail.com>
+Source: http://sourceforge.net/projects/linuxptp/files/
+
+Files: *
+Copyright: 2011-2014 Richard Cochran <richardcochran@gmail.com>
+ 2013-2014 Miroslav Lichvar <mlichvar@redhat.com>
+ 2014 Jacob Keller <jacob.keller@gmail.com>
+ 2014 Jiri Benc <jbenc@redhat.com>
+ 2013 Delio Brignoli <dbrignoli@audioscience.com>
+License: GPL-2.0+
+
+Files: debian/*
+Copyright: 2014-2015 Tino Mettler <tino+debian@tikei.de>
+License: GPL-2.0+
+
+Files: debian/*.service
+ debian/timemaster.conf
+Copyright: 2014-2015 Miroslav Lichvar <mlichvar@redhat.com>
+ 2015 Tino Mettler <tino+debian@tikei.de>
+License: GPL-2.0+
+
+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
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/gbp/postclone.sh b/debian/gbp/postclone.sh
new file mode 100755
index 0000000..5790ec6
--- /dev/null
+++ b/debian/gbp/postclone.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+## script to initialize a cloned repository
+## with per (local) repository settings.
+
+# - ignore quilt's .pc/ directory
+# - enable the "--follow-tags" mode for pushing
+
+echo "tuning git-repository for ${NAME}"
+git config push.followTags true && echo "enabled push.followTags"
+
+GITEXCLUDE=".git/info/exclude"
+egrep "^/?\.pc/?$" "${GITEXCLUDE}" >/dev/null 2>&1 \
+ || (echo "/.pc/" >> "${GITEXCLUDE}" && echo "ignoring /.pc/")
diff --git a/debian/linuxptp.docs b/debian/linuxptp.docs
new file mode 100644
index 0000000..f841117
--- /dev/null
+++ b/debian/linuxptp.docs
@@ -0,0 +1,2 @@
+README.org
+configs \ No newline at end of file
diff --git a/debian/linuxptp.install b/debian/linuxptp.install
new file mode 100755
index 0000000..af6db99
--- /dev/null
+++ b/debian/linuxptp.install
@@ -0,0 +1,6 @@
+#!/usr/bin/dh-exec
+debian/ptp4l@.service /lib/systemd/system/
+debian/phc2sys@.service /lib/systemd/system/
+debian/timemaster.service /lib/systemd/system/
+configs/default.cfg => /etc/linuxptp/ptp4l.conf
+debian/timemaster.conf /etc/linuxptp/
diff --git a/debian/phc2sys@.service b/debian/phc2sys@.service
new file mode 100644
index 0000000..dd2512b
--- /dev/null
+++ b/debian/phc2sys@.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Synchronize system clock or PTP hardware clock (PHC)
+Documentation=man:phc2sys
+Requires=ptp4l.service
+After=ptp4l.service
+Before=time-sync.target
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/phc2sys -w -s %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/ptp4l@.service b/debian/ptp4l@.service
new file mode 100644
index 0000000..1bad2d7
--- /dev/null
+++ b/debian/ptp4l@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Precision Time Protocol (PTP) service for %I
+Documentation=man:ptp4l
+After=sys-subsystem-net-devices-%i.device
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/ptp4l -f /etc/linuxptp/ptp4l.conf -i %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..8920f9d
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+DPKG_EXPORT_BUILDFLAGS = 1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+include /usr/share/dpkg/default.mk
+export EXTRA_CFLAGS = $(CFLAGS)
+
+%:
+ dh $@
+
+override_dh_auto_install:
+ dh_auto_install -- prefix=/usr mandir=/usr/share/man
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 0000000..8424db4
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,3 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/timemaster.conf b/debian/timemaster.conf
new file mode 100644
index 0000000..fd8e77e
--- /dev/null
+++ b/debian/timemaster.conf
@@ -0,0 +1,33 @@
+# Configuration file for timemaster
+
+#[ntp_server ntp-server.local]
+#minpoll 4
+#maxpoll 4
+
+#[ptp_domain 0]
+#interfaces eth0
+#delay 10e-6
+
+[timemaster]
+ntp_program chronyd
+
+[chrony.conf]
+include /etc/chrony.conf
+
+[ntp.conf]
+includefile /etc/ntp.conf
+
+[ptp4l.conf]
+
+[chronyd]
+path /usr/sbin/chronyd
+
+[ntpd]
+path /usr/sbin/ntpd
+options -u ntp:ntp -g
+
+[phc2sys]
+path /usr/sbin/phc2sys
+
+[ptp4l]
+path /usr/sbin/ptp4l
diff --git a/debian/timemaster.service b/debian/timemaster.service
new file mode 100644
index 0000000..c9323ae
--- /dev/null
+++ b/debian/timemaster.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Synchronize system clock to NTP and PTP time sources
+Documentation=man:timemaster
+After=chronyd.service ntpd.service ntpdate.service sntp.service
+Conflicts=chronyd.service ntpd.service phc2sys.service ptp4l.service
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/timemaster -f /etc/linuxptp/timemaster.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..5f40308
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,5 @@
+version=3
+# qa.debian.org runs a redirector which allows a simpler form of URL
+# for SourceForge based projects. The format below will automatically
+# be rewritten to use the redirector.
+https://sf.net/linuxptp/linuxptp-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))