* [Buildroot] [PATCH 1/1] package/php: bump version to 7.1.13
@ 2018-01-06 18:36 Bernd Kuhls
2018-01-06 19:09 ` Bernd Kuhls
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Bernd Kuhls @ 2018-01-06 18:36 UTC (permalink / raw)
To: buildroot
Removed 0008-fix-asm-constraints-in-aarch64-multiply-macro.patch, patch
was applied upstream:
https://github.com/php/php-src/commit/d6d4f2a9b38cd7fa7e938142e49e5a514d612e52
Renumbered patch 0009.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
...ch => 0008-Call-apxs-with-correct-prefix.patch} | 0
...asm-constraints-in-aarch64-multiply-macro.patch | 28 ----------------------
package/php/php.hash | 2 +-
package/php/php.mk | 2 +-
4 files changed, 2 insertions(+), 30 deletions(-)
rename package/php/{0009-Call-apxs-with-correct-prefix.patch => 0008-Call-apxs-with-correct-prefix.patch} (100%)
delete mode 100644 package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch
diff --git a/package/php/0009-Call-apxs-with-correct-prefix.patch b/package/php/0008-Call-apxs-with-correct-prefix.patch
similarity index 100%
rename from package/php/0009-Call-apxs-with-correct-prefix.patch
rename to package/php/0008-Call-apxs-with-correct-prefix.patch
diff --git a/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch b/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch
deleted file mode 100644
index f4812daaa5..0000000000
--- a/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1622f24fde4220967bd907bf8f0325d444bf9339 Mon Sep 17 00:00:00 2001
-From: Andy Postnikov <apostnikov@gmail.com>
-Date: Sat, 10 Dec 2016 23:51:17 +0300
-Subject: [PATCH] Fix bug #70015 - Compilation failure on aarch64
-
-Fixes build at -O0.
-
-[From pull request https://github.com/php/php-src/pull/2236.]
-Signed-off-by: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
----
- Zend/zend_multiply.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
-index 75769db..fbd69ab 100644
---- a/Zend/zend_multiply.h
-+++ b/Zend/zend_multiply.h
-@@ -75,8 +75,8 @@
- __asm__("mul %0, %2, %3\n" \
- "smulh %1, %2, %3\n" \
- "sub %1, %1, %0, asr #63\n" \
-- : "=X"(__tmpvar), "=X"(usedval) \
-- : "X"(a), "X"(b)); \
-+ : "=&r"(__tmpvar), "=&r"(usedval) \
-+ : "r"(a), "r"(b)); \
- if (usedval) (dval) = (double) (a) * (double) (b); \
- else (lval) = __tmpvar; \
- } while (0)
diff --git a/package/php/php.hash b/package/php/php.hash
index cdec308b66..3b3c97bd38 100644
--- a/package/php/php.hash
+++ b/package/php/php.hash
@@ -1,5 +1,5 @@
# From http://php.net/downloads.php
-sha256 a0118850774571b1f2d4e30b4fe7a4b958ca66f07d07d65ebdc789c54ba6eeb3 php-7.1.12.tar.xz
+sha256 1a0b3f2fb61959b57a3ee01793a77ed3f19bde5aa90c43dcacc85ea32f64fc10 php-7.1.13.tar.xz
# License file
sha256 a44951f93b10c87c3f7cd9f311d95999c57c95ed950eec32b14c1c7ea6baf25e LICENSE
diff --git a/package/php/php.mk b/package/php/php.mk
index 72d5ea80c7..941000cd6b 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PHP_VERSION = 7.1.12
+PHP_VERSION = 7.1.13
PHP_SITE = http://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/php: bump version to 7.1.13
2018-01-06 18:36 [Buildroot] [PATCH 1/1] package/php: bump version to 7.1.13 Bernd Kuhls
@ 2018-01-06 19:09 ` Bernd Kuhls
2018-01-07 14:06 ` Thomas Petazzoni
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Bernd Kuhls @ 2018-01-06 19:09 UTC (permalink / raw)
To: buildroot
Bernd Kuhls <bernd.kuhls@t-online.de> wrote in
news:20180106183657.20579-1-bernd.kuhls at t-online.de:
Hi,
forgot to mention that this is a security release according to the php
homepage: http://www.php.net/
Regards, Bernd
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/php: bump version to 7.1.13
2018-01-06 18:36 [Buildroot] [PATCH 1/1] package/php: bump version to 7.1.13 Bernd Kuhls
2018-01-06 19:09 ` Bernd Kuhls
@ 2018-01-07 14:06 ` Thomas Petazzoni
2018-01-08 21:52 ` Peter Korsgaard
2018-01-29 21:36 ` Peter Korsgaard
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2018-01-07 14:06 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 6 Jan 2018 19:36:57 +0100, Bernd Kuhls wrote:
> Removed 0008-fix-asm-constraints-in-aarch64-multiply-macro.patch, patch
> was applied upstream:
> https://github.com/php/php-src/commit/d6d4f2a9b38cd7fa7e938142e49e5a514d612e52
>
> Renumbered patch 0009.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> ...ch => 0008-Call-apxs-with-correct-prefix.patch} | 0
> ...asm-constraints-in-aarch64-multiply-macro.patch | 28 ----------------------
> package/php/php.hash | 2 +-
> package/php/php.mk | 2 +-
> 4 files changed, 2 insertions(+), 30 deletions(-)
> rename package/php/{0009-Call-apxs-with-correct-prefix.patch => 0008-Call-apxs-with-correct-prefix.patch} (100%)
> delete mode 100644 package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch
I adjusted the commit title to indicate it's a security bump, and
applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/php: bump version to 7.1.13
2018-01-06 18:36 [Buildroot] [PATCH 1/1] package/php: bump version to 7.1.13 Bernd Kuhls
2018-01-06 19:09 ` Bernd Kuhls
2018-01-07 14:06 ` Thomas Petazzoni
@ 2018-01-08 21:52 ` Peter Korsgaard
2018-01-29 21:36 ` Peter Korsgaard
3 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2018-01-08 21:52 UTC (permalink / raw)
To: buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> Removed 0008-fix-asm-constraints-in-aarch64-multiply-macro.patch, patch
> was applied upstream:
> https://github.com/php/php-src/commit/d6d4f2a9b38cd7fa7e938142e49e5a514d612e52
> Renumbered patch 0009.
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Committed to 2017.11.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/php: bump version to 7.1.13
2018-01-06 18:36 [Buildroot] [PATCH 1/1] package/php: bump version to 7.1.13 Bernd Kuhls
` (2 preceding siblings ...)
2018-01-08 21:52 ` Peter Korsgaard
@ 2018-01-29 21:36 ` Peter Korsgaard
3 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2018-01-29 21:36 UTC (permalink / raw)
To: buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> Removed 0008-fix-asm-constraints-in-aarch64-multiply-macro.patch, patch
> was applied upstream:
> https://github.com/php/php-src/commit/d6d4f2a9b38cd7fa7e938142e49e5a514d612e52
> Renumbered patch 0009.
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Committed to 2017.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-01-29 21:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-06 18:36 [Buildroot] [PATCH 1/1] package/php: bump version to 7.1.13 Bernd Kuhls
2018-01-06 19:09 ` Bernd Kuhls
2018-01-07 14:06 ` Thomas Petazzoni
2018-01-08 21:52 ` Peter Korsgaard
2018-01-29 21:36 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox