From patchwork Sat May 4 13:55:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Jean Texier X-Patchwork-Id: 1095235 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=koncepto.io Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io header.b="ACQA/zMA"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44x9YK2jJsz9s4Y for ; Sat, 4 May 2019 23:57:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4104782DDF; Sat, 4 May 2019 13:57:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8xLGlua9a2pc; Sat, 4 May 2019 13:57:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0264485EA4; Sat, 4 May 2019 13:57:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C4EE21BF3A6 for ; Sat, 4 May 2019 13:57:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BED4D229A3 for ; Sat, 4 May 2019 13:57:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QgkdDnSfc9Nj for ; Sat, 4 May 2019 13:57:14 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from koncepto.io (koncepto.io [195.154.119.111]) by silver.osuosl.org (Postfix) with ESMTPS id 55BB4221CC for ; Sat, 4 May 2019 13:57:14 +0000 (UTC) Received: from localhost.localdomain (lfbn-1-8938-37.w193-250.abo.wanadoo.fr [193.250.79.37]) by koncepto.io (Postfix) with ESMTPSA id 70672600BB; Sat, 4 May 2019 15:57:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; s=default; t=1556978224; bh=ndBTa3U3tG58pH5pogy9UawJ/NT+/VPdRiZEDyiCylM=; h=From:To:Cc:Subject:Date:From; b=ACQA/zMAcjyuABz/1yU9zrv0WQghY3JR2aAuH03fIa/y/yeIjo1mzfhbd12QfYJCi EiDW+AdRo15sDhjT+BRJbsoo0X194Wy0eyMXyqJuMHwr0O9qnW9LHIb31k1fPqOl0b TN/HksGdZcCcUKDS5n5oXP6PUQvctH2y5otzFY/N8hP6OuzTVu274yVhNikKL1Tl8d wGH4GsNWerTr4fTKgMwiGcNKtBAw4hCdoLpxMwkCRaMiLyiqfK3cFes7G/zIFe+230 Ff8MmYmTMYwl5nE2I1WO0wdDiaBuT/LMYyaZZwffxpFez/AJgB52YynNzwvHtQT4W4 6BGLnno5eQHHw== From: Pierre-Jean Texier To: buildroot@buildroot.org Date: Sat, 4 May 2019 15:55:56 +0200 Message-Id: <1556978156-1626-1-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH 1/1] package/swupdate: bump to version 2019.04 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pierre-Jean Texier MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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. Signed-off-by: Pierre-Jean Texier --- .../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 diff --git a/package/swupdate/0001-Makefile-fix-static-build.patch b/package/swupdate/0001-Makefile-fix-static-build.patch deleted file mode 100644 index 56901f9..0000000 --- a/package/swupdate/0001-Makefile-fix-static-build.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 15a324f8c67548f219256a5a75ba8123cc5bdac6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -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 -[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 - diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 138bd6d..8194de6 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -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 diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 78f23ec..4626a16 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -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 \