Skip to contentSkip to conversation

package/php: bump version to 7.1.13

PATCH New Bernd Kuhls 3 participants 5 messages Jan 6, 2018 – Jan 29, 2018

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/php: bump version to 7.1.13

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 <[email protected]>
---
 ...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
package/php/0008-Call-apxs-with-correct-prefix.patch renamed from package/php/0009-Call-apxs-with-correct-prefix.patch +0 -0
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
package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch deleted +0 -28
deleted file mode 100644
index f4812daaa5..0000000000
@@ -1,28 +0,0 @@
-From 1622f24fde4220967bd907bf8f0325d444bf9339 Mon Sep 17 00:00:00 2001
-From: Andy Postnikov <[email protected]>
-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 <[email protected]>
----
- 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)
package/php/php.hash +1 -1
index cdec308b66..3b3c97bd38 100644
@@ -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
package/php/php.mk +1 -1
index 72d5ea80c7..941000cd6b 100644
@@ -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
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 1/1 package/php: bump version to 7.1.13

Bernd Kuhls <[email protected]> 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

#2 lore raw

PATCH 1/1 package/php: bump version to 7.1.13

In reply to Bernd Kuhls

Hello,

Quoted 7 lines · Bernd Kuhls

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 <[email protected]>
Quoted 8 lines
---
 ...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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 1/1 package/php: bump version to 7.1.13

In reply to Bernd Kuhls
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> 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 <[email protected]>

Committed to 2017.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/1 package/php: bump version to 7.1.13

In reply to Bernd Kuhls
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> 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 <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard