[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-182-ge55e306b5
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-182-ge55e306b5
|
From: Sébastien S. <ss...@us...> - 2020-04-14 08:21:12
|
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 e55e306b53d1f7487d484856492ee3aa94157c98 (commit)
from e6bf35d9bac569a6cb242f5f447c254530434c7e (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 e55e306b53d1f7487d484856492ee3aa94157c98
Author: Gildas PRIME <gil...@bi...>
Date: Tue Apr 14 09:29:28 2020 +0200
[BUILDROOT] Bump BR to 2019.02.11
Signed-off-by: Gildas PRIME <gil...@bi...>
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
.../221-package-ntp-bump-to-version-4.2.8p14.patch | 54 ----------------------
...package-libopenssl-bump-to-version-1.1.1f.patch | 42 -----------------
patches/buildroot/2019.02/cleanup_buildroot.sh | 3 --
4 files changed, 1 insertion(+), 100 deletions(-)
delete mode 100644 patches/buildroot/2019.02/221-package-ntp-bump-to-version-4.2.8p14.patch
delete mode 100644 patches/buildroot/2019.02/241-package-libopenssl-bump-to-version-1.1.1f.patch
diff --git a/Makefile b/Makefile
index e55281d16..608df4bfa 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).10
+BUILDROOT_VERSION ?= $(BUILDROOT_MAJOR_VERSION).11
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/221-package-ntp-bump-to-version-4.2.8p14.patch b/patches/buildroot/2019.02/221-package-ntp-bump-to-version-4.2.8p14.patch
deleted file mode 100644
index e00515fdb..000000000
--- a/patches/buildroot/2019.02/221-package-ntp-bump-to-version-4.2.8p14.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 82a9d45c8679dfb0cec7c5e28ece158b1bd7e1ae Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Mon, 30 Mar 2020 13:12:34 +0200
-Subject: [PATCH 1/1] package/ntp: bump to version 4.2.8p14
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-"This release fixes three security issues in ntpd and provides 46
-bugfixes and addresses 4 other issues." [1]
-
-[1] http://support.ntp.org/bin/view/Main/SecurityNotice#March_2020_ntp_4_2_8p14_NTP_Rele
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
-
-It also seems that the ntp-4.2.8p13.tar.gz file has changed and thus the
-hashes are wrong.
-
- package/ntp/ntp.hash | 8 ++++----
- package/ntp/ntp.mk | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash
-index 4014936e61..f6f4d2221c 100644
---- a/package/ntp/ntp.hash
-+++ b/package/ntp/ntp.hash
-@@ -1,5 +1,5 @@
--# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p13.tar.gz.md5
--md5 ea040ab9b4ca656b5229b89d6b822f13 ntp-4.2.8p13.tar.gz
-+# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p14.tar.gz.md5
-+md5 783edaf1d68ddf651bde64eda54a579d ntp-4.2.8p14.tar.gz
- # Calculated based on the hash above
--sha256 288772cecfcd9a53694ffab108d1825a31ba77f3a8466b0401baeca3bc232a38 ntp-4.2.8p13.tar.gz
--sha256 3828da5fc8126889d6a64432288ace08526c490bf5427d799931689069968d91 COPYRIGHT
-+sha256 1960e4f081f6aafd108d721bc3ab15f9e8dfd08dc08339aa95bca9d2545e4eb7 ntp-4.2.8p14.tar.gz
-+sha256 957e6a13445cc61ab1ca3dc80d8c269cf9b0a6d9eaec20f9f39639b0b3e66ee8 COPYRIGHT
-diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
-index 4cede8b154..3af3e01a52 100644
---- a/package/ntp/ntp.mk
-+++ b/package/ntp/ntp.mk
-@@ -5,7 +5,7 @@
- ################################################################################
-
- NTP_VERSION_MAJOR = 4.2
--NTP_VERSION = $(NTP_VERSION_MAJOR).8p13
-+NTP_VERSION = $(NTP_VERSION_MAJOR).8p14
- NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR)
- NTP_DEPENDENCIES = host-pkgconf libevent
- NTP_LICENSE = NTP
---
-2.24.1
-
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
deleted file mode 100644
index ad66f60d6..000000000
--- a/patches/buildroot/2019.02/241-package-libopenssl-bump-to-version-1.1.1f.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index 8b8bc7c6d..22d7788d2 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -63,7 +63,6 @@ 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
@@ -76,8 +75,6 @@ rm -rf buildroot/package/marble/marble.mk
rm -rf buildroot/package/matiec/Config.in
rm -rf buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch
rm -rf buildroot/package/matiec/matiec.mk
-rm -rf buildroot/package/ntp/ntp.hash
-rm -rf buildroot/package/ntp/ntp.mk
rm -rf buildroot/package/pci_debug/Config.in
rm -rf buildroot/package/pci_debug/pci_debug.hash
rm -rf buildroot/package/pci_debug/pci_debug.mk
hooks/post-receive
--
armadeus
|