diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-11-09 17:07:03 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-13 15:18:28 +0000 |
commit | a9c90d3d97c928dad4bd9137bff957877bb57a3c (patch) | |
tree | 0a1dd72672aeae4084b952ec79a04359d19a62b1 /meta/recipes-support/apr | |
parent | a181b36bf2357c5f7d5835df2f828ff1e0007dc6 (diff) | |
download | openembedded-core-contrib-a9c90d3d97c928dad4bd9137bff957877bb57a3c.tar.gz |
apr: upgrade 1.6.3 -> 1.6.5
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/apr')
-rw-r--r-- | meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch | 32 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr_1.6.5.bb (renamed from meta/recipes-support/apr/apr_1.6.3.bb) | 7 |
2 files changed, 3 insertions, 36 deletions
diff --git a/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch b/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch deleted file mode 100644 index 6809fa60b0..0000000000 --- a/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 036f90748247417dbfa714b1b912ca7dd4053f04 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 23 Jul 2018 14:12:35 +0800 -Subject: [PATCH] apr: fix ptest hang in teststr - -ptest hang in teststr since turns into a non-terminating loop, -fix by below backported patch. - -Upstream-Status: Backport[https://github.com/apache/apr/commit/ - 2e8fbff4ecf82d0decf6baf774c209948f2f4998?diff=unified] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - test/teststr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/teststr.c b/test/teststr.c -index d9a5054..951a830 100644 ---- a/test/teststr.c -+++ b/test/teststr.c -@@ -307,7 +307,7 @@ static void overflow_strfsize(abts_case *tc, void *data) - for (; off < 999999999; off += 999) { - apr_strfsize(off, buf); - } -- for (off = 1; off < LONG_MAX && off > 0; off *= 2) { -+ for (off = LONG_MAX; off > 1; off /= 2) { - apr_strfsize(off, buf); - apr_strfsize(off + 1, buf); - apr_strfsize(off - 1, buf); --- -2.7.4 - diff --git a/meta/recipes-support/apr/apr_1.6.3.bb b/meta/recipes-support/apr/apr_1.6.5.bb index 7bfb69855a..c2f59005aa 100644 --- a/meta/recipes-support/apr/apr_1.6.3.bb +++ b/meta/recipes-support/apr/apr_1.6.5.bb @@ -18,11 +18,10 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ - file://0008-apr-fix-ptest-hang-in-teststr.patch \ -" + " -SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa" -SRC_URI[sha256sum] = "131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172" +SRC_URI[md5sum] = "ad4add8efdfe87330b88e5e788241775" +SRC_URI[sha256sum] = "a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105" inherit autotools-brokensep lib_package binconfig multilib_header ptest |