From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. dfbbc534beed7853f027005eb3e5eac7678c3346 Date: Fri, 16 Jun 2023 09:24:26 +0000 Message-ID: <4QjDJB4NRTz2xdB@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8450101898935190587==" List-Id: --===============8450101898935190587== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 dfbbc534beed7853f027005eb3e5eac7678c3346 (commit) via 0746122a1609805e49c97934a06279746722d2cb (commit) via a71450b6fabb942bf9f22ad47899a444ef26f857 (commit) via 6f22b0ac4d083d6f2557ff03364feb9355fc6624 (commit) from a06f2fa02e66d247fc271ac639c64eabb8e9d514 (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 dfbbc534beed7853f027005eb3e5eac7678c3346 Author: Michael Tremer Date: Fri Jun 16 09:23:46 2023 +0000 core176: Ship vpnmain.cgi =20 Signed-off-by: Michael Tremer commit 0746122a1609805e49c97934a06279746722d2cb Author: Adolf Belka Date: Thu Jun 15 21:55:01 2023 +0200 vpnmain.cgi: unique_subject =3D yes in index.txt.attr for first attempt w= ith fresh install =20 - The patches for Bug#13138 https://patchwork.ipfire.org/project/ipfire/patch/20230603140541.13834= -1-adolf.belka(a)ipfire.org/ https://patchwork.ipfire.org/project/ipfire/patch/20230606104050.8290-= 1-adolf.belka(a)ipfire.org/ work for an update to Core Update 175 but a fresh install of CU175 wil= l still fail with the error when creating the root/host certificate set for the first ti= me. - This patch ensures that the unique_subject =3D yes line is addeed to in= dex.txt.attr when the root/host certificate set is attempted to be created or is up= loaded also for the first attempt. =20 Tested-by: Adolf Belka Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer commit a71450b6fabb942bf9f22ad47899a444ef26f857 Author: Michael Tremer Date: Fri Jun 16 09:22:17 2023 +0000 core176: Ship intel-microcode and regenerate all initramdisks =20 Signed-off-by: Michael Tremer commit 6f22b0ac4d083d6f2557ff03364feb9355fc6624 Author: Adolf Belka Date: Thu Jun 15 15:31:09 2023 +0200 intel-microcode: Update to version 20230613 =20 - Updated from version 20230214 to 20230512-rev2 where the source tarball= is named version 20230613 - Update of rootfile - Changelog details for versions 20230512 and 20230512-rev2 can be found = at https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/re= leases =20 Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/x86_64/intel-microcode | 1 + config/rootfiles/core/176/filelists/files | 1 + .../{oldcore/121 =3D> core/176}/filelists/x86_64/intel-microcode | 0 config/rootfiles/core/176/update.sh | 10 ++++++++= ++ html/cgi-bin/vpnmain.cgi | 2 ++ lfs/intel-microcode | 4 ++-- 6 files changed, 16 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/121 =3D> core/176}/filelists/x86_64/intel-mic= rocode (100%) Difference in files: diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfile= s/common/x86_64/intel-microcode index 2d4f8f8c3..7f9632973 100644 --- a/config/rootfiles/common/x86_64/intel-microcode +++ b/config/rootfiles/common/x86_64/intel-microcode @@ -120,6 +120,7 @@ lib/firmware/intel-ucode/06-a7-01 lib/firmware/intel-ucode/06-b7-01 lib/firmware/intel-ucode/06-ba-02 lib/firmware/intel-ucode/06-ba-03 +lib/firmware/intel-ucode/06-be-00 lib/firmware/intel-ucode/06-bf-02 lib/firmware/intel-ucode/06-bf-05 lib/firmware/intel-ucode/0f-00-07 diff --git a/config/rootfiles/core/176/filelists/files b/config/rootfiles/cor= e/176/filelists/files index 19b446979..98f2343f5 100644 --- a/config/rootfiles/core/176/filelists/files +++ b/config/rootfiles/core/176/filelists/files @@ -1,2 +1,3 @@ etc/rc.d/init.d/partresize srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/config/rootfiles/core/176/filelists/x86_64/intel-microcode b/con= fig/rootfiles/core/176/filelists/x86_64/intel-microcode new file mode 120000 index 000000000..d5ac074e2 --- /dev/null +++ b/config/rootfiles/core/176/filelists/x86_64/intel-microcode @@ -0,0 +1 @@ +../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/176/update.sh b/config/rootfiles/core/176/= update.sh index 250be35df..3b64202f6 100644 --- a/config/rootfiles/core/176/update.sh +++ b/config/rootfiles/core/176/update.sh @@ -51,6 +51,16 @@ ldconfig =20 # Start services =20 +# Rebuild initial ramdisk to apply microcode updates +dracut --regenerate-all --force +KVER=3D"xxxKVERxxx" +case "$(uname -m)" in + 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 + # This update needs a reboot... touch /var/run/need_reboot =20 diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index f2aeecdf9..63f875c6a 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -870,6 +870,8 @@ END } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'generate root/host certificates'= } || $cgiparams{'ACTION'} eq $Lang::tr{'upload p12 file'}) { =20 + &newcleanssldatabase(); + if (-f "${General::swroot}/ca/cacert.pem") { $errormessage =3D $Lang::tr{'valid root certificate already exists'}; goto ROOTCERT_SKIP; diff --git a/lfs/intel-microcode b/lfs/intel-microcode index fb7be5fe4..37cf9589c 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 20230214 +VER =3D 20230613 =20 THISAPP =3D Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_BLAKE2 =3D d98d054a8cfd66e3d0549d1e8f4a4745cad342d45f36a82d2f2f51= fedc29635125fdad95ee4970069e134facc1ab3092b97837c6f8744ffedf220a5d3d022dd5 +$(DL_FILE)_BLAKE2 =3D 56bffb26687fd3a20b79b4540ae10c98b2875e3edb84583b679ddc= 75e339193db4bddece25c7e5cb26b79f5e6ce2d10fcc318c55e13c05d8611198e4c571354b =20 install : $(TARGET) =20 hooks/post-receive -- IPFire 2.x development tree --===============8450101898935190587==--