X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 9DFCFDC7E53 for ; Mon, 4 Apr 2016 19:43:46 +0000 (UTC) Received: from bird.oak.relay.mailchannels.net (bird.oak.relay.mailchannels.net [23.83.215.17]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 2BE1DDC1529 for ; Mon, 4 Apr 2016 19:43:45 +0000 (UTC) X-Sender-Id: mxroute|x-authuser|developer@it-offshore.co.uk Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 087E612081E; Mon, 4 Apr 2016 19:43:44 +0000 (UTC) Received: from ocean.mxroute.com (ip-10-21-3-36.us-west-2.compute.internal [10.21.3.36]) by relay.mailchannels.net (Postfix) with ESMTPA id 3D75A12085B; Mon, 4 Apr 2016 19:43:43 +0000 (UTC) X-Sender-Id: mxroute|x-authuser|developer@it-offshore.co.uk Received: from ocean.mxroute.com (unassigned.psychz.net [10.134.137.132]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.6.11); Mon, 04 Apr 2016 19:43:43 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: mxroute|x-authuser|developer@it-offshore.co.uk X-MailChannels-Auth-Id: mxroute X-MC-Loop-Signature: 1459799037811:33997818 X-MC-Ingress-Time: 1459799037811 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=it-offshore.co.uk; s=default; h=Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:Cc:To:References:Subject:Reply-To; bh=GvSVIcja7/vvR59aOQNmDemWwr2Va9nrVcOgFNjFhY0=; b=oI8UfESniGY+UQEb0NUL7rEp3l kaN/J6c1lOCamv+hNW73zeNuFeFr7HHSZd4ek7V9ehbTxyidyt8u+ibRA1Dp59Rmv44Z3o7GYCHW1 yfAZWLylvZb1VBUv8RNIXybGPEZjMIIKkutV3SOiyWrzpXbBvcaIoQjSd7LNmEhyfk8PVDPamrfyo U/gtXIOj8yOSrlZu7qOPcPORs7ZBx/1EQgeQL3g6Sdz/sDDg8nZLBVVNOVlBPB0R+7gpemgRaABqp lF7+JIoI49oBD2p75DsGJKYzhuVa1xvxnK24yOCTgR6BWmNC6kQVP3NvcN2jUDpnAW7i/UmhOV9XA e0nvN+dw==; Received: from [81.4.121.188] (port=49848 helo=[10.8.0.10]) by ocean.mxroute.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.86_1) (envelope-from ) id 1anAPR-0006JJ-G6; Mon, 04 Apr 2016 15:43:37 -0400 Reply-To: developer@it-offshore.co.uk Subject: Re: [alpine-aports] [PATCH v2] testing/php7: add iconv subpkg References: <1459704185-7807-1-git-send-email-developer@it-offshore.co.uk> To: Valery Kartel Cc: alpine-aports@lists.alpinelinux.org From: Stuart Cardall Message-ID: <5702C3E7.8080501@it-offshore.co.uk> Date: Mon, 4 Apr 2016 20:43:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/alternative; boundary="------------020006020004050708030206" X-AuthUser: developer@it-offshore.co.uk X-Virus-Scanned: ClamAV using ClamSMTP This is a multi-part message in MIME format. --------------020006020004050708030206 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable The php5 iconv patch in ~/aports/main/php/gd-iconv.patch also applies ok in php7 Timo prefers that to be applied instead of mine. Stuart. On 04/04/2016 07:48 PM, Valery Kartel wrote: > I join your patch to my newly created one to add it all in one shot > > 2016-04-03 20:23 GMT+03:00 Stuart Cardall >: > > --- > Changes v1 -> v2: > - pkgrel bumped correctly > =3D this should apply cleanly after Valery's 7.0.5 patch sent toda= y > > testing/php7/APKBUILD | 27 +++++++++++++++++---------- > testing/php7/libintl-iconv.patch | 10 ++++++++++ > 2 files changed, 27 insertions(+), 10 deletions(-) > create mode 100644 testing/php7/libintl-iconv.patch > > diff --git a/testing/php7/APKBUILD b/testing/php7/APKBUILD > index 34a2408..1b62a93 100644 > --- a/testing/php7/APKBUILD > +++ b/testing/php7/APKBUILD > @@ -3,7 +3,7 @@ > pkgname=3Dphp7 > _pkgreal=3Dphp > pkgver=3D7.0.5 > -pkgrel=3D0 > +pkgrel=3D1 > pkgdesc=3D"The PHP language runtime engine - 7th branch" > url=3D"http://www.php.net/" > arch=3D"x86_64 armhf" > @@ -16,8 +16,8 @@ makedepends=3D"autoconf bison re2c apache2-dev > libxml2-dev libxslt-dev libzip-dev > libical-dev openssl-dev openldap-dev net-snmp-dev db-dev > krb5-dev gdbm-dev sqlite-dev > freetds-dev mariadb-dev postgresql-dev unixodbc-dev > freetype-dev tidyhtml-dev libxpm-dev > libpng-dev libwebp-dev libjpeg-turbo-dev libmcrypt-dev > libmbfl-dev gsoap-dev recode-dev > - readline-dev mhash-dev paxmark > -" > + readline-dev mhash-dev paxmark gettext-dev > + " > > subpackages=3D"$pkgname-dev $pkgname-doc > $pkgname-apache2 $pkgname-phpdbg $pkgname-embed > $pkgname-litespeed $pkgname-cgi $pkgname-fpm > @@ -35,6 +35,7 @@ subpackages=3D"$pkgname-dev $pkgname-doc > $pkgname-gd > $pkgname-gettext > $pkgname-gmp > + $pkgname-iconv > $pkgname-imap > $pkgname-intl > $pkgname-json > @@ -87,6 +88,7 @@ > source=3D"http://php.net/distributions/$_pkgreal-$pkgver.tar.bz2 > includedir.patch > pid_log.patch > fix-crypt.patch > + libintl-iconv.patch > " > > _apiver=3D"20151012" > @@ -142,6 +144,7 @@ _build() { > --with-gettext=3Dshared \ > --with-gmp=3Dshared \ > --with-mhash=3Dshared \ > + --with-iconv=3Dshared \ > --with-imap=3Dshared --with-imap-ssl \ > --enable-intl=3Dshared --with-icu-dir=3D/usr \ > --enable-json=3Dshared \ > @@ -187,7 +190,7 @@ build() { > # phpdbg > _build --enable-phpdbg \ > --enable-phpdbg \ > - --enable-phpdbg-webhelper \ > + --enable-phpdbg-webhelper \ > --enable-phpdbg-debug \ > --disable-cgi \ > --disable-cli \ > @@ -355,6 +358,7 @@ ftp() { _mv_ext ftp; } > gd() { _mv_ext gd; } > gettext() { _mv_ext gettext; } > gmp() { _mv_ext gmp; } > +iconv() { _mv_ext iconv; } > imap() { _mv_ext imap; } > intl() { _mv_ext intl; } > json() { _mv_ext json; } > @@ -400,7 +404,7 @@ xsl() { _mv_ext xsl $pkgname-dom;= } > zip() { _mv_ext zip; } > zlib() { _mv_ext zlib; } > > -md5sums=3D"0171201350941327399a5c3e678a86e5 php-7.0.4.tar.bz2 > +md5sums=3D"b15e6836babcbf0aa446678ee38f896b php-7.0.5.tar.bz2 > a340f27e83ed4482d2fbb98658ef71cb php7-fpm.initd > 25bde13e7894c2930d97fad68d5dd3b3 php7-fpm.logrotate > 47be6cd1ed92f21579e15bf2003a709f php7-module.conf > @@ -408,8 +412,9 @@ a340f27e83ed4482d2fbb98658ef71cb php7-fpm.init= d > 66f0037a029f9eed2b31d2e1d50f1860 tidy-buffio.patch > d872e633c9b33c3c9f629dd2edd2e5c5 includedir.patch > 6ba762ab7a105163b8e5b3913deae109 pid_log.patch > -7f12fabdd1494e1c994cadd167e401d8 fix-crypt.patch" > -sha256sums=3D"a246c503709c189ba8e1e22ed2cb22abc27da43a997ff1b3318e= 181baf529dcc=20 > php-7.0.4.tar.bz2 > +7f12fabdd1494e1c994cadd167e401d8 fix-crypt.patch > +c11468cd2c8524a2aefcd82b3b7d43d1 libintl-iconv.patch" > +sha256sums=3D"2c09af7fe64537ea795f098b9b542ead407ef83f7cdc65b37871= 15ccbbb51de9=20 > php-7.0.5.tar.bz2 > eca59e8b0498c1c93b35f9a5109ae56d0cda9d94822727d689371ccad31b3615=20 > php7-fpm.initd > 6e4406f21b69085714cdb9d9a67c08e27a1c737ab353f9813cb2fc268352d2c6=20 > php7-fpm.logrotate > 276c823ee666ea73b36d4e97174eeea05713125b61f7f8681e350453c4123143=20 > php7-module.conf > @@ -417,8 +422,9 @@ > f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab=20 > install-pear.p > 5dc8f32e5e2b1cd6317ada5a5adb9b5f0802ed6e0dbe065d7bfcc0f55d47e0d5=20 > tidy-buffio.patch > ea74966a23b1b54548ee35e9ccc2fc8d2b7c2285c385c44d6b23d9e2f25ea1a7=20 > includedir.patch > 0cca8729c64682387a8c44ed74f0966da697f2817152d8d05bb25bedc7eaafec=20 > pid_log.patch > -ffc10d325be398a5560fe9265e89f056ef2eba27981c98300be30bbc2f18a4ec=20 > fix-crypt.patch" > -sha512sums=3D"9d1dc761cdd9103a91299e01117c1790550e3b94e7694dcc2555= d83e5abe3d2170acd6226e8501c5f2a77b5c374b1c9f5ea009999d476818c2682a54def86= b96=20 > php-7.0.4.tar.bz2 > +ffc10d325be398a5560fe9265e89f056ef2eba27981c98300be30bbc2f18a4ec=20 > fix-crypt.patch > +2b181861240249236f13302ed5669810fd9e57928fad39583ee6d91fd73da2c2=20 > libintl-iconv.patch" > +sha512sums=3D"13d6dcd339211b22761586f2804c7470634e00b36e5e0b7bcf51= 88c017f950cbf49a2d4dd41047a7d44c70ed9474097a7290fc84ee3c26532e2ad8a2cbe70= 6d7=20 > php-7.0.5.tar.bz2 > 89076ab8e170a8f886b88bb30aa3e6a6b4463155a18ea53485cc9e3898c81afa3d= 01fb8403d28a45dc1680f09c645c2d81d8272bc8b9c7ced41e59b0ba226216=20 > php7-fpm.initd > cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72= 165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691=20 > php7-fpm.logrotate > fbf9a1572d37370ec0d126502e1d066e045a992484d8fc4f1e2ede330134c1a15f= 4029f29fa4daebd48eed78b045dc051ced69fbf1f11efc7ad81d884a639a99=20 > php7-module.conf > @@ -426,4 +432,5 @@ > f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a= 313d689c93976 > 6894c9cba7752a3406e774d9efc0e058c37433493c1c20101e9563bf247c112157= a67e306b06b9517b0422eca521f543d637a6cbd2cea7639e43f13d773b3d2b=20 > tidy-buffio.patch > 199aecdbd3b4035aabf5379c215f82412d3c98b79a1ee186944e7fe1f0ed6f4078= 9ea30e2355149491de6be34fc66c5e486e2a79a7e41ab2ae18706ef3ffe79b=20 > includedir.patch > 82231c7b27b4d044272857dc713674884715ed8e36e54be06faa5d2a949ba4bca5= 97628958a9c5683ec51c36e05a00f6be811c7e95112b0314c98528f584a8d6=20 > pid_log.patch > -b4badb1850bf99210498d6e27136ee275379b5c39c52904b292aed204d5c95a845= ed53db7dd56856121b3019ffefc7632419f9b2c45f431165ec0b5c5cbe974d=20 > fix-crypt.patch" > +b4badb1850bf99210498d6e27136ee275379b5c39c52904b292aed204d5c95a845= ed53db7dd56856121b3019ffefc7632419f9b2c45f431165ec0b5c5cbe974d=20 > fix-crypt.patch > +7bbcc016f37277f80b31cd6fc552c9cd411faad377fb7a02bb56097250574c4d48= 6a211cff75282cef6aa2be70e7b6e83a3e6b2a830e05a82c618a1b757b92cd=20 > libintl-iconv.patch" > diff --git a/testing/php7/libintl-iconv.patch > b/testing/php7/libintl-iconv.patch > new file mode 100644 > index 0000000..13c0e22 > --- /dev/null > +++ b/testing/php7/libintl-iconv.patch > @@ -0,0 +1,10 @@ > +--- php-7.0.4/ext/standard/string.c > ++++ php-7.0.4/ext/standard/string.c.new > +@@ -23,6 +23,7 @@ > + /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ > + > + #include > ++#include > + #include "php.h" > + #include "php_rand.h" > + #include "php_string.h" > -- > 2.8.0 > > > > --- > Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org > > Help: alpine-aports+help@lists.alpinelinux.org > > --- > > --------------020006020004050708030206 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable The php5 iconv patch in ~/aports/main/php/gd-iconv.patch also applies ok in php7

Timo prefers that to be applied instead of mine.

Stuart.

On 04/04/2016 07:48 PM, Valery Kartel wrote:
I join your patch to my newly created one to add i= t all in one shot

2016-04-03 20:23 GMT+03:00 Stuart Cardall <developer@it-offshore.co.uk>:
---
Changes v1 -> v2:
=C2=A0- pkgrel bumped correctly
=C2=A0=3D this should apply cleanly after Valery's 7.0.5 patc= h sent today

=C2=A0testing/php7/APKBUILD=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 | 27 +++++++++++++++++----------
=C2=A0testing/php7/libintl-iconv.patch | 10 ++++++++++
=C2=A02 files changed, 27 insertions(+), 10 deletions(-)
=C2=A0create mode 100644 testing/php7/libintl-iconv.patch

diff --git a/testing/php7/APKBUILD b/testing/php7/APKBUILD index 34a2408..1b62a93 100644
--- a/testing/php7/APKBUILD
+++ b/testing/php7/APKBUILD
@@ -3,7 +3,7 @@
=C2=A0pkgname=3Dphp7
=C2=A0_pkgreal=3Dphp
=C2=A0pkgver=3D7.0.5
-pkgrel=3D0
+pkgrel=3D1
=C2=A0pkgdesc=3D"The PHP language runtime engine - 7th branch= "
=C2=A0url=3D"http://www.php.net/"
=C2=A0arch=3D"x86_64 armhf"
@@ -16,8 +16,8 @@ makedepends=3D"autoconf bison re2c apache2-dev libxml2-dev libxslt-dev libzip-dev
=C2=A0 =C2=A0 =C2=A0 =C2=A0 libical-dev openssl-dev openldap-= dev net-snmp-dev db-dev krb5-dev gdbm-dev sqlite-dev
=C2=A0 =C2=A0 =C2=A0 =C2=A0 freetds-dev mariadb-dev postgresq= l-dev unixodbc-dev freetype-dev tidyhtml-dev libxpm-dev
=C2=A0 =C2=A0 =C2=A0 =C2=A0 libpng-dev libwebp-dev libjpeg-tu= rbo-dev libmcrypt-dev libmbfl-dev gsoap-dev recode-dev
-=C2=A0 =C2=A0 =C2=A0 =C2=A0readline-dev mhash-dev paxmark -"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0readline-dev mhash-dev paxmark ge= ttext-dev
+=C2=A0 =C2=A0 =C2=A0 =C2=A0"

=C2=A0subpackages=3D"$pkgname-dev $pkgname-doc
=C2=A0 =C2=A0 =C2=A0 =C2=A0 $pkgname-apache2 $pkgname-phpdbg = $pkgname-embed $pkgname-litespeed $pkgname-cgi $pkgname-fpm
@@ -35,6 +35,7 @@ subpackages=3D"$pkgname-dev $pkgname-doc =C2=A0 =C2=A0 =C2=A0 =C2=A0 $pkgname-gd
=C2=A0 =C2=A0 =C2=A0 =C2=A0 $pkgname-gettext
=C2=A0 =C2=A0 =C2=A0 =C2=A0 $pkgname-gmp
+=C2=A0 =C2=A0 =C2=A0 =C2=A0$pkgname-iconv
=C2=A0 =C2=A0 =C2=A0 =C2=A0 $pkgname-imap
=C2=A0 =C2=A0 =C2=A0 =C2=A0 $pkgname-intl
=C2=A0 =C2=A0 =C2=A0 =C2=A0 $pkgname-json
@@ -87,6 +88,7 @@ source=3D"http://php.net/distrib= utions/$_pkgreal-$pkgver.tar.bz2
=C2=A0 =C2=A0 =C2=A0 =C2=A0 includedir.patch
=C2=A0 =C2=A0 =C2=A0 =C2=A0 pid_log.patch
=C2=A0 =C2=A0 =C2=A0 =C2=A0 fix-crypt.patch
+=C2=A0 =C2=A0 =C2=A0 =C2=A0libintl-iconv.patch
=C2=A0 =C2=A0 =C2=A0 =C2=A0 "

=C2=A0_apiver=3D"20151012"
@@ -142,6 +144,7 @@ _build() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --wit= h-gettext=3Dshared \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --wit= h-gmp=3Dshared \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --wit= h-mhash=3Dshared \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--wit= h-iconv=3Dshared \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --wit= h-imap=3Dshared --with-imap-ssl \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --ena= ble-intl=3Dshared --with-icu-dir=3D/usr \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --ena= ble-json=3Dshared \
@@ -187,7 +190,7 @@ build() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 # phpdbg
=C2=A0 =C2=A0 =C2=A0 =C2=A0 _build --enable-phpdbg \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --ena= ble-phpdbg \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--ena= ble-phpdbg-webhelper \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--ena= ble-phpdbg-webhelper \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --ena= ble-phpdbg-debug \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --dis= able-cgi \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --dis= able-cli \
@@ -355,6 +358,7 @@ ftp()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0{ _mv_ext ftp; }
=C2=A0gd()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{ _mv_ext = gd; }
=C2=A0gettext()=C2=A0 =C2=A0 =C2=A0 { _mv_ext gettext; }
=C2=A0gmp()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 { _mv_ext gmp; = }
+iconv()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{ _mv_ext iconv; }<= br> =C2=A0imap()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{ _mv_ext imap;= }
=C2=A0intl()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{ _mv_ext intl;= }
=C2=A0json()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{ _mv_ext json;= }
@@ -400,7 +404,7 @@ xsl()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0{ _mv_ext xsl $pkgname-dom; }
=C2=A0zip()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 { _mv_ext zip; = }
=C2=A0zlib()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{ _mv_ext zlib;= }

-md5sums=3D"0171201350941327399a5c3e678a86e5=C2=A0 php-7.0.4.tar.bz2
+md5sums=3D"b15e6836babcbf0aa446678ee38f896b=C2=A0 php-7.0.5.tar.bz2
=C2=A0a340f27e83ed4482d2fbb98658ef71cb=C2=A0 php7-fpm.initd =C2=A025bde13e7894c2930d97fad68d5dd3b3=C2=A0 php7-fpm.logrota= te
=C2=A047be6cd1ed92f21579e15bf2003a709f=C2=A0 php7-module.conf=
@@ -408,8 +412,9 @@ a340f27e83ed4482d2fbb98658ef71cb=C2=A0 php7-fpm.initd
=C2=A066f0037a029f9eed2b31d2e1d50f1860=C2=A0 tidy-buffio.patc= h
=C2=A0d872e633c9b33c3c9f629dd2edd2e5c5=C2=A0 includedir.patch=
=C2=A06ba762ab7a105163b8e5b3913deae109=C2=A0 pid_log.patch -7f12fabdd1494e1c994cadd167e401d8=C2=A0 fix-crypt.patch"
-sha256sums=3D"a246c503709c189ba8e1e22ed2cb22abc27da43a997ff1= b3318e181baf529dcc=C2=A0 php-7.0.4.tar.bz2
+7f12fabdd1494e1c994cadd167e401d8=C2=A0 fix-crypt.patch
+c11468cd2c8524a2aefcd82b3b7d43d1=C2=A0 libintl-iconv.patch"<= br> +sha256sums=3D"2c09af7fe64537ea795f098b9b542ead407ef83f7cdc65= b3787115ccbbb51de9=C2=A0 php-7.0.5.tar.bz2
=C2=A0eca59e8b0498c1c93b35f9a5109ae56d0cda9d94822727d689371cc= ad31b3615=C2=A0 php7-fpm.initd
=C2=A06e4406f21b69085714cdb9d9a67c08e27a1c737ab353f9813cb2fc2= 68352d2c6=C2=A0 php7-fpm.logrotate
=C2=A0276c823ee666ea73b36d4e97174eeea05713125b61f7f8681e35045= 3c4123143=C2=A0 php7-module.conf
@@ -417,8 +422,9 @@ f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099= bab=C2=A0 install-pear.p
=C2=A05dc8f32e5e2b1cd6317ada5a5adb9b5f0802ed6e0dbe065d7bfcc0f= 55d47e0d5=C2=A0 tidy-buffio.patch
=C2=A0ea74966a23b1b54548ee35e9ccc2fc8d2b7c2285c385c44d6b23d9e= 2f25ea1a7=C2=A0 includedir.patch
=C2=A00cca8729c64682387a8c44ed74f0966da697f2817152d8d05bb25be= dc7eaafec=C2=A0 pid_log.patch
-ffc10d325be398a5560fe9265e89f056ef2eba27981c98300be30bbc2f18= a4ec=C2=A0 fix-crypt.patch"
-sha512sums=3D"9d1dc761cdd9103a91299e01117c1790550e3b94e7694d= cc2555d83e5abe3d2170acd6226e8501c5f2a77b5c374b1c9f5ea009999d476818c2682a5= 4def86b96=C2=A0 php-7.0.4.tar.bz2
+ffc10d325be398a5560fe9265e89f056ef2eba27981c98300be30bbc2f18= a4ec=C2=A0 fix-crypt.patch
+2b181861240249236f13302ed5669810fd9e57928fad39583ee6d91fd73d= a2c2=C2=A0 libintl-iconv.patch"
+sha512sums=3D"13d6dcd339211b22761586f2804c7470634e00b36e5e0b= 7bcf5188c017f950cbf49a2d4dd41047a7d44c70ed9474097a7290fc84ee3c26532e2ad8a= 2cbe706d7=C2=A0 php-7.0.5.tar.bz2
=C2=A089076ab8e170a8f886b88bb30aa3e6a6b4463155a18ea53485cc9e3= 898c81afa3d01fb8403d28a45dc1680f09c645c2d81d8272bc8b9c7ced41e59b0ba226216= =C2=A0 php7-fpm.initd
=C2=A0cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400= baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691= =C2=A0 php7-fpm.logrotate
=C2=A0fbf9a1572d37370ec0d126502e1d066e045a992484d8fc4f1e2ede3= 30134c1a15f4029f29fa4daebd48eed78b045dc051ced69fbf1f11efc7ad81d884a639a99= =C2=A0 php7-module.conf
@@ -426,4 +432,5 @@ f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d68= 9c93976
=C2=A06894c9cba7752a3406e774d9efc0e058c37433493c1c20101e9563b= f247c112157a67e306b06b9517b0422eca521f543d637a6cbd2cea7639e43f13d773b3d2b= =C2=A0 tidy-buffio.patch
=C2=A0199aecdbd3b4035aabf5379c215f82412d3c98b79a1ee186944e7fe= 1f0ed6f40789ea30e2355149491de6be34fc66c5e486e2a79a7e41ab2ae18706ef3ffe79b= =C2=A0 includedir.patch
=C2=A082231c7b27b4d044272857dc713674884715ed8e36e54be06faa5d2= a949ba4bca597628958a9c5683ec51c36e05a00f6be811c7e95112b0314c98528f584a8d6= =C2=A0 pid_log.patch
-b4badb1850bf99210498d6e27136ee275379b5c39c52904b292aed204d5c= 95a845ed53db7dd56856121b3019ffefc7632419f9b2c45f431165ec0b5c5cbe974d=C2=A0 fix-crypt.patch"
+b4badb1850bf99210498d6e27136ee275379b5c39c52904b292aed204d5c= 95a845ed53db7dd56856121b3019ffefc7632419f9b2c45f431165ec0b5c5cbe974d=C2=A0 fix-crypt.patch
+7bbcc016f37277f80b31cd6fc552c9cd411faad377fb7a02bb5609725057= 4c4d486a211cff75282cef6aa2be70e7b6e83a3e6b2a830e05a82c618a1b757b92cd=C2=A0 libintl-iconv.patch"
diff --git a/testing/php7/libintl-iconv.patch b/testing/php7/libintl-iconv.patch
new file mode 100644
index 0000000..13c0e22
--- /dev/null
+++ b/testing/php7/libintl-iconv.patch
@@ -0,0 +1,10 @@
+--- php-7.0.4/ext/standard/string.c
++++ php-7.0.4/ext/standard/string.c.new
+@@ -23,6 +23,7 @@
+ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ +
+ #include <stdio.h>
++#include <libintl.h>
+ #include "php.h"
+ #include "php_rand.h"
+ #include "php_string.h"
--
2.8.0



---
Unsubscribe:=C2=A0 alpine-aports+unsubscribe@lists.alpinelinux.org
Help:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0alpine-aports+help@lists.alpinelinux.org
---



--------------020006020004050708030206-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---