From 20d89644642c8df3429244b1b2ca8935b1cda137 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Thu, 14 Dec 2023 20:09:31 +0000
Subject: Thu Dec 14 20:09:31 UTC 2023

l/libxml2-2.12.3-x86_64-2.txz:  Rebuilt.
  Rebuilt using the --with-legacy option (maximum ABI compatibility) and
  --with-ftp option (functionality included by default in libxml2 2.9).
n/bluez-5.71-x86_64-1.txz:  Upgraded.
  This update fixes a security issue:
  It may have been possible for an attacker within Bluetooth range to inject
  keystrokes (and possibly execute commands) while devices were discoverable.
  Thanks to marav for the heads-up.
  For more information, see:
    https://www.cve.org/CVERecord?id=CVE-2023-45866
  (* Security fix *)
x/compiz-0.8.18-x86_64-4.txz:  Rebuilt.
  Patched to work properly with libxml2-2.12.3.
  Thanks to saxa.
---
 source/l/libxml2/libxml2.SlackBuild |  4 ++-
 source/x/compiz/175.patch           | 55 +++++++++++++++++++++++++++++++++++++
 source/x/compiz/compiz.SlackBuild   |  7 +++--
 3 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 source/x/compiz/175.patch

(limited to 'source')

diff --git a/source/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild
index 3f42efea5..353cb19ca 100755
--- a/source/l/libxml2/libxml2.SlackBuild
+++ b/source/l/libxml2/libxml2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libxml2
 VERSION=${VERSION:-$(echo $PKGNAM-*.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
@@ -99,6 +99,8 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --disable-static \
   --with-python \
+  --with-legacy \
+  --with-ftp \
   --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
diff --git a/source/x/compiz/175.patch b/source/x/compiz/175.patch
new file mode 100644
index 000000000..46eb4533f
--- /dev/null
+++ b/source/x/compiz/175.patch
@@ -0,0 +1,55 @@
+From ea7b3731b1a8a0f2fb7aa765a84374658b67b1b7 Mon Sep 17 00:00:00 2001
+From: Sixu Hu <husixu1@hotmail.com>
+Date: Wed, 22 Nov 2023 00:54:10 +0800
+Subject: [PATCH] Fix compatibility with libxml 2.12
+
+---
+ src/main.c     | 6 ++++--
+ src/metadata.c | 7 +++++--
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 26b4c512..7182b75b 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -271,8 +271,10 @@ readCoreXmlCallback (void *context,
+     i += compReadXmlChunk ("</screen></core></compiz>", &offset, buffer + i,
+ 			   length - i);
+ 
+-    if (!offset && length > i)
+-	buffer[i++] = '\0';
++    if (!offset && length > i) {
++	    // buffer[i] = '\0';
++        ctx->offset += 1;
++    }
+ 
+     ctx->offset += i;
+ 
+diff --git a/src/metadata.c b/src/metadata.c
+index 3c1fa9ff..559734aa 100644
+--- a/src/metadata.c
++++ b/src/metadata.c
+@@ -30,6 +30,7 @@
+ #include <libxml/xpath.h>
+ #include <libxml/xpathInternals.h>
+ #include <locale.h>
++#include <stdlib.h>
+ 
+ #include <compiz-core.h>
+ 
+@@ -285,8 +286,10 @@ readPluginXmlCallback (void *context,
+     i += compReadXmlChunk ("</plugin></compiz>", &offset, buffer + i,
+ 			   length - i);
+ 
+-    if (!offset && length > i)
+-	buffer[i++] = '\0';
++    if (!offset && length > i) {
++	    // buffer[i] = '\0';
++        ctx->offset += 1;
++    }
+ 
+     ctx->offset += i;
+ 
+-- 
+GitLab
+
diff --git a/source/x/compiz/compiz.SlackBuild b/source/x/compiz/compiz.SlackBuild
index 842ced5f8..9e34a28ac 100755
--- a/source/x/compiz/compiz.SlackBuild
+++ b/source/x/compiz/compiz.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2019, 2023  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=compiz
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # 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 {} \+
 
+# Fix for libxml2-2.12:
+zcat $CWD/175.patch.gz | patch -p1 --verbose || exit 1
+
 if [ ! -r configure ]; then
   NOCONFIGURE=1 ./autogen.sh
 fi
-- 
cgit v1.2.3-80-g2a13