From 35326fa74dee53ffa4bd454e5fc95fdcbf0d5da6 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 15 Aug 2016 13:45:14 +0800 Subject: [PATCH] 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-4.4.2/10-use-only-libsystemd.patch | 81 ------------------- .../00-fix-typos-in-man-pages.patch | 0 ...void-using-colon-in-the-checking-msg.patch | 0 .../samba-4.4.5/10-use-only-libsystemd.patch | 30 +++++++ .../16-do-not-check-xsltproc-manpages.patch | 0 ...rt-target-module-while-cross-compile.patch | 0 ...1-add-config-option-without-valgrind.patch | 0 .../volatiles.03_samba | 0 .../samba/{samba_4.4.2.bb => samba_4.4.5.bb} | 4 +- 9 files changed, 32 insertions(+), 83 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch rename meta-networking/recipes-connectivity/samba/{samba-4.4.2 => samba-4.4.5}/00-fix-typos-in-man-pages.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.2 => samba-4.4.5}/0006-avoid-using-colon-in-the-checking-msg.patch (100%) create mode 100644 meta-networking/recipes-connectivity/samba/samba-4.4.5/10-use-only-libsystemd.patch rename meta-networking/recipes-connectivity/samba/{samba-4.4.2 => samba-4.4.5}/16-do-not-check-xsltproc-manpages.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.2 => samba-4.4.5}/20-do-not-import-target-module-while-cross-compile.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.2 => samba-4.4.5}/21-add-config-option-without-valgrind.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.2 => samba-4.4.5}/volatiles.03_samba (100%) rename meta-networking/recipes-connectivity/samba/{samba_4.4.2.bb => samba_4.4.5.bb} (99%) 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 81621ff2a7..0000000000 --- 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, diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.2/00-fix-typos-in-man-pages.patch b/meta-networking/recipes-connectivity/samba/samba-4.4.5/00-fix-typos-in-man-pages.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.2/00-fix-typos-in-man-pages.patch rename to meta-networking/recipes-connectivity/samba/samba-4.4.5/00-fix-typos-in-man-pages.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.2/0006-avoid-using-colon-in-the-checking-msg.patch b/meta-networking/recipes-connectivity/samba/samba-4.4.5/0006-avoid-using-colon-in-the-checking-msg.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.2/0006-avoid-using-colon-in-the-checking-msg.patch rename to meta-networking/recipes-connectivity/samba/samba-4.4.5/0006-avoid-using-colon-in-the-checking-msg.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/10-use-only-libsystemd.patch b/meta-networking/recipes-connectivity/samba/samba-4.4.5/10-use-only-libsystemd.patch new file mode 100644 index 0000000000..0ddc9410cd --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba-4.4.5/10-use-only-libsystemd.patch @@ -0,0 +1,30 @@ +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, diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.2/16-do-not-check-xsltproc-manpages.patch b/meta-networking/recipes-connectivity/samba/samba-4.4.5/16-do-not-check-xsltproc-manpages.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.2/16-do-not-check-xsltproc-manpages.patch rename to meta-networking/recipes-connectivity/samba/samba-4.4.5/16-do-not-check-xsltproc-manpages.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.2/20-do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-connectivity/samba/samba-4.4.5/20-do-not-import-target-module-while-cross-compile.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.2/20-do-not-import-target-module-while-cross-compile.patch rename to meta-networking/recipes-connectivity/samba/samba-4.4.5/20-do-not-import-target-module-while-cross-compile.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.2/21-add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba-4.4.5/21-add-config-option-without-valgrind.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.2/21-add-config-option-without-valgrind.patch rename to meta-networking/recipes-connectivity/samba/samba-4.4.5/21-add-config-option-without-valgrind.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.2/volatiles.03_samba b/meta-networking/recipes-connectivity/samba/samba-4.4.5/volatiles.03_samba similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.2/volatiles.03_samba rename to meta-networking/recipes-connectivity/samba/samba-4.4.5/volatiles.03_samba diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb similarity index 99% rename from meta-networking/recipes-connectivity/samba/samba_4.4.2.bb rename to meta-networking/recipes-connectivity/samba/samba_4.4.5.bb index c51569657c..e35d527f8a 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb @@ -21,8 +21,8 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ " -SRC_URI[md5sum] = "03a65a3adf08ceb1636ad59d234d7f9d" -SRC_URI[sha256sum] = "eaecd41a85ebb9507b8db9856ada2a949376e9d53cf75664b5493658f6e5926a" +SRC_URI[md5sum] = "6950c5e9f7bdeb8a610c2ca957a15be4" +SRC_URI[sha256sum] = "b876ef2e63f66265490e80a122e66ef2d7616112b839df68f56ac2e1ce17a7bd" inherit systemd waf-samba cpan-base perlnative update-rc.d # remove default added RDEPENDS on perl