Tue Jul 18 19:58:10 UTC 202320230718195810

a/tar-1.35-x86_64-1.txz:  Upgraded.
x/mesa-23.2.0_rc1-x86_64-1.txz:  Upgraded.
  OK, usually I won't use rc versions even in -current, but in this case I'm
  going to. Some time ago my desktop machine with RS880 / Radeon HD 4290
  graphics on the motherboard began acting up with the screen going black
  for a few seconds before returning. This after an hour or so of uptime,
  usually, then becoming more frequent with more uptime. Eventually I'd lose
  mouse and/or keyboard too, and have to reboot. Here's a couple of errors
  from dmesg:
    [ 9942.677675] [drm:r600_ib_test [radeon]] *ERROR* radeon: fence wait
                   timed out.
    [ 9942.677741] [drm:radeon_ib_ring_tests [radeon]] *ERROR* radeon: failed
                   testing IB on GFX ring (-110).
  I also noticed that the backtrace started with ttm_bo_release, and seeing
  this in recent kernel patches had been chalking this up to a kernel bug.
  I *still* think it could be, and there are a bunch of kernel patches coming
  soon to -stable from Alex Deucher that could address the underlying causes
  (not for 6.1.39 though, unfortunately). Anyway, I'd recently figured out
  that reverting Mesa sufficiently made the issue go away. And now it seems
  this 23.2.0 release candidate also fixes the issue.
  Yes, I could go search for the commits to cherry-pick, but we'll be moving
  to mesa-23.2.0 when it's released, so we might as well start testing now.

3 files changed, 5 insertions, 39 deletions

diff --git a/source/a/tar/CVE-2022-48303.patch b/source/a/tar/CVE-2022-48303.patch
deleted file mode 100644
index b248fb089..000000000
--- a/source/a/tar/CVE-2022-48303.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1d530107a24d71e798727d7f0afa0833473d1074 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Matej=20Mu=C5=BEila?= <mmuzila@gmail.com>
-Date: Wed, 11 Jan 2023 08:55:58 +0100
-Subject: [PATCH] Fix savannah bug #62387
-
-* src/list.c (from_header): Check for the end of field after leading byte
-  (0x80 or 0xff) of base-256 encoded header value
----
- src/list.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/list.c b/src/list.c
-index 9fafc425..bf41b581 100644
---- a/src/list.c
-+++ b/src/list.c
-@@ -895,6 +895,12 @@ from_header (char const *where0, size_t digs, char const *type,
- 			   << (CHAR_BIT * sizeof (uintmax_t)
- 			       - LG_256 - (LG_256 - 2)));
-       value = (*where++ & ((1 << (LG_256 - 2)) - 1)) - signbit;
-+      if (where == lim)
-+        {
-+          if (type && !silent)
-+            ERROR ((0, 0, _("Archive base-256 value is invalid")));
-+          return -1;
-+        }
-       for (;;)
- 	{
- 	  value = (value << LG_256) + (unsigned char) *where++;
--- 
-2.38.1
-
diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild
index 20dcd4956..b01d00eda 100755
--- a/source/a/tar/tar.SlackBuild
+++ b/source/a/tar/tar.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tar
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -78,9 +78,6 @@ find . \
 # The "A lone zero block at %s" messages also cause problems:
 zcat $CWD/tar.nolonezero.diff.gz | patch -p1 --verbose || exit 1
 
-# Patch for CVE-2022-48303:
-zcat $CWD/CVE-2022-48303.patch.gz | patch -p1 --verbose || exit 1
-
 FORCE_UNSAFE_CONFIGURE=1 \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 6f42f6607..81fb4b4e8 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mesa
-VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
 AMBERVERS=${AMBERVERS:-21.3.9}
 DEMOVERS=${DEMOVERS:-8.5.0}
 BUILD=${BUILD:-1}
@@ -48,7 +48,7 @@ fi
 # the name of the created package would be, and then exit. This information
 # could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  echo "$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz"
   exit 0
 fi
 
@@ -198,4 +198,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz