From ec425b5970ca429bf46e8c646538fea9b44238a1 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 12 Sep 2022 19:00:55 +0000
Subject: Mon Sep 12 19:00:55 UTC 2022

a/kernel-firmware-20220912_4c004d8-noarch-1.txz:  Upgraded.
e/emacs-28.2-x86_64-1.txz:  Upgraded.
kde/kjots-20220731_6e48fca-x86_64-1.txz:  Upgraded.
  Upgraded to fix FTBFS. Thanks to marav.
l/grantlee-5.3.0-x86_64-1.txz:  Upgraded.
l/imagemagick-7.1.0_48-x86_64-1.txz:  Upgraded.
n/stunnel-5.66-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
  Switched from pcre to pcre2 for GNU grep. Thanks to EdGr.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
  Switched from pcre to pcre2 for GNU grep. Thanks to EdGr.
---
 source/installer/ChangeLog.txt      | 4 ++++
 source/installer/build_installer.sh | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'source/installer')

diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 4142dae5..30b51134 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Mon Sep 12 18:09:41 UTC 2022
+  Removed pcre, added pcre2. Needed for GNU grep.
+  Thanks to EdGr.
++--------------------------+
 Tue Sep  6 18:34:42 UTC 2022
   rc.pcmcia: change fgrep to grep -F.
   /sbin/probe: change egrep to grep -E.
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 44d613cf..8ba9ff77 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -974,7 +974,7 @@ l/libusb \
 l/lz4 \
 l/lzo \
 l/parted \
-l/pcre \
+l/pcre2 \
 l/popt \
 l/readline \
 l/zlib \
@@ -1296,7 +1296,6 @@ cp  -fa${VERBOSE1} \
         libmount.so* \
         libnsl.so* \
         libpam*.so* \
-        libpcre.so* \
         libpopt*.so* \
         libsmartcols.so* \
         libssl*so* \
@@ -1322,6 +1321,7 @@ cp  -fa${VERBOSE1} \
         liblz4.so* \
         liblzo*.so* \
         libparted*so* \
+        libpcre2-8.so* \
         libreadline*.so* \
         libstdc++*.so* \
         libunistring*.so* \
-- 
cgit v1.2.3