summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/CPU-X/CPU-X.SlackBuild6
-rw-r--r--system/CPU-X/CPU-X.info6
-rw-r--r--system/CPU-X/doinst.sh7
-rw-r--r--system/Iosevka-slab/Iosevka-slab.SlackBuild65
-rw-r--r--system/Iosevka-slab/Iosevka-slab.info10
-rw-r--r--system/Iosevka-slab/LICENSE92
-rw-r--r--system/Iosevka-slab/README20
-rw-r--r--system/Iosevka-slab/doinst.sh10
-rw-r--r--system/Iosevka-slab/slack-desc19
-rw-r--r--system/Iosevka/Iosevka.SlackBuild14
-rw-r--r--system/Iosevka/Iosevka.info14
-rw-r--r--system/Iosevka/README25
-rw-r--r--system/ansible/ansible.SlackBuild2
-rw-r--r--system/ansible/ansible.info6
-rw-r--r--system/bacula-client/bacula-client.SlackBuild4
-rw-r--r--system/bacula-client/bacula-client.info6
-rw-r--r--system/bacula/README.SLACKWARE4
-rw-r--r--system/bacula/bacula.SlackBuild4
-rw-r--r--system/bacula/bacula.info6
-rw-r--r--system/bitmapfont2ttf/README17
-rw-r--r--system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild82
-rw-r--r--system/bitmapfont2ttf/bitmapfont2ttf.info10
-rw-r--r--system/bitmapfont2ttf/derive_pixel_size.diff13
-rw-r--r--system/bitmapfont2ttf/slack-desc19
-rw-r--r--system/bleachbit/bleachbit.SlackBuild2
-rw-r--r--system/bleachbit/bleachbit.info6
-rw-r--r--system/borgbackup/borgbackup.SlackBuild4
-rw-r--r--system/borgbackup/borgbackup.info6
-rw-r--r--system/btrbk/btrbk.SlackBuild4
-rw-r--r--system/btrbk/btrbk.info6
-rw-r--r--system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild6
-rw-r--r--system/cpuid2cpuflags/cpuid2cpuflags.info6
-rw-r--r--system/dash/dash.SlackBuild4
-rw-r--r--system/dash/dash.info6
-rw-r--r--system/dget/dget.SlackBuild2
-rw-r--r--system/dget/dget.info10
-rw-r--r--system/dosbox-dev/dosbox-dev.SlackBuild4
-rw-r--r--system/dosbox-dev/dosbox-dev.info6
-rw-r--r--system/dse-typewriter-font/README17
-rw-r--r--system/dse-typewriter-font/doinst.sh8
-rw-r--r--system/dse-typewriter-font/dse-typewriter-font.SlackBuild47
-rw-r--r--system/dse-typewriter-font/dse-typewriter-font.info10
-rw-r--r--system/dse-typewriter-font/git2tarxz.sh45
-rw-r--r--system/dse-typewriter-font/slack-desc19
-rw-r--r--system/epson-inkjet-printer-escpr2/README.models19
-rw-r--r--system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild2
-rw-r--r--system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info6
-rw-r--r--system/execline/execline.SlackBuild2
-rw-r--r--system/execline/execline.info6
-rw-r--r--system/fcron/fcron.SlackBuild3
-rw-r--r--system/fd/fd.SlackBuild2
-rw-r--r--system/fd/fd.info6
-rw-r--r--system/filerunner/README12
-rw-r--r--system/filerunner/doinst.sh14
-rw-r--r--system/filerunner/filerunner.SlackBuild114
-rw-r--r--system/filerunner/filerunner.info10
-rw-r--r--system/filerunner/slack-desc19
-rw-r--r--system/fish/README8
-rw-r--r--system/fish/fish.SlackBuild2
-rw-r--r--system/fish/fish.info8
-rw-r--r--system/ft2demos/README26
-rw-r--r--system/ft2demos/ft2demos.SlackBuild158
-rw-r--r--system/ft2demos/ft2demos.info16
-rw-r--r--system/ft2demos/slack-desc19
-rw-r--r--system/fwupd/README2
-rw-r--r--system/fwupd/fwupd.SlackBuild4
-rw-r--r--system/fwupd/fwupd.info6
-rw-r--r--system/guake/doinst.sh12
-rw-r--r--system/guake/guake-3.7.0-fix-paths.patch22
-rw-r--r--system/guake/guake.SlackBuild51
-rw-r--r--system/guake/guake.info12
-rw-r--r--system/intelmas/README4
-rw-r--r--system/intelmas/intelmas.SlackBuild2
-rw-r--r--system/intelmas/intelmas.info8
-rw-r--r--system/intelmas/slack-desc2
-rw-r--r--system/jdupes/jdupes.SlackBuild2
-rw-r--r--system/jdupes/jdupes.info6
-rw-r--r--system/kbfs/kbfs.SlackBuild4
-rw-r--r--system/kbfs/kbfs.info10
-rw-r--r--system/keybase/keybase.SlackBuild2
-rw-r--r--system/keybase/keybase.info6
-rw-r--r--system/lbench/lbench.info2
-rw-r--r--system/letsencrypt/letsencrypt.SlackBuild2
-rw-r--r--system/letsencrypt/letsencrypt.info6
-rw-r--r--system/loksh/loksh.SlackBuild47
-rw-r--r--system/loksh/loksh.info8
-rw-r--r--system/lynis/lynis.SlackBuild4
-rw-r--r--system/lynis/lynis.info6
-rw-r--r--system/md5deep/md5deep.SlackBuild10
-rw-r--r--system/md5deep/md5deep.info2
-rw-r--r--system/memtester/README23
-rw-r--r--system/memtester/memtester.SlackBuild78
-rw-r--r--system/memtester/memtester.info12
-rw-r--r--system/memtester/slack-desc19
-rw-r--r--system/mksh/mksh.SlackBuild2
-rw-r--r--system/mksh/mksh.info6
-rw-r--r--system/mkslack/ChangeLog.txt182
-rw-r--r--system/mkslack/README70
-rw-r--r--system/mkslack/mkslack.SlackBuild34
-rw-r--r--system/mkslack/mkslack.info12
-rw-r--r--system/mkslack/slack-desc10
-rw-r--r--system/netdata/netdata.SlackBuild2
-rw-r--r--system/netdata/netdata.info6
-rw-r--r--system/noto-emoji/noto-emoji.SlackBuild6
-rw-r--r--system/noto-emoji/noto-emoji.info6
-rw-r--r--system/nvidia-driver/README14
-rw-r--r--system/nvidia-driver/changelog.txt1
-rw-r--r--system/nvidia-driver/nvidia-driver.SlackBuild4
-rw-r--r--system/nvidia-driver/nvidia-driver.info26
-rw-r--r--system/nvidia-kernel/README13
-rw-r--r--system/nvidia-kernel/nvidia-kernel.SlackBuild6
-rw-r--r--system/nvidia-kernel/nvidia-kernel.info6
-rw-r--r--system/nvidia-legacy390-driver/README24
-rw-r--r--system/nvidia-legacy390-driver/changelog.txt45
-rw-r--r--system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild4
-rw-r--r--system/nvidia-legacy390-driver/nvidia-legacy390-driver.info50
-rw-r--r--system/nvidia-legacy390-kernel/README14
-rw-r--r--system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild6
-rw-r--r--system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info10
-rw-r--r--system/nvme-cli/nvme-cli.SlackBuild2
-rw-r--r--system/nvme-cli/nvme-cli.info6
-rw-r--r--system/oksh/oksh.SlackBuild7
-rw-r--r--system/oksh/oksh.info6
-rw-r--r--system/parallel/parallel.SlackBuild2
-rw-r--r--system/parallel/parallel.info6
-rw-r--r--system/pass-otp/README2
-rw-r--r--system/pass-otp/pass-otp.SlackBuild65
-rw-r--r--system/pass-otp/pass-otp.info10
-rw-r--r--system/pass-otp/slack-desc (renamed from system/slack-scripts/slack-desc)24
-rw-r--r--system/passwordsafe/passwordsafe.SlackBuild2
-rw-r--r--system/passwordsafe/passwordsafe.info6
-rw-r--r--system/ph/README6
-rw-r--r--system/ph/ph.SlackBuild (renamed from system/slack-scripts/slack-scripts.SlackBuild)33
-rw-r--r--system/ph/ph.info10
-rw-r--r--system/ph/slack-desc19
-rw-r--r--system/phoronix-test-suite/phoronix-test-suite.SlackBuild2
-rw-r--r--system/phoronix-test-suite/phoronix-test-suite.info6
-rw-r--r--system/posh/posh.SlackBuild6
-rw-r--r--system/posh/posh.info6
-rw-r--r--system/powershell/powershell.SlackBuild2
-rw-r--r--system/powershell/powershell.info6
-rw-r--r--system/pspg/pspg.SlackBuild2
-rw-r--r--system/pspg/pspg.info6
-rw-r--r--system/ripgrep/ripgrep.SlackBuild2
-rw-r--r--system/ripgrep/ripgrep.info66
-rw-r--r--system/rmw/README.Slackware23
-rw-r--r--system/rmw/rmw.SlackBuild4
-rw-r--r--system/rmw/rmw.info6
-rw-r--r--system/s6-linux-init/README4
-rw-r--r--system/s6-linux-init/s6-linux-init.SlackBuild2
-rw-r--r--system/s6-linux-init/s6-linux-init.info6
-rw-r--r--system/s6/s6.SlackBuild2
-rw-r--r--system/s6/s6.info6
-rw-r--r--system/sandbox/sandbox.SlackBuild4
-rw-r--r--system/sandbox/sandbox.info6
-rw-r--r--system/slack-scripts/README83
-rw-r--r--system/slack-scripts/slack-scripts.info10
-rw-r--r--system/slpkg/slpkg.SlackBuild2
-rw-r--r--system/slpkg/slpkg.info6
-rw-r--r--system/sqlite2/sqlite2.info2
-rw-r--r--system/sunflower/README5
-rw-r--r--system/sunflower/doinst.sh9
-rw-r--r--system/sunflower/slack-desc19
-rw-r--r--system/sunflower/sunflower.SlackBuild98
-rw-r--r--system/sunflower/sunflower.info10
-rw-r--r--system/targetcli-fb/targetcli-fb.SlackBuild4
-rw-r--r--system/targetcli-fb/targetcli-fb.info10
-rw-r--r--system/telegraf/telegraf.SlackBuild2
-rw-r--r--system/telegraf/telegraf.info10
-rw-r--r--system/tpm/tpm.SlackBuild11
-rw-r--r--system/tpm/tpm.info6
-rw-r--r--system/ttf-ancient-fonts/README20
-rw-r--r--system/ttf-ancient-fonts/README.debian21
-rw-r--r--system/ttf-ancient-fonts/copyright.debian26
-rw-r--r--system/ttf-ancient-fonts/doinst.sh13
-rw-r--r--system/ttf-ancient-fonts/slack-desc19
-rw-r--r--system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild89
-rw-r--r--system/ttf-ancient-fonts/ttf-ancient-fonts.info10
-rw-r--r--system/unionfs-fuse/README12
-rw-r--r--system/unionfs-fuse/slack-desc19
-rw-r--r--system/unionfs-fuse/unionfs-fuse.SlackBuild92
-rw-r--r--system/unionfs-fuse/unionfs-fuse.info10
-rw-r--r--system/v4l2loopback/README9
-rw-r--r--system/v4l2loopback/doinst.sh3
-rw-r--r--system/v4l2loopback/slack-desc19
-rw-r--r--system/v4l2loopback/update_to_master_17JUN2020.patch671
-rw-r--r--system/v4l2loopback/v4l2loopback.SlackBuild98
-rw-r--r--system/v4l2loopback/v4l2loopback.info10
-rw-r--r--system/vice/README20
-rw-r--r--system/vice/config/x64.desktop9
-rw-r--r--system/vice/slack-desc2
-rw-r--r--system/vice/vice.SlackBuild8
-rw-r--r--system/wine-staging/wine-staging.SlackBuild2
-rw-r--r--system/wine-staging/wine-staging.info10
-rw-r--r--system/wine/wine.SlackBuild2
-rw-r--r--system/wine/wine.info6
-rw-r--r--system/wmgtemp/bugfix.diff14
-rw-r--r--system/wmgtemp/wmgtemp.SlackBuild34
-rw-r--r--system/wmgtemp/wmgtemp.info10
-rw-r--r--system/xen/dom0/README.dom02
-rw-r--r--system/xen/dom0/kernel-xen.sh2
-rw-r--r--system/xen/xen.SlackBuild2
-rw-r--r--system/xen/xen.info6
-rw-r--r--system/xen/xsa/xsa312.patch93
-rw-r--r--system/xen/xsa/xsa313-1.patch26
-rw-r--r--system/xen/xsa/xsa313-2.patch132
-rw-r--r--system/xen/xsa/xsa314-4.13.patch121
-rw-r--r--system/xen/xsa/xsa316-xen.patch30
-rw-r--r--system/xen/xsa/xsa318.patch39
-rw-r--r--system/yash/yash.SlackBuild5
-rw-r--r--system/yash/yash.info6
-rw-r--r--system/zfs-on-linux/zfs-on-linux.SlackBuild2
-rw-r--r--system/zfs-on-linux/zfs-on-linux.info6
213 files changed, 3037 insertions, 1417 deletions
diff --git a/system/CPU-X/CPU-X.SlackBuild b/system/CPU-X/CPU-X.SlackBuild
index 8530510954..86069a8b7a 100644
--- a/system/CPU-X/CPU-X.SlackBuild
+++ b/system/CPU-X/CPU-X.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=CPU-X
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-4.0.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -84,10 +84,8 @@ cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog.md COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/system/CPU-X/CPU-X.info b/system/CPU-X/CPU-X.info
index 8a160e9c04..a8af4b71db 100644
--- a/system/CPU-X/CPU-X.info
+++ b/system/CPU-X/CPU-X.info
@@ -1,8 +1,8 @@
PRGNAM="CPU-X"
-VERSION="3.2.4"
+VERSION="4.0.1"
HOMEPAGE="https://x0rg.github.io/CPU-X/"
-DOWNLOAD="https://github.com/X0rg/CPU-X/archive/v3.2.4/CPU-X-3.2.4.tar.gz"
-MD5SUM="1f6f8f4efedd04d6197db0b62f724e62"
+DOWNLOAD="https://github.com/X0rg/CPU-X/archive/v4.0.1/CPU-X-4.0.1.tar.gz"
+MD5SUM="4337fc118398392f90a88379ca9e2954"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libcpuid"
diff --git a/system/CPU-X/doinst.sh b/system/CPU-X/doinst.sh
index a5749a8f36..401d987795 100644
--- a/system/CPU-X/doinst.sh
+++ b/system/CPU-X/doinst.sh
@@ -7,4 +7,9 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
/usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
fi
fi
-
+
+if [ -e usr/share/glib-2.0/schemas ]; then
+ if [ -x /usr/bin/glib-compile-schemas ]; then
+ /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+ fi
+fi
diff --git a/system/Iosevka-slab/Iosevka-slab.SlackBuild b/system/Iosevka-slab/Iosevka-slab.SlackBuild
new file mode 100644
index 0000000000..369ca665fb
--- /dev/null
+++ b/system/Iosevka-slab/Iosevka-slab.SlackBuild
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Slackware build script for Iosevka-slab
+
+# Copyright 2020 Eugene M., <damagedone at gmx dot com>
+# 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.
+
+PRGNAM=Iosevka-slab
+VERSION=${VERSION:-3.2.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $TMP/$PRGNAM-$VERSION
+unzip -o $CWD/pkg-iosevka-slab-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF
+cp -a ttf/*.ttf ttc/*.ttc $PKG/usr/share/fonts/TTF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/Iosevka-slab/Iosevka-slab.info b/system/Iosevka-slab/Iosevka-slab.info
new file mode 100644
index 0000000000..8bc723275e
--- /dev/null
+++ b/system/Iosevka-slab/Iosevka-slab.info
@@ -0,0 +1,10 @@
+PRGNAM="Iosevka-slab"
+VERSION="3.2.2"
+HOMEPAGE="https://typeof.net/Iosevka/"
+DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v3.2.2/pkg-iosevka-slab-3.2.2.zip"
+MD5SUM="acb5fe7b6cbe9210c390ebfda11215ca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Eugene M."
+EMAIL="damagedone@gmx.com"
diff --git a/system/Iosevka-slab/LICENSE b/system/Iosevka-slab/LICENSE
new file mode 100644
index 0000000000..d952d62c06
--- /dev/null
+++ b/system/Iosevka-slab/LICENSE
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/Iosevka-slab/README b/system/Iosevka-slab/README
new file mode 100644
index 0000000000..0dabcd6436
--- /dev/null
+++ b/system/Iosevka-slab/README
@@ -0,0 +1,20 @@
+Iosevka is an open-source, sans-serif, monospace quasi‑proportional
+typeface family, designed for writing code, using in terminals,
+and preparing technical documents.
+
+Iosevka provides a large variety of variants. Prebuilt variants are
+listed below. For all Monospace variants' packages, it will contain
+three spacing variants.
+
+Default: The default variant with ligatures. Various symbols, like
+arrows and geometric, are wide (2-column).
+
+Terminal (“Term”):A narrower variant focusing terminal uses. Arrows and
+geometric symbols will be narrow to follow typical terminal usages.
+
+Fixed: Exact monospace font without ligatures and wide glyphs. Since
+some environments cannot interpret Iosevka or Iosevka Term as monospace,
+and have difficulties with ligatures included, you can use Iosevka Fixed
+as an alternative.
+
+Iosevka Slab variant - Monospace, Slab.
diff --git a/system/Iosevka-slab/doinst.sh b/system/Iosevka-slab/doinst.sh
new file mode 100644
index 0000000000..14f39b38cd
--- /dev/null
+++ b/system/Iosevka-slab/doinst.sh
@@ -0,0 +1,10 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+ ( cd usr/share/fonts/TTF
+ mkfontscale .
+ mkfontdir .
+ )
+ if [ -x /usr/bin/fc-cache ]; then
+ /usr/bin/fc-cache -f
+ fi
+fi
diff --git a/system/Iosevka-slab/slack-desc b/system/Iosevka-slab/slack-desc
new file mode 100644
index 0000000000..b2e63509c1
--- /dev/null
+++ b/system/Iosevka-slab/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+Iosevka-slab: Iosevka (Open source monospace coding font)
+Iosevka-slab:
+Iosevka-slab: Iosevka is a monospace typeface inspired by Pragmata Pro, M+, and
+Iosevka-slab: DIN Mono. It is designed to have a narrow shape to be space
+Iosevka-slab: efficient and compatible to CJK characters.
+Iosevka-slab:
+Iosevka-slab:
+Iosevka-slab: Homepage: https://typeof.net/Iosevka/
+Iosevka-slab:
+Iosevka-slab:
+Iosevka-slab:
diff --git a/system/Iosevka/Iosevka.SlackBuild b/system/Iosevka/Iosevka.SlackBuild
index c791211400..be13911bee 100644
--- a/system/Iosevka/Iosevka.SlackBuild
+++ b/system/Iosevka/Iosevka.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Iosevka
-# Copyright 2015-2019 Eugene M., <damagedone at gmx dot com>
+# Copyright 2015-2020 Eugene M., <damagedone at gmx dot com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=Iosevka
-VERSION=${VERSION:-2.3.3}
+VERSION=${VERSION:-3.2.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -41,12 +41,8 @@ mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
mkdir $TMP/$PRGNAM-$VERSION
-unzip -o $CWD/01-iosevka-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
-unzip -o $CWD/02-iosevka-term-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
-unzip -o $CWD/03-iosevka-type-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
-unzip -o $CWD/04-iosevka-cc-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
-unzip -o $CWD/05-iosevka-slab-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
-cd $PRGNAM-$VERSION/ttf
+unzip -o $CWD/pkg-iosevka-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -55,7 +51,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
mkdir -p $PKG/usr/share/fonts/TTF
-cp -a *.ttf $PKG/usr/share/fonts/TTF
+cp -a ttf/*.ttf ttc/*.ttc $PKG/usr/share/fonts/TTF
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
diff --git a/system/Iosevka/Iosevka.info b/system/Iosevka/Iosevka.info
index 5a30c879a0..73578e3a59 100644
--- a/system/Iosevka/Iosevka.info
+++ b/system/Iosevka/Iosevka.info
@@ -1,16 +1,8 @@
PRGNAM="Iosevka"
-VERSION="2.3.3"
+VERSION="3.2.2"
HOMEPAGE="https://typeof.net/Iosevka/"
-DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v2.3.3/01-iosevka-2.3.3.zip \
- https://github.com/be5invis/Iosevka/releases/download/v2.3.3/02-iosevka-term-2.3.3.zip \
- https://github.com/be5invis/Iosevka/releases/download/v2.3.3/03-iosevka-type-2.3.3.zip \
- https://github.com/be5invis/Iosevka/releases/download/v2.3.3/04-iosevka-cc-2.3.3.zip \
- https://github.com/be5invis/Iosevka/releases/download/v2.3.3/05-iosevka-slab-2.3.3.zip"
-MD5SUM="d05451d88596d711bf4bb1fa9b17fc41 \
- e10873b36f1e8ea1fabfb67c52751342 \
- d06b4a4d4e5d14a553c041bc26191582 \
- 20b220837781508c1c7e54174efacfc8 \
- 2122ec0ad1dde2edd7003b6d08d07782"
+DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v3.2.2/pkg-iosevka-3.2.2.zip"
+MD5SUM="827de688d4e6092233107ca3988c9ef3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/Iosevka/README b/system/Iosevka/README
index cf9f1b1825..11fd308944 100644
--- a/system/Iosevka/README
+++ b/system/Iosevka/README
@@ -1,7 +1,20 @@
-Iosevka is a slender monospace, sans-serif and slab-serif typeface
-inspired by Pragmata Pro, M+ and PF DIN Mono, designed to be the
-ideal font for programming.
+Iosevka is an open-source, sans-serif, monospace quasi‑proportional
+typeface family, designed for writing code, using in terminals,
+and preparing technical documents.
-- Four styles: Regular, Italic, Bold, and Bold Italic;
-- Extended language support for most Latin-based Western, Central and
- Northern European languages, as well as Greek and Cyrillic.
+Iosevka provides a large variety of variants. Prebuilt variants are listed
+below. For all Monospace variants' packages, it will contain three spacing
+variants.
+
+Default: The default variant with ligatures. Various symbols, like arrows
+and geometric, are wide (2-column).
+
+Terminal (“Term”):A narrower variant focusing terminal uses. Arrows and
+geometric symbols will be narrow to follow typical terminal usages.
+
+Fixed: Exact monospace font without ligatures and wide glyphs. Since some
+environments cannot interpret Iosevka or Iosevka Term as monospace, and
+have difficulties with ligatures included, you can use Iosevka Fixed as an
+alternative.
+
+Iosevka variant - Monospace, Default.
diff --git a/system/ansible/ansible.SlackBuild b/system/ansible/ansible.SlackBuild
index d51846f713..e376daa22b 100644
--- a/system/ansible/ansible.SlackBuild
+++ b/system/ansible/ansible.SlackBuild
@@ -25,7 +25,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ansible
-VERSION=${VERSION:-2.9.9}
+VERSION=${VERSION:-2.9.10}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/ansible/ansible.info b/system/ansible/ansible.info
index e271f273c8..52737fdafa 100644
--- a/system/ansible/ansible.info
+++ b/system/ansible/ansible.info
@@ -1,8 +1,8 @@
PRGNAM="ansible"
-VERSION="2.9.9"
+VERSION="2.9.10"
HOMEPAGE="https://www.ansible.com"
-DOWNLOAD="https://releases.ansible.com/ansible/ansible-2.9.9.tar.gz"
-MD5SUM="4d6b8beb8fa88e3f2697f822352b471e"
+DOWNLOAD="https://releases.ansible.com/ansible/ansible-2.9.10.tar.gz"
+MD5SUM="2d31e719fb13734f1b394daddc2e43cf"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="cryptography python3-PyYAML Jinja2"
diff --git a/system/bacula-client/bacula-client.SlackBuild b/system/bacula-client/bacula-client.SlackBuild
index f2e5727f0e..c481a020db 100644
--- a/system/bacula-client/bacula-client.SlackBuild
+++ b/system/bacula-client/bacula-client.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Bacula Client
-# Copyright 2010, 2012, 2013, 2018 Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2012, 2013, 2018, 2020 Mario Preksavec, Zagreb, Croatia
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=bacula-client
-VERSION=${VERSION:-9.0.6}
+VERSION=${VERSION:-9.6.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/bacula-client/bacula-client.info b/system/bacula-client/bacula-client.info
index c819e6ad41..506b822dd6 100644
--- a/system/bacula-client/bacula-client.info
+++ b/system/bacula-client/bacula-client.info
@@ -1,8 +1,8 @@
PRGNAM="bacula-client"
-VERSION="9.0.6"
+VERSION="9.6.3"
HOMEPAGE="http://www.bacula.org"
-DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.0.6.tar.gz"
-MD5SUM="9168e398808c42bf290515f60892f643"
+DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.6.3.tar.gz"
+MD5SUM="6d64bc27de773ee0e0ca1d836cbe4008"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/bacula/README.SLACKWARE b/system/bacula/README.SLACKWARE
index eaf57eba47..6429187729 100644
--- a/system/bacula/README.SLACKWARE
+++ b/system/bacula/README.SLACKWARE
@@ -17,8 +17,8 @@ Remember to give executable permission to /etc/rc.d/rc.local_shutdown:
chmod 0755 /etc/rc.d/rc.local_shutdown
-Upgrading from 5.2.13 to 9.0.6
-------------------------------
+Upgrading from 5.2.13/9.0.6 to 9.6.3
+------------------------------------
Before installing the new package, make sure to:
diff --git a/system/bacula/bacula.SlackBuild b/system/bacula/bacula.SlackBuild
index a7e1856c7d..30b0059daa 100644
--- a/system/bacula/bacula.SlackBuild
+++ b/system/bacula/bacula.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Bacula
-# Copyright 2010, 2012, 2013, 2018 Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2012, 2013, 2018, 2020 Mario Preksavec, Zagreb, Croatia
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=bacula
-VERSION=${VERSION:-9.0.6}
+VERSION=${VERSION:-9.6.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/bacula/bacula.info b/system/bacula/bacula.info
index 4721c04f6d..8ecb0e383d 100644
--- a/system/bacula/bacula.info
+++ b/system/bacula/bacula.info
@@ -1,8 +1,8 @@
PRGNAM="bacula"
-VERSION="9.0.6"
+VERSION="9.6.3"
HOMEPAGE="http://www.bacula.org"
-DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.0.6.tar.gz"
-MD5SUM="9168e398808c42bf290515f60892f643"
+DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.6.3.tar.gz"
+MD5SUM="6d64bc27de773ee0e0ca1d836cbe4008"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/bitmapfont2ttf/README b/system/bitmapfont2ttf/README
new file mode 100644
index 0000000000..1c9b9a50e0
--- /dev/null
+++ b/system/bitmapfont2ttf/README
@@ -0,0 +1,17 @@
+bitmapfont2ttf (convert bitmap BDF fonts to vector TTF)
+
+bitmapfont2ttf is a fontforge Python script which autotraces the glyphs
+in a bitmap font and converts it to a vector (outline) TrueType font.
+The resulting font retains its "pixelated" look when scaled up to any
+size.
+
+bitmapfont2ttf is a bit picky about the BDF fonts it will accept as
+input. This build includes a patch that allows it to work with fonts
+produced by psf2bdf (from psftools). The patch is applied by default,
+but you can export PRISTINE=yes in the environment if you really don't
+want it.
+
+If you're trying to convert a PCF font, use pcf2bdf to turn it into a
+BDF first.
+
+If you're looking for exact-autotrace, it's included in this build.
diff --git a/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild b/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild
new file mode 100644
index 0000000000..683b4abfce
--- /dev/null
+++ b/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for bitmapfont2ttf
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# The source tarball contains code from 3 git repositories:
+# https://github.com/dse/bitmapfont2ttf
+# https://github.com/dse/exact-autotrace
+# https://github.com/wernsey/bitmap.git
+# ...plus some minor fixes by me to get exact-autotrace to compile.
+
+PRGNAM=bitmapfont2ttf
+VERSION=${VERSION:-20200215_03529d2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20200621 bkw: the fonts produced by some tools (notably psf2bdf)
+# are missing the PIXEL_SIZE property. Patched code derives it from the
+# ascent and descent properties, if necessary. This isn't always correct,
+# but for the 670 fonts in /usr/share/fonts/misc (converted to BDF),
+# it's correct for 654 (98%) of them.
+if [ "${PRISTINE:-no}" != "yes" ]; then
+ patch -p1 < $CWD/derive_pixel_size.diff
+ PATCHDESC=" This package includes a patch for fonts without PIXEL_SIZE."
+fi
+
+make -C exact-autotrace CFLAGS="$SLKCFLAGS"
+strip exact-autotrace/bin/exact-autotrace-c
+mkdir -p $PKG/usr/bin
+install -m0755 exact-autotrace/bin/* bin/$PRGNAM $PKG/usr/bin
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md exact-autotrace/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+sed "16s/$/$PATCHDESC/" $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/bitmapfont2ttf/bitmapfont2ttf.info b/system/bitmapfont2ttf/bitmapfont2ttf.info
new file mode 100644
index 0000000000..194565ca53
--- /dev/null
+++ b/system/bitmapfont2ttf/bitmapfont2ttf.info
@@ -0,0 +1,10 @@
+PRGNAM="bitmapfont2ttf"
+VERSION="20200215_03529d2"
+HOMEPAGE="https://github.com/dse/bitmapfont2ttf"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/bitmapfont2ttf-20200215_03529d2.tar.xz"
+MD5SUM="5f4ab36a5d56c79e28ce38841f063bdc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/bitmapfont2ttf/derive_pixel_size.diff b/system/bitmapfont2ttf/derive_pixel_size.diff
new file mode 100644
index 0000000000..60afe3242c
--- /dev/null
+++ b/system/bitmapfont2ttf/derive_pixel_size.diff
@@ -0,0 +1,13 @@
+diff -Naur bitmapfont2ttf-20200215_03529d2/bin/bitmapfont2ttf bitmapfont2ttf-20200215_03529d2.patched/bin/bitmapfont2ttf
+--- bitmapfont2ttf-20200215_03529d2/bin/bitmapfont2ttf 2020-06-08 17:30:53.000000000 -0400
++++ bitmapfont2ttf-20200215_03529d2.patched/bin/bitmapfont2ttf 2020-06-21 04:06:26.622171278 -0400
+@@ -122,6 +122,9 @@
+ continue
+ (cmd, args) = (args[0].upper(), args[1:])
+ if cmd == 'ENDPROPERTIES':
++ if self.pixelSize == None:
++ self.pixelSize = int(self.ascent + self.descent)
++ sys.stderr.write('*** missing PIXEL_SIZE property, derived from FONT_ASCENT + FONT_DESCENT: %d\n' % self.pixelSize);
+ return
+ if cmd == 'PIXEL_SIZE' and len(args) >= 1:
+ self.pixelSize = float(args[0])
diff --git a/system/bitmapfont2ttf/slack-desc b/system/bitmapfont2ttf/slack-desc
new file mode 100644
index 0000000000..dd948af0b8
--- /dev/null
+++ b/system/bitmapfont2ttf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+bitmapfont2ttf: bitmapfont2ttf (convert bitmap BDF fonts to vector TTF)
+bitmapfont2ttf:
+bitmapfont2ttf: bitmapfont2ttf is a fontforge Python script which autotraces the
+bitmapfont2ttf: glyphs in a bitmap font and converts it to a vector (outline)
+bitmapfont2ttf: TrueType font. The resulting font retains its "pixelated" look
+bitmapfont2ttf: when scaled up to any size.
+bitmapfont2ttf:
+bitmapfont2ttf:
+bitmapfont2ttf:
+bitmapfont2ttf:
+bitmapfont2ttf:
diff --git a/system/bleachbit/bleachbit.SlackBuild b/system/bleachbit/bleachbit.SlackBuild
index a9ac2c65f6..ade1efd44a 100644
--- a/system/bleachbit/bleachbit.SlackBuild
+++ b/system/bleachbit/bleachbit.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=bleachbit
-VERSION=${VERSION:-3.9.2}
+VERSION=${VERSION:-4.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/bleachbit/bleachbit.info b/system/bleachbit/bleachbit.info
index e633252a2f..6de7e9fa1b 100644
--- a/system/bleachbit/bleachbit.info
+++ b/system/bleachbit/bleachbit.info
@@ -1,8 +1,8 @@
PRGNAM="bleachbit"
-VERSION="3.9.2"
+VERSION="4.0.0"
HOMEPAGE="https://www.bleachbit.org/"
-DOWNLOAD="https://github.com/bleachbit/bleachbit/archive/v3.9.2/bleachbit-3.9.2.tar.gz"
-MD5SUM="aefa8259cca972a5b101cc59daaf2045"
+DOWNLOAD="https://github.com/bleachbit/bleachbit/archive/v4.0.0/bleachbit-4.0.0.tar.gz"
+MD5SUM="4f2ffb465d0b3870fbd58f17f91fe57b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="pygobject3-python3"
diff --git a/system/borgbackup/borgbackup.SlackBuild b/system/borgbackup/borgbackup.SlackBuild
index 93a2e84d8d..e7b71cf172 100644
--- a/system/borgbackup/borgbackup.SlackBuild
+++ b/system/borgbackup/borgbackup.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for borgbackup
-# Copyright 2019 Andrzej Telszewski, Szczecin
+# Copyright 2020 Andrzej Telszewski, Szczecin
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=borgbackup
-VERSION=${VERSION:-1.1.10}
+VERSION=${VERSION:-1.1.13}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/borgbackup/borgbackup.info b/system/borgbackup/borgbackup.info
index 5a963a72fb..57a140bdfd 100644
--- a/system/borgbackup/borgbackup.info
+++ b/system/borgbackup/borgbackup.info
@@ -1,8 +1,8 @@
PRGNAM="borgbackup"
-VERSION="1.1.10"
+VERSION="1.1.13"
HOMEPAGE="https://borgbackup.readthedocs.io/"
-DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.10/borgbackup-1.1.10.tar.gz"
-MD5SUM="0a27e660ace162e41ea1d80e4b700808"
+DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.13/borgbackup-1.1.13.tar.gz"
+MD5SUM="a82d2bdf61bfaeebb90ac8ab1347657a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libb2 lz4 msgpack-python python3 setuptools-scm zstd"
diff --git a/system/btrbk/btrbk.SlackBuild b/system/btrbk/btrbk.SlackBuild
index 9f1dba424e..456319f52e 100644
--- a/system/btrbk/btrbk.SlackBuild
+++ b/system/btrbk/btrbk.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for btrbk
-# Copyright 2019 Alan Aversa
+# Copyright 2020 Alan Aversa
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=btrbk
-VERSION=${VERSION:-0.29.0}
+VERSION=${VERSION:-0.29.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/btrbk/btrbk.info b/system/btrbk/btrbk.info
index d8fcbb28f2..207a68cbcc 100644
--- a/system/btrbk/btrbk.info
+++ b/system/btrbk/btrbk.info
@@ -1,8 +1,8 @@
PRGNAM="btrbk"
-VERSION="0.29.0"
+VERSION="0.29.1"
HOMEPAGE="https://digint.ch/btrbk/"
-DOWNLOAD="https://digint.ch/download/btrbk/releases/btrbk-0.29.0.tar.xz"
-MD5SUM="4cd4bef295557a5cc6cc913a37d894a8"
+DOWNLOAD="https://digint.ch/download/btrbk/releases/btrbk-0.29.1.tar.xz"
+MD5SUM="624fb6c9d1e0d3d31f430ebdd3ce3f0f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild b/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild
index bab761ce93..bf1d575973 100644
--- a/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild
+++ b/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script for cpuid2cpuflags.
#
-# Copyright 2017-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2017-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil.
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cpuid2cpuflags
-VERSION=${VERSION:-8.0}
+VERSION=${VERSION:-9.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -56,7 +56,7 @@ fi
set -e
-SRCVER="8"
+SRCVER="9"
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
diff --git a/system/cpuid2cpuflags/cpuid2cpuflags.info b/system/cpuid2cpuflags/cpuid2cpuflags.info
index d156a35b47..a3fd667a8a 100644
--- a/system/cpuid2cpuflags/cpuid2cpuflags.info
+++ b/system/cpuid2cpuflags/cpuid2cpuflags.info
@@ -1,8 +1,8 @@
PRGNAM="cpuid2cpuflags"
-VERSION="8.0"
+VERSION="9.0"
HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-DOWNLOAD="https://github.com/mgorny/cpuid2cpuflags/releases/download/v8/cpuid2cpuflags-8.tar.bz2"
-MD5SUM="ec89818b94f3c38d3ad4edddd1bc8531"
+DOWNLOAD="https://github.com/mgorny/cpuid2cpuflags/releases/download/v9/cpuid2cpuflags-9.tar.bz2"
+MD5SUM="0b55c1ce1d80cbab6b82edbb3415cc7f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/dash/dash.SlackBuild b/system/dash/dash.SlackBuild
index dfb7bdf565..53945af7af 100644
--- a/system/dash/dash.SlackBuild
+++ b/system/dash/dash.SlackBuild
@@ -3,10 +3,10 @@
# Slackware build script for dash
# Written by Vincent Batts, http://hashbangbash.com/
-# Copyright 2017-2018 Donald Cooley South Haven, Indiana USA
+# Copyright 2017-2020 Donald Cooley South Haven, Indiana USA
PRGNAM=dash
-VERSION=${VERSION:-0.5.10.2}
+VERSION=${VERSION:-0.5.11}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/dash/dash.info b/system/dash/dash.info
index 93724d2bb5..0e72884d13 100644
--- a/system/dash/dash.info
+++ b/system/dash/dash.info
@@ -1,8 +1,8 @@
PRGNAM="dash"
-VERSION="0.5.10.2"
+VERSION="0.5.11"
HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.10.2.tar.gz"
-MD5SUM="8f485f126c05d0ab800e85abfe1987aa"
+DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.tar.gz"
+MD5SUM="027236e48b9202607b1418fee42c473e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libedit"
diff --git a/system/dget/dget.SlackBuild b/system/dget/dget.SlackBuild
index f3dfc9e20a..cb352c836a 100644
--- a/system/dget/dget.SlackBuild
+++ b/system/dget/dget.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=dget
-VERSION=${VERSION:-2.20.2}
+VERSION=${VERSION:-2.20.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/dget/dget.info b/system/dget/dget.info
index 466f34513b..dc8b71e5bd 100644
--- a/system/dget/dget.info
+++ b/system/dget/dget.info
@@ -1,10 +1,10 @@
PRGNAM="dget"
-VERSION="2.20.2"
+VERSION="2.20.3"
HOMEPAGE="https://goo.gl/mr1Uz3"
-DOWNLOAD="https://snapshot.debian.org/archive/debian/20200223T210712Z/pool/main/d/devscripts/devscripts_2.20.2_i386.deb"
-MD5SUM="7055c1c78f1426d1bb05384cff9f0a3d"
-DOWNLOAD_x86_64="https://snapshot.debian.org/archive/debian/20200223T210712Z/pool/main/d/devscripts/devscripts_2.20.2_amd64.deb"
-MD5SUM_x86_64="a60aa38b0e84a12bce5325b98b21fa83"
+DOWNLOAD="https://snapshot.debian.org/archive/debian/20200524T025222Z/pool/main/d/devscripts/devscripts_2.20.3_i386.deb"
+MD5SUM="93a9232729fc9aff4395cd71d9f994ce"
+DOWNLOAD_x86_64="https://snapshot.debian.org/archive/debian/20200524T025222Z/pool/main/d/devscripts/devscripts_2.20.3_amd64.deb"
+MD5SUM_x86_64="14b841f781027f6cb69e648edac653b9"
REQUIRES="dpkg"
MAINTAINER="Edinaldo P. Silva"
EMAIL="edps.mundognu@gmail.com"
diff --git a/system/dosbox-dev/dosbox-dev.SlackBuild b/system/dosbox-dev/dosbox-dev.SlackBuild
index 04c8dd06fb..f7b1ca8c4f 100644
--- a/system/dosbox-dev/dosbox-dev.SlackBuild
+++ b/system/dosbox-dev/dosbox-dev.SlackBuild
@@ -26,8 +26,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=dosbox-dev
-REVISION=${REVISION:-4335}
-VERSION=${VERSION:-0.74.3.r4335}
+REVISION=${REVISION:-4354}
+VERSION=${VERSION:-0.75_pre4354}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
DOSBOXDEV=${DOSBOXDEV:-no}
diff --git a/system/dosbox-dev/dosbox-dev.info b/system/dosbox-dev/dosbox-dev.info
index a99552ae08..8fec05bd4b 100644
--- a/system/dosbox-dev/dosbox-dev.info
+++ b/system/dosbox-dev/dosbox-dev.info
@@ -1,8 +1,8 @@
PRGNAM="dosbox-dev"
-VERSION="0.74.3.r4335"
+VERSION="0.75_pre4354"
HOMEPAGE="http://dosbox.sourceforge.net"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/dosbox-dev-0.74.3.r4335.tar.xz"
-MD5SUM="bf34dd4d40ce3131b2ab4f10057a6f5b"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/dosbox-dev-0.75_pre4354.tar.xz"
+MD5SUM="5d9807456b3c3577528c12582b3ea78e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/dse-typewriter-font/README b/system/dse-typewriter-font/README
new file mode 100644
index 0000000000..7a8d65d7a2
--- /dev/null
+++ b/system/dse-typewriter-font/README
@@ -0,0 +1,17 @@
+dse-typewriter-font (typewriter-style TrueType font)
+
+dse-typewriter-font is a coding font inspired by early 20th-century
+typewriters, with good Unicode coverage.
+
+This font is not the result of any scans or traces of samples, specimens,
+or other output from an actual typewriter. It's more like an amalgamation
+of old-school typewriter fonts with features semi-arbitrarily picked
+from each one, as well as a few not in use on actual typewriters.
+
+Features and Characteristics:
+
+* Relatively low ex-height.
+* Coding-friendly distinctive characters: li1| Oo0 `'"
+* Elite scale typeface (12 characters per inch at 12-point font size).
+* Perfectly useful as a traditional typewriter face for other purposes, if you
+ don’t mind the zero (0) having a dot in the middle.
diff --git a/system/dse-typewriter-font/doinst.sh b/system/dse-typewriter-font/doinst.sh
new file mode 100644
index 0000000000..c4c0e67fec
--- /dev/null
+++ b/system/dse-typewriter-font/doinst.sh
@@ -0,0 +1,8 @@
+if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then
+ ( cd usr/share/fonts/TTF
+ /usr/bin/mkfontscale .
+ /usr/bin/mkfontdir .
+ )
+fi
+
+[ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
diff --git a/system/dse-typewriter-font/dse-typewriter-font.SlackBuild b/system/dse-typewriter-font/dse-typewriter-font.SlackBuild
new file mode 100644
index 0000000000..857bfbcc46
--- /dev/null
+++ b/system/dse-typewriter-font/dse-typewriter-font.SlackBuild
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Slackware build script for dse-typewriter-font
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=dse-typewriter-font
+VERSION=${VERSION:-20200507_1795eb8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+# upstream permissions are bad
+find -L . -type d -exec chmod 755 {} \+
+find -L . -type f -exec chmod 644 {} \+
+
+mkdir -p $PKG/usr/share/fonts/TTF
+cp -a ttf/*.ttf $PKG/usr/share/fonts/TTF
+
+# don't include the HTML docs: they're just a copy of the homepage, except
+# they don't actually work right when installed locally.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/dse-typewriter-font/dse-typewriter-font.info b/system/dse-typewriter-font/dse-typewriter-font.info
new file mode 100644
index 0000000000..7ca0fb24a1
--- /dev/null
+++ b/system/dse-typewriter-font/dse-typewriter-font.info
@@ -0,0 +1,10 @@
+PRGNAM="dse-typewriter-font"
+VERSION="20200507_1795eb8"
+HOMEPAGE="https://webonastick.com/fonts/dse-typewriter/"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/dse-typewriter-font-20200507_1795eb8.tar.xz"
+MD5SUM="fc138176cffc5e8acb8937132a16d4c6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/dse-typewriter-font/git2tarxz.sh b/system/dse-typewriter-font/git2tarxz.sh
new file mode 100644
index 0000000000..e4d12c1807
--- /dev/null
+++ b/system/dse-typewriter-font/git2tarxz.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=dse-typewriter-font
+GITUSER=dse
+CLONE_URL=https://github.com/$GITUSER/$PRGNAM.git
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+ git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/dse-typewriter-font/slack-desc b/system/dse-typewriter-font/slack-desc
new file mode 100644
index 0000000000..d1ad44a2c3
--- /dev/null
+++ b/system/dse-typewriter-font/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+dse-typewriter-font: dse-typewriter-font (typewriter-style TrueType font)
+dse-typewriter-font:
+dse-typewriter-font: dse-typewriter-font is a coding font inspired by early 20th-century
+dse-typewriter-font: typewriters, with good Unicode coverage.
+dse-typewriter-font:
+dse-typewriter-font: This font is not the result of any scans or traces of samples,
+dse-typewriter-font: specimens, or other output from an actual typewriter. It's more
+dse-typewriter-font: like an amalgamation of old-school typewriter fonts with features
+dse-typewriter-font: semi-arbitrarily picked from each one, as well as a few not in use
+dse-typewriter-font: on actual typewriters.
+dse-typewriter-font:
diff --git a/system/epson-inkjet-printer-escpr2/README.models b/system/epson-inkjet-printer-escpr2/README.models
index c01fd4baee..a1eaab3d8a 100644
--- a/system/epson-inkjet-printer-escpr2/README.models
+++ b/system/epson-inkjet-printer-escpr2/README.models
@@ -5,15 +5,16 @@ ET-3700 Series, ET-3710 Series, ET-3750 Series, ET-3760 Series,
ET-4750 Series, ET-4760 Series, ET-5800 Series, ET-5850 Series,
ET-5880 Series, ET-8700 Series, ET-M1140 Series, ET-M1170 Series,
ET-M1180 Series, ET-M2140 Series, ET-M2170 Series, ET-M3140 Series,
-ET-M3170 Series, ET-M3180 Series, EW-M630T Series, EW-M670FT Series,
-EW-M752T Series, L14150 Series, L15150 Series, L15160 Series,
-L6160 Series, L6170 Series, L6190 Series, L6550 Series, L6570 Series,
-L6580 Series, M1140 Series, M1170 Series, M1180 Series, M2140 Series,
-M2170 Series, M3140 Series, M3170 Series, M3180 Series, PM-520 Series,
-PX-M270FT Series, PX-M270T Series, PX-M380F, PX-M381FL,
-PX-M5080F Series, PX-M5081F Series, PX-M680F Series, PX-M7070FX,
-PX-M7080FX, PX-M7090FX, PX-M7110F, PX-M7110FP, PX-M780F Series,
-PX-M781F Series, PX-M880FX, PX-M884F, PX-M885F, PX-M886FL,
+ET-M3170 Series, ET-M3180 Series, EW-M5610FT Series, EW-M630T Series,
+EW-M670FT Series, EW-M752T Series, L14150 Series, L15150 Series,
+L15160 Series, L6160 Series, L6170 Series, L6190 Series, L6550 Series,
+L6570 Series, L6580 Series, M1140 Series, M1170 Series, M1180 Series,
+M2140 Series, M2170 Series, M3140 Series, M3170 Series, M3180 Series,
+PM-520 Series, PX-M270FT Series, PX-M270T Series, PX-M380F, PX-M381FL,
+PX-M5080F Series, PX-M5081F Series, PX-M6711FT Series,
+PX-M6712FT Series, PX-M680F Series, PX-M7070FX, PX-M7080FX,
+PX-M7090FX, PX-M7110F, PX-M7110FP, PX-M780F Series, PX-M781F Series,
+PX-M791FT Series, PX-M880FX, PX-M884F, PX-M885F, PX-M886FL,
PX-S270T Series, PX-S380, PX-S381L, PX-S5010 Series, PX-S5080 Series,
PX-S7070X, PX-S7090X, PX-S7110, PX-S7110P, PX-S880X, PX-S884, PX-S885,
ST-3000 Series, ST-4000 Series, ST-C8000 Series, ST-M1000 Series,
diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
index c7f7e59a8f..9951334480 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
@@ -26,7 +26,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=epson-inkjet-printer-escpr2
-VERSION=${VERSION:-1.1.12}
+VERSION=${VERSION:-1.1.13}
EXTRABIT=1lsb3.2
TARNAM=$PRGNAM-$VERSION-$EXTRABIT.tar.gz
BUILD=${BUILD:-1}
diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
index 57d5f728ca..af3c0d5501 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
@@ -1,8 +1,8 @@
PRGNAM="epson-inkjet-printer-escpr2"
-VERSION="1.1.12"
+VERSION="1.1.13"
HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/"
-DOWNLOAD="https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm"
-MD5SUM="164704ab2b47332f1adc721784abfc0a"
+DOWNLOAD="https://download3.ebz.epson.net/dsc/f/03/00/11/33/72/48e6a853e518a1bedaee575113e087c0bd5d6e2e/epson-inkjet-printer-escpr2-1.1.13-1lsb3.2.src.rpm"
+MD5SUM="719bddd9d941107271ea04fe051d0574"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/execline/execline.SlackBuild b/system/execline/execline.SlackBuild
index 9ac5f81812..21073e4cba 100644
--- a/system/execline/execline.SlackBuild
+++ b/system/execline/execline.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=execline
-VERSION=${VERSION:-2.6.0.0}
+VERSION=${VERSION:-2.6.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/execline/execline.info b/system/execline/execline.info
index 95df22837a..58480eb10b 100644
--- a/system/execline/execline.info
+++ b/system/execline/execline.info
@@ -1,8 +1,8 @@
PRGNAM="execline"
-VERSION="2.6.0.0"
+VERSION="2.6.1.0"
HOMEPAGE="https://skarnet.org/software/execline/"
-DOWNLOAD="https://skarnet.org/software/execline/execline-2.6.0.0.tar.gz"
-MD5SUM="5b359440600cba9a31c4e7efba87d4ca"
+DOWNLOAD="https://skarnet.org/software/execline/execline-2.6.1.0.tar.gz"
+MD5SUM="150ee543391b0dff693cf3b8fdd76e54"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="skalibs"
diff --git a/system/fcron/fcron.SlackBuild b/system/fcron/fcron.SlackBuild
index 2744dff620..835f21f70f 100644
--- a/system/fcron/fcron.SlackBuild
+++ b/system/fcron/fcron.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=fcron
VERSION=${VERSION:-3.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Select fcron's default user/group
@@ -94,6 +94,7 @@ find -L . \
--with-boot-install=no \
--with-cflags="$SLKCFLAGS" \
--with-docdir=/usr/doc \
+ --without-pam \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--localstatedir=/var \
--mandir=/usr/man \
diff --git a/system/fd/fd.SlackBuild b/system/fd/fd.SlackBuild
index 30cd58191b..51e82e4b94 100644
--- a/system/fd/fd.SlackBuild
+++ b/system/fd/fd.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=fd
-VERSION=${VERSION:-8.1.0}
+VERSION=${VERSION:-8.1.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/fd/fd.info b/system/fd/fd.info
index fa48f25b37..8298b53d32 100644
--- a/system/fd/fd.info
+++ b/system/fd/fd.info
@@ -1,7 +1,7 @@
PRGNAM="fd"
-VERSION="8.1.0"
+VERSION="8.1.1"
HOMEPAGE="https://github.com/sharkdp/fd"
-DOWNLOAD="https://github.com/sharkdp/fd/archive/v8.1.0/fd-8.1.0.tar.gz \
+DOWNLOAD="https://github.com/sharkdp/fd/archive/v8.1.1/fd-8.1.1.tar.gz \
https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.10.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \
@@ -68,7 +68,7 @@ DOWNLOAD="https://github.com/sharkdp/fd/archive/v8.1.0/fd-8.1.0.tar.gz \
https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate"
-MD5SUM="b9a6bdde9d6d50e0f7c14b366a5bb621 \
+MD5SUM="5a18528c91b4e81b99803d1bda5a8e08 \
abc51f82118d86e83165ba87e2521e96 \
294a49d3c53865fa7ac5d0ce2f5d5735 \
f44e8d1d2e61974b268852797530ea41 \
diff --git a/system/filerunner/README b/system/filerunner/README
new file mode 100644
index 0000000000..13cd824d28
--- /dev/null
+++ b/system/filerunner/README
@@ -0,0 +1,12 @@
+filerunner (two-pane graphical file manager)
+
+FileRunner is a very configurable two-pane file manager for Unix and
+Windows systems. It is simple and efficient and has a built-in FTP/SFTP
+client.
+
+FileRunner's config files can be found in ~/.config/.fr.
+
+Note: the FileRunner executable is normally called /usr/bin/fr. I've
+renamed it to /usr/bin/filerunner, since there's already a system/fr
+package that installs a /usr/bin/fr. If system/fr is not installed,
+you'll get a /usr/bin/fr symlink to filerunner.
diff --git a/system/filerunner/doinst.sh b/system/filerunner/doinst.sh
new file mode 100644
index 0000000000..f05aaf46fc
--- /dev/null
+++ b/system/filerunner/doinst.sh
@@ -0,0 +1,14 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
+
+# If there's no fr link, take over:
+if [ ! -r usr/bin/fr ]; then
+ ( cd usr/bin ; ln -sf filerunner fr )
+fi
diff --git a/system/filerunner/filerunner.SlackBuild b/system/filerunner/filerunner.SlackBuild
new file mode 100644
index 0000000000..365286bdc0
--- /dev/null
+++ b/system/filerunner/filerunner.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Slackware build script for filerunner
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Upstream's official RPM release claims to be noarch, but it's a dirty
+# lie: it includes libinotify1.4.1.so binaries[*] for various arches. So
+# does the source, but we're not trusting binaries that were probably
+# built on Red Hat. The source for the prebuilt binaries is included,
+# so this script compiles it instead.
+
+# [*] It breaks FHS and Slackware standards by installing arch-dependent
+# files (shared libs) in /usr/share, too. But I'm going to leave it
+# that way.
+
+PRGNAM=filerunner
+VERSION=${VERSION:-20.05.02.17}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=fr
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+# called twice, make it a func
+fixperms() {
+ chown -R root:root .
+ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $PRGNAM
+fixperms
+
+# DO NOT use precompiled binaries!
+rm -rf packages/inotify/*
+
+# Use tcl's idea of our architecture, since that's what fr will use
+# to locate the inotify tcl extension.
+TCLARCH="$( echo 'puts $::tcl_platform(machine)' | tclsh )"
+mkdir -p packages/inotify/$TCLARCH
+
+# Compile the library that prevents this from being a noarch package:
+cd Makefiles
+LIBNAM=tcl-inotify
+LIBVER="$( echo $LIBNAM-*.tar.gz | sed 's,.*-\([0-9.]*\)\.tar.gz,\1,' )"
+tar xvf $LIBNAM-$LIBVER.tar.gz
+fixperms
+
+cd $LIBNAM-$LIBVER
+./configure && make
+
+# Install it where fr INSTALL script expects to find it.
+install -s libinotify$LIBVER.so \
+ $TMP/$PRGNAM/packages/inotify/$TCLARCH
+
+# Now we can install the main package.
+cd -
+DESTDIR=$PKG \
+DOCS=/usr/doc/$PRGNAM-$VERSION \
+ ./INSTALL -nogui
+
+# Make this symlink so fr won't try to do it at runtime (and fail, if
+# not running as root).
+( cd $PKG/usr/share/$PRGNAM/packages/inotify
+ ln -s $TCLARCH/libinotify$LIBVER.so . )
+
+# We have a slight conflict with system/fr, so:
+mv $PKG/usr/bin/$SRCNAM $PKG/usr/bin/$PRGNAM
+sed -i "/^Exec/s|$SRCNAM|$PRGNAM|" $PKG/usr/share/applications/$PRGNAM.desktop
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/filerunner/filerunner.info b/system/filerunner/filerunner.info
new file mode 100644
index 0000000000..1304749807
--- /dev/null
+++ b/system/filerunner/filerunner.info
@@ -0,0 +1,10 @@
+PRGNAM="filerunner"
+VERSION="20.05.02.17"
+HOMEPAGE="https://sourceforge.net/projects/filerunner/"
+DOWNLOAD="https://downloads.sourceforge.net/project/filerunner/release-20.05.02.17/fr-20.05.02.17.tar.gz"
+MD5SUM="a8787d750f729c8487e44e16075aa671"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/filerunner/slack-desc b/system/filerunner/slack-desc
new file mode 100644
index 0000000000..c40867c9a6
--- /dev/null
+++ b/system/filerunner/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+filerunner: filerunner (two-pane graphical file manager)
+filerunner:
+filerunner: FileRunner is a very configurable two-pane file manager for Unix
+filerunner: and Windows systems. It is simple and efficient and has a built-in
+filerunner: FTP/SFTP client.
+filerunner:
+filerunner:
+filerunner:
+filerunner:
+filerunner:
+filerunner:
diff --git a/system/fish/README b/system/fish/README
index 2f0a1f4067..00f5c35adf 100644
--- a/system/fish/README
+++ b/system/fish/README
@@ -10,9 +10,7 @@ from the y/bsdgames package. In a stock installation with default PATH
ordering, /usr/bin should be checked before /usr/games, so it shouldn't
be an issue, but we thought it was worth noting just in case.
-Optional packages (also found at slackbuilds.org):
- sphinx
- libedit
+Optional packages (also found at slackbuilds.org): sphinx libedit
NOTES:
@@ -32,3 +30,7 @@ SlackBuild or typically (as normal user or root):
$ fish
$ source /etc/profile.d/man-db.sh
$ fish_update_completions
+
+If you are upgrading from version 3.0.0 or before, please also review
+the release notes for 3.1.1, 3.1.0 and 3.1b1 at
+https://fishshell.com/release_notes.html.
diff --git a/system/fish/fish.SlackBuild b/system/fish/fish.SlackBuild
index 5e098fed36..909ee515e2 100644
--- a/system/fish/fish.SlackBuild
+++ b/system/fish/fish.SlackBuild
@@ -25,7 +25,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=fish
-VERSION=${VERSION:-3.1.0}
+VERSION=${VERSION:-3.1.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/fish/fish.info b/system/fish/fish.info
index 80c1720b99..b70ec030e0 100644
--- a/system/fish/fish.info
+++ b/system/fish/fish.info
@@ -1,10 +1,10 @@
PRGNAM="fish"
-VERSION="3.1.0"
+VERSION="3.1.2"
HOMEPAGE="https://fishshell.com/"
-DOWNLOAD="https://github.com/fish-shell/fish-shell/releases/download/3.1.0/fish-3.1.0.tar.gz"
-MD5SUM="8c9995a5a6d07ce05a1413ca24e16691"
+DOWNLOAD="https://github.com/fish-shell/fish-shell/releases/download/3.1.2/fish-3.1.2.tar.gz"
+MD5SUM="2e9f12a250dccb9ab0529ae6f77710a0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="man-db"
MAINTAINER="Donald Cooley"
-EMAIL="chytraeus@protonmail.com"
+EMAIL="chytraeu@sdf.org"
diff --git a/system/ft2demos/README b/system/ft2demos/README
new file mode 100644
index 0000000000..048f6be971
--- /dev/null
+++ b/system/ft2demos/README
@@ -0,0 +1,26 @@
+ft2demos (freetype demos and tools)
+
+Set of demo programs and tools for freetype. Can be useful for testing
+and debugging problems with fonts (or with freetype itself). Includes
+these tools:
+
+ftbench - benchmark some common FreeType paths
+ftchkwd - test fixed font width
+ftdiff - compare font hinting modes
+ftdump - simple font dumper
+ftgamma - screen gamma calibration helper
+ftgrid - simple glyph grid viewer
+ftlint - simple font tester
+ftmemchk - simple memory tester (tests FreeType's memory allocator)
+ftmulti - multiple masters font viewer
+ftpatchk - tests whether patented hinting is necessary
+ftstring - string viewer (displays text in specified font)
+fttimer - simple performance timer
+ftvalid - font layout table validator
+ftview - simple glyph viewer
+ttdebug - a TrueType bytecode debugger
+
+Most of the commands have man pages. Also most of the commands show
+usage info if you run them with --help (or with no arguments).
+
+This package is known as "freetype2-demos" on Arch and Debian systems.
diff --git a/system/ft2demos/ft2demos.SlackBuild b/system/ft2demos/ft2demos.SlackBuild
new file mode 100644
index 0000000000..6f4c2805c9
--- /dev/null
+++ b/system/ft2demos/ft2demos.SlackBuild
@@ -0,0 +1,158 @@
+#!/bin/sh
+
+# Slackware build script for ft2demos
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# This thing requires first building (but not installing) freetype2,
+# hence all the downloads.
+
+# This script is heavily based on Pat Volkerding's freetype.SlackBuild:
+# https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/
+# ...and Arch Linux's freetype2-demos PKGBUILD:
+# https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/freetype2
+
+# Note to self: keep VERSION in sync with Pat's patches/freetype.
+
+PRGNAM=ft2demos
+VERSION=${VERSION:-2.6.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+LIBNAM=freetype
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-build
+mkdir -p $PRGNAM-build
+cd $PRGNAM-build
+tar xvf $CWD/$LIBNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+chown -R root:root .
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Build process wants this symlink.
+ln -s $LIBNAM-$VERSION ${LIBNAM}2
+
+### First, build FreeType, since ft2demos needs the whole source tree.
+cd $LIBNAM-$VERSION
+
+# Apply Pat's patches
+zcat $CWD/freetype.illadvisederror.diff.gz | patch -p1
+zcat $CWD/freetype.CVE-2017-8287.diff.gz | patch -p1
+
+# Enable the validators needed by the ftvalid command. Part 1 of a
+# DIRTY_HACK to make ftvalid work.
+sed -i '/^# *AUX_MODULES.*valid/s|^# *||' modules.cfg
+
+# Use Pat's build command (but no make install!)
+CFLAGS="$SLKCFLAGS" \
+ make setup \
+ CFG="--prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX} --build=$ARCH-slackware-linux"
+make
+
+### Now, build ft2demos. These will end up dynamically linked to the
+# system libfreetype.so after package installation, *except* for
+# ftvalid, which won't work with Slackware's libfreetype.so, so it
+# gets statically linked with the libfreetype.a we just built. See
+# DIRTY_HACK, parts 1 and 2.
+cd $TMP/$PRGNAM-build/$PRGNAM-$VERSION
+
+# Build the extra executables
+sed -i '/^ *# *EXES/s|# *||' Makefile
+
+# Don't try to build ftvalid yet. If we do, the resulting binary is
+# useless, complains that none of its validation methods are compiled in,
+# and suggests rebuilding FreeType.
+sed -i '/EXES *+= *ftvalid/d' Makefile
+
+# Don't include RPATH in binaries (borrowed from Arch)
+sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
+
+# Don't have to specify CFLAGS here, it'll pick them up from the freetype
+# build we just did.
+make
+
+# DIRTY_HACK, part 2. Get the link command libtool generated for ftvalid,
+# and replace freetype.so with freetype.a (the static lib). This is me
+# working around libtool's "helpful" automation. Die, libtool!
+echo "=== Prepare for dirty hack, put on your goggles now"
+make EXES=ftvalid | tee make.out
+
+echo "=== ftvalid.build.cmd:"
+grep '^libtool: link:' make.out | \
+ cut -d: -f3- | \
+ sed 's|/usr/lib[^/]*/libfreetype.so||' | \
+ sed 's|\([^ *]\.libs/libfreetype.\)so|\1a|' | \
+ tee ftvalid.build.cmd
+
+# Now run the abomination we've created. If it fails, don't let set -e
+# kill the whole script (we'll just make a package without ftvalid).
+sh ./ftvalid.build.cmd || echo "!!! Attempt to build ftvalid failed"
+
+# The semi-static ftvalid is big, but still under 1MB. Also, if you
+# run ldd on it, you'll see libfreetype.so is required... this is because
+# of a circular dependency with harfbuzz. It doesn't seem to cause a
+# problem for ftvalid.
+echo "=== Stand down from dirty hack alert, you may now remove your goggles"
+
+# There is no 'make install', this bit was borrowed from Arch.
+mkdir -p $PKG/usr/bin
+for i in bin/{f,t}t*; do
+ libtool --mode=install install $i $PKG/usr/bin
+done
+strip $PKG/usr/bin/*
+
+# For whatever reason, the Arch and Debian packages don't install the
+# man pages.
+mkdir -p $PKG/usr/man/man1
+for i in src/*.1; do
+ gzip -9c < $i > $PKG/usr/man/man1/$( basename $i).gz
+done
+
+# The README is build instructions, don't bother. Instead, include our
+# own README which at least lists the tools and their short descriptions.
+# The ChangeLog goes back to 2000, don't need the whole damn thing.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+head -n1000 ChangeLog > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ft2demos/ft2demos.info b/system/ft2demos/ft2demos.info
new file mode 100644
index 0000000000..50c3bc2ea5
--- /dev/null
+++ b/system/ft2demos/ft2demos.info
@@ -0,0 +1,16 @@
+PRGNAM="ft2demos"
+VERSION="2.6.3"
+HOMEPAGE="http://www.freetype.org"
+DOWNLOAD="https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-2.6.3.tar.bz2 \
+ https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype-2.6.3.tar.xz \
+ https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype.CVE-2017-8287.diff.gz \
+ https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype.illadvisederror.diff.gz"
+MD5SUM="f7c6102f29834a80456264fe4edd81d1 \
+ c806890db47d8ad8887253a926377e33 \
+ eea2e24cf46314d716d0668f5fdbbf08 \
+ 419295091bb684f531c3ba9614fea3a0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/ft2demos/slack-desc b/system/ft2demos/slack-desc
new file mode 100644
index 0000000000..22f4cbc5e3
--- /dev/null
+++ b/system/ft2demos/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+ft2demos: ft2demos (freetype demos and tools)
+ft2demos:
+ft2demos: Set of demo programs and tools for freetype. Can be useful for testing
+ft2demos: and debugging problems with fonts (or with freetype itself). Includes
+ft2demos: these tools:
+ft2demos:
+ft2demos: ftbench ftchkwd ftdiff ftdump ftgamma ftgrid ftlint ftmemchk
+ft2demos: ftmulti ftpatchk ftstring fttimer ftvalid ftview ttdebug
+ft2demos:
+ft2demos:
+ft2demos:
diff --git a/system/fwupd/README b/system/fwupd/README
index cb483338da..b5c9ef78e2 100644
--- a/system/fwupd/README
+++ b/system/fwupd/README
@@ -7,4 +7,4 @@ Options (all default to false):
ENABLE_UEFI: true|false - requires pygobject3-python3 python3-pillow
py3cairo
- https://github.com/fwupd/fwupd/blob/1.2.10/meson_options.txt
+ https://github.com/fwupd/fwupd/blob/1.2.12/meson_options.txt
diff --git a/system/fwupd/fwupd.SlackBuild b/system/fwupd/fwupd.SlackBuild
index 8493264dc1..6d8b9ff19b 100644
--- a/system/fwupd/fwupd.SlackBuild
+++ b/system/fwupd/fwupd.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for fwupd
-# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=fwupd
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.2.12}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/fwupd/fwupd.info b/system/fwupd/fwupd.info
index 9ca69fcdeb..d754a08b2e 100644
--- a/system/fwupd/fwupd.info
+++ b/system/fwupd/fwupd.info
@@ -1,8 +1,8 @@
PRGNAM="fwupd"
-VERSION="1.2.10"
+VERSION="1.2.12"
HOMEPAGE="https://www.fwupd.org"
-DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.2.10/fwupd-1.2.10.tar.gz"
-MD5SUM="ad3765dc9409fa1d9b46dc712fd041e4"
+DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.2.12/fwupd-1.2.12.tar.gz"
+MD5SUM="a34c51aa4b9b0c8bec77f1943e846183"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libxmlb libgusb efivar json-glib gcab"
diff --git a/system/guake/doinst.sh b/system/guake/doinst.sh
index c9b09eac64..5c97dbdc86 100644
--- a/system/guake/doinst.sh
+++ b/system/guake/doinst.sh
@@ -1,13 +1,3 @@
-schema_install() {
- SCHEMA="$1"
- GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
- chroot . gconftool-2 --makefile-install-rule \
- /etc/gconf/schemas/$SCHEMA \
- 1>/dev/null
-}
-
- schema_install guake.schemas
-
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
@@ -20,6 +10,6 @@ fi
if [ -e usr/share/glib-2.0/schemas ]; then
if [ -x /usr/bin/glib-compile-schemas ]; then
- /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+ /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
fi
fi
diff --git a/system/guake/guake-3.7.0-fix-paths.patch b/system/guake/guake-3.7.0-fix-paths.patch
new file mode 100644
index 0000000000..0cd91ef062
--- /dev/null
+++ b/system/guake/guake-3.7.0-fix-paths.patch
@@ -0,0 +1,22 @@
+--- guake/paths.py.orig 2020-02-10 16:10:10.000000000 -0500
++++ guake/paths.py 2020-06-08 20:32:03.423403158 -0400
+@@ -55,8 +55,8 @@
+
+
+ def get_default_locale_dir():
+- d = os.path.join(get_data_files_dir(), "po")
+- log.debug("Using guake image directory: %s", d)
++ d = '/usr/share/locale'
++ log.debug("Using guake locale directory: %s", d)
+ return d
+
+
+@@ -73,7 +73,7 @@
+
+
+ def get_default_schema_dir():
+- d = get_default_data_dir()
++ d = '/usr/share/glib-2.0/schemas'
+ log.debug("Using guake scheme directory: %s", d)
+ return d
+
diff --git a/system/guake/guake.SlackBuild b/system/guake/guake.SlackBuild
index 0bf0b55b94..2713b9539e 100644
--- a/system/guake/guake.SlackBuild
+++ b/system/guake/guake.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for guake
# Copyright 2017-2018 Donald Cooley South Haven, IN USA
+# Copyright (C) 2020 Logan Rathbone <poprocks@gmail.com> Province of Ontario, Canada
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=guake
-VERSION=${VERSION:-0.8.14}
+VERSION=${VERSION:-3.7.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -40,20 +41,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
set -e
rm -rf $PKG
@@ -69,35 +56,19 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-schemas-install \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# fix some of the broken paths
+patch -p0 < $CWD/guake-3.7.0-fix-paths.patch
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make generate-desktop generate-mo compile-glib-schemas-dev
+make DESTDIR="$PKG" PREFIX='/usr' install-schemas install-locale
+python3 setup.py install --root "$PKG" --prefix="/usr" --optimize=1
-find $PKG -name perllocal.pod \
- -o -name ".packlist" \
- -o -name "*.bs" \
- | xargs rm -f
+# don't ship duplicate .mo and .po files
+rm -rf $PKG/usr/share/guake/po
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS COPYING INSTALL NEWS README.rst ChangeLog \
+ COPYING NEWS.rst README.rst \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/guake/guake.info b/system/guake/guake.info
index 4318250bec..4bc7673e19 100644
--- a/system/guake/guake.info
+++ b/system/guake/guake.info
@@ -1,10 +1,10 @@
PRGNAM="guake"
-VERSION="0.8.14"
+VERSION="3.7.0"
HOMEPAGE="http://guake.org"
-DOWNLOAD="https://github.com/Guake/guake/archive/0.8.14/guake-0.8.14.tar.gz"
-MD5SUM="a0155a28c4417d3c6200afbdebe2c306"
+DOWNLOAD="https://files.pythonhosted.org/packages/f1/20/32c2c8fe2ec4d5c38dbdd2b2ee60a382a529d0409c7a9960b2453e50d0d7/guake-3.7.0.tar.gz"
+MD5SUM="7934c9c214e25cbc706cd9a8e806becd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="pyxdg python-keybinder gnome-python2-gconf gnome-common"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+REQUIRES="libwnck3 vte3 python3 py3cairo dbus-python3 pygobject3-python3 pbr"
+MAINTAINER="Logan Rathbone"
+EMAIL="poprocks@gmail.com"
diff --git a/system/intelmas/README b/system/intelmas/README
index c3075ac504..2b3a4f8d60 100644
--- a/system/intelmas/README
+++ b/system/intelmas/README
@@ -8,6 +8,6 @@ The intelmas unifies functionality of several Intel programs including
the isdct (Intel SSD Data Center Tool), which was previously available
on SBo. The intelmas is a drop-in replacement for the isdct.
-The sg kernel module is required by isdct. To have this module loaded
-on boot, please uncomment the corresponding line in
+To work with SATA drives intelmas requires the sg kernel module. To have
+this module loaded on boot, please uncomment the corresponding line in
/etc/rc.d/rc.modules.local
diff --git a/system/intelmas/intelmas.SlackBuild b/system/intelmas/intelmas.SlackBuild
index 3cd7ff438e..3c95edea2b 100644
--- a/system/intelmas/intelmas.SlackBuild
+++ b/system/intelmas/intelmas.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=intelmas
-VERSION=${VERSION:-1.0.5}
+VERSION=${VERSION:-1.0.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/intelmas/intelmas.info b/system/intelmas/intelmas.info
index bca088fc70..128171c17c 100644
--- a/system/intelmas/intelmas.info
+++ b/system/intelmas/intelmas.info
@@ -1,8 +1,8 @@
PRGNAM="intelmas"
-VERSION="1.0.5"
-HOMEPAGE="https://downloadcenter.intel.com/download/29337"
-DOWNLOAD="https://downloadmirror.intel.com/29337/eng/Intel%C2%AE_MAS_CLI_Tool_1.0.5_Linux.zip"
-MD5SUM="6233fbfabd8d95635c3f02cc39431d66"
+VERSION="1.0.6"
+HOMEPAGE="https://downloadcenter.intel.com/download/29628"
+DOWNLOAD="https://downloadmirror.intel.com/29628/eng/Intel%C2%AE_MAS_CLI_Tool_1.0.6%20Linux.zip"
+MD5SUM="553b27387a1f4a2350c60c63bae2d1f5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/intelmas/slack-desc b/system/intelmas/slack-desc
index f478f9e568..53eb9649a6 100644
--- a/system/intelmas/slack-desc
+++ b/system/intelmas/slack-desc
@@ -13,7 +13,7 @@ intelmas: and Optane memory devices. It provides firmware update capability as
intelmas: well as reading and setting many configuration settings.
intelmas:
intelmas:
-intelmas: Homepage: https://downloadcenter.intel.com/download/29337
+intelmas: Homepage: https://downloadcenter.intel.com/download/29628
intelmas:
intelmas:
intelmas:
diff --git a/system/jdupes/jdupes.SlackBuild b/system/jdupes/jdupes.SlackBuild
index f75edaf9d8..7ce0b87762 100644
--- a/system/jdupes/jdupes.SlackBuild
+++ b/system/jdupes/jdupes.SlackBuild
@@ -21,7 +21,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=jdupes
-VERSION=${VERSION:-1.14.0}
+VERSION=${VERSION:-1.16.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/jdupes/jdupes.info b/system/jdupes/jdupes.info
index 7756a60a72..db523f2c2d 100644
--- a/system/jdupes/jdupes.info
+++ b/system/jdupes/jdupes.info
@@ -1,8 +1,8 @@
PRGNAM="jdupes"
-VERSION="1.14.0"
+VERSION="1.16.0"
HOMEPAGE="https://github.com/jbruchon/jdupes"
-DOWNLOAD="https://github.com/jbruchon/jdupes/archive/v1.14.0/jdupes-1.14.0.tar.gz"
-MD5SUM="9b4905699deb8354ef3e80c46bf615cf"
+DOWNLOAD="https://github.com/jbruchon/jdupes/archive/v1.16.0/jdupes-1.16.0.tar.gz"
+MD5SUM="7fcddb187bc18ed761c05265b05bc02f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/kbfs/kbfs.SlackBuild b/system/kbfs/kbfs.SlackBuild
index 9358635440..70342d9747 100644
--- a/system/kbfs/kbfs.SlackBuild
+++ b/system/kbfs/kbfs.SlackBuild
@@ -24,8 +24,8 @@
PRGNAM=kbfs
SRCNAM=keybase
-VERSION=${VERSION:-5.4.2_20200424214931}
-COMMITVER=7b0bbf1e3c
+VERSION=${VERSION:-5.5.1_20200527202541}
+COMMITVER=39ca0071e5
SRCVER=$(echo $VERSION | tr _ - )
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/kbfs/kbfs.info b/system/kbfs/kbfs.info
index 752a371325..4e55341daf 100644
--- a/system/kbfs/kbfs.info
+++ b/system/kbfs/kbfs.info
@@ -1,10 +1,10 @@
PRGNAM="kbfs"
-VERSION="5.4.2_20200424214931"
+VERSION="5.5.1_20200527202541"
HOMEPAGE="https://github.com/keybase/kbfs"
-DOWNLOAD="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.4.2-20200424214931.7b0bbf1e3c_i386.deb"
-MD5SUM="c3ff8a32002d4588f7dc02f9697ca75f"
-DOWNLOAD_x86_64="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.4.2-20200424214931.7b0bbf1e3c_amd64.deb"
-MD5SUM_x86_64="cb652e4be711eaf3511f276de6b6fb91"
+DOWNLOAD="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.5.1-20200527202541.39ca0071e5_i386.deb"
+MD5SUM="05f29974643ebb448b2ad3499a5fb535"
+DOWNLOAD_x86_64="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.5.1-20200527202541.39ca0071e5_amd64.deb"
+MD5SUM_x86_64="22829bb5610e3857c5c272f5d2617754"
REQUIRES="google-go-lang sshfs-fuse"
MAINTAINER="Willy Sudiarto Raharjo"
EMAIL="willysr@slackbuilds.org"
diff --git a/system/keybase/keybase.SlackBuild b/system/keybase/keybase.SlackBuild
index ab49569939..53074a2095 100644
--- a/system/keybase/keybase.SlackBuild
+++ b/system/keybase/keybase.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=keybase
SRCNAM=client
-VERSION=${VERSION:-5.4.2}
+VERSION=${VERSION:-5.5.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/keybase/keybase.info b/system/keybase/keybase.info
index 9bb9cddb0f..067930cec9 100644
--- a/system/keybase/keybase.info
+++ b/system/keybase/keybase.info
@@ -1,8 +1,8 @@
PRGNAM="keybase"
-VERSION="5.4.2"
+VERSION="5.5.1"
HOMEPAGE="https://github.com/keybase/client"
-DOWNLOAD="https://github.com/keybase/client/archive/v5.4.2/client-5.4.2.tar.gz"
-MD5SUM="ec3b14e02e199263e78ace312c119570"
+DOWNLOAD="https://github.com/keybase/client/archive/v5.5.1/client-5.5.1.tar.gz"
+MD5SUM="cba784105f1449edeb1b063728714b25"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="google-go-lang"
diff --git a/system/lbench/lbench.info b/system/lbench/lbench.info
index 99b4b5abdf..39c6d2d16d 100644
--- a/system/lbench/lbench.info
+++ b/system/lbench/lbench.info
@@ -1,7 +1,7 @@
PRGNAM="lbench"
VERSION="3.7"
HOMEPAGE="http://kornelix.net/lbench/lbench.html"
-DOWNLOAD="http://kornelix.net/downloads/tarballs/lbench-3.7.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lbench-3.7.tar.gz"
MD5SUM="ba1cf6181d3748489ebe68b3c98d3565"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/system/letsencrypt/letsencrypt.SlackBuild b/system/letsencrypt/letsencrypt.SlackBuild
index ae0599a4a7..5c6f1a303d 100644
--- a/system/letsencrypt/letsencrypt.SlackBuild
+++ b/system/letsencrypt/letsencrypt.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=letsencrypt
SRCNAM=certbot
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.5.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/letsencrypt/letsencrypt.info b/system/letsencrypt/letsencrypt.info
index f61627931d..9f12a2db58 100644
--- a/system/letsencrypt/letsencrypt.info
+++ b/system/letsencrypt/letsencrypt.info
@@ -1,8 +1,8 @@
PRGNAM="letsencrypt"
-VERSION="1.4.0"
+VERSION="1.5.0"
HOMEPAGE="https://letsencrypt.org/"
-DOWNLOAD="https://github.com/certbot/certbot/archive/v1.4.0/certbot-1.4.0.tar.gz"
-MD5SUM="142c73ebd9c682445d75e37a83d13939"
+DOWNLOAD="https://github.com/certbot/certbot/archive/v1.5.0/certbot-1.5.0.tar.gz"
+MD5SUM="6a8bc9f1bd826f568c02f2319bcb75b2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="configobj mock pytz python3-pythondialog zope.component pyrfc3339 psutil python-parsedatetime python-configargparse werkzeug ndg_httpsclient python3-augeas josepy funcsigs requests-toolbelt python-distro python3-certifi python3-packaging"
diff --git a/system/loksh/loksh.SlackBuild b/system/loksh/loksh.SlackBuild
index 31f9e194c8..3720480e91 100644
--- a/system/loksh/loksh.SlackBuild
+++ b/system/loksh/loksh.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for loksh
-# Copyright 2018-2019 Hunter Sezen California, USA
+# Copyright 2018-2020 Hunter Sezen California, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=loksh
-VERSION=${VERSION:-6.6}
+VERSION=${VERSION:-6.7.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -59,9 +59,9 @@ set -eu
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,16 +69,35 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-make \
- CFLAGS="$SLKCFLAGS"
+if [ "${DEBUG:=0}" != 0 ]; then
+ NDEBUG=false
+ RELEASE=debug
+ SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0/')"
+else
+ NDEBUG=true
+ RELEASE=plain
+fi
-make install \
- PREFIX=/usr \
- BIN_NAME=$PRGNAM \
- BIN_DIR=/bin \
- MAN_DIR=/usr/man \
- DOC_DIR=/usr/doc/$PRGNAM-$VERSION \
- DESTDIR=$PKG
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+meson \
+ --prefix=/ \
+ --bindir=bin \
+ --libdir=usr/lib${LIBDIRSUFFIX} \
+ --mandir=usr/man \
+ --datadir=usr \
+ -Dstrip=$NDEBUG \
+ -Db_ndebug=$NDEBUG \
+ -Dbuildtype=$RELEASE \
+ build
+
+"${NINJA:=ninja}" -C build
+DESTDIR=$PKG "$NINJA" -C build install
+
+mv -- $PKG/bin/ksh $PKG/bin/$PRGNAM
+mv -- $PKG/usr/man/man1/ksh.1 $PKG/usr/man/man1/$PRGNAM.1
+mv -- $PKG/usr/man/man1/sh.1 $PKG/usr/man/man1/$PRGNAM-sh.1
+mv -- $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
mkdir -p $PKG/usr/bin
ln -s /bin/$PRGNAM $PKG/usr/bin/$PRGNAM
diff --git a/system/loksh/loksh.info b/system/loksh/loksh.info
index 7c68610ff4..5e3d180812 100644
--- a/system/loksh/loksh.info
+++ b/system/loksh/loksh.info
@@ -1,10 +1,10 @@
PRGNAM="loksh"
-VERSION="6.6"
+VERSION="6.7.2"
HOMEPAGE="https://github.com/dimkr/loksh"
-DOWNLOAD="https://github.com/dimkr/loksh/archive/6.6/loksh-6.6.tar.gz"
-MD5SUM="06b00072a7b41075f78c8d5ebfd5c1ef"
+DOWNLOAD="https://github.com/dimkr/loksh/releases/download/6.7.2/loksh-6.7.2.tar.xz"
+MD5SUM="abe82b1d897e28f55f88fa030a854425"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="meson"
MAINTAINER="Hunter Sezen"
EMAIL="orbea@riseup.net"
diff --git a/system/lynis/lynis.SlackBuild b/system/lynis/lynis.SlackBuild
index 480ce79145..1db260e378 100644
--- a/system/lynis/lynis.SlackBuild
+++ b/system/lynis/lynis.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for lynis
-# Copyright 2016-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=lynis
-VERSION=${VERSION:-2.7.5}
+VERSION=${VERSION:-3.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/lynis/lynis.info b/system/lynis/lynis.info
index cbe145eed1..2ba1485fdd 100644
--- a/system/lynis/lynis.info
+++ b/system/lynis/lynis.info
@@ -1,8 +1,8 @@
PRGNAM="lynis"
-VERSION="2.7.5"
+VERSION="3.0.0"
HOMEPAGE="https://cisofy.com/"
-DOWNLOAD="https://downloads.cisofy.com/lynis/lynis-2.7.5.tar.gz"
-MD5SUM="fb527b6976e70a6bcd57036c9cddc242"
+DOWNLOAD="https://downloads.cisofy.com/lynis/lynis-3.0.0.tar.gz"
+MD5SUM="7f6777843fc4f30ea16e4e2bf393f797"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/md5deep/md5deep.SlackBuild b/system/md5deep/md5deep.SlackBuild
index 9f4760f7a0..b049d8efab 100644
--- a/system/md5deep/md5deep.SlackBuild
+++ b/system/md5deep/md5deep.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for md5deep
# Copyright 2009-2015 Erik W. Hanson, Minneapolis, MN, USA
-# Copyright 2015-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
PRGNAM=md5deep
SRCNAM=hashdeep
VERSION=${VERSION:-4.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -62,9 +62,13 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $SRCNAM-release-$VERSION
-tar xvf $CWD/$SRCNAM-release-$VERSION.tar.gz || tar xvf $CWD/release-$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM-release-$VERSION.tar.gz
cd $SRCNAM-release-$VERSION
chown -R root:root .
+
+# Remove loop
+rm -rf tests/testfiles/symlinktest/
+
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
diff --git a/system/md5deep/md5deep.info b/system/md5deep/md5deep.info
index 655b55c6ac..eaed42214d 100644
--- a/system/md5deep/md5deep.info
+++ b/system/md5deep/md5deep.info
@@ -1,7 +1,7 @@
PRGNAM="md5deep"
VERSION="4.4"
HOMEPAGE="https://github.com/jessek/hashdeep/"
-DOWNLOAD="https://github.com/jessek/hashdeep/archive/release-4.4.tar.gz"
+DOWNLOAD="https://github.com/jessek/hashdeep/archive/release-4.4/hashdeep-release-4.4.tar.gz"
MD5SUM="9ccfd5ba3e3d9cffddeb118cacad0c27"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/system/memtester/README b/system/memtester/README
new file mode 100644
index 0000000000..df134f1b2e
--- /dev/null
+++ b/system/memtester/README
@@ -0,0 +1,23 @@
+memtester (memory test utility)
+
+memtester is a userspace utility for testing the memory subsystem for
+faults. Unlike memtest86, it runs as a process on a running Linux system,
+meaning it can't test all of memory the way memtest86 is able to... but
+you don't have to reboot to use it.
+
+Note that, by definition, memtester counts as a denial-of-service
+(resource exhaustion) attack against the local machine. Be cautious
+about using it, and definitely *read its man page* before use.
+
+memtester has traditionally been run as root, so that it can lock the
+memory it's testing to prevent swapping and remapping. However, it's
+possible to use capabilities to allow it to run correctly as a normal
+user. Use something like:
+
+# chown root:console /usr/bin/memtester
+# chmod 0750 /usr/bin/memtester
+# setcap cap_ipc_lock=ep /usr/bin/memtester
+
+This allows anyone in the "console" group to run memtester. You could
+also create a memtester group and use it in the chown command above,
+if you'd rather have more fine-grained control.
diff --git a/system/memtester/memtester.SlackBuild b/system/memtester/memtester.SlackBuild
new file mode 100644
index 0000000000..d32e2086c4
--- /dev/null
+++ b/system/memtester/memtester.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Slackware build script for memtester
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# The _5 is the debian patchlevel.
+
+PRGNAM=memtester
+VERSION=${VERSION:-4.3.0_5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCVER="$( echo $VERSION | cut -d_ -f1 )"
+DEBVER="$( echo $VERSION | cut -d_ -f2 )"
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
+tar xvf $CWD/${PRGNAM}_$SRCVER-$DEBVER.debian.tar.xz
+chown -R root:root .
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# These patches don't do much, but they're worth having.
+for i in $( cat debian/patches/series ); do
+ patch -p1 < debian/patches/$i
+done
+
+# After applying the debian patches, CC doesn't get a default value (?)
+make CC=${CC:-gcc} CFLAGS="$SLKCFLAGS"
+make install INSTALLPATH=$PKG/usr
+
+# Binary already stripped, manpage already gzipped.
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUGS CHANGELOG COPYING README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/memtester/memtester.info b/system/memtester/memtester.info
new file mode 100644
index 0000000000..eac51c6c69
--- /dev/null
+++ b/system/memtester/memtester.info
@@ -0,0 +1,12 @@
+PRGNAM="memtester"
+VERSION="4.3.0_5"
+HOMEPAGE="http://pyropus.ca/software/memtester/"
+DOWNLOAD="http://pyropus.ca/software/memtester/old-versions/memtester-4.3.0.tar.gz \
+ http://deb.debian.org/debian/pool/main/m/memtester/memtester_4.3.0-5.debian.tar.xz"
+MD5SUM="598f41b7308e1f736164bca3ab84ddbe \
+ a1db0271761c3913357a1930e5753e3b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/memtester/slack-desc b/system/memtester/slack-desc
new file mode 100644
index 0000000000..d68f3dccba
--- /dev/null
+++ b/system/memtester/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+memtester: memtester (memory test utility)
+memtester:
+memtester: memtester is a userspace utility for testing the memory subsystem
+memtester: for faults. Unlike memtest86, it runs as a process on a running
+memtester: Linux system, meaning it can't test all of memory the way memtest86
+memtester: is able to... but you don't have to reboot to use it.
+memtester:
+memtester:
+memtester:
+memtester:
+memtester:
diff --git a/system/mksh/mksh.SlackBuild b/system/mksh/mksh.SlackBuild
index a1f011e469..23d3874da8 100644
--- a/system/mksh/mksh.SlackBuild
+++ b/system/mksh/mksh.SlackBuild
@@ -26,7 +26,7 @@
# Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
PRGNAM=mksh
-VERSION=${VERSION:-R59}
+VERSION=${VERSION:-R59b}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/mksh/mksh.info b/system/mksh/mksh.info
index d50ce27aa6..49c3168021 100644
--- a/system/mksh/mksh.info
+++ b/system/mksh/mksh.info
@@ -1,8 +1,8 @@
PRGNAM="mksh"
-VERSION="R59"
+VERSION="R59b"
HOMEPAGE="http://mirbsd.de/mksh"
-DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59.tgz"
-MD5SUM="995ddf33b4b52d48bb9a648ce996f791"
+DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59b.tgz"
+MD5SUM="dce6abffc2036288540b9ba11dfb2ec8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/mkslack/ChangeLog.txt b/system/mkslack/ChangeLog.txt
deleted file mode 100644
index 365b4d14d9..0000000000
--- a/system/mkslack/ChangeLog.txt
+++ /dev/null
@@ -1,182 +0,0 @@
-Mon 01 Aug 2016 20:22:51 BST
-Version 5.1
-Do not rename python and perl packages.
-Sat 30 Jul 2016 03:27:00 BST
-Version 5.0
-Fix documentation
-Thu 28 Jul 2016 02:25:54 BST
-Version 4.9
-Updated templates for i586
-Mon 04 May 2015 05:48:43 BST
-Version 4.8
-Remove some debugging code
-Sat 11 Apr 2015 23:18:49 BST
-Version 4.7
-Add autotools as the first option.
-Wed 24 Dec 2014 09:32:31 GMT
-Update various build templates and revised documentation line.
-Mon 07 Apr 2014 10:12:35 BST
-Add waf template.
-+--------------------------+
-Tue 31 Dec 2013 03:02:59 GMT
-Info file: Remove APPROVED. Add REQUIRES.
-+--------------------------+
-Mon 30 Dec 2013 11:22:07 GMT
-Bugfix for missing manpage lines in autotools template.
-+--------------------------+
-Fri 22 Nov 2013 08:49:14 GMT
-Updated SlackBuild templates
-+--------------------------+
-Sun 30 Oct 2011 00:25:05 BST
-Added --infodir to autotools template
-+--------------------------+
-Tue 25 Oct 2011 19:25:35 BST
-Version 4.0
-Minor edit of mkslack.conf
-Added a chmod +x of SlackBuild
-+--------------------------+
-Sun 24 Apr 2011 17:30:38 BST
-Version 4.0
-Hmm where did 3.9 go?
-Fixed a problem with repeating additions to doinst.sh
-Removed annoying ... from slack-desc
-+--------------------------+
-Tue 08 Feb 2011 22:29:23 GMT
-Version 3.8
-Added support to auto-add year into slackbuilds.
-+--------------------------+
-Sun Jan 16 18:55:57 GMT 2011
-Version 3.7
-Added ruby support.
-+--------------------------+
-Tue 09 Nov 2010 12:07:36 PM GMT
-Version 3.6
-Bugfix for docmuentation
-+--------------------------+
-Tue 21 Sep 2010 18:45:16 BST
-Version 3.5
-Added 'doc' as an option for documentation
-+--------------------------+
-Mon 20 Sep 2010 08:28:24 BSTTue 07 Sep 2010 15:24:53 BST
-Version 3.4
-Changed .desktop and mimetype grep to case-insensitive.
-Added stock doinst.sh to templates for convenience.
-+--------------------------+
-Version 3.3 finalised
-+--------------------------+
-Thu 12 Aug 2010 06:35:28 BST
-Version 3.3rc8
-Small code improvements
-+--------------------------+
-Sat 31 Jul 2010 20:59:50 BST
-Version 3.3rc6
-Small bugfix for $PKG with python/perl packages.
-+--------------------------+
-Thu 01 Jul 2010 03:14:02 BST
-Version 3.3rc5
-Small bugfix.
-+--------------------------+
-Wed 30 Jun 2010 19:39:47 BST
-Version 3.3rc4
-Small bugfix.
-+--------------------------+
-Wed 30 Jun 2010 17:28:31 BST
-Version 3.3rc3
-Cleaned up message for usr/share/man pages found.
-+--------------------------+
-Wed 30 Jun 2010 09:54:37 BST
-Version 3.3rc2
-Reverted back to not needing an underscore for TAG.
-+--------------------------+
-Wed 30 Jun 2010 09:07:19 BST
-Version 3.3rc1
-Incorporated slakmagik's nice, new code.
--r is now -b (for build)
-A new -V for version check.
-With -b you get the choice of having a failed build fixed and
-rebuilt. Mostly for manpage/info errors. A new config option
-ERRORACTION to do this, which can be PROMPT, AUTO or EXIT.
-Now config file errors are reported back.
-Now TAG _must_ have a preceding underscore, which keeps it in
-line with slackbuilds.
-+--------------------------+
-Sun 27 Jun 2010 16:28:32 BST
-Version 3.1
-Fixed ARCH bug.
-Now puts appname into first line of slack-desc.
-+--------------------------+
-Wed 23 Jun 2010 23:59:14 BST
-Version 3.0
-Adjusted docs.
-+--------------------------+
-Tue 22 Jun 2010 19:47:26 BST
-Version 2.9
-Code improvements.
-+--------------------------+
-Tue 22 Jun 2010 19:47:05 BST
-Version 2.8
-???
-+--------------------------+
-Tue 22 Jun 2010 17:48:34 BST
-Version 2.7
-Adjusted docs.
-+--------------------------+
-Tue 22 Jun 2010 09:30:00 BST
-Version 2.6
-Upgraded to new perl template.
-+--------------------------+
-Mon 21 Jun 2010 01:12:41 BST
-Version 2.6
-Fixed python support.
-+--------------------------+
-Sun 20 Jun 2010 02:35:23 BST
-Version 2.5
-Improved backups. Added KEEPBACKUPS option to conf.
-+--------------------------+
-Sun 20 Jun 2010 01:20:39 BST
-Version 2.4
-Fixed slack-desc.
-+--------------------------+
-Sun 20 Jun 2010 00:44:02 BST
-Version 2.3
-Code improvements.
-+--------------------------+
-Sun 20 Jun 2010 00:12:41 BST
-Version 2.2
-Improved support for perl modules.
-+--------------------------+
-Fri 18 Jun 2010 01:07:52 BST
-Version 2.1
-Added some support for ./autogen.sh or autoreconf in configure
-is missing. YMMV on this.
-+--------------------------+
-Thu 17 Jun 2010 22:29:57 BST
-Version 2.0
-Added function to check for latest version.
-+--------------------------+
-Sun 13 Jun 2010 21:51:29 BST
-Version 1.9
-Fixed tag error
-+--------------------------+
-Sun 13 Jun 2010 19:20:55 BST
-Version 1.8
-Various code improvements
-+--------------------------+
-Sun 13 Jun 2010 10:24:38 BST
-Version 1.7
-Fixed _tag bug in package name.
-+--------------------------+
-Thu 10 Jun 2010 21:48:12 BST
-Version 1.6
-Updated for all templates on slackbuilds.org
-It _should_ detect the correct template to use.
-YMMV ;-)
-+--------------------------+
-Mon 31 May 2010 01:52:00 BST
-Version 1.5
-Minor bugfix.
-+--------------------------+
-Sat 29 May 2010 12:35:08 BST
-Version 1.4
-Updated SlackBuild template to the latest on slackbuilds.org
-+--------------------------+
diff --git a/system/mkslack/README b/system/mkslack/README
index 2899a7efdf..e30ce3d17c 100644
--- a/system/mkslack/README
+++ b/system/mkslack/README
@@ -1,70 +1,6 @@
-mkslack - a SlackBuild generator script
+mkslack - a SlackBuild generator
-This slackbuild generator uses templates stored in
-/usr/share/mkslack/templates and a config file
-/etc/mkslack/mkslack.conf which you must edit for name, email, tag and
-a few options.
-
-
-Idea for use:
-
-The initial slackbuild and info file are built by this script, and
-when a test build/install is done and working, the files should be
-tweaked by hand. Especially don't forget to fill in the rest of the
-details in the .info. One thing to point out is that mkslack will
-overwrite these files if run again unless you set KEEPBACKUPS="YES"
-in the conf (default).
-
-This is only a starter kit! You ARE expected to edit the created
-files by hand afterwards to remove unnecesary parts and add extra
-options!
-
-
-Syntax:
+mkslack generates SlackBuild scripts and supporting files using the
+standard SBo templates found at https://slackbuilds.org/templates/
mkslack [options] archive
-
-Options:
--h --help Usage.
--b --build Run SlackBuild after creation. Got root?
--i --install Install the package after running.
--l --list Pipe archive contents to /usr/bin/most and exit.
--v --version Version of mkslack.
--V --ckver Check for new version.
-
-With no option set, mkslack will generate the SlackBuild and other
-files, print out a small message, and then quit.
-
-
-Config options:
-
-NAME, EMAIL as they should appear in .SlackBuild and .info TAG should
-be your custom tag and defaults to _SBo KEEPBACKUPS="YES|NO" up to 5
-backups of .SlackBuild and other files are kept. The higher the
-number, the older they are. ERRORACTION="PROMPT|AUTO|EXIT" what to
-do on build errors. Using AUTO or answering 'y' to the prompt will
-have the slackbuild adjusted for man and info pages and then rebuilt.
-Waf scripts don't exit on a '1' return code so it scans the end of
-the to see if there is an unrecognised configure option (the most
-frequent error with waf).
-
-
-CLI Options:
-
-The documents list in top level of source tree can be adjusted by
-command:
-DOCS="SomeFile" mkslack archive
-This will add 'SomeFile' to the list. You can also edit the DOCS list
-in this script. Any that it doesn't find will be removed from the
-list.
-
-Build can be specified by:
-BUILD=2 mkslack archive
-Otherwise it defaults to 1.
-
-ARCH can be specified by:
-ARCH=xxx mkslack archive
-It defaults to whatever is set in the system, or what the SlackBuild
-finds or sets.
-
-TAG can also be specified.
diff --git a/system/mkslack/mkslack.SlackBuild b/system/mkslack/mkslack.SlackBuild
index 1a76a876f4..1f216ff64e 100644
--- a/system/mkslack/mkslack.SlackBuild
+++ b/system/mkslack/mkslack.SlackBuild
@@ -2,8 +2,8 @@
# Slackware build script for mkslack
-# Copyright 2010 David Woodfall <dave@slackbuilds.org>,
-# Modifications copyright slakmagik <slakmagik@gmail.com>
+# Copyright 2010-20 Dave Woodfall <dave@slackbuilds.org>,
+# slakmagik <slakmagik@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=mkslack
-VERSION=${VERSION:-5.2}
+VERSION=${VERSION:-5.3.0}
ARCH=noarch
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -38,12 +38,13 @@ README=$PKG/usr/doc/$PRGNAM-$VERSION/README
set -e
rm -rf $PKG
-mkdir -p $TMP $PKG/usr/bin $PKG/usr/share/mkslack/templates $PKG/etc/mkslack \
- $PKG/usr/man/man1 $OUTPUT
+mkdir -p $TMP $OUTPUT \
+ $PKG/usr/share/mkslack/templates
+
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION/$PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -51,30 +52,31 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i -e "s/@VERSION@/$VERSION/" mkslack.1
gzip mkslack.1
-install -m 644 mkslack.1.gz $PKG/usr/man/man1
-install -m 755 mkslack $PKG/usr/bin
-install -m 644 template* $PKG/usr/share/mkslack/templates
-install -m 644 *SlackBuild $PKG/usr/share/mkslack/templates
-install -m 644 mkslack.conf.new $PKG/etc/mkslack
+install -m 644 -D mkslack.1.gz $PKG/usr/man/man1/mkslack.1.gz
+install -m 755 -D mkslack $PKG/usr/bin/mkslack
+install -m 644 -D mkslack.conf.new $PKG/etc/mkslack/mkslack.conf.new
+install -m 644 templates/* $PKG/usr/share/mkslack/templates
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a original-templates $PKG/usr/doc/$PRGNAM-$VERSION
+
# generate the README from some introductory text and a dump of the manual
cat << EOF > $README
mkslack - a SlackBuild generator script
-Copyright 2010 David Woodfall, modification by slakmagik
+Copyright 2010-2020 Dave Woodfall, modification by slakmagik
mkslack is licensed under a "one-clause BSD/Slackware" license.
See the script for the full text.
-Homepage: http://tty1.uk/slackbuilds/noversion/mkslack/
+Homepage: http://tty1.uk/slackbuilds/noversion/mkslack
EOF
-man ./mkslack.1.gz | col -b | expand | cat -s | sed '
+man ./mkslack.1.gz | col -b | expand | fmt -72 | cat -s | sed "
1d
s/\([^[:space:]]\)[[:space:]][[:space:]]*/\1 /g
/^$/N;/MKSLACK(1)$/D
- ' >> $README
+ " >> $README
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/ChangeLog.txt > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog.txt
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/mkslack/mkslack.info b/system/mkslack/mkslack.info
index a204e9218d..aa0d1d5b5d 100644
--- a/system/mkslack/mkslack.info
+++ b/system/mkslack/mkslack.info
@@ -1,10 +1,10 @@
PRGNAM="mkslack"
-VERSION="5.2"
-HOMEPAGE="http://tty1.uk/slackbuilds/noversion/mkslack"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/mkslack-5.2.tar.gz"
-MD5SUM="1866d9b32bee61a5bdfca52230e2a6f0"
+VERSION="5.3.0"
+HOMEPAGE="http://tty1.uk/slackbuilds/mkslack"
+DOWNLOAD="http://git.tty1.uk/cgit.cgi/mkslack/snapshot/mkslack-5.3.0.tar.gz"
+MD5SUM="d58dff15c9621d2c2d6aacd6eec42372"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@slackbuilds.org"
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@tty1.uk"
diff --git a/system/mkslack/slack-desc b/system/mkslack/slack-desc
index b02ac1b0af..f96062efc2 100644
--- a/system/mkslack/slack-desc
+++ b/system/mkslack/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
@@ -16,4 +16,4 @@ mkslack:
mkslack: The config file /etc/mkslack/mkslack.conf should be customised with
mkslack: your name, email etc. before use.
mkslack:
-mkslack: http://tty1.uk/slackbuilds/noversion/mkslack
+mkslack:
diff --git a/system/netdata/netdata.SlackBuild b/system/netdata/netdata.SlackBuild
index 4ae6009854..8a4ed50d3e 100644
--- a/system/netdata/netdata.SlackBuild
+++ b/system/netdata/netdata.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=netdata
-VERSION=${VERSION:-1.21.1}
+VERSION=${VERSION:-1.22.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/netdata/netdata.info b/system/netdata/netdata.info
index 359a67cef9..825b5ae88e 100644
--- a/system/netdata/netdata.info
+++ b/system/netdata/netdata.info
@@ -1,8 +1,8 @@
PRGNAM="netdata"
-VERSION="1.21.1"
+VERSION="1.22.1"
HOMEPAGE="https://github.com/netdata/netdata"
-DOWNLOAD="https://github.com/netdata/netdata/archive/v1.21.1/netdata-1.21.1.tar.gz"
-MD5SUM="0f87dc0fb1b2f7af877a8c0d0eb2b1f7"
+DOWNLOAD="https://github.com/netdata/netdata/archive/v1.22.1/netdata-1.22.1.tar.gz"
+MD5SUM="c235613311fec3a7a2993565ec590165"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="PyYAML libuv"
diff --git a/system/noto-emoji/noto-emoji.SlackBuild b/system/noto-emoji/noto-emoji.SlackBuild
index 0a282408ec..edf52a6efa 100644
--- a/system/noto-emoji/noto-emoji.SlackBuild
+++ b/system/noto-emoji/noto-emoji.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for noto-emoji
-# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,11 +23,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=noto-emoji
-VERSION=${VERSION:-20191119}
+VERSION=${VERSION:-20200408}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-SRCVERSION=${SRCVERSION:-2019-11-19-unicode12}
+SRCVERSION=${SRCVERSION:-2020-04-08-unicode12_1}
ARCH=noarch
diff --git a/system/noto-emoji/noto-emoji.info b/system/noto-emoji/noto-emoji.info
index 72868fcb29..b71a88a26e 100644
--- a/system/noto-emoji/noto-emoji.info
+++ b/system/noto-emoji/noto-emoji.info
@@ -1,9 +1,9 @@
PRGNAM="noto-emoji"
-VERSION="20191119"
+VERSION="20200408"
HOMEPAGE="https://www.google.com/get/noto/help/emoji/"
-DOWNLOAD="https://github.com/googlei18n/noto-emoji/archive/v2019-11-19-unicode12/noto-emoji-2019-11-19-unicode12.tar.gz \
+DOWNLOAD="https://github.com/googlei18n/noto-emoji/archive/v2020-04-08-unicode12_1/noto-emoji-2020-04-08-unicode12_1.tar.gz \
https://gist.githubusercontent.com/hexchain/47f550472e79d0805060/raw/d9ecd5a5fcb901bcfb75115f4b602f6c1d3020c1/51-noto-color-emoji.conf.xml"
-MD5SUM="8e449a8d1bfbca27332aba7c68a4c55f \
+MD5SUM="84fdd55819be83ab22c4db8a096421c3 \
e2d9cf0460fa0315a8da5d8dedacf702"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index ac48e8d9dd..a72b5a9047 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -2,10 +2,11 @@ This is the proprietary binary video driver from NVidia for the X.Org
X-server. This package does not include the kernel-module - it is a part
of the nvidia-kernel package at SlackBuilds.org.
-NOTE: 64-bit x86_64 support ONLY for Slackware64. For x86 32-bit support,
-use nvidia-legacy390-{driver,kernel}
+NOTE: 64-bit x86_64 support ONLY for Slackware64. For x86 32-bit
+support, use nvidia-legacy390-{driver,kernel}
-Installing the 32-bit compatibility libraries is available: if desired, do:
+Installing the 32-bit compatibility libraries is available: if desired,
+do:
COMPAT32="yes" ./nvidia-driver.SlackBuild
If you plan to test this buildscript on current (15.0 EXPERIMENTAL), to
@@ -19,9 +20,10 @@ Several useful utilities are included: nvidia-xsettings, nvidia-smi, and
nvidia-settings. Please refer to the Nvidia documentation and man pages
for details and usage.
-For CUDA/OpenCL to work after reboot, and for utilites such as nvidia-smi,
-you might need to include the following line in your /etc/rc.d/rc.local:
-(This is required if you plan on running nvidia-persistenced)
+For CUDA/OpenCL to work after reboot, and for utilites such as
+nvidia-smi, you might need to include the following line in your
+/etc/rc.d/rc.local: (This is required if you plan on running
+nvidia-persistenced)
# Create missing nvidia device nodes after reboot
/usr/bin/nvidia-modprobe -c 0 -u
diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index 9f4e710aff..f08b8c1a6b 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -51,3 +51,4 @@
7.3 24-Mar-2020 version update LLB, fixes nvidia-switch; doinst; update patch (thanks Daniel B.)
7.4 03-Apr-2020 script cleanups, added rc.nvidia-persitenced
new maintainer Lenard Spencer <lenardrspencer@gmail.com>
+7.5 27-JUN-2020 version update LLB
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index c6baba6ce0..4427a56ca9 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -27,8 +27,8 @@
# see changelog.txt
PRGNAM=nvidia-driver
-VERSION=${VERSION:-440.82}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-440.100}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
CURRENT=${CURRENT:-no}
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index afaf437f08..efc558ff7f 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,20 +1,20 @@
PRGNAM="nvidia-driver"
-VERSION="440.82"
+VERSION="440.100"
HOMEPAGE="http://www.nvidia.com"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/440.82/NVIDIA-Linux-x86_64-440.82.run \
- https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-440.82.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-440.82.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-440.82.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.82.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-440.82.tar.bz2"
-MD5SUM_x86_64="80eb4fd64124c5cab0ebf560f84a9bfa \
- de77054e0718af0d164eed7409805d12 \
- 3e70b9d80cae148d86c4173ba3fff1c5 \
- c457dfcfd7c490f087ae09f76352738a \
- cb2f2ae00e623399961a1f9ab276fea0 \
- fefdfa0b14ed6369e319a41e0fb90c79"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/440.100/NVIDIA-Linux-x86_64-440.100.run \
+ https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-440.100.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-440.100.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-440.100.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.100.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-440.100.tar.bz2"
+MD5SUM_x86_64="7b99bcd2807ecd37af60d29de7bc30c2 \
+ 0549194f418fd1b4189e68ab04185459 \
+ ff3c7c317483c078f97efc9a794d5b85 \
+ 696ae6ec596fec78fe8c360fe91d6a81 \
+ 3e584be299f8948b13626974757f0141 \
+ 8ef4b7498ed2740a1f1d3dcf103a985c"
REQUIRES="nvidia-kernel"
MAINTAINER="Lenard Spencer"
EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-kernel/README b/system/nvidia-kernel/README
index 442c313a38..d1a52f94b6 100644
--- a/system/nvidia-kernel/README
+++ b/system/nvidia-kernel/README
@@ -1,13 +1,14 @@
-This is the kernel-module needed by the proprietary binary nvidia driver.
-You also need the nvidia-driver package from SlackBuilds.org.
+This is the kernel-module needed by the proprietary binary nvidia
+driver. You also need the nvidia-driver package from SlackBuilds.org.
To build the package for a kernel different from the running one,
start the script setting the KERNEL variable as in
KERNEL=4.6.3 ./nvidia-kernel.SlackBuild
-A default config file is placed at /usr/share/X11/xorg.conf.d/10-nvidia.conf
-to make sure that X loads the nvidia module. If you need to make changes,
-move that file to /etc/X11/xorg.conf.d/ and edit the copy. You do not need
-this file at all if you have a proper and complete xorg.conf.
+A default config file is placed at
+/usr/share/X11/xorg.conf.d/10-nvidia.conf to make sure that X loads the
+nvidia module. If you need to make changes, move that file to
+/etc/X11/xorg.conf.d/ and edit the copy. You do not need this file at
+all if you have a proper and complete xorg.conf.
The xf86-video-nouveau-blacklist package from /extra is required.
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index 8a3dc86ed2..ffd40b6fa9 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -29,7 +29,7 @@
# see nvidia-driver/changelog.txt
PRGNAM=nvidia-kernel
-VERSION=${VERSION:-440.82}
+VERSION=${VERSION:-440.100}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -90,10 +90,6 @@ if [ "$TARGET" = "x86_64" ]; then
install -m 0664 kernel/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
fi
-# Make sure the X is specified to automagically load the
-# correct driver, since I always forget. You can remove
-# this file if you have an equivilent entry in /etc/X11/xorg.d
-
mkdir -p $PKG/usr/share/X11/xorg.conf.d/
cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index 8329d052fd..56f7bfc1c9 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,10 @@
PRGNAM="nvidia-kernel"
-VERSION="440.82"
+VERSION="440.100"
HOMEPAGE="http://www.nvidia.com"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/440.82/NVIDIA-Linux-x86_64-440.82.run"
-MD5SUM_x86_64="80eb4fd64124c5cab0ebf560f84a9bfa"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/440.100/NVIDIA-Linux-x86_64-440.100.run"
+MD5SUM_x86_64="7b99bcd2807ecd37af60d29de7bc30c2"
REQUIRES=""
MAINTAINER="Lenard Spencer"
EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-legacy390-driver/README b/system/nvidia-legacy390-driver/README
index 3095e866c7..8e1ebec91f 100644
--- a/system/nvidia-legacy390-driver/README
+++ b/system/nvidia-legacy390-driver/README
@@ -2,7 +2,8 @@ This is the proprietary binary video driver from NVidia for the X.Org
X-server. This package does not include the kernel module - it is a part
of the nvidia-legacy390-kernel package at SlackBuilds.org.
-Installing the 32-bit compatibility libraries is available: if desired, do:
+Installing the 32-bit compatibility libraries is available: if desired,
+do:
COMPAT32="yes" ./nvidia-legacy390-driver.SlackBuild
If you plan to test this buildscript on current (15.0 EXPERIMENTAL), to
@@ -20,17 +21,18 @@ Several useful utilities are included: nvidia-xsettings, nvidia-smi, and
nvidia-settings. Please refer to the Nvidia documentation and man pages
for details and usage.
-For CUDA/OpenCL to work after reboot, and for utilites such as nvidia-smi,
-you might need to include the following line in your /etc/rc.d/rc.local:
-(this is REQUIRED for nvidia-persistenced to work properly)
+For CUDA/OpenCL to work after reboot, and for utilites such as
+nvidia-smi, you might need to include the following line in your
+/etc/rc.d/rc.local: (this is REQUIRED for nvidia-persistenced to work
+properly)
# Create missing nvidia device nodes after reboot
/usr/bin/nvidia-modprobe -c 0 -u
-Included is a script called nvidia-switch, which is used to switch between
-the xorg and nvidia drivers, but it will not edit xorg.conf for you;
-you have to do that manually. The nvidia-switch script is installed to
-/usr/sbin.
+Included is a script called nvidia-switch, which is used to switch
+between the xorg and nvidia drivers, but it will not edit xorg.conf for
+you; you have to do that manually. The nvidia-switch script is
+installed to /usr/sbin.
Usage of nvidia-switch:
nvidia-switch --install <--> save the stock xorg files and
@@ -40,9 +42,9 @@ Usage of nvidia-switch:
NOTES:
Since nvidia-legacy390-driver conflicts with some files of xorg, it's a
-bit complex to install/uninstall the driver. However, installation of the
-nvidia-legacy390-driver package backs up the conflicting files and puts
-the nvidia-specific files into place by automatically running
+bit complex to install/uninstall the driver. However, installation of
+the nvidia-legacy390-driver package backs up the conflicting files and
+puts the nvidia-specific files into place by automatically running
nvidia-switch --install in doinst.sh.
Before uninstalling or upgrading this package, it is IMPORTANT that
diff --git a/system/nvidia-legacy390-driver/changelog.txt b/system/nvidia-legacy390-driver/changelog.txt
deleted file mode 100644
index 5596de99d7..0000000000
--- a/system/nvidia-legacy390-driver/changelog.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-1.0 20-MAR-2011 New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
-1.1 10-APR-2011 updated to new version, testing 13.37rc4.6692
-1.2 27-MAY-2011 new version, allow multilib option, minor edits
-1.2.1 20-JUN-2011 minor edits, thanks to Robby and Roberto
-1.5 01-JUL-2011 new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
-1.6 27-AUG-2011 version bump, minor edits
-1.7 21-OCT-2011 version bump
-1.8 24-MAR-2012 version bump, fix to nvidia-switch thanks to Phill W.
-1.9 02-AUG-2012 version bmp, fixes, updates, nvidia-switch for install/uninstall only
-2.0 21-AUG-2012 new version (important security fix), missing vdpau-nvidia, dropped *.h
-2.1 25-AUG-2012 new version -Long Lived Branch, fixed symlinks (per Das email)
-2.2 22-NOV-2012 new version -Long Lived Branch. Updates: libs, apps
-2.3 15-FEB-2013 new version -Long Lived Branch.
-2.4 19-MAY-2013 new version -Long Lived Branch.
-2.6 20-OCT-2013 new version -Long Lived Branch, add new lib, fix nvidia-switch --remove
-3.0 13-NOV-2013 new version (LLB), update libs
-3.1 12-APR-2014 new version (LLB), update libs
-3.2a 12-JUL-2014 new version (LLB), update libs and bug fixes, fix /dev/nvidia-uvm
-3.3 20-NOV-2014 new version (LLB), update libs, fix nvidia-switch
-3.4 11-JAN-2015 new version (LLB), monitor detection bug fix, add libEGL/GLES
-4.0 07-FEB-2015 new long lived branch, version update, bug fixes
-4.1 27-APR-2015 version update LLB, fix $VERSION usage
-4.2 28-JUL-2015 version update LLB, bug fixes, clean-ups.
-4.3 05-SEP-2015 version update LLB
-4.4 13-DEC-2015 version update, X.Org 1.18 support
-4.5 12-MAR-2016 version update LLB, symlink fixes, drop nvidia-installer, get ready for 14.2
-4.5a 26-MAR-2016 fixed broken symlinks
-4.6 24-APR-2016 version update LLB, fix symlinks, added to version if multilib
-4.7 31-APR-2016 version update LLB, added nvidia-installer, updated libs/symlinks
-5.0 20-FEB-2017 version update LLB, security fixes, updated libs/symlinks, nvidia-switch
-5.1 01-APR-2017 fix nvidia-switch lib names to prevent bad ldconfig symlinks on reboot
-5.2 02-JUN-2017 version update LLB, refactor/debug scripts, use nvidia-installer
-5.3 13-OCT-2017 version update LLB, bug fixes, update copyright
-5.4 18-FEB-2018 version update LLB, updates, bug fix (thanks Leo)
-5.5 25-MAR-2018 version update LLB
-5.6 23-APR-2018 version update LLB, update symlinks, fix changelog formatting
-5.7 28-MAY-2018 version update LLB
-5.8 30-JUL-2018 version update LLB
-5.9 06-SEP-2018 version update LLB
-6.0 09-NOV-2019 renamed to nvidia-legacy390; last version to support 32-bit CPU.
-6.1 26-FEB-2019 version update LLB; compatibility with recent kernels
-6.2 15-AUG-2019 version update LLB
-6.3 22-Feb-2020 version update LLB, minor edits
-6.4 03-APR-2020 script cleanups, add rc.nvidia-persistenced; now works on -current
- New maintainer Lenard Spencer <lenardrspencer@gmail.com>
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
index b503dfb57f..145ef74a56 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
@@ -26,8 +26,8 @@
# see changelog.txt
PRGNAM=nvidia-legacy390-driver
-VERSION=${VERSION:-390.132}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-390.138}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
CURRENT=${CURRENT:-no}
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
index a7a9835ec6..bada93153a 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
@@ -1,30 +1,30 @@
PRGNAM="nvidia-legacy390-driver"
-VERSION="390.132"
+VERSION="390.138"
HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run \
- https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.132.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.132.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.132.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.132.tar.bz2"
-MD5SUM="2677480ee20cd4918b1de9289b2d0af8 \
- 1f9b5ef3fb9329cf8f1b3b1880f11aa0 \
- 37a8bf0de34b9769e9c97ee1cc70f5dd \
- 9d506bcdf40fe794673dfc7c48064759 \
- 45e7cc0e1717fb23c675f11607a2d756 \
- 4d6bb6e058282d7da8673953c9755e38"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run \
- https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.132.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.132.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.132.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.132.tar.bz2"
-MD5SUM_x86_64="c6a37fc418ede54ad63fdf5c96f54958 \
- 1f9b5ef3fb9329cf8f1b3b1880f11aa0 \
- 37a8bf0de34b9769e9c97ee1cc70f5dd \
- 9d506bcdf40fe794673dfc7c48064759 \
- 45e7cc0e1717fb23c675f11607a2d756 \
- 4d6bb6e058282d7da8673953c9755e38"
+DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.138/NVIDIA-Linux-x86-390.138.run \
+ https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.138.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.138.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.138.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.138.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.138.tar.bz2"
+MD5SUM="1247db325e3127324e28fb5f7c59ad50 \
+ 8eb272cfc6559f59e8931eab0ce3a535 \
+ e7256650639b708d378ac9ff77747383 \
+ a5a5f2c3d22021042f24a998c82b653c \
+ 8a6c34fbdff639aa7c2a9697cb96f1af \
+ 146a1ac48785f2a9f8f03fc937c28f16"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.138/NVIDIA-Linux-x86_64-390.138.run \
+ https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.138.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.138.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.138.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.138.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.138.tar.bz2"
+MD5SUM_x86_64="e12b55efa430062a0f7f73db071bc0c3 \
+ 8eb272cfc6559f59e8931eab0ce3a535 \
+ e7256650639b708d378ac9ff77747383 \
+ a5a5f2c3d22021042f24a998c82b653c \
+ 8a6c34fbdff639aa7c2a9697cb96f1af \
+ 146a1ac48785f2a9f8f03fc937c28f16"
REQUIRES="nvidia-legacy390-kernel"
MAINTAINER="Lenard Spencer"
EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-legacy390-kernel/README b/system/nvidia-legacy390-kernel/README
index ab0d4a748f..44c0369dd2 100644
--- a/system/nvidia-legacy390-kernel/README
+++ b/system/nvidia-legacy390-kernel/README
@@ -1,13 +1,15 @@
-This is the kernel-module needed by the proprietary binary nvidia driver.
-You also need the nvidia-legacy390-driver package from SlackBuilds.org.
+This is the kernel-module needed by the proprietary binary nvidia
+driver. You also need the nvidia-legacy390-driver package from
+SlackBuilds.org.
To build the package for a kernel different from the running one,
start the script setting the KERNEL variable as in
KERNEL=4.6.3 ./nvidia-legacy390-kernel.SlackBuild
-A default config file is placed at /usr/share/X11/xorg.conf.d/10-nvidia.conf
-to make sure that X loads the nvidia module. If you need to make changes,
-move that file to /etc/X11/xorg.conf.d/ and edit the copy. You do not need
-this file at all if you have a proper and complete xorg.conf.
+A default config file is placed at
+/usr/share/X11/xorg.conf.d/10-nvidia.conf to make sure that X loads the
+nvidia module. If you need to make changes, move that file to
+/etc/X11/xorg.conf.d/ and edit the copy. You do not need this file at
+all if you have a proper and complete xorg.conf.
The xf86-video-nouveau-blacklist package from /extra is required.
diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
index 6640ff06c3..fba0d38bd0 100644
--- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
+++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
@@ -28,7 +28,7 @@
# see nvidia-driver/changelog.txt
PRGNAM=nvidia-legacy390-kernel
-VERSION=${VERSION:-390.132}
+VERSION=${VERSION:-390.138}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -92,10 +92,6 @@ if [ "$TARGET" = "x86_64" ]; then
install -m 0664 kernel/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
fi
-# Make sure the X is specified to automagically load the
-# correct driver, since I always forget. You can remove
-# this file if you have an equivilent entry in /etc/X11/xorg.d
-
mkdir -p $PKG/usr/share/X11/xorg.conf.d/
cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info
index 802c01d5c4..1dff6364aa 100644
--- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info
+++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info
@@ -1,10 +1,10 @@
PRGNAM="nvidia-legacy390-kernel"
-VERSION="390.132"
+VERSION="390.138"
HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run"
-MD5SUM="2677480ee20cd4918b1de9289b2d0af8"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run"
-MD5SUM_x86_64="c6a37fc418ede54ad63fdf5c96f54958"
+DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.138/NVIDIA-Linux-x86-390.138.run"
+MD5SUM="1247db325e3127324e28fb5f7c59ad50"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.138/NVIDIA-Linux-x86_64-390.138.run"
+MD5SUM_x86_64="e12b55efa430062a0f7f73db071bc0c3"
REQUIRES=""
MAINTAINER="Lenard Spencer"
EMAIL="lenardrspencer@gmai.com"
diff --git a/system/nvme-cli/nvme-cli.SlackBuild b/system/nvme-cli/nvme-cli.SlackBuild
index 747d75d449..9eef39e402 100644
--- a/system/nvme-cli/nvme-cli.SlackBuild
+++ b/system/nvme-cli/nvme-cli.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=nvme-cli
-VERSION=${VERSION:-1.11.1}
+VERSION=${VERSION:-1.12}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/nvme-cli/nvme-cli.info b/system/nvme-cli/nvme-cli.info
index 5ead1b1bed..eab3a56e9f 100644
--- a/system/nvme-cli/nvme-cli.info
+++ b/system/nvme-cli/nvme-cli.info
@@ -1,8 +1,8 @@
PRGNAM="nvme-cli"
-VERSION="1.11.1"
+VERSION="1.12"
HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-DOWNLOAD="https://github.com/linux-nvme/nvme-cli/archive/v1.11.1/nvme-cli-1.11.1.tar.gz"
-MD5SUM="eaa3a5b422a555d1b206fb2d612c8588"
+DOWNLOAD="https://github.com/linux-nvme/nvme-cli/archive/v1.12/nvme-cli-1.12.tar.gz"
+MD5SUM="94997b72a63b5bc26c2862c7603bb6e3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/oksh/oksh.SlackBuild b/system/oksh/oksh.SlackBuild
index c58224a0c8..b21000e2de 100644
--- a/system/oksh/oksh.SlackBuild
+++ b/system/oksh/oksh.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for oksh
-# Copyright 2019 Hunter Sezen California, USA
+# Copyright 2019-2020 Hunter Sezen California, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=oksh
-VERSION=${VERSION:-6.6}
+VERSION=${VERSION:-6.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,7 +71,8 @@ find -L . \
CFLAGS="$SLKCFLAGS" \
./configure \
- --prefix=/ \
+ --prefix=/usr \
+ --bindir=/bin \
--mandir=/usr/man
make
diff --git a/system/oksh/oksh.info b/system/oksh/oksh.info
index c207136a71..c7e49d7653 100644
--- a/system/oksh/oksh.info
+++ b/system/oksh/oksh.info
@@ -1,8 +1,8 @@
PRGNAM="oksh"
-VERSION="6.6"
+VERSION="6.7"
HOMEPAGE="https://github.com/ibara/oksh"
-DOWNLOAD="https://github.com/ibara/oksh/releases/download/oksh-6.6/oksh-6.6.tar.gz"
-MD5SUM="d583dfa0f9e4076714ec22a69f138cfd"
+DOWNLOAD="https://github.com/ibara/oksh/releases/download/oksh-6.7/oksh-6.7.tar.gz"
+MD5SUM="bbfab4558db956f4a88d230440729b8d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/parallel/parallel.SlackBuild b/system/parallel/parallel.SlackBuild
index 7ffc2f6552..2aed36a5e5 100644
--- a/system/parallel/parallel.SlackBuild
+++ b/system/parallel/parallel.SlackBuild
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=parallel
-VERSION=${VERSION:-20170622}
+VERSION=${VERSION:-20200522}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/parallel/parallel.info b/system/parallel/parallel.info
index f8ab2f619c..41cae8fa5f 100644
--- a/system/parallel/parallel.info
+++ b/system/parallel/parallel.info
@@ -1,8 +1,8 @@
PRGNAM="parallel"
-VERSION="20170622"
+VERSION="20200522"
HOMEPAGE="http://www.gnu.org/software/parallel/"
-DOWNLOAD="http://gnu.uberglobalmirror.com/parallel/parallel-20170622.tar.bz2"
-MD5SUM="8494ff022451aac0162f18cf3dd3ae7f"
+DOWNLOAD="https://ftp.gnu.org/gnu/parallel/parallel-20200522.tar.bz2"
+MD5SUM="81e23020aecff6535a1a75cbbc5fe506"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/pass-otp/README b/system/pass-otp/README
new file mode 100644
index 0000000000..40939c0745
--- /dev/null
+++ b/system/pass-otp/README
@@ -0,0 +1,2 @@
+pass-otp is a pass extension for managing one-time-password (OTP)
+tokens.
diff --git a/system/pass-otp/pass-otp.SlackBuild b/system/pass-otp/pass-otp.SlackBuild
new file mode 100644
index 0000000000..bf7e2c60c6
--- /dev/null
+++ b/system/pass-otp/pass-otp.SlackBuild
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Slackware build script for pass-otp
+
+# Copyright 2020 Julian Grinblat <julian@dotcore.co.il>
+# 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.
+
+PRGNAM=pass-otp
+VERSION=${VERSION:-1.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man/man1 DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE CHANGELOG.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/pass-otp/pass-otp.info b/system/pass-otp/pass-otp.info
new file mode 100644
index 0000000000..f0170768eb
--- /dev/null
+++ b/system/pass-otp/pass-otp.info
@@ -0,0 +1,10 @@
+PRGNAM="pass-otp"
+VERSION="1.2.0"
+HOMEPAGE="https://github.com/tadfisher/pass-otp"
+DOWNLOAD="https://github.com/tadfisher/pass-otp/releases/download/v1.2.0/pass-otp-1.2.0.tar.gz"
+MD5SUM="20cfa80273813294014577fead8714ca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="password-store qrencode oath-toolkit"
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/system/slack-scripts/slack-desc b/system/pass-otp/slack-desc
index 090e02679a..c0694a4d42 100644
--- a/system/slack-scripts/slack-desc
+++ b/system/pass-otp/slack-desc
@@ -5,15 +5,15 @@
# You must make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':' except on otherwise blank lines.
- |-----handy-ruler------------------------------------------------------|
-slack-scripts: slack-scripts (Some Slackware Utilities)
-slack-scripts:
-slack-scripts: ph A Slackware Package History
-slack-scripts: slkcfg A Sysvinit Script Utility
-slack-scripts:
-slack-scripts: Use <script> -h for usage.
-slack-scripts:
-slack-scripts: http://tty1.uk
-slack-scripts:
-slack-scripts:
-slack-scripts:
+ |-----handy-ruler------------------------------------------------------|
+pass-otp: pass-otp (Manage OTP tokens)
+pass-otp:
+pass-otp: A pass extension for managing one-time-password (OTP) tokens.
+pass-otp:
+pass-otp:
+pass-otp:
+pass-otp:
+pass-otp:
+pass-otp:
+pass-otp:
+pass-otp: https://github.com/tadfisher/pass-otp
diff --git a/system/passwordsafe/passwordsafe.SlackBuild b/system/passwordsafe/passwordsafe.SlackBuild
index 330f6dbc9b..5aa0b9f212 100644
--- a/system/passwordsafe/passwordsafe.SlackBuild
+++ b/system/passwordsafe/passwordsafe.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=passwordsafe
-VERSION=${VERSION:-1.010.0}
+VERSION=${VERSION:-1.11.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/passwordsafe/passwordsafe.info b/system/passwordsafe/passwordsafe.info
index dc320eefec..91f3658ccd 100644
--- a/system/passwordsafe/passwordsafe.info
+++ b/system/passwordsafe/passwordsafe.info
@@ -1,8 +1,8 @@
PRGNAM="passwordsafe"
-VERSION="1.010.0"
+VERSION="1.11.0"
HOMEPAGE="https://pwsafe.org"
-DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.010.0/pwsafe-1.010.0.tar.gz"
-MD5SUM="316ac53812bc6d6ef13676571c319bc1"
+DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.11.0/pwsafe-1.11.0.tar.gz"
+MD5SUM="f997e8e2292a1153fd5c660c1c7ed45e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ykpers xerces-c wxGTK3 xvkbd qrencode"
diff --git a/system/ph/README b/system/ph/README
new file mode 100644
index 0000000000..0b8c1894a3
--- /dev/null
+++ b/system/ph/README
@@ -0,0 +1,6 @@
+ph - a fast Slackware Package History tool
+
+[ROOT=/mnt] ph [options] [-][NUM]
+
+ph prints a filtered list of the packages installed in a Slackware
+system, using the package description files in /var/log/packages/.
diff --git a/system/slack-scripts/slack-scripts.SlackBuild b/system/ph/ph.SlackBuild
index a93b19f4d8..5d2ffe6077 100644
--- a/system/slack-scripts/slack-scripts.SlackBuild
+++ b/system/ph/ph.SlackBuild
@@ -1,7 +1,8 @@
#!/bin/sh
-# Slackware build script for slack-scripts
-# Copyright 2018 David Woodfall <dave@slackbuilds.org>
+# Slackware build script for ph
+#
+# Copyright 2013 Dave Woodfall <dave@tty1.uk>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,8 +22,8 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=slack-scripts
-VERSION=${VERSION:-0.0.3}
+PRGNAM=ph
+VERSION=${VERSION:-1.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
ARCH=noarch
@@ -31,6 +32,7 @@ CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+README=$PKG/usr/doc/$PRGNAM-$VERSION/README
set -e
@@ -47,12 +49,27 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-mkdir -p $PKG/usr/{bin,sbin}
-cp ph/ph $PKG/usr/bin
-cp slkcfg/slkcfg $PKG/usr/sbin
+sed -i -e "s/@VERSION@/$VERSION/" ph.1
+gzip ph.1
+install -m 644 -D ph.1.gz $PKG/usr/man/man1/ph.1.gz
+install -m 755 -D ph $PKG/usr/bin/ph
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+
+cat << EOF > $README
+ph - a fast Slackware Package History tool
+Copyright 2013- Dave Woodfall
+ph is licensed under a "one-clause BSD/Slackware" license.
+See the script for the full text.
+Homepage: http://tty1.uk/slackbuilds/noversion/ph
+EOF
+
+man ./ph.1.gz | col -b | expand | fmt -72 | cat -s | sed "
+ 1d
+ s/\([^[:space:]]\)[[:space:]][[:space:]]*/\1 /g
+ /^$/N;/PH(1)$/D
+ " >> $README
+
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/system/ph/ph.info b/system/ph/ph.info
new file mode 100644
index 0000000000..f5d6749a24
--- /dev/null
+++ b/system/ph/ph.info
@@ -0,0 +1,10 @@
+PRGNAM="ph"
+VERSION="1.1.0"
+HOMEPAGE="http://tty1.uk/slackbuilds/noversion/ph"
+DOWNLOAD="http://git.tty1.uk/cgit.cgi/ph/snapshot/ph-1.1.0.tar.gz"
+MD5SUM="916cad4a723485a54d4213e5dc46ad7f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@tty1.uk"
diff --git a/system/ph/slack-desc b/system/ph/slack-desc
new file mode 100644
index 0000000000..8275eb17ac
--- /dev/null
+++ b/system/ph/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+ph: ph (A fast Slackware Package History tool)
+ph:
+ph: ph prints a filtered list of the packages installed in a Slackware
+ph: system, using the package description files in /var/log/packages/.
+ph:
+ph: HOMEPAGE="http://tty1.uk/slackbuilds/noversion/ph"
+ph:
+ph:
+ph:
+ph:
+ph:
diff --git a/system/phoronix-test-suite/phoronix-test-suite.SlackBuild b/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
index d9dc8f8b03..69dc0bc1ee 100644
--- a/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
+++ b/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=phoronix-test-suite
-VERSION=${VERSION:-9.6.0}
+VERSION=${VERSION:-9.6.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/phoronix-test-suite/phoronix-test-suite.info b/system/phoronix-test-suite/phoronix-test-suite.info
index 2cb0540c80..61ef5d55f2 100644
--- a/system/phoronix-test-suite/phoronix-test-suite.info
+++ b/system/phoronix-test-suite/phoronix-test-suite.info
@@ -1,8 +1,8 @@
PRGNAM="phoronix-test-suite"
-VERSION="9.6.0"
+VERSION="9.6.1"
HOMEPAGE="https://phoronix-test-suite.com/"
-DOWNLOAD="https://www.phoronix-test-suite.com/releases/phoronix-test-suite-9.6.0.tar.gz"
-MD5SUM="a21547bb74880bce26de0f946be8a2a3"
+DOWNLOAD="https://www.phoronix-test-suite.com/releases/phoronix-test-suite-9.6.1.tar.gz"
+MD5SUM="4d18a995bc781191eb853d4f00eccc4a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/posh/posh.SlackBuild b/system/posh/posh.SlackBuild
index fee476fe28..62f1c8dcd6 100644
--- a/system/posh/posh.SlackBuild
+++ b/system/posh/posh.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for posh
-# Copyright 2017-2019 Hunter Sezen California, USA
+# Copyright 2017-2020 Hunter Sezen California, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=posh
-VERSION=${VERSION:-0.13.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.14.1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
diff --git a/system/posh/posh.info b/system/posh/posh.info
index 408fe5a053..5867da639a 100644
--- a/system/posh/posh.info
+++ b/system/posh/posh.info
@@ -1,8 +1,8 @@
PRGNAM="posh"
-VERSION="0.13.2"
+VERSION="0.14.1"
HOMEPAGE="https://packages.qa.debian.org/p/posh.html"
-DOWNLOAD="http://http.debian.net/debian/pool/main/p/posh/posh_0.13.2.tar.xz"
-MD5SUM="d4e4bd477bc68d78442f9967faab2406"
+DOWNLOAD="http://http.debian.net/debian/pool/main/p/posh/posh_0.14.1.tar.xz"
+MD5SUM="71f482c9a8815f209abf6ac134543bc9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/powershell/powershell.SlackBuild b/system/powershell/powershell.SlackBuild
index 388deccfeb..e077e049f1 100644
--- a/system/powershell/powershell.SlackBuild
+++ b/system/powershell/powershell.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=powershell
-VERSION=${VERSION:-7.0.0}
+VERSION=${VERSION:-7.0.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/powershell/powershell.info b/system/powershell/powershell.info
index b5bcb3ccfd..634d9f62d4 100644
--- a/system/powershell/powershell.info
+++ b/system/powershell/powershell.info
@@ -1,10 +1,10 @@
PRGNAM="powershell"
-VERSION="7.0.0"
+VERSION="7.0.2"
HOMEPAGE="https://www.microsoft.com/powershell/"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/PowerShell/PowerShell/releases/download/v7.0.0/powershell-7.0.0-linux-x64.tar.gz"
-MD5SUM_x86_64="74eb89209645f20d2acbb92423c6e864"
+DOWNLOAD_x86_64="https://github.com/PowerShell/PowerShell/releases/download/v7.0.2/powershell-7.0.2-linux-x64.tar.gz"
+MD5SUM_x86_64="5ed4ed61f6e1ac43ab8a84c28f5a1ee6"
REQUIRES=""
MAINTAINER="Reza Talebi"
EMAIL="reza.talebi.73@outlook.com"
diff --git a/system/pspg/pspg.SlackBuild b/system/pspg/pspg.SlackBuild
index 7524a961d0..faf2073b3b 100644
--- a/system/pspg/pspg.SlackBuild
+++ b/system/pspg/pspg.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=pspg
-VERSION=${VERSION:-3.0.7}
+VERSION=${VERSION:-3.1.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/pspg/pspg.info b/system/pspg/pspg.info
index ea1d9bdf61..9ad9470c1e 100644
--- a/system/pspg/pspg.info
+++ b/system/pspg/pspg.info
@@ -1,8 +1,8 @@
PRGNAM="pspg"
-VERSION="3.0.7"
+VERSION="3.1.2"
HOMEPAGE="https://github.com/okbob/pspg"
-DOWNLOAD="https://github.com/okbob/pspg/archive/3.0.7/pspg-3.0.7.tar.gz"
-MD5SUM="2565e341ee3e6f7484de48a0fed611d2"
+DOWNLOAD="https://github.com/okbob/pspg/archive/3.1.2/pspg-3.1.2.tar.gz"
+MD5SUM="2c00960521e081fdca2295266cc8e82d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/ripgrep/ripgrep.SlackBuild b/system/ripgrep/ripgrep.SlackBuild
index 4cd705be56..6a4dfc2a0e 100644
--- a/system/ripgrep/ripgrep.SlackBuild
+++ b/system/ripgrep/ripgrep.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ripgrep
-VERSION=${VERSION:-12.1.0}
+VERSION=${VERSION:-12.1.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/ripgrep/ripgrep.info b/system/ripgrep/ripgrep.info
index 5e7c3812bf..8ffbd6693e 100644
--- a/system/ripgrep/ripgrep.info
+++ b/system/ripgrep/ripgrep.info
@@ -1,31 +1,31 @@
PRGNAM="ripgrep"
-VERSION="12.1.0"
+VERSION="12.1.1"
HOMEPAGE="https://github.com/BurntSushi/ripgrep"
-DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/12.1.0/ripgrep-12.1.0.tar.gz \
+DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/12.1.1/ripgrep-12.1.1.tar.gz \
https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.10.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.12.1.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.12.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.13.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/bytecount/bytecount-0.6.0.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.52.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.54.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.0.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.1.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.2.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs/encoding_rs-0.8.22.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs/encoding_rs-0.8.23.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs_io/encoding_rs_io-0.1.7.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.6.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/fs_extra/fs_extra-1.1.0.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.12.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.13.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.5.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/jemalloc-sys/jemalloc-sys-0.3.2.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/jemallocator/jemallocator-0.3.2.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.69.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.71.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.8.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
@@ -35,18 +35,18 @@ DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/12.1.0/ripgrep-12.1.0.ta
https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2-sys/pcre2-sys-0.2.2.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2/pcre2-0.2.3.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.17.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.12.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.4.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.17.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.6.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-automata/regex-automata-0.1.9.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.17.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.7.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.18.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.9.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.4.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.107.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.107.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.52.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.110.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.110.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.53.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
- https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.19.crate \
+ https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.27.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.0.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
@@ -57,31 +57,31 @@ DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/12.1.0/ripgrep-12.1.0.ta
https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate"
-MD5SUM="52f65f50222c0fbae42d786e6f9cdf70 \
+MD5SUM="d3190853d47d51ad077a65aadbf55448 \
abc51f82118d86e83165ba87e2521e96 \
142cb4b9a653e56e56311f0c883b8582 \
7c6515c4b7f4c7723a3c6d1f07acc261 \
468f237829e960715055da5d484681b9 \
6799c26a7eacaf8e58d3e45c6c5add89 \
- 33229041d7f94f7187634d017a75654f \
+ d25e25d08adce75c63f3969191141f28 \
fe9c56d3d43021538850fcad8404bdad \
e502e6c6b0dca9c1ae2d99e92b26f645 \
- af1f1bff38cb52f5836ec9a7957d419a \
+ 720e6fb5478963221c58e4ef0fc44356 \
882dbbc613a93f64c3709b0a2bd0d6dc \
- 135f6d6306e50606f0475ada50c33ce2 \
+ 42af3a1e965585d80dcc1e0324fda6eb \
e9d5377e649441c6984e17b9679f2773 \
ff67cf2eb9668167782b8012d3b48e7b \
- 66ab26097508d72ca826bab41fd9062e \
+ cba3538d5dac64d269dda867ba6c5011 \
98dd664015c5a6c5e1d3cfb8dce1c4ff \
- b0fd8ad50f5e64c71f0daf8af79ca952 \
+ 8dab3b3ec00dc56cffde0b0c410d47b5 \
8b98db48d2cecf5843b75e2f668c58fa \
e7c07242a95ee1df865efe9534e10a34 \
- d02ceab917d216ae2cd5127a3f33171f \
+ be4d52524ec8485abc40efba317b1e4c \
493f4bd45cf2a6c3963f66f58884f622 \
85dae509b4cda41fa820b3ad3b302479 \
9f10bcc7b3ab24a0cdbaa0addc65b88d \
fba3b040a55c01be7376d3dd5c4d4920 \
- 0f24b5ab599c41a83e973aabe92ac46d \
+ 0a258dcd990afe3d83e0c103edd7f095 \
61e508ca2eee543023c5e1ba777e5ede \
b5cf10e268e8a3bee2de8a734104245e \
124ec4f35274a0e9c1a4ef3dc0958643 \
@@ -91,18 +91,18 @@ MD5SUM="52f65f50222c0fbae42d786e6f9cdf70 \
2cc140411a55694fa07baa857a720af2 \
244c87ebce1ce19de9283d14e218618d \
d6f8f8aba0bdb5edb2dc41705b9d1144 \
- e0bbd1014405fcdd6aba0b0022c9effc \
- c36ab58ddd10863b2be0f243917dfbcb \
+ e0941025a0c5ed64fa8837efd892ecce \
+ ef0afe60eee17cc47bc3cb6f88b843a6 \
3b298ba1d0e5e75b14765b2c48d52b13 \
- 04031b2ff0f95e8fb3c09d2d1d3b3b77 \
- 26e3fed1cf505f5fd65b98fb149ca1aa \
+ 24118e5657591c6f208dbb1d77fbc482 \
+ eee136546e9f4735577dd20f45727c69 \
44d95c1ed46baee736c9420ad1de3228 \
2d8d8b377d144f5e32b4f65a69eb0b24 \
- c77de409830f87b3d071a71163deddaf \
- a3a2d6677229787ad356df0594ae4cee \
- 8bdd15c69ec08bfd3aeaf4c04a3304f4 \
+ 3879349fe374e764e24f37ce40ac9824 \
+ 9b7d58f6341fb619ff2190481ce13b84 \
+ ce76f5430cd6d2ab76d0d86ecb8a4f4d \
781d4ccf5d04c98fa02af207a9639249 \
- 376a4faf2a9d5d659dc1f81f88e942b8 \
+ 6fcb4505d0da4df3c5747dc23afe6622 \
62e883807a65ebe1ba9d0e555d703339 \
a8de006fe0c7e373c560dd51599287a8 \
a5dd75e77c7324f5c1d2d372c990d0a7 \
diff --git a/system/rmw/README.Slackware b/system/rmw/README.Slackware
index bb11343514..a93201f522 100644
--- a/system/rmw/README.Slackware
+++ b/system/rmw/README.Slackware
@@ -1,4 +1,4 @@
-# rmw-0.7.04
+# rmw-0.7.05
## Description
@@ -20,7 +20,7 @@ Web site: <https://remove-to-waste.info/>
## Screenshots
-![rmw usage output](https://remove-to-waste.info/images/Screenshot_2019-07-05_22-47-51.png)
+![rmw usage output](https://remove-to-waste.info/images/Screenshot_2020-04-11.png)
[More Screenshots](https://remove-to-waste.info/screenshots.html)
@@ -74,11 +74,11 @@ libmenuw some other way, rmw will use `ncurses` but you may experience
[this minor
bug](https://github.com/theimpossibleastronaut/rmw/issues/205).
-Note: rmw has been built on **Windows** 2 years ago using Cygwin but it
+Note: rmw was built on **Windows** 2 years ago using Cygwin but it
didn't use the proper directories. We have no Windows developers
working on this project and are hoping that some will join soon!. As
stated in the description, the goal of this project is a
-"cross-platform" utility; so getting rmw to work reliably on Windows is
+"cross-platform" utility; so getting rmw to work on Windows is
still on the TODO list.
## Uninstall / Cleaning up
@@ -115,7 +115,7 @@ rmw is run, it will be used; if not, it will be skipped. Once you
create "example_waste", rmw will automatically create
example_waste/info and example_waste/files
- e.g: WASTE=/mnt/sda10000/example_waste, removable
+ e.g.: WASTE=/mnt/sda10000/example_waste, removable
== Features and Options ==
@@ -134,6 +134,8 @@ Restore FILE(s) from a WASTE directory
-o, --orphaned check for orphaned files (maintenance)
-f, --force allow purge to run
-e, --empty completely empty (purge) all waste folders
+-r, -R, --recursive option used for compatibility with rm
+ (recursive operation is enabled by default)
-v, --verbose increase output messages
-w, --warranty display warranty
-V, --version display version and license information
@@ -141,7 +143,7 @@ Restore FILE(s) from a WASTE directory
===] Restoring [===
--z, --restore <wildcard filename(s) pattern>
+-z, --restore <wildcard filename(s) pattern> (e.g. ~/.local/share/Waste/files/foo*)
-s, --select select files from list to restore
-u, --undo-last undo last ReMove
@@ -167,14 +169,9 @@ $HOME/.local/share/rmw (or $XDG_DATA_HOME/rmw).
== -z, --restore ==
-To restore a file, or multiple files, specify the path to them in in the
+To restore a file, or multiple files, specify the path to them in the
<WASTE>/files folder (wildcards ok).
-e.g. 'rmw -z ~/.local/share/Trash/files/foo*'
-
-Files can also be restored using only the basename, from within any directory.
-NOTE: That feature will not process wildcards unless the user is in a
-<WASTE>/files folder and the filespec actually exists in the present working
-directory.
+e.g. 'rmw -z ~/.local/share/Waste/files/foo*'
== -f, --force ==
diff --git a/system/rmw/rmw.SlackBuild b/system/rmw/rmw.SlackBuild
index 5cc04d3bd6..3bccaeea52 100644
--- a/system/rmw/rmw.SlackBuild
+++ b/system/rmw/rmw.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script for rmw
#
-# Copyright 2019 / Andy Alt / United States
+# Copyright 2019-2020 / Andy Alt / United States
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=rmw
-VERSION=${VERSION:-0.7.04}
+VERSION=${VERSION:-0.7.05}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/rmw/rmw.info b/system/rmw/rmw.info
index 500850584d..241e3d7800 100644
--- a/system/rmw/rmw.info
+++ b/system/rmw/rmw.info
@@ -1,8 +1,8 @@
PRGNAM="rmw"
-VERSION="0.7.04"
+VERSION="0.7.05"
HOMEPAGE="https://remove-to-waste.info/"
-DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.04/rmw-0.7.04.tar.gz"
-MD5SUM="4ca6fc8405883eba6ffe3d28bef43cc1"
+DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.05/rmw-0.7.05.tar.gz"
+MD5SUM="adaa3ce4f4e10203e772d5d80c4a0b5a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/s6-linux-init/README b/system/s6-linux-init/README
index 387a7d3182..28c069dffb 100644
--- a/system/s6-linux-init/README
+++ b/system/s6-linux-init/README
@@ -36,7 +36,9 @@ script like below:
The init system created by s6-linux-init will need an early boot tmpfs
in order to work properly. By default, s6-linux-init will assume that
this initial tmpfs will be mounted on /run. You can change this by
-passing TMPFS_DIR=/path/to/directory to the script
+passing TMPFS_DIR=/path/to/directory to the script like below:
+
+ TMPFS_DIR=/path/to/directory ./s6-linux-init.SlackBuild
Upstream recommends building skarnet.org softwares with static libraries
as most of skarnet.org softwares are small enough that using shared
diff --git a/system/s6-linux-init/s6-linux-init.SlackBuild b/system/s6-linux-init/s6-linux-init.SlackBuild
index 2b52135aec..c296799451 100644
--- a/system/s6-linux-init/s6-linux-init.SlackBuild
+++ b/system/s6-linux-init/s6-linux-init.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=s6-linux-init
-VERSION=${VERSION:-1.0.4.0}
+VERSION=${VERSION:-1.0.4.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/s6-linux-init/s6-linux-init.info b/system/s6-linux-init/s6-linux-init.info
index 77de978ca8..fe4c003f60 100644
--- a/system/s6-linux-init/s6-linux-init.info
+++ b/system/s6-linux-init/s6-linux-init.info
@@ -1,8 +1,8 @@
PRGNAM="s6-linux-init"
-VERSION="1.0.4.0"
+VERSION="1.0.4.2"
HOMEPAGE="https://skarnet.org/software/s6-linux-init/"
-DOWNLOAD="https://skarnet.org/software/s6-linux-init/s6-linux-init-1.0.4.0.tar.gz"
-MD5SUM="50e4e2e21bfd37d6c7cb1532207ebd85"
+DOWNLOAD="https://skarnet.org/software/s6-linux-init/s6-linux-init-1.0.4.2.tar.gz"
+MD5SUM="d21a115ddff023be7dfc92df6bd6572a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="s6"
diff --git a/system/s6/s6.SlackBuild b/system/s6/s6.SlackBuild
index 67e4093cf5..9d9d454b4e 100644
--- a/system/s6/s6.SlackBuild
+++ b/system/s6/s6.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=s6
-VERSION=${VERSION:-2.9.1.0}
+VERSION=${VERSION:-2.9.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/s6/s6.info b/system/s6/s6.info
index 0bb1bf0433..5404aa2d61 100644
--- a/system/s6/s6.info
+++ b/system/s6/s6.info
@@ -1,8 +1,8 @@
PRGNAM="s6"
-VERSION="2.9.1.0"
+VERSION="2.9.2.0"
HOMEPAGE="https://skarnet.org/software/s6/"
-DOWNLOAD="https://skarnet.org/software/s6/s6-2.9.1.0.tar.gz"
-MD5SUM="fd2d217829064ec1a409bbd15a3b8ea3"
+DOWNLOAD="https://skarnet.org/software/s6/s6-2.9.2.0.tar.gz"
+MD5SUM="cb6e5b4db41e1a1c5b69c5efb3fbc44d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="execline"
diff --git a/system/sandbox/sandbox.SlackBuild b/system/sandbox/sandbox.SlackBuild
index 9832355b7a..e1c592ca8f 100644
--- a/system/sandbox/sandbox.SlackBuild
+++ b/system/sandbox/sandbox.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for sandbox
-# Copyright 2018-2019 Hunter Sezen California, USA
+# Copyright 2018-2020 Hunter Sezen California, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=sandbox
-VERSION=${VERSION:-2.18}
+VERSION=${VERSION:-2.20}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/sandbox/sandbox.info b/system/sandbox/sandbox.info
index 131e955d23..7ea79a2f57 100644
--- a/system/sandbox/sandbox.info
+++ b/system/sandbox/sandbox.info
@@ -1,8 +1,8 @@
PRGNAM="sandbox"
-VERSION="2.18"
+VERSION="2.20"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-DOWNLOAD="https://gitweb.gentoo.org/proj/sandbox.git/snapshot/sandbox-2.18.tar.bz2"
-MD5SUM="8d772726ef0edd05e52e4289b76bfa14"
+DOWNLOAD="https://gitweb.gentoo.org/proj/sandbox.git/snapshot/sandbox-2.20.tar.bz2"
+MD5SUM="9f0fc6baae17190fdd78cda967936e80"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/slack-scripts/README b/system/slack-scripts/README
deleted file mode 100644
index e58de09685..0000000000
--- a/system/slack-scripts/README
+++ /dev/null
@@ -1,83 +0,0 @@
-slack-scripts (Some Slackware Utilities)
-
-ph - A Slackware Package History
-slkcfg - A Sysvinit Script Utility
-
-============================================================
-
-ph N
-
-Lists last installed N packages by date order, newest first
-unless N is negative, then it lists oldest first. With no
-number it outputs all, suitable for grepping etc.
-
-It supports a few options about listing style such as date,
-version, tag, and can be used in conjunction with other
-applications such as removepkg.
-
-Example:
-
-ph -s 5 (list last 5 SBo packages installed)
-ph -t alien 10 (list last 10 packages with tag 'alien')
-ph -d 5 (list last 5 without printing the dates)
-pn -v 5 (list last 5 without printing versions)
-
-Or combine them:
-
-ph -v -d -s 5 (list only the names of the last 5 SBo packages)
-
-It also supports the $ROOT environmental option so that it
-will work with mounted file systems and partitions.
-
-See ph -h for more details and ph --help for more examples.
-
-============================================================
-
-slkcfg runs commands on the rc scripts in /etc/rc.d/ but
-without needing to specify the full path. Any output is
-printed.
-
-It can run the usual start/stop/restart/status commands and
-set/unset the executable bit.
-
-eg:
-
-slkcfg cups on|off (chmod +/-x)
-slkcfg cups start|stop|status
-
-and so on.
-
-It greps the rc file to find options. If it doesn't find any
-options but you know that some exist you can force the
-command by adding 'force' at the end.
-
-Running with just the name of the rc file will 'ls -l' it
-and print any found options.
-
-/etc/rc.d/rc.inet1 is treated specially and will try to
-find the names of interfaces using ifconfig -a.
-
-At the moment it supports the following: eth, wlan, br,
-virbr, vmnet, vboxnet, pan and ppp.
-
-If you would like me to add extra interface support just
-drop me a line with the details or send a patch.
-
-Example output from inet1:
-
-slkcfg inet1
--rwxr-xr-x 1 root root 10878 Nov 19 2015 /etc/rc.d/rc.inet1*
-
-Options:
-start stop restart
-lo_start lo_stop
-eth0_start eth0_stop eth0_restart
-virbr0_start virbr0_stop virbr0_restart
-wlan0_start wlan0_stop wlan0_restart
-
-slkcfg uses 'sh' to run commands (apart from chmod) so it
-should work even if the rc file isn't executable. In that
-case it will print a message to tell you at the end of the
-output.
-
-See slkcfg -h for more details.
diff --git a/system/slack-scripts/slack-scripts.info b/system/slack-scripts/slack-scripts.info
deleted file mode 100644
index 86818b2938..0000000000
--- a/system/slack-scripts/slack-scripts.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="slack-scripts"
-VERSION="0.0.3"
-HOMEPAGE="http://slackbuilds.org"
-DOWNLOAD="http://unrealize.co.uk/source/slack-scripts-0.0.3.tar.gz"
-MD5SUM="25d081be066dcb16b282c727449d0772"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/system/slpkg/slpkg.SlackBuild b/system/slpkg/slpkg.SlackBuild
index c3f4bd237c..5ee02e8d47 100644
--- a/system/slpkg/slpkg.SlackBuild
+++ b/system/slpkg/slpkg.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=slpkg
-VERSION=${VERSION:-3.8.7}
+VERSION=${VERSION:-3.8.9}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/slpkg/slpkg.info b/system/slpkg/slpkg.info
index 19aa6761e8..8ddaf26c0d 100644
--- a/system/slpkg/slpkg.info
+++ b/system/slpkg/slpkg.info
@@ -1,8 +1,8 @@
PRGNAM="slpkg"
-VERSION="3.8.7"
+VERSION="3.8.9"
HOMEPAGE="https://dslackw.gitlab.io/slpkg"
-DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/3.8.7/slpkg-3.8.7.tar.gz"
-MD5SUM="2b41c1d3c21ff61d62cc119ee7def256"
+DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/3.8.9/slpkg-3.8.9.tar.gz"
+MD5SUM="d485c552637b510d2d3b7ff5be093ada"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python3 python-urllib3"
diff --git a/system/sqlite2/sqlite2.info b/system/sqlite2/sqlite2.info
index 4176372a7d..aaa7b6674f 100644
--- a/system/sqlite2/sqlite2.info
+++ b/system/sqlite2/sqlite2.info
@@ -2,7 +2,7 @@ PRGNAM="sqlite2"
VERSION="2.8.17_7"
HOMEPAGE="http://www.sqlite.org"
DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17.orig.tar.gz \
- http://ftp.de.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17-7.diff.gz"
+ http://archive.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17-7.diff.gz"
MD5SUM="04f15ed552134b06528b3628be7d7315 \
9d926474caaed0d12f2fb418bdcf1ccf"
DOWNLOAD_x86_64=""
diff --git a/system/sunflower/README b/system/sunflower/README
new file mode 100644
index 0000000000..711a5bd496
--- /dev/null
+++ b/system/sunflower/README
@@ -0,0 +1,5 @@
+Sunflower is a small and highly customizable twin-panel file manager
+with support for plugins. It contains a built-in terminal.
+
+Sunflower 0.4 requires GTK+ 3.22 (and thus is unsupported on
+Slackware 14.2).
diff --git a/system/sunflower/doinst.sh b/system/sunflower/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/sunflower/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/system/sunflower/slack-desc b/system/sunflower/slack-desc
new file mode 100644
index 0000000000..633b0afd27
--- /dev/null
+++ b/system/sunflower/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+sunflower: sunflower (Twin-panel file manager)
+sunflower:
+sunflower: Sunflower is a small and highly customizable twin-panel file manager
+sunflower: with support for plugins.
+sunflower:
+sunflower:
+sunflower:
+sunflower:
+sunflower:
+sunflower:
+sunflower:
diff --git a/system/sunflower/sunflower.SlackBuild b/system/sunflower/sunflower.SlackBuild
new file mode 100644
index 0000000000..a4d545f82a
--- /dev/null
+++ b/system/sunflower/sunflower.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for sunflower
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# 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.
+
+PRGNAM=sunflower
+VERSION=${VERSION:-0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+COMMIT=61
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf Sunflower
+tar xvf $CWD/$PRGNAM-$VERSION-$COMMIT.tgz
+cd Sunflower
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Treat sunflower as an executable
+mkdir -p "$PKG/usr/bin"
+[ ! -f "$PKG/usr/bin/sunflower" ] \
+ && echo -e '#!/bin/bash\nexec python /usr/share/sunflower/Sunflower.py "$@"' > "$PKG/usr/bin/sunflower"
+chmod 755 "$PKG/usr/bin/sunflower"
+
+# Copy other files
+mkdir -p "$PKG/usr/share/sunflower"
+cp -r Sunflower.py application images translations "$PKG/usr/share/sunflower/"
+install -Dm644 Sunflower.desktop "$PKG/usr/share/applications/sunflower.desktop"
+install -Dm644 images/sunflower.svg "$PKG/usr/share/pixmaps/sunflower.svg"
+install -Dm644 images/sunflower.png "$PKG/usr/share/pixmaps/sunflower.png"
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp AUTHORS CHANGES COPYING DEPENDS LICENSE README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/sunflower/sunflower.info b/system/sunflower/sunflower.info
new file mode 100644
index 0000000000..e2d5a51dc6
--- /dev/null
+++ b/system/sunflower/sunflower.info
@@ -0,0 +1,10 @@
+PRGNAM="sunflower"
+VERSION="0.3"
+HOMEPAGE="https://sunflower-fm.org"
+DOWNLOAD="https://sunflower-fm.org/pub/sunflower-0.3-61.tgz"
+MD5SUM="a5cd28438e83b88e5a4edeb3aacef0c6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python-chardet"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/system/targetcli-fb/targetcli-fb.SlackBuild b/system/targetcli-fb/targetcli-fb.SlackBuild
index 741d29c372..8a8eb91dca 100644
--- a/system/targetcli-fb/targetcli-fb.SlackBuild
+++ b/system/targetcli-fb/targetcli-fb.SlackBuild
@@ -24,8 +24,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=targetcli-fb
-VERSION=${VERSION:-2.1.52}
-RTVERSION=${RTVERSION:-2.1.72}
+VERSION=${VERSION:-2.1.53}
+RTVERSION=${RTVERSION:-2.1.73}
CSVERSION=${CSVERSION:-1.1.28}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/targetcli-fb/targetcli-fb.info b/system/targetcli-fb/targetcli-fb.info
index 04ff3bcee2..99d90cc03d 100644
--- a/system/targetcli-fb/targetcli-fb.info
+++ b/system/targetcli-fb/targetcli-fb.info
@@ -1,11 +1,11 @@
PRGNAM="targetcli-fb"
-VERSION="2.1.51"
+VERSION="2.1.53"
HOMEPAGE="https://github.com/open-iscsi/targetcli-fb"
-DOWNLOAD="https://github.com/open-iscsi/targetcli-fb/archive/v2.1.52/targetcli-fb-2.1.52.tar.gz \
- https://github.com/open-iscsi/rtslib-fb/archive/v2.1.72/rtslib-fb-2.1.72.tar.gz \
+DOWNLOAD="https://github.com/open-iscsi/targetcli-fb/archive/v2.1.53/targetcli-fb-2.1.53.tar.gz \
+ https://github.com/open-iscsi/rtslib-fb/archive/v2.1.73/rtslib-fb-2.1.73.tar.gz \
https://github.com/open-iscsi/configshell-fb/archive/v1.1.28/configshell-fb-1.1.28.tar.gz"
-MD5SUM="59766318004cf905b5ce287862636019 \
- c42d36e542bbb8609fd2df61ccbaf0fc \
+MD5SUM="61cdf4c71a0b206b021232fb9e845bd8 \
+ 5eb1fc54a5f16566b76b6037950c0dc6 \
d1908982dffb1df700fa52ed65949729"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/system/telegraf/telegraf.SlackBuild b/system/telegraf/telegraf.SlackBuild
index 6ba4d733ef..076b061b1a 100644
--- a/system/telegraf/telegraf.SlackBuild
+++ b/system/telegraf/telegraf.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=telegraf
-VERSION=${VERSION:-1.14.2}
+VERSION=${VERSION:-1.14.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/telegraf/telegraf.info b/system/telegraf/telegraf.info
index 92494b31e6..70b8d207b0 100644
--- a/system/telegraf/telegraf.info
+++ b/system/telegraf/telegraf.info
@@ -1,10 +1,10 @@
PRGNAM="telegraf"
-VERSION="1.14.2"
+VERSION="1.14.4"
HOMEPAGE="https://www.influxdata.com"
-DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.14.2_linux_i386.tar.gz"
-MD5SUM="813c71a966468d214f6a5ab29c9520e7"
-DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.14.2_linux_amd64.tar.gz"
-MD5SUM_x86_64="2bae0ab4719608f8a284f512bcc056c2"
+DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.14.4_linux_i386.tar.gz"
+MD5SUM="4010e7ffa9a1ed738a2e46614b20c4d6"
+DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.14.4_linux_amd64.tar.gz"
+MD5SUM_x86_64="2c9cb0cbf3527ef8e6ee2ba5447bbd46"
REQUIRES=""
MAINTAINER="Ebben Aries"
EMAIL="e@dscp.org"
diff --git a/system/tpm/tpm.SlackBuild b/system/tpm/tpm.SlackBuild
index b0d689f9d9..2c985eb7d4 100644
--- a/system/tpm/tpm.SlackBuild
+++ b/system/tpm/tpm.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for tpm
-# Copyright 2015-2016 Hunter Sezen California, USA
+# Copyright 2015-2016, 2020 Hunter Sezen California, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=tpm
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.3.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -34,7 +34,7 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-set -e
+set -eu
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
@@ -50,13 +50,14 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
make
+
make install \
PREFIX=/usr \
MANDIR=/usr/man \
DESTDIR=$PKG
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
+ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/system/tpm/tpm.info b/system/tpm/tpm.info
index 09f3c3f3a3..4b0f8ba320 100644
--- a/system/tpm/tpm.info
+++ b/system/tpm/tpm.info
@@ -1,8 +1,8 @@
PRGNAM="tpm"
-VERSION="1.3.2"
+VERSION="1.3.3"
HOMEPAGE="https://github.com/nmeum/tpm"
-DOWNLOAD="https://github.com/nmeum/tpm/archive/1.3.2/tpm-1.3.2.tar.gz"
-MD5SUM="d86118c38e908663c8d1422c79f6ce1d"
+DOWNLOAD="https://github.com/nmeum/tpm/archive/1.3.3/tpm-1.3.3.tar.gz"
+MD5SUM="9a5244e8f5e5bf0ba491ab7a029e79c1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/ttf-ancient-fonts/README b/system/ttf-ancient-fonts/README
new file mode 100644
index 0000000000..79c9476e25
--- /dev/null
+++ b/system/ttf-ancient-fonts/README
@@ -0,0 +1,20 @@
+ttf-ancient-fonts (Unicode fonts for ancient scripts)
+
+These are free unicode fonts for Aegean Scripts, other ancient scripts
+in the greater Aegean vicinity, Egyptian Hieroglyphs, Sumero-Akkadian
+Cuneiform, and Musical Symbols in the Unicode Standard.
+
+Despite the "ttf" in the name, the package includes a few .otf fonts
+as well.
+
+The fonts installed by this package include hinting, by default. If you
+for some reason require unhinted fonts, export HINTS=no in the
+environment before running the SlackBuild. If you don't know what font
+hinting is, you probably shouldn't worry about it.
+
+The source tarball contains an older version of the Symbola font.
+By default it's not included here, as there's already a symbola-font-ttf
+on SBo. It's a much newer version of Symbola, but is licensed under
+highly restrictive terms. If you'd rather have the older but free-to-use
+version of Symbola, set SYMBOLA=yes in the environment for this build,
+and don't install symbola-font-ttf.
diff --git a/system/ttf-ancient-fonts/README.debian b/system/ttf-ancient-fonts/README.debian
new file mode 100644
index 0000000000..2978e4a02a
--- /dev/null
+++ b/system/ttf-ancient-fonts/README.debian
@@ -0,0 +1,21 @@
+Versions of the fonts included in this package
+==============================================
+
+Aegean v.9.17 02/2017 Scripts and symbols of the Aegean world
+Textfonts v.7.17 02/2017 Fonts based on early Greek editions
+
+Symbola v.9.17 07/2017 Symbol blocks of The Unicode Standard
+Abydos v.1.23 07/2017 A data-font of 7440 Egyptian Hieroglyphs
+Aegyptus v.6.17 02/2017 Egyptian Hieroglyphs, Coptic, Meroitic
+Akkadian v.7.17 02/2017 Sumero-Akkadian Cuneiform
+Anatolian v.5.17 02/2017 Anatolian Hieroglyphs
+Maya v.4.17 02/2017 Maya Hieroglyphs
+Unidings v.9.17 07/2017 Icons for blocks of The Unicode Standard
+Musica v.3.17 02/2017 Musical Notation
+Analecta v.5.17 02/2017 Coptic, Gothic, Deseret
+
+The package also includes the following fonts obsoleted by the author:
+
+Alfios (superseded by Asea)
+Atavyros
+Avdira
diff --git a/system/ttf-ancient-fonts/copyright.debian b/system/ttf-ancient-fonts/copyright.debian
new file mode 100644
index 0000000000..24cd414239
--- /dev/null
+++ b/system/ttf-ancient-fonts/copyright.debian
@@ -0,0 +1,26 @@
+This package was debianized by:
+
+ Gürkan Myczko <gurkan@phys.ethz.ch> on Mon, 26 Nov 2007 12:13:25 +0100.
+
+It was downloaded from:
+
+ http://users.teilar.gr/~g1951d/
+
+Upstream Author:
+
+ George Douros <g1951d@teilar.gr>
+
+Copyright:
+
+ Copyright (C) 2007-2015 George Douros
+
+License:
+
+ Fonts are free for any use; they may be opened, edited,
+ modified, regenerated, packaged and redistributed.
+
+The Debian packaging is:
+
+ Copyright (C) 2007-2017 Gürkan Myczko <gurkan@phys.ethz.ch>
+ Copyright (C) 2015 Andrew Shadura <andrewsh@debian.org>
+ is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/system/ttf-ancient-fonts/doinst.sh b/system/ttf-ancient-fonts/doinst.sh
new file mode 100644
index 0000000000..2b48ae510c
--- /dev/null
+++ b/system/ttf-ancient-fonts/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/mkfontdir ]; then
+ ( cd usr/share/fonts/TTF
+ mkfontscale .
+ mkfontdir .
+ )
+ ( cd usr/share/fonts/OTF
+ mkfontscale .
+ mkfontdir .
+ )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+ /usr/bin/fc-cache -f
+fi
diff --git a/system/ttf-ancient-fonts/slack-desc b/system/ttf-ancient-fonts/slack-desc
new file mode 100644
index 0000000000..9df1af7ee8
--- /dev/null
+++ b/system/ttf-ancient-fonts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+ttf-ancient-fonts: ttf-ancient-fonts (Unicode fonts for ancient scripts)
+ttf-ancient-fonts:
+ttf-ancient-fonts: These are free unicode fonts for Aegean Scripts, other ancient scripts
+ttf-ancient-fonts: in the greater Aegean vicinity, Egyptian Hieroglyphs, Sumero-Akkadian
+ttf-ancient-fonts: Cuneiform, and Musical Symbols in the Unicode Standard.
+ttf-ancient-fonts:
+ttf-ancient-fonts: The TTF fonts in this package are @UN@hinted.
+ttf-ancient-fonts:
+ttf-ancient-fonts:
+ttf-ancient-fonts:
+ttf-ancient-fonts:
diff --git a/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild b/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild
new file mode 100644
index 0000000000..f01844ad7e
--- /dev/null
+++ b/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for ttf-ancient-fonts
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Notes to self (or anyone else who cares):
+
+# The tarball includes both hinted and unhinted versions of the fonts. The
+# Debian package installs <font>.ttf and <font>_hint.ttf for all the
+# fonts. However, if I do this, it's impossible to select the _hint
+# versions in any application (because the TTF names conflict). Since
+# it's possible to disable hinting in fontconfig or specific apps,
+# I'm only going to include the _hint versions here by default. User
+# can override with HINTS=no. The .otf fonts only come in one variety,
+# so they're always installed as-is.
+
+# There are newer versions of these fonts at https://dn-works.com/ufas/
+# but they're under what I consider a ludicrously restrictive license,
+# so I'm not going to touch them with a 10 foot pole. The symbola-font-ttf
+# package is the restrictive version, so I've made it possible to include
+# the older (free-to-use) Symbola here, though it's not the default.
+
+# There's no documentation in the tarball, so I borrow it from Debian.
+# There's no license info in the tarball, and neither the original site
+# nor web.archive.org still has has the "un-Debianized" zip files that
+# presumably included the licenses, so I'm including Debian's copyright
+# file that asserts these fonts are "free for any use".
+
+PRGNAM=ttf-ancient-fonts
+VERSION=${VERSION:-2.60}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+HINTS="${HINTS:-yes}"
+
+# If the user requested unhinted fonts, don't even bother to extract
+# the hinted versions.
+[ "$HINTS" != "yes" ] && UN=un && TAROPT="--exclude=*_hint.ttf"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION.orig
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.xz $TAROPT
+cd $PRGNAM-$VERSION.orig
+chown -R root:root .
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+HAS_SYMBOLA=yes
+[ "${SYMBOLA:-no}" = "no" ] && rm -f Symbola* && HAS_SYMBOLA=no
+
+# If we're doing hinted fonts, get rid of the unhinted ones. I can't think
+# of a sane way to avoid extracting them in the first place...
+[ "$HINTS" = "yes" ] && /bin/ls *.ttf | grep -v _hint | xargs rm -f
+
+for i in TTF OTF; do
+ mkdir -p $PKG/usr/share/fonts/$i
+ install -m0644 *.$( echo $i | tr A-Z a-z) $PKG/usr/share/fonts/$i
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+for i in README.debian copyright.debian; do
+ cat $CWD/$i > $PKG/usr/doc/$PRGNAM-$VERSION/$i
+done
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+sed "s,@UN@,$UN," $CWD/slack-desc > $PKG/install/slack-desc
+if [ "$HAS_SYMBOLA" = "yes" ]; then
+ sed -i \
+ '17s/$/ This package includes the Symbola font, and will conflict with symbola-font-ttf/' \
+ $PKG/install/slack-desc
+fi
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ttf-ancient-fonts/ttf-ancient-fonts.info b/system/ttf-ancient-fonts/ttf-ancient-fonts.info
new file mode 100644
index 0000000000..3e51b06439
--- /dev/null
+++ b/system/ttf-ancient-fonts/ttf-ancient-fonts.info
@@ -0,0 +1,10 @@
+PRGNAM="ttf-ancient-fonts"
+VERSION="2.60"
+HOMEPAGE="https://packages.debian.org/sid/ttf-ancient-fonts"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/t/ttf-ancient-fonts/ttf-ancient-fonts_2.60.orig.tar.xz"
+MD5SUM="a0132b3262b3eec9bc2fc8ff8c4ed9f3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/unionfs-fuse/README b/system/unionfs-fuse/README
new file mode 100644
index 0000000000..f49b8ef95d
--- /dev/null
+++ b/system/unionfs-fuse/README
@@ -0,0 +1,12 @@
+unionfs-fuse is a unionfs filesystem implementation using fuse.
+It is meant to be way more flexible than the current in-kernel unionfs solution.
+
+Why choose this stuff?
+ * The filesystem has to be mounted after the roots are mounted when using the standard module.
+ With unionfs-fuse, you can mount the roots later and their contents will appear seamlesly
+ * You get caching (provided by the underlying FUSE page cache) which speeds things up a lot for free
+ * Advanced features like copy-on-write and more
+
+Why NOT choose it?
+ * Compared to kernel-space solution we need lots of useless context switches which makes
+ kernel-only solution clear speed-winner
diff --git a/system/unionfs-fuse/slack-desc b/system/unionfs-fuse/slack-desc
new file mode 100644
index 0000000000..1710793212
--- /dev/null
+++ b/system/unionfs-fuse/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+unionfs-fuse: union-fuse (unionfs filesystem)
+unionfs-fuse:
+unionfs-fuse: unionfs-fuse is a unionfs filesystem implementation using fuse.
+unionfs-fuse:
+unionfs-fuse: It is meant to be way more flexible than the current in-kernel
+unionfs-fuse: unionfs solution.
+unionfs-fuse:
+unionfs-fuse:
+unionfs-fuse: Project URL: https://github.com/rpodgorny/unionfs-fuse
+unionfs-fuse:
+unionfs-fuse:
diff --git a/system/unionfs-fuse/unionfs-fuse.SlackBuild b/system/unionfs-fuse/unionfs-fuse.SlackBuild
new file mode 100644
index 0000000000..8b5241e008
--- /dev/null
+++ b/system/unionfs-fuse/unionfs-fuse.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+# Slackware build script for unionfs-fuse.
+#
+# Yth | Pont-en-Royans, France | yth@ythogtha.org
+#
+# 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.
+
+PRGNAM=unionfs-fuse
+VERSION=${VERSION:-2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+DOCFILES="CREDITS LICENSE NEWS README*"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sed -i -e 's|share/man|man|' Makefile
+sed -i -e 's|usr/local|usr|' Makefile
+
+make PREFIX=/usr CFLAGS_EXTRA="$SLKCFLAGS"
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/unionfs-fuse/unionfs-fuse.info b/system/unionfs-fuse/unionfs-fuse.info
new file mode 100644
index 0000000000..e8c9d31d6a
--- /dev/null
+++ b/system/unionfs-fuse/unionfs-fuse.info
@@ -0,0 +1,10 @@
+PRGNAM="unionfs-fuse"
+VERSION="2.1"
+HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
+DOWNLOAD="https://github.com/rpodgorny/unionfs-fuse/archive/v2.1/unionfs-fuse-2.1.tar.gz"
+MD5SUM="07f877d5b440b526fcf4532905183085"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/system/v4l2loopback/README b/system/v4l2loopback/README
new file mode 100644
index 0000000000..2c78fe244c
--- /dev/null
+++ b/system/v4l2loopback/README
@@ -0,0 +1,9 @@
+v4l2loopback - a kernel module to create V4L2 loopback devices
+
+This module allows you to create "virtual video devices".
+Normal (v4l2) applications will read these devices as if they
+were ordinary video devices, but the video will not be read
+from, e.g. a capture card or webcam, but instead video generated
+by another application.
+
+You must rebuild this package if you upgrade your kernel.
diff --git a/system/v4l2loopback/doinst.sh b/system/v4l2loopback/doinst.sh
new file mode 100644
index 0000000000..dcfb80855f
--- /dev/null
+++ b/system/v4l2loopback/doinst.sh
@@ -0,0 +1,3 @@
+
+chroot . /sbin/depmod -a @KERNEL@ 2>/dev/null
+
diff --git a/system/v4l2loopback/slack-desc b/system/v4l2loopback/slack-desc
new file mode 100644
index 0000000000..32972147b4
--- /dev/null
+++ b/system/v4l2loopback/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+v4l2loopback: v4l2loopback (kernel module to create V4L2 loopback devices)
+v4l2loopback:
+v4l2loopback: This module allows you to create "virtual video devices". Normal (v4l2)
+v4l2loopback: applications will read these devices as if they were ordinary video devices,
+v4l2loopback: but the video will not be read from, e.g. a capture card or webcam, but
+v4l2loopback: instead video generated by another application.
+v4l2loopback:
+v4l2loopback:
+v4l2loopback: Project URL:
+v4l2loopback: http://github.com/umlaeute/v4l2loopback/
+v4l2loopback:
diff --git a/system/v4l2loopback/update_to_master_17JUN2020.patch b/system/v4l2loopback/update_to_master_17JUN2020.patch
new file mode 100644
index 0000000000..cd44185102
--- /dev/null
+++ b/system/v4l2loopback/update_to_master_17JUN2020.patch
@@ -0,0 +1,671 @@
+diff --git a/README.md b/README.md
+index d8b295a..d8d338b 100644
+--- a/README.md
++++ b/README.md
+@@ -18,9 +18,31 @@ only be of limited use...
+
+ # ISSUES
+ for current issues, checkout https://github.com/umlaeute/v4l2loopback/issues
+-please use the issue-tracker for reporting any problems
++please use the issue-tracker for reporting any problems.
++
++before you create a new ticket in our issue tracker, please make sure that you have read
++*this* document and followed any instructions found within.
++
++also, please search the issue-tracker *before* reporting any problems: it's much better
++to add your information to an existing ticket than to create a new ticket with essentially
++the same information.
++
++## SEEKING HELP
++the issue tracker is meant to track specific bugs in the code (and new features).
++however, it is ill-suited as a user support forum.
++
++if you have general questions or problems, please use the `v4l2loopback` tag
++on [Stack Overflow](https://stackoverflow.com/questions/tagged/v4l2loopback) instead:
++https://stackoverflow.com/questions/tagged/v4l2loopback
++
+
+ # DEPENDENCIES
++in order to build (compile,...) anything, you must have a *working* build-environment
++(compiler, GNU make,...).
++the kernel can be somewhat picky if you try to load a module that was compiled with
++a different compiler than was used to compile the kernel itself.
++so make sure to have the right compiler in place.
++
+ the v4l2loopback module is a *kernel module*.
+ in order to build it, you *must have* the kernel headers installed that match
+ the linux kernel with which you want to use the module (in most cases this will
+@@ -31,6 +53,12 @@ the first few number are the same.
+ (modules will be incompatible if the versions don't match. if you are lucky, the module will
+ simply refuse to load. if you are unlucky, your computer will spit in your eye or do worse.)
+
++there are distribution-specific differences on how to get the correct kernel headers
++(or to install a compilation toolchain).
++documenting all those possibilities would go far beyond the scope of `v4l2loopback`.
++please understnd that we cannot provide support for questions regarding dependencies.
++
++
+ # BUILD
+ to build the kernel module run:
+
+diff --git a/v4l2loopback.c b/v4l2loopback.c
+index bcf7667..b0f7b93 100644
+--- a/v4l2loopback.c
++++ b/v4l2loopback.c
+@@ -48,9 +48,9 @@
+
+ MODULE_DESCRIPTION("V4L2 loopback video device");
+ MODULE_AUTHOR("Vasily Levin, " \
+- "IOhannes m zmoelnig <zmoelnig@iem.at>," \
+- "Stefan Diewald," \
+- "Anton Novikov" \
++ "IOhannes m zmoelnig <zmoelnig@iem.at>," \
++ "Stefan Diewald," \
++ "Anton Novikov" \
+ "et al." \
+ );
+ MODULE_LICENSE("GPL");
+@@ -61,18 +61,18 @@ MODULE_LICENSE("GPL");
+ #define STRINGIFY(s) #s
+ #define STRINGIFY2(s) STRINGIFY(s)
+
+-#define dprintk(fmt, args...) \
+- do { if (debug > 0) { \
++#define dprintk(fmt, args...) \
++ do { if (debug > 0) { \
+ printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__) "]: " fmt, ##args); \
+ } } while (0)
+
+-#define MARK() \
+- do { if (debug > 1) { \
++#define MARK() \
++ do { if (debug > 1) { \
+ printk(KERN_INFO "%s:%d[%s]\n", __FILE__, __LINE__, __func__); \
+ } } while (0)
+
+-#define dprintkrw(fmt, args...) \
+- do { if (debug > 2) { \
++#define dprintkrw(fmt, args...) \
++ do { if (debug > 2) { \
+ printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__)"]: " fmt, ##args); \
+ } } while (0)
+
+@@ -85,14 +85,14 @@ struct v4l2_ctrl_handler {
+ int error;
+ };
+ struct v4l2_ctrl_config {
+- void *ops;
+- u32 id;
++ void *ops;
++ u32 id;
+ const char *name;
+ int type;
+- s32 min;
+- s32 max;
+- u32 step;
+- s32 def;
++ s32 min;
++ s32 max;
++ u32 step;
++ s32 def;
+ };
+ int v4l2_ctrl_handler_init(struct v4l2_ctrl_handler*hdl,
+ unsigned nr_of_controls_hint)
+@@ -119,7 +119,7 @@ struct v4l2_device {
+ char name[V4L2_DEVICE_NAME_SIZE];
+ struct v4l2_ctrl_handler*ctrl_handler;
+ };
+-static inline int v4l2_device_register (void *dev, void *v4l2_dev) { return 0; }
++static inline int v4l2_device_register(void *dev, void *v4l2_dev) { return 0; }
+ static inline void v4l2_device_unregister(struct v4l2_device *v4l2_dev) { return; }
+ #endif /* HAVE__V4L2_DEVICE */
+
+@@ -155,7 +155,7 @@ static inline void v4l2l_get_timestamp(struct v4l2_buffer *b) {
+
+ /* module constants
+ * can be overridden during he build process using something like
+- * make KCPPFLAGS="-DMAX_DEVICES=100"
++ * make KCPPFLAGS="-DMAX_DEVICES=100"
+ */
+
+
+@@ -235,13 +235,13 @@ MODULE_PARM_DESC(max_height, "maximum frame height");
+
+ /* control IDs */
+ #ifndef HAVE__V4L2_CTRLS
+-# define V4L2LOOPBACK_CID_BASE (V4L2_CID_PRIVATE_BASE)
++# define V4L2LOOPBACK_CID_BASE (V4L2_CID_PRIVATE_BASE)
+ #else
+-# define V4L2LOOPBACK_CID_BASE (V4L2_CID_USER_BASE | 0xf000)
++# define V4L2LOOPBACK_CID_BASE (V4L2_CID_USER_BASE | 0xf000)
+ #endif
+-#define CID_KEEP_FORMAT (V4L2LOOPBACK_CID_BASE + 0)
++#define CID_KEEP_FORMAT (V4L2LOOPBACK_CID_BASE + 0)
+ #define CID_SUSTAIN_FRAMERATE (V4L2LOOPBACK_CID_BASE + 1)
+-#define CID_TIMEOUT (V4L2LOOPBACK_CID_BASE + 2)
++#define CID_TIMEOUT (V4L2LOOPBACK_CID_BASE + 2)
+ #define CID_TIMEOUT_IMAGE_IO (V4L2LOOPBACK_CID_BASE + 3)
+
+ static int v4l2loopback_s_ctrl(struct v4l2_ctrl *ctrl);
+@@ -249,44 +249,44 @@ static const struct v4l2_ctrl_ops v4l2loopback_ctrl_ops = {
+ .s_ctrl = v4l2loopback_s_ctrl,
+ };
+ static const struct v4l2_ctrl_config v4l2loopback_ctrl_keepformat = {
+- .ops = &v4l2loopback_ctrl_ops,
+- .id = CID_KEEP_FORMAT,
+- .name = "keep_format",
+- .type = V4L2_CTRL_TYPE_BOOLEAN,
+- .min = 0,
+- .max = 1,
+- .step = 1,
+- .def = 0,
++ .ops = &v4l2loopback_ctrl_ops,
++ .id = CID_KEEP_FORMAT,
++ .name = "keep_format",
++ .type = V4L2_CTRL_TYPE_BOOLEAN,
++ .min = 0,
++ .max = 1,
++ .step = 1,
++ .def = 0,
+ };
+ static const struct v4l2_ctrl_config v4l2loopback_ctrl_sustainframerate = {
+- .ops = &v4l2loopback_ctrl_ops,
+- .id = CID_SUSTAIN_FRAMERATE,
+- .name = "sustain_framerate",
+- .type = V4L2_CTRL_TYPE_BOOLEAN,
+- .min = 0,
+- .max = 1,
+- .step = 1,
+- .def = 0,
++ .ops = &v4l2loopback_ctrl_ops,
++ .id = CID_SUSTAIN_FRAMERATE,
++ .name = "sustain_framerate",
++ .type = V4L2_CTRL_TYPE_BOOLEAN,
++ .min = 0,
++ .max = 1,
++ .step = 1,
++ .def = 0,
+ };
+ static const struct v4l2_ctrl_config v4l2loopback_ctrl_timeout = {
+- .ops = &v4l2loopback_ctrl_ops,
+- .id = CID_TIMEOUT,
+- .name = "timeout",
+- .type = V4L2_CTRL_TYPE_INTEGER,
+- .min = 0,
+- .max = MAX_TIMEOUT,
+- .step = 1,
+- .def = 0,
++ .ops = &v4l2loopback_ctrl_ops,
++ .id = CID_TIMEOUT,
++ .name = "timeout",
++ .type = V4L2_CTRL_TYPE_INTEGER,
++ .min = 0,
++ .max = MAX_TIMEOUT,
++ .step = 1,
++ .def = 0,
+ };
+ static const struct v4l2_ctrl_config v4l2loopback_ctrl_timeoutimageio = {
+- .ops = &v4l2loopback_ctrl_ops,
+- .id = CID_TIMEOUT_IMAGE_IO,
+- .name = "timeout_image_io",
+- .type = V4L2_CTRL_TYPE_BOOLEAN,
+- .min = 0,
+- .max = 1,
+- .step = 1,
+- .def = 0,
++ .ops = &v4l2loopback_ctrl_ops,
++ .id = CID_TIMEOUT_IMAGE_IO,
++ .name = "timeout_image_io",
++ .type = V4L2_CTRL_TYPE_BOOLEAN,
++ .min = 0,
++ .max = 1,
++ .step = 1,
++ .def = 0,
+ };
+
+
+@@ -321,7 +321,7 @@ struct v4l2_loopback_device {
+ (close to) nominal framerate */
+
+ /* buffers stuff */
+- u8 *image; /* pointer to actual buffers data */
++ u8 *image; /* pointer to actual buffers data */
+ unsigned long int imagesize; /* size of buffers data */
+ int buffers_number; /* should not be big, 4 is a good choice */
+ struct v4l2l_buffer buffers[MAX_BUFFERS]; /* inner driver buffers */
+@@ -386,13 +386,13 @@ struct v4l2_loopback_opener {
+ /* this is heavily inspired by the bttv driver found in the linux kernel */
+ struct v4l2l_format {
+ char *name;
+- int fourcc; /* video4linux 2 */
+- int depth; /* bit/pixel */
++ int fourcc; /* video4linux 2 */
++ int depth; /* bit/pixel */
+ int flags;
+ };
+ /* set the v4l2l_format.flags to PLANAR for non-packed formats */
+-#define FORMAT_FLAGS_PLANAR 0x01
+-#define FORMAT_FLAGS_COMPRESSED 0x02
++#define FORMAT_FLAGS_PLANAR 0x01
++#define FORMAT_FLAGS_COMPRESSED 0x02
+
+ #ifndef V4L2_PIX_FMT_VP9
+ #define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0')
+@@ -446,7 +446,7 @@ static void pix_format_set_size(struct v4l2_pix_format *f,
+ f->bytesperline = width; /* Y plane */
+ f->sizeimage = (width * height * fmt->depth) >> 3;
+ } else if (fmt->flags & FORMAT_FLAGS_COMPRESSED) {
+- /* doesn't make sense for compressed formats */
++ /* doesn't make sense for compressed formats */
+ f->bytesperline = 0;
+ f->sizeimage = (width * height * fmt->depth) >> 3;
+ } else {
+@@ -458,7 +458,7 @@ static void pix_format_set_size(struct v4l2_pix_format *f,
+ static int set_timeperframe(struct v4l2_loopback_device *dev,
+ struct v4l2_fract *tpf)
+ {
+- if((tpf->denominator < 1) || (tpf->numerator < 1)) {
++ if((tpf->denominator < 1) || (tpf->numerator < 1)) {
+ return -EINVAL;
+ }
+ dev->capture_param.timeperframe = *tpf;
+@@ -485,7 +485,7 @@ static ssize_t attr_show_format(struct device *cd,
+ tpf = &dev->capture_param.timeperframe;
+
+ fourcc2str(dev->pix_format.pixelformat, buf4cc);
+- buf4cc[4]=0;
++ buf4cc[4]=0;
+ if (tpf->numerator == 1)
+ snprintf(buf_fps, sizeof(buf_fps), "%d", tpf->denominator);
+ else
+@@ -578,7 +578,7 @@ static void v4l2loopback_create_sysfs(struct video_device *vdev)
+ {
+ int res = 0;
+
+-#define V4L2_SYSFS_CREATE(x) res = device_create_file(&vdev->dev, &dev_attr_##x); if (res < 0) break
++#define V4L2_SYSFS_CREATE(x) res = device_create_file(&vdev->dev, &dev_attr_##x); if (res < 0) break
+ if (!vdev)
+ return;
+ do {
+@@ -671,7 +671,7 @@ static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability
+ {
+ struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+ int devnr = ((struct v4l2loopback_private *)video_get_drvdata(dev->vdev))->devicenr;
+- __u32 capabilities = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
++ __u32 capabilities = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
+
+ strlcpy(cap->driver, "v4l2 loopback", sizeof(cap->driver));
+ vidioc_fill_name(cap->card, sizeof(cap->card), devnr);
+@@ -698,7 +698,10 @@ static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability
+ }
+ }
+
+- dev->vdev->device_caps = cap->device_caps = cap->capabilities = capabilities;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ dev->vdev->device_caps =
++#endif /* >=linux-4.7.0 */
++ cap->device_caps = cap->capabilities = capabilities;
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
+ cap->capabilities |= V4L2_CAP_DEVICE_CAPS;
+@@ -891,7 +894,7 @@ static int vidioc_enum_fmt_out(struct file *file, void *fh, struct v4l2_fmtdesc
+ f->pixelformat = dev->pix_format.pixelformat;
+ } else {
+ /* fill in a dummy format */
+- /* coverity[unsigned_compare] */
++ /* coverity[unsigned_compare] */
+ if (f->index < 0 || f->index >= FORMATS)
+ return -EINVAL;
+
+@@ -1069,11 +1072,11 @@ static int vidioc_s_parm(struct file *file, void *priv, struct v4l2_streamparm *
+
+ switch (parm->type) {
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+- if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
++ if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
+ return err;
+ break;
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+- if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
++ if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
+ return err;
+ break;
+ default:
+@@ -1249,7 +1252,7 @@ static int vidioc_enum_output(struct file *file, void *fh, struct v4l2_output *o
+ struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+ MARK();
+
+- if (!dev->announce_all_caps && !dev->ready_for_output)
++ if (!dev->announce_all_caps && !dev->ready_for_output)
+ return -ENOTTY;
+
+ if (0 != index)
+@@ -1279,7 +1282,7 @@ static int vidioc_enum_output(struct file *file, void *fh, struct v4l2_output *o
+ static int vidioc_g_output(struct file *file, void *fh, unsigned int *i)
+ {
+ struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+- if (!dev->announce_all_caps && !dev->ready_for_output)
++ if (!dev->announce_all_caps && !dev->ready_for_output)
+ return -ENOTTY;
+ if (i)
+ *i = 0;
+@@ -1292,7 +1295,7 @@ static int vidioc_g_output(struct file *file, void *fh, unsigned int *i)
+ static int vidioc_s_output(struct file *file, void *fh, unsigned int i)
+ {
+ struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+- if (!dev->announce_all_caps && !dev->ready_for_output)
++ if (!dev->announce_all_caps && !dev->ready_for_output)
+ return -ENOTTY;
+
+ if (i)
+@@ -1340,7 +1343,7 @@ static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *inp
+ static int vidioc_g_input(struct file *file, void *fh, unsigned int *i)
+ {
+ struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+- if (!dev->announce_all_caps && !dev->ready_for_capture)
++ if (!dev->announce_all_caps && !dev->ready_for_capture)
+ return -ENOTTY;
+ if (i)
+ *i = 0;
+@@ -1353,7 +1356,7 @@ static int vidioc_g_input(struct file *file, void *fh, unsigned int *i)
+ static int vidioc_s_input(struct file *file, void *fh, unsigned int i)
+ {
+ struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+- if (!dev->announce_all_caps && !dev->ready_for_capture)
++ if (!dev->announce_all_caps && !dev->ready_for_capture)
+ return -ENOTTY;
+ if (i == 0)
+ return 0;
+@@ -1527,7 +1530,7 @@ static int vidioc_qbuf(struct file *file, void *private_data, struct v4l2_buffer
+ /* Hopefully fix 'DQBUF return bad index if queue bigger then 2 for capture'
+ https://github.com/umlaeute/v4l2loopback/issues/60 */
+ buf->flags &= ~V4L2_BUF_FLAG_DONE;
+- buf->flags |= V4L2_BUF_FLAG_QUEUED;
++ buf->flags |= V4L2_BUF_FLAG_QUEUED;
+
+ wake_up_all(&dev->read_event);
+ return 0;
+@@ -1666,7 +1669,7 @@ static int vidioc_streamon(struct file *file, void *private_data, enum v4l2_buf_
+ default:
+ return -EINVAL;
+ }
+- return -EINVAL;
++ return -EINVAL;
+ }
+
+ /* stop streaming
+@@ -1896,8 +1899,8 @@ static ssize_t v4l2_loopback_read(struct file *file,
+ dev = v4l2loopback_getdevice(file);
+
+ read_index = get_capture_buffer(file);
+- if (read_index < 0)
+- return read_index;
++ if (read_index < 0)
++ return read_index;
+ if (count > dev->buffer_size)
+ count = dev->buffer_size;
+ b = &dev->buffers[read_index].buffer;
+@@ -2034,20 +2037,20 @@ static void init_buffers(struct v4l2_loopback_device *dev)
+
+ for (i = 0; i < dev->buffers_number; ++i) {
+ struct v4l2_buffer *b = &dev->buffers[i].buffer;
+- b->index = i;
+- b->bytesused = bytesused;
+- b->length = buffer_size;
+- b->field = V4L2_FIELD_NONE;
+- b->flags = 0;
++ b->index = i;
++ b->bytesused = bytesused;
++ b->length = buffer_size;
++ b->field = V4L2_FIELD_NONE;
++ b->flags = 0;
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 1)
+- b->input = 0;
++ b->input = 0;
+ #endif
+- b->m.offset = i * buffer_size;
+- b->memory = V4L2_MEMORY_MMAP;
+- b->sequence = 0;
++ b->m.offset = i * buffer_size;
++ b->memory = V4L2_MEMORY_MMAP;
++ b->sequence = 0;
+ b->timestamp.tv_sec = 0;
+ b->timestamp.tv_usec = 0;
+- b->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++ b->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+ v4l2l_get_timestamp(b);
+ }
+@@ -2077,29 +2080,29 @@ static void init_vdev(struct video_device *vdev, int nr)
+ vidioc_fill_name(vdev->name, sizeof(vdev->name), nr);
+
+ #ifdef V4L2LOOPBACK_WITH_STD
+- vdev->tvnorms = V4L2_STD_ALL;
++ vdev->tvnorms = V4L2_STD_ALL;
+ #endif /* V4L2LOOPBACK_WITH_STD */
+
+- vdev->vfl_type = VFL_TYPE_VIDEO;
+- vdev->fops = &v4l2_loopback_fops;
+- vdev->ioctl_ops = &v4l2_loopback_ioctl_ops;
+- vdev->release = &video_device_release;
+- vdev->minor = -1;
++ vdev->vfl_type = VFL_TYPE_VIDEO;
++ vdev->fops = &v4l2_loopback_fops;
++ vdev->ioctl_ops = &v4l2_loopback_ioctl_ops;
++ vdev->release = &video_device_release;
++ vdev->minor = -1;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+ vdev->device_caps =
+- V4L2_CAP_DEVICE_CAPS |
++ V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
++ V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
+ #ifdef V4L2_CAP_VIDEO_M2M
+- V4L2_CAP_VIDEO_M2M |
+-#endif
+- V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
+- V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
++ vdev->device_caps |= V4L2_CAP_VIDEO_M2M;
+ #endif
++#endif /* >=linux-4.7.0 */
++
+ if (debug > 1)
+- #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
+ vdev->debug = V4L2_DEBUG_IOCTL | V4L2_DEBUG_IOCTL_ARG;
+- #else
++#else
+ vdev->dev_debug = V4L2_DEV_DEBUG_IOCTL | V4L2_DEV_DEBUG_IOCTL_ARG;
+- #endif
++#endif
+
+ /* since kernel-3.7, there is a new field 'vfl_dir' that has to be
+ * set to VFL_DIR_M2M for bidrectional devices */
+@@ -2114,11 +2117,11 @@ static void init_vdev(struct video_device *vdev, int nr)
+ static void init_capture_param(struct v4l2_captureparm *capture_param)
+ {
+ MARK();
+- capture_param->capability = 0;
+- capture_param->capturemode = 0;
+- capture_param->extendedmode = 0;
+- capture_param->readbuffers = max_buffers;
+- capture_param->timeperframe.numerator = 1;
++ capture_param->capability = 0;
++ capture_param->capturemode = 0;
++ capture_param->extendedmode = 0;
++ capture_param->readbuffers = max_buffers;
++ capture_param->timeperframe.numerator = 1;
+ capture_param->timeperframe.denominator = 30;
+ }
+
+@@ -2177,10 +2180,10 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
+ int ret;
+ struct v4l2_ctrl_handler *hdl = &dev->ctrl_handler;
+ snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name),
+- "v4l2loopback-%03d", nr);
+- ret = v4l2_device_register(NULL, &dev->v4l2_dev);
+- if (ret)
+- return ret;
++ "v4l2loopback-%03d", nr);
++ ret = v4l2_device_register(NULL, &dev->v4l2_dev);
++ if (ret)
++ return ret;
+
+ MARK();
+ dev->vdev = video_device_alloc();
+@@ -2230,7 +2233,7 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
+ setup_timer(&dev->sustain_timer, sustain_timer_clb, nr);
+ setup_timer(&dev->timeout_timer, timeout_timer_clb, nr);
+ #endif
+- dev->reread_count = 0;
++ dev->reread_count = 0;
+ dev->timeout_jiffies = 0;
+ dev->timeout_image = NULL;
+ dev->timeout_happened = 0;
+@@ -2242,10 +2245,10 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
+ v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_sustainframerate, NULL);
+ v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_timeout, NULL);
+ v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_timeoutimageio, NULL);
+- if (hdl->error) {
+- ret = hdl->error;
+- goto error;
+- }
++ if (hdl->error) {
++ ret = hdl->error;
++ goto error;
++ }
+ dev->v4l2_dev.ctrl_handler = hdl;
+
+ /* FIXME set buffers to 0 */
+@@ -2267,55 +2270,55 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
+ return 0;
+
+ error:
+- v4l2_ctrl_handler_free(&dev->ctrl_handler);
+- v4l2_device_unregister(&dev->v4l2_dev);
++ v4l2_ctrl_handler_free(&dev->ctrl_handler);
++ v4l2_device_unregister(&dev->v4l2_dev);
+ kfree(dev->vdev);
+- return ret;
++ return ret;
+
+ };
+
+ /* LINUX KERNEL */
+ static const struct v4l2_file_operations v4l2_loopback_fops = {
+- .owner = THIS_MODULE,
+- .open = v4l2_loopback_open,
++ .owner = THIS_MODULE,
++ .open = v4l2_loopback_open,
+ .release = v4l2_loopback_close,
+- .read = v4l2_loopback_read,
+- .write = v4l2_loopback_write,
+- .poll = v4l2_loopback_poll,
+- .mmap = v4l2_loopback_mmap,
+- .unlocked_ioctl = video_ioctl2,
++ .read = v4l2_loopback_read,
++ .write = v4l2_loopback_write,
++ .poll = v4l2_loopback_poll,
++ .mmap = v4l2_loopback_mmap,
++ .unlocked_ioctl = video_ioctl2,
+ };
+
+ static const struct v4l2_ioctl_ops v4l2_loopback_ioctl_ops = {
+- .vidioc_querycap = &vidioc_querycap,
++ .vidioc_querycap = &vidioc_querycap,
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+- .vidioc_enum_framesizes = &vidioc_enum_framesizes,
++ .vidioc_enum_framesizes = &vidioc_enum_framesizes,
+ .vidioc_enum_frameintervals = &vidioc_enum_frameintervals,
+ #endif
+
+ #ifndef HAVE__V4L2_CTRLS
+- .vidioc_queryctrl = &vidioc_queryctrl,
+- .vidioc_g_ctrl = &vidioc_g_ctrl,
+- .vidioc_s_ctrl = &vidioc_s_ctrl,
++ .vidioc_queryctrl = &vidioc_queryctrl,
++ .vidioc_g_ctrl = &vidioc_g_ctrl,
++ .vidioc_s_ctrl = &vidioc_s_ctrl,
+ #endif /* HAVE__V4L2_CTRLS */
+
+- .vidioc_enum_output = &vidioc_enum_output,
+- .vidioc_g_output = &vidioc_g_output,
+- .vidioc_s_output = &vidioc_s_output,
++ .vidioc_enum_output = &vidioc_enum_output,
++ .vidioc_g_output = &vidioc_g_output,
++ .vidioc_s_output = &vidioc_s_output,
+
+- .vidioc_enum_input = &vidioc_enum_input,
+- .vidioc_g_input = &vidioc_g_input,
+- .vidioc_s_input = &vidioc_s_input,
++ .vidioc_enum_input = &vidioc_enum_input,
++ .vidioc_g_input = &vidioc_g_input,
++ .vidioc_s_input = &vidioc_s_input,
+
+ .vidioc_enum_fmt_vid_cap = &vidioc_enum_fmt_cap,
+- .vidioc_g_fmt_vid_cap = &vidioc_g_fmt_cap,
+- .vidioc_s_fmt_vid_cap = &vidioc_s_fmt_cap,
+- .vidioc_try_fmt_vid_cap = &vidioc_try_fmt_cap,
++ .vidioc_g_fmt_vid_cap = &vidioc_g_fmt_cap,
++ .vidioc_s_fmt_vid_cap = &vidioc_s_fmt_cap,
++ .vidioc_try_fmt_vid_cap = &vidioc_try_fmt_cap,
+
+ .vidioc_enum_fmt_vid_out = &vidioc_enum_fmt_out,
+- .vidioc_s_fmt_vid_out = &vidioc_s_fmt_out,
+- .vidioc_g_fmt_vid_out = &vidioc_g_fmt_out,
+- .vidioc_try_fmt_vid_out = &vidioc_try_fmt_out,
++ .vidioc_s_fmt_vid_out = &vidioc_s_fmt_out,
++ .vidioc_g_fmt_vid_out = &vidioc_g_fmt_out,
++ .vidioc_try_fmt_vid_out = &vidioc_try_fmt_out,
+
+ #ifdef V4L2L_OVERLAY
+ .vidioc_s_fmt_vid_overlay = &vidioc_s_fmt_overlay,
+@@ -2323,24 +2326,24 @@ static const struct v4l2_ioctl_ops v4l2_loopback_ioctl_ops = {
+ #endif
+
+ #ifdef V4L2LOOPBACK_WITH_STD
+- .vidioc_s_std = &vidioc_s_std,
+- .vidioc_g_std = &vidioc_g_std,
+- .vidioc_querystd = &vidioc_querystd,
++ .vidioc_s_std = &vidioc_s_std,
++ .vidioc_g_std = &vidioc_g_std,
++ .vidioc_querystd = &vidioc_querystd,
+ #endif /* V4L2LOOPBACK_WITH_STD */
+
+- .vidioc_g_parm = &vidioc_g_parm,
+- .vidioc_s_parm = &vidioc_s_parm,
++ .vidioc_g_parm = &vidioc_g_parm,
++ .vidioc_s_parm = &vidioc_s_parm,
+
+- .vidioc_reqbufs = &vidioc_reqbufs,
+- .vidioc_querybuf = &vidioc_querybuf,
+- .vidioc_qbuf = &vidioc_qbuf,
+- .vidioc_dqbuf = &vidioc_dqbuf,
++ .vidioc_reqbufs = &vidioc_reqbufs,
++ .vidioc_querybuf = &vidioc_querybuf,
++ .vidioc_qbuf = &vidioc_qbuf,
++ .vidioc_dqbuf = &vidioc_dqbuf,
+
+- .vidioc_streamon = &vidioc_streamon,
+- .vidioc_streamoff = &vidioc_streamoff,
++ .vidioc_streamon = &vidioc_streamon,
++ .vidioc_streamoff = &vidioc_streamoff,
+
+ #ifdef CONFIG_VIDEO_V4L1_COMPAT
+- .vidiocgmbuf = &vidiocgmbuf,
++ .vidiocgmbuf = &vidiocgmbuf,
+ #endif
+ };
+
+@@ -2459,10 +2462,10 @@ static void v4l2loopback_cleanup_module(void)
+ #ifdef MODULE
+ int __init init_module(void)
+ {
+- return v4l2loopback_init_module();
++ return v4l2loopback_init_module();
+ }
+ void __exit cleanup_module(void) {
+- return v4l2loopback_cleanup_module();
++ return v4l2loopback_cleanup_module();
+ }
+ #else
+ late_initcall(v4l2loopback_init_module);
diff --git a/system/v4l2loopback/v4l2loopback.SlackBuild b/system/v4l2loopback/v4l2loopback.SlackBuild
new file mode 100644
index 0000000000..7d7fadd788
--- /dev/null
+++ b/system/v4l2loopback/v4l2loopback.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for v4l2loopback
+
+# Copyright 2020 Edward W. Koenig <kingbeowulf@gmail.com>
+# 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.
+
+PRGNAM=v4l2loopback
+VERSION=${VERSION:-0.12.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix for older kernels, etc...
+# https://github.com/umlaeute/v4l2loopback/commit/d26e624b4ead762d34152f9f825b3a51fb92fb9c
+# https://github.com/umlaeute/v4l2loopback/commit/7dced0f9e6641b7e9e54ced74c5c7611d10f729f
+# https://github.com/umlaeute/v4l2loopback/commit/72a32a67dee3a67dff76f565551907a2fc7e88e6
+# only set (struct video_device).device_caps on linux>=4.7.0
+# Set device_caps in init_vdev() for all kernel-versions (not just >4.7.0)
+# Don't set the V4L2_CAP_DEVICE_CAPS on device_caps
+patch -p1 < $CWD/update_to_master_17JUN2020.patch
+
+make
+
+install -D -m 644 $PRGNAM.ko $PKG/lib/modules/$(uname -r)/kernel/extra/$PRGNAM.ko
+install -D -m 755 utils/$PRGNAM-ctl $PKG/usr/bin/$PRGNAM-ctl
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README.md TODO doc/ $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/v4l2loopback/v4l2loopback.info b/system/v4l2loopback/v4l2loopback.info
new file mode 100644
index 0000000000..f475983a79
--- /dev/null
+++ b/system/v4l2loopback/v4l2loopback.info
@@ -0,0 +1,10 @@
+PRGNAM="v4l2loopback"
+VERSION="0.12.5"
+HOMEPAGE="https://github.com/umlaeute/v4l2loopback/"
+DOWNLOAD="https://github.com/umlaeute/v4l2loopback/archive/v0.12.5/v4l2loopback-0.12.5.tar.gz"
+MD5SUM="4b0aaae5dd8c4f5dd0f9e2142e92e390"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edward W. Koenig"
+EMAIL="kingbeowulf@gmail.com"
diff --git a/system/vice/README b/system/vice/README
index d023ecb72c..695f7c927c 100644
--- a/system/vice/README
+++ b/system/vice/README
@@ -1,8 +1,16 @@
-VICE is the one and only Versatile Commodore Emulator. It provides emulation
-of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II computers.
+VICE is the one and only Versatile Commodore Emulator. It provides
+emulation of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II
+computers.
NOTE: To use the standard application menu instead of the in-emulator
-PETSCII menu, GTK3 v3.22 is required. Slackware 14.2 ships with 3.18 and
-there is no upgrade package for this. Slackware Current has 3.22. So to
-use the normal application menus, you either need to use Slackware Current
-or find a way to upgrade your Slackware 14.2's GTK3 to v3.22.
+PETSCII menu, GTK3 v3.22 is required. Slackware 14.2 ships with 3.18
+and there is no upgrade package for this. Slackware Current has 3.22.
+So to use the normal application menus, you either need to use Slackware
+Current or find a way to upgrade your Slackware 14.2's GTK3 to v3.22.
+
+Optional Dependency
+
+To enable recording of videos, you need ffmpeg. Enable this by passing
+to the script the parameter:
+
+ FFMPEG=yes ./vice.SlackBuild
diff --git a/system/vice/config/x64.desktop b/system/vice/config/x64.desktop
deleted file mode 100644
index 41e8485963..0000000000
--- a/system/vice/config/x64.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE C64 emulator
-Comment=Commodore 64 emulator from the VICE team
-StartupNotify=true
-Exec=x64
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/slack-desc b/system/vice/slack-desc
index b7266deab0..9148291f61 100644
--- a/system/vice/slack-desc
+++ b/system/vice/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-vice: vice (the Versatile Commodore Emulator)
+vice: VICE - the Versatile Commodore Emulator
vice:
vice: VICE is a program that runs on a Unix, MS-DOS, Win32, OS/2, BeOS,
vice: QNX 4.x, QNX 6.x, Amiga, Syllable or Mac OS X machine and executes
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index f745447368..578b7d0626 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -25,7 +25,7 @@
# Initialize variables
PRGNAM=vice
VERSION=${VERSION:-3.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -58,6 +58,10 @@ else
LIBDIRSUFFIX=""
fi
+# The "--enable-shared-ffmpeg" option creates conflicts with external ffmpeg libraries
+# So we use an external ffmpeg from another package if requested.
+if [ "${FFMPEG:-no}" = "yes" ]; then ffmpeg="--enable-external-ffmpeg"; else ffmpeg=""; fi
+
# Exit if errors encountered
set -e
@@ -95,7 +99,7 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
- --enable-shared-ffmpeg \
+ $ffmpeg \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--with-x \
--enable-quicktime \
diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index 633171b43e..44bb5ffb08 100644
--- a/system/wine-staging/wine-staging.SlackBuild
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -32,7 +32,7 @@
# Now maintained by Dave Woodfall <dave@slackbuilds.org>
PRGNAM=wine-staging
-VERSION=${VERSION:-5.7}
+VERSION=${VERSION:-5.11}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
index fa12e5c287..2c222e91a4 100644
--- a/system/wine-staging/wine-staging.info
+++ b/system/wine-staging/wine-staging.info
@@ -1,10 +1,10 @@
PRGNAM="wine-staging"
-VERSION="5.7"
+VERSION="5.11"
HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-DOWNLOAD="https://dl.winehq.org/wine/source/5.x/wine-5.7.tar.xz \
- https://github.com/wine-staging/wine-staging/archive/v5.7/wine-staging-5.7.tar.gz"
-MD5SUM="32861bee748bc0203a95ffc160165440 \
- 28f6a2057d0af6795887e2c5fa741f42"
+DOWNLOAD="https://dl.winehq.org/wine/source/5.x/wine-5.11.tar.xz \
+ https://github.com/wine-staging/wine-staging/archive/v5.11/wine-staging-5.11.tar.gz"
+MD5SUM="e5250e7bb7358e94265122e1a709842b \
+ 6805e48343f1e71da1c7547a3c2f452e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild
index 10d7f8356b..7c94840287 100644
--- a/system/wine/wine.SlackBuild
+++ b/system/wine/wine.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wine
-VERSION=${VERSION:-5.0}
+VERSION=${VERSION:-5.0.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
CWD=$(pwd)
diff --git a/system/wine/wine.info b/system/wine/wine.info
index aaab33f775..1bc9f4bccf 100644
--- a/system/wine/wine.info
+++ b/system/wine/wine.info
@@ -1,8 +1,8 @@
PRGNAM="wine"
-VERSION="5.0"
+VERSION="5.0.1"
HOMEPAGE="http://www.winehq.com/"
-DOWNLOAD="https://dl.winehq.org/wine/source/5.0/wine-5.0.tar.xz"
-MD5SUM="95993144d0c63bdd31110ae5a90c77b2"
+DOWNLOAD="https://dl.winehq.org/wine/source/5.0/wine-5.0.1.tar.xz"
+MD5SUM="d60a0768d7e422aea34ba4e25728944b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/wmgtemp/bugfix.diff b/system/wmgtemp/bugfix.diff
deleted file mode 100644
index 19916400c8..0000000000
--- a/system/wmgtemp/bugfix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur wmgtemp-1.1/src/wmgtemp.c wmgtemp-1.1.patched/src/wmgtemp.c
---- wmgtemp-1.1/src/wmgtemp.c 2010-06-21 06:54:37.000000000 -0400
-+++ wmgtemp-1.1.patched/src/wmgtemp.c 2016-08-16 08:38:01.208866564 -0400
-@@ -90,8 +90,8 @@
- int SUBFEAT_NUM_CPU = 0;
- int SUBFEAT_NUM_SYS = 0;
-
--double cpu_history[59];
--double sys_history[59];
-+double cpu_history[60];
-+double sys_history[60];
-
- double display_min = 20;
- double display_max = 35;
diff --git a/system/wmgtemp/wmgtemp.SlackBuild b/system/wmgtemp/wmgtemp.SlackBuild
index d48afc24a9..f8c546215f 100644
--- a/system/wmgtemp/wmgtemp.SlackBuild
+++ b/system/wmgtemp/wmgtemp.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for wmgtemp
#
# Copyright 2015 Gethyn ThomasQuail <email removed>
+# Copyright 2020 B. Watson <yalhcru@gmail.com>
# All rights reserved.
#
# Based on:
@@ -27,6 +28,7 @@
# Now maintained by B. Watson <yalhcru@gmail.com>
+# 20200609 bkw: update for v1.2, add libdockapp dep
# 20160816 bkw:
# - take over maintenance
# - BUILD=2
@@ -37,8 +39,8 @@
# - don't install INSTALL to doc dir
PRGNAM=wmgtemp
-VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -77,21 +79,23 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-patch -p1 < $CWD/bugfix.diff
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux
-sed -i 's,/etc/sensors\.conf,/etc/sensors3.conf,' src/$PRGNAM.c $PRGNAM.1
-
-make CCFLAGS="$SLKCFLAGS -fgnu89-inline"
-mkdir -p $PKG/usr/bin
-install -s -m0755 src/$PRGNAM $PKG/usr/bin
-mkdir -p $PKG/usr/man/man1
-gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+make
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a Artistic ChangeLog CREDITS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/wmgtemp/wmgtemp.info b/system/wmgtemp/wmgtemp.info
index 8723be139c..0ead6258c1 100644
--- a/system/wmgtemp/wmgtemp.info
+++ b/system/wmgtemp/wmgtemp.info
@@ -1,10 +1,10 @@
PRGNAM="wmgtemp"
-VERSION="1.1"
-HOMEPAGE="http://fluxcode.net/projects/wmgtemp"
-DOWNLOAD="http://fluxcode.net/files/wmgtemp-1.1.tar.gz"
-MD5SUM="cce700b3a4ef74b2ec019d8e89bdf2f6"
+VERSION="1.2"
+HOMEPAGE="https://www.dockapps.net/wmgtemp"
+DOWNLOAD="https://www.dockapps.net/download/wmgtemp-1.2.tar.gz"
+MD5SUM="a595053ba7fab25e318d983df3af8ce8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libdockapp"
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"
diff --git a/system/xen/dom0/README.dom0 b/system/xen/dom0/README.dom0
index f798e2ddc7..68dbf815fb 100644
--- a/system/xen/dom0/README.dom0
+++ b/system/xen/dom0/README.dom0
@@ -46,7 +46,7 @@ Xen EFI binary.
To make things a bit easier, a copy of Xen EFI binary can be found here:
- http://slackware.hr/~mario/xen/xen-4.13.0.efi.gz
+ http://slackware.hr/~mario/xen/xen-4.13.1.efi.gz
If an automatic boot to Xen kernel is desired, the binary should be renamed and
copied to the following location: /boot/efi/EFI/BOOT/bootx64.efi
diff --git a/system/xen/dom0/kernel-xen.sh b/system/xen/dom0/kernel-xen.sh
index 483d6460c2..754cf6fcf5 100644
--- a/system/xen/dom0/kernel-xen.sh
+++ b/system/xen/dom0/kernel-xen.sh
@@ -6,7 +6,7 @@
# Modified by Mario Preksavec <mario@slackware.hr>
KERNEL=${KERNEL:-4.4.217}
-XEN=${XEN:-4.13.0}
+XEN=${XEN:-4.13.1}
BOOTLOADER=${BOOTLOADER:-lilo}
ROOTMOD=${ROOTMOD:-ext4}
diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild
index 262ff9996a..80aac0a098 100644
--- a/system/xen/xen.SlackBuild
+++ b/system/xen/xen.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xen
-VERSION=${VERSION:-4.13.0}
+VERSION=${VERSION:-4.13.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/xen/xen.info b/system/xen/xen.info
index fa9672aace..c74e7f07d1 100644
--- a/system/xen/xen.info
+++ b/system/xen/xen.info
@@ -1,7 +1,7 @@
PRGNAM="xen"
-VERSION="4.13.0"
+VERSION="4.13.1"
HOMEPAGE="http://www.xenproject.org/"
-DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.13.0.tar.gz \
+DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.13.1.tar.gz \
http://mirror.slackware.hr/sources/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz \
http://mirror.slackware.hr/sources/xen-extfiles/lwip-1.3.0.tar.gz \
http://mirror.slackware.hr/sources/xen-extfiles/zlib-1.2.3.tar.gz \
@@ -13,7 +13,7 @@ DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.13.0.tar.gz \
http://mirror.slackware.hr/sources/xen-extfiles/tpm_emulator-0.7.4.tar.gz \
http://mirror.slackware.hr/sources/xen-seabios/seabios-1.12.1.tar.gz \
http://mirror.slackware.hr/sources/xen-ovmf/xen-ovmf-20190606_20d2e5a125.tar.bz2"
-MD5SUM="d3b13c4c785601be2f104eaddd7c6a00 \
+MD5SUM="e26fe8f9ce39463734e6ede45c6e11b8 \
b3ab0488a989a089207302111d12e1a0 \
36cc57650cffda9a0269493be2a169bb \
debc62758716a169df9f62e6ab2bc634 \
diff --git a/system/xen/xsa/xsa312.patch b/system/xen/xsa/xsa312.patch
deleted file mode 100644
index ae3fa4041b..0000000000
--- a/system/xen/xsa/xsa312.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 9f807cf84a9a7a011cf1df7895c54d6031a7596d Mon Sep 17 00:00:00 2001
-From: Julien Grall <julien@xen.org>
-Date: Thu, 19 Dec 2019 08:12:21 +0000
-Subject: [PATCH] xen/arm: Place a speculation barrier sequence following an
- eret instruction
-
-Some CPUs can speculate past an ERET instruction and potentially perform
-speculative accesses to memory before processing the exception return.
-Since the register state is often controlled by lower privilege level
-at the point of an ERET, this could potentially be used as part of a
-side-channel attack.
-
-Newer CPUs may implement a new SB barrier instruction which acts
-as an architected speculation barrier. For current CPUs, the sequence
-DSB; ISB is known to prevent speculation.
-
-The latter sequence is heavier than SB but it would never be executed
-(this is speculation after all!).
-
-Introduce a new macro 'sb' that could be used when a speculation barrier
-is required. For now it is using dsb; isb but this could easily be
-updated to cater SB in the future.
-
-This is XSA-312.
-
-Signed-off-by: Julien Grall <julien@xen.org>
----
- xen/arch/arm/arm32/entry.S | 1 +
- xen/arch/arm/arm64/entry.S | 3 +++
- xen/include/asm-arm/macros.h | 9 +++++++++
- 3 files changed, 13 insertions(+)
-
-diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S
-index 31ccfb2631..b228d44b19 100644
---- a/xen/arch/arm/arm32/entry.S
-+++ b/xen/arch/arm/arm32/entry.S
-@@ -426,6 +426,7 @@ return_to_hypervisor:
- add sp, #(UREGS_SP_usr - UREGS_sp); /* SP, LR, SPSR, PC */
- clrex
- eret
-+ sb
-
- /*
- * struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next)
-diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S
-index d35855af96..175ea2981e 100644
---- a/xen/arch/arm/arm64/entry.S
-+++ b/xen/arch/arm/arm64/entry.S
-@@ -354,6 +354,7 @@ guest_sync:
- */
- mov x1, xzr
- eret
-+ sb
-
- check_wa2:
- /* ARM_SMCCC_ARCH_WORKAROUND_2 handling */
-@@ -393,6 +394,7 @@ wa2_end:
- #endif /* !CONFIG_ARM_SSBD */
- mov x0, xzr
- eret
-+ sb
- guest_sync_slowpath:
- /*
- * x0/x1 may have been scratch by the fast path above, so avoid
-@@ -457,6 +459,7 @@ return_from_trap:
- ldr lr, [sp], #(UREGS_SPSR_el1 - UREGS_LR) /* CPSR, PC, SP, LR */
-
- eret
-+ sb
-
- /*
- * Consume pending SError generated by the guest if any.
-diff --git a/xen/include/asm-arm/macros.h b/xen/include/asm-arm/macros.h
-index 91ea3505e4..4833671f4c 100644
---- a/xen/include/asm-arm/macros.h
-+++ b/xen/include/asm-arm/macros.h
-@@ -20,4 +20,13 @@
- .endr
- .endm
-
-+ /*
-+ * Speculative barrier
-+ * XXX: Add support for the 'sb' instruction
-+ */
-+ .macro sb
-+ dsb nsh
-+ isb
-+ .endm
-+
- #endif /* __ASM_ARM_MACROS_H */
---
-2.17.1
-
diff --git a/system/xen/xsa/xsa313-1.patch b/system/xen/xsa/xsa313-1.patch
deleted file mode 100644
index 95fde7ead4..0000000000
--- a/system/xen/xsa/xsa313-1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: xenoprof: clear buffer intended to be shared with guests
-
-alloc_xenheap_pages() making use of MEMF_no_scrub is fine for Xen
-internally used allocations, but buffers allocated to be shared with
-(unpriviliged) guests need to be zapped of their prior content.
-
-This is part of XSA-313.
-
-Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Wei Liu <wl@xen.org>
-
---- a/xen/common/xenoprof.c
-+++ b/xen/common/xenoprof.c
-@@ -253,6 +253,9 @@ static int alloc_xenoprof_struct(
- return -ENOMEM;
- }
-
-+ for ( i = 0; i < npages; ++i )
-+ clear_page(d->xenoprof->rawbuf + i * PAGE_SIZE);
-+
- d->xenoprof->npages = npages;
- d->xenoprof->nbuf = nvcpu;
- d->xenoprof->bufsize = bufsize;
diff --git a/system/xen/xsa/xsa313-2.patch b/system/xen/xsa/xsa313-2.patch
deleted file mode 100644
index d81b8232d2..0000000000
--- a/system/xen/xsa/xsa313-2.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: xenoprof: limit consumption of shared buffer data
-
-Since a shared buffer can be written to by the guest, we may only read
-the head and tail pointers from there (all other fields should only ever
-be written to). Furthermore, for any particular operation the two values
-must be read exactly once, with both checks and consumption happening
-with the thus read values. (The backtrace related xenoprof_buf_space()
-use in xenoprof_log_event() is an exception: The values used there get
-re-checked by every subsequent xenoprof_add_sample().)
-
-Since that code needed touching, also fix the double increment of the
-lost samples count in case the backtrace related xenoprof_add_sample()
-invocation in xenoprof_log_event() fails.
-
-Where code is being touched anyway, add const as appropriate, but take
-the opportunity to entirely drop the now unused domain parameter of
-xenoprof_buf_space().
-
-This is part of XSA-313.
-
-Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Wei Liu <wl@xen.org>
-
---- a/xen/common/xenoprof.c
-+++ b/xen/common/xenoprof.c
-@@ -479,25 +479,22 @@ static int add_passive_list(XEN_GUEST_HA
-
-
- /* Get space in the buffer */
--static int xenoprof_buf_space(struct domain *d, xenoprof_buf_t * buf, int size)
-+static int xenoprof_buf_space(int head, int tail, int size)
- {
-- int head, tail;
--
-- head = xenoprof_buf(d, buf, event_head);
-- tail = xenoprof_buf(d, buf, event_tail);
--
- return ((tail > head) ? 0 : size) + tail - head - 1;
- }
-
- /* Check for space and add a sample. Return 1 if successful, 0 otherwise. */
--static int xenoprof_add_sample(struct domain *d, xenoprof_buf_t *buf,
-+static int xenoprof_add_sample(const struct domain *d,
-+ const struct xenoprof_vcpu *v,
- uint64_t eip, int mode, int event)
- {
-+ xenoprof_buf_t *buf = v->buffer;
- int head, tail, size;
-
- head = xenoprof_buf(d, buf, event_head);
- tail = xenoprof_buf(d, buf, event_tail);
-- size = xenoprof_buf(d, buf, event_size);
-+ size = v->event_size;
-
- /* make sure indexes in shared buffer are sane */
- if ( (head < 0) || (head >= size) || (tail < 0) || (tail >= size) )
-@@ -506,7 +503,7 @@ static int xenoprof_add_sample(struct do
- return 0;
- }
-
-- if ( xenoprof_buf_space(d, buf, size) > 0 )
-+ if ( xenoprof_buf_space(head, tail, size) > 0 )
- {
- xenoprof_buf(d, buf, event_log[head].eip) = eip;
- xenoprof_buf(d, buf, event_log[head].mode) = mode;
-@@ -530,7 +527,6 @@ static int xenoprof_add_sample(struct do
- int xenoprof_add_trace(struct vcpu *vcpu, uint64_t pc, int mode)
- {
- struct domain *d = vcpu->domain;
-- xenoprof_buf_t *buf = d->xenoprof->vcpu[vcpu->vcpu_id].buffer;
-
- /* Do not accidentally write an escape code due to a broken frame. */
- if ( pc == XENOPROF_ESCAPE_CODE )
-@@ -539,7 +535,8 @@ int xenoprof_add_trace(struct vcpu *vcpu
- return 0;
- }
-
-- return xenoprof_add_sample(d, buf, pc, mode, 0);
-+ return xenoprof_add_sample(d, &d->xenoprof->vcpu[vcpu->vcpu_id],
-+ pc, mode, 0);
- }
-
- void xenoprof_log_event(struct vcpu *vcpu, const struct cpu_user_regs *regs,
-@@ -570,17 +567,22 @@ void xenoprof_log_event(struct vcpu *vcp
- /* Provide backtrace if requested. */
- if ( backtrace_depth > 0 )
- {
-- if ( (xenoprof_buf_space(d, buf, v->event_size) < 2) ||
-- !xenoprof_add_sample(d, buf, XENOPROF_ESCAPE_CODE, mode,
-- XENOPROF_TRACE_BEGIN) )
-+ if ( xenoprof_buf_space(xenoprof_buf(d, buf, event_head),
-+ xenoprof_buf(d, buf, event_tail),
-+ v->event_size) < 2 )
- {
- xenoprof_buf(d, buf, lost_samples)++;
- lost_samples++;
- return;
- }
-+
-+ /* xenoprof_add_sample() will increment lost_samples on failure */
-+ if ( !xenoprof_add_sample(d, v, XENOPROF_ESCAPE_CODE, mode,
-+ XENOPROF_TRACE_BEGIN) )
-+ return;
- }
-
-- if ( xenoprof_add_sample(d, buf, pc, mode, event) )
-+ if ( xenoprof_add_sample(d, v, pc, mode, event) )
- {
- if ( is_active(vcpu->domain) )
- active_samples++;
---- a/xen/include/xen/xenoprof.h
-+++ b/xen/include/xen/xenoprof.h
-@@ -61,12 +61,12 @@ struct xenoprof {
-
- #ifndef CONFIG_COMPAT
- #define XENOPROF_COMPAT(x) 0
--#define xenoprof_buf(d, b, field) ((b)->field)
-+#define xenoprof_buf(d, b, field) ACCESS_ONCE((b)->field)
- #else
- #define XENOPROF_COMPAT(x) ((x)->is_compat)
--#define xenoprof_buf(d, b, field) (*(!(d)->xenoprof->is_compat ? \
-- &(b)->native.field : \
-- &(b)->compat.field))
-+#define xenoprof_buf(d, b, field) ACCESS_ONCE(*(!(d)->xenoprof->is_compat \
-+ ? &(b)->native.field \
-+ : &(b)->compat.field))
- #endif
-
- struct domain;
diff --git a/system/xen/xsa/xsa314-4.13.patch b/system/xen/xsa/xsa314-4.13.patch
deleted file mode 100644
index 67e006681e..0000000000
--- a/system/xen/xsa/xsa314-4.13.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From ab49f005f7d01d4004d76f2e295d31aca7d4f93a Mon Sep 17 00:00:00 2001
-From: Julien Grall <jgrall@amazon.com>
-Date: Thu, 20 Feb 2020 20:54:40 +0000
-Subject: [PATCH] xen/rwlock: Add missing memory barrier in the unlock path of
- rwlock
-
-The rwlock unlock paths are using atomic_sub() to release the lock.
-However the implementation of atomic_sub() rightfully doesn't contain a
-memory barrier. On Arm, this means a processor is allowed to re-order
-the memory access with the preceeding access.
-
-In other words, the unlock may be seen by another processor before all
-the memory accesses within the "critical" section.
-
-The rwlock paths already contains barrier indirectly, but they are not
-very useful without the counterpart in the unlock paths.
-
-The memory barriers are not necessary on x86 because loads/stores are
-not re-ordered with lock instructions.
-
-So add arch_lock_release_barrier() in the unlock paths that will only
-add memory barrier on Arm.
-
-Take the opportunity to document each lock paths explaining why a
-barrier is not necessary.
-
-This is XSA-314.
-
-Signed-off-by: Julien Grall <jgrall@amazon.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-
----
- xen/include/xen/rwlock.h | 29 ++++++++++++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/xen/include/xen/rwlock.h b/xen/include/xen/rwlock.h
-index 3dfea1ac2a..516486306f 100644
---- a/xen/include/xen/rwlock.h
-+++ b/xen/include/xen/rwlock.h
-@@ -48,6 +48,10 @@ static inline int _read_trylock(rwlock_t *lock)
- if ( likely(!(cnts & _QW_WMASK)) )
- {
- cnts = (u32)atomic_add_return(_QR_BIAS, &lock->cnts);
-+ /*
-+ * atomic_add_return() is a full barrier so no need for an
-+ * arch_lock_acquire_barrier().
-+ */
- if ( likely(!(cnts & _QW_WMASK)) )
- return 1;
- atomic_sub(_QR_BIAS, &lock->cnts);
-@@ -64,11 +68,19 @@ static inline void _read_lock(rwlock_t *lock)
- u32 cnts;
-
- cnts = atomic_add_return(_QR_BIAS, &lock->cnts);
-+ /*
-+ * atomic_add_return() is a full barrier so no need for an
-+ * arch_lock_acquire_barrier().
-+ */
- if ( likely(!(cnts & _QW_WMASK)) )
- return;
-
- /* The slowpath will decrement the reader count, if necessary. */
- queue_read_lock_slowpath(lock);
-+ /*
-+ * queue_read_lock_slowpath() is using spinlock and therefore is a
-+ * full barrier. So no need for an arch_lock_acquire_barrier().
-+ */
- }
-
- static inline void _read_lock_irq(rwlock_t *lock)
-@@ -92,6 +104,7 @@ static inline unsigned long _read_lock_irqsave(rwlock_t *lock)
- */
- static inline void _read_unlock(rwlock_t *lock)
- {
-+ arch_lock_release_barrier();
- /*
- * Atomically decrement the reader count
- */
-@@ -121,11 +134,20 @@ static inline int _rw_is_locked(rwlock_t *lock)
- */
- static inline void _write_lock(rwlock_t *lock)
- {
-- /* Optimize for the unfair lock case where the fair flag is 0. */
-+ /*
-+ * Optimize for the unfair lock case where the fair flag is 0.
-+ *
-+ * atomic_cmpxchg() is a full barrier so no need for an
-+ * arch_lock_acquire_barrier().
-+ */
- if ( atomic_cmpxchg(&lock->cnts, 0, _QW_LOCKED) == 0 )
- return;
-
- queue_write_lock_slowpath(lock);
-+ /*
-+ * queue_write_lock_slowpath() is using spinlock and therefore is a
-+ * full barrier. So no need for an arch_lock_acquire_barrier().
-+ */
- }
-
- static inline void _write_lock_irq(rwlock_t *lock)
-@@ -157,11 +179,16 @@ static inline int _write_trylock(rwlock_t *lock)
- if ( unlikely(cnts) )
- return 0;
-
-+ /*
-+ * atomic_cmpxchg() is a full barrier so no need for an
-+ * arch_lock_acquire_barrier().
-+ */
- return likely(atomic_cmpxchg(&lock->cnts, 0, _QW_LOCKED) == 0);
- }
-
- static inline void _write_unlock(rwlock_t *lock)
- {
-+ arch_lock_release_barrier();
- /*
- * If the writer field is atomic, it can be cleared directly.
- * Otherwise, an atomic subtraction will be used to clear it.
---
-2.17.1
-
diff --git a/system/xen/xsa/xsa316-xen.patch b/system/xen/xsa/xsa316-xen.patch
deleted file mode 100644
index 4962b4e716..0000000000
--- a/system/xen/xsa/xsa316-xen.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Ross Lagerwall <ross.lagerwall@citrix.com>
-Subject: xen/gnttab: Fix error path in map_grant_ref()
-
-Part of XSA-295 (c/s 863e74eb2cffb) inadvertently re-positioned the brackets,
-changing the logic. If the _set_status() call fails, the grant_map hypercall
-would fail with a status of 1 (rc != GNTST_okay) instead of the expected
-negative GNTST_* error.
-
-This error path can be taken due to bad guest state, and causes net/blk-back
-in Linux to crash.
-
-This is XSA-316.
-
-Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
-Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Julien Grall <jgrall@amazon.com>
-
-diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
-index 9fd6e60416..4b5344dc21 100644
---- a/xen/common/grant_table.c
-+++ b/xen/common/grant_table.c
-@@ -1031,7 +1031,7 @@ map_grant_ref(
- {
- if ( (rc = _set_status(shah, status, rd, rgt->gt_version, act,
- op->flags & GNTMAP_readonly, 1,
-- ld->domain_id) != GNTST_okay) )
-+ ld->domain_id)) != GNTST_okay )
- goto act_release_out;
-
- if ( !act->pin )
diff --git a/system/xen/xsa/xsa318.patch b/system/xen/xsa/xsa318.patch
deleted file mode 100644
index f4becdf81e..0000000000
--- a/system/xen/xsa/xsa318.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: gnttab: fix GNTTABOP_copy continuation handling
-
-The XSA-226 fix was flawed - the backwards transformation on rc was done
-too early, causing a continuation to not get invoked when the need for
-preemption was determined at the very first iteration of the request.
-This in particular means that all of the status fields of the individual
-operations would be left untouched, i.e. set to whatever the caller may
-or may not have initialized them to.
-
-This is part of XSA-318.
-
-Reported-by: Pawel Wieczorkiewicz <wipawel@amazon.de>
-Tested-by: Pawel Wieczorkiewicz <wipawel@amazon.de>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Juergen Gross <jgross@suse.com>
-
---- a/xen/common/grant_table.c
-+++ b/xen/common/grant_table.c
-@@ -3576,8 +3576,7 @@ do_grant_table_op(
- rc = gnttab_copy(copy, count);
- if ( rc > 0 )
- {
-- rc = count - rc;
-- guest_handle_add_offset(copy, rc);
-+ guest_handle_add_offset(copy, count - rc);
- uop = guest_handle_cast(copy, void);
- }
- break;
-@@ -3644,6 +3643,9 @@ do_grant_table_op(
- out:
- if ( rc > 0 || opaque_out != 0 )
- {
-+ /* Adjust rc, see gnttab_copy() for why this is needed. */
-+ if ( cmd == GNTTABOP_copy )
-+ rc = count - rc;
- ASSERT(rc < count);
- ASSERT((opaque_out & GNTTABOP_CMD_MASK) == 0);
- rc = hypercall_create_continuation(__HYPERVISOR_grant_table_op, "ihi",
diff --git a/system/yash/yash.SlackBuild b/system/yash/yash.SlackBuild
index cabe3bca8d..5f41204fee 100644
--- a/system/yash/yash.SlackBuild
+++ b/system/yash/yash.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for yash
# Copyright 2015-2018 Leonard Schmidt <lems@gmx.net>
-# Copyright 2018-2019 Hunter Sezen <orbea@riseup.net>
+# Copyright 2018-2020 Hunter Sezen <orbea@riseup.net>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=yash
-VERSION=${VERSION:-2.49}
+VERSION=${VERSION:-2.50}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -77,6 +77,7 @@ CFLAGS="$SLKCFLAGS" \
--mandir=/usr/man
make
+make test
make install DESTDIR=$PKG
mkdir -p $PKG/usr/bin
diff --git a/system/yash/yash.info b/system/yash/yash.info
index 4dfe162189..ddc9630359 100644
--- a/system/yash/yash.info
+++ b/system/yash/yash.info
@@ -1,8 +1,8 @@
PRGNAM="yash"
-VERSION="2.49"
+VERSION="2.50"
HOMEPAGE="https://yash.osdn.jp/index.html.en"
-DOWNLOAD="https://osdn.net/dl/yash/yash-2.49.tar.xz"
-MD5SUM="38ff1fad5775906e62bb1b4e4fdb7255"
+DOWNLOAD="https://osdn.net/dl/yash/yash-2.50.tar.xz"
+MD5SUM="f9db1699252b107764fec07f501ddb79"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/zfs-on-linux/zfs-on-linux.SlackBuild b/system/zfs-on-linux/zfs-on-linux.SlackBuild
index 6647a2de13..f8fe810f59 100644
--- a/system/zfs-on-linux/zfs-on-linux.SlackBuild
+++ b/system/zfs-on-linux/zfs-on-linux.SlackBuild
@@ -28,7 +28,7 @@
PRGNAM=zfs-on-linux
SRCNAM=zfs
-VERSION=${VERSION:-0.8.3}
+VERSION=${VERSION:-0.8.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/zfs-on-linux/zfs-on-linux.info b/system/zfs-on-linux/zfs-on-linux.info
index 053c068c09..47efbfc08e 100644
--- a/system/zfs-on-linux/zfs-on-linux.info
+++ b/system/zfs-on-linux/zfs-on-linux.info
@@ -1,8 +1,8 @@
PRGNAM="zfs-on-linux"
-VERSION="0.8.3"
+VERSION="0.8.4"
HOMEPAGE="https://zfsonlinux.org"
-DOWNLOAD="https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz"
-MD5SUM="405ad50a9d24794a70d2709097058e63"
+DOWNLOAD="https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.4/zfs-0.8.4.tar.gz"
+MD5SUM="f0c203c59c4fcd44187a64758707469f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""