third_party: Update socket_wrapper to version 1.4.4

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
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 d6fe609c8960cb7ff543ed6c1e91185c25f731ef..0387328daecca0b5aad9fb3afcf04519644e77e5 100644 (file)
--- 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 37799c82419f60db19c65866490ba3752f40682a..db20eac4ba22a8df9a3ca7b7b01d9727430baff4 100644 (file)
--- 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 cdd34938ba3be9ddcb4e239c20ae0cf46f462851..370f6fc30705c66807bd97f67828141038a4922c 100644 (file)
--- 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):