From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade
Date: Wed, 7 Jan 2015 11:14:23 +0100 [thread overview]
Message-ID: <20150107101423.GH29986@jama> (raw)
In-Reply-To: <20150105115922.GF2484@jama>
[-- Attachment #1: Type: text/plain, Size: 6147 bytes --]
On Mon, Jan 05, 2015 at 12:59:22PM +0100, Martin Jansa wrote:
> Thanks for v2
>
> Please remember to update your old series as superseded when pushing
> newer version, it would help me a lot when sorting the pending patches.
Something is wrong:
php-5.5.20: php requires
/tmp/work/core2-64-oe-linux/php/5.5.20-r0/image/usr/bin/php, but no
providers in its RDEPENDS [file-rdeps]
>
> On Mon, Jan 05, 2015 at 10:33:13AM +0000, Paul Eggleton wrote:
> > Finally resolve the overlap between the modphp and php recipes by
> > merging the former into the latter. Along the way I fixed a few minor
> > issues and upgraded related recipes.
> >
> > I've taken a stepped approach to doing the php merge / upgrade so it's
> > easier to see what's going on and easier for me to test - first upgrade
> > php to the same version as modphp, then do the integration, then upgrade
> > to the latest 5.5 release. I would appreciate someone testing PHP in CGI
> > mode however since I don't have a convenient test setup for that (as I
> > do for mod_php).
> >
> > Changes since v1:
> > * Default mod_php building to disabled since we don't have apache2 in
> > meta-oe where the php recipe is and meta-oe can't depend on
> > meta-webserver
> > * Drop commented out line in uw-imap pam change
> > * Update meta-webserver README as appropriate
> >
> >
> > The following changes since commit 2ea3a19a478c526baa04d6b9a9e8c9f42aae9d34:
> >
> > ctapi-common: Add new recipe (2014-12-31 16:38:22 +0100)
> >
> > are available in the git repository at:
> >
> > git://git.openembedded.org/meta-openembedded-contrib paule/php
> > http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/php
> >
> > Paul Eggleton (12):
> > php: upgrade to 5.5.15
> > libc-client: rename to uw-imap, upgrade to 2007f
> > php: integrate modphp
> > php: upgrade to 5.5.20
> > modphp: remove
> > README: update for modphp merging into php
> > uw-imap: make libpam dependency dependent on DISTRO_FEATURES
> > php: add PACKAGECONFIG to fix implicit dependency on libpam
> > php: add PACKAGECONFIG for imap
> > xdebug: fix DEPENDS and un-blacklist
> > xdebug: update to 2.2.6
> > phpmyadmin: update to 4.3.4
> >
> > .../recipes-devtools/php/php}/70_mod_php5.conf | 0
> > .../recipes-devtools/php/php}/configure.patch | 0
> > .../php/php}/pthread-check-threads-m4.patch | 0
> > meta-oe/recipes-devtools/php/php_5.4.33.bb | 150 -----------
> > meta-oe/recipes-devtools/php/php_5.5.20.bb | 234 +++++++++++++++++
> > .../uw-imap/uw-imap/imap-2007e-shared.patch | 82 ++++++
> > .../uw-imap/imap-2007f-format-security.patch | 20 ++
> > .../files => uw-imap/uw-imap}/quote_cctype.patch | 0
> > .../uw-imap_2007f.bb} | 23 +-
> > meta-webserver/README | 16 +-
> > .../0001-using-pkgconfig-to-check-libxml.patch | 74 ------
> > .../modphp/files/php-CVE-2014-3587.patch | 31 ---
> > .../modphp/files/php-CVE-2014-3597.patch | 282 ---------------------
> > .../modphp/files/php-CVE-2014-5120.patch | 35 ---
> > meta-webserver/recipes-php/modphp/modphp5.inc | 112 --------
> > meta-webserver/recipes-php/modphp/modphp_5.5.15.bb | 7 -
> > .../0001-Bug-4544-additional-fix-for-4.2.x.patch | 29 ---
> > ...ug-4504-security-Self-XSS-in-query-charts.patch | 29 ---
> > ...4505-security-XSS-in-view-operations-page.patch | 43 ----
> > .../{phpmyadmin_4.2.7.bb => phpmyadmin_4.3.4.bb} | 7 +-
> > .../xdebug/{xdebug_2.2.5.bb => xdebug_2.2.6.bb} | 8 +-
> > 21 files changed, 372 insertions(+), 810 deletions(-)
> > rename {meta-webserver/recipes-php/modphp/files => meta-oe/recipes-devtools/php/php}/70_mod_php5.conf (100%)
> > rename {meta-webserver/recipes-php/modphp/files => meta-oe/recipes-devtools/php/php}/configure.patch (100%)
> > rename {meta-webserver/recipes-php/modphp/files => meta-oe/recipes-devtools/php/php}/pthread-check-threads-m4.patch (100%)
> > delete mode 100644 meta-oe/recipes-devtools/php/php_5.4.33.bb
> > create mode 100644 meta-oe/recipes-devtools/php/php_5.5.20.bb
> > create mode 100644 meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007e-shared.patch
> > create mode 100644 meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007f-format-security.patch
> > rename meta-oe/recipes-devtools/{libc-client/files => uw-imap/uw-imap}/quote_cctype.patch (100%)
> > rename meta-oe/recipes-devtools/{libc-client/libc-client_2007e.bb => uw-imap/uw-imap_2007f.bb} (55%)
> > delete mode 100644 meta-webserver/recipes-php/modphp/files/0001-using-pkgconfig-to-check-libxml.patch
> > delete mode 100644 meta-webserver/recipes-php/modphp/files/php-CVE-2014-3587.patch
> > delete mode 100644 meta-webserver/recipes-php/modphp/files/php-CVE-2014-3597.patch
> > delete mode 100644 meta-webserver/recipes-php/modphp/files/php-CVE-2014-5120.patch
> > delete mode 100644 meta-webserver/recipes-php/modphp/modphp5.inc
> > delete mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.15.bb
> > delete mode 100644 meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch
> > delete mode 100644 meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch
> > delete mode 100644 meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch
> > rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_4.2.7.bb => phpmyadmin_4.3.4.bb} (75%)
> > rename meta-webserver/recipes-php/xdebug/{xdebug_2.2.5.bb => xdebug_2.2.6.bb} (79%)
> >
> > --
> > 1.9.3
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
next prev parent reply other threads:[~2015-01-07 10:14 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-05 10:33 [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Paul Eggleton
2015-01-05 10:33 ` [meta-oe][PATCH v2 01/12] php: upgrade to 5.5.15 Paul Eggleton
2015-01-07 11:53 ` [meta-oe][PATCH v3] " Paul Eggleton
2015-01-05 10:33 ` [meta-oe][PATCH v2 02/12] libc-client: rename to uw-imap, upgrade to 2007f Paul Eggleton
2015-01-05 10:33 ` [meta-oe][PATCH v2 03/12] php: integrate modphp Paul Eggleton
2015-01-05 10:33 ` [meta-oe][PATCH v2 04/12] php: upgrade to 5.5.20 Paul Eggleton
2015-01-05 10:33 ` [meta-webserver][PATCH v2 05/12] modphp: remove Paul Eggleton
2015-01-05 10:33 ` [meta-webserver][PATCH v2 06/12] README: update for modphp merging into php Paul Eggleton
2015-01-05 10:33 ` [meta-oe][PATCH v2 07/12] uw-imap: make libpam dependency dependent on DISTRO_FEATURES Paul Eggleton
2015-01-05 10:33 ` [meta-oe][PATCH v2 08/12] php: add PACKAGECONFIG to fix implicit dependency on libpam Paul Eggleton
2015-01-05 10:33 ` [meta-oe][PATCH v2 09/12] php: add PACKAGECONFIG for imap Paul Eggleton
2015-01-05 10:33 ` [meta-webserver][PATCH v2 10/12] xdebug: fix DEPENDS and un-blacklist Paul Eggleton
2015-01-05 10:33 ` [meta-webserver][PATCH v2 11/12] xdebug: update to 2.2.6 Paul Eggleton
2015-01-05 10:33 ` [meta-webserver][PATCH v2 12/12] phpmyadmin: update to 4.3.4 Paul Eggleton
2015-01-05 11:59 ` [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Martin Jansa
2015-01-07 10:14 ` Martin Jansa [this message]
2015-01-07 10:34 ` Paul Eggleton
2015-01-07 10:41 ` Paul Eggleton
2015-01-07 10:42 ` Martin Jansa
2015-01-07 11:55 ` Paul Eggleton
2015-01-07 12:06 ` Paul Eggleton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150107101423.GH29986@jama \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.