From c01ee3e65304c6ff4a85a5f74ea1aed6a315a2da Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 30 Jun 2021 03:45:31 +0000
Subject: Wed Jun 30 03:45:31 UTC 2021

a/kernel-firmware-20210629_d79c267-noarch-1.txz:  Upgraded.
ap/cups-2.3.3op2-x86_64-1.txz:  Upgraded.
kde/lokalize-21.04.2-x86_64-2.txz:  Rebuilt.
  Recompiled against hunspell-1.7.0.
kde/sonnet-5.83.0-x86_64-2.txz:  Rebuilt.
  Recompiled against hunspell-1.7.0.
l/enchant-2.3.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
l/gtkspell-2.0.16-x86_64-7.txz:  Rebuilt.
  Recompiled against enchant-2.3.0.
l/hunspell-1.7.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
l/python-urllib3-1.26.6-x86_64-2.txz:  Rebuilt.
  Don't build python2 version.
l/python2-module-collection-2.7.18-x86_64-4.txz:  Rebuilt.
  Upgraded to urllib3-1.25.11 for compatibility with requests.
  Thanks to USUARIONUEVO.
l/qt5-5.15.2-x86_64-10.txz:  Rebuilt.
  Recompiled against hunspell-1.7.0.
n/php-7.4.21-x86_64-1.txz:  Upgraded.
  This update fixes bugs and security issues:
  Core: SSRF bypass in FILTER_VALIDATE_URL.
  PDO_Firebird: Stack buffer overflow in firebird_info_cb.
  PDO_Firebird: SIGSEGV in firebird_handle_doer.
  PDO_Firebird: SIGSEGV in firebird_stmt_execute.
  PDO_Firebird: Crash while parsing blob data in firebird_fetch_blob.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-21705
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-21704
  (* Security fix *)
xap/pan-0.146-x86_64-5.txz:  Rebuilt.
  Recompiled against enchant-2.3.0.
extra/php8/php8-8.0.8-x86_64-1.txz:  Upgraded.
---
 source/xap/pan/pan.SlackBuild    |  5 ++++-
 source/xap/pan/pan.enchant2.diff | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 source/xap/pan/pan.enchant2.diff

(limited to 'source/xap')

diff --git a/source/xap/pan/pan.SlackBuild b/source/xap/pan/pan.SlackBuild
index b3a8a3bf..d9cacee9 100755
--- a/source/xap/pan/pan.SlackBuild
+++ b/source/xap/pan/pan.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pan
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -78,6 +78,9 @@ find . \
 # Fix gmime3 errors and building with glib-2.68.0:
 zcat $CWD/pan.glib-2.68.0.diff.gz | patch -p1 --verbose || exit 1
 
+# Build with enchant-2:
+zcat $CWD/pan.enchant2.diff.gz | patch -p1 --verbose || exit 1
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/xap/pan/pan.enchant2.diff b/source/xap/pan/pan.enchant2.diff
new file mode 100644
index 00000000..62311031
--- /dev/null
+++ b/source/xap/pan/pan.enchant2.diff
@@ -0,0 +1,33 @@
+diff -u -r --new-file pan-0.146.orig/configure.ac pan-0.146/configure.ac
+--- pan-0.146.orig/configure.ac	2019-05-04 11:10:27.000000000 -0500
++++ pan-0.146/configure.ac	2021-06-29 14:19:49.612442354 -0500
+@@ -149,7 +149,7 @@
+                     AC_DEFINE(HAVE_GTK,[1],[GTK+ 3 support])]
+                     )
+   if test "x$want_gtkspell" = "xyes" ; then
+-    PKG_CHECK_MODULES([GTKSPELL], [gtkspell3-3.0 >= $GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED],
++    PKG_CHECK_MODULES([GTKSPELL], [gtkspell3-3.0 >= $GTKSPELL3_REQUIRED enchant-2 >= $ENCHANT_REQUIRED],
+                       [
+                       gtkspell_msg=yes
+                       AC_DEFINE(HAVE_GTKSPELL,[1],[GtkSpell support for spellchecking])
+@@ -162,7 +162,7 @@
+   fi
+ else
+    if test "x$want_gtkspell" = "xyes" ; then
+-   PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0 >= $GTKSPELL_REQUIRED enchant >= $ENCHANT_REQUIRED],
++   PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0 >= $GTKSPELL_REQUIRED enchant-2 >= $ENCHANT_REQUIRED],
+                       [
+                       gtkspell_msg=yes
+                       AC_DEFINE(HAVE_GTKSPELL,[1],[GtkSpell support for spellchecking])
+diff -u -r --new-file pan-0.146.orig/pan/gui/group-prefs-dialog.cc pan-0.146/pan/gui/group-prefs-dialog.cc
+--- pan-0.146.orig/pan/gui/group-prefs-dialog.cc	2017-12-29 11:15:47.000000000 -0600
++++ pan-0.146/pan/gui/group-prefs-dialog.cc	2021-06-29 14:19:49.628442353 -0500
+@@ -23,7 +23,7 @@
+   #include <glib.h>
+   #include "gtk-compat.h"
+ #ifdef HAVE_GTKSPELL
+-  #include <enchant/enchant.h>
++  #include <enchant-2/enchant.h>
+ #endif
+ }
+ #include <pan/general/debug.h>
-- 
cgit v1.2.3