diff options
Diffstat (limited to 'source/n/php')
| -rwxr-xr-x | source/n/php/fetch-php.sh | 4 | ||||
| -rw-r--r-- | source/n/php/php.imap.api.diff | 93 |
2 files changed, 45 insertions, 52 deletions
diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh index 1fce3052..afe2c0a8 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.3.tar.xz.asc -lftpget http://us.php.net/distributions/php-7.4.3.tar.xz +lftpget http://us.php.net/distributions/php-7.4.4.tar.xz.asc +lftpget http://us.php.net/distributions/php-7.4.4.tar.xz diff --git a/source/n/php/php.imap.api.diff b/source/n/php/php.imap.api.diff index 83637520..b767e155 100644 --- a/source/n/php/php.imap.api.diff +++ b/source/n/php/php.imap.api.diff @@ -1,14 +1,32 @@ ---- ./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 @@ +--- ./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 @@ + 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) +--- ./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){} @@ -16,7 +34,7 @@ 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 @@ +@@ -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){} @@ -24,7 +42,9 @@ 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 @@ +--- ./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){} @@ -32,9 +52,16 @@ 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 @@ +@@ -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){} @@ -42,37 +69,3 @@ 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) |