Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

1 files changed, 26 insertions, 9 deletions

diff --git a/source/a/elilo/elilo.SlackBuild b/source/a/elilo/elilo.SlackBuild
index 2fa31a7af..1dc1004c6 100755
--- a/source/a/elilo/elilo.SlackBuild
+++ b/source/a/elilo/elilo.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2013, 2014, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2013, 2014, 2016, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=elilo
 VERSION=${VERSION:-$(echo $PKGNAM*.tar.?z* | rev | cut -f 2 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-6}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -32,7 +34,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -50,6 +51,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -58,11 +67,16 @@ mkdir elilo
 cd elilo
 tar xvf $CWD/${PKGNAM}-$VERSION-all.tar.?z* || exit 1
 tar xvf elilo-${VERSION}-source.tar.gz || exit 1
-# This is a rebuilt version of the x86_64 elilo (which is really the only
-# useful one), fetched from $TMP/elilo/elilo-${VERSION}-source/ after
-# running this script.  Elilo can be rather fragile, so we don't want to
-# rebuild it all the time and risk breaking it.
-tar xvf $CWD/elilo.x64.rebuilt.tar.xz || exit 1
+
+# The tarball extracted below contains rebuilt versions of the x86_64 and
+# ia32 elilo, which were extracted from $TMP/elilo/elilo-${VERSION}-source/
+# after building under both architectures. This approach simplifies making
+# changes to other parts of the package without needlessly complicating
+# things, as the loaders themselves seldom need to be rebuilt. Besides,
+# elilo can be rather fragile, so we don't want to rebuild it without a
+# good reason and risk breaking it.
+tar xvf $CWD/elilo.loader.binaries.tar.xz || exit 1
+
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 cd elilo-${VERSION}-source || cd elilo || exit
@@ -71,6 +85,9 @@ sed -i "s,/usr/lib,/usr/lib${LIBDIRSUFFIX},g" Make.defaults
 sed -i "s,EFICRT0.*= /usr/lib${LIBDIRSUFFIX},EFICRT0    = /usr/lib${LIBDIRSUFFIX}/gnuefi,g" Make.defaults
 sed -i "s,dpkg-architecture -qDEB_BUILD_ARCH,uname -m,g" Make.defaults
 
+# Increase kernel size limit from 8MB to 16MB (nobody will ever need more than 640K ;-):
+zcat $CWD/elilo.double.kernel.size.limit.diff.gz | patch -p1 --verbose || exit 1
+
 # We will build this from source.
 # However, we will package the pre-built EFI binaries, since we would
 # like to include both 32-bit and 64-bit x86 EFI loaders in the