5b7bc560a5
In src/dep/ntpengine/ntp_isc_md5.*, the typedef of EVP_MD_CTX conflicts with a definition of the same type done by OpenSSL. This issue is referenced at https://github.com/ptpd/ptpd/issues/54, and has been fixed upstream in commit838b985510. In src/dep/snmp.c, U64 can be missing or conflicts with new perl as reported at https://github.com/ptpd/ptpd/issues/25. This issue has been fixed upstream in commit1886522b50. This commit is adapted to apply on the current version of ptpd2 we have in Buildroot. Fixes: http://autobuild.buildroot.net/results/47b99a6de256bfc0f5a8ae1484bb34e93b407237/ http://autobuild.buildroot.net/results/08365fc559dda74640b9750358c82e84600a68ea/ http://autobuild.buildroot.net/results/9b41c513500c63a9890973a0f17ffdb84d44d580/ http://autobuild.buildroot.net/results/2ed79d01635c9a5e1018229dc6f4b7240a995b87/ http://autobuild.buildroot.net/results/6d1b7e191f573334115684b85165f2bc27d75d8f/ http://autobuild.buildroot.net/results/f54c6fd841b3ea77dc12048c81f3f2991b679252/ http://autobuild.buildroot.net/results/332bc77bcde0bef1b2fd7b9993409dd051c27cd6/ http://autobuild.buildroot.net/results/4b416edaec9528d75a82c9570b8f8297718ca62d/ Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
29 lines
829 B
Diff
29 lines
829 B
Diff
From 84157b11e8f27318f7291823c657f6313c3b60af 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
|
|
|
|
[Thomas: Backport to 2.3.1.]
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
src/dep/snmp.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/dep/snmp.c b/src/dep/snmp.c
|
|
index 5c08aaa..3086c86 100644
|
|
--- a/src/dep/snmp.c
|
|
+++ b/src/dep/snmp.c
|
|
@@ -221,7 +221,7 @@ snmpHeaderIndexBest(struct snmpHeaderIndex *idx)
|
|
|
|
#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; \
|
|
--
|
|
2.14.4
|
|
|