Sun Apr 14 18:35:32 UTC 202420240414183532

a/less-653-x86_64-2.txz:  Rebuilt.
  This update patches a security issue:
  less through 653 allows OS command execution via a newline character in the
  name of a file, because quoting is mishandled in filename.c. Exploitation
  typically requires use with attacker-controlled file names, such as the files
  extracted from an untrusted archive. Exploitation also requires the LESSOPEN
  environment variable, but this is set by default in many common cases.
  For more information, see:
    https://www.cve.org/CVERecord?id=CVE-2024-32487
  (* Security fix *)
ap/inxi-3.3.34_1-noarch-1.txz:  Upgraded.
d/python-setuptools-69.5.1-x86_64-1.txz:  Upgraded.
n/bluez-5.74-x86_64-1.txz:  Upgraded.
xfce/xfce4-notifyd-0.9.4-x86_64-1.txz:  Upgraded.
  Almost everyone has jumped to this version, so we'll get with the program.

5 files changed, 84 insertions, 8 deletions

diff --git a/source/a/elogind/elogind.SlackBuild b/source/a/elogind/elogind.SlackBuild
index 8faabc77d..615d08f27 100755
--- a/source/a/elogind/elogind.SlackBuild
+++ b/source/a/elogind/elogind.SlackBuild
@@ -104,10 +104,10 @@ export CXXFLAGS="$SLKCFLAGS"
 mkdir meson-build
 cd meson-build
 meson \
-  --buildtype release \
-  --prefix /usr \
-  --libdir /lib${LIBDIRSUFFIX} \
-  --libexecdir /lib${LIBDIRSUFFIX}/elogind \
+  --buildtype=release \
+  --prefix=/usr \
+  --libdir=/lib${LIBDIRSUFFIX} \
+  --libexecdir=/lib${LIBDIRSUFFIX}/elogind \
   -Dpkgconfiglibdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \
   -Dpamlibdir=/lib${LIBDIRSUFFIX}/security \
   -Dudevrulesdir="/lib/udev/rules.d" \
@@ -120,7 +120,6 @@ meson \
   -Dnobody-user=nobody \
   -Dnobody-group=nogroup \
   -Dpam=enabled \
-  -Dpamlibdir="/lib${LIBDIRSUFFIX}/security" \
   -Dpamconfdir="/etc/pam.d" \
   -Dacl=enabled \
   -Dsmack=false \
@@ -131,6 +130,7 @@ meson \
   -Dpoweroff-path=/sbin/poweroff \
   -Dreboot-path=/sbin/reboot \
   -Ddefault-kill-user-processes=false \
+  -Dmode=release \
   .. || exit 1
   "${NINJA:=ninja}" $NUMJOBS || exit 1
   DESTDIR=$PKG $NINJA install || exit 1
diff --git a/source/a/less/007521ac3c95bc76.patch b/source/a/less/007521ac3c95bc76.patch
new file mode 100644
index 000000000..663f222c0
--- /dev/null
+++ b/source/a/less/007521ac3c95bc76.patch
@@ -0,0 +1,73 @@
+From 007521ac3c95bc76e3d59c6dbfe75d06c8075c33 Mon Sep 17 00:00:00 2001
+From: Mark Nudelman <markn@greenwoodsoftware.com>
+Date: Thu, 11 Apr 2024 17:49:48 -0700
+Subject: [PATCH] Fix bug when viewing a file whose name contains a newline.
+
+---
+ filename.c | 31 +++++++++++++++++++++++++------
+ 1 file changed, 25 insertions(+), 6 deletions(-)
+
+diff --git a/filename.c b/filename.c
+index f90e0e82..a52c6354 100644
+--- a/filename.c
++++ b/filename.c
+@@ -127,11 +127,20 @@ static constant char * metachars(void)
+ /*
+  * Is this a shell metacharacter?
+  */
+-static int metachar(char c)
++static lbool metachar(char c)
+ {
+ 	return (strchr(metachars(), c) != NULL);
+ }
+ 
++/*
++ * Must use quotes rather than escape char for this metachar?
++ */
++static lbool must_quote(char c)
++{
++	/* {{ Maybe the set of must_quote chars should be configurable? }} */
++	return (c == '\n'); 
++}
++
+ /*
+  * Insert a backslash before each metacharacter in a string.
+  */
+@@ -164,6 +173,9 @@ public char * shell_quoten(constant char *s, size_t slen)
+ 				 * doesn't support escape chars.  Use quotes.
+ 				 */
+ 				use_quotes = TRUE;
++			} else if (must_quote(*p))
++			{
++				len += 3; /* open quote + char + close quote */
+ 			} else
+ 			{
+ 				/*
+@@ -194,15 +206,22 @@ public char * shell_quoten(constant char *s, size_t slen)
+ 		constant char *es = s + slen;
+ 		while (s < es)
+ 		{
+-			if (metachar(*s))
++			if (!metachar(*s))
+ 			{
+-				/*
+-				 * Add the escape char.
+-				 */
++				*np++ = *s++;
++			} else if (must_quote(*s))
++			{
++				/* Surround the char with quotes. */
++				*np++ = openquote;
++				*np++ = *s++;
++				*np++ = closequote;
++			} else
++			{
++				/* Insert an escape char before the char. */
+ 				strcpy(np, esc);
+ 				np += esclen;
++				*np++ = *s++;
+ 			}
+-			*np++ = *s++;
+ 		}
+ 		*np = '\0';
+ 	}
diff --git a/source/a/less/less.SlackBuild b/source/a/less/less.SlackBuild
index 1ea2e2077..b4ea88c72 100755
--- a/source/a/less/less.SlackBuild
+++ b/source/a/less/less.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=less
 VERSION=${VERSION:-$(echo less-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -85,6 +85,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+# newline in filenames patch for CVE-2024-32487:
+cat $CWD/007521ac3c95bc76.patch | patch -p1 --verbose || exit 1
+
 if [ ! -r configure ]; then
   if [ -x ./autogen.sh ]; then
     NOCONFIGURE=1 ./autogen.sh
diff --git a/source/ap/inxi/fetch-inxi.sh b/source/ap/inxi/fetch-inxi.sh
index 2e8025c51..8750c0bd5 100755
--- a/source/ap/inxi/fetch-inxi.sh
+++ b/source/ap/inxi/fetch-inxi.sh
@@ -24,7 +24,7 @@
 PKGNAM=inxi
 
 # Pull a stable branch + patches
-BRANCH=${1:-3.3.33-1}
+BRANCH=${1:-3.3.34-1}
 
 # Clear download area:
 rm -rf ${PKGNAM}
diff --git a/source/xfce/xfce4-notifyd/xfce4-notifyd.url b/source/xfce/xfce4-notifyd/xfce4-notifyd.url
index 9151af925..7e66686fa 100644
--- a/source/xfce/xfce4-notifyd/xfce4-notifyd.url
+++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.url
@@ -1 +1 @@
-http://archive.xfce.org/src/apps/xfce4-notifyd/0.8/
+http://archive.xfce.org/src/apps/xfce4-notifyd/0.9/