summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-11-09 17:07:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-14 11:14:39 +0000
commit14898aa4750f13bbfa4c9c7719bcdeb5f7f457c5 (patch)
treed15b5f2b2d84ae9cf046c33da32e489a1cfd8cc1
parent621e043b8dad96d334f88cadebc5f2548fff333c (diff)
downloadpoky-14898aa4750f13bbfa4c9c7719bcdeb5f7f457c5.tar.gz
apr: upgrade 1.6.3 -> 1.6.5
(From OE-Core rev: a9c90d3d97c928dad4bd9137bff957877bb57a3c) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch32
-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 @@
1From 036f90748247417dbfa714b1b912ca7dd4053f04 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 23 Jul 2018 14:12:35 +0800
4Subject: [PATCH] apr: fix ptest hang in teststr
5
6ptest hang in teststr since turns into a non-terminating loop,
7fix by below backported patch.
8
9Upstream-Status: Backport[https://github.com/apache/apr/commit/
10 2e8fbff4ecf82d0decf6baf774c209948f2f4998?diff=unified]
11
12Signed-off-by: Changqing Li <changqing.li@windriver.com>
13---
14 test/teststr.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/test/teststr.c b/test/teststr.c
18index d9a5054..951a830 100644
19--- a/test/teststr.c
20+++ b/test/teststr.c
21@@ -307,7 +307,7 @@ static void overflow_strfsize(abts_case *tc, void *data)
22 for (; off < 999999999; off += 999) {
23 apr_strfsize(off, buf);
24 }
25- for (off = 1; off < LONG_MAX && off > 0; off *= 2) {
26+ for (off = LONG_MAX; off > 1; off /= 2) {
27 apr_strfsize(off, buf);
28 apr_strfsize(off + 1, buf);
29 apr_strfsize(off - 1, buf);
30--
312.7.4
32
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 \
18 file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ 18 file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \
19 file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ 19 file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \
20 file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ 20 file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \
21 file://0008-apr-fix-ptest-hang-in-teststr.patch \ 21 "
22"
23 22
24SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa" 23SRC_URI[md5sum] = "ad4add8efdfe87330b88e5e788241775"
25SRC_URI[sha256sum] = "131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172" 24SRC_URI[sha256sum] = "a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105"
26 25
27inherit autotools-brokensep lib_package binconfig multilib_header ptest 26inherit autotools-brokensep lib_package binconfig multilib_header ptest
28 27