swupdate: bump to version 2018.03

deleted file mode 100644
index 5e3bfb0f49..0000000000
@@ -1,87 +0,0 @@
-From 9867a9d6a21e6b0b9bcba57c3e2398fe671cea17 Mon Sep 17 00:00:00 2001
-From: Christian Storm <[email protected]>
-Date: Tue, 16 Jan 2018 10:34:52 +0100
-Subject: [PATCH] compat.h: introduce compatibility header
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduce a compat.h housing compatibility definitions
-and macros along the lines of commit 7b49b8d having
-introduced a compatibility mechanism for Lua.
-
-First use case (and motivation) is the support for
-musl (https://www.musl-libc.org/) which doesn't
-bother to provide
-    char *strndupa(const char *s, size_t n)
-
-Backported from: 9867a9d6a21e6b0b9bcba57c3e2398fe671cea17
-
-Reviewed-by: Stefano Babic <[email protected]>
-Reported-by: J?rg Krause <[email protected]>
-Signed-off-by: Christian Storm <[email protected]>
-Signed-off-by: J?rg Krause <[email protected]>
----
- include/compat.h  | 24 ++++++++++++++++++++++++
- include/util.h    |  1 +
- ipc/network_ipc.c |  1 +
- 3 files changed, 26 insertions(+)
- create mode 100644 include/compat.h
-
-diff --git a/include/compat.h b/include/compat.h
-new file mode 100644
-index 0000000..29d7af1
---- /dev/null
-+++ b/include/compat.h
-@@ -0,0 +1,24 @@
-+/*
-+ * Author: Christian Storm
-+ * Copyright (C) 2018, Siemens AG
-+ *
-+ * SPDX-License-Identifier:     GPL-2.0-or-later
-+ */
-+
-+#pragma once
-+
-+#ifndef strndupa
-+/*
-+ * Define char *strndupa(const char *s, size_t n)
-+ * for, e.g., musl (https://www.musl-libc.org/)
-+ * which does not bother to implement this function.
-+ */
-+#define strndupa(s, n)                          \
-+	(__extension__({                            \
-+		const char *__in = (s);                 \
-+		size_t __len = strnlen(__in, (n)) + 1;  \
-+		char *__out = (char *)alloca(__len);    \
-+		__out[__len - 1] = '\0';                \
-+		(char *)memcpy(__out, __in, __len - 1); \
-+	}))
-+#endif
-diff --git a/include/util.h b/include/util.h
-index bec2975..d43cd8c 100644
---- a/include/util.h
-+++ b/include/util.h
-@@ -12,6 +12,7 @@
- #include <string.h>
- #include "swupdate.h"
- #include "swupdate_status.h"
-+#include "compat.h"
- 
- #define NOTIFY_BUF_SIZE 	2048
- #define ENOMEM_ASPRINTF		-1
-diff --git a/ipc/network_ipc.c b/ipc/network_ipc.c
-index 3f197c7..48f6fcc 100644
---- a/ipc/network_ipc.c
-+++ b/ipc/network_ipc.c
-@@ -27,6 +27,7 @@
- #include <pthread.h>
- 
- #include "network_ipc.h"
-+#include "compat.h"
- 
- #ifdef CONFIG_SOCKET_CTRL_PATH
- static char* SOCKET_CTRL_PATH = (char*)CONFIG_SOCKET_CTRL_PATH;
--- 
-2.15.1
-

107 lines not on this page · raw message

index 0f6e9615e5..730ebe500d 100644
@@ -12,6 +12,7 @@ CONFIG_HAVE_DOT_CONFIG=y
 # General Configuration
 #
 # CONFIG_CURL is not set
+# CONFIG_CURL_SSL is not set
 # CONFIG_SYSTEMD is not set
 CONFIG_SCRIPTS=y
 # CONFIG_HW_COMPATIBILITY is not set

@@ -49,6 +50,10 @@ CONFIG_EXTRA_LDLIBS=""
 # CONFIG_WERROR is not set
 # CONFIG_NOCLEANUP is not set
 
+#
+# EFI Boot Guard needs libebgenv and libz
+#
+
 #
 # U-Boot support needs libubootenv, libz
 #

@@ -72,29 +77,13 @@ CONFIG_BOOTLOADER_NONE=y
 #
 # CONFIG_SURICATTA is not set
 CONFIG_WEBSERVER=y
-
-#
-# Webserver Features
-#
 CONFIG_MONGOOSE=y
-
-#
-# Mongoose Feature
-#
 CONFIG_MONGOOSEIPV6=y
 
 #
 # SSL support needs libcrypto, libssl
 #
 
-#
-# Archival Features
-#
-
-#
-# gunzip support needs libz
-#
-
 #
 # Parser Features
 #

@@ -124,6 +113,10 @@ CONFIG_RAW=y
 # remote handler needs zeromq
 #
 
+#
+# swuforward handler needs json-c and curl
+#
+
 #
 # SWU forwarder requires libcurl
 #

index d1b69c9a03..efc637976a 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  1e15d9675cf7e23886dca7ea058498282c35679a555845dbc85ffe688f2cc681  swupdate-2017.11.tar.gz
+sha256  19156bb30c3517a0ff9c918a38062df3cfa70f02f8162da4971a2f47d108688e  swupdate-2018.03.tar.gz

index aa232e5837..8649931eb7 100644
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-SWUPDATE_VERSION = 2017.11
+SWUPDATE_VERSION = 2018.03
 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION))
-SWUPDATE_LICENSE = GPL-2.0+, MIT, Public Domain
+SWUPDATE_LICENSE = GPL-2.0+, LGPL-2.1+, MIT
 SWUPDATE_LICENSE_FILES = COPYING
 
-# swupdate bundles its own version of mongoose (version 3.8)
+# swupdate bundles its own version of mongoose (version 6.11)
 
 ifeq ($(BR2_PACKAGE_JSON_C),y)
 SWUPDATE_DEPENDENCIES += json-c