From 0e6f7049d6a514115df0164db47fbd8763cf5148 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 9 Nov 2018 02:42:22 +0000
Subject: Fri Nov  9 02:42:22 UTC 2018

a/efibootmgr-16-x86_64-2.txz:  Rebuilt.
  Reverted to previous version. We'd tried this before and it still doesn't
  work. Thanks to _RDS_.
a/efivar-35-x86_64-1.txz:  Upgraded.
  Reverted to previous version. We'd tried this before and it still doesn't
  work. Thanks to _RDS_.
a/hwdata-0.317-noarch-1.txz:  Upgraded.
a/lvm2-2.03.01-x86_64-1.txz:  Upgraded.
a/quota-4.04-x86_64-1.txz:  Upgraded.
ap/cups-2.2.9-x86_64-1.txz:  Upgraded.
ap/sysstat-12.0.2-x86_64-1.txz:  Upgraded.
d/cscope-15.9-x86_64-1.txz:  Upgraded.
d/distcc-3.3.2-x86_64-1.txz:  Upgraded.
d/nasm-2.14-x86_64-1.txz:  Upgraded.
d/oprofile-1.3.0-x86_64-1.txz:  Upgraded.
d/rust-1.30.1-x86_64-1.txz:  Upgraded.
l/elfutils-0.174-x86_64-1.txz:  Upgraded.
l/shared-mime-info-1.10-x86_64-1.txz:  Upgraded.
n/samba-4.9.2-x86_64-1.txz:  Upgraded.
xap/gimp-2.10.8-x86_64-1.txz:  Upgraded.
---
 source/a/efibootmgr/efibootmgr.SlackBuild  |  2 +-
 source/a/hwdata/hwdata.SlackBuild          |  6 +++---
 source/a/quota/quota.SlackBuild            | 10 +++++-----
 source/a/quota/quota.lwrap.needs.lnsl.diff | 16 ++++++++--------
 4 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'source/a')

diff --git a/source/a/efibootmgr/efibootmgr.SlackBuild b/source/a/efibootmgr/efibootmgr.SlackBuild
index e91b25fd9..9671a6e21 100755
--- a/source/a/efibootmgr/efibootmgr.SlackBuild
+++ b/source/a/efibootmgr/efibootmgr.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=efibootmgr
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/hwdata/hwdata.SlackBuild b/source/a/hwdata/hwdata.SlackBuild
index f0559ab13..1c00ec5c2 100755
--- a/source/a/hwdata/hwdata.SlackBuild
+++ b/source/a/hwdata/hwdata.SlackBuild
@@ -26,8 +26,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=hwdata
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -69,7 +69,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/a/quota/quota.SlackBuild b/source/a/quota/quota.SlackBuild
index 6c47e141b..ad67fc30d 100755
--- a/source/a/quota/quota.SlackBuild
+++ b/source/a/quota/quota.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=quota
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -81,8 +81,8 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
 
 zcat $CWD/quota.lwrap.needs.lnsl.diff.gz | patch -p1 --verbose || exit 1
 
@@ -104,7 +104,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make $NUMJOBS || make || exit 1
diff --git a/source/a/quota/quota.lwrap.needs.lnsl.diff b/source/a/quota/quota.lwrap.needs.lnsl.diff
index eaaecf286..26792bd1b 100644
--- a/source/a/quota/quota.lwrap.needs.lnsl.diff
+++ b/source/a/quota/quota.lwrap.needs.lnsl.diff
@@ -1,11 +1,11 @@
---- ./configure.ac.orig	2015-12-18 08:00:34.000000000 -0600
-+++ ./configure.ac	2015-12-27 18:44:30.768289611 -0600
-@@ -167,7 +167,7 @@
-         ])
-     ])
-     AS_IF([test "x$build_libwrap" != "xno"], [
+--- ./configure.ac.orig	2018-11-08 15:30:51.834366741 -0600
++++ ./configure.ac	2018-11-08 15:31:25.275363974 -0600
+@@ -170,7 +170,7 @@
+ AS_IF([test "x$enable_libwrap" != "xno"], [
+     AC_CHECK_HEADER([tcpd.h], [
+     	build_libwrap="yes"
 -        WRAP_LIBS="-lwrap"
-+        WRAP_LIBS="-lwrap -lnsl"
++        WRAP_LIBS="-lwrap  -lnsl"
          AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
          COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
-     ])
+     ], [
-- 
cgit v1.2.3-79-gdb01