[oe] [meta-oe/meta-webserver][PATCH v4 00/13] Merge modphp into php and upgrade

Martin Jansa martin.jansa at gmail.com
Fri Jan 9 09:38:10 UTC 2015 

On Wed, Jan 07, 2015 at 02:50:15PM +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 v2/3:
> * Fix phar script installation and packaging, which also resolves a QA
>   warning

There is one more issue:

sstate-sysroot-crutf.sh script was whitelisting this entries:
[^/]*/usr/lib/php/\.channels.*
[^/]*/usr/lib/php/\.registry.*
[^/]*/usr/lib/php/\.depdb.*
[^/]*/usr/lib/php/\.filemap
[^/]*/usr/lib/php/\.lock

No it's in php5 directory so it's easy to change the whitelist, can you
please confirm that it's safe to ignore these files (that nobody will
miss them if they aren't there after sstate reuse) or check if we can
prevent creating them in first place?

And is "/usr/lib/php5/php" expected, shouldn't it be just
"/usr/lib/php5"?

ERROR: Following files are installed in sysroot, but not tracked by
sstate:
x86_64-linux/usr/lib/php5/php/.channels
x86_64-linux/usr/lib/php5/php/.channels/.alias
x86_64-linux/usr/lib/php5/php/.channels/.alias/pear.txt
x86_64-linux/usr/lib/php5/php/.channels/.alias/pecl.txt
x86_64-linux/usr/lib/php5/php/.channels/.alias/phpdocs.txt
x86_64-linux/usr/lib/php5/php/.channels/__uri.reg
x86_64-linux/usr/lib/php5/php/.channels/doc.php.net.reg
x86_64-linux/usr/lib/php5/php/.channels/pear.php.net.reg
x86_64-linux/usr/lib/php5/php/.channels/pecl.php.net.reg
x86_64-linux/usr/lib/php5/php/.depdb
x86_64-linux/usr/lib/php5/php/.depdblock
x86_64-linux/usr/lib/php5/php/.filemap
x86_64-linux/usr/lib/php5/php/.lock
x86_64-linux/usr/lib/php5/php/.registry
x86_64-linux/usr/lib/php5/php/.registry/.channel.__uri
x86_64-linux/usr/lib/php5/php/.registry/.channel.doc.php.net
x86_64-linux/usr/lib/php5/php/.registry/.channel.pecl.php.net

> 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
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20150109/dd530ac1/attachment-0002.sig>

More information about the Openembedded-devel mailing list