Skip to contentSkip to conversation

package/swupdate: bump to version 2019.04

PATCH Superseded Pierre-Jean Texier 3 participants 5 messages May 4, 2019 – Jun 10, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

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

New features in this release:

- Improved documentation
- delta updates based on rdiff library
- support for libubootenv
- dry-run option
- CA certificates for signed images
- Fix security leak in parser

This commit also drop upstreamed patch.

---
 .../swupdate/0001-Makefile-fix-static-build.patch  | 62 ----------------------
 package/swupdate/swupdate.hash                     |  2 +-
 package/swupdate/swupdate.mk                       |  2 +-
 3 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 package/swupdate/0001-Makefile-fix-static-build.patch
package/swupdate/0001-Makefile-fix-static-build.patch deleted +0 -62
deleted file mode 100644
index 56901f9..0000000
@@ -1,62 +0,0 @@
-From 15a324f8c67548f219256a5a75ba8123cc5bdac6 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Mon, 4 Mar 2019 21:51:36 +0100
-Subject: [PATCH] Makefile: fix static build
-
-Don't build and install lua_swupdate.so if HAVE_LUA isn't set to y
-otherwise build will fail if the toolchain only suports building static
-libraries
-
-Fixes:
- - http://autobuild.buildroot.org/results/c11c4d26983e0347d96f3dda62e6d72b031967bb
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://github.com/sbabic/swupdate/pull/49]
----
- Makefile | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index cfeb9a6..cac99b5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -369,11 +369,15 @@ tools-bins	:= $(patsubst $(tools-y)/%.c,$(tools-y)/%,$(wildcard $(tools-y)/*.c))
- tools-bins-unstr:= $(patsubst %,%_unstripped,$(tools-bins))
- tools-all	:= $(tools-objs)
- 
-+ifeq ($(HAVE_LUA),y)
-+lua_swupdate	:= lua_swupdate.so
-+endif
-+
- shared-dirs	:= $(shareds-y)
- shared-libs	:= $(patsubst %,%/built-in.o, $(shareds-y))
- shared-all	:= $(shared-libs)
- 
--all: swupdate ${tools-bins} lua_swupdate.so
-+all: swupdate ${tools-bins} ${lua_swupdate}
- 
- # Do modpost on a prelinked vmlinux. The finally linked vmlinux has
- # relevant sections renamed as per the linker script.
-@@ -434,7 +438,6 @@ install: all
- 	install -d ${DESTDIR}/usr/bin
- 	install -d ${DESTDIR}/usr/include
- 	install -d ${DESTDIR}/usr/lib
--	install -d ${DESTDIR}/usr/lib/lua/$(LUAVER)
- 	install -m 755 swupdate ${DESTDIR}/usr/bin
- 	for i in ${tools-bins};do \
- 		install -m 755 $$i ${DESTDIR}/usr/bin; \
-@@ -443,7 +446,10 @@ install: all
- 	install -m 0644 include/swupdate_status.h ${DESTDIR}/usr/include
- 	install -m 0644 include/progress_ipc.h ${DESTDIR}/usr/include
- 	install -m 0755 ipc/lib.a ${DESTDIR}/usr/lib/libswupdate.a
--	install -m 0755 lua_swupdate.so $(DESTDIR)/usr/lib/lua/$(LUAVER)
-+	if [ $(HAVE_LUA) = y ]; then \
-+		install -d ${DESTDIR}/usr/lib/lua/$(LUAVER); \
-+		install -m 0755 ${lua_swupdate} $(DESTDIR)/usr/lib/lua/$(LUAVER); \
-+	fi
- 
- PHONY += run-tests
- tests: \
--- 
-2.14.1
-
package/swupdate/swupdate.hash +1 -1
index 138bd6d..8194de6 100644
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  a65884ca18523cde1b0744d952d6f91462dbd4ad07941305f5684c6d4ec833dc  swupdate-2018.11.tar.gz
+sha256  96b2c59558e847ddb7c23b666c1bbe61e03ab90a64c30d233bd5e9029df8519b  swupdate-2019.04.tar.gz
 sha256  43492b377cf2fb67942d1dd231146bd4e6578646ad13ef289297c9dd75cbc478  Licenses/Exceptions
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Licenses/lgpl-2.1.txt
package/swupdate/swupdate.mk +1 -1
index 78f23ec..4626a16 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SWUPDATE_VERSION = 2018.11
+SWUPDATE_VERSION = 2019.04
 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION))
 SWUPDATE_LICENSE = GPL-2.0+ with OpenSSL exception, LGPL-2.1+, MIT
 SWUPDATE_LICENSE_FILES = Licenses/Exceptions Licenses/gpl-2.0.txt \
Signature · 1 line
2.7.4
#1 lore raw

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

Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Pierre-Jean" == Pierre-Jean Texier <[email protected]> writes:

New features in this release:
- Improved documentation
- delta updates based on rdiff library

Looking at https://sbabic.github.io/swupdate/swupdate.html, this seems to rely on librsync, but I don't see any change to _DEPENDENCIES?

Quoted 1 line

- support for libubootenv

Is that something that would be worthwhile to package?

Quoted 3 lines

- dry-run option
- CA certificates for signed images
- Fix security leak in parser

What does this mean exactly? Does this mean that this should be applied to 2019.02.x as well?

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

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

Hi Peter,

Le 05/05/2019 ? 12:05, Peter Korsgaard a ?crit?:

Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Pierre-Jean" == Pierre-Jean Texier <[email protected]> writes:

New features in this release:
- Improved documentation
- delta updates based on rdiff library

Looking at https://sbabic.github.io/swupdate/swupdate.html, this seems to rely on librsync, but I don't see any change to _DEPENDENCIES?

Indeed, I will do in v2.

Quoted 4 lines
Quoted 2 lines

- support for libubootenv

Is that something that would be worthwhile to package?

Sure, I am working on it [1] :).
I'll try to send this package as soon as possible. And I'll send the v2 after.

Quoted 7 lines
Quoted 4 lines

- dry-run option
- CA certificates for signed images
- Fix security leak in parser

What does this mean exactly? Does this mean that this should be applied to 2019.02.x as well?

Yes, I think so.

[1]
https://github.com/texierp/buildroot/commit/6f1ea3cb62560996ba3669cf760dc527ed1a9ec9

Thanks

Pierre-Jean

#3 lore raw

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

In reply to Pierre-Jean Texier
Quoted 11 lines · Pierre-Jean Texier

New features in this release:

- Improved documentation
- delta updates based on rdiff library
- support for libubootenv
- dry-run option
- CA certificates for signed images
- Fix security leak in parser

This commit also drop upstreamed patch.

I'd recommend you backport the following 2 patches which were committed after 2019.04:
https://github.com/sbabic/swupdate/commit/95a2b9961119aac80aea1eeabbc1cd52b72d876a
https://github.com/sbabic/swupdate/commit/ee17493d470ae7fd7b34241f263cfa6d790ce1b3

Quoted 108 lines
---
 .../swupdate/0001-Makefile-fix-static-build.patch  | 62 ----------------------
 package/swupdate/swupdate.hash                     |  2 +-
 package/swupdate/swupdate.mk                       |  2 +-
 3 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 package/swupdate/0001-Makefile-fix-static-build.patch
package/swupdate/0001-Makefile-fix-static-build.patch deleted +0 -62
deleted file mode 100644
index 56901f9..0000000
@@ -1,62 +0,0 @@
-From 15a324f8c67548f219256a5a75ba8123cc5bdac6 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Mon, 4 Mar 2019 21:51:36 +0100
-Subject: [PATCH] Makefile: fix static build
-
-Don't build and install lua_swupdate.so if HAVE_LUA isn't set to y
-otherwise build will fail if the toolchain only suports building static
-libraries
-
-Fixes:
- - http://autobuild.buildroot.org/results/c11c4d26983e0347d96f3dda62e6d72b031967bb
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://github.com/sbabic/swupdate/pull/49]
----
- Makefile | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index cfeb9a6..cac99b5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -369,11 +369,15 @@ tools-bins       := $(patsubst $(tools-y)/%.c,$(tools-y)/%,$(wildcard $(tools-y)/*.c))
- tools-bins-unstr:= $(patsubst %,%_unstripped,$(tools-bins))
- tools-all     := $(tools-objs)
-
-+ifeq ($(HAVE_LUA),y)
-+lua_swupdate  := lua_swupdate.so
-+endif
-+
- shared-dirs   := $(shareds-y)
- shared-libs   := $(patsubst %,%/built-in.o, $(shareds-y))
- shared-all    := $(shared-libs)
-
--all: swupdate ${tools-bins} lua_swupdate.so
-+all: swupdate ${tools-bins} ${lua_swupdate}
-
- # Do modpost on a prelinked vmlinux. The finally linked vmlinux has
- # relevant sections renamed as per the linker script.
-@@ -434,7 +438,6 @@ install: all
-       install -d ${DESTDIR}/usr/bin
-       install -d ${DESTDIR}/usr/include
-       install -d ${DESTDIR}/usr/lib
--      install -d ${DESTDIR}/usr/lib/lua/$(LUAVER)
-       install -m 755 swupdate ${DESTDIR}/usr/bin
-       for i in ${tools-bins};do \
-               install -m 755 $$i ${DESTDIR}/usr/bin; \
-@@ -443,7 +446,10 @@ install: all
-       install -m 0644 include/swupdate_status.h ${DESTDIR}/usr/include
-       install -m 0644 include/progress_ipc.h ${DESTDIR}/usr/include
-       install -m 0755 ipc/lib.a ${DESTDIR}/usr/lib/libswupdate.a
--      install -m 0755 lua_swupdate.so $(DESTDIR)/usr/lib/lua/$(LUAVER)
-+      if [ $(HAVE_LUA) = y ]; then \
-+              install -d ${DESTDIR}/usr/lib/lua/$(LUAVER); \
-+              install -m 0755 ${lua_swupdate} $(DESTDIR)/usr/lib/lua/$(LUAVER); \
-+      fi
-
- PHONY += run-tests
- tests: \
---
-2.14.1
-
package/swupdate/swupdate.hash +1 -1
index 138bd6d..8194de6 100644
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  a65884ca18523cde1b0744d952d6f91462dbd4ad07941305f5684c6d4ec833dc  swupdate-2018.11.tar.gz
+sha256  96b2c59558e847ddb7c23b666c1bbe61e03ab90a64c30d233bd5e9029df8519b  swupdate-2019.04.tar.gz
 sha256  43492b377cf2fb67942d1dd231146bd4e6578646ad13ef289297c9dd75cbc478  Licenses/Exceptions
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Licenses/lgpl-2.1.txt
package/swupdate/swupdate.mk +1 -2
index 78f23ec..4626a16 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SWUPDATE_VERSION = 2018.11
+SWUPDATE_VERSION = 2019.04
 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION))
 SWUPDATE_LICENSE = GPL-2.0+ with OpenSSL exception, LGPL-2.1+, MIT
 SWUPDATE_LICENSE_FILES = Licenses/Exceptions Licenses/gpl-2.0.txt \
--

2.7.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#4 lore raw

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

Hi James,

Le 10/06/2019 ? 00:51, James Hilliard a ?crit?:

Quoted 4 lines

I'd recommend you backport the following 2 patches which were committed after 2019.04:
https://github.com/sbabic/swupdate/commit/95a2b9961119aac80aea1eeabbc1cd52b72d876a
https://github.com/sbabic/swupdate/commit/ee17493d470ae7fd7b34241f263cfa6d790ce1b3

Sure, you are right, I will backport these commits in v2.

Thanks !

Signature · 2 lines
Best regards,
Pierre-Jean Texier