diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-04-05 12:51:59 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-04-05 12:51:59 +0000 |
| commit | 343e40efb539159bff58339cae63279e2a7cf9c2 (patch) | |
| tree | 114140210c76d51c9946300ec02fa676aebf6ad5 /user/php7/pwbuflen.patch | |
| parent | 0b10cc74d61cd3b81c5f3b54d44bc6c3e1723a03 (diff) | |
| parent | af409aaaaf71ee25115f59e64bf8ea566d278176 (diff) | |
| download | packages-343e40efb539159bff58339cae63279e2a7cf9c2.tar.gz packages-343e40efb539159bff58339cae63279e2a7cf9c2.tar.bz2 packages-343e40efb539159bff58339cae63279e2a7cf9c2.tar.xz packages-343e40efb539159bff58339cae63279e2a7cf9c2.zip | |
Merge branch 'bump/php744' into 'master'
Bump PHP to 7.4.4
See merge request adelie/packages!423
Diffstat (limited to 'user/php7/pwbuflen.patch')
| -rw-r--r-- | user/php7/pwbuflen.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/user/php7/pwbuflen.patch b/user/php7/pwbuflen.patch deleted file mode 100644 index 7d2685b55..000000000 --- a/user/php7/pwbuflen.patch +++ /dev/null @@ -1,15 +0,0 @@ -sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on musl and 1024 on glibc. - ---- php-7.2.6/main/main.c 2018-06-04 23:30:18.790089810 -0400 -+++ php-7.2.6/main/main.c 2018-06-04 23:30:14.660089806 -0400 -@@ -1315,7 +1315,9 @@ - int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); - char *pwbuf; - -- if (pwbuflen < 1) { -+ if (pwbuflen == -1) { -+ pwbuflen = 1024; -+ } else if (pwbuflen < 1) { - return ""; - } - pwbuf = emalloc(pwbuflen); |