Wed Jul 28 22:48:44 UTC 202120210728224844

a/e2fsprogs-1.46.3-x86_64-1.txz:  Upgraded.
a/kernel-generic-5.13.6-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.13.6-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.13.6-x86_64-1.txz:  Upgraded.
a/libblockdev-2.26-x86_64-1.txz:  Upgraded.
ap/vim-8.2.3238-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.13.6-x86-1.txz:  Upgraded.
k/kernel-source-5.13.6-noarch-1.txz:  Upgraded.
l/libgnt-2.14.2-x86_64-1.txz:  Upgraded.
l/pulseaudio-15.0-x86_64-1.txz:  Upgraded.
n/ipset-7.14-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.2.3238-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

12 files changed, 9 insertions, 101 deletions

diff --git a/source/a/libblockdev/libblockdev.SlackBuild b/source/a/libblockdev/libblockdev.SlackBuild
index ccf0cc0f..5f815f1d 100755
--- a/source/a/libblockdev/libblockdev.SlackBuild
+++ b/source/a/libblockdev/libblockdev.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libblockdev
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -79,9 +79,6 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
-# Fix build with glib-2.68.0:
-zcat $CWD/libblockdev.glib-2.68.0.diff.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/a/libblockdev/libblockdev.glib-2.68.0.diff b/source/a/libblockdev/libblockdev.glib-2.68.0.diff
deleted file mode 100644
index 029f70fb..00000000
--- a/source/a/libblockdev/libblockdev.glib-2.68.0.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/plugins/vdo.c.orig	2021-01-11 04:48:35.000000000 -0600
-+++ ./src/plugins/vdo.c	2021-04-06 12:57:27.128009876 -0500
-@@ -81,7 +81,7 @@
- }
- 
- BDVDOStats* bd_vdo_stats_copy (BDVDOStats *stats) {
--    return g_memdup (stats, sizeof (BDVDOStats));
-+    return g_memdup2 (stats, sizeof (BDVDOStats));
- }
- 
- 
diff --git a/source/k/kernel-configs/config-generic-5.13.5 b/source/k/kernel-configs/config-generic-5.13.6
index 5824b038..ceb73525 100644
--- a/source/k/kernel-configs/config-generic-5.13.5
+++ b/source/k/kernel-configs/config-generic-5.13.6
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.5 Kernel Configuration
+# Linux/x86 5.13.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-5.13.5.x64 b/source/k/kernel-configs/config-generic-5.13.6.x64
index 5904ca10..07c353a1 100644
--- a/source/k/kernel-configs/config-generic-5.13.5.x64
+++ b/source/k/kernel-configs/config-generic-5.13.6.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.5 Kernel Configuration
+# Linux/x86 5.13.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-smp-5.13.5-smp b/source/k/kernel-configs/config-generic-smp-5.13.6-smp
index f96b0536..e881775f 100644
--- a/source/k/kernel-configs/config-generic-smp-5.13.5-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.13.6-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.5 Kernel Configuration
+# Linux/x86 5.13.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.13.5 b/source/k/kernel-configs/config-huge-5.13.6
index 887559f6..1a6bd1e2 100644
--- a/source/k/kernel-configs/config-huge-5.13.5
+++ b/source/k/kernel-configs/config-huge-5.13.6
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.5 Kernel Configuration
+# Linux/x86 5.13.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.13.5.x64 b/source/k/kernel-configs/config-huge-5.13.6.x64
index 09f2d6c7..966ed0da 100644
--- a/source/k/kernel-configs/config-huge-5.13.5.x64
+++ b/source/k/kernel-configs/config-huge-5.13.6.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.5 Kernel Configuration
+# Linux/x86 5.13.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-smp-5.13.5-smp b/source/k/kernel-configs/config-huge-smp-5.13.6-smp
index ce72ecd2..c870f9cf 100644
--- a/source/k/kernel-configs/config-huge-smp-5.13.5-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.13.6-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.5 Kernel Configuration
+# Linux/x86 5.13.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/l/libgnt/libgnt.url b/source/l/libgnt/libgnt.url
index fb3a149b..696d6291 100644
--- a/source/l/libgnt/libgnt.url
+++ b/source/l/libgnt/libgnt.url
@@ -1,2 +1,2 @@
 #https://keep.imfreedom.org/libgnt/libgnt
-https://downloads.sourceforge.net/pidgin/libgnt/libgnt-2.14.1.tar.xz
+https://downloads.sourceforge.net/pidgin/libgnt/libgnt-2.14.2.tar.xz
diff --git a/source/l/pulseaudio/020_no-parallel-make.diff b/source/l/pulseaudio/020_no-parallel-make.diff
deleted file mode 100644
index 6b552e33..00000000
--- a/source/l/pulseaudio/020_no-parallel-make.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.am.orig	2014-02-14 23:45:45.000000000 +1000
-+++ src/Makefile.am	2014-10-26 21:59:33.220234317 +1000
-@@ -19,6 +19,8 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- # USA.
- 
-+.NOTPARALLEL:
-+
- ###################################
- #       Extra directories         #
- ###################################
---- Makefile.am.orig	2014-01-24 04:57:55.000000000 +1000
-+++ Makefile.am	2014-10-26 21:58:47.090622189 +1000
-@@ -15,6 +15,8 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- # USA.
- 
-+.NOTPARALLEL:
-+
- ACLOCAL_AMFLAGS = -I m4
- 
- EXTRA_DIST = \
diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild
index dab661bf..39d4b77b 100755
--- a/source/l/pulseaudio/pulseaudio.SlackBuild
+++ b/source/l/pulseaudio/pulseaudio.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pulseaudio
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -77,7 +77,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-zcat $CWD/020_no-parallel-make.diff.gz | patch -p0 --verbose || exit 1
 zcat $CWD/030_posix-completion.diff.gz | patch -p0 --verbose || exit 1
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1234710
@@ -93,9 +92,6 @@ echo "X-MATE-Autostart-Phase=Initialization" >> src/daemon/pulseaudio.desktop.in
 # If autospawn isn't working, start-pulseaudio-x11 should start it manually:
 zcat $CWD/pulseaudio-autostart.patch.gz | patch -p1 --verbose || exit 1
 
-# Add support for meson to detect elogind:
-zcat $CWD/pulseaudio.elogind.meson.diff.gz | patch -p1 --verbose || exit 1
-
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
diff --git a/source/l/pulseaudio/pulseaudio.elogind.meson.diff b/source/l/pulseaudio/pulseaudio.elogind.meson.diff
deleted file mode 100644
index 8538a368..00000000
--- a/source/l/pulseaudio/pulseaudio.elogind.meson.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -urN pulseaudio-14.0.orig/meson.build pulseaudio-14.0/meson.build
---- pulseaudio-14.0.orig/meson.build	2020-11-23 20:31:13.000000000 +0200
-+++ pulseaudio-14.0/meson.build	2020-12-24 22:24:03.166596631 +0200
-@@ -602,6 +602,11 @@
-   systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
- endif
- 
-+libelogind_dep = dependency('libelogind', required : get_option('elogind'))
-+if libelogind_dep.found()
-+  cdata.set('HAVE_SYSTEMD_LOGIN', 1)
-+endif
-+
- x11_dep = dependency('x11-xcb', required : get_option('x11'))
- if x11_dep.found()
-   xcb_dep  = dependency('xcb',  required : true, version : '>= 1.6')
-@@ -829,6 +834,7 @@
-   'Enable udev:                   @0@'.format(udev_dep.found()),
-   '  Enable HAL->udev compat:     @0@'.format(get_option('hal-compat')),
-   'Enable systemd:                @0@'.format(libsystemd_dep.found()),
-+  'Enable elogind:                @0@'.format(libelogind_dep.found()),
- #  'Enable TCP Wrappers:           @0@'.format(${ENABLE_TCPWRAP}),
-   'Enable libsamplerate:          @0@'.format(samplerate_dep.found()),
-   'Enable IPv6:                   @0@'.format(get_option('ipv6')),
-diff -urN pulseaudio-14.0.orig/meson_options.txt pulseaudio-14.0/meson_options.txt
---- pulseaudio-14.0.orig/meson_options.txt	2020-11-11 04:07:46.000000000 +0200
-+++ pulseaudio-14.0/meson_options.txt	2020-12-24 22:18:27.921584579 +0200
-@@ -135,6 +135,9 @@
- option('systemd',
-        type : 'feature', value : 'auto',
-        description : 'Optional systemd support')
-+option('elogind',
-+       type : 'feature', value : 'auto',
-+       description : 'Optional elogind support')
- option('udev',
-        type : 'feature', value : 'auto',
-        description : 'Optional udev support')
-diff -urN pulseaudio-14.0.orig/src/modules/meson.build pulseaudio-14.0/src/modules/meson.build
---- pulseaudio-14.0.orig/src/modules/meson.build	2020-11-11 04:07:46.000000000 +0200
-+++ pulseaudio-14.0/src/modules/meson.build	2020-12-24 22:20:06.143588110 +0200
-@@ -188,6 +188,12 @@
-   ]
- endif
- 
-+if libelogind_dep.found()
-+  all_modules += [
-+    [ 'module-systemd-login', 'module-systemd-login.c', [], [], [libelogind_dep] ],
-+  ]
-+endif
-+
- if udev_dep.found()
-   all_modules += [ [ 'module-udev-detect', 'module-udev-detect.c', [], [], [udev_dep] ] ]
-   if get_option('hal-compat')