diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2020-05-28 10:28:12 -0500 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-05-30 11:27:48 -0700 |
| commit | 9c3b872f846e0a2491fe8bf16ae38db82609938c (patch) | |
| tree | ed677dec9771abea49669b8e2ee07d01f38a692c /meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch | |
| parent | ccdfa08863d2a01ed31e7d60887632db5b078ec1 (diff) | |
| download | meta-openembedded-9c3b872f846e0a2491fe8bf16ae38db82609938c.tar.gz | |
net-snmp: refresh patches
Refreshed patches for 5.8 due to the following:
ERROR: net-snmp-5.8-r0 do_patch: Command Error: 'quilt --quiltrc .../net-snmp/5.8-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
Applying patch 0001-Add-pkg-config-support-for-building-applications-and.patch
patching file configure
...
Hunk #1 succeeded at 32248 with fuzz 2 (offset 1826 lines).
Hunk #2 FAILED at 31447.
1 out of 2 hunks FAILED -- rejects in file configure
...
Patch 0001-Add-pkg-config-support-for-building-applications-and.patch does not apply (enforce with -f)
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch')
| -rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch index 7e686ce7fe..33a1e745fa 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From e38c508ef401593b1d4fe42b62e42a49cfec82af Mon Sep 17 00:00:00 2001 | 1 | From 383e67e359b89abe0440597ce414297892ade511 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Tue, 26 Feb 2019 14:26:07 +0800 | 3 | Date: Tue, 26 Feb 2019 14:26:07 +0800 |
| 4 | Subject: [PATCH] net-snmp: fix compile error with --disable-des | 4 | Subject: [PATCH] net-snmp: fix compile error with --disable-des |
| @@ -12,12 +12,12 @@ Subject: [PATCH] net-snmp: fix compile error with --disable-des | |||
| 12 | pad_size is defined only without --disable-des | 12 | pad_size is defined only without --disable-des |
| 13 | [snip] | 13 | [snip] |
| 14 | #ifndef NETSNMP_DISABLE_DES | 14 | #ifndef NETSNMP_DISABLE_DES |
| 15 | int pad, plast, pad_size = 0; | 15 | int pad, plast, pad_size = 0; |
| 16 | 16 | ||
| 17 | but used when disable-des, | 17 | but used when disable-des, |
| 18 | [snip] | 18 | [snip] |
| 19 | QUITFUN(SNMPERR_GENERR, sc_encrypt_quit); | 19 | QUITFUN(SNMPERR_GENERR, sc_encrypt_quit); |
| 20 | } | 20 | } |
| 21 | pad_size = pai->pad_size; | 21 | pad_size = pai->pad_size; |
| 22 | 22 | ||
| 23 | memset(my_iv, 0, sizeof(my_iv)); | 23 | memset(my_iv, 0, sizeof(my_iv)); |
| @@ -37,10 +37,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
| 37 | 1 file changed, 2 insertions(+), 1 deletion(-) | 37 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 38 | 38 | ||
| 39 | diff --git a/snmplib/scapi.c b/snmplib/scapi.c | 39 | diff --git a/snmplib/scapi.c b/snmplib/scapi.c |
| 40 | index 43caddf..c09deb0 100644 | 40 | index 8ad1d70d90..8c6882d9ab 100644 |
| 41 | --- a/snmplib/scapi.c | 41 | --- a/snmplib/scapi.c |
| 42 | +++ b/snmplib/scapi.c | 42 | +++ b/snmplib/scapi.c |
| 43 | @@ -1253,7 +1253,6 @@ sc_encrypt(const oid * privtype, size_t privtypelen, | 43 | @@ -1251,7 +1251,6 @@ sc_encrypt(const oid * privtype, size_t privtypelen, |
| 44 | 44 | ||
| 45 | QUITFUN(SNMPERR_GENERR, sc_encrypt_quit); | 45 | QUITFUN(SNMPERR_GENERR, sc_encrypt_quit); |
| 46 | } | 46 | } |
| @@ -48,7 +48,7 @@ index 43caddf..c09deb0 100644 | |||
| 48 | 48 | ||
| 49 | memset(my_iv, 0, sizeof(my_iv)); | 49 | memset(my_iv, 0, sizeof(my_iv)); |
| 50 | 50 | ||
| 51 | @@ -1263,6 +1262,8 @@ sc_encrypt(const oid * privtype, size_t privtypelen, | 51 | @@ -1261,6 +1260,8 @@ sc_encrypt(const oid * privtype, size_t privtypelen, |
| 52 | /* | 52 | /* |
| 53 | * now calculate the padding needed | 53 | * now calculate the padding needed |
| 54 | */ | 54 | */ |
| @@ -58,5 +58,5 @@ index 43caddf..c09deb0 100644 | |||
| 58 | plast = (int) ptlen - (pad_size - pad); | 58 | plast = (int) ptlen - (pad_size - pad); |
| 59 | if (pad == pad_size) | 59 | if (pad == pad_size) |
| 60 | -- | 60 | -- |
| 61 | 2.7.4 | 61 | 2.26.2 |
| 62 | 62 | ||
