[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-181-ge6bf35d9b
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-181-ge6bf35d9b
|
From: Sébastien S. <ss...@us...> - 2020-04-02 10:14:17
|
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 e6bf35d9bac569a6cb242f5f447c254530434c7e (commit)
via fe8faa4f879e237c46ef362c311e1906ceb338ee (commit)
via ca6b244ff8b1f14313fc8151abbe2874a0c5c568 (commit)
from 193f5e632ac32e28b71a10ccf552074204a69201 (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 e6bf35d9bac569a6cb242f5f447c254530434c7e
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Apr 2 12:13:47 2020 +0200
[BUILDROOT] 2019.02: libopenssl: bump to version 1.1.1f
commit fe8faa4f879e237c46ef362c311e1906ceb338ee
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Apr 2 11:19:58 2020 +0200
[UCLIBC] ng-1.0.22: enable UCLIBC_HAS_LIBINTL
It fixes libglib2 build on APF27
commit ca6b244ff8b1f14313fc8151abbe2874a0c5c568
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Apr 1 20:21:55 2020 +0200
[BUILDROOT] Bump BR to 2019.02.10
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
.../target/device/armadeus/uClibc-ng-1.0.22.config | 1 +
...rab-bump-version-to-1.3.1-and-update-proj.patch | 61 ---------------
...package-libopenssl-bump-to-version-1.1.1f.patch | 42 ++++++++++
...-qt5base-fix-building-with-correct-optimi.patch | 91 ----------------------
...base-add-upstream-security-patch-for-LTS-.patch | 68 ----------------
patches/buildroot/2019.02/cleanup_buildroot.sh | 6 +-
7 files changed, 45 insertions(+), 226 deletions(-)
delete mode 100644 patches/buildroot/2019.02/220-package-fbgrab-bump-version-to-1.3.1-and-update-proj.patch
create mode 100644 patches/buildroot/2019.02/241-package-libopenssl-bump-to-version-1.1.1f.patch
delete mode 100644 patches/buildroot/2019.02/349-package-qt5-qt5base-fix-building-with-correct-optimi.patch
delete mode 100644 patches/buildroot/2019.02/350-package-qt5base-add-upstream-security-patch-for-LTS-.patch
diff --git a/Makefile b/Makefile
index e425c8438..e55281d16 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).9
+BUILDROOT_VERSION ?= $(BUILDROOT_MAJOR_VERSION).10
include ./Makefile.in
BUILDROOT_SITE:=https://buildroot.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_MAJOR_VERSION)
diff --git a/buildroot/target/device/armadeus/uClibc-ng-1.0.22.config b/buildroot/target/device/armadeus/uClibc-ng-1.0.22.config
index 91062e900..f85f304bd 100644
--- a/buildroot/target/device/armadeus/uClibc-ng-1.0.22.config
+++ b/buildroot/target/device/armadeus/uClibc-ng-1.0.22.config
@@ -22,6 +22,7 @@ UCLIBC_USE_NETLINK=y
UCLIBC_SUPPORT_AI_ADDRCONFIG=y
UCLIBC_HAS_RESOLVER_SUPPORT=y
UCLIBC_HAS_CTYPE_CHECKED=y
+UCLIBC_HAS_LIBINTL=y
UCLIBC_HAS_LOCALE=y
UCLIBC_HAS_XLOCALE=y
UCLIBC_HAS_HEXADECIMAL_FLOATS=y
diff --git a/patches/buildroot/2019.02/220-package-fbgrab-bump-version-to-1.3.1-and-update-proj.patch b/patches/buildroot/2019.02/220-package-fbgrab-bump-version-to-1.3.1-and-update-proj.patch
deleted file mode 100644
index bf35c4369..000000000
--- a/patches/buildroot/2019.02/220-package-fbgrab-bump-version-to-1.3.1-and-update-proj.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 7e87817d2c4168e857d1a2aa4cd6b21ed080a96f Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps....@gm...>
-Date: Wed, 4 Mar 2020 11:31:41 +0100
-Subject: [PATCH 1/1] package/fbgrab: bump version to 1.3.1 and update projct
- URL
-
-- bump version to 1.3.1
- Changelog:
- * Incorrect alpha value when converting 32-bit framebuffers.
- * Documentation for github instead of own homepage.
-
-- update project URL
-
-Fixes bug 12606 ([1]).
-
-[1] https://bugs.busybox.net/show_bug.cgi?id=12606
-
-Signed-off-by: Peter Seiderer <ps....@gm...>
-Tested-by: Timo Ketola <tim...@ex...>
-Acked-by: Timo Ketola <tim...@ex...>
-Signed-off-by: Yann E. MORIN <yan...@fr...>
----
- package/fbgrab/Config.in | 2 +-
- package/fbgrab/fbgrab.hash | 2 +-
- package/fbgrab/fbgrab.mk | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-Index: buildroot/package/fbgrab/Config.in
-===================================================================
---- buildroot.orig/package/fbgrab/Config.in
-+++ buildroot/package/fbgrab/Config.in
-@@ -5,4 +5,4 @@ config BR2_PACKAGE_FBGRAB
- FBGrab is a framebuffer screenshot program, capturing the
- linux frambuffer and converting it to a png-picture.
-
-- http://fbgrab.monells.se/
-+ https://github.com/GunnarMonell/fbgrab
-Index: buildroot/package/fbgrab/fbgrab.hash
-===================================================================
---- buildroot.orig/package/fbgrab/fbgrab.hash
-+++ buildroot/package/fbgrab/fbgrab.hash
-@@ -1,2 +1,3 @@
- # Locally calculated
--sha256 5fab478cbf8731fbacefaa76236a8f8b38ccff920c53b3a8253bc35509fba8ed fbgrab-1.3.tar.gz
-+sha256 3314a932f830e32feaf36914e1b43326529fe35b7eb7410ff55f16c930ddfbcb fbgrab-1.3.1.tar.gz
-+sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING
-Index: buildroot/package/fbgrab/fbgrab.mk
-===================================================================
---- buildroot.orig/package/fbgrab/fbgrab.mk
-+++ buildroot/package/fbgrab/fbgrab.mk
-@@ -4,8 +4,8 @@
- #
- ################################################################################
-
--FBGRAB_VERSION = 1.3
--FBGRAB_SITE = http://fbgrab.monells.se
-+FBGRAB_VERSION = 1.3.1
-+FBGRAB_SITE = $(call github,GunnarMonell,fbgrab,$(FBGRAB_VERSION))
- FBGRAB_DEPENDENCIES = libpng
- FBGRAB_LICENSE = GPL-2.0
- FBGRAB_LICENSE_FILES = COPYING
diff --git a/patches/buildroot/2019.02/241-package-libopenssl-bump-to-version-1.1.1f.patch b/patches/buildroot/2019.02/241-package-libopenssl-bump-to-version-1.1.1f.patch
new file mode 100644
index 000000000..ad66f60d6
--- /dev/null
+++ b/patches/buildroot/2019.02/241-package-libopenssl-bump-to-version-1.1.1f.patch
@@ -0,0 +1,42 @@
+From 674f709aacc32e4fa71c21878f0d2ee066ed80a7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 2 Apr 2020 11:56:54 +0200
+Subject: [PATCH 1/1] package/libopenssl: bump to version 1.1.1f
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/libopenssl/libopenssl.hash | 2 +-
+ package/libopenssl/libopenssl.mk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash
+index 1b239fbee7..3becd790ac 100644
+--- a/package/libopenssl/libopenssl.hash
++++ b/package/libopenssl/libopenssl.hash
+@@ -1,5 +1,5 @@
+ # From https://www.openssl.org/source/openssl-1.1.1d.tar.gz.sha256
+-sha256 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2 openssl-1.1.1d.tar.gz
++sha256 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 openssl-1.1.1f.tar.gz
+
+ # License files
+ sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE
+diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk
+index da4ae291c0..4639c63fac 100644
+--- a/package/libopenssl/libopenssl.mk
++++ b/package/libopenssl/libopenssl.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-LIBOPENSSL_VERSION = 1.1.1d
++LIBOPENSSL_VERSION = 1.1.1f
+ LIBOPENSSL_SITE = https://www.openssl.org/source
+ LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz
+ LIBOPENSSL_LICENSE = OpenSSL or SSLeay
+--
+2.24.1
+
diff --git a/patches/buildroot/2019.02/349-package-qt5-qt5base-fix-building-with-correct-optimi.patch b/patches/buildroot/2019.02/349-package-qt5-qt5base-fix-building-with-correct-optimi.patch
deleted file mode 100644
index bf6f2cf2f..000000000
--- a/patches/buildroot/2019.02/349-package-qt5-qt5base-fix-building-with-correct-optimi.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From c4a6f974b158a23bcab2f5e0e42971d0c15cc04b Mon Sep 17 00:00:00 2001
-From: Giulio Benetti <giu...@be...>
-Date: Mon, 25 Nov 2019 12:26:14 +0100
-Subject: [PATCH 349/352] package/qt5/qt5base: fix building with correct
- optimization
-
-Qt5 has predefined optimization flags depending if you're building for
-size, for debug etc. These flags are defined in
-mkspecs/common/gcc-base.conf:
-
-QMAKE_CFLAGS_OPTIMIZE = -O2
-QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
-QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
-QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
-
-Then, in the same file, they use them to set
-QMAKE_CFLAGS_RELEASE/QMAKE_CXXFLAGS_RELEASE:
-
-QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE
-QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
-
-At this point there is our chance to override QMAKE_CFLAGS_OPTIMIZE_* in
-qmake.conf, but it's too late, because QMAKE_CFLAGS_RELEASE is already
-set (i.e. -O2) so trying to add or remove QMAKE_CFLAGS_OPTIMIZE (that is
-reset now on) from QMAKE_CLAGS_RELEASE in
-common/features/default_post.prf won't work:
-
-optimize_size {
- !isEmpty(QMAKE_CFLAGS_OPTIMIZE):!isEmpty(QMAKE_CFLAGS_OPTIMIZE_SIZE) {
- QMAKE_CFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE
- QMAKE_CXXFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE
- QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE_SIZE
- QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE_SIZE
- }
-} else: optimize_full {
- !isEmpty(QMAKE_CFLAGS_OPTIMIZE):!isEmpty(QMAKE_CFLAGS_OPTIMIZE_FULL) {
- QMAKE_CFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE
- QMAKE_CXXFLAGS_RELEASE -= $$QMAKE_CFLAGS_OPTIMIZE
- QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE_FULL
- QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE_FULL
- }
-}
-
-So let's reset:
-QMAKE_CFLAGS_RELEASE
-QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG
-in our qmake.conf since the only assignment done in
-mkspecs/common/gcc-base.conf only regards optimization.
-
-This package is also affected by BR2_TOOLCHAIN_HAS_GCC_BUG_90620 and
-it's been worked around by appending -O0 to CFLAGS/CXXFLAGS. This bug
-prevented workaround to work overriding optimization flags, so solving
-this also solves workaround problem.
-
-Fixes:
-http://autobuild.buildroot.net/results/ada/adaa9b4bcc6f9d2b5e82c479859a07e8abf5cf13/
-http://autobuild.buildroot.net/results/a83/a83bdd1f3bf309c07abebe871b017c331ed36e67/
-
-Signed-off-by: Giulio Benetti <giu...@be...>
-Tested-by: Fabrice Fontaine <fon...@gm...>
-[Arnout: add a comment to qmake.conf.in]
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...>
----
- package/qt5/qt5base/qmake.conf.in | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/package/qt5/qt5base/qmake.conf.in b/package/qt5/qt5base/qmake.conf.in
-index 2eb564e172..024c074928 100644
---- a/package/qt5/qt5base/qmake.conf.in
-+++ b/package/qt5/qt5base/qmake.conf.in
-@@ -15,10 +15,15 @@ QMAKE_CXX = $${CROSS_COMPILE}g++
- # modifications to gcc-base.conf
- QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS}
- QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS}
-+# Remove all optimisation flags, we really only want our own.
- QMAKE_CFLAGS_OPTIMIZE =
- QMAKE_CFLAGS_OPTIMIZE_DEBUG =
- QMAKE_CFLAGS_OPTIMIZE_FULL =
- QMAKE_CFLAGS_OPTIMIZE_SIZE =
-+QMAKE_CFLAGS_DEBUG =
-+QMAKE_CXXFLAGS_DEBUG =
-+QMAKE_CFLAGS_RELEASE =
-+QMAKE_CXXFLAGS_RELEASE =
- CONFIG += nostrip
-
- QMAKE_LIBS += -lrt -lpthread -ldl
---
-2.24.1
-
diff --git a/patches/buildroot/2019.02/350-package-qt5base-add-upstream-security-patch-for-LTS-.patch b/patches/buildroot/2019.02/350-package-qt5base-add-upstream-security-patch-for-LTS-.patch
deleted file mode 100644
index 4402127ec..000000000
--- a/patches/buildroot/2019.02/350-package-qt5base-add-upstream-security-patch-for-LTS-.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From c0607b38c862a6bd556d6f8c1a7d503bab9ede75 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps....@gm...>
-Date: Thu, 30 Jan 2020 22:13:34 +0100
-Subject: [PATCH 350/352] package/qt5base: add upstream security patch for LTS
- variant
-
-Fixed the following security issue:
-
-- CVE-2020-0569: QPluginLoader in Qt versions 5.0.0 through 5.13.2 would
- search for certain plugins first on the current working directory of the
- application, which allows an attacker that can place files in the file
- system and influence the working directory of Qt-based applications to
- load and execute malicious code. This issue was verified on macOS and
- Linux and probably affects all other Unix operating systems. This issue
- does not affect Windows.
-
-For details, see the advisory:
-https://www.openwall.com/lists/oss-security/2020/01/30/1
-
-Signed-off-by: Peter Seiderer <ps....@gm...>
-[Peter: extend commit message]
-Signed-off-by: Peter Korsgaard <pe...@ko...>
----
- ...0005-Do-not-load-plugin-from-the-PWD.patch | 32 +++++++++++++++++++
- 1 file changed, 32 insertions(+)
- create mode 100644 package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch
-
-diff --git a/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch b/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch
-new file mode 100644
-index 0000000000..4acd42f005
---- /dev/null
-+++ b/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch
-@@ -0,0 +1,32 @@
-+From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001
-+From: Olivier Goffart <ogo...@wo...>
-+Date: Fri, 8 Nov 2019 11:30:40 +0100
-+Subject: [PATCH] Do not load plugin from the $PWD
-+
-+I see no reason why this would make sense to look for plugins in the current
-+directory. And when there are plugins there, it may actually be wrong
-+
-+Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5
-+Reviewed-by: Thiago Macieira <thi...@in...>
-+
-+Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bf131e8d2181b3404f5293546ed390999f760404
-+Signed-off-by: Peter Seiderer <ps....@gm...>
-+---
-+ src/corelib/plugin/qpluginloader.cpp | 1 -
-+ 1 file changed, 1 deletion(-)
-+
-+diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
-+index cadff4f32b..c2443dbdda 100644
-+--- a/src/corelib/plugin/qpluginloader.cpp
-++++ b/src/corelib/plugin/qpluginloader.cpp
-+@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName)
-+ paths.append(fileName.left(slash)); // don't include the '/'
-+ } else {
-+ paths = QCoreApplication::libraryPaths();
-+- paths.prepend(QStringLiteral(".")); // search in current dir first
-+ }
-+
-+ for (const QString &path : qAsConst(paths)) {
-+--
-+2.25.0
-+
---
-2.24.1
-
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index 3c577d0bc..8b8bc7c6d 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -41,9 +41,6 @@ rm -rf buildroot/package/e-uae/e-uae.mk
rm -rf buildroot/package/expect/expect.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
rm -rf buildroot/package/fbgrab/0002-fix-1.3-version.patch
-rm -rf buildroot/package/fbgrab/Config.in
-rm -rf buildroot/package/fbgrab/fbgrab.hash
-rm -rf buildroot/package/fbgrab/fbgrab.mk
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
@@ -66,6 +63,7 @@ rm -rf buildroot/package/imx-test/imx-test.mk
rm -rf buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
rm -rf buildroot/package/leptonmodule/Config.in
rm -rf buildroot/package/leptonmodule/leptonmodule.mk
+rm -rf buildroot/package/libopenssl/libopenssl.hash
rm -rf buildroot/package/libopenssl/libopenssl.mk
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
@@ -128,9 +126,7 @@ rm -rf buildroot/package/qt5/qt5base/5.12.5/qt5base.hash
rm -rf buildroot/package/qt5/qt5base/5.12.7/0001-qtbase-Fix-build-error-when-using-EGL.patch
rm -rf buildroot/package/qt5/qt5base/5.12.7/0002-double-conversion-enable-for-microblaze.patch
rm -rf buildroot/package/qt5/qt5base/5.12.7/qt5base.hash
-rm -rf buildroot/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch
rm -rf buildroot/package/qt5/qt5base/Config.in
-rm -rf buildroot/package/qt5/qt5base/qmake.conf.in
rm -rf buildroot/package/qt5/qt5base/qt.conf.in
rm -rf buildroot/package/qt5/qt5base/qt5base.mk
rm -rf buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash
hooks/post-receive
--
armadeus
|