X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-vk0-f65.google.com (mail-vk0-f65.google.com [209.85.213.65]) by lists.alpinelinux.org (Postfix) with ESMTP id CA2E45C4695 for ; Mon, 3 Apr 2017 14:11:30 +0000 (GMT) Received: by mail-vk0-f65.google.com with SMTP id j137so18263253vke.0 for ; Mon, 03 Apr 2017 07:11:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=xjI7IoTkMr15LfuQ1ZBhNMd2wpatyqmex5g3JhWrB0s=; b=iHdYtofPDNgI+PNnNFX2zxsa+0VUYAFQKXeuHPQ4ciZjLes0r1ZUfrSdVx+WtUxihy o5ucgY33fH3CYbznwOk4r9bmEL7UkfhdV4CqsNaQ4HVEPpotN5FdQMntjmIivzTFsK5R asCtU8o+ux0z+m/PLtTJC4Ixelxr1CUWC5xapfr5zg/wTF9StGeloZvyBjitKe8EoNCS f2V4nMX1Rbr5V2jrGVXmEjmxsJTEDPanGBuCPbnAUrx6rPDyw3Shj+ttMO1a7ilfHXjf YVMrNQTX8+cIuxTMeX5oKS8S1qHqMNOll8Gtxm7z27RPBL/7yHSDfWnaLrnBGJw1ElRo tPpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=xjI7IoTkMr15LfuQ1ZBhNMd2wpatyqmex5g3JhWrB0s=; b=cPxRxRpEM/BNgiBsQgoRKbScsanpU/44+qTCll+7X4w59q3SQ6WoEuCrJ9UXOQZBxb /fi9qaLYG80AU/1gRv4GjsacxXxIaQa5kzotTxUA5/ctjysJLw8ui9L0tq0se7Pe0rjN B5M323vfx60lYbsMyriMCwT5XR0Tf/Q4350/hbWu7UfXR1KjbiAx1BedxZb0Qm//SeoC O+2oxBQCbrsKKK7wNDQNmOCU+jry96Yf8f84SOlFmW4wZSBYH9M/kT7/IFFEt+eUsEWR zRG7smOdBlv6BYoi+8PQYimLzqKoBwjrL3OucMDCfjFBLnifir35yZr1WvtSQOkERVQx rA8Q== X-Gm-Message-State: AFeK/H3RyQxY+nIMmwpz7ysLEgEAw+NDihUCe62FBWnVyIyjt1939vU/kqhV+aodd3R8xgUZD0LryeOo76DNRg== X-Received: by 10.31.76.133 with SMTP id z127mr1722912vka.154.1491228690158; Mon, 03 Apr 2017 07:11:30 -0700 (PDT) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Received: by 10.103.127.149 with HTTP; Mon, 3 Apr 2017 07:11:28 -0700 (PDT) Received: by 10.103.127.149 with HTTP; Mon, 3 Apr 2017 07:11:28 -0700 (PDT) In-Reply-To: <897a3832-3415-2b12-e38c-888ce275c4c8@gmail.com> References: <20170330132903.15462-1-valery.kartel@gmail.com> <897a3832-3415-2b12-e38c-888ce275c4c8@gmail.com> From: Valery Kartel Date: Mon, 3 Apr 2017 17:11:28 +0300 Message-ID: Subject: Re: [alpine-aports] [PATCH] community/php5: fix conflict with php7 To: Leonardo Arena Cc: alpine-aports , Jakub Jirutka Content-Type: multipart/alternative; boundary=001a114dacea5b1a84054c43bc1b --001a114dacea5b1a84054c43bc1b Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi, I made php-xdebug and php-couchbase separated for php5 and php7 in PR #1061. But @jirutka wants to see it combined as it is. So, I made patches to remove php5/7 conflict and combine it again in #1061 3 =D0=B0=D0=BF=D1=80. 2017 =D0=B3. 15:26 =D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0= =BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C "Leonardo Arena" =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BB: > Hi, > > On 30/03/2017 15:29, Valery Kartel wrote: > > fix conflict if both php5-dev, php7-dev would be installed > > fix php5-dev depends (add autoconf) > > fix extension depends > > add tidy extension > > --- > > community/php5/APKBUILD | 42 ++++++++++++++++++++++++------ > ---------- > > community/php5/tidy-buffio.patch | 11 +++++++++++ > > 2 files changed, 36 insertions(+), 17 deletions(-) > > create mode 100644 community/php5/tidy-buffio.patch > > > > diff --git a/community/php5/APKBUILD b/community/php5/APKBUILD > > index c8a9289fe8..cdcbb8f86a 100644 > > --- a/community/php5/APKBUILD > > +++ b/community/php5/APKBUILD > > @@ -4,15 +4,16 @@ > > # Maintainer: Matt Smith > > pkgname=3Dphp5 > > pkgver=3D5.6.30 > > -pkgrel=3D0 > > +pkgrel=3D1 > > pkgdesc=3D"The PHP language runtime engine" > > url=3D"http://www.php.net/" > > arch=3D"all" > > license=3D"PHP-3" > > depends=3D"$pkgname-cli" > > -depends_dev=3D"$pkgname-cli pcre-dev" > > +depends_dev=3D"$pkgname-cli autoconf pcre-dev" > > install=3D"$pkgname.post-upgrade" > > provides=3D"php" > > +replaces=3D"php7" > > shouldn't be "conflict" here? We don't want to end up with a PHP > environment with binaries from different versions. > > Looks like that only php-xdebug and php-couchbase try to build packages > for both PHP versions (and are currently broken because of this issue) > and needs to be updated to build either with PHP 5 or 7 or make two > separate packages. > > Same thing with the other patch for php7. > > Thoughts? > > |_eo > > > > makedepends=3D" > > $depends_dev > > apache2-dev > > @@ -26,6 +27,7 @@ makedepends=3D" > > expat-dev > > freetds-dev > > freetype-dev > > + tidyhtml-dev > > gdbm-dev > > gettext-dev > > gmp-dev > > @@ -97,6 +99,7 @@ subpackages=3D"$pkgname-dbg $pkgname-dev $pkgname-doc > $pkgname-common::noarch $pkg > > $pkgname-sysvmsg > > $pkgname-sysvsem > > $pkgname-sysvshm > > + $pkgname-tidy > > $pkgname-xml > > $pkgname-xmlreader > > $pkgname-xmlrpc > > @@ -114,6 +117,7 @@ source=3D"http://php.net/ > distributions/php-$pkgver.tar.bz2 > > php5-module.conf > > php-install-pear-xml.patch > > gd-iconv.patch > > + tidy-buffio.patch > > " > > > > _apiver=3D"20131106" > > @@ -232,6 +236,7 @@ build() { > > --enable-sysvsem=3Dshared \ > > --enable-sysvshm=3Dshared \ > > --with-unixODBC=3Dshared,/usr \ > > + --with-tidy=3Dshared \ > > --enable-xml=3Dshared \ > > --enable-xmlreader=3Dshared \ > > --with-xmlrpc=3Dshared \ > > @@ -311,6 +316,7 @@ package() { > > > > dev() { > > default_dev || return 1 > > + replaces=3D"$replaces-dev" > > > > mkdir -p "$subpkgdir"/usr/lib/php > > mv "$pkgdir"/usr/lib/php/build \ > > @@ -321,6 +327,8 @@ dev() { > > doc() { > > # man pages > > default_doc || return 1 > > + depends=3D > > + replaces=3D > > cd "$srcdir"/php-$pkgver > > > > # doc files > > @@ -334,8 +342,8 @@ doc() { > > > > common() { > > pkgdesc=3D"PHP Common Files" > > - depends=3D"" > > - > > + depends=3D > > + replaces=3D > > cd "$srcdir"/php-$pkgver > > > > install -D -m644 php.ini-production "$subpkgdir"$_confdir/php.ini > > @@ -348,6 +356,7 @@ common() { > > cgi() { > > pkgdesc=3D"PHP Common Gateway Interface (CGI)" > > depends=3D"$pkgname-common" > > + replaces=3D"$replaces-cgi" > > mkdir -p "$subpkgdir"/usr/bin > > mv "$pkgdir"/usr/bin/php-cgi* "$subpkgdir"/usr/bin/ > > } > > @@ -365,6 +374,7 @@ cli() { > > fpm() { > > pkgdesc=3D"PHP FastCGI Process Manager (FPM)" > > depends=3D"$pkgname-common" > > + replaces=3D > > mkdir -p "$subpkgdir"$_confdir/fpm.d > > install -D -m755 "$srcdir"/build-fpm/sapi/fpm/php-fpm \ > > "$subpkgdir"/usr/bin/php-fpm || return 1 > > @@ -384,6 +394,7 @@ fpm() { > > apache2() { > > pkgdesc=3D"PHP Module for Apache2" > > depends=3D"$pkgname-common apache2" > > + replaces=3D > > install -D -m755 "$srcdir"/build-apache2/libs/libphp5.so \ > > "$subpkgdir"/usr/lib/apache2/libphp5.so || return 1 > > install -D -m644 "$srcdir"/php5-module.conf \ > > @@ -393,6 +404,7 @@ apache2() { > > embed() { > > pkgdesc=3D"PHP Embed Library" > > depends=3D"$pkgname-common" > > + replaces=3D > > mkdir -p "$subpkgdir"/usr/lib > > mv "$pkgdir"/usr/lib/libphp5.so "$subpkgdir"/usr/lib/ > > } > > @@ -400,6 +412,7 @@ embed() { > > pear() { > > pkgdesc=3D"PHP Extension and Application Repository (PEAR)" > > depends=3D"$pkgname-cli $pkgname-xml" > > + replaces=3D"$replaces-pear" > > mkdir -p "$subpkgdir"/usr/share "$subpkgdir"$_confdir \ > > "$subpkgdir"/usr/bin > > mv "$pkgdir"/usr/bin/pecl \ > > @@ -414,6 +427,8 @@ pear() { > > > > phpdbg() { > > pkgdesc=3D"Interactive PHP debugger" > > + depends=3D"$pkgname-common" > > + replaces=3D"$replaces-phpdbg" > > mkdir -p "$subpkgdir"/usr/bin > > mv "$pkgdir"/usr/bin/phpdbg* "$subpkgdir"/usr/bin/ > > } > > @@ -424,10 +439,11 @@ _mv_ext() { > > pkgdesc=3D"${ext} extension for PHP" > > > > # extension dependencies > > + depends=3D"$pkgname-common" > > if [ -n "${2-}" ]; then > > - depends=3D"${2-}" > > + depends=3D"$depends ${2-}" > > fi > > - depends=3D"${pkgname} ${depends}" > > + replaces=3D > > > > # work around dependency issue > > # https://bugs.alpinelinux.org/issues/1848 > > @@ -493,6 +509,7 @@ sqlite3() { _mv_ext sqlite3; } > > sysvmsg() { _mv_ext sysvmsg; } > > sysvsem() { _mv_ext sysvsem; } > > sysvshm() { _mv_ext sysvshm; } > > +tidy() { _mv_ext tidy; } > > xml() { _mv_ext xml; } > > xmlreader() { _mv_ext xmlreader $pkgname-dom; } > > xmlrpc() { _mv_ext xmlrpc $pkgname-xml; } > > @@ -504,18 +521,9 @@ pdo_dblib() { _mv_ext pdo_dblib "$pkgname-pdo > freetds"; } > > wddx() { _mv_ext wddx; } > > opcache() { _mv_ext opcache; } > > > > -md5sums=3D"67566191957b5fcac8567a5a9bbdced7 php-5.6.30.tar.bz2 > > -63b16caff0d7aa881a31a1e02f3080c3 php-fpm.initd > > -67719f428f44ec004da18705cbabe2ee php5-module.conf > > -483bc0a85c50a9a9aedbe14a19ed4526 php-install-pear-xml.patch > > -7200972a23adae799921c4ca20ff0074 gd-iconv.patch" > > -sha256sums=3D"a105c293fa1dbff118b5b0ca74029e > 6c461f8c78f49b337a2a98be9e32c27906 php-5.6.30.tar.bz2 > > -be9bfdab10a994fe553119b181be7015325a7618de454a58bdee06bcfb711454 > php-fpm.initd > > -ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba392257f > php5-module.conf > > -f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab > php-install-pear-xml.patch > > -98de37c650a36870a543225f6a6b81813ccd447a484f0881511be4eb6e901844 > gd-iconv.patch" > > sha512sums=3D"12734d786cca5767b8b8838affbe1c > 3d578dd179c8d5339653d905658562c5fdf39a88349213b1340f32032070 > 0a5378aed617447b6e15909019788a49ad2da0 php-5.6.30.tar.bz2 > > 1f5cb18f85a2e279e24344d993f5c51c7bfbcbecc0e9bfcf075bebd1b0b8 > 93e2ffb793d95a632c9333033597d4b4f74840bfd00520a6dc700444d1a054225da1 > php-fpm.initd > > 895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00a > 18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102 > php5-module.conf > > f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c > 8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 > php-install-pear-xml.patch > > -6ecd0be2da1dc5b1d7512e46a2a5cd107a8b2a8c364efc9c624a7d6b2ab0 > 81685a329c94c22c970dc14c5c1115f702c512e97ae858da1bc69c6423323dbeeba2 > gd-iconv.patch" > > +6ecd0be2da1dc5b1d7512e46a2a5cd107a8b2a8c364efc9c624a7d6b2ab0 > 81685a329c94c22c970dc14c5c1115f702c512e97ae858da1bc69c6423323dbeeba2 > gd-iconv.patch > > +6894c9cba7752a3406e774d9efc0e058c37433493c1c20101e9563bf247c > 112157a67e306b06b9517b0422eca521f543d637a6cbd2cea7639e43f13d773b3d2b > tidy-buffio.patch" > > diff --git a/community/php5/tidy-buffio.patch > b/community/php5/tidy-buffio.patch > > new file mode 100644 > > index 0000000000..c15f9540a4 > > --- /dev/null > > +++ b/community/php5/tidy-buffio.patch > > @@ -0,0 +1,11 @@ > > +--- a/ext/tidy/tidy.c > > ++++ b/ext/tidy/tidy.c > > +@@ -31,7 +31,7 @@ > > + #include "ext/standard/info.h" > > + > > + #include "tidy.h" > > +-#include "buffio.h" > > ++#include "tidybuffio.h" > > + > > + /* compatibility with older versions of libtidy */ > > + #ifndef TIDY_CALL > > > > > --001a114dacea5b1a84054c43bc1b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi, I made php-xdebug and php-couchbase separated for php= 5 and php7 in PR #1061. But @jirutka wants to see it combined as it is. So,= I made patches to remove php5/7 conflict and combine it again in #1061

3 =D0=B0=D0=BF= =D1=80. 2017 =D0=B3. 15:26 =D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0= =D1=82=D0=B5=D0=BB=D1=8C "Leonardo Arena" <rnalrd@gmail.com> =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0= =B0=D0=BB:
Hi,

On 30/03/2017 15:29, Valery Kartel wrote:
> fix conflict if both php5-dev, php7-dev would be installed
> fix php5-dev depends (add autoconf)
> fix extension depends
> add tidy extension
> ---
>=C2=A0 community/php5/APKBUILD=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 42 += +++++++++++++++++++++++----------------
>=C2=A0 community/php5/tidy-buffio.patch | 11 +++++++++++
>=C2=A0 2 files changed, 36 insertions(+), 17 deletions(-)
>=C2=A0 create mode 100644 community/php5/tidy-buffio.patch
>
> diff --git a/community/php5/APKBUILD b/community/php5/APKBUILD
> index c8a9289fe8..cdcbb8f86a 100644
> --- a/community/php5/APKBUILD
> +++ b/community/php5/APKBUILD
> @@ -4,15 +4,16 @@
>=C2=A0 # Maintainer: Matt Smith <mcs@darkregion.net>
>=C2=A0 pkgname=3Dphp5
>=C2=A0 pkgver=3D5.6.30
> -pkgrel=3D0
> +pkgrel=3D1
>=C2=A0 pkgdesc=3D"The PHP language runtime engine"
>=C2=A0 url=3D"http://www.php.net/"
>=C2=A0 arch=3D"all"
>=C2=A0 license=3D"PHP-3"
>=C2=A0 depends=3D"$pkgname-cli"
> -depends_dev=3D"$pkgname-cli pcre-dev"
> +depends_dev=3D"$pkgname-cli autoconf pcre-dev"
>=C2=A0 install=3D"$pkgname.post-upgrade"
>=C2=A0 provides=3D"php"
> +replaces=3D"php7"

shouldn't be "conflict" here? We don't want to end up wit= h a PHP
environment with binaries from different versions.

Looks like that only php-xdebug and php-couchbase try to build packages
for both PHP versions (and are currently broken because of this issue)
and needs to be updated to build either with PHP 5 or 7 or make two
separate packages.

Same thing with the other patch for php7.

Thoughts?

|_eo


>=C2=A0 makedepends=3D"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0$depends_dev
>=C2=A0 =C2=A0 =C2=A0 =C2=A0apache2-dev
> @@ -26,6 +27,7 @@ makedepends=3D"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0expat-dev
>=C2=A0 =C2=A0 =C2=A0 =C2=A0freetds-dev
>=C2=A0 =C2=A0 =C2=A0 =C2=A0freetype-dev
> +=C2=A0 =C2=A0 =C2=A0tidyhtml-dev
>=C2=A0 =C2=A0 =C2=A0 =C2=A0gdbm-dev
>=C2=A0 =C2=A0 =C2=A0 =C2=A0gettext-dev
>=C2=A0 =C2=A0 =C2=A0 =C2=A0gmp-dev
> @@ -97,6 +99,7 @@ subpackages=3D"$pkgname-dbg $pkgname-dev $pkgna= me-doc $pkgname-common::noarch $pkg
>=C2=A0 =C2=A0 =C2=A0 =C2=A0$pkgname-sysvmsg
>=C2=A0 =C2=A0 =C2=A0 =C2=A0$pkgname-sysvsem
>=C2=A0 =C2=A0 =C2=A0 =C2=A0$pkgname-sysvshm
> +=C2=A0 =C2=A0 =C2=A0$pkgname-tidy
>=C2=A0 =C2=A0 =C2=A0 =C2=A0$pkgname-xml
>=C2=A0 =C2=A0 =C2=A0 =C2=A0$pkgname-xmlreader
>=C2=A0 =C2=A0 =C2=A0 =C2=A0$pkgname-xmlrpc
> @@ -114,6 +117,7 @@ source=3D"http://php.n= et/distributions/php-$pkgver.tar.bz2
>=C2=A0 =C2=A0 =C2=A0 =C2=A0php5-module.conf
>=C2=A0 =C2=A0 =C2=A0 =C2=A0php-install-pear-xml.patch
>=C2=A0 =C2=A0 =C2=A0 =C2=A0gd-iconv.patch
> +=C2=A0 =C2=A0 =C2=A0tidy-buffio.patch
>=C2=A0 =C2=A0 =C2=A0 =C2=A0"
>
>=C2=A0 _apiver=3D"20131106"
> @@ -232,6 +236,7 @@ build() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--enable-sysvsem= =3Dshared \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--enable-sysvshm= =3Dshared \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-un= ixODBC=3Dshared,/usr \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-tidy=3Dshared = \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--enable-xml=3Ds= hared \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--enable-xmlread= er=3Dshared \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-xm= lrpc=3Dshared \
> @@ -311,6 +316,7 @@ package() {
>
>=C2=A0 dev() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0default_dev || return 1
> +=C2=A0 =C2=A0 =C2=A0replaces=3D"$replaces-dev"
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr/lib/php<= br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/lib/php/build \ > @@ -321,6 +327,8 @@ dev() {
>=C2=A0 doc() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0# man pages
>=C2=A0 =C2=A0 =C2=A0 =C2=A0default_doc || return 1
> +=C2=A0 =C2=A0 =C2=A0depends=3D
> +=C2=A0 =C2=A0 =C2=A0replaces=3D
>=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$srcdir"/php-$pkgver
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0# doc files
> @@ -334,8 +342,8 @@ doc() {
>
>=C2=A0 common() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"PHP Common Files"
> -=C2=A0 =C2=A0 =C2=A0depends=3D""
> -
> +=C2=A0 =C2=A0 =C2=A0depends=3D
> +=C2=A0 =C2=A0 =C2=A0replaces=3D
>=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$srcdir"/php-$pkgver
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0install -D -m644 php.ini-production "$s= ubpkgdir"$_confdir/php.ini
> @@ -348,6 +356,7 @@ common() {
>=C2=A0 cgi() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"PHP Common Gateway Interface= (CGI)"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-common"
> +=C2=A0 =C2=A0 =C2=A0replaces=3D"$replaces-cgi"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr/bin
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/bin/php-cgi* &quo= t;$subpkgdir"/usr/bin/
>=C2=A0 }
> @@ -365,6 +374,7 @@ cli() {
>=C2=A0 fpm() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"PHP FastCGI Process Manager = (FPM)"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-common"
> +=C2=A0 =C2=A0 =C2=A0replaces=3D
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"$_confdir/fpm= .d
>=C2=A0 =C2=A0 =C2=A0 =C2=A0install -D -m755 "$srcdir"/build-f= pm/sapi/fpm/php-fpm \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$subpkgdir= "/usr/bin/php-fpm || return 1
> @@ -384,6 +394,7 @@ fpm() {
>=C2=A0 apache2() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"PHP Module for Apache2"=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-common apache2"= ;
> +=C2=A0 =C2=A0 =C2=A0replaces=3D
>=C2=A0 =C2=A0 =C2=A0 =C2=A0install -D -m755 "$srcdir"/build-a= pache2/libs/libphp5.so \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$subpkgdir= "/usr/lib/apache2/libphp5.so || return 1
>=C2=A0 =C2=A0 =C2=A0 =C2=A0install -D -m644 "$srcdir"/php5-mo= dule.conf \
> @@ -393,6 +404,7 @@ apache2() {
>=C2=A0 embed() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"PHP Embed Library"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-common"
> +=C2=A0 =C2=A0 =C2=A0replaces=3D
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr/lib
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/lib/libphp5.so &q= uot;$subpkgdir"/usr/lib/
>=C2=A0 }
> @@ -400,6 +412,7 @@ embed() {
>=C2=A0 pear() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"PHP Extension and Applicatio= n Repository (PEAR)"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-cli $pkgname-xml&qu= ot;
> +=C2=A0 =C2=A0 =C2=A0replaces=3D"$replaces-pear"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr/share &q= uot;$subpkgdir"$_confdir \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$subpkgdir= "/usr/bin
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/bin/pecl \
> @@ -414,6 +427,8 @@ pear() {
>
>=C2=A0 phpdbg() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"Interactive PHP debugger&quo= t;
> +=C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-common"
> +=C2=A0 =C2=A0 =C2=A0replaces=3D"$replaces-phpdbg"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr/bin
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/bin/phpdbg* "= ;$subpkgdir"/usr/bin/
>=C2=A0 }
> @@ -424,10 +439,11 @@ _mv_ext() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"${ext} extension for PHP&quo= t;
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0# extension dependencies
> +=C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-common"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0if [ -n "${2-}" ]; then
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"${2-}= "
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$depe= nds ${2-}"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0fi
> -=C2=A0 =C2=A0 =C2=A0depends=3D"${pkgname} ${depends}"
> +=C2=A0 =C2=A0 =C2=A0replaces=3D
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0# work around dependency issue
>=C2=A0 =C2=A0 =C2=A0 =C2=A0# https://bugs.alpinelinux.or= g/issues/1848
> @@ -493,6 +509,7 @@ sqlite3() { _mv_ext sqlite3; }
>=C2=A0 sysvmsg()=C2=A0 =C2=A0 { _mv_ext sysvmsg; }
>=C2=A0 sysvsem()=C2=A0 =C2=A0 { _mv_ext sysvsem; }
>=C2=A0 sysvshm()=C2=A0 =C2=A0 { _mv_ext sysvshm; }
> +tidy()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{ _mv_ex= t tidy; }
>=C2=A0 xml()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 { _= mv_ext xml; }
>=C2=A0 xmlreader()=C2=A0 { _mv_ext xmlreader $pkgname-dom; }
>=C2=A0 xmlrpc()=C2=A0 =C2=A0 =C2=A0{ _mv_ext xmlrpc $pkgname-xml; }
> @@ -504,18 +521,9 @@ pdo_dblib()=C2=A0 =C2=A0 =C2=A0 { _mv_ext pdo_dbl= ib "$pkgname-pdo freetds"; }
>=C2=A0 wddx()=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{ _= mv_ext wddx; }
>=C2=A0 opcache()=C2=A0 =C2=A0 { _mv_ext opcache; }
>
> -md5sums=3D"67566191957b5fcac8567a5a9bbdced7=C2=A0 php-= 5.6.30.tar.bz2
> -63b16caff0d7aa881a31a1e02f3080c3=C2=A0 php-fpm.initd
> -67719f428f44ec004da18705cbabe2ee=C2=A0 php5-module.conf
> -483bc0a85c50a9a9aedbe14a19ed4526=C2=A0 php-install-pear-xml= .patch
> -7200972a23adae799921c4ca20ff0074=C2=A0 gd-iconv.patch"=
> -sha256sums=3D"a105c293fa1dbff118b5b0ca74029e6c461f8c78= f49b337a2a98be9e32c27906=C2=A0 php-5.6.30.tar.bz2
> -be9bfdab10a994fe553119b181be7015325a7618de454a58bdee06bcfb7= 11454=C2=A0 php-fpm.initd
> -ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba39= 2257f=C2=A0 php5-module.conf
> -f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d0= 99bab=C2=A0 php-install-pear-xml.patch
> -98de37c650a36870a543225f6a6b81813ccd447a484f0881511be4eb6e9= 01844=C2=A0 gd-iconv.patch"
>=C2=A0 sha512sums=3D"12734d786cca5767b8b8838affbe1c3d578= dd179c8d5339653d905658562c5fdf39a88349213b1340f320320700a5378aed6= 17447b6e15909019788a49ad2da0=C2=A0 php-5.6.30.tar.bz2
>=C2=A0 1f5cb18f85a2e279e24344d993f5c51c7bfbcbecc0e9bfcf075bebd1b0b= 893e2ffb793d95a632c9333033597d4b4f74840bfd00520a6dc700444d1a054225da1=C2=A0 php-fpm.initd
>=C2=A0 895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00= a18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102=C2=A0 php5-module.conf
>=C2=A0 f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337= c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505=C2=A0 php-install-pear-xml.patch
> -6ecd0be2da1dc5b1d7512e46a2a5cd107a8b2a8c364efc9c624a7d6b2ab= 081685a329c94c22c970dc14c5c1115f702c512e97ae858da1bc69c6423323dbeeba2=C2=A0 gd-iconv.patch"
> +6ecd0be2da1dc5b1d7512e46a2a5cd107a8b2a8c364efc9c624a7d6b2ab= 081685a329c94c22c970dc14c5c1115f702c512e97ae858da1bc69c6423323dbeeba2=C2=A0 gd-iconv.patch
> +6894c9cba7752a3406e774d9efc0e058c37433493c1c20101e9563bf247= c112157a67e306b06b9517b0422eca521f543d637a6cbd2cea7639e43f13d773b3d2b=C2=A0 tidy-buffio.patch"
> diff --git a/community/php5/tidy-buffio.patch b/community/php5/ti= dy-buffio.patch
> new file mode 100644
> index 0000000000..c15f9540a4
> --- /dev/null
> +++ b/community/php5/tidy-buffio.patch
> @@ -0,0 +1,11 @@
> +--- a/ext/tidy/tidy.c
> ++++ b/ext/tidy/tidy.c
> +@@ -31,7 +31,7 @@
> + #include "ext/standard/info.h"
> +
> + #include "tidy.h"
> +-#include "buffio.h"
> ++#include "tidybuffio.h"
> +
> + /* compatibility with older versions of libtidy */
> + #ifndef TIDY_CALL
>


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