From: Paul Eggleton <paul.eggleton@linux.intel.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe/meta-webserver][PATCH v4 00/13] Merge modphp into php and upgrade
Date: Wed, 7 Jan 2015 14:50:15 +0000 [thread overview]
Message-ID: <cover.1420641979.git.paul.eggleton@linux.intel.com> (raw)
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 v2/3:
* Fix phar script installation and packaging, which also resolves a QA
warning
The following changes since commit 5b4413ccf329a981bee976c9fcde5d2872f0defb:
dnrd: fix SRC_URI (2015-01-05 11:25:51 -0500)
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 (13):
php: upgrade to 5.5.15
libc-client: rename to uw-imap, upgrade to 2007f
php: integrate modphp
php: upgrade to 5.5.20
php: fix phar script packaging
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
.../recipes-devtools/php/php/phar-makefile.patch | 29 ++-
.../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 | 236 +++++++++++++++++
.../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 +-
22 files changed, 394 insertions(+), 819 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
next reply other threads:[~2015-01-07 14:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-07 14:50 Paul Eggleton [this message]
2015-01-07 14:50 ` [meta-oe][PATCH v4 01/13] php: upgrade to 5.5.15 Paul Eggleton
2015-01-07 14:50 ` [meta-oe][PATCH v4 02/13] libc-client: rename to uw-imap, upgrade to 2007f Paul Eggleton
2015-01-07 14:50 ` [meta-oe][PATCH v4 03/13] php: integrate modphp Paul Eggleton
2015-01-07 14:50 ` [meta-oe][PATCH v4 04/13] php: upgrade to 5.5.20 Paul Eggleton
2015-01-07 14:50 ` [meta-oe][PATCH v4 05/13] php: fix phar script packaging Paul Eggleton
2015-01-07 14:50 ` [meta-webserver][PATCH v4 06/13] modphp: remove Paul Eggleton
2015-01-07 14:50 ` [meta-webserver][PATCH v4 07/13] README: update for modphp merging into php Paul Eggleton
2015-01-07 14:50 ` [meta-oe][PATCH v4 08/13] uw-imap: make libpam dependency dependent on DISTRO_FEATURES Paul Eggleton
2015-01-07 14:50 ` [meta-oe][PATCH v4 09/13] php: add PACKAGECONFIG to fix implicit dependency on libpam Paul Eggleton
2015-01-07 14:50 ` [meta-oe][PATCH v4 10/13] php: add PACKAGECONFIG for imap Paul Eggleton
2015-01-07 14:50 ` [meta-webserver][PATCH v4 11/13] xdebug: fix DEPENDS and un-blacklist Paul Eggleton
2015-01-07 14:50 ` [meta-webserver][PATCH v4 12/13] xdebug: update to 2.2.6 Paul Eggleton
2015-01-07 14:50 ` [meta-webserver][PATCH v4 13/13] phpmyadmin: update to 4.3.4 Paul Eggleton
2015-01-09 9:38 ` [meta-oe/meta-webserver][PATCH v4 00/13] Merge modphp into php and upgrade Martin Jansa
2015-01-09 10:22 ` 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=cover.1420641979.git.paul.eggleton@linux.intel.com \
--to=paul.eggleton@linux.intel.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.