From 54efc574732f81aa298dd8ea253200222d32f1b2 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 16 Jan 2022 21:33:27 +0000
Subject: Sun Jan 16 21:33:27 UTC 2022

a/aaa_libraries-15.0-x86_64-14.txz:  Rebuilt.
  Upgraded: libexpat.so.1.8.3.
a/kernel-generic-5.15.15-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.15.15-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.15.15-x86_64-1.txz:  Upgraded.
ap/cups-filters-1.28.11-x86_64-1.txz:  Upgraded.
ap/ksh93-1.0_20220114_e569f23e-x86_64-1.txz:  Upgraded.
ap/vim-8.2.4115-x86_64-1.txz:  Upgraded.
d/gdb-11.2-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.15.15-x86-1.txz:  Upgraded.
k/kernel-source-5.15.15-noarch-1.txz:  Upgraded.
kde/kwayland-server-5.23.5-x86_64-2.txz:  Rebuilt.
  Applied upstream patch:
  [PATCH] Store surface object in tablet cursor using QPointer.
  Thanks to ZhaoLin1457.
l/expat-2.4.3-x86_64-1.txz:  Upgraded.
  Fix issues with left shifts by >=29 places resulting in:
    a) realloc acting as free
    b) realloc allocating too few bytes
    c) undefined behavior
  Fix integer overflow on variable m_groupSize in function doProlog leading
  to realloc acting as free. Impact is denial of service or other undefined
  behavior.
  Prevent integer overflows near memory allocation at multiple places.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-45960
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-46143
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22822
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22823
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22824
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22825
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22826
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22827
  (* Security fix *)
l/libunwind-1.6.2-x86_64-1.txz:  Upgraded.
x/xterm-370-x86_64-3.txz:  Rebuilt.
  Ship a sample XTerm.linux.console app-defaults file. Thanks to GazL.
xap/vim-gvim-8.2.4115-x86_64-1.txz:  Upgraded.
xap/xsnow-3.4.3-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/installer/ChangeLog.txt      | 4 ++++
 source/installer/build_installer.sh | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'source/installer')

diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index b2251ed9a..d2e7a8730 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Sun Jan 16 20:51:35 UTC 2022
+  Fix installation of the exfat kernel module(s).
+  Thanks to Nille_kungen.
++--------------------------+
 Wed Jan 12 19:45:11 UTC 2022
   Added "nvme" command-line utility. Thanks to peake.
 +--------------------------+
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 82b0f776f..c46d0bb1d 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -1533,7 +1533,7 @@ for ind in $(seq 0 $((${#KERNELS[*]} -1)) ); do
            cp -a fs.orig/{udf*,isofs*,cifs*,ext*,fat*,fscache,jfs*,lockd,nfs,nfs_common,jbd*,nls,reiserfs,xfs,binfmt*,mbcache*,exportfs*} fs/
          ;;
          *86*)
-           cp -a fs.orig/{cifs*,fscache,lockd,nfs,nfs_common,ntfs3} fs/
+           cp -a fs.orig/{cifs*,exfat,fscache,lockd,nfs,nfs_common,ntfs3} fs/
          ;;
          *)
            cp -a fs.orig/cifs* fs/
@@ -1593,9 +1593,10 @@ for ind in $(seq 0 $((${#KERNELS[*]} -1)) ); do
     # Done with block directory
     # Grab a few modules from staging:
     mv staging staging.orig
-    mv staging.orig/hv staging
-    mv staging.orig/exfat staging
-    mv staging.orig/speakup staging
+    # These all seem to have been merged...
+    #mv staging.orig/hv staging
+    #mv staging.orig/exfat staging
+    #mv staging.orig/speakup staging
     rm -rf${VERBOSE1} staging.orig
     # Save the Hyper-V keyboard module:
     mkdir -p input.orig/serio
-- 
cgit v1.2.3-65-gdbad