* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 05a1fe1362b633b82b696a88801bb29fb1070872
@ 2022-05-05 14:20 Peter Müller
0 siblings, 0 replies; only message in thread
From: Peter Müller @ 2022-05-05 14:20 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 9034 bytes --]
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 "IPFire 2.x development tree".
The branch, next has been updated
via 05a1fe1362b633b82b696a88801bb29fb1070872 (commit)
via ce386d20ab8c5eea847038fb83dc8396bbbe2c04 (commit)
via a694737a131fccbc791ab70693a0da8b1c5d550b (commit)
via d97295c680de05d7528471077115a46f3a48f600 (commit)
via c22d834ca84af6155eab7020c6b031e1e8c7e764 (commit)
via 1bd22b04242bfc3a77a151e74d0f1428e0d1f0fe (commit)
via 3baefafee476f8f18ae36b6f8c59a70f399e0396 (commit)
via 66ff5ffec85347f36abb7c173c66e8f9a23371b6 (commit)
via 5bfdb4e5398d697bc7dfafd4c91ef38c4b610d68 (commit)
via 24c8e6a6df46745963afd1f9f67fca0350f477c6 (commit)
via e1aca5fdc11cd6f9dfc132eac12b2f19900db37d (commit)
via afd5f13c899e972afe9a8fae0cf9ba919a6aad32 (commit)
via 8f696f60e2d101bcded6592185d5be49cb6c19ad (commit)
from 98b761a5576204b9cd0c8a441f2eeb4d530cadd6 (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 05a1fe1362b633b82b696a88801bb29fb1070872
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed May 4 13:14:29 2022 +0200
boost: Fix rootfile entries that referred to python3.8 instead of 3.10
- In Jan 2022 I updated python from 3.8 to 3.10 but I missed that boost had rootfile
entries with python38 in it.
- Running a build just now for another package it got flagged up that the rootfile for
boost had been changed and the logfile now had the entries with python310 instead of
python38
- Not clear why it only flagged this up now but this patch is to correct that error
- Running find-dependencies on both the pyton38 and python310 versions of the libraries
flagged nothing as being linked to either, so probably lucky with this being missed
first time around.
- Boost will need to be shipped with a Core Update
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit ce386d20ab8c5eea847038fb83dc8396bbbe2c04
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu May 5 14:18:46 2022 +0000
Core Update 168: Ship OpenSSL
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit a694737a131fccbc791ab70693a0da8b1c5d550b
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed May 4 12:59:48 2022 +0200
openssl: Update to version 1.1.1o
- Update from version 1.1.1n to 1.1.1o
- Update of rootfile not required
- This patch is to go into CU168 as this update is for fixing a moderate severity CVE
- Changelog
1.1.1o [3 May 2022]
(CVE-2022-1292)
Fixed a bug in the c_rehash script which was not properly sanitising shell
metacharacters to prevent command injection. This script is distributed by
some operating systems in a manner where it is automatically executed. On
such operating systems, an attacker could execute arbitrary commands with the
privileges of the script.
Use of the c_rehash script is considered obsolete and should be replaced
by the OpenSSL rehash command line tool.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
commit d97295c680de05d7528471077115a46f3a48f600
Merge: 98b761a55 c22d834ca
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu May 5 14:18:13 2022 +0000
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aarch64/boost | 8 ++++----
config/rootfiles/common/armv6l/boost | 8 ++++----
config/rootfiles/common/x86_64/boost | 8 ++++----
config/rootfiles/{oldcore/100 => core/168}/filelists/openssl | 0
config/rootfiles/oldcore/167/update.sh | 10 ++++++++++
lfs/openssl | 4 ++--
6 files changed, 24 insertions(+), 14 deletions(-)
copy config/rootfiles/{oldcore/100 => core/168}/filelists/openssl (100%)
Difference in files:
diff --git a/config/rootfiles/common/aarch64/boost b/config/rootfiles/common/aarch64/boost
index 49ff120ab..015dc1458 100644
--- a/config/rootfiles/common/aarch64/boost
+++ b/config/rootfiles/common/aarch64/boost
@@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-a64.so.1.76.0
usr/lib/libboost_prg_exec_monitor-mt-a64.so.1.76.0
#usr/lib/libboost_prg_exec_monitor-a64.so
usr/lib/libboost_prg_exec_monitor-a64.so.1.76.0
-#usr/lib/libboost_python38-mt-a64.so
-usr/lib/libboost_python38-mt-a64.so.1.76.0
-#usr/lib/libboost_python38-a64.so
-usr/lib/libboost_python38-a64.so.1.76.0
+#usr/lib/libboost_python310-mt-a64.so
+usr/lib/libboost_python310-mt-a64.so.1.76.0
+#usr/lib/libboost_python310-a64.so
+usr/lib/libboost_python310-a64.so.1.76.0
#usr/lib/libboost_random-mt-a64.so
usr/lib/libboost_random-mt-a64.so.1.76.0
#usr/lib/libboost_random-a64.so
diff --git a/config/rootfiles/common/armv6l/boost b/config/rootfiles/common/armv6l/boost
index 80cc4063a..79e9ed3d7 100644
--- a/config/rootfiles/common/armv6l/boost
+++ b/config/rootfiles/common/armv6l/boost
@@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-mt-a32.so.1.76.0
usr/lib/libboost_prg_exec_monitor-a32.so.1.76.0
#usr/lib/libboost_prg_exec_monitor-mt-a32.so
usr/lib/libboost_prg_exec_monitor-mt-a32.so.1.76.0
-#usr/lib/libboost_python38-a32.so
-usr/lib/libboost_python38-a32.so.1.76.0
-#usr/lib/libboost_python38-mt-a32.so
-usr/lib/libboost_python38-mt-a32.so.1.76.0
+#usr/lib/libboost_python310-a32.so
+usr/lib/libboost_python310-a32.so.1.76.0
+#usr/lib/libboost_python310-mt-a32.so
+usr/lib/libboost_python310-mt-a32.so.1.76.0
#usr/lib/libboost_random-a32.so
usr/lib/libboost_random-a32.so.1.76.0
#usr/lib/libboost_random-mt-a32.so
diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost
index 357dc2d1d..77eef1d0b 100644
--- a/config/rootfiles/common/x86_64/boost
+++ b/config/rootfiles/common/x86_64/boost
@@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-x64.so.1.76.0
usr/lib/libboost_prg_exec_monitor-mt-x64.so.1.76.0
#usr/lib/libboost_prg_exec_monitor-x64.so
usr/lib/libboost_prg_exec_monitor-x64.so.1.76.0
-#usr/lib/libboost_python38-mt-x64.so
-usr/lib/libboost_python38-mt-x64.so.1.76.0
-#usr/lib/libboost_python38-x64.so
-usr/lib/libboost_python38-x64.so.1.76.0
+#usr/lib/libboost_python310-mt-x64.so
+usr/lib/libboost_python310-mt-x64.so.1.76.0
+#usr/lib/libboost_python310-x64.so
+usr/lib/libboost_python310-x64.so.1.76.0
#usr/lib/libboost_random-mt-x64.so
usr/lib/libboost_random-mt-x64.so.1.76.0
#usr/lib/libboost_random-x64.so
diff --git a/config/rootfiles/core/168/filelists/openssl b/config/rootfiles/core/168/filelists/openssl
new file mode 120000
index 000000000..e011a9266
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/167/update.sh b/config/rootfiles/oldcore/167/update.sh
index 399978bcc..f447a924b 100644
--- a/config/rootfiles/oldcore/167/update.sh
+++ b/config/rootfiles/oldcore/167/update.sh
@@ -385,6 +385,16 @@ hardlink -c -vv /lib/firmware
# Regenerate all initrds
dracut --regenerate-all --force
+case "$(uname -m)" in
+ armv*)
+ mkimage -A arm -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
+ rm /boot/initramfs-${KVER}-ipfire.img
+ ;;
+ aarch64)
+ mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
+ # dont remove initramfs because grub need this to boot.
+ ;;
+esac
# Replace /etc/mtab by symlink as mount no longer writes it
rm -vf /etc/mtab
diff --git a/lfs/openssl b/lfs/openssl
index 2aa0aeb86..a1328fcd0 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
include Config
-VER = 1.1.1n
+VER = 1.1.1o
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -74,7 +74,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = af530258d9f7ca4f1bd1c6c344eb385e766e465c9341dd08797676165f67bbb82d3fd549ed7559dc12fb8c9c4db5e04fa6ec7ab729ec1467f5e8bce469ff5398
+$(DL_FILE)_BLAKE2 = 5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-05 14:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-05 14:20 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 05a1fe1362b633b82b696a88801bb29fb1070872 Peter Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox