slackware-current/source/n/php/php.imap.api.diff
Patrick J Volkerding 888029128e Thu Apr 13 22:25:18 UTC 2023
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.
2023-04-14 01:40:28 +02:00

62 lines
2.3 KiB
Diff

--- ./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? */
}
-PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char *pwd, long trial)
+PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char **pwd, long trial)
{
if (*mb->user) {
@@ -4510,7 +4510,13 @@
} else {
strlcpy (user, IMAPG(imap_user), MAILTMPLEN);
}
- strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN);
+ *pwd = cpystr(IMAPG(imap_password)); /* alpine-2.22 c-client.a */
+}
+
+/* alpine-2.22 c-client.a workaround */
+PHP_IMAP_EXPORT void mm_login_method(NETMBX *mb, char *user, void *pwd, long trial, char *method)
+{
+ pwd = NULL;
}
PHP_IMAP_EXPORT void mm_critical(MAILSTREAM *stream)