- Update to 2.3.1

* see attached Changelog for full list of changes
- Update project and download url
- Small spec file cleanups

OBS-URL: https://build.opensuse.org/package/show/network:time/ptpd?expand=0&rev=8

conf.sysconfig.ptpd

@@ -1,8 +1,22 @@
-# Config file location
+## Path:           Network/PTPD
-PTPD_CONFIG_FILE="/etc/ptpd2.conf"
+## Description:    Precision Time Protocol (PTP) daemon options
-# Lock / PID file location
+## Type:           string
-#PTPD_PID_FILE="/var/run/ptpd2.lock"
+## Default:        AUTO-2
-# Status file location
+## ServiceRestart: ptpd
-#PTPD_STATUS_FILE="/var/run/ptpd2.status"
+#
-# Any extra command-line options
+## Type:           string
-PTPD_EXTRA_OPTIONS=""
+## Default:        ""
+#
+# Additional arguments when starting ptpd. The most important ones would be
+# -x                do not reset the clock if off by more than one second
+# -t                do not adjust the system clock
+# 
+# -g                run as slave only
+# -p                make this a preferred clock
+# 
+# -b NAME           bind PTP to network interface NAME
+# 
+# -n NAME           specify PTP subdomain name (not related to IP or DNS)
+# -a NUMBER,NUMBER  specify clock servo P and I attenuations
+# -w NUMBER         specify one way delay filter stiffness
+PTPD_OPTIONS=""

ptpd-2.3.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a4e90496f004bfd91657ccc49209101dc25b787e540648c07c0973469f1d8f7
-size 785362

ptpd-2.3.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:267ad61d09d97069acec5d4878dceda20d0ddbebd27557d80230847848cee6c2
+size 884161

ptpd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu May 12 19:33:35 UTC 2016 - mpluskal@suse.com
+
+- Update to 2.3.1
+  * see attached Changelog for full list of changes
+- Update project and download url
+- Small spec file cleanups
+
 -------------------------------------------------------------------
 Mon Jun  1 08:41:34 UTC 2015 - mpluskal@suse.com
 

ptpd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ptpd
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
 
 
 Name:           ptpd
-Version:        2.3.0
+Version:        2.3.1
 Release:        0
 Summary:        Implements the Precision Time protocol as defined by IEEE 1588 standard
 License:        BSD-3-Clause
 Group:          System/Daemons
-Url:            http://ptpd.sourceforge.net/
+Url:            https://github.com/ptpd/ptpd
-Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/ptpd/ptpd/archive/ptpd-%{version}.tar.gz
 Source1:        ptpd2.service
 Source2:        ptpd2.conf
 Source3:        conf.sysconfig.ptpd
@@ -58,17 +58,15 @@ be easy to port to other platforms.
 PTPd is free. Everyone is invited to use and contribute to PTPd.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
-autoreconf -fiv
 
 %build
+autoreconf -fiv
 %configure \
-    --enable-statistics \
+  --enable-statistics
-    --enable-ntpdc \
-    --enable-sigusr2=counters
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 install -D -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}2.service
 ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}2
 install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}2.conf
@@ -77,17 +75,6 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/
 install -d %{buildroot}%{_localstatedir}/log
 touch %{buildroot}%{_localstatedir}/log/ptpd2_kernelclock.drift
 
-%files
-%defattr(-, root, root)
-%doc COPYRIGHT ChangeLog README
-%config %{_sysconfdir}/%{name}2.conf
-%{_sbindir}/*
-%{_mandir}/man8/*
-%{_mandir}/man5/*
-%{_libexecdir}/systemd/system/ptpd2.service
-%{_localstatedir}/adm/fillup-templates/*
-%config %ghost %{_localstatedir}/log/ptpd2_kernelclock.drift
-
 %pre
 %service_add_pre %{name}2.service
 
@@ -101,4 +88,16 @@ touch %{buildroot}%{_localstatedir}/log/ptpd2_kernelclock.drift
 %postun
 %service_del_postun %{name}2.service
 
+%files
+%defattr(-, root, root)
+%doc COPYRIGHT ChangeLog README
+%config %{_sysconfdir}/%{name}2.conf
+%{_sbindir}/*
+%{_mandir}/man8/*
+%{_mandir}/man5/*
+%{_datadir}/ptpd
+%{_libexecdir}/systemd/system/ptpd2.service
+%{_localstatedir}/adm/fillup-templates/*
+%config %ghost %{_localstatedir}/log/ptpd2_kernelclock.drift
+
 %changelog

ptpd2.conf

@@ -1,68 +0,0 @@
-;
-==============================================================================
-; This is a recommended configuration for a PTPv2 slave
-; For a full list of options run ptpd2 -H or see the documentation and man
-pages
-;
-==============================================================================
-
-; interface has to be specified
-ptpengine:interface=
-
-; PTP domain
-ptpengine:domain=0
-
-; available presets are slaveonly, masteronly and masterslave (full IEEE
-1588 implementation)
-ptpengine:preset=slaveonly
-
-; multicast for both sync and delay requests - use hybrid for unicast delay
-requests
-ptpengine:ip_mode=multicast
-
-; when enabled, sniffing is used instead of sockets to send and receive
-packets
-ptpengine:use_libpcap=n
-
-; go into panic mode for 10 minutes instead of resetting the clock
-ptpengine:panic_mode=y
-ptpengine:panic_mode_duration=10
-
-; uncomment this to enable outlier filters
-ptpengine:sync_outlier_filter_enable=y
-ptpengine:delay_outlier_filter_enable=y
-
-; store observed drift in a file
-clock:drift_handling=file
-clock:drift_file=/var/log/ptpd2_kernelclock.drift
-
-; update online statistics every 5 seconds
-global:statistics_update_interval=5
-
-; wait 5 statistics intervals for one-way delay to stabilise
-ptpengine:calibration_delay=5
-
-; log file, event log only. if timing statistics are needed, see
-statistics_file
-global:log_file=/var/log/ptpd2.log
-; log file up to 5M
-global:log_file_max_size=5000
-; rotate logs up to 5 files
-global:log_file_max_files=5
-
-; status file providing an overview of ptpd's operation and statistics
-global:log_status=y
-
-; required if ip_mode is set to hybrid
-;ptpengine:log_delayreq_interval=0
-
-; uncomment this to log a timing log like in previous ptpd versions
-;global:statistics_file=/var/log/ptpd2.stats
-
-; on multi-core systems it is recommended to bind ptpd to a single core
-;global:cpuaffinity_cpucore=0
-
-; use DSCP 46 for expedited forwarding over ipv4 networks
-ptpengine:ip_dscp=46
-
-; always keep a new line in the end

ptpd2.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=ptpd time precision daemon
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/ptpd2
-ExecStart=/usr/bin/ptpd2 -c $PTPD_CONFIG_FILE $PTPD_EXTRA_OPTIONS
-
-[Install]
-WantedBy=multi-user.target