From: Andreas Schneider Date: Wed, 22 Jan 2025 14:37:07 +0000 (+0100) Subject: third_party: Update socket_wrapper to version 1.4.4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b542e35437c382a4483a72f26b5cdbcf6179bdb9;p=thirdparty%2Fsamba.git third_party: Update socket_wrapper to version 1.4.4 Signed-off-by: Andreas Schneider Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Thu Jan 23 11:28:32 UTC 2025 on atb-devel-224 (cherry picked from commit 2c44022c512e302e8a3787ca17188213f112e182) --- diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py index d6fe609c896..0387328daec 100644 --- a/buildtools/wafsamba/samba_third_party.py +++ b/buildtools/wafsamba/samba_third_party.py @@ -24,7 +24,7 @@ Build.BuildContext.CHECK_CMOCKA = CHECK_CMOCKA @conf def CHECK_SOCKET_WRAPPER(conf): - return conf.CHECK_BUNDLED_SYSTEM_PKG('socket_wrapper', minversion='1.4.3') + return conf.CHECK_BUNDLED_SYSTEM_PKG('socket_wrapper', minversion='1.4.4') Build.BuildContext.CHECK_SOCKET_WRAPPER = CHECK_SOCKET_WRAPPER @conf diff --git a/third_party/socket_wrapper/socket_wrapper.c b/third_party/socket_wrapper/socket_wrapper.c index 37799c82419..db20eac4ba2 100644 --- a/third_party/socket_wrapper/socket_wrapper.c +++ b/third_party/socket_wrapper/socket_wrapper.c @@ -5110,6 +5110,13 @@ static int swrap_setsockopt(int s, int level, int optname, } if (level == SOL_SOCKET) { + /* + * SO_REUSEPORT is not supported on a unix socket. glibc 2.40 + * returns ENOTSUPP now. + */ + if (optname == SO_REUSEPORT) { + return 0; + } return libc_setsockopt(s, level, optname, diff --git a/third_party/socket_wrapper/wscript b/third_party/socket_wrapper/wscript index cdd34938ba3..370f6fc3070 100644 --- a/third_party/socket_wrapper/wscript +++ b/third_party/socket_wrapper/wscript @@ -2,7 +2,7 @@ import os -VERSION = "1.4.3" +VERSION = "1.4.4" def configure(conf):