diff options
| author |   Jan Breuer <honza.breuer@gmail.com> | 2018-09-15 23:47:05 +0200 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2018-09-16 21:54:21 +0200 |
| commit | bfb687613954e39c24ebb2247f06eda67afbc7b9 (patch) | |
| tree | f4c86dd894cc98d8f1c822ab151cd748b2e0f0e8 /net-misc/ptpd/files | |
| parent | www-servers/apache-2.4.34-r2: ppc stable, bug 662894 (diff) | |
| download | gentoo-bfb687613954e39c24ebb2247f06eda67afbc7b9.tar.gz gentoo-bfb687613954e39c24ebb2247f06eda67afbc7b9.tar.bz2 gentoo-bfb687613954e39c24ebb2247f06eda67afbc7b9.zip | |
net-misc/ptpd: Fix conflicting types for EVP_MD_CTX
Closes: https://bugs.gentoo.org/664500
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9786
Diffstat (limited to 'net-misc/ptpd/files')
| -rw-r--r-- | net-misc/ptpd/files/ptpd-2.3.1-fix-libressl-compatibility.patch | 24 | ||||
| -rw-r--r-- | net-misc/ptpd/files/ptpd-2.3.1-fix-snmp.patch | 12 |
2 files changed, 36 insertions, 0 deletions
diff --git a/net-misc/ptpd/files/ptpd-2.3.1-fix-libressl-compatibility.patch b/net-misc/ptpd/files/ptpd-2.3.1-fix-libressl-compatibility.patch new file mode 100644 index 000000000000..4fa25797ff06 --- /dev/null +++ b/net-misc/ptpd/files/ptpd-2.3.1-fix-libressl-compatibility.patch @@ -0,0 +1,24 @@ +diff -urN old/src/dep/ntpengine/ntp_isc_md5.c new/src/dep/ntpengine/ntp_isc_md5.c +--- old/src/dep/ntpengine/ntp_isc_md5.c 2015-06-29 17:13:29.000000000 +0200 ++++ new/src/dep/ntpengine/ntp_isc_md5.c 2018-09-15 22:56:18.469044902 +0200 +@@ -262,7 +262,7 @@ + { + 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)); +diff -urN old/src/dep/ntpengine/ntp_isc_md5.h new/src/dep/ntpengine/ntp_isc_md5.h +--- old/src/dep/ntpengine/ntp_isc_md5.h 2015-06-29 17:13:29.000000000 +0200 ++++ new/src/dep/ntpengine/ntp_isc_md5.h 2018-09-15 22:56:11.852020732 +0200 +@@ -80,7 +80,7 @@ + # 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) \ diff --git a/net-misc/ptpd/files/ptpd-2.3.1-fix-snmp.patch b/net-misc/ptpd/files/ptpd-2.3.1-fix-snmp.patch new file mode 100644 index 000000000000..31b466d1468c --- /dev/null +++ b/net-misc/ptpd/files/ptpd-2.3.1-fix-snmp.patch @@ -0,0 +1,12 @@ +diff -urN old/src/dep/snmp.c new/src/dep/snmp.c +--- old/src/dep/snmp.c 2015-06-29 17:13:29.000000000 +0200 ++++ new/src/dep/snmp.c 2018-09-15 22:54:11.818589001 +0200 +@@ -221,7 +221,7 @@ + + #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; \ |