The branch, master has been updated
via 2c44022c512 third_party: Update socket_wrapper to version 1.4.4
from 9aa5c43315d lib:replace: Don't use deprecated readline CPPFunction
cast
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2c44022c512e302e8a3787ca17188213f112e182
Author: Andreas Schneider <[email protected]>
Date: Wed Jan 22 15:37:07 2025 +0100
third_party: Update socket_wrapper to version 1.4.4
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Thu Jan 23 11:28:32 UTC 2025 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_third_party.py | 2 +-
third_party/socket_wrapper/socket_wrapper.c | 7 +++++++
third_party/socket_wrapper/wscript | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
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):
--
Samba Shared Repository
