diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-01-22 22:53:32 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-01-23 08:59:50 +0100 |
commit | 4f9273afa49a94b04bccc088fb87fec9d80a3fc6 (patch) | |
tree | 4d72218eb61e88572100270416cc562159676018 /source/n/php/php.imap.api.diff | |
parent | 24375111b1a4c62f9b704108e98f53002f8c448a (diff) | |
download | current-4f9273afa49a94b04bccc088fb87fec9d80a3fc6.tar.gz current-4f9273afa49a94b04bccc088fb87fec9d80a3fc6.tar.xz |
Wed Jan 22 22:53:32 UTC 202020200122225332
a/kernel-firmware-20200122_1eb2408-noarch-1.txz: Upgraded.
a/pciutils-3.6.3-x86_64-1.txz: Upgraded.
a/pkgtools-15.0-noarch-30.txz: Rebuilt.
removepkg: prevent upgradepkg noise when a directory turns into a symlink.
setup.vi-ex: don't make symlinks if the targets don't exist.
d/cmake-3.16.3-x86_64-1.txz: Upgraded.
d/distcc-3.3.3-x86_64-3.txz: Rebuilt.
Move symlink tree into /usr/lib/distcc/, and make a link in /usr/lib64/ if
needed. Seems like this is how everyone else sets it up. Thanks to hpfeil.
Recompiled against krb5-1.17.1 (--with-auth).
d/parallel-20200122-noarch-1.txz: Upgraded.
l/python-urllib3-1.25.8-x86_64-1.txz: Upgraded.
n/bind-9.14.10-x86_64-1.txz: Upgraded.
This is a bugfix release:
With some libmaxminddb versions, named could erroneously match an IP address
not belonging to any subnet defined in a given GeoIP2 database to one of the
existing entries in that database. [GL #1552]
Fix line spacing in `rndc secroots`. Thanks to Tony Finch. [GL #2478]
Recompiled against krb5-1.17.1 (--with-gssapi).
n/dhcp-4.4.2-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.19-x86_64-1.txz: Upgraded.
n/php-7.4.2-x86_64-2.txz: Rebuilt.
Patched for c-client library API change. Thanks to ecd102.
Recompiled against krb5-1.17.1 (--with-kerberos).
Diffstat (limited to 'source/n/php/php.imap.api.diff')
-rw-r--r-- | source/n/php/php.imap.api.diff | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/source/n/php/php.imap.api.diff b/source/n/php/php.imap.api.diff new file mode 100644 index 000000000..836375205 --- /dev/null +++ b/source/n/php/php.imap.api.diff @@ -0,0 +1,78 @@ +--- ./configure.orig 2020-01-21 05:35:20.000000000 -0600 ++++ ./configure 2020-01-22 16:13:05.664626321 -0600 +@@ -39925,6 +39925,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){} +@@ -39992,6 +39993,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){} +@@ -40059,6 +40061,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){} +@@ -40133,6 +40136,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 2020-01-21 05:35:24.000000000 -0600 ++++ ./ext/imap/config.m4 2020-01-22 16:13:05.665626321 -0600 +@@ -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){} +--- ./ext/imap/php_imap.c.orig 2020-01-21 05:35:24.000000000 -0600 ++++ ./ext/imap/php_imap.c 2020-01-22 16:15:25.545614746 -0600 +@@ -5081,7 +5081,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) { +@@ -5089,7 +5089,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) |