[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Thu Feb 2 18:28:01 UTC 2023
The branch, master has been updated
via d80f28b081e tevent: version 0.14.1
via ae77854a440 tevent: remove the already removed tevent_port.c also from the build
via 488aa227584 replace: remove unused configure checks for port_create()
via 15b1afc9175 replace: provide PIPE_BUF on GNU/Hurd
from 65e9b409a6c s3:utils: Fix UNUSED_VALUE
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d80f28b081e515e32a480daf80b42cf782447a9c
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Feb 1 15:31:32 2023 +0000
tevent: version 0.14.1
- Build fix for GNU/Hurd
- Build fix for Solaris, after removal
of ports backend (bug #15298)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Thu Feb 2 18:27:08 UTC 2023 on atb-devel-224
commit ae77854a44094df6c9291271504c9733e717674f
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Feb 1 13:31:38 2023 +0000
tevent: remove the already removed tevent_port.c also from the build
This fixes a regression introduced by 147a317b7b92e60c5940d875dbd7aef19824834e.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15298
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 488aa2275847162755dcbfc75cb2549299aa2aeb
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Feb 1 13:33:42 2023 +0000
replace: remove unused configure checks for port_create()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15298
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 15b1afc9175e045b3b28523309fb3b28a3fab484
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date: Sun Aug 2 18:01:05 2020 +0000
replace: provide PIPE_BUF on GNU/Hurd
There is no hardcoded PIPE_BUF pipe limitation on GNU/Hurd, but POSIX
provides a minimum value that we can use.
Signed-off-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/replace/system/network.h | 12 ++++++++++++
lib/replace/system/select.h | 4 ----
lib/replace/wscript | 5 -----
lib/tevent/ABI/{tevent-0.14.0.sigs => tevent-0.14.1.sigs} | 0
lib/tevent/wscript | 5 +----
5 files changed, 13 insertions(+), 13 deletions(-)
copy lib/tevent/ABI/{tevent-0.14.0.sigs => tevent-0.14.1.sigs} (100%)
Changeset truncated at 500 lines:
diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h
index a84bfd453b1..1721d65a51a 100644
--- a/lib/replace/system/network.h
+++ b/lib/replace/system/network.h
@@ -91,6 +91,8 @@
#include <stropts.h>
#endif
+#include <limits.h>
+
#ifndef HAVE_SOCKLEN_T
#define HAVE_SOCKLEN_T
typedef int socklen_t;
@@ -342,6 +344,16 @@ typedef unsigned short int sa_family_t;
# endif
#endif
+#ifndef PIPE_BUF
+# ifdef __GNU__
+ /*
+ * GNU/Hurd does not have such hardcoded limitations. But it has to support
+ * the minimum POSIX value anyway.
+ */
+# define PIPE_BUF 512
+# endif
+#endif
+
#ifndef HAVE_STRUCT_ADDRINFO
#define HAVE_STRUCT_ADDRINFO
struct addrinfo {
diff --git a/lib/replace/system/select.h b/lib/replace/system/select.h
index 9e945c3ccfa..11c5390d901 100644
--- a/lib/replace/system/select.h
+++ b/lib/replace/system/select.h
@@ -34,10 +34,6 @@
#include <sys/epoll.h>
#endif
-#ifdef HAVE_SOLARIS_PORTS
-#include <port.h>
-#endif
-
#ifndef SELECT_CAST
#define SELECT_CAST
#endif
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 82c5a8a477b..5c2b750832b 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -44,7 +44,6 @@ def configure(conf):
conf.CHECK_HEADERS('locale.h ndir.h pwd.h')
conf.CHECK_HEADERS('shadow.h sys/acl.h')
conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h')
- conf.CHECK_HEADERS('port.h')
conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h')
conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h')
conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h')
@@ -482,7 +481,6 @@ def configure(conf):
conf.CHECK_FUNCS('timegm getifaddrs freeifaddrs mmap setgroups syscall setsid')
conf.CHECK_FUNCS('getgrent_r getgrgid_r getgrnam_r getgrouplist getpagesize')
conf.CHECK_FUNCS('getpwent_r getpwnam_r getpwuid_r epoll_create')
- conf.CHECK_FUNCS('port_create')
conf.CHECK_FUNCS('getprogname')
if not conf.CHECK_FUNCS('copy_file_range'):
conf.CHECK_CODE('''
@@ -708,9 +706,6 @@ syscall(SYS_copy_file_range,0,NULL,0,NULL,0,0);
if conf.CONFIG_SET('HAVE_EPOLL_CREATE') and conf.CONFIG_SET('HAVE_SYS_EPOLL_H'):
conf.DEFINE('HAVE_EPOLL', 1)
- if conf.CONFIG_SET('HAVE_PORT_CREATE') and conf.CONFIG_SET('HAVE_PORT_H'):
- conf.DEFINE('HAVE_SOLARIS_PORTS', 1)
-
if conf.CHECK_FUNCS('eventfd', headers='sys/eventfd.h'):
conf.DEFINE('HAVE_EVENTFD', 1)
diff --git a/lib/tevent/ABI/tevent-0.14.0.sigs b/lib/tevent/ABI/tevent-0.14.1.sigs
similarity index 100%
copy from lib/tevent/ABI/tevent-0.14.0.sigs
copy to lib/tevent/ABI/tevent-0.14.1.sigs
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index df1c69127ab..0f6e92f93e8 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'tevent'
-VERSION = '0.14.0'
+VERSION = '0.14.1'
import sys, os
@@ -93,9 +93,6 @@ def build(bld):
if bld.CONFIG_SET('HAVE_EPOLL'):
SRC += ' tevent_epoll.c'
- if bld.CONFIG_SET('HAVE_SOLARIS_PORTS'):
- SRC += ' tevent_port.c'
-
if bld.env.standalone_tevent:
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
private_library = False
--
Samba Shared Repository
More information about the samba-cvs
mailing list