Thu Nov 8 02:52:55 UTC 201820181108025255

a/aaa_terminfo-6.1_20181027-x86_64-2.txz:  Rebuilt.
a/efibootmgr-17-x86_64-1.txz:  Upgraded.
a/efivar-36-x86_64-1.txz:  Upgraded.
a/hostname-3.21-x86_64-1.txz:  Upgraded.
a/inotify-tools-3.20.1-x86_64-1.txz:  Upgraded.
a/mdadm-4.1-x86_64-1.txz:  Upgraded.
a/usb_modeswitch-2.5.2-x86_64-1.txz:  Upgraded.
a/util-linux-2.33-x86_64-1.txz:  Upgraded.
ap/cdrdao-1.2.4-x86_64-1.txz:  Upgraded.
ap/dash-0.5.10.2-x86_64-1.txz:  Upgraded.
ap/diffstat-1.62-x86_64-1.txz:  Upgraded.
ap/rpm-4.14.2.1-x86_64-1.txz:  Upgraded.
ap/sqlite-3.25.3-x86_64-1.txz:  Upgraded.
l/gnu-efi-3.0.9-x86_64-1.txz:  Upgraded.
l/iso-codes-4.1-noarch-1.txz:  Upgraded.
l/jasper-2.0.14-x86_64-1.txz:  Upgraded.
l/libbluray-1.0.2-x86_64-1.txz:  Upgraded.
l/libcap-ng-0.7.9-x86_64-1.txz:  Upgraded.
l/libiodbc-3.52.12-x86_64-1.txz:  Upgraded.
l/libodfgen-0.1.7-x86_64-1.txz:  Upgraded.
l/libwpd-0.10.2-x86_64-1.txz:  Upgraded.
l/libwpg-0.3.2-x86_64-1.txz:  Upgraded.
l/libyaml-0.2.1-x86_64-1.txz:  Upgraded.
l/ncurses-6.1_20181027-x86_64-2.txz:  Rebuilt.
  Temporarily removed the bce feature from the linux console definition until
  the console is fixed. Added a linux-bce terminal definition for testing.
l/sbc-1.4-x86_64-1.txz:  Upgraded.
l/zstd-1.3.7-x86_64-1.txz:  Upgraded.
n/gnupg2-2.2.11-x86_64-1.txz:  Upgraded.
n/ipset-7.0-x86_64-1.txz:  Upgraded.
n/libndp-1.7-x86_64-1.txz:  Upgraded.
n/npth-1.6-x86_64-1.txz:  Upgraded.
n/php-7.2.12-x86_64-1.txz:  Upgraded.
n/slrn-1.0.3a-x86_64-1.txz:  Upgraded.
n/snownews-1.6.10-x86_64-1.txz:  Upgraded.
n/whois-5.4.0-x86_64-1.txz:  Upgraded.
x/libinput-1.12.3-x86_64-1.txz:  Upgraded.
x/libva-2.3.0-x86_64-1.txz:  Upgraded.
x/libva-utils-2.3.0-x86_64-1.txz:  Upgraded.
x/libwacom-0.32-x86_64-1.txz:  Upgraded.
x/xdg-user-dirs-0.17-x86_64-1.txz:  Upgraded.
xap/blackbox-0.74-x86_64-1.txz:  Upgraded.

22 files changed, 79 insertions, 43 deletions

diff --git a/source/l/gnu-efi/gnu-efi.url b/source/l/gnu-efi/gnu-efi.url
index e5435b45a..50941d120 100644
--- a/source/l/gnu-efi/gnu-efi.url
+++ b/source/l/gnu-efi/gnu-efi.url
@@ -1 +1 @@
-https://downloads.sourceforge.net/gnu-efi/gnu-efi-3.0.8.tar.bz2
+https://downloads.sourceforge.net/gnu-efi/gnu-efi-3.0.9.tar.bz2
diff --git a/source/l/iso-codes/iso-codes.SlackBuild b/source/l/iso-codes/iso-codes.SlackBuild
index 96ccdf607..8ae50bf89 100755
--- a/source/l/iso-codes/iso-codes.SlackBuild
+++ b/source/l/iso-codes/iso-codes.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=iso-codes
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # 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
diff --git a/source/l/jasper/jasper.SlackBuild b/source/l/jasper/jasper.SlackBuild
index 373069d0c..ec0ecddfe 100755
--- a/source/l/jasper/jasper.SlackBuild
+++ b/source/l/jasper/jasper.SlackBuild
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=jasper
-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
@@ -69,7 +69,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || 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/l/jasper/slack-desc b/source/l/jasper/slack-desc
index 5fb164f5c..1f2f53663 100644
--- a/source/l/jasper/slack-desc
+++ b/source/l/jasper/slack-desc
@@ -12,7 +12,7 @@ jasper: The JasPer Project is an open-source initiative to provide a free
 jasper: software-based reference implementation of the codec specified in the
 jasper: JPEG-2000 Part-1 standard (i.e., ISO/IEC 15444-1).jasper:
 jasper:
-jasper: JasPer home: http://www.ece.uvic.ca/~mdadams/jasper/
+jasper: Homepage: http://www.ece.uvic.ca/~mdadams/jasper/
 jasper:
 jasper:
 jasper:
diff --git a/source/l/libbluray/libbluray.SlackBuild b/source/l/libbluray/libbluray.SlackBuild
index 46fa148b3..51c5b8192 100755
--- a/source/l/libbluray/libbluray.SlackBuild
+++ b/source/l/libbluray/libbluray.SlackBuild
@@ -27,8 +27,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libbluray
-VERSION=${VERSION:-$(echo libbluray-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo libbluray-*.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
 chown -R root:root .
 find -L . \
diff --git a/source/l/libcap-ng/libcap-ng.SlackBuild b/source/l/libcap-ng/libcap-ng.SlackBuild
index 2b7c91ad8..fd421fb49 100755
--- a/source/l/libcap-ng/libcap-ng.SlackBuild
+++ b/source/l/libcap-ng/libcap-ng.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libcap-ng
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+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
@@ -75,7 +75,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
@@ -85,9 +85,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Fix byte-compiling python3 bindings
-zcat $CWD/python3.patch.gz | patch -p1 --verbose || exit 1
-
 autoreconf -vif
 
 # Configure:
diff --git a/source/l/libcap-ng/python3.patch b/source/l/libcap-ng/python3.patch
deleted file mode 100644
index cf26fe5de..000000000
--- a/source/l/libcap-ng/python3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libcap-ng-0.7.8.orig/bindings/python3/Makefile.am libcap-ng-0.7.8/bindings/python3/Makefile.am
---- libcap-ng-0.7.8.orig/bindings/python3/Makefile.am	2016-07-24 17:47:34.000000000 +0200
-+++ libcap-ng-0.7.8/bindings/python3/Makefile.am	2017-06-24 16:32:53.957501204 +0200
-@@ -26,6 +26,8 @@
- LIBS = ${top_builddir}/src/libcap-ng.la
- SWIG_FLAGS = -python -py3 -modern
- SWIG_INCLUDES = ${AM_CPPFLAGS}
-+# REMOVE SOMEDAY - without overriding this macro, it uses python2
-+am__py_compile = PYTHON=$(PYTHON3) $(SHELL) $(py_compile)
- py3exec_PYTHON = capng.py
- py3exec_LTLIBRARIES = _capng.la
- py3exec_SOLIBRARIES = _capng.so
diff --git a/source/l/libiodbc/libiodbc.SlackBuild b/source/l/libiodbc/libiodbc.SlackBuild
index 8e2618e60..a8e71429e 100755
--- a/source/l/libiodbc/libiodbc.SlackBuild
+++ b/source/l/libiodbc/libiodbc.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libiodbc
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/l/libiodbc/slack-desc b/source/l/libiodbc/slack-desc
index 725461468..a16120f26 100644
--- a/source/l/libiodbc/slack-desc
+++ b/source/l/libiodbc/slack-desc
@@ -13,7 +13,7 @@ libiodbc: an Open Source platform independent implementation of both the ODBC
 libiodbc: and X/Open specifications. It allows for developing solutions
 libiodbc: that are language, platform and database independent.
 libiodbc:
+libiodbc: Homepage: http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/
 libiodbc:
 libiodbc:
-libiodbc: Homepage: http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/
 libiodbc:
diff --git a/source/l/libodfgen/libodfgen.SlackBuild b/source/l/libodfgen/libodfgen.SlackBuild
index 18ec4d14c..4e5803485 100755
--- a/source/l/libodfgen/libodfgen.SlackBuild
+++ b/source/l/libodfgen/libodfgen.SlackBuild
@@ -24,8 +24,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libodfgen
-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}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -78,7 +78,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || 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/l/libodfgen/slack-desc b/source/l/libodfgen/slack-desc
index 7521a48ff..a00d17339 100644
--- a/source/l/libodfgen/slack-desc
+++ b/source/l/libodfgen/slack-desc
@@ -10,10 +10,10 @@ libodfgen: libodfgen (Library for generating documents in Open Document Format)
 libodfgen:
 libodfgen: ilibodfgen is an ODF export library for projects using librevenge.
 libodfgen:
+libodfgen: Homepage: http://sourceforge.net/p/libwpd/wiki/libodfgen/
 libodfgen:
 libodfgen:
 libodfgen:
 libodfgen:
 libodfgen:
-libodfgen: Homepage: http://sourceforge.net/p/libwpd/wiki/libodfgen/
 libodfgen:
diff --git a/source/l/libwpd/libwpd.SlackBuild b/source/l/libwpd/libwpd.SlackBuild
index 492ab2f24..6df6ed2a3 100755
--- a/source/l/libwpd/libwpd.SlackBuild
+++ b/source/l/libwpd/libwpd.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libwpd
 VERSION=${VERSION:-$(echo libwpd-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/libwpd/slack-desc b/source/l/libwpd/slack-desc
index 5474c8e5b..c033ed706 100644
--- a/source/l/libwpd/slack-desc
+++ b/source/l/libwpd/slack-desc
@@ -11,9 +11,9 @@ libwpd:
 libwpd: This package contains a library (libwpd) and tools to transform
 libwpd: WordPerfect documents into other formats such as HTML, text, and raw.
 libwpd:
-libwpd:
 libwpd: libwpd is used by word processors such as Calligra Words.
 libwpd:
+libwpd: Homepage: https://sourceforge.net/projects/libwpd
 libwpd:
 libwpd:
 libwpd:
diff --git a/source/l/libwpg/libwpg.SlackBuild b/source/l/libwpg/libwpg.SlackBuild
index 25925df28..6d0f6f38c 100755
--- a/source/l/libwpg/libwpg.SlackBuild
+++ b/source/l/libwpg/libwpg.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libwpg
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/libyaml/libyaml.SlackBuild b/source/l/libyaml/libyaml.SlackBuild
index 9fb202b60..4aab8b343 100755
--- a/source/l/libyaml/libyaml.SlackBuild
+++ b/source/l/libyaml/libyaml.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=libyaml
 SRCNAM=yaml
 VERSION=$(echo $SRCNAM-*.tar.?z* | 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
diff --git a/source/l/ncurses/aaa_terminfo.SlackBuild b/source/l/ncurses/aaa_terminfo.SlackBuild
index 44ac1fc13..d32322ffc 100755
--- a/source/l/ncurses/aaa_terminfo.SlackBuild
+++ b/source/l/ncurses/aaa_terminfo.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=aaa_terminfo
 # Note the version of ncurses in use:
 VERSION=${VERSION:-$(PRINT_PACKAGE_NAME=yes ./ncurses.SlackBuild | cut -f 2 -d -)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
 
diff --git a/source/l/ncurses/linux-no-bce.diff b/source/l/ncurses/linux-no-bce.diff
new file mode 100644
index 000000000..a490c2635
--- /dev/null
+++ b/source/l/ncurses/linux-no-bce.diff
@@ -0,0 +1,11 @@
+--- ./misc/terminfo.src.orig	2018-10-27 18:10:56.000000000 -0500
++++ ./misc/terminfo.src	2018-11-06 18:51:34.708372527 -0600
+@@ -941,7 +941,7 @@
+ # themselves; this entry assumes that capability.
+ #
+ linux-basic|linux console,
+-	am, bce, eo, mir, msgr, xenl, xon,
++	am, eo, mir, msgr, xenl, xon,
+ 	it#8, ncv#18, U8#1,
+ 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
+ 	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
diff --git a/source/l/ncurses/ncurses.SlackBuild b/source/l/ncurses/ncurses.SlackBuild
index 7c6542a34..1eebb7987 100755
--- a/source/l/ncurses/ncurses.SlackBuild
+++ b/source/l/ncurses/ncurses.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ncurses
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2- -d - | cut -f 1,2 -d .)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -118,6 +118,10 @@ chown -R root:root .
 
 zcat $CWD/ncurses.mkhashsize.diff.gz | patch -p1 --verbose || exit 1
 
+# BCE is broken with 4.19.0 and 4.19.1 kernels. Revert this ASAP, but use it
+# for now to paper over the problem:
+zcat $CWD/linux-no-bce.diff.gz | patch -p1 --verbose || exit 1
+
 # Configure/build/install to package the standard ncurses libraries:
 ncurses_configure || exit 1
 make $NUMJOBS || exit 1
diff --git a/source/l/ncurses/terminfo/linux-bce.README b/source/l/ncurses/terminfo/linux-bce.README
new file mode 100644
index 000000000..8957a730c
--- /dev/null
+++ b/source/l/ncurses/terminfo/linux-bce.README
@@ -0,0 +1,4 @@
+This is the original linux console definition with the BCE feature active.
+BCE is broken so far in the 4.19.x kernels, but we're keeping this handy for
+use with TERM=linux-bce so that we can easily test to see if the kernel has
+been fixed.
diff --git a/source/l/ncurses/terminfo/linux-bce.terminfo b/source/l/ncurses/terminfo/linux-bce.terminfo
new file mode 100644
index 000000000..82e5a8905
--- /dev/null
+++ b/source/l/ncurses/terminfo/linux-bce.terminfo
@@ -0,0 +1,32 @@
+linux-bce|linux console with BCE feature,
+	am, bce, ccc, eo, mir, msgr, xenl, xon,
+	colors#8, it#8, ncv#18, pairs#64,
+	acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}c~~,
+	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l\E[?1c,
+	clear=\E[H\E[J, cnorm=\E[?25h\E[?0c, cr=\r,
+	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+	cvvis=\E[?25h\E[?8c, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+	el1=\E[1K, enacs=\E)0, flash=\E[?5h$<200/>\E[?5l,
+	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
+	initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/%02x%p4%{255}%*%{1000}%/%02x,
+	kb2=\E[G, kbs=^?, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
+	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kend=\E[4~, kf1=\E[[A,
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
+	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
+	kf18=\E[32~, kf19=\E[33~, kf2=\E[[B, kf20=\E[34~,
+	kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
+	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
+	kmous=\E[M, knp=\E[6~, kpp=\E[5~, kspd=^Z, nel=\r\n, oc=\E]R,
+	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+	rmam=\E[?7l, rmir=\E[4l, rmpch=\E[10m, rmso=\E[27m,
+	rmul=\E[24m, rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm,
+	setaf=\E[3%p1%dm,
+	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;,
+	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+	smpch=\E[11m, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?6c, u9=\E[c,
+	vpa=\E[%i%p1%dd,
diff --git a/source/l/sbc/sbc.SlackBuild b/source/l/sbc/sbc.SlackBuild
index 108bb22ad..4be8a8c78 100755
--- a/source/l/sbc/sbc.SlackBuild
+++ b/source/l/sbc/sbc.SlackBuild
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=sbc
-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}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -66,7 +66,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 -L . \
diff --git a/source/l/zstd/zstd.url b/source/l/zstd/zstd.url
index 0c9a52bc6..8e7c94f8e 100644
--- a/source/l/zstd/zstd.url
+++ b/source/l/zstd/zstd.url
@@ -1 +1 @@
-https://github.com/facebook/zstd/archive/v1.3.3/zstd-1.3.3.tar.gz
+https://github.com/facebook/zstd