diff options
author | tm <tm@pkgsrc.org> | 2021-11-23 22:47:04 +0000 |
---|---|---|
committer | tm <tm@pkgsrc.org> | 2021-11-23 22:47:04 +0000 |
commit | 2059e2940814623125efd06bccd7a652ce456e34 (patch) | |
tree | e3ada3840ee1635823fe3e22122610939a8280e3 | |
parent | ccc218b46e6ad854b96728d768727d22eb2ad806 (diff) | |
download | pkgsrc-2059e2940814623125efd06bccd7a652ce456e34.tar.gz |
Pullup ticket #6541 - requested by taca
lang/php74: security fix
Revisions pulled up:
- lang/php/phpversion.mk 1.345
- lang/php74/distinfo 1.33
- lang/php74/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp 1.3
---
Module Name: pkgsrc
Committed By: taca
Date: Fri Nov 19 14:26:29 UTC 2021
Modified Files:
pkgsrc/lang/php: phpversion.mk
pkgsrc/lang/php74: distinfo
pkgsrc/lang/php74/patches:
patch-ext_intl_breakiterator_codepointiterator__internal.cpp
Log Message:
lang/php74: udpate to 7.4.26
This release contains security fix.
18 Nov 2021, PHP 7.4.26
- Core:
. Fixed bug #81518 (Header injection via default_mimetype / default_charset).
(cmb)
- Date:
. Fixed bug #81500 (Interval serialization regression since 7.3.14 / 7.4.2).
(cmb)
- MBString:
. Fixed bug #76167 (mbstring may use pointer from some previous request).
(cmb, cataphract)
- MySQLi:
. Fixed bug #81494 (Stopped unbuffered query does not throw error). (Nikita)
- PCRE:
. Fixed bug #81424 (PCRE2 10.35 JIT performance regression). (cmb)
- Streams:
. Fixed bug #54340 (Memory corruption with user_filter). (Nikita)
- XML:
. Fixed bug #79971 (special character is breaking the path in xml function).
(CVE-2021-21707) (cmb)
-rw-r--r-- | lang/php/phpversion.mk | 4 | ||||
-rw-r--r-- | lang/php74/distinfo | 12 | ||||
-rw-r--r-- | lang/php74/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index b7f5bb63caa..1ae62bfad97 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.341.2.3 2021/11/02 18:28:45 tm Exp $ +# $NetBSD: phpversion.mk,v 1.341.2.4 2021/11/23 22:47:04 tm Exp $ # # This file selects a PHP version, based on the user's preferences and # the installed packages. It does not add a dependency on the PHP @@ -89,7 +89,7 @@ PHPVERSION_MK= defined # Define each PHP's version. PHP56_VERSION= 5.6.40 PHP73_VERSION= 7.3.32 -PHP74_VERSION= 7.4.25 +PHP74_VERSION= 7.4.26 PHP80_VERSION= 8.0.12 # Define initial release of major version. diff --git a/lang/php74/distinfo b/lang/php74/distinfo index e02f575e9f9..b275ddc4316 100644 --- a/lang/php74/distinfo +++ b/lang/php74/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.28.2.1 2021/11/02 18:20:51 tm Exp $ +$NetBSD: distinfo,v 1.28.2.2 2021/11/23 22:47:04 tm Exp $ -SHA1 (php-7.4.25.tar.xz) = c873eabab28db07412a198ccc3482af6fbc6ab92 -RMD160 (php-7.4.25.tar.xz) = 53d6d40db7e78d98ea037e08780d68e81675bbe4 -SHA512 (php-7.4.25.tar.xz) = 7fcb236f6d2a92514059b2e107c2b592e6139e3c65046566ae98fb9d2c09eb3e9ca1a41ea6535fc814bc7127d8fd9f8bb5a80bd86eec32120eb150a34b9b5c34 -Size (php-7.4.25.tar.xz) = 10376304 bytes +SHA1 (php-7.4.26.tar.xz) = 7057da60ba8c65e2b0c75129bb9ffff8ddd2f9d0 +RMD160 (php-7.4.26.tar.xz) = 3072fb3ed288d7c2be259df3866fb38878d0a606 +SHA512 (php-7.4.26.tar.xz) = 36cd493c9c95aabb1ee47e82cb0c20b2be99fe7ebd98743355139064590d0b9a1746d71e31dd47f164df34ebe3f8366a75f3efc149262e1391b43d83d3045c6e +Size (php-7.4.26.tar.xz) = 10420236 bytes SHA1 (patch-build_libtool.m4) = 3656eb516fb14defd4b0964fe21e117c630be856 SHA1 (patch-configure) = 5e9c9c06f6d819d5ba2832d648f41363f40f3108 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640 -SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = c6702b071a1881ed35a1c1adc0e07ce53335e2e7 +SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = b0ded220ffa42b77228d66696f00212caf37b4aa SHA1 (patch-ext_intl_collator_collator__sort.c) = 7fdb751cabb24eb4097cfb5cf23ba217a9893530 SHA1 (patch-ext_intl_dateformat_dateformat__attr.c) = 08a26ec534b67ed029426e4aa3bd26cb6761aead SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 10a215438db81c9f1f002f9409ebd56de6d65617 diff --git a/lang/php74/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp b/lang/php74/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp index c78c30cebd9..54c931f78e5 100644 --- a/lang/php74/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp +++ b/lang/php74/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.2 2020/11/08 23:55:44 otis Exp $ +$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.2.8.1 2021/11/23 22:47:04 tm Exp $ Use stdbool true/false macros. ---- ext/intl/breakiterator/codepointiterator_internal.cpp.orig 2020-10-27 15:01:59.000000000 +0000 +--- ext/intl/breakiterator/codepointiterator_internal.cpp.orig 2021-11-16 15:31:39.000000000 +0000 +++ ext/intl/breakiterator/codepointiterator_internal.cpp @@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIt return *this; @@ -13,8 +13,8 @@ Use stdbool true/false macros. //don't bother copying the character iterator, getText() is deprecated clearCurrentCharIter(); -@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakI - UBool CodePointBreakIterator::operator==(const BreakIterator& that) const +@@ -82,17 +82,17 @@ UBool CodePointBreakIterator::operator== + #endif { if (typeid(*this) != typeid(that)) { - return FALSE; @@ -34,7 +34,7 @@ Use stdbool true/false macros. } CodePointBreakIterator* CodePointBreakIterator::clone(void) const -@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterato +@@ -113,7 +113,7 @@ CharacterIterator& CodePointBreakIterato UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const { @@ -43,7 +43,7 @@ Use stdbool true/false macros. } void CodePointBreakIterator::setText(const UnicodeString &text) -@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UTe +@@ -132,7 +132,7 @@ void CodePointBreakIterator::setText(UTe return; } @@ -52,7 +52,7 @@ Use stdbool true/false macros. clearCurrentCharIter(); } -@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIt +@@ -284,7 +284,7 @@ CodePointBreakIterator &CodePointBreakIt } int64_t pos = utext_getNativeIndex(this->fText); |