Thu Apr 13 22:25:18 UTC 202320230413222518

a/kernel-generic-6.1.24-x86_64-1.txz:  Upgraded.
a/kernel-huge-6.1.24-x86_64-1.txz:  Upgraded.
a/kernel-modules-6.1.24-x86_64-1.txz:  Upgraded.
a/tcsh-6.24.09-x86_64-1.txz:  Upgraded.
ap/vim-9.0.1450-x86_64-1.txz:  Upgraded.
d/kernel-headers-6.1.24-x86-1.txz:  Upgraded.
d/mercurial-6.4.1-x86_64-1.txz:  Upgraded.
d/rust-bindgen-0.65.1-x86_64-1.txz:  Upgraded.
k/kernel-source-6.1.24-noarch-1.txz:  Upgraded.
kde/digikam-8.0.0-x86_64-1.txz:  Upgraded.
l/gobject-introspection-1.76.1-x86_64-1.txz:  Upgraded.
l/pipewire-0.3.69-x86_64-1.txz:  Upgraded.
  When enabled, use wireplumber rather than the deprecated media-session.
  Thanks to saxa for the help. :-)
n/openvpn-2.6.3-x86_64-1.txz:  Upgraded.
n/php-8.2.5-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://www.php.net/ChangeLog-8.php#8.2.5
xap/vim-gvim-9.0.1450-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

2 files changed, 42 insertions, 51 deletions

diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh
index 6af2a04f4..a7328f95a 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-8.2.4.tar.xz.asc
-lftpget http://us.php.net/distributions/php-8.2.4.tar.xz
+lftpget http://us.php.net/distributions/php-8.2.5.tar.xz.asc
+lftpget http://us.php.net/distributions/php-8.2.5.tar.xz
diff --git a/source/n/php/php.imap.api.diff b/source/n/php/php.imap.api.diff
index b767e1558..8626c84c0 100644
--- a/source/n/php/php.imap.api.diff
+++ b/source/n/php/php.imap.api.diff
@@ -1,6 +1,42 @@
---- ./ext/imap/php_imap.c.orig	2020-03-17 05:40:25.000000000 -0500
-+++ ./ext/imap/php_imap.c	2020-03-17 16:20:15.600685744 -0500
-@@ -5081,7 +5081,7 @@
+--- ./configure.orig	2023-04-11 11:16:23.000000000 -0500
++++ ./configure	2023-04-13 12:54:14.715770023 -0500
+@@ -43985,6 +43985,7 @@
+     PHP_IMAP_EXPORT void mm_nocritical(void){}
+     PHP_IMAP_EXPORT void mm_notify(void){}
+     PHP_IMAP_EXPORT void mm_login(void){}
++    PHP_IMAP_EXPORT void mm_login_method(void){}
+     PHP_IMAP_EXPORT void mm_diskerror(void){}
+     PHP_IMAP_EXPORT void mm_status(void){}
+     PHP_IMAP_EXPORT void mm_lsub(void){}
+@@ -44164,6 +44165,7 @@
+     PHP_IMAP_EXPORT void mm_nocritical(void){}
+     PHP_IMAP_EXPORT void mm_notify(void){}
+     PHP_IMAP_EXPORT void mm_login(void){}
++    PHP_IMAP_EXPORT void mm_login_method(void){}
+     PHP_IMAP_EXPORT void mm_diskerror(void){}
+     PHP_IMAP_EXPORT void mm_status(void){}
+     PHP_IMAP_EXPORT void mm_lsub(void){}
+--- ./ext/imap/config.m4.orig	2023-04-11 11:16:23.000000000 -0500
++++ ./ext/imap/config.m4	2023-04-13 12:51:51.222777960 -0500
+@@ -46,6 +46,7 @@
+     PHP_IMAP_EXPORT void mm_nocritical(void){}
+     PHP_IMAP_EXPORT void mm_notify(void){}
+     PHP_IMAP_EXPORT void mm_login(void){}
++    PHP_IMAP_EXPORT void mm_login_method(void){}
+     PHP_IMAP_EXPORT void mm_diskerror(void){}
+     PHP_IMAP_EXPORT void mm_status(void){}
+     PHP_IMAP_EXPORT void mm_lsub(void){}
+@@ -282,6 +283,7 @@
+       PHP_IMAP_EXPORT void mm_nocritical(void){}
+       PHP_IMAP_EXPORT void mm_notify(void){}
+       PHP_IMAP_EXPORT void mm_login(void){}
++      PHP_IMAP_EXPORT void mm_login_method(void){}
+       PHP_IMAP_EXPORT void mm_diskerror(void){}
+       PHP_IMAP_EXPORT void mm_status(void){}
+       PHP_IMAP_EXPORT void mm_lsub(void){}
+--- ./ext/imap/php_imap.c.orig	2023-04-11 11:16:23.000000000 -0500
++++ ./ext/imap/php_imap.c	2023-04-13 12:51:51.222777960 -0500
+@@ -4502,7 +4502,7 @@
  	   php debugger? */
  }
  
@@ -9,7 +45,7 @@
  {
  
  	if (*mb->user) {
-@@ -5089,7 +5089,13 @@
+@@ -4510,7 +4510,13 @@
  	} else {
  		strlcpy (user, IMAPG(imap_user), MAILTMPLEN);
  	}
@@ -24,48 +60,3 @@
  }
  
  PHP_IMAP_EXPORT void mm_critical(MAILSTREAM *stream)
---- ./ext/imap/config.m4.orig	2020-03-17 05:40:25.000000000 -0500
-+++ ./ext/imap/config.m4	2020-03-17 16:20:15.588685745 -0500
-@@ -34,6 +34,7 @@
-     PHP_IMAP_EXPORT void mm_nocritical(void){}
-     PHP_IMAP_EXPORT void mm_notify(void){}
-     PHP_IMAP_EXPORT void mm_login(void){}
-+    PHP_IMAP_EXPORT void mm_login_method(void){}
-     PHP_IMAP_EXPORT void mm_diskerror(void){}
-     PHP_IMAP_EXPORT void mm_status(void){}
-     PHP_IMAP_EXPORT void mm_lsub(void){}
-@@ -262,6 +263,7 @@
-       PHP_IMAP_EXPORT void mm_nocritical(void){}
-       PHP_IMAP_EXPORT void mm_notify(void){}
-       PHP_IMAP_EXPORT void mm_login(void){}
-+      PHP_IMAP_EXPORT void mm_login_method(void){}
-       PHP_IMAP_EXPORT void mm_diskerror(void){}
-       PHP_IMAP_EXPORT void mm_status(void){}
-       PHP_IMAP_EXPORT void mm_lsub(void){}
---- ./configure.orig	2020-03-17 05:40:20.000000000 -0500
-+++ ./configure	2020-03-17 16:22:03.768679101 -0500
-@@ -39870,6 +39870,7 @@
-     PHP_IMAP_EXPORT void mm_nocritical(void){}
-     PHP_IMAP_EXPORT void mm_notify(void){}
-     PHP_IMAP_EXPORT void mm_login(void){}
-+    PHP_IMAP_EXPORT void mm_login_method(void){}
-     PHP_IMAP_EXPORT void mm_diskerror(void){}
-     PHP_IMAP_EXPORT void mm_status(void){}
-     PHP_IMAP_EXPORT void mm_lsub(void){}
-@@ -39937,6 +39938,8 @@
-     PHP_IMAP_EXPORT void mm_nocritical(void){}
-     PHP_IMAP_EXPORT void mm_notify(void){}
-     PHP_IMAP_EXPORT void mm_login(void){}
-+    PHP_IMAP_EXPORT void mm_login_method(void){}
-+    PHP_IMAP_EXPORT void mm_login_method(void){}
-     PHP_IMAP_EXPORT void mm_diskerror(void){}
-     PHP_IMAP_EXPORT void mm_status(void){}
-     PHP_IMAP_EXPORT void mm_lsub(void){}
-@@ -40078,6 +40081,7 @@
-     PHP_IMAP_EXPORT void mm_nocritical(void){}
-     PHP_IMAP_EXPORT void mm_notify(void){}
-     PHP_IMAP_EXPORT void mm_login(void){}
-+    PHP_IMAP_EXPORT void mm_login_method(void){}
-     PHP_IMAP_EXPORT void mm_diskerror(void){}
-     PHP_IMAP_EXPORT void mm_status(void){}
-     PHP_IMAP_EXPORT void mm_lsub(void){}