From: Matthias Schiffer Date: Sun, 24 Jun 2018 15:20:43 +0000 (+0200) Subject: musl: sys/socket.h: fix SO_PEERSEC value on MIPS X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a63e38ba46a58cfb9001ddda3e68cf0548832eb5;p=librecmc%2Flibrecmc.git musl: sys/socket.h: fix SO_PEERSEC value on MIPS Differing from all other archs supported by musl, MIPS defines SO_PEERSEC to 30 instead of 31. Patch has also been submitted upstream. Reported-by: Andrey Jr. Mlenikov Signed-off-by: Matthias Schiffer (cherry picked from commit 4b50854a60fce73aa83b50c445ea93970322d442) --- diff --git a/toolchain/musl/patches/010-sys-socket.h-fix-SO_PEERSEC-value-on-MIPS.patch b/toolchain/musl/patches/010-sys-socket.h-fix-SO_PEERSEC-value-on-MIPS.patch new file mode 100644 index 0000000000..2319d9cb68 --- /dev/null +++ b/toolchain/musl/patches/010-sys-socket.h-fix-SO_PEERSEC-value-on-MIPS.patch @@ -0,0 +1,59 @@ +From 4e0877a604bad684be020f68e96a05156131fd44 Mon Sep 17 00:00:00 2001 +From: Matthias Schiffer +Date: Sun, 24 Jun 2018 17:05:31 +0200 +Subject: [PATCH] sys/socket.h: fix SO_PEERSEC value on MIPS + +Differing from all other archs supported by musl, MIPS defines SO_PEERSEC +to 30 instead of 31. + +Reported-by: Andrey Jr. Mlenikov +--- + arch/mips/bits/socket.h | 2 ++ + arch/mips64/bits/socket.h | 2 ++ + arch/mipsn32/bits/socket.h | 2 ++ + include/sys/socket.h | 3 +++ + 4 files changed, 9 insertions(+) + +--- a/arch/mips/bits/socket.h ++++ b/arch/mips/bits/socket.h +@@ -48,5 +48,7 @@ struct cmsghdr { + #define SO_SNDBUFFORCE 31 + #define SO_RCVBUFFORCE 33 + ++#define SO_PEERSEC 30 ++ + #define SOCK_NONBLOCK 0200 + #define SOCK_CLOEXEC 02000000 +--- a/arch/mips64/bits/socket.h ++++ b/arch/mips64/bits/socket.h +@@ -64,5 +64,7 @@ struct cmsghdr { + #define SO_SNDBUFFORCE 31 + #define SO_RCVBUFFORCE 33 + ++#define SO_PEERSEC 30 ++ + #define SOCK_NONBLOCK 0200 + #define SOCK_CLOEXEC 02000000 +--- a/arch/mipsn32/bits/socket.h ++++ b/arch/mipsn32/bits/socket.h +@@ -48,5 +48,7 @@ struct cmsghdr { + #define SO_SNDBUFFORCE 31 + #define SO_RCVBUFFORCE 33 + ++#define SO_PEERSEC 30 ++ + #define SOCK_NONBLOCK 0200 + #define SOCK_CLOEXEC 02000000 +--- a/include/sys/socket.h ++++ b/include/sys/socket.h +@@ -201,7 +201,10 @@ struct linger { + #define SO_TIMESTAMP 29 + #define SCM_TIMESTAMP SO_TIMESTAMP + ++#ifndef SO_PEERSEC + #define SO_PEERSEC 31 ++#endif ++ + #define SO_PASSSEC 34 + #define SO_TIMESTAMPNS 35 + #define SCM_TIMESTAMPNS SO_TIMESTAMPNS