mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-10-23 20:58:33 +00:00
samba: Upgrade to 4.6.2
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Khem Raj authored and 
Joe MacDonald committed
1 parent
8ef5e3ffc3
commit
d16352e9b4
22 files changed
+13
-129
No files matched your search
@@ -36,3 +36,4 @@ getcwd takes a NULL argument: OK
|
||||
Checking for small off_t: NO
|
||||
Checking whether blkcnt_t is 32 bit: NO
|
||||
Checking whether blkcnt_t is 64 bit: OK
|
||||
Checking whether fcntl lock supports open file description locks: OK
|
||||
@@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK
|
||||
Checking for small off_t: NO
|
||||
Checking whether blkcnt_t is 32 bit: NO
|
||||
Checking whether blkcnt_t is 64 bit: OK
|
||||
Checking whether fcntl lock supports open file description locks: OK
|
||||
@@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK
|
||||
Checking for small off_t: NO
|
||||
Checking whether blkcnt_t is 32 bit: NO
|
||||
Checking whether blkcnt_t is 64 bit: OK
|
||||
Checking whether fcntl lock supports open file description locks: OK
|
||||
@@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK
|
||||
Checking for small off_t: NO
|
||||
Checking whether blkcnt_t is 32 bit: NO
|
||||
Checking whether blkcnt_t is 64 bit: OK
|
||||
Checking whether fcntl lock supports open file description locks: OK
|
||||
@@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK
|
||||
Checking for small off_t: NO
|
||||
Checking whether blkcnt_t is 32 bit: NO
|
||||
Checking whether blkcnt_t is 64 bit: OK
|
||||
Checking whether fcntl lock supports open file description locks: OK
|
||||
@@ -36,3 +36,4 @@ getcwd takes a NULL argument: OK
|
||||
Checking for small off_t: NO
|
||||
Checking whether blkcnt_t is 32 bit: NO
|
||||
Checking whether blkcnt_t is 64 bit: OK
|
||||
Checking whether fcntl lock supports open file description locks: OK
|
||||
@@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK
|
||||
Checking for small off_t: NO
|
||||
Checking whether blkcnt_t is 32 bit: NO
|
||||
Checking whether blkcnt_t is 64 bit: OK
|
||||
Checking whether fcntl lock supports open file description locks: OK
|
||||
@@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK
|
||||
Checking for small off_t: NO
|
||||
Checking whether blkcnt_t is 32 bit: NO
|
||||
Checking whether blkcnt_t is 64 bit: OK
|
||||
Checking whether fcntl lock supports open file description locks: OK
|
||||
@@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK
|
||||
Checking for small off_t: NO
|
||||
Checking whether blkcnt_t is 32 bit: NO
|
||||
Checking whether blkcnt_t is 64 bit: OK
|
||||
Checking whether fcntl lock supports open file description locks: OK
|
||||
@@ -36,3 +36,4 @@ getcwd takes a NULL argument: OK
|
||||
Checking for small off_t: NO
|
||||
Checking whether blkcnt_t is 32 bit: NO
|
||||
Checking whether blkcnt_t is 64 bit: OK
|
||||
Checking whether fcntl lock supports open file description locks: OK
|
||||
@@ -1,30 +0,0 @@
|
||||
diff -ur samba-4.4.2/lib/util/debug.c samba-4.4.2/lib/util/debug.c
|
||||
--- samba-4.4.2/lib/util/debug.c 2016-05-08 18:33:24.000000000 +0200
|
||||
+++ samba-4.4.2/lib/util/debug.c 2016-05-08 18:27:09.341481492 +0200
|
||||
@@ -102,7 +102,7 @@
|
||||
.fd = 2 /* stderr by default */
|
||||
};
|
||||
|
||||
-#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD_JOURNAL)
|
||||
+#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD)
|
||||
static int debug_level_to_priority(int level)
|
||||
{
|
||||
/*
|
||||
@@ -179,7 +179,7 @@
|
||||
}
|
||||
#endif /* WITH_SYSLOG */
|
||||
|
||||
-#ifdef HAVE_LIBSYSTEMD_JOURNAL
|
||||
+#ifdef HAVE_LIBSYSTEMD
|
||||
#include <systemd/sd-journal.h>
|
||||
static void debug_systemd_log(int msg_level,
|
||||
const char *msg, const char *msg_no_nl)
|
||||
@@ -251,7 +251,7 @@
|
||||
},
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_LIBSYSTEMD_JOURNAL
|
||||
+#ifdef HAVE_LIBSYSTEMD
|
||||
{
|
||||
.name = "systemd",
|
||||
.log = debug_systemd_log,
|
||||
-92
@@ -1,92 +0,0 @@
|
||||
--- samba-4.4.5.orig/lib/tevent/tevent_internal.h 2016-01-26 12:45:46.000000000 +0100
|
||||
+++ samba-4.4.5/lib/tevent/tevent_internal.h 2016-10-07 06:45:35.000000000 +0200
|
||||
@@ -228,6 +228,16 @@
|
||||
void *additional_data;
|
||||
};
|
||||
|
||||
+struct tevent_threaded_context {
|
||||
+ struct tevent_threaded_context *next, *prev;
|
||||
+
|
||||
+#ifdef HAVE_PTHREAD
|
||||
+ pthread_mutex_t event_ctx_mutex;
|
||||
+#endif
|
||||
+ struct tevent_context *event_ctx;
|
||||
+ int wakeup_fd;
|
||||
+};
|
||||
+
|
||||
struct tevent_debug_ops {
|
||||
void (*debug)(void *context, enum tevent_debug_level level,
|
||||
const char *fmt, va_list ap) PRINTF_ATTRIBUTE(3,0);
|
||||
@@ -241,24 +251,41 @@
|
||||
/* the specific events implementation */
|
||||
const struct tevent_ops *ops;
|
||||
|
||||
+ /*
|
||||
+ * The following three pointers are queried on every loop_once
|
||||
+ * in the order in which they appear here. Not measured, but
|
||||
+ * hopefully putting them at the top together with "ops"
|
||||
+ * should make tevent a *bit* more cache-friendly than before.
|
||||
+ */
|
||||
+
|
||||
+ /* list of signal events - used by common code */
|
||||
+ struct tevent_signal *signal_events;
|
||||
+
|
||||
+ /* List of threaded job indicators */
|
||||
+ struct tevent_threaded_context *threaded_contexts;
|
||||
+
|
||||
+ /* list of immediate events - used by common code */
|
||||
+ struct tevent_immediate *immediate_events;
|
||||
+
|
||||
/* list of fd events - used by common code */
|
||||
struct tevent_fd *fd_events;
|
||||
|
||||
/* list of timed events - used by common code */
|
||||
struct tevent_timer *timer_events;
|
||||
|
||||
- /* list of immediate events - used by common code */
|
||||
- struct tevent_immediate *immediate_events;
|
||||
-
|
||||
- /* list of signal events - used by common code */
|
||||
- struct tevent_signal *signal_events;
|
||||
+ /* List of scheduled immediates */
|
||||
+ pthread_mutex_t scheduled_mutex;
|
||||
+ struct tevent_immediate *scheduled_immediates;
|
||||
|
||||
/* this is private for the events_ops implementation */
|
||||
void *additional_data;
|
||||
|
||||
/* pipe hack used with signal handlers */
|
||||
- struct tevent_fd *pipe_fde;
|
||||
- int pipe_fds[2];
|
||||
+ struct tevent_fd *wakeup_fde;
|
||||
+ int wakeup_fd; /* fd to write into */
|
||||
+#ifndef HAVE_EVENT_FD
|
||||
+ int wakeup_read_fd;
|
||||
+#endif
|
||||
|
||||
/* debugging operations */
|
||||
struct tevent_debug_ops debug_ops;
|
||||
@@ -282,6 +309,10 @@
|
||||
* tevent_common_add_timer_v2()
|
||||
*/
|
||||
struct tevent_timer *last_zero_timer;
|
||||
+
|
||||
+#ifdef HAVE_PTHREAD
|
||||
+ struct tevent_context *prev, *next;
|
||||
+#endif
|
||||
};
|
||||
|
||||
const struct tevent_ops *tevent_find_ops_byname(const char *name);
|
||||
@@ -327,6 +358,12 @@
|
||||
const char *handler_name,
|
||||
const char *location);
|
||||
bool tevent_common_loop_immediate(struct tevent_context *ev);
|
||||
+void tevent_common_threaded_activate_immediate(struct tevent_context *ev);
|
||||
+
|
||||
+bool tevent_common_have_events(struct tevent_context *ev);
|
||||
+int tevent_common_wakeup_init(struct tevent_context *ev);
|
||||
+int tevent_common_wakeup_fd(int fd);
|
||||
+int tevent_common_wakeup(struct tevent_context *ev);
|
||||
|
||||
struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+3
-7
@@ -13,22 +13,19 @@ ${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \
|
||||
|
||||
SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
|
||||
file://00-fix-typos-in-man-pages.patch \
|
||||
file://10-use-only-libsystemd.patch \
|
||||
file://16-do-not-check-xsltproc-manpages.patch \
|
||||
file://20-do-not-import-target-module-while-cross-compile.patch \
|
||||
file://21-add-config-option-without-valgrind.patch \
|
||||
file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \
|
||||
file://0006-avoid-using-colon-in-the-checking-msg.patch \
|
||||
file://internal_tevent_to_0.9.31.patch \
|
||||
file://volatiles.03_samba \
|
||||
"
|
||||
SRC_URI_append_libc-musl = " \
|
||||
file://samba-4.2.7-pam.patch \
|
||||
file://samba-4.3.9-remove-getpwent_r.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "6950c5e9f7bdeb8a610c2ca957a15be4"
|
||||
SRC_URI[sha256sum] = "b876ef2e63f66265490e80a122e66ef2d7616112b839df68f56ac2e1ce17a7bd"
|
||||
SRC_URI[md5sum] = "461def8190ffc651fd8458b24ca2a622"
|
||||
SRC_URI[sha256sum] = "927afcc16e444718985e3952de92d34e7b776b9ca0238179d866da18a6441c35"
|
||||
|
||||
inherit systemd waf-samba cpan-base perlnative update-rc.d
|
||||
# remove default added RDEPENDS on perl
|
||||
@@ -201,9 +198,8 @@ FILES_${PN}-base = "${sbindir}/nmbd \
|
||||
FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
|
||||
${bindir}/ctdb_run_cluster_tests \
|
||||
${sysconfdir}/ctdb/nodes \
|
||||
${libdir}/ctdb-tests \
|
||||
${datadir}/ctdb-tests \
|
||||
/run/ctdb \
|
||||
${datadir}/ctdb/tests \
|
||||
"
|
||||
|
||||
FILES_${BPN}-common = "${sysconfdir}/default \
|
||||
Reference in new issue
Block a user