lxc: update to v4.0.4

While we are updating, we refresh one patch to remove fuzz, otherwise
there are no significant changes.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

3 files changed, 9 insertions, 6 deletions

diff --git a/recipes-containers/lxc/files/lxc-fix-B-S.patch b/recipes-containers/lxc/files/lxc-fix-B-S.patch
index cd8f81d0..7a807b7c 100644
--- a/recipes-containers/lxc/files/lxc-fix-B-S.patch
+++ b/recipes-containers/lxc/files/lxc-fix-B-S.patch
@@ -1,6 +1,7 @@
-From 1cdadc8d6f7ccaf398a95af920b7c49514ee62ef Mon Sep 17 00:00:00 2001
+From dc2e71f060c25b94f011fce12ef59d2f5ae4e6a9 Mon Sep 17 00:00:00 2001
 From: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
 Date: Thu, 9 Apr 2015 23:01:48 +0300
+Subject: [PATCH] %% original patch: lxc-fix-B-S.patch
 
 ---
  config/init/upstart/Makefile.am | 4 ++--
diff --git a/recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch b/recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch
index 522aab7c..3a2b1f0d 100644
--- a/recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch
+++ b/recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch
@@ -1,4 +1,4 @@
-From 7c1c597592694d1f3e652657b1cc642a8990f8a0 Mon Sep 17 00:00:00 2001
+From b30643c37d0d64a15d15026ac94e548cae8a88d2 Mon Sep 17 00:00:00 2001
 From: Mark Asselstine <mark.asselstine@windriver.com>
 Date: Thu, 31 May 2018 16:21:45 -0400
 Subject: [PATCH] templates: actually create DOWNLOAD_TEMP directory
@@ -23,12 +23,12 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/templates/lxc-download.in b/templates/lxc-download.in
-index 58d063f..d7e6128 100644
+index 4cb2129..923d2a1 100644
 --- a/templates/lxc-download.in
 +++ b/templates/lxc-download.in
 @@ -329,7 +329,7 @@ elif [ -n "${DOWNLOAD_TEMP}" ]; then
    mkdir -p "${DOWNLOAD_TEMP}"
-   DOWNLOAD_TEMP="$(mktemp -p ${DOWNLOAD_TEMP} -d)"
+   DOWNLOAD_TEMP="$(mktemp -p "${DOWNLOAD_TEMP}" -d)"
  else
 -  DOWNLOAD_TEMP="${DOWNLOAD_TEMP}$(mktemp -d)"
 +  DOWNLOAD_TEMP="$(mktemp -p ${DOWNLOAD_TEMP} -d)"
diff --git a/recipes-containers/lxc/lxc_4.0.3.bb b/recipes-containers/lxc/lxc_4.0.4.bb
index f0fd4b96..a8f93948 100644
--- a/recipes-containers/lxc/lxc_4.0.3.bb
+++ b/recipes-containers/lxc/lxc_4.0.4.bb
@@ -51,8 +51,10 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \
         file://lxc-net \
         "
 
-SRC_URI[md5sum] = "7d86ddf9fcb5f78ac5ae0380fbbfb690"
-SRC_URI[sha256sum] = "d56d91d772449c57e9a67b770dab8967e412051d8d6246ce56c63264671672e5"
+SRC_URI[md5sum] = "6197096cf11da286b9f9ee02dee9dc50"
+SRC_URI[sha256sum] = "3c65a8ba20ed2b66c2075dc914aa632f76d0137af707b851b62b5555fed7d995"
+
+
 
 S = "${WORKDIR}/${BPN}-${PV}"