Wed Jun 30 03:45:31 UTC 202120210630034531

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.

3 files changed, 84 insertions, 3 deletions

diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh
index e22271692..880b92fae 100755
--- a/source/n/php/fetch-php.sh
+++ b/source/n/php/fetch-php.sh
@@ -1,2 +1,2 @@
-lftpget http://us.php.net/distributions/php-7.4.20.tar.xz.asc
-lftpget http://us.php.net/distributions/php-7.4.20.tar.xz
+lftpget http://us.php.net/distributions/php-7.4.21.tar.xz.asc
+lftpget http://us.php.net/distributions/php-7.4.21.tar.xz
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index 74c8d4854..9b7cde933 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -3,7 +3,7 @@
 # Build and package mod_php on Slackware.
 # by:  David Cantrell <david@slackware.com>
 # Modified for PHP 4-5 by volkerdi@slackware.com
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2019, 2020  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2019, 2020, 2021  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -155,6 +155,11 @@ zcat $CWD/php-fpm.conf.diff.gz | patch -p1 --verbose || exit 1
 # Fix for imap API change:
 zcat $CWD/php.imap.api.diff.gz | patch -p1 --verbose || exit 1
 
+# Use enchant-2:
+zcat $CWD/php.enchant-2.patch.gz | patch -p1 --verbose || exit 1
+export ENCHANT_CFLAGS="-I/usr/include/enchant-2"
+export ENCHANT_LIBS="-lenchant-2"
+
 # Install the build folder into /usr/lib$LIBDIRSUFFIX/php/build
 # and adapt phpize accordingly:
 sed -i "s|build$|php/build|" scripts/Makefile.frag
diff --git a/source/n/php/php.enchant-2.patch b/source/n/php/php.enchant-2.patch
new file mode 100644
index 000000000..9d421c3bf
--- /dev/null
+++ b/source/n/php/php.enchant-2.patch
@@ -0,0 +1,76 @@
+--- php-7.4.4/ext/enchant/config.m4	2020-03-17 10:40:22.000000000 +0000
++++ php-7.4.4/ext/enchant/config.m4	2020-03-27 21:25:27.754470703 +0000
+@@ -4,21 +4,21 @@ PHP_ARG_WITH([enchant],
+     [Include Enchant support])])
+ 
+ if test "$PHP_ENCHANT" != "no"; then
+-  PKG_CHECK_MODULES([ENCHANT], [enchant])
++  PKG_CHECK_MODULES([ENCHANT], [enchant-2])
+ 
+   PHP_EVAL_INCLINE($ENCHANT_CFLAGS)
+   PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD)
+ 
+   AC_DEFINE(HAVE_ENCHANT, 1, [ ])
+ 
+-  PHP_CHECK_LIBRARY(enchant, enchant_get_version,
++  PHP_CHECK_LIBRARY(enchant-2, enchant_get_version,
+   [
+     AC_DEFINE(HAVE_ENCHANT_GET_VERSION, 1, [ ])
+   ], [ ], [
+     $ENCHANT_LIBS
+   ])
+ 
+-  PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
++  PHP_CHECK_LIBRARY(enchant-2, enchant_broker_set_param,
+   [
+     AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ ])
+   ], [ ], [
+--- a/ext/enchant/enchant.c.orig
++++ b/ext/enchant/enchant.c
+@@ -738,7 +738,7 @@
+ 			for (i = 0; i < n_sugg; i++) {
+ 				add_next_index_string(sugg, suggs[i]);
+ 			}
+-			enchant_dict_free_suggestions(pdict->pdict, suggs);
++			enchant_dict_free_string_list(pdict->pdict, suggs);
+ 		}
+ 
+ 
+@@ -793,7 +793,7 @@
+ 			add_next_index_string(return_value, suggs[i]);
+ 		}
+ 
+-		enchant_dict_free_suggestions(pdict->pdict, suggs);
++		enchant_dict_free_string_list(pdict->pdict, suggs);
+ 	}
+ }
+ /* }}} */
+@@ -813,7 +813,7 @@
+ 
+ 	PHP_ENCHANT_GET_DICT;
+ 
+-	enchant_dict_add_to_personal(pdict->pdict, word, wordlen);
++	enchant_dict_add(pdict->pdict, word, wordlen);
+ }
+ /* }}} */
+ 
+@@ -851,7 +851,7 @@
+ 
+ 	PHP_ENCHANT_GET_DICT;
+ 
+-	RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen));
++	RETURN_BOOL(enchant_dict_is_added(pdict->pdict, word, wordlen));
+ }
+ /* }}} */
+ 
+--- php-7.4.4/build/php.m4	2020-03-17 06:40:21.000000000 -0400
++++ php-7.4.4/build/php.m4	2020-04-05 09:27:14.634620646 -0400
+@@ -1541,7 +1541,7 @@ AC_DEFUN([PHP_CHECK_LIBRARY], [
+   ],[
+     LDFLAGS=$save_old_LDFLAGS
+     ext_shared=$save_ext_shared
+-    unset ac_cv_lib_$1[]_$2
++    unset ac_cv_lib_[]translit($1, -, _)_$2
+     $4
+   ])dnl
+ ])