From b2fa3fdbd7ee8367f9ea371367850e010a58dfee Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 22 May 2023 19:05:02 +0000
Subject: Mon May 22 19:05:02 UTC 2023

ap/qpdf-11.4.0-x86_64-1.txz:  Upgraded.
l/exiv2-0.27.7-x86_64-1.txz:  Upgraded.
l/imagemagick-7.1.1_10-x86_64-1.txz:  Upgraded.
n/c-ares-1.19.1-x86_64-1.txz:  Upgraded.
  This update fixes bugs and security issues:
  0-byte UDP payload causes Denial of Service.
  Insufficient randomness in generation of DNS query IDs.
  Buffer Underwrite in ares_inet_net_pton().
  AutoTools does not set CARES_RANDOM_FILE during cross compilation.
  For more information, see:
    https://www.cve.org/CVERecord?id=CVE-2023-32067
    https://www.cve.org/CVERecord?id=CVE-2023-31147
    https://www.cve.org/CVERecord?id=CVE-2023-31130
    https://www.cve.org/CVERecord?id=CVE-2023-31124
  (* Security fix *)
n/wget-1.21.4-x86_64-1.txz:  Upgraded.
xap/gnuplot-5.4.7-x86_64-1.txz:  Upgraded.
---
 source/ap/qpdf/qpdf.SlackBuild                     |  2 +-
 source/l/exiv2/exiv2.url                           |  1 +
 source/n/wget/wget.SlackBuild                      |  2 +-
 source/x/FTBFSlog                                  |  3 +++
 .../7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch | 26 ++++++++++++++++++++++
 source/x/fcitx5/fcitx5.SlackBuild                  |  2 ++
 6 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 source/l/exiv2/exiv2.url
 create mode 100644 source/x/fcitx5/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch

(limited to 'source')

diff --git a/source/ap/qpdf/qpdf.SlackBuild b/source/ap/qpdf/qpdf.SlackBuild
index 30f2c2f81..9be9357a0 100755
--- a/source/ap/qpdf/qpdf.SlackBuild
+++ b/source/ap/qpdf/qpdf.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qpdf
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/l/exiv2/exiv2.url b/source/l/exiv2/exiv2.url
new file mode 100644
index 000000000..812250611
--- /dev/null
+++ b/source/l/exiv2/exiv2.url
@@ -0,0 +1 @@
+https://github.com/Exiv2/exiv2
diff --git a/source/n/wget/wget.SlackBuild b/source/n/wget/wget.SlackBuild
index 476fb2995..e4073927b 100755
--- a/source/n/wget/wget.SlackBuild
+++ b/source/n/wget/wget.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=wget
 VERSION=${VERSION:-$(echo wget-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/x/FTBFSlog b/source/x/FTBFSlog
index 82cf785b6..056948557 100644
--- a/source/x/FTBFSlog
+++ b/source/x/FTBFSlog
@@ -1,3 +1,6 @@
+Mon May 22 17:50:35 UTC 2023
+fcitx5: Fix build against recent fmt. Thanks to lucabon.
++--------------------------+
 Thu Apr 13 19:25:28 UTC 2023
 mesa: fix build by removing deprecated rust-bindgen option. Thanks to lucabon.
 +--------------------------+
diff --git a/source/x/fcitx5/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch b/source/x/fcitx5/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch
new file mode 100644
index 000000000..0e8a33913
--- /dev/null
+++ b/source/x/fcitx5/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch
@@ -0,0 +1,26 @@
+From 7fb3a5500270877d93b61b11b2a17b9b8f6a506b Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Sat, 20 May 2023 20:02:24 -0700
+Subject: [PATCH] Fix compatiblity with fmt 10.0
+
+Fix #797
+---
+ src/modules/dbus/dbusmodule.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules/dbus/dbusmodule.cpp b/src/modules/dbus/dbusmodule.cpp
+index a7196676..6bebee30 100644
+--- a/src/modules/dbus/dbusmodule.cpp
++++ b/src/modules/dbus/dbusmodule.cpp
+@@ -570,8 +570,9 @@ class Controller1 : public ObjectVTable<Controller1> {
+                     ss << fmt::format("{:02x}", static_cast<int>(v));
+                 }
+                 ss << "] program:" << ic->program()
+-                   << " frontend:" << ic->frontend()
+-                   << " cap:" << fmt::format("{:x}", ic->capabilityFlags())
++                   << " frontend:" << ic->frontend() << " cap:"
++                   << fmt::format("{:x}",
++                                  static_cast<uint64_t>(ic->capabilityFlags()))
+                    << " focus:" << ic->hasFocus() << std::endl;
+                 return true;
+             });
diff --git a/source/x/fcitx5/fcitx5.SlackBuild b/source/x/fcitx5/fcitx5.SlackBuild
index 085e2eb77..ce3d80a10 100755
--- a/source/x/fcitx5/fcitx5.SlackBuild
+++ b/source/x/fcitx5/fcitx5.SlackBuild
@@ -87,6 +87,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+zcat $CWD/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch.gz | patch -p1 --verbose || exit 1
+
 mkdir build
 cd build
   cmake \
-- 
cgit v1.2.3-65-gdbad