From 2f0dc39029ae08cbed2f65d21501b3e329895e7d Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 26 May 2016 11:11:33 -0300 Subject: [PATCH] network: Fix missing bits from {recv,send}{m}msg standard com,pliance This patch fixes wrong/missing bits from the Fix {recv,send}{m}msg standard compliance (BZ#16919) patches: * nptl/Makefile sets CFLAGS-oldrecvfrom.c, but there's no such file as oldrecvfrom.c. It should be oldsendmsg.c as defined by ChangeLog. * sysdeps/unix/sysv/linux/hppa/Versions and sysdeps/unix/sysv/linux/i386/Versions list a symbol recvms instead of recvmsg at version GLIBC_2.24. * nptl/Makefile (CFLAGS-oldrecvfrom.c): Remove rule. (CFLAGS-oldsendmsg.c): Add rule. * sysdeps/unix/sysv/linux/hppa/Versions [libc] (GLIBC_2.24): Correct recvmsg symbol name. * sysdeps/unix/sysv/linux/i386/Versions [libc] (GLIBC_2.24): Likewise. --- ChangeLog | 9 +++++++++ nptl/Makefile | 2 +- sysdeps/unix/sysv/linux/hppa/Versions | 2 +- sysdeps/unix/sysv/linux/i386/Versions | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0b975e094..ecedf6f6e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2016-05-26 Adhemerval Zanella + + * nptl/Makefile (CFLAGS-oldrecvfrom.c): Remove rule. + (CFLAGS-oldsendmsg.c): Add rule. + * sysdeps/unix/sysv/linux/hppa/Versions [libc] (GLIBC_2.24): + Correct recvmsg symbol name. + * sysdeps/unix/sysv/linux/i386/Versions [libc] (GLIBC_2.24): + Likewise. + 2016-05-25 Adhemerval Zanella * sysdeps/unix/sysv/linux/Makefile diff --git a/nptl/Makefile b/nptl/Makefile index 42409289bd..eaa6f7f283 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -208,7 +208,7 @@ CFLAGS-sendto.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-connect.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-recvfrom.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-oldrecvmsg.c = -fexceptions -fasynchronous-unwind-tables -CFLAGS-oldrecvfrom.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-oldsendmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-pt-system.c = -fexceptions diff --git a/sysdeps/unix/sysv/linux/hppa/Versions b/sysdeps/unix/sysv/linux/hppa/Versions index 895696ebf8..f0af95ef46 100644 --- a/sysdeps/unix/sysv/linux/hppa/Versions +++ b/sysdeps/unix/sysv/linux/hppa/Versions @@ -36,6 +36,6 @@ libc { fanotify_mark; } GLIBC_2.24 { - recvms; sendmsg; + recvmsg; sendmsg; } } diff --git a/sysdeps/unix/sysv/linux/i386/Versions b/sysdeps/unix/sysv/linux/i386/Versions index 55d12777ef..64d503b62d 100644 --- a/sysdeps/unix/sysv/linux/i386/Versions +++ b/sysdeps/unix/sysv/linux/i386/Versions @@ -46,7 +46,7 @@ libc { fallocate64; } GLIBC_2.24 { - recvms; sendmsg; + recvmsg; sendmsg; } GLIBC_PRIVATE { __modify_ldt; -- 2.43.5