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

Accepting request 650722 from home:iulhaq:branches:network:time

Browse Source 
- Fix name conflict with openssl variable 
  * ptpd-evp-md-ctx.patch

OBS-URL: https://build.opensuse.org/request/show/650722
OBS-URL: https://build.opensuse.org/package/show/network:time/ptpd?expand=0&rev=20
This commit is contained in:
Martin Pluskal 2018-11-21 14:43:36 +00:00 committed by Git OBS Bridge
parent ce73e08714
commit 6e1d2c298e
3 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ptpd-evp-md-ctx.patch Normal file
View File

@ -0,0 +1,43 @@
From 838b985510c360e651d18134e64f258f2f4c6e7c Mon Sep 17 00:00:00 2001
From: Giulio Benetti <giulio.benetti@micronovasrl.com>
Date: Fri, 31 Aug 2018 18:46:56 +0200
Subject: [PATCH] ntp_isc_md5: rename EVP_MD_CTX into PTPD_EVP_MD_CTX
EVP_MD_CTX can conflict with openssl that defines a completely different
typedef with same name.
Since this typedef is used only twice in the entire ptpd,
substitute EVP_MD_CTX with PTPD_EVP_MD_CTX.
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
src/dep/ntpengine/ntp_isc_md5.c | 2 +-
src/dep/ntpengine/ntp_isc_md5.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: ptpd-ptpd-2.3.1/src/dep/ntpengine/ntp_isc_md5.c
===================================================================
--- ptpd-ptpd-2.3.1.orig/src/dep/ntpengine/ntp_isc_md5.c
+++ ptpd-ptpd-2.3.1/src/dep/ntpengine/ntp_isc_md5.c
@@ -262,7 +262,7 @@ MD5authencrypt(
{
u_char digest[64];
u_int len;
- EVP_MD_CTX ctx;
+ PTPD_EVP_MD_CTX ctx;
pkt[length / 4] = htonl(keyid);
EVP_DigestInit(&ctx);
EVP_DigestUpdate(&ctx, (u_char *)key, (u_int)strlen(key));
Index: ptpd-ptpd-2.3.1/src/dep/ntpengine/ntp_isc_md5.h
===================================================================
--- ptpd-ptpd-2.3.1.orig/src/dep/ntpengine/ntp_isc_md5.h
+++ ptpd-ptpd-2.3.1/src/dep/ntpengine/ntp_isc_md5.h
@@ -80,7 +80,7 @@ isc_md5_final(isc_md5_t *ctx, unsigned c
# define MD5Init(c) isc_md5_init(c)
# define MD5Update(c, p, s) isc_md5_update(c, p, s)
# define MD5Final(d, c) isc_md5_final((c), (d)) /* swapped */
- typedef MD5_CTX EVP_MD_CTX;
+ typedef MD5_CTX PTPD_EVP_MD_CTX;
# define EVP_DigestInit(c) MD5Init(c)
# define EVP_DigestUpdate(c, p, s) MD5Update(c, p, s)
# define EVP_DigestFinal(c, d, pdl) \

6
ptpd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 21 14:31:06 UTC 2018 - iulhaq@suse.com
- Fix name conflict with openssl variable
* ptpd-evp-md-ctx.patch
-------------------------------------------------------------------
Fri Nov 9 07:50:17 UTC 2018 - Martin Pluskal <mpluskal@suse.com>

7
ptpd.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@ -22,12 +22,14 @@ Release: 0
Summary: Implements the Precision Time protocol as defined by IEEE 1588 standard
License: BSD-3-Clause
Group: System/Daemons
URL: https://github.com/ptpd/ptpd
Url: https://github.com/ptpd/ptpd
Source0: https://github.com/ptpd/ptpd/archive/ptpd-%{version}.tar.gz
Source1: ptpd2.service
Source3: conf.sysconfig.ptpd
# PATCH-FIX-UPSTREAM ptpd2-net-snmp_U64.patch gh#ptpd/ptpd#25
Patch0: ptpd2-net-snmp_U64.patch
# PATCH-FIX-UPSTREAM resolve EVP_MD_CTX name conflict
Patch1: ptpd-evp-md-ctx.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libpcap-devel
@ -60,6 +62,7 @@ PTPd is free. Everyone is invited to use and contribute to PTPd.
%prep
%setup -q -n %{name}-%{name}-%{version}
%patch0
%patch1 -p1
%build
autoreconf -fiv