Skip to contentSkip to conversation

package/swupdate: bump to version 2019.11

PATCH New Jörg Krause 2 participants 2 messages Dec 3, 2019 – Dec 9, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/swupdate: bump to version 2019.11

Add support for:
* mbedTLS as SSL choice
* zstd as compression option
* libgpiod to support microcontroller firmware update
* efibootmgr to support EFI Boot Guard
* libwebsockets and liburiparser to support SWU forwarder

Also:
* drop upstream patches
* drop CONFIG_GUNZIP. Setting it because Buxybox provides a binary named gunzip is wrong. CONFIG_GUNZIP should only be set if zlib is provided, which Buxybox' gunzip does not.

Regenerated the .config file by doing:

```
make swupdate-menuconfig
make swupdate-update-config
```

.. and removing the paths for the build options manually.

---
 ...ve-handler-set-locale-for-libarchive.patch | 65 -------------------
 ...-segfault-in-image-property-handling.patch | 42 ------------
 ...ript-format-when-CONFIG_UBOOT_NEWAPI.patch | 44 -------------
 package/swupdate/Config.in                    | 13 +++-
 package/swupdate/swupdate.config              | 22 +++++--
 package/swupdate/swupdate.hash                |  2 +-
 package/swupdate/swupdate.mk                  | 45 ++++++++++++-
 7 files changed, 72 insertions(+), 161 deletions(-)
 delete mode 100644 package/swupdate/0001-archive-handler-set-locale-for-libarchive.patch
 delete mode 100644 package/swupdate/0002-Lua-fix-segfault-in-image-property-handling.patch
 delete mode 100644 package/swupdate/0003-u-boot-fix-script-format-when-CONFIG_UBOOT_NEWAPI.patch
package/swupdate/0001-archive-handler-set-locale-for-libarchive.patch deleted +0 -65
deleted file mode 100644
index 30bad66802..0000000000
@@ -1,65 +0,0 @@
-From 95a2b9961119aac80aea1eeabbc1cd52b72d876a Mon Sep 17 00:00:00 2001
-From: James Hilliard <[email protected]>
-Date: Sat, 4 May 2019 11:38:37 -0600
-Subject: [PATCH] archive handler: set locale for libarchive
-
-Signed-off-by: James Hilliard <[email protected]>
-[Backported from: 95a2b9961119aac80aea1eeabbc1cd52b72d876a]
-Signed-off-by: Pierre-Jean Texier <[email protected]>
----
- handlers/archive_handler.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/handlers/archive_handler.c b/handlers/archive_handler.c
-index 7f12761..993bc10 100644
---- a/handlers/archive_handler.c
-+++ b/handlers/archive_handler.c
-@@ -6,6 +6,7 @@
-  */
- 
- #include <sys/types.h>
-+#include <locale.h>
- #include <stdio.h>
- #include <sys/stat.h>
- #include <unistd.h>
-@@ -68,6 +69,8 @@ copy_data(struct archive *ar, struct archive *aw)
- static void *
- extract(void *p)
- {
-+	locale_t archive_locale;
-+	locale_t old_locale;
- 	struct archive *a;
- 	struct archive *ext = NULL;
- 	struct archive_entry *entry = NULL;
-@@ -77,6 +80,20 @@ extract(void *p)
- 	flags = data->flags;
- 	int exitval = -EFAULT;
- 
-+	/*
-+	 * Enable system locale - change from the standard (C) to system locale.
-+	 * This allows libarchive (in case it is activated) to handle filenames.
-+	 * We only change LC_CTYPE since libarchive only needs the charset set.
-+	 * We don't use LC_ALL because it causes problems on some systems.
-+	 * We restore the original LC_CTYPE after extraction to avoid side effects.
-+	 * We use uselocale instead of setlocale to avoid setting LC_CTYPE globally.
-+	 * See on libarchive Website for a more complete description of the issue:
-+	 *  https://github.com/libarchive/libarchive/issues/587
-+	 *  https://github.com/libarchive/libarchive/wiki/Filenames
-+	 */
-+	archive_locale = newlocale(LC_CTYPE_MASK, "", (locale_t)0);
-+	old_locale = uselocale(archive_locale);
-+
- 	a = archive_read_new();
- 	if (!a) {
- 		goto out;
-@@ -155,6 +172,7 @@ out:
- 		archive_read_free(a);
- 	}
- 
-+	uselocale(old_locale);
- 	data->exitval = exitval;
- 	pthread_exit(NULL);
- }
--- 
-2.7.4
-
package/swupdate/0002-Lua-fix-segfault-in-image-property-handling.patch deleted +0 -42

42 lines not on this page · raw message

package/swupdate/0003-u-boot-fix-script-format-when-CONFIG_UBOOT_NEWAPI.patch deleted +0 -44

44 lines not on this page · raw message

package/swupdate/Config.in +11 -2
index 951caf604c..d372927c11 100644
@@ -24,12 +24,14 @@ config BR2_PACKAGE_SWUPDATE
 	    want to have Lua support.
 	  * Select BR2_PACKAGE_LIBCURL if you want to use the download
 	    feature.
-	  * Select BR2_PACKAGE_OPENSSL is you want to add encryption
-	    support.
+	  * Select BR2_PACKAGE_OPENSSL or BR2_PACKAGE_MBEDTLS is you
+	    want to add encryption support.
 	  * Select BR2_PACKAGE_MTD if you want to use swupdate with
 	    UBI partitions.
 	  * Select BR2_PACKAGE_ZLIB if you want to deal with gzip
 	    compressed archives.
+	  * Select BR2_PACKAGE_ZSTD if you want to deal with zstd
+	    compressed archives.
 	  * Select BR2_PACKAGE_UBOOT_TOOLS and BR2_PACKAGE_ZLIB to add
 	    support for setting the U-Boot environment.
 	  * Select BR2_PACKAGE_ZEROMQ to add support for using a
@@ -38,6 +40,13 @@ config BR2_PACKAGE_SWUPDATE
 	    rdiff handler.
 	  * Select BR2_PACKAGE_LIBUBOOTENV to add support for setting
 	    the U-Boot environment with the new API.
+	  * Select BR2_PACKAGE_LIBGPIOD to add support for
+	    microcontroller firmware update.
+	  * Select BR2_PACKAGE_EFIBOOTMGR to add support for EFI Boot
+	    Guard.
+	  * Select BR2_PACKAGE_LIBCURL, BR2_PACKAGE_JSON_C,
+	    BR2_PACKAGE_LIBWEBSOCKETS, and BR2_PACKAGE_LIBURIPARSER
+	    to add support for the SWU forwarder.
 
 	  https://sbabic.github.io/swupdate
 
package/swupdate/swupdate.config +16 -6
index 3cb39d8549..9d255c8ee4 100644
@@ -49,28 +49,32 @@ CONFIG_EXTRA_LDLIBS=""
 # CONFIG_DEBUG is not set
 # CONFIG_WERROR is not set
 # CONFIG_NOCLEANUP is not set
-# CONFIG_BOOTLOADER_EBG is not set
+
+#
+# EFI Boot Guard needs libebgenv and libz
+#
 CONFIG_BOOTLOADER_NONE=y
 # CONFIG_BOOTLOADER_GRUB is not set
 
 #
 # U-Boot support needs libubootenv, libz
 #
+CONFIG_SSL_IMPL_NONE=y
 
 #
 # Image downloading support needs libcurl
 #
 
 #
-# Hash verification needs libssl
+# Hash checking needs an SSL implementation
 #
 
 #
-# Image verification (signed images) needs libssl
+# Image signature verification needs an SSL implementation
 #
 
 #
-# Image encryption needs libssl
+# Image encryption needs an SSL implementation
 #
 # CONFIG_SURICATTA is not set
 CONFIG_WEBSERVER=y
@@ -80,7 +84,6 @@ CONFIG_MONGOOSEIPV6=y
 #
 # SSL support needs libcrypto, libssl
 #
-CONFIG_GUNZIP=y
 
 #
 # Parser Features
@@ -119,5 +122,12 @@ CONFIG_RAW=y
 #
 # SWU forwarder requires libcurl
 #
+
+#
+# swuforward handler needs json-c and curl
+#
 # CONFIG_BOOTLOADERHANDLER is not set
-# CONFIG_UCFWHANDLER is not set
+
+#
+# Microcontroller handler depends on libgpiod
+#
package/swupdate/swupdate.hash +1 -1
index 8194de6e64..3de8d25f46 100644
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  96b2c59558e847ddb7c23b666c1bbe61e03ab90a64c30d233bd5e9029df8519b  swupdate-2019.04.tar.gz
+sha256  31b2561c9c91ab1e8b6f73704f9a3560816961c2cade4f5d5fc15f55c77ec819  swupdate-2019.11.tar.gz
 sha256  43492b377cf2fb67942d1dd231146bd4e6578646ad13ef289297c9dd75cbc478  Licenses/Exceptions
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Licenses/lgpl-2.1.txt
package/swupdate/swupdate.mk +44 -1

82 lines not on this page · raw message

Signature · 1 line
2.24.0
#1 lore raw

PATCH 1/1 package/swupdate: bump to version 2019.11

Quoted 22 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"J?rg" == J?rg Krause <[email protected]> writes:

Add support for:
* mbedTLS as SSL choice
* zstd as compression option
* libgpiod to support microcontroller firmware update
* efibootmgr to support EFI Boot Guard
* libwebsockets and liburiparser to support SWU forwarder

Also:
* drop upstream patches
* drop CONFIG_GUNZIP. Setting it because Buxybox provides a binary named gunzip is wrong. CONFIG_GUNZIP should only be set if zlib is provided, which Buxybox' gunzip does not.

Regenerated the .config file by doing:

```
make swupdate-menuconfig
make swupdate-update-config
```

.. and removing the paths for the build options manually.

package/swupdate/Config.in config BR2_PACKAGE_SWUPDATE · line 28

Quoted 4 lines
package/swupdate/Config.in +2 -2
-	  * Select BR2_PACKAGE_OPENSSL is you want to add encryption
-	    support.
+	  * Select BR2_PACKAGE_OPENSSL or BR2_PACKAGE_MBEDTLS is you
+	    want to add encryption support.

You kept the 'is' typo ;)

Changed to 'if' and committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard