mgorny 15/06/12 10:55:53
Added: ptpd2.confd ptpd-2.3.0-ntpdc.patch
ptpd-2.3.1_rc4-debug-display.patch ptpd2.service
ptpd2.rc ptpd-2.3.0-statistics-clear.patch
Log:
New ebuild from Jan Breuer: PTPd -- implementation of Precise Time Protocol
(IEEE 1588). https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/144.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.1 net-misc/ptpd/files/ptpd2.confd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd2.confd?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd2.confd?rev=1.1&content-type=text/plain
Index: ptpd2.confd
===================================================================
# /etc/conf.d/ptpd2
# Options to pass to ptpd2
PTPD_OPTS=""
1.1 net-misc/ptpd/files/ptpd-2.3.0-ntpdc.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd-2.3.0-ntpdc.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd-2.3.0-ntpdc.patch?rev=1.1&content-type=text/plain
Index: ptpd-2.3.0-ntpdc.patch
===================================================================
diff -urN ptpd-2.3.0.old/src/dep/ntpengine/ntpdcontrol.c
ptpd-2.3.0.new/src/dep/ntpengine/ntpdcontrol.c
--- ptpd-2.3.0.old/src/dep/ntpengine/ntpdcontrol.c 2013-11-22
17:17:57.000000000 +0100
+++ ptpd-2.3.0.new/src/dep/ntpengine/ntpdcontrol.c 2014-10-08
01:37:09.000000000 +0200
@@ -74,7 +74,7 @@
if(!options->enableEngine)
return FALSE;
- memset(control, 0, sizeof(control));
+ memset(control, 0, sizeof(*control));
if(!hostLookup(options->hostAddress, &control->serverAddress)) {
control->serverAddress = 0;
@@ -236,8 +236,7 @@
int maclen;
static char *key;
- key=malloc(21);
- memset (key, 0, sizeof(key));
+ key=calloc(21,sizeof(char));
strncpy(key,options->key,20);
memset(&qpkt, 0, sizeof(qpkt));
1.1 net-misc/ptpd/files/ptpd-2.3.1_rc4-debug-display.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd-2.3.1_rc4-debug-display.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd-2.3.1_rc4-debug-display.patch?rev=1.1&content-type=text/plain
Index: ptpd-2.3.1_rc4-debug-display.patch
===================================================================
diff -ur ptpd-2.3.1-rc4.old/src/ptpd.h ptpd-2.3.1-rc4.new/src/ptpd.h
--- ptpd-2.3.1-rc4.old/src/ptpd.h 2015-06-08 23:28:46.000000000 +0200
+++ ptpd-2.3.1-rc4.new/src/ptpd.h 2015-06-12 11:35:37.200223151 +0200
@@ -438,7 +438,7 @@
void mMUtcProperties_display(const MMUtcProperties*, const PtpClock*);
void mMTraceabilityProperties_display(const MMTraceabilityProperties*, const
PtpClock*);
void mMDelayMechanism_display(const MMDelayMechanism*, const PtpClock*);
-void mMlogMinPdelayReqInterval_display(const MMLogMinPdelayReqInterval*, const
PtpClock*);
+void mMLogMinPdelayReqInterval_display(const MMLogMinPdelayReqInterval*, const
PtpClock*);
void mMErrorStatus_display(const MMErrorStatus*, const PtpClock*);
void sMRequestUnicastTransmission_display(const SMRequestUnicastTransmission*,
const PtpClock*);
1.1 net-misc/ptpd/files/ptpd2.service
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd2.service?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd2.service?rev=1.1&content-type=text/plain
Index: ptpd2.service
===================================================================
[Unit]
Description=Precise Time Protocol daemon
Documentation=man:ptpd2(8)
After=network.target
[Service]
ExecStart=/usr/sbin/ptpd2 -C -c /etc/ptpd2.conf
ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
1.1 net-misc/ptpd/files/ptpd2.rc
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd2.rc?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd2.rc?rev=1.1&content-type=text/plain
Index: ptpd2.rc
===================================================================
#!/sbin/runscript
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/ptpd/files/ptpd2.rc,v 1.1
2015/06/12 10:55:53 mgorny Exp $
PTPD_CONFIGFILE=${PTPD_CONFIGFILE:-/etc/${RC_SVCNAME}.conf}
PTPD_STATEFILE_DIR=${PTPD_STATEFILE_DIR:-/var/run}
PTPD_STATEFILE=${PTPD_STATEFILE:-${PTPD_STATEFILE_DIR}/${RC_SVCNAME}.status}
PTPD_PIDFILE_DIR=${PTPD_PIDFILE_DIR:-/var/run}
PTPD_PIDFILE=${PTPD_PIDFILE:-${PTPD_PIDFILE_DIR}/${RC_SVCNAME}.pid}
extra_commands="checkconfig"
extra_started_commands="reload"
command="/usr/sbin/ptpd2"
command_args="--global:lock_file=$PTPD_PIDFILE
--global:status_file=$PTPD_STATEFILE -c $PTPD_CONFIGFILE $PTPD_OPTS"
pidfile="${PTPD_PIDFILE}"
description="Precise Time Protocol daemon"
depend() {
use net dns logger
}
checkconfig() {
ebegin "Checking ${SVCNAME} configuration"
msgout="$($command -k $command_args 2>&1)"
RETVAL=$?
# colorize output
echo "$msgout" | while read ln; do
if [[ "$ln" == *ignored* ]]; then
ewarn "$ln"
elif [[ "$ln" != "Configuration OK" ]]; then
eerror "$ln"
fi
done
eend $RETVAL
}
start() {
checkconfig || return 1
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start --exec ${command} \
--pidfile ${pidfile} \
-- ${command_args}
eend $?
}
reload() {
checkconfig || return 1
ebegin "Reloading ${SVCNAME} configuration"
start-stop-daemon --signal HUP --pidfile "${pidfile}"
eend $?
}
1.1 net-misc/ptpd/files/ptpd-2.3.0-statistics-clear.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd-2.3.0-statistics-clear.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ptpd/files/ptpd-2.3.0-statistics-clear.patch?rev=1.1&content-type=text/plain
Index: ptpd-2.3.0-statistics-clear.patch
===================================================================
diff -urN ptpd-2.3.0.old/src/dep/statistics.c ptpd-2.3.0/src/dep/statistics.c
--- ptpd-2.3.0.old/src/dep/statistics.c 2013-11-22 17:17:58.000000000 +0100
+++ ptpd-2.3.0/src/dep/statistics.c 2015-06-07 10:29:45.697110725 +0200
@@ -528,7 +528,7 @@
void
clearPtpEngineSlaveStats(PtpEngineSlaveStats* stats)
{
- memset(stats, 0, sizeof(stats));
+ memset(stats, 0, sizeof(*stats));
}
void
