summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2018-07-23 15:37:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-26 13:16:41 +0100
commitfa23fa907bad1aaba638537676ca638ea447b83d (patch)
tree198e0748109c738cf7035d5eacce545270325734 /meta
parentae1dbbbfb50812f4a8729ce33f714340355fca44 (diff)
downloadpoky-fa23fa907bad1aaba638537676ca638ea447b83d.tar.gz
apr: fix ptest hangs since enter non-terminating loop
ptest hangs in teststr since enter non-terminating loop, fixed by a backport patch (From OE-Core rev: daa496e7104e3f06bc5192bb4ec7d894b22dba5d) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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.3.bb1
2 files changed, 33 insertions, 0 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
new file mode 100644
index 0000000000..6809fa60b0
--- /dev/null
+++ b/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch
@@ -0,0 +1,32 @@
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.3.bb
index 87b878723b..e044c4a9a5 100644
--- a/meta/recipes-support/apr/apr_1.6.3.bb
+++ b/meta/recipes-support/apr/apr_1.6.3.bb
@@ -18,6 +18,7 @@ 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"
22 23
23SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa" 24SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa"