rpm/ptpd
SHA256
1
0
Fork 0
forked from pool/ptpd
Code Pull Requests Activity

- Fix building with latest net-snmp

Browse Source 
* ptpd2-net-snmp_U64.patch

OBS-URL: https://build.opensuse.org/package/show/network:time/ptpd?expand=0&rev=11
This commit is contained in:
Martin Pluskal 2016-07-13 10:42:57 +00:00 committed by Git OBS Bridge
parent b4832b8944
commit c973845a58
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ptpd.changes
View File

@ -1,7 +1,8 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jul 10 07:45:01 UTC 2016 - mpluskal@suse.com Wed Jul 13 10:40:49 UTC 2016 - mpluskal@suse.com
- Disable snmp support untill gh#25 is resolved - Fix building with latest net-snmp
* ptpd2-net-snmp_U64.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 12 19:33:35 UTC 2016 - mpluskal@suse.com Thu May 12 19:33:35 UTC 2016 - mpluskal@suse.com

5
ptpd.spec
View File

@ -27,11 +27,13 @@ Source0: https://github.com/ptpd/ptpd/archive/ptpd-%{version}.tar.gz
Source1: ptpd2.service Source1: ptpd2.service
Source2: ptpd2.conf Source2: ptpd2.conf
Source3: conf.sysconfig.ptpd 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: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: libpcap-devel BuildRequires: libpcap-devel
BuildRequires: libtool BuildRequires: libtool
#BuildRequires: net-snmp-devel BuildRequires: net-snmp-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -59,6 +61,7 @@ PTPd is free. Everyone is invited to use and contribute to PTPd.
%prep %prep
%setup -q -n %{name}-%{name}-%{version} %setup -q -n %{name}-%{name}-%{version}
%patch0
%build %build
autoreconf -fiv autoreconf -fiv

23
ptpd2-net-snmp_U64.patch Normal file
View File

@ -0,0 +1,23 @@
From 1886522b50fe44e5c0dedd01d13ac456b941f744 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@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; \