[oe] [meta-oe][PATCH] ltrace: Remove deprecated readdir_r()

[Khem Raj]

On Mon, Apr 25, 2016 at 8:44 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
> On Sun, Apr 24, 2016 at 05:12:18PM -0700, Khem Raj wrote:
>> New glibc >= 2.24 will remove it
>
> Is this still needed with:
> http://patchwork.openembedded.org/patch/120317/
> ?

yes. Sent a v2

>
> If so please rebase on top of master-next and resend.
>
>> Signed-off-by: Khem Raj <raj.khem at gmail.com>
>> ---
>>  .../0001-replace-readdir_r-with-readdir.patch      | 33 ++++++++++++++++++++++
>>  meta-oe/recipes-devtools/ltrace/ltrace_git.bb      |  1 +
>>  2 files changed, 34 insertions(+)
>>  create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch
>>
>> diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch
>> new file mode 100644
>> index 0000000..8d2c264
>> --- /dev/null
>> +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch
>> @@ -0,0 +1,33 @@
>> +From 64f98f84fd88797e219f9dde1ca387fee4b509f0 Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem at gmail.com>
>> +Date: Sun, 24 Apr 2016 16:58:17 -0700
>> +Subject: [PATCH] replace readdir_r with readdir
>> +
>> +glibc 2.24 has deprecated readdir_r
>> +
>> +https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html
>> +
>> +Signed-off-by: Khem Raj <raj.khem at gmail.com>
>> +---
>> +Upstream-Status: Submitted
>> +
>> + sysdeps/linux-gnu/proc.c | 5 +++--
>> + 1 file changed, 3 insertions(+), 2 deletions(-)
>> +
>> +Index: git/sysdeps/linux-gnu/proc.c
>> +===================================================================
>> +--- git.orig/sysdeps/linux-gnu/proc.c
>> ++++ git/sysdeps/linux-gnu/proc.c
>> +@@ -240,9 +240,10 @@ process_tasks(pid_t pid, pid_t **ret_tas
>> +     size_t alloc = 0;
>> +
>> +     while (1) {
>> +-            struct dirent entry;
>> +             struct dirent *result;
>> +-            if (readdir_r(d, &entry, &result) != 0) {
>> ++            errno = 0;
>> ++            result = readdir(d);
>> ++            if (errno != 0) {
>> +                     free(tasks);
>> +                     return -1;
>> +             }
>> diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
>> index d8d037e..7a7174c 100644
>> --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
>> +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
>> @@ -19,6 +19,7 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=ltrace-0.7 \
>>             file://ltrace-0.7.2-unused-typedef.patch \
>>             file://configure-allow-to-disable-selinux-support.patch \
>>             file://0001-ltrace-fix-gcc-5-logical-not-parentheses.patch \
>> +           file://0001-replace-readdir_r-with-readdir.patch \
>>            "
>>  S = "${WORKDIR}/git"
>>
>> --
>> 2.8.0
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>