Hello community,
here is the log from the commit of package ptpd for openSUSE:Factory checked in
at 2016-07-14 09:50:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ptpd (Old)
and /work/SRC/openSUSE:Factory/.ptpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ptpd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ptpd/ptpd.changes 2016-05-17
17:15:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ptpd.new/ptpd.changes 2016-07-14
09:50:29.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 13 10:40:49 UTC 2016 - mplus...@suse.com
+
+- Fix building with latest net-snmp
+ * ptpd2-net-snmp_U64.patch
+
+-------------------------------------------------------------------
New:
----
ptpd2-net-snmp_U64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ptpd.spec ++++++
--- /var/tmp/diff_new_pack.yqhQp6/_old 2016-07-14 09:50:29.000000000 +0200
+++ /var/tmp/diff_new_pack.yqhQp6/_new 2016-07-14 09:50:29.000000000 +0200
@@ -27,6 +27,8 @@
Source1: ptpd2.service
Source2: ptpd2.conf
Source3: conf.sysconfig.ptpd
+# PATCH-FIX-UPSTREAM ptpd2-net-snmp_U64.patch gh#ptpd/ptpd#25
+Patch0: ptpd2-net-snmp_U64.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libpcap-devel
@@ -59,6 +61,7 @@
%prep
%setup -q -n %{name}-%{name}-%{version}
+%patch0
%build
autoreconf -fiv
@@ -66,11 +69,11 @@
--enable-statistics
%install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
-install -D -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}2.service
+%make_install
+install -D -p -m 0644 %{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
-install -D -m 644 %{SOURCE3}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.ptpd2
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}2.conf
+install -D -p -m 0644 %{SOURCE3}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.ptpd2
# have to create the below, else ptpd will not log drift
install -d %{buildroot}%{_localstatedir}/log
touch %{buildroot}%{_localstatedir}/log/ptpd2_kernelclock.drift
@@ -92,9 +95,10 @@
%defattr(-, root, root)
%doc COPYRIGHT ChangeLog README
%config %{_sysconfdir}/%{name}2.conf
-%{_sbindir}/*
-%{_mandir}/man8/*
-%{_mandir}/man5/*
+%{_sbindir}/ptpd2
+%{_sbindir}/rcptpd2
+%{_mandir}/man5/ptpd2.conf.5%{ext_man}
+%{_mandir}/man8/ptpd2.8%{ext_man}
%{_datadir}/ptpd
%{_libexecdir}/systemd/system/ptpd2.service
%{_localstatedir}/adm/fillup-templates/*
++++++ ptpd2-net-snmp_U64.patch ++++++
>From 1886522b50fe44e5c0dedd01d13ac456b941f744 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.bre...@jaybee.cz>
Date: Tue, 12 Jul 2016 18:07:08 +0200
Subject: [PATCH] Solve issue #25 - Removing type U64 from net-snmp related
code
---
src/dep/snmp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: src/dep/snmp.c
===================================================================
--- src/dep/snmp.c.orig
+++ src/dep/snmp.c
@@ -221,7 +221,7 @@ snmpHeaderIndexBest(struct snmpHeaderInd
#define SNMP_LOCAL_VARIABLES \
static unsigned long long_ret; \
- static U64 counter64_ret; \
+ static struct counter64 counter64_ret; \
static uint32_t ipaddr; \
Integer64 bigint; \
struct snmpHeaderIndex idx; \
