From 35326fa74dee53ffa4bd454e5fc95fdcbf0d5da6 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 15 Aug 2016 13:45:14 +0800 Subject: samba: upgrade to 4.4.5 * This is a security release in order to address the following defect: - CVE-2016-2119 (Client side SMB2/3 required signing can be downgraded) * Detail release note: - https://www.samba.org/samba/history/samba-4.4.5.html * Removed part of the 10-use-only-libsystemd.patch which has been fixed in new version. Signed-off-by: Jackie Huang Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../samba/samba-4.4.2/10-use-only-libsystemd.patch | 81 ---------------------- 1 file changed, 81 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch (limited to 'meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch') diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch b/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch deleted file mode 100644 index 81621ff2a..000000000 --- a/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -ur samba-4.4.2/lib/util/become_daemon.c samba-4.4.2/lib/util/become_daemon.c ---- samba-4.4.2/lib/util/become_daemon.c 2016-05-08 18:33:24.000000000 +0200 -+++ samba-4.4.2/lib/util/become_daemon.c 2016-05-08 18:26:50.275177918 +0200 -@@ -24,7 +24,7 @@ - #include "includes.h" - #include "system/filesys.h" - #include "system/locale.h" --#if HAVE_LIBSYSTEMD_DAEMON -+#if HAVE_LIBSYSTEMD - #include - #endif - #include "lib/util/close_low_fd.h" -@@ -69,9 +69,9 @@ - if (do_fork) { - newpid = fork(); - if (newpid) { --#if HAVE_LIBSYSTEMD_DAEMON -+#if HAVE_LIBSYSTEMD - sd_notifyf(0, "READY=0\nSTATUS=Starting process...\nMAINPID=%lu", (unsigned long) newpid); --#endif /* HAVE_LIBSYSTEMD_DAEMON */ -+#endif /* HAVE_LIBSYSTEMD */ - _exit(0); - } - } -@@ -98,7 +98,7 @@ - - _PUBLIC_ void exit_daemon(const char *msg, int error) - { --#ifdef HAVE_LIBSYSTEMD_DAEMON -+#ifdef HAVE_LIBSYSTEMD - if (msg == NULL) { - msg = strerror(error); - } -@@ -117,7 +117,7 @@ - if (name == NULL) { - name = "Samba"; - } --#ifdef HAVE_LIBSYSTEMD_DAEMON -+#ifdef HAVE_LIBSYSTEMD - sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...", name); - #endif - DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve " -@@ -129,7 +129,7 @@ - if (name == NULL) { - name = "Samba"; - } --#ifdef HAVE_LIBSYSTEMD_DAEMON -+#ifdef HAVE_LIBSYSTEMD - sd_notifyf(0, "\nSTATUS=%s: %s", name, msg); - #endif - DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg)); -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 - 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, -- cgit v1.2.3-54-g00ecf