[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-351-gf4c1bb4e2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-351-gf4c1bb4e2
|
From: sszy <ss...@us...> - 2022-12-15 15:57:46
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f4c1bb4e294742f64341886758f50f27d881fcc5 (commit)
from 47719697a103ec05b46af866f525945a6671ced0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f4c1bb4e294742f64341886758f50f27d881fcc5
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Dec 15 16:52:17 2022 +0100
[BUILDROOT] 2022.02: patches to fix libzlib downloading
Bump to 1.2.13
-----------------------------------------------------------------------
Summary of changes:
...18-package-libzlib-bump-to-version-1.2.13.patch | 177 +++++++++++++++++++++
patches/buildroot/2022.02/cleanup_buildroot.sh | 5 +
2 files changed, 182 insertions(+)
create mode 100644 patches/buildroot/2022.02/418-package-libzlib-bump-to-version-1.2.13.patch
diff --git a/patches/buildroot/2022.02/418-package-libzlib-bump-to-version-1.2.13.patch b/patches/buildroot/2022.02/418-package-libzlib-bump-to-version-1.2.13.patch
new file mode 100644
index 000000000..6dc845b95
--- /dev/null
+++ b/patches/buildroot/2022.02/418-package-libzlib-bump-to-version-1.2.13.patch
@@ -0,0 +1,177 @@
+From 5a948e32fece110c6208c1b0fa1a05d55037a7e7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fon...@gm...>
+Date: Sun, 23 Oct 2022 18:50:26 +0200
+Subject: [PATCH 1/1] package/libzlib: bump to version 1.2.13
+
+- Drop all patches (already in version)
+- Replace README by LICENSE file added with
+ https://github.com/madler/zlib/commit/352cb28d12baf02863ff5d4d96be0587ced419a1
+
+https://github.com/madler/zlib/releases/tag/v1.2.13
+
+Signed-off-by: Fabrice Fontaine <fon...@gm...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ ...hat-discarded-provided-CC-definition.patch | 28 ---------------
+ package/libzlib/0002-fix-CVE-2022-37434.patch | 35 -------------------
+ .../0003-fix-CVE-2022-37434-regression.patch | 32 -----------------
+ package/libzlib/libzlib.hash | 4 +--
+ package/libzlib/libzlib.mk | 7 ++--
+ 5 files changed, 4 insertions(+), 102 deletions(-)
+ delete mode 100644 package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
+ delete mode 100644 package/libzlib/0002-fix-CVE-2022-37434.patch
+ delete mode 100644 package/libzlib/0003-fix-CVE-2022-37434-regression.patch
+
+diff --git a/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
+deleted file mode 100644
+index 398e1c9481..0000000000
+--- a/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
++++ /dev/null
+@@ -1,28 +0,0 @@
+-From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
+-From: Mark Adler <ma...@al...>
+-Date: Mon, 28 Mar 2022 18:34:10 -0700
+-Subject: [PATCH] Fix configure issue that discarded provided CC definition.
+-
+-Downloaded from upstream commit:
+-https://github.com/madler/zlib/commit/05796d3d8d5546cf1b4dfe2cd72ab746afae505d
+-
+-Signed-off-by: Bernd Kuhls <ber...@t-...>
+----
+- configure | 3 +++
+- 1 file changed, 3 insertions(+)
+-
+-diff --git a/configure b/configure
+-index 52ff4a04e..3fa3e8618 100755
+---- a/configure
+-+++ b/configure
+-@@ -174,7 +174,10 @@ if test -z "$CC"; then
+- else
+- cc=${CROSS_PREFIX}cc
+- fi
+-+else
+-+ cc=${CC}
+- fi
+-+
+- cflags=${CFLAGS-"-O3"}
+- # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+- case "$cc" in
+diff --git a/package/libzlib/0002-fix-CVE-2022-37434.patch b/package/libzlib/0002-fix-CVE-2022-37434.patch
+deleted file mode 100644
+index a61be48536..0000000000
+--- a/package/libzlib/0002-fix-CVE-2022-37434.patch
++++ /dev/null
+@@ -1,35 +0,0 @@
+-From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001
+-From: Mark Adler <fo...@ma...>
+-Date: Sat, 30 Jul 2022 15:51:11 -0700
+-Subject: [PATCH] Fix a bug when getting a gzip header extra field with
+- inflate().
+-
+-If the extra field was larger than the space the user provided with
+-inflateGetHeader(), and if multiple calls of inflate() delivered
+-the extra header data, then there could be a buffer overflow of the
+-provided space. This commit assures that provided space is not
+-exceeded.
+-
+-Backported from: eff308af425b67093bab25f80f1ae950166bece1
+-Signed-off-by: Marcus Hoffmann <mar...@ot...>
+----
+- inflate.c | 5 +++--
+- 1 file changed, 3 insertions(+), 2 deletions(-)
+-
+-diff --git a/inflate.c b/inflate.c
+-index 7be8c6366..7a7289749 100644
+---- a/inflate.c
+-+++ b/inflate.c
+-@@ -763,9 +763,10 @@ int flush;
+- copy = state->length;
+- if (copy > have) copy = have;
+- if (copy) {
+-+ len = state->head->extra_len - state->length;
+- if (state->head != Z_NULL &&
+-- state->head->extra != Z_NULL) {
+-- len = state->head->extra_len - state->length;
+-+ state->head->extra != Z_NULL &&
+-+ len < state->head->extra_max) {
+- zmemcpy(state->head->extra + len, next,
+- len + copy > state->head->extra_max ?
+- state->head->extra_max - len : copy);
+diff --git a/package/libzlib/0003-fix-CVE-2022-37434-regression.patch b/package/libzlib/0003-fix-CVE-2022-37434-regression.patch
+deleted file mode 100644
+index 46a58710d2..0000000000
+--- a/package/libzlib/0003-fix-CVE-2022-37434-regression.patch
++++ /dev/null
+@@ -1,32 +0,0 @@
+-From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
+-From: Mark Adler <fo...@ma...>
+-Date: Mon, 8 Aug 2022 10:50:09 -0700
+-Subject: [PATCH] Fix extra field processing bug that dereferences NULL
+- state->head.
+-
+-The recent commit to fix a gzip header extra field processing bug
+-introduced the new bug fixed here.
+-
+-Backported from: 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d
+-Signed-off-by: Marcus Hoffmann <mar...@ot...>
+----
+- inflate.c | 4 ++--
+- 1 file changed, 2 insertions(+), 2 deletions(-)
+-
+-diff --git a/inflate.c b/inflate.c
+-index 7a7289749..2a3c4fe98 100644
+---- a/inflate.c
+-+++ b/inflate.c
+-@@ -763,10 +763,10 @@ int flush;
+- copy = state->length;
+- if (copy > have) copy = have;
+- if (copy) {
+-- len = state->head->extra_len - state->length;
+- if (state->head != Z_NULL &&
+- state->head->extra != Z_NULL &&
+-- len < state->head->extra_max) {
+-+ (len = state->head->extra_len - state->length) <
+-+ state->head->extra_max) {
+- zmemcpy(state->head->extra + len, next,
+- len + copy > state->head->extra_max ?
+- state->head->extra_max - len : copy);
+diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash
+index e6ca974e2f..df5e8d723a 100644
+--- a/package/libzlib/libzlib.hash
++++ b/package/libzlib/libzlib.hash
+@@ -1,4 +1,4 @@
+ # From http://www.zlib.net/
+-sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz
++sha256 d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98 zlib-1.2.13.tar.xz
+ # License files, locally calculated
+-sha256 fc2c3368901700f0acdeb1d8afeaca5923296768ec6824ecdf627aac396001fd README
++sha256 845efc77857d485d91fb3e0b884aaa929368c717ae8186b66fe1ed2495753243 LICENSE
+diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk
+index f75502326b..e344cc7ad9 100644
+--- a/package/libzlib/libzlib.mk
++++ b/package/libzlib/libzlib.mk
+@@ -4,19 +4,16 @@
+ #
+ ################################################################################
+
+-LIBZLIB_VERSION = 1.2.12
++LIBZLIB_VERSION = 1.2.13
+ LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz
+ LIBZLIB_SITE = http://www.zlib.net
+ LIBZLIB_LICENSE = Zlib
+-LIBZLIB_LICENSE_FILES = README
++LIBZLIB_LICENSE_FILES = LICENSE
+ LIBZLIB_INSTALL_STAGING = YES
+ LIBZLIB_PROVIDES = zlib
+ LIBZLIB_CPE_ID_VENDOR = zlib
+ LIBZLIB_CPE_ID_PRODUCT = zlib
+
+-# 0002-fix-CVE-2022-37434.patch
+-LIBZLIB_IGNORE_CVES = CVE-2022-37434
+-
+ # It is not possible to build only a shared version of zlib, so we build both
+ # shared and static, unless we only want the static libs, and we eventually
+ # selectively remove what we do not want
+--
+2.37.4
+
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index 30bdbf58f..b20407be1 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -46,6 +46,11 @@ rm -rf buildroot/package/libimxvpuapi2/Config.in
rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.hash
rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.mk
rm -rf buildroot/package/libopenssl/libopenssl.mk
+rm -rf buildroot/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
+rm -rf buildroot/package/libzlib/0002-fix-CVE-2022-37434.patch
+rm -rf buildroot/package/libzlib/0003-fix-CVE-2022-37434-regression.patch
+rm -rf buildroot/package/libzlib/libzlib.hash
+rm -rf buildroot/package/libzlib/libzlib.mk
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
rm -rf buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
hooks/post-receive
--
armadeus
|