[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-130-gcc9d850a4
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-130-gcc9d850a4
|
From: Sébastien S. <ss...@us...> - 2019-10-07 08:07:21
|
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 cc9d850a4e3f506ae1729cd511fcb8c00c3889c8 (commit)
from f647568ee1507b0409d3eb48eacc754555144e34 (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 cc9d850a4e3f506ae1729cd511fcb8c00c3889c8
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Oct 7 10:06:50 2019 +0200
[BUILDROOT] Bump BR to 2019.02.6
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
...ip-update-security-and-bux-fix-patches-fr.patch | 83 ----------------------
patches/buildroot/2019.02/cleanup_buildroot.sh | 2 -
3 files changed, 1 insertion(+), 86 deletions(-)
delete mode 100644 patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch
diff --git a/Makefile b/Makefile
index 8affdfda6..cac084637 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2019.02
-BUILDROOT_VERSION ?= $(BUILDROOT_MAJOR_VERSION).5
+BUILDROOT_VERSION ?= $(BUILDROOT_MAJOR_VERSION).6
include ./Makefile.in
BUILDROOT_SITE:=https://buildroot.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_MAJOR_VERSION)
diff --git a/patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch b/patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch
deleted file mode 100644
index 79fcb70fe..000000000
--- a/patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From eda353497d512b1a036caedfdc574b1643cb43e2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Tue, 3 Sep 2019 10:26:19 +0200
-Subject: [PATCH 1/1] package/unzip: add security patch from Debian
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix the URL and add a new patch. Quoting changelog [1]:
-
-unzip (6.0-25) unstable; urgency=medium
-
- * Apply one more patch by Mark Adler:
- - Do not raise a zip bomb alert for a misplaced central directory.
- This should allow Firefox to build again. Closes: #932404.
- Reported by Peter Green. Hopefully CVE-2019-13232 is fixed now.
-
- -- Santiago Vila <sa...@de...> Sat, 27 Jul 2019 18:01:36 +0200
-
-[1] https://sources.debian.org/data/main/u/unzip/6.0-25/debian/changelog
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
- package/unzip/unzip.hash | 1 +
- package/unzip/unzip.mk | 33 +++++++++++++++++----------------
- 2 files changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/package/unzip/unzip.hash b/package/unzip/unzip.hash
-index 0c384d006e..a10778a468 100644
---- a/package/unzip/unzip.hash
-+++ b/package/unzip/unzip.hash
-@@ -16,3 +16,4 @@ sha256 4eabc3faeddd56ebc3d5053486b61f8758d840902725fd555d3472cffb094437 20-cve-2
- sha256 df3b0eeea8dcc161a2565e306b5dda13d27de43145e198baaf0eab822321ee7e 21-fix-warning-messages-on-big-files.patch
- sha256 2cf5a89e921da99e883bcde0ea03e2c77ae9185f57efaf35e7d43bc24353cfdc 22-cve-2019-13232-fix-bug-in-undefer-input.patch
- sha256 c8e82c80fc7760f90567118a465e4cfa1b8e5d0a5723f9c70e3d21247e550615 23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch
-+sha256 37ba0bea723beeb22670babda18bd980368cc6591bc7bd9caa04f62692c7e5ac 24-cve-2019-13232-do-not-raise-alert-for-misplaced-central-directory.patch
-diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk
-index 2887b7b288..1d972055de 100644
---- a/package/unzip/unzip.mk
-+++ b/package/unzip/unzip.mk
-@@ -11,21 +11,22 @@ UNZIP_LICENSE = Info-ZIP
- UNZIP_LICENSE_FILES = LICENSE
-
- UNZIP_PATCH = \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/07-increase-size-of-cfactorstr.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/08-allow-greater-hostver-values.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/09-cve-2014-8139-crc-overflow.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/10-cve-2014-8140-test-compr-eb.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/11-cve-2014-8141-getzip64data.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/12-cve-2014-9636-test-compr-eb.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/14-cve-2015-7696.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/15-cve-2015-7697.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/16-fix-integer-underflow-csiz-decrypted.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/17-restore-unix-timestamps-accurately.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/18-cve-2014-9913-unzip-buffer-overflow.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/19-cve-2016-9844-zipinfo-buffer-overflow.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/20-cve-2018-1000035-unzip-buffer-overflow.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/21-fix-warning-messages-on-big-files.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/22-cve-2019-13232-fix-bug-in-undefer-input.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/07-increase-size-of-cfactorstr.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/08-allow-greater-hostver-values.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/09-cve-2014-8139-crc-overflow.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/10-cve-2014-8140-test-compr-eb.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/11-cve-2014-8141-getzip64data.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/12-cve-2014-9636-test-compr-eb.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/14-cve-2015-7696.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/15-cve-2015-7697.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/16-fix-integer-underflow-csiz-decrypted.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/17-restore-unix-timestamps-accurately.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/18-cve-2014-9913-unzip-buffer-overflow.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/19-cve-2016-9844-zipinfo-buffer-overflow.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/20-cve-2018-1000035-unzip-buffer-overflow.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/21-fix-warning-messages-on-big-files.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/22-cve-2019-13232-fix-bug-in-undefer-input.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/24-cve-2019-13232-do-not-raise-alert-for-misplaced-central-directory.patch
-
- $(eval $(cmake-package))
---
-2.21.0
-
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index 524c4a040..9eb81f4e0 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -189,8 +189,6 @@ rm -rf buildroot/package/sunxi-mali/sunxi-mali.mk
rm -rf buildroot/package/thingerio/Config.in
rm -rf buildroot/package/thingerio/thingerio.hash
rm -rf buildroot/package/thingerio/thingerio.mk
-rm -rf buildroot/package/unzip/unzip.hash
-rm -rf buildroot/package/unzip/unzip.mk
rm -rf buildroot/package/wolf4sdl/Config.in
rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
hooks/post-receive
--
armadeus
|