Upgraded several packages in base, xorg and net.

base/neon/neon.SMBuild

@@ -1,8 +1,8 @@
 app=neon
-version=0.31.1
+version=0.31.2
 build=1sml
 homepage='https://notroj.github.io/neon/'
-download='https://notroj.github.io/neon/neon-0.31.1.tar.gz'
+download='https://notroj.github.io/neon/neon-0.31.2.tar.gz'
 desc="HTTP and WebDav client library with a C interface"
 requires="expat zlib openssl"
 
@@ -30,5 +30,5 @@ build() {
 }
 
 sha512sums="
-87c702a84a63a2c35f1b9ea38ba6f5453d4fbd51c17b17a8dca4bbbac2834c92e5e3b4f187d725e42bcdf6390b7c31cd7297b57b53fb1426ddd86190656b1496  neon-0.31.1.tar.lz
-"
+1e402b40a0445f68ed24d2697ee60d21636f61ebc98edcde37ff9e26c54430acabf3969ac22a942d1dd51bddee0f312c04073b423b0af3a3e7c9bf60cd53e48c  neon-0.31.2.tar.gz
+"

base/openssl/openssl.SMBuild

@@ -1,8 +1,8 @@
 app=openssl
-version=1.1.1k
+version=1.1.1p
 build=1sml
 homepage='https://www.openssl.org/'
-download='https://www.openssl.org/source/openssl-1.1.1k.tar.gz'
+download='https://www.openssl.org/source/openssl-1.1.1o.tar.gz'
 desc="Commercial-grade, full-featured crypto library from OpenSSL Project that implements TLS and SSLv3"
 requires="perl"
 
@@ -14,9 +14,9 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  if [ "$ARCH" = "aarch64" ]; then
+  if [ "$arch" = "aarch64" ]; then
     cpuflag="linux-aarch64"
-  elif [ "$ARCH" = "x86_64" ]; then
+  elif [ "$arch" = "x86_64" ]; then
     cpuflag="linux-x86_64"
   fi
 
@@ -34,5 +34,5 @@ build() {
 }
 
 sha512sums="
-73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121  openssl-1.1.1k.tar.gz
+203470b1cd37bdbfabfec5ef37fc97c991d9943f070c988316f6396b09dae7cea16ac884bd8646dbf7dd1ed40ebde6bdfa5700beee2d714d07c97cc70b4e48d9  openssl-1.1.1p.tar.gz
 "

base/wayland-protocols/wayland-protocols.SMBuild

@@ -1,8 +1,8 @@
 app=wayland-protocols
-version=1.18
+version=1.25
 build=1sml
 homepage="https://wayland.freedesktop.org/"
-download="https://wayland.freedesktop.org/releases/wayland-protocols-1.18.tar.xz"
+download="https://wayland.freedesktop.org/releases/wayland-protocols-1.25.tar.xz"
 desc="specifications of extended wayland protocols"
 requires="wayland"
 
@@ -14,17 +14,18 @@ build() {
   cd $app-$version 
   fixbuilddirpermissions
 
-  ./configure \
-    --prefix="" 
+  mkdir smbuild && cd smbuild
+  meson .. \
+    --prefix="/" 
 
-  make
-  make install DESTDIR=$pkg 
+  ninja
+  DESTDIR=$pkg ninja install
 
-  cp COPYING $pkgdocs/
+  cp ../COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
 sha512sums="
-fbf5b0888a2c40cca2b49d29154ff032a23073668b1ace2f5683d960f2491b375279de02474433c3da2f6b35d2f9ac125afdb84edd8bdb8ede1584fcfb20f691  wayland-protocols-1.18.tar.lz
+8269694a0780e4d32f1982ff4cbb50b1ef85f08157b9486bc6d7e489c64665a9d9f959121d0eede7c7b108a604d974b64d74cfdef8b5f14304465309afb0768f  wayland-protocols-1.25.tar.xz
 "

net/php/cve-2021-21708.patch

@@ -1,57 +0,0 @@
-From 6fc79c90a07672992b39d8d4fc95ad4023f751ae Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Mon, 31 Jan 2022 15:43:24 +0100
-Subject: [PATCH] Fix #81708: UAF due to php_filter_float() failing for ints
-
-We must only release the zval, if we actually assign a new zval.
----
- ext/filter/logical_filters.c   |  2 +-
- ext/filter/tests/bug81708.phpt | 20 ++++++++++++++++++++
- 2 files changed, 21 insertions(+), 1 deletion(-)
- create mode 100644 ext/filter/tests/bug81708.phpt
-
-diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
-index fa6ae65ac5..e5e87c0156 100644
---- a/ext/filter/logical_filters.c
-+++ b/ext/filter/logical_filters.c
-@@ -435,10 +435,10 @@ void php_filter_float(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
- 
- 	switch (is_numeric_string(num, p - num, &lval, &dval, 0)) {
- 		case IS_LONG:
--			zval_ptr_dtor(value);
- 			if ((min_range_set && (lval < min_range)) || (max_range_set && (lval > max_range))) {
- 				goto error;
- 			}
-+			zval_ptr_dtor(value);
- 			ZVAL_DOUBLE(value, (double)lval);
- 			break;
- 		case IS_DOUBLE:
-diff --git a/ext/filter/tests/bug81708.phpt b/ext/filter/tests/bug81708.phpt
-new file mode 100644
-index 0000000000..d0036af136
---- /dev/null
-+++ b/ext/filter/tests/bug81708.phpt
-@@ -0,0 +1,20 @@
-+--TEST--
-+Bug #81708 (UAF due to php_filter_float() failing for ints)
-+--SKIPIF--
-+<?php
-+if (!extension_loaded("filter")) die("skip filter extension not available");
-+?>
-+--INI--
-+opcache.enable_cli=0
-+--FILE--
-+<?php
-+$input = "+" . str_repeat("1", 2); // avoid string interning
-+filter_var(
-+    $input,
-+    FILTER_VALIDATE_FLOAT,
-+    ["options" => ['min_range' => -1, 'max_range' => 1]]
-+);
-+var_dump($input);
-+?>
-+--EXPECT--
-+string(3) "+11"
--- 
-2.35.1.windows.1
-

net/php/php.SMBuild

@@ -1,9 +1,9 @@
 app=php
-version=7.4.26
+version=7.4.30
 rrdversion=2.0.3
 build=2sml
 homepage="https://www.php.net/"
-download="https://www.php.net/distributions/php-7.4.26.tar.xz"
+download="https://www.php.net/distributions/php-7.4.30.tar.xz"
 desc="Scripting language suited for creating dynamic websites"
 requires="enchant libgd db gmp icu libsodium libxslt sqlite curl libtool pcre2 postfix aspell openssl oniguruma libffi bzip2 zlib libexif intltool readline libsodium mariadb libwebp"
 
@@ -22,8 +22,6 @@ build() {
   cd ..
   ./buildconf -f
 
-  applypatch $srcdir/cve-2021-21708.patch
-
   ./configure \
     --prefix="" \
     --sysconfdir=/etc/php \
@@ -102,6 +100,6 @@ build() {
 }
 
 sha512sums="
-36cd493c9c95aabb1ee47e82cb0c20b2be99fe7ebd98743355139064590d0b9a1746d71e31dd47f164df34ebe3f8366a75f3efc149262e1391b43d83d3045c6e  php-7.4.26.tar.xz
+7bce44a23c07193c10c57459f08b08fdce4e3a269d6829a61371d1b1f117ecf4e167805a40e1a5e7687f534aee9d5f5745a3f4dcb344e9e781c105bc964ed738  php-7.4.30.tar.xz
 28679ccead54806d1e92accc6f5ebab582a41db802f95797ddb43e3e15690889be3437f22e2a14939d217422ac2700ef90ae0a9b36244ddead3856343b3e09b4  rrd-2.0.3.tgz
 "

xorg/libinput/libinput.SMBuild

@@ -1,8 +1,8 @@
 app=libinput
-version=1.10.0
+version=1.19.3
 build=1sml
 homepage="https://www.freedesktop.org/wiki/Software/libinput/"
-download="https://freedesktop.org/software/libinput/libinput-1.10.0.tar.xz"
+download="https://freedesktop.org/software/libinput/libinput-1.19.3.tar.xz"
 desc="Input device management and event handling library"
 requires="libevdev mtdev libwacom"
 
@@ -29,5 +29,5 @@ build() {
 }
 
 sha512sums="
-173f72f454c534dee755b6121c4577900ae9b8a129ac41de69410c3195950a6d149d6148892c4976f013eeabca66117d53fa67e352cc005960863a5576696928  libinput-1.10.0.tar.xz
-"
+f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298  libinput-1.19.3.tar.xz
+"