diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2019-04-04 23:47:31 +0300 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2019-04-05 01:12:42 +0300 |
| commit | 9ab658975164fba3a87c84f81da05828ac2815f4 (patch) | |
| tree | 17b226d42479ec2ac4f1a3433d4c43f0bf9b3743 /community | |
| parent | 7d2b5f88887142d4ba854702961c89b3a409a0c6 (diff) | |
| download | aports-9ab658975164fba3a87c84f81da05828ac2815f4.tar.bz2 aports-9ab658975164fba3a87c84f81da05828ac2815f4.tar.xz | |
community/php7: security upgrade to 7.2.17
Diffstat (limited to 'community')
| -rw-r--r-- | community/php7/5025eb05bde83a0a51eb0668c45c240b366545bf.patch | 37 | ||||
| -rw-r--r-- | community/php7/APKBUILD | 10 |
2 files changed, 4 insertions, 43 deletions
diff --git a/community/php7/5025eb05bde83a0a51eb0668c45c240b366545bf.patch b/community/php7/5025eb05bde83a0a51eb0668c45c240b366545bf.patch deleted file mode 100644 index b95677c12e..0000000000 --- a/community/php7/5025eb05bde83a0a51eb0668c45c240b366545bf.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5025eb05bde83a0a51eb0668c45c240b366545bf Mon Sep 17 00:00:00 2001 -From: Jay Satiro <raysatiro@yahoo.com> -Date: Fri, 1 Mar 2019 01:37:00 -0500 -Subject: [PATCH] curl_error: return an empty string if no error occurred - -CURLOPT_ERRORBUFFER doc says "Do not rely on the contents of the -buffer unless an error code was returned." [1] - -Prior to this change the error buffer was returned even if no error had -occurred, and that buffer may contain incorrect information in such a -case. [2] - -[1]: https://curl.haxx.se/libcurl/c/CURLOPT_ERRORBUFFER.html -[2]: https://github.com/curl/curl/issues/3629 ---- - ext/curl/interface.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/ext/curl/interface.c b/ext/curl/interface.c -index 3af7ec12e23c..a252bb3a219d 100644 ---- a/ext/curl/interface.c -+++ b/ext/curl/interface.c -@@ -3310,8 +3310,12 @@ PHP_FUNCTION(curl_error) - RETURN_FALSE; - } - -- ch->err.str[CURL_ERROR_SIZE] = 0; -- RETURN_STRING(ch->err.str); -+ if (ch->err.no) { -+ ch->err.str[CURL_ERROR_SIZE] = 0; -+ RETURN_STRING(ch->err.str); -+ } else { -+ RETURN_EMPTY_STRING(); -+ } - } - /* }}} */ - diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD index f1078c439c..1d57d6cc12 100644 --- a/community/php7/APKBUILD +++ b/community/php7/APKBUILD @@ -25,8 +25,8 @@ pkgname=php7 _pkgreal=php -pkgver=7.2.16 -pkgrel=1 +pkgver=7.2.17 +pkgrel=0 _apiver=20170718 _suffix=${pkgname#php} # Is this package the default (latest) PHP version? @@ -100,7 +100,6 @@ source="https://php.net/distributions/$_pkgreal-$pkgver.tar.bz2 php7-fpm-version-suffix.patch allow-build-recode-and-imap-together.patch fix-tests-devserver.patch - 5025eb05bde83a0a51eb0668c45c240b366545bf.patch " builddir="$srcdir/$_pkgreal-$pkgver" @@ -659,7 +658,7 @@ _mv() { mv $@ } -sha512sums="f97545905a3ec4bc1ce431e306bffb2d7b6357164ea035a6899ea1589d8df4e6617af3924fa1abcb5da428ad691967504c3f94187d4cae6f2ef285e963d07e3d php-7.2.16.tar.bz2 +sha512sums="6d14311cb3699eec7a8eacfb82e0a00e8f5dcfb31474dd32071c1c3261ddf52157a43a1ead4762da01283b0f5ccbbae8dfbbad2fb59e0900a1769e9f318e5830 php-7.2.17.tar.bz2 1c708de82d1086f272f484faf6cf6d087af7c31750cc2550b0b94ed723961b363f28a947b015b2dfc0765caea185a75f5d2c2f2b099c948b65c290924f606e4f php7-fpm.initd cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691 php7-fpm.logrotate 274bd7b0b2b7002fa84c779640af37b59258bb37b05cb7dd5c89452977d71807f628d91b523b5039608376d1f760f3425d165242ca75ee5129b2730e71c4e198 php7-module.conf @@ -669,5 +668,4 @@ f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c93976 db4c47cb254d208e4055db9287f4f4bacc0339f1f5912d2bf9c66e8a0fd0db9d53fb02aaa6d30a823a4b8504a04a9ce906706f3792684654131bb5b26aeb77b2 sharedir.patch 6d4aa75b94ce7c88f97574a06964fafd7cb6657c1cb19c0b93776dedef05857331cce9c40f69a442ef84c66aa9137ad9f6197cc25f2384a27b8fd7350838292e php7-fpm-version-suffix.patch f8ecae241a90cbc3e98aa4deb3d5d35ef555f51380e29f4e182a8060dffeb84be74f030a14c6b452668471030d78964f52795ca74275db05543ccad20ef1f2cc allow-build-recode-and-imap-together.patch -5bb1f90de8c543d4efffa8bc604fb3239e478d9d9625d30cd03449643906a0fe5407123403206ec57f4bf9f18893a7ff4524ccf417b2bd8bce4ee7d18815b576 fix-tests-devserver.patch -36fa7471d847d7044202fb2b8dfd137769eb3a69562cb021e22f42923fde830518468ee68dc64593278794732295f0ac58f2b0c66a5f64dcfbeded5bf5cbd635 5025eb05bde83a0a51eb0668c45c240b366545bf.patch" +5bb1f90de8c543d4efffa8bc604fb3239e478d9d9625d30cd03449643906a0fe5407123403206ec57f4bf9f18893a7ff4524ccf417b2bd8bce4ee7d18815b576 fix-tests-devserver.patch" |