summaryrefslogtreecommitdiff
path: root/source/a
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-07-29 23:17:22 +0000
committerEric Hameleers <alien@slackware.com>2019-07-30 08:59:48 +0200
commitaf4fda568788c131ce0a660dc40f621e2bbec3e1 (patch)
treeb16fee5c2b9d93c898f85f11206dc3a68da5390c /source/a
parent110278b262dbdbd27af3dc1e21c4e072462208c4 (diff)
downloadcurrent-af4fda568788c131ce0a660dc40f621e2bbec3e1.tar.gz
Mon Jul 29 23:17:22 UTC 201920190729231722
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.
Diffstat (limited to 'source/a')
-rwxr-xr-xsource/a/aaa_elflibs/aaa_elflibs.SlackBuild2
-rw-r--r--source/a/aaa_elflibs/symlinks-to-tracked-libs1
-rw-r--r--source/a/aaa_elflibs/tracked-files1
-rwxr-xr-xsource/a/cryptsetup/cryptsetup.SlackBuild25
-rwxr-xr-xsource/a/efibootmgr/efibootmgr.SlackBuild4
-rw-r--r--source/a/efibootmgr/efibootmgr.efi_set_verbose.diff12
-rwxr-xr-xsource/a/efibootmgr/fetch-efibootmgr.sh47
-rw-r--r--source/a/efivar/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch51
-rw-r--r--source/a/efivar/b98ba8921010d03f46704a476c69861515deb1ca.patch56
-rw-r--r--source/a/efivar/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch168
-rwxr-xr-xsource/a/efivar/efivar.SlackBuild7
-rwxr-xr-xsource/a/efivar/fetch-efivar.sh47
-rwxr-xr-xsource/a/elilo/elilo.SlackBuild4
-rw-r--r--source/a/elilo/eliloconfig17
-rwxr-xr-xsource/a/lvm2/lvm2.SlackBuild3
15 files changed, 127 insertions, 318 deletions
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
index a93e4aee..76260dd4 100755
--- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=aaa_elflibs
VERSION=${VERSION:-15.0}
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs
index 764d77bd..e527a6d7 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs
@@ -47,6 +47,7 @@
/usr/lib/libidn.so.12
/usr/lib/libidn2.so.0
/usr/lib/libjpeg.so.62
+/usr/lib/libjson-c.so.4
/usr/lib/libturbojpeg.so.0
/usr/lib/liblber-2.4.so.2
/usr/lib/libldap-2.4.so.2
diff --git a/source/a/aaa_elflibs/tracked-files b/source/a/aaa_elflibs/tracked-files
index f112d04d..27e15993 100644
--- a/source/a/aaa_elflibs/tracked-files
+++ b/source/a/aaa_elflibs/tracked-files
@@ -5,6 +5,7 @@
/lib/libdb-4.2.so
/lib/libdb-4.4.so
/lib/libdevmapper.so.1.02
+/usr/lib/libargon2.so.1
/usr/lib/libcups.so.2
/usr/lib/libcupsimage.so.2
/usr/lib/libgcc_s.so.1
diff --git a/source/a/cryptsetup/cryptsetup.SlackBuild b/source/a/cryptsetup/cryptsetup.SlackBuild
index 318417aa..4e9d550b 100755
--- a/source/a/cryptsetup/cryptsetup.SlackBuild
+++ b/source/a/cryptsetup/cryptsetup.SlackBuild
@@ -36,7 +36,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=cryptsetup
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -95,6 +95,7 @@ CFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--sysconfdir=/etc \
--enable-cryptsetup-reencrypt \
+ --enable-libargon2 \
--mandir=/usr/man \
--docdir=/usr/doc/cryptsetup-$VERSION \
--build=$ARCH-slackware-linux || exit 1
@@ -102,15 +103,19 @@ CFLAGS="$SLKCFLAGS" \
make || exit 1
make DESTDIR=$PKG install || exit 1
-# Move the shared library to $PKG/lib${LIBDIRSUFFIX}:
-mkdir -p $PKG/lib${LIBDIRSUFFIX}
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
- for file in lib*.so.?.* ; do
- mv $file ../../lib${LIBDIRSUFFIX}
- ln -sf ../../lib${LIBDIRSUFFIX}/$file .
- done
- cp -a lib*.so.? ../../lib${LIBDIRSUFFIX}
-)
+# __DISABLED__
+# If libargon2 and libjson-c are both under /usr, there's very little reason to
+# move this. This continues a trend generally going on with Linux based OSes to
+# ignore weird /usr-is-a-separate-partition corner cases.
+## Move the shared library to $PKG/lib${LIBDIRSUFFIX}:
+#mkdir -p $PKG/lib${LIBDIRSUFFIX}
+#( cd $PKG/usr/lib${LIBDIRSUFFIX}
+# for file in lib*.so.*.* ; do
+# mv $file ../../lib${LIBDIRSUFFIX}
+# ln -sf ../../lib${LIBDIRSUFFIX}/$file .
+# done
+# cp -a lib*.so.? ../../lib${LIBDIRSUFFIX}
+#)
# Don't ship .la files:
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
diff --git a/source/a/efibootmgr/efibootmgr.SlackBuild b/source/a/efibootmgr/efibootmgr.SlackBuild
index 5618c09d..4a9ac73d 100755
--- a/source/a/efibootmgr/efibootmgr.SlackBuild
+++ b/source/a/efibootmgr/efibootmgr.SlackBuild
@@ -79,8 +79,6 @@ rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
cd $PKGNAM-$VERSION
-zcat $CWD/efibootmgr.efi_set_verbose.diff.gz | patch -p1 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -92,7 +90,7 @@ find . \
export EFIDIR=/boot/efi
# Build:
-export EXTRA_CFLAGS="$SLKCFLAGS"
+export CFLAGS="$SLKCFLAGS -Wno-pointer-sign"
make mandir=/usr/man || exit 1
make install mandir=/usr/man DESTDIR=$PKG || exit 1
diff --git a/source/a/efibootmgr/efibootmgr.efi_set_verbose.diff b/source/a/efibootmgr/efibootmgr.efi_set_verbose.diff
deleted file mode 100644
index cea96487..00000000
--- a/source/a/efibootmgr/efibootmgr.efi_set_verbose.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./src/efibootmgr.c.orig 2018-06-10 15:12:10.000000000 -0500
-+++ ./src/efibootmgr.c 2018-12-31 13:23:27.284013090 -0600
-@@ -1536,9 +1536,6 @@
- "invalid numeric value %s\n",
- optarg);
- }
-- /* XXX efivar-36 accidentally doesn't have a public
-- * header for this */
-- extern int efi_set_verbose(int verbosity, FILE *errlog);
- efi_set_verbose(opts.verbose - 2, stderr);
- break;
- case 'V':
diff --git a/source/a/efibootmgr/fetch-efibootmgr.sh b/source/a/efibootmgr/fetch-efibootmgr.sh
new file mode 100755
index 00000000..995c8187
--- /dev/null
+++ b/source/a/efibootmgr/fetch-efibootmgr.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Pull a stable branch + patches
+BRANCH=${1:-master}
+
+# Clear download area:
+rm -rf efibootmgr
+
+# Clone repository:
+git clone https://github.com/rhboot/efibootmgr
+
+# checkout $BRANCH:
+( cd efibootmgr
+ git checkout $BRANCH || exit 1
+)
+
+HEADISAT="$( cd efibootmgr && git log -1 --format=%h )"
+DATE="$( cd efibootmgr && git log -1 --format=%ad --date=format:%Y%m%d )"
+# Cleanup. We're not packing up the whole git repo.
+( cd efibootmgr && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv efibootmgr efibootmgr-${DATE}_${HEADISAT}
+tar cf efibootmgr-${DATE}_${HEADISAT}.tar efibootmgr-${DATE}_${HEADISAT}
+xz -9 -f efibootmgr-${DATE}_${HEADISAT}.tar
+rm -rf efibootmgr-${DATE}_${HEADISAT}
+echo
+echo "efibootmgr branch $BRANCH with HEAD at $HEADISAT packaged as efibootmgr-${DATE}_${HEADISAT}.tar.xz"
+echo
diff --git a/source/a/efivar/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch b/source/a/efivar/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
deleted file mode 100644
index e4a43582..00000000
--- a/source/a/efivar/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0dad6d78a7fb5f6c5fb4a1d646040539db6cf865 Mon Sep 17 00:00:00 2001
-From: Chih-Wei Huang <cwhuang@linux.org.tw>
-Date: Tue, 26 Feb 2019 18:42:20 +0800
-Subject: [PATCH] Fix another error of -Werror=address-of-packed-member
-
-Android 9 clang complains:
-
-external/efivar/src/dp-message.c:367:24: error: taking address of packed member '' of class or structure 'efidp_infiniband' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]
- (efi_guid_t *)&dp->infiniband.ioc_guid);
- ^~~~~~~~~~~~~~~~~~~~~~~
-external/efivar/src/dp.h:76:19: note: expanded from macro 'format_guid'
- memmove(&_guid, guid, sizeof(_guid)); \
- ^~~~
-1 error generated.
-
-Since commit c3c553d the fifth parameter of format_guid() is treated as
-a const void *. The casting is unnecessary.
-
-Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
----
- src/dp-media.c | 3 +--
- src/dp-message.c | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/dp-media.c b/src/dp-media.c
-index 96a576f..be691c4 100644
---- a/src/dp-media.c
-+++ b/src/dp-media.c
-@@ -46,8 +46,7 @@ _format_media_dn(char *buf, size_t size, const_efidp dp)
- break;
- case EFIDP_HD_SIGNATURE_GUID:
- format(buf, size, off, "HD", "GPT,");
-- format_guid(buf, size, off, "HD",
-- (efi_guid_t *)dp->hd.signature);
-+ format_guid(buf, size, off, "HD", dp->hd.signature);
- format(buf, size, off, "HD",
- ",0x%"PRIx64",0x%"PRIx64")",
- dp->hd.start, dp->hd.size);
-diff --git a/src/dp-message.c b/src/dp-message.c
-index 9f96466..6b8e907 100644
---- a/src/dp-message.c
-+++ b/src/dp-message.c
-@@ -364,7 +364,7 @@ _format_message_dn(char *buf, size_t size, const_efidp dp)
- dp->infiniband.port_gid[1],
- dp->infiniband.port_gid[0]);
- format_guid(buf, size, off, "Infiniband",
-- (efi_guid_t *)&dp->infiniband.ioc_guid);
-+ &dp->infiniband.ioc_guid);
- format(buf, size, off, "Infiniband",
- ",%"PRIu64",%"PRIu64")",
- dp->infiniband.target_port_id,
diff --git a/source/a/efivar/b98ba8921010d03f46704a476c69861515deb1ca.patch b/source/a/efivar/b98ba8921010d03f46704a476c69861515deb1ca.patch
deleted file mode 100644
index f40942f4..00000000
--- a/source/a/efivar/b98ba8921010d03f46704a476c69861515deb1ca.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b98ba8921010d03f46704a476c69861515deb1ca Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 7 Jan 2019 10:30:59 -0500
-Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers
- safely.
-
-GCC 9 adds -Werror=address-of-packed-member, which causes us to see the
-build error reported at
- https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 .
-
-That bug report shows us the following:
-
-In file included from dp.c:26:
-dp.h: In function 'format_vendor_helper':
-dp.h:120:37: error: taking address of packed member of 'struct <anonymous>' may result in an unaligned pointer value [-Werror=address-of-packed-member]
- 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid);
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~
-dp.h:74:25: note: in definition of macro 'format_guid'
- 74 | _rc = efi_guid_to_str(guid, &_guidstr); \
- | ^~~~
-cc1: all warnings being treated as errors
-
-This patch makes format_guid() use a local variable as a bounce buffer
-in the case that the guid we're passed is aligned as chaotic neutral.
-
-Note that this only fixes this instance and there may be others that bz
-didn't show because it exited too soon, and I don't have a gcc 9 build
-in front of me right now.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/dp.h | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/dp.h b/src/dp.h
-index aa4e390..20cb608 100644
---- a/src/dp.h
-+++ b/src/dp.h
-@@ -70,8 +70,15 @@
- #define format_guid(buf, size, off, dp_type, guid) ({ \
- int _rc; \
- char *_guidstr = NULL; \
-- \
-- _rc = efi_guid_to_str(guid, &_guidstr); \
-+ efi_guid_t _guid; \
-+ const efi_guid_t * const _guid_p = \
-+ likely(__alignof__(guid) == sizeof(guid)) \
-+ ? guid \
-+ : &_guid; \
-+ \
-+ if (unlikely(__alignof__(guid) == sizeof(guid))) \
-+ memmove(&_guid, guid, sizeof(_guid)); \
-+ _rc = efi_guid_to_str(_guid_p, &_guidstr); \
- if (_rc < 0) { \
- efi_error("could not build %s GUID DP string", \
- dp_type); \
diff --git a/source/a/efivar/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch b/source/a/efivar/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
deleted file mode 100644
index bbb6a99a..00000000
--- a/source/a/efivar/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From c3c553db85ff10890209d0fe48fb4856ad68e4e0 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 21 Feb 2019 15:20:12 -0500
-Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches.
-
-This gets rid of all the places GCC 9's -Werror=address-of-packed-member
-flags as problematic.
-
-Fixes github issue #123
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/dp-message.c | 6 ++++--
- src/dp.h | 12 ++++--------
- src/guid.c | 2 +-
- src/include/efivar/efivar.h | 2 +-
- src/ucs2.h | 27 +++++++++++++++++++--------
- 5 files changed, 29 insertions(+), 20 deletions(-)
-
-diff --git a/src/dp-message.c b/src/dp-message.c
-index 3724e5f..9f96466 100644
---- a/src/dp-message.c
-+++ b/src/dp-message.c
-@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp)
- ) / sizeof(efi_ip_addr_t);
- format(buf, size, off, "Dns", "Dns(");
- for (int i=0; i < end; i++) {
-- const efi_ip_addr_t *addr = &dp->dns.addrs[i];
-+ efi_ip_addr_t addr;
-+
-+ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr));
- if (i != 0)
- format(buf, size, off, "Dns", ",");
- format_ip_addr(buf, size, off, "Dns",
-- dp->dns.is_ipv6, addr);
-+ dp->dns.is_ipv6, &addr);
- }
- format(buf, size, off, "Dns", ")");
- break;
-diff --git a/src/dp.h b/src/dp.h
-index 20cb608..1f921d5 100644
---- a/src/dp.h
-+++ b/src/dp.h
-@@ -71,13 +71,9 @@
- int _rc; \
- char *_guidstr = NULL; \
- efi_guid_t _guid; \
-- const efi_guid_t * const _guid_p = \
-- likely(__alignof__(guid) == sizeof(guid)) \
-- ? guid \
-- : &_guid; \
-- \
-- if (unlikely(__alignof__(guid) == sizeof(guid))) \
-- memmove(&_guid, guid, sizeof(_guid)); \
-+ const efi_guid_t * const _guid_p = &_guid; \
-+ \
-+ memmove(&_guid, guid, sizeof(_guid)); \
- _rc = efi_guid_to_str(_guid_p, &_guidstr); \
- if (_rc < 0) { \
- efi_error("could not build %s GUID DP string", \
-@@ -86,7 +82,7 @@
- _guidstr = onstack(_guidstr, \
- strlen(_guidstr)+1); \
- _rc = format(buf, size, off, dp_type, "%s", \
-- _guidstr); \
-+ _guidstr); \
- } \
- _rc; \
- })
-diff --git a/src/guid.c b/src/guid.c
-index 306c9ff..3156b3b 100644
---- a/src/guid.c
-+++ b/src/guid.c
-@@ -31,7 +31,7 @@
- extern const efi_guid_t efi_guid_zero;
-
- int NONNULL(1, 2) PUBLIC
--efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b)
-+efi_guid_cmp(const void * const a, const void * const b)
- {
- return memcmp(a, b, sizeof (efi_guid_t));
- }
-diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h
-index 316891c..ad6449d 100644
---- a/src/include/efivar/efivar.h
-+++ b/src/include/efivar/efivar.h
-@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid)
-
- extern int efi_guid_is_zero(const efi_guid_t *guid);
- extern int efi_guid_is_empty(const efi_guid_t *guid);
--extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b);
-+extern int efi_guid_cmp(const void * const a, const void * const b);
-
- /* import / export functions */
- typedef struct efi_variable efi_variable_t;
-diff --git a/src/ucs2.h b/src/ucs2.h
-index dbb5900..edd8367 100644
---- a/src/ucs2.h
-+++ b/src/ucs2.h
-@@ -23,16 +23,21 @@
- (((val) & ((mask) << (shift))) >> (shift))
-
- static inline size_t UNUSED
--ucs2len(const uint16_t * const s, ssize_t limit)
-+ucs2len(const void *vs, ssize_t limit)
- {
- ssize_t i;
-- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++)
-+ const uint16_t *s = vs;
-+ const uint8_t *s8 = vs;
-+
-+ for (i = 0;
-+ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0;
-+ i++, s8 += 2, s++)
- ;
- return i;
- }
-
- static inline size_t UNUSED
--ucs2size(const uint16_t * const s, ssize_t limit)
-+ucs2size(const void *s, ssize_t limit)
- {
- size_t rc = ucs2len(s, limit);
- rc *= sizeof (uint16_t);
-@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit)
- }
-
- static inline unsigned char * UNUSED
--ucs2_to_utf8(const uint16_t * const chars, ssize_t limit)
-+ucs2_to_utf8(const void * const voidchars, ssize_t limit)
- {
- ssize_t i, j;
- unsigned char *ret;
-+ const uint16_t * const chars = voidchars;
-
- if (limit < 0)
- limit = ucs2len(chars, -1);
-@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit)
- }
-
- static inline ssize_t UNUSED NONNULL(4)
--utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8)
-+utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8)
- {
- ssize_t req;
- ssize_t i, j;
-+ uint16_t *ucs2 = ucs2void;
-+ uint16_t val16;
-
- if (!ucs2 && size > 0) {
- errno = EINVAL;
-@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8)
- val = utf8[i] & 0x7f;
- i += 1;
- }
-- ucs2[j] = val;
-+ val16 = val;
-+ ucs2[j] = val16;
-+ }
-+ if (terminate) {
-+ val16 = 0;
-+ ucs2[j++] = val16;
- }
-- if (terminate)
-- ucs2[j++] = (uint16_t)0;
- return j;
- };
-
diff --git a/source/a/efivar/efivar.SlackBuild b/source/a/efivar/efivar.SlackBuild
index 947621fe..08c9ad8c 100755
--- a/source/a/efivar/efivar.SlackBuild
+++ b/source/a/efivar/efivar.SlackBuild
@@ -85,12 +85,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# GCC9 fixes for -Werror:
-zcat $CWD/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/b98ba8921010d03f46704a476c69861515deb1ca.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch.gz | patch -p1 --verbose || exit 1
-
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wformat=0" \
CXXFLAGS="$SLKCFLAGS" \
make $NUMJOBS libdir=/usr/lib$LIBDIRSUFFIX/ mandir=/usr/man/ || exit 1
make $NUMJOBS install DESTDIR=${PKG}/ libdir=/usr/lib$LIBDIRSUFFIX/ mandir=/usr/man/ || exit 1
diff --git a/source/a/efivar/fetch-efivar.sh b/source/a/efivar/fetch-efivar.sh
new file mode 100755
index 00000000..deed14bb
--- /dev/null
+++ b/source/a/efivar/fetch-efivar.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Pull a stable branch + patches
+BRANCH=${1:-master}
+
+# Clear download area:
+rm -rf efivar
+
+# Clone repository:
+git clone https://github.com/rhboot/efivar
+
+# checkout $BRANCH:
+( cd efivar
+ git checkout $BRANCH || exit 1
+)
+
+HEADISAT="$( cd efivar && git log -1 --format=%h )"
+DATE="$( cd efivar && git log -1 --format=%ad --date=format:%Y%m%d )"
+# Cleanup. We're not packing up the whole git repo.
+( cd efivar && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv efivar efivar-${DATE}_${HEADISAT}
+tar cf efivar-${DATE}_${HEADISAT}.tar efivar-${DATE}_${HEADISAT}
+xz -9 -f efivar-${DATE}_${HEADISAT}.tar
+rm -rf efivar-${DATE}_${HEADISAT}
+echo
+echo "efivar branch $BRANCH with HEAD at $HEADISAT packaged as efivar-${DATE}_${HEADISAT}.tar.xz"
+echo
diff --git a/source/a/elilo/elilo.SlackBuild b/source/a/elilo/elilo.SlackBuild
index b4c2e98e..81e4acfa 100755
--- a/source/a/elilo/elilo.SlackBuild
+++ b/source/a/elilo/elilo.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2013, 2014, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2013, 2014, 2016, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=elilo
VERSION=${VERSION:-$(echo $PKGNAM*.tar.?z* | rev | cut -f 2 -d - | rev)}
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/a/elilo/eliloconfig b/source/a/elilo/eliloconfig
index e1866859..9d7475f9 100644
--- a/source/a/elilo/eliloconfig
+++ b/source/a/elilo/eliloconfig
@@ -133,18 +133,23 @@ timeout=1
#
EOF
cp -a $T_PX/boot/elilo-x86_64.efi $T_PX/boot/efi/EFI/Slackware/elilo.efi 1> /dev/null 2> /dev/null
-cp $T_PX/boot/vmlinuz $T_PX/boot/efi/EFI/Slackware 1> /dev/null 2> /dev/null
-cat << EOF >> $T_PX/boot/efi/EFI/Slackware/elilo.conf
-image=vmlinuz
- label=vmlinuz
-EOF
-touch -r $T_PX/boot/vmlinuz $T_PX/boot/efi/EFI/Slackware/vmlinuz
if [ -r $T_PX/boot/initrd.gz ]; then
+ cp $T_PX/boot/vmlinuz-generic $T_PX/boot/efi/EFI/Slackware/vmlinuz 1> /dev/null 2> /dev/null
+ touch -r $T_PX/boot/vmlinuz-generic $T_PX/boot/efi/EFI/Slackware/vmlinuz
cp $T_PX/boot/initrd.gz $T_PX/boot/efi/EFI/Slackware 1> /dev/null 2> /dev/null
touch -r $T_PX/boot/initrd.gz $T_PX/boot/efi/EFI/Slackware/initrd.gz
cat << EOF >> $T_PX/boot/efi/EFI/Slackware/elilo.conf
+image=vmlinuz
+ label=vmlinuz
initrd=initrd.gz
EOF
+else
+ cp $T_PX/boot/vmlinuz-huge $T_PX/boot/efi/EFI/Slackware/vmlinuz 1> /dev/null 2> /dev/null
+ touch -r $T_PX/boot/vmlinuz-huge $T_PX/boot/efi/EFI/Slackware/vmlinuz
+ cat << EOF >> $T_PX/boot/efi/EFI/Slackware/elilo.conf
+image=vmlinuz
+ label=vmlinuz
+EOF
fi
cat << EOF >> $T_PX/boot/efi/EFI/Slackware/elilo.conf
read-only
diff --git a/source/a/lvm2/lvm2.SlackBuild b/source/a/lvm2/lvm2.SlackBuild
index 2a94a0d0..31d08f0b 100755
--- a/source/a/lvm2/lvm2.SlackBuild
+++ b/source/a/lvm2/lvm2.SlackBuild
@@ -86,12 +86,10 @@ CFLAGS="$SLKCFLAGS" \
--disable-readline \
--enable-cmdlib \
--enable-dmeventd \
- --enable-applib \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--with-usrlibdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--enable-realtime \
- --with-lvm1=internal \
--enable-pkgconfig \
--enable-udev_sync \
--enable-udev_rules \
@@ -102,7 +100,6 @@ CFLAGS="$SLKCFLAGS" \
--with-default-locking-dir=/run/lock/lvm \
--with-default-run-dir=/run/lvm \
--with-default-dm-run-dir=/run/lvm \
- --with-clvmd-pidfile=/run/lvm/clvmd.pid \
--with-cmirrord-pidfile=/run/lvm/cmirrord.pid \
--with-dmeventd-pidfile=/run/lvm/dmeventd.pid \
--build=$ARCH-slackware-linux || exit 1