diff options
| author | Khem Raj <raj.khem@gmail.com> | 2015-10-03 12:55:24 -0700 |
|---|---|---|
| committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-10-21 15:59:03 -0400 |
| commit | c0a865d4efe5e5d702f39ac2793ee7a3de19d236 (patch) | |
| tree | 9941a46b279cebfc3500dcef8c06827849cbb720 /meta-networking/recipes-protocols | |
| parent | 6233934a50f738c5d24dbe91bafcbcea10d22058 (diff) | |
| download | meta-openembedded-c0a865d4efe5e5d702f39ac2793ee7a3de19d236.tar.gz | |
net-snmp: Fix build with gcc5
Fix errors seen with gcc5
Change-Id: I9c4361f3a9c25342f5c740263f551c162dce8faf
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-protocols')
| -rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch | 33 | ||||
| -rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch new file mode 100644 index 0000000000..af242fafb2 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From d3027a227bc0f603a5b650d01f97ee1dec515be5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 18 Sep 2015 00:28:45 -0400 | ||
| 4 | Subject: [PATCH] snmplib/keytools.c: Don't check for return from | ||
| 5 | EVP_MD_CTX_init() | ||
| 6 | |||
| 7 | EVP_MD_CTX_init() API returns void, it fixes errors with new compilers | ||
| 8 | |||
| 9 | snmplib/keytools.c: In function 'generate_Ku': error: invalid use of void expression | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | Upstream-Status: Submitted [https://sourceforge.net/p/net-snmp/patches/1317/] | ||
| 14 | snmplib/keytools.c | 3 +-- | ||
| 15 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/snmplib/keytools.c b/snmplib/keytools.c | ||
| 18 | index 0ccb3a6..880fc14 100644 | ||
| 19 | --- a/snmplib/keytools.c | ||
| 20 | +++ b/snmplib/keytools.c | ||
| 21 | @@ -153,8 +153,7 @@ generate_Ku(const oid * hashtype, u_int hashtype_len, | ||
| 22 | ctx = EVP_MD_CTX_create(); | ||
| 23 | #else | ||
| 24 | ctx = malloc(sizeof(*ctx)); | ||
| 25 | - if (!EVP_MD_CTX_init(ctx)) | ||
| 26 | - return SNMPERR_GENERR; | ||
| 27 | + EVP_MD_CTX_init(ctx); | ||
| 28 | #endif | ||
| 29 | #ifndef NETSNMP_DISABLE_MD5 | ||
| 30 | if (ISTRANSFORM(hashtype, HMACMD5Auth)) { | ||
| 31 | -- | ||
| 32 | 2.5.2 | ||
| 33 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb index 431a6330f5..b32d842de9 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | |||
| @@ -20,6 +20,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \ | |||
| 20 | file://run-ptest \ | 20 | file://run-ptest \ |
| 21 | file://dont-return-incompletely-parsed-varbinds.patch \ | 21 | file://dont-return-incompletely-parsed-varbinds.patch \ |
| 22 | file://0001-config_os_headers-Error-Fix.patch \ | 22 | file://0001-config_os_headers-Error-Fix.patch \ |
| 23 | file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \ | ||
| 23 | " | 24 | " |
| 24 | SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee" | 25 | SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee" |
| 25 | SRC_URI[sha256sum] = "e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e" | 26 | SRC_URI[sha256sum] = "e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e" |
