This thread contains a patchset. You're looking at the original emails,
but you may wish to use the patch review UI.
Review patch
[alpine-aports] [PATCH] main/php: upgrade to 5.6.18
---
main/php/APKBUILD | 18 +++++++++++-------
main/php/gnulib-stdio.patch | 10 ++++++++++
2 files changed, 21 insertions(+), 7 deletions(-)
create mode 100644 main/php/gnulib-stdio.patch
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 4c8f049..284ddbd 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=php
-pkgver=5.6.17
+pkgver=5.6.18
pkgrel=0
pkgdesc="The PHP language runtime engine"
url="http://www.php.net/"
@@ -115,6 +115,7 @@ source="http://php.net/distributions/php-$pkgver.tar.bz2
gd-iconv.patch
php-fix-crypt.patch
fix-crypt-sha.patch
+ gnulib-stdio.patch
"
_apiver="20131106"
@@ -494,24 +495,27 @@ pdo_dblib() { _mv_ext pdo_dblib "php-pdo freetds"; }
wddx() { _mv_ext wddx; }
opcache() { _mv_ext opcache; }
-md5sums="23e2183852b172a8e2b2c739b7dde4ca php-5.6.17.tar.bz2
+md5sums="7340353bedd998286ba2c4d87d7864f8 php-5.6.18.tar.bz2
02417a82d080c858933e945ced0c6818 php-fpm.initd
67719f428f44ec004da18705cbabe2ee php5-module.conf
483bc0a85c50a9a9aedbe14a19ed4526 php-install-pear-xml.patch
162d8d079944387eab2bc80edab347ae gd-iconv.patch
b63ef63893c1c115d6dd63e8df1f17e3 php-fix-crypt.patch
-cb10034c525c6544890f1a1839837e38 fix-crypt-sha.patch"
-sha256sums="77b45f56a1e63e75bb22b42cfb8b438ec4083c59ce774b4d7c1685544b7add3b php-5.6.17.tar.bz2
+cb10034c525c6544890f1a1839837e38 fix-crypt-sha.patch
+9a4d813a3bddb8d2d7cbb0f9c13aa39e gnulib-stdio.patch"
+sha256sums="c3cd4a29a9562309d36e2b128407d6eaa5c7dde590d2b1a464457383e517f4ed php-5.6.18.tar.bz2
3ad0252894d628e9832dbefb24d7043ac0f75475cd26d6ca12332e71cc3fc0f5 php-fpm.initd
ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba392257f php5-module.conf
f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab php-install-pear-xml.patch
6122bf279cdb7c387dd000761b2426969a73cf63a10a132aa98a79eb1dd259b2 gd-iconv.patch
817f6300cd0c4d97f24c3e883132d2cde0ef52d84f5c97073f9c9668d6275d6e php-fix-crypt.patch
-a5db307ad2638e7e609b450abce19c98c23de54be96619b46adb69f2c5e11fa2 fix-crypt-sha.patch"
-sha512sums="706fd31324c98717d44b4db4440a5eaffe24ad34b346ba95418b33ee072b3ddde5d7429d318f69554b4bfcd7dcc0e9e4b07142b539196e9f0ab7707485ad9dbb php-5.6.17.tar.bz2
+a5db307ad2638e7e609b450abce19c98c23de54be96619b46adb69f2c5e11fa2 fix-crypt-sha.patch
+062524d9aa725dd7277f09ea1046f729b27310fb2f55b2fda4e9fb6d613a46d4 gnulib-stdio.patch"
+sha512sums="1f0820d829923404ceae287129afa9c7d7d9c83d6fbf148a65a6ac49224f4cb84e743443c4fadb69d959229123ab7e99816aab40f694d808e64b05bb7238f89e php-5.6.18.tar.bz2
38c24e84c9be2dcf4f291e5f04187f40e5a8b325da73e79580d82b8a9e0e496c4fb17df92dcf8157bb9df4f1beadce102df9265c83849ca4e55560abf4937c43 php-fpm.initd
895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00a18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102 php5-module.conf
f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 php-install-pear-xml.patch
59443fb464f49ff7d9b64739df982e7240f9d4792226d96ad1538286945125fc7eb6f0cab88b64d5c81ee3679fd89bffdca59ebd20eca2778ab801ee54529028 gd-iconv.patch
febe75305b19ca7c2b4f85ee8144d3a347530044223619b28fb754485f72fe3dd283ece341d77f2e0bff3881ed7fa2b89e6c95a8e4b077ab40b3f7a8d767a633 php-fix-crypt.patch
-d3b156dc7fca33c5634ace04bc7b7f27174d58d09455adf5bcdafd748a6aab1b1c97dce588d218b95d5fde3f6c2dd9202f4d7ea1c3b323be400f4d990c39290b fix-crypt-sha.patch"
+d3b156dc7fca33c5634ace04bc7b7f27174d58d09455adf5bcdafd748a6aab1b1c97dce588d218b95d5fde3f6c2dd9202f4d7ea1c3b323be400f4d990c39290b fix-crypt-sha.patch
+77cb2ac6b4d0639c3f3243d09508ce704a2117eda2616911ed7eefa68e5f7c53e5a0569597ea728d8d28f1c4f55530ea204ab669ed25df80ad31784e8bcb3995 gnulib-stdio.patch"
diff --git a/main/php/gnulib-stdio.patch b/main/php/gnulib-stdio.patch
new file mode 100644
index 0000000..2c3328a
--- /dev/null
+++ b/main/php/gnulib-stdio.patch
@@ -0,0 +1,10 @@
+--- a/ext/standard/string.c
++++ b/ext/standard/string.c
+@@ -22,6 +22,7 @@
+
+ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
+
++#define _GL_STDIO_H 1
+ #include <stdio.h>
+ #include "php.h"
+ #include "php_rand.h"
--
2.7.0
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---
[alpine-aports] Re: [PATCH] main/php: upgrade to 5.6.18
After gettext's 'dont-override-gnulib.patch', the gnulib-stdio.patch does
not need. I will make a v2 commit
2016-02-05 14:35 GMT+02:00 Valery Kartel <valery.kartel@gmail.com>:
> ---
> main/php/APKBUILD | 18 +++++++++++-------
> main/php/gnulib-stdio.patch | 10 ++++++++++
> 2 files changed, 21 insertions(+), 7 deletions(-)
> create mode 100644 main/php/gnulib-stdio.patch
>
> diff --git a/main/php/APKBUILD b/main/php/APKBUILD
> index 4c8f049..284ddbd 100644
> --- a/main/php/APKBUILD
> +++ b/main/php/APKBUILD
> @@ -3,7 +3,7 @@
> # Contributor: Carlo Landmeter <clandmeter@gmail.com>
> # Maintainer: Matt Smith <mcs@darkregion.net>
> pkgname=php
> -pkgver=5.6.17
> +pkgver=5.6.18
> pkgrel=0
> pkgdesc="The PHP language runtime engine"
> url="http://www.php.net/"
> @@ -115,6 +115,7 @@ source="
> http://php.net/distributions/php-$pkgver.tar.bz2
> gd-iconv.patch
> php-fix-crypt.patch
> fix-crypt-sha.patch
> + gnulib-stdio.patch
> "
>
> _apiver="20131106"
> @@ -494,24 +495,27 @@ pdo_dblib() { _mv_ext pdo_dblib "php-pdo
> freetds"; }
> wddx() { _mv_ext wddx; }
> opcache() { _mv_ext opcache; }
>
> -md5sums="23e2183852b172a8e2b2c739b7dde4ca php-5.6.17.tar.bz2
> +md5sums="7340353bedd998286ba2c4d87d7864f8 php-5.6.18.tar.bz2
> 02417a82d080c858933e945ced0c6818 php-fpm.initd
> 67719f428f44ec004da18705cbabe2ee php5-module.conf
> 483bc0a85c50a9a9aedbe14a19ed4526 php-install-pear-xml.patch
> 162d8d079944387eab2bc80edab347ae gd-iconv.patch
> b63ef63893c1c115d6dd63e8df1f17e3 php-fix-crypt.patch
> -cb10034c525c6544890f1a1839837e38 fix-crypt-sha.patch"
> -sha256sums="77b45f56a1e63e75bb22b42cfb8b438ec4083c59ce774b4d7c1685544b7add3b
> php-5.6.17.tar.bz2
> +cb10034c525c6544890f1a1839837e38 fix-crypt-sha.patch
> +9a4d813a3bddb8d2d7cbb0f9c13aa39e gnulib-stdio.patch"
> +sha256sums="c3cd4a29a9562309d36e2b128407d6eaa5c7dde590d2b1a464457383e517f4ed
> php-5.6.18.tar.bz2
> 3ad0252894d628e9832dbefb24d7043ac0f75475cd26d6ca12332e71cc3fc0f5
> php-fpm.initd
> ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba392257f
> php5-module.conf
> f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab
> php-install-pear-xml.patch
> 6122bf279cdb7c387dd000761b2426969a73cf63a10a132aa98a79eb1dd259b2
> gd-iconv.patch
> 817f6300cd0c4d97f24c3e883132d2cde0ef52d84f5c97073f9c9668d6275d6e
> php-fix-crypt.patch
> -a5db307ad2638e7e609b450abce19c98c23de54be96619b46adb69f2c5e11fa2
> fix-crypt-sha.patch"
> -sha512sums="706fd31324c98717d44b4db4440a5eaffe24ad34b346ba95418b33ee072b3ddde5d7429d318f69554b4bfcd7dcc0e9e4b07142b539196e9f0ab7707485ad9dbb
> php-5.6.17.tar.bz2
> +a5db307ad2638e7e609b450abce19c98c23de54be96619b46adb69f2c5e11fa2
> fix-crypt-sha.patch
> +062524d9aa725dd7277f09ea1046f729b27310fb2f55b2fda4e9fb6d613a46d4
> gnulib-stdio.patch"
> +sha512sums="1f0820d829923404ceae287129afa9c7d7d9c83d6fbf148a65a6ac49224f4cb84e743443c4fadb69d959229123ab7e99816aab40f694d808e64b05bb7238f89e
> php-5.6.18.tar.bz2
> 38c24e84c9be2dcf4f291e5f04187f40e5a8b325da73e79580d82b8a9e0e496c4fb17df92dcf8157bb9df4f1beadce102df9265c83849ca4e55560abf4937c43
> php-fpm.initd
> 895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00a18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102
> php5-module.conf
> f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505
> php-install-pear-xml.patch
> 59443fb464f49ff7d9b64739df982e7240f9d4792226d96ad1538286945125fc7eb6f0cab88b64d5c81ee3679fd89bffdca59ebd20eca2778ab801ee54529028
> gd-iconv.patch
> febe75305b19ca7c2b4f85ee8144d3a347530044223619b28fb754485f72fe3dd283ece341d77f2e0bff3881ed7fa2b89e6c95a8e4b077ab40b3f7a8d767a633
> php-fix-crypt.patch
> -d3b156dc7fca33c5634ace04bc7b7f27174d58d09455adf5bcdafd748a6aab1b1c97dce588d218b95d5fde3f6c2dd9202f4d7ea1c3b323be400f4d990c39290b
> fix-crypt-sha.patch"
> +d3b156dc7fca33c5634ace04bc7b7f27174d58d09455adf5bcdafd748a6aab1b1c97dce588d218b95d5fde3f6c2dd9202f4d7ea1c3b323be400f4d990c39290b
> fix-crypt-sha.patch
> +77cb2ac6b4d0639c3f3243d09508ce704a2117eda2616911ed7eefa68e5f7c53e5a0569597ea728d8d28f1c4f55530ea204ab669ed25df80ad31784e8bcb3995
> gnulib-stdio.patch"
> diff --git a/main/php/gnulib-stdio.patch b/main/php/gnulib-stdio.patch
> new file mode 100644
> index 0000000..2c3328a
> --- /dev/null
> +++ b/main/php/gnulib-stdio.patch
> @@ -0,0 +1,10 @@
> +--- a/ext/standard/string.c
> ++++ b/ext/standard/string.c
> +@@ -22,6 +22,7 @@
> +
> + /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
> +
> ++#define _GL_STDIO_H 1
> + #include <stdio.h>
> + #include "php.h"
> + #include "php_rand.h"
> --
> 2.7.0
>
>