From af4fda568788c131ce0a660dc40f621e2bbec3e1 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 29 Jul 2019 23:17:22 +0000
Subject: Mon Jul 29 23:17:22 UTC 2019

a/aaa_elflibs-15.0-x86_64-10.txz:  Rebuilt.
  Upgraded: libglib-2.0.so.0.6000.6, libgmodule-2.0.so.0.6000.6,
  libgobject-2.0.so.0.6000.6, libgthread-2.0.so.0.6000.6,
  liblber-2.4.so.2.10.11, libldap-2.4.so.2.10.11.
  Added: libargon2.so.1, libjson-c.so.4.0.0.
a/cryptsetup-2.1.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
  Thanks to Robby Workman.
a/efibootmgr-20190528_d9eb7f1-x86_64-1.txz:  Upgraded.
  Even though efibootmgr-17 will compile against efivar from git, it's probably
  best to take this from git as well to keep things closely synced.
a/efivar-20190618_272b216-x86_64-1.txz:  Upgraded.
  Switch to git to fix "efibootmgr -v" failing with a parse error.
a/elilo-3.16-x86_64-10.txz:  Rebuilt.
  eliloconfig: If /boot/initrd.gz exists, install the generic kernel and initrd.
  Otherwise, install the huge kernel.
a/lvm2-2.03.05-x86_64-1.txz:  Upgraded.
  Back to lvm2-2.03.x (cryptsetup needs it). Hopefully there's been enough time
  for most of the bugs to have been ironed out.
l/argon2-20190702-x86_64-3.txz:  Rebuilt.
  Fix shared library permissions.
l/aspell-0.60.7-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.10_57-x86_64-1.txz:  Upgraded.
l/python-docutils-0.15.1-x86_64-1.txz:  Upgraded.
n/ipset-7.3-x86_64-1.txz:  Upgraded.
xap/geeqie-1.5-x86_64-1.txz:  Upgraded.
xfce/garcon-0.6.4-x86_64-1.txz:  Upgraded.
xfce/thunar-volman-0.9.4-x86_64-1.txz:  Upgraded.
xfce/tumbler-0.2.6-x86_64-1.txz:  Upgraded.
---
 source/installer/ChangeLog.txt      | 3 +++
 source/installer/build_installer.sh | 4 ++++
 2 files changed, 7 insertions(+)

(limited to 'source/installer')

diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index c3a78b07a..f92f51122 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,6 @@
+Mon Jul 29 21:51:59 UTC 2019
+  Include libraries from the argon2 and json-c packages, needed by cryptsetup.
++--------------------------+
 Fri Jul 12 18:42:02 UTC 2019
   build-installer.sh: Add cqhci.ko kernel module.
   Thanks to Pomme Raccoon.
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index dcdc20382..f0f8ef836 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -833,7 +833,9 @@ ap/lsscsi \
 ap/terminus-font \
 d/gcc \
 d/gcc-g++ \
+l/argon2 \
 l/glibc \
+l/json-c \
 l/libaio \
 l/libcap \
 l/libidn2 \
@@ -1125,11 +1127,13 @@ cp  -fa${VERBOSE1} \
 # Deal with /usr/lib stuff from the packages:
 cd $TMP/extract-packages/usr/lib${LIBDIRSUFFIX}
 cp  -fa${VERBOSE1} \
+        libargon2.so* \
         libefiboot.so* \
         libefivar.so* \
         libgcc*.so* \
         libhistory*.so* \
         libidn2*.so* \
+        libjson-c.so* \
         liblz.so* \
         liblzo*.so* \
         libparted*so* \
-- 
cgit v1.2.3