* [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade
@ 2015-01-05 10:33 Paul Eggleton
2015-01-05 10:33 ` [meta-oe][PATCH v2 01/12] php: upgrade to 5.5.15 Paul Eggleton
` (12 more replies)
0 siblings, 13 replies; 21+ messages in thread
From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply [flat|nested] 21+ messages in thread* [meta-oe][PATCH v2 01/12] php: upgrade to 5.5.15 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 ` 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 ` (11 subsequent siblings) 12 siblings, 1 reply; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel Based on the corresponding changes to the modphp recipe in meta-webserver. From the commit message for the modphp upgrade: * LIC_FILES_CHKSUM needed to change because the copyright year changed * Enabled mcrypt since upstream recommend this for acceptable performance * Disabled the opcache; this is a new feature in 5.5 and the configure check for it currently breaks when cross-compiling. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-oe/recipes-devtools/php/{php_5.4.33.bb => php_5.5.15.bb} | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) rename meta-oe/recipes-devtools/php/{php_5.4.33.bb => php_5.5.15.bb} (94%) diff --git a/meta-oe/recipes-devtools/php/php_5.4.33.bb b/meta-oe/recipes-devtools/php/php_5.5.15.bb similarity index 94% rename from meta-oe/recipes-devtools/php/php_5.4.33.bb rename to meta-oe/recipes-devtools/php/php_5.5.15.bb index 6fdfe0f..ff81aee 100644 --- a/meta-oe/recipes-devtools/php/php_5.4.33.bb +++ b/meta-oe/recipes-devtools/php/php_5.5.15.bb @@ -3,11 +3,11 @@ HOMEPAGE = "http://www.php.net" SECTION = "console/network" LICENSE = "PHP-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97" +LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108" BBCLASSEXTEND = "native" DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native \ - libc-client openssl" + libc-client openssl libmcrypt" DEPENDS_virtclass-native = "zlib-native libxml2-native" # The new PHP downloads server groups PHP releases by major version so find @@ -30,8 +30,8 @@ SRC_URI_append_class-target += " \ file://php-fpm-apache.conf \ " -SRC_URI[md5sum] = "c6878bb1cdb46bfc1e1a5cd67a024737" -SRC_URI[sha256sum] = "1a75b2d0835e74b8886cd3980d9598a0e06691441bb7f91d19b74c2278e40bb5" +SRC_URI[md5sum] = "5cb5f2ed9099299f8a4c952d59d93812" +SRC_URI[sha256sum] = "00f24226b12fee27e332383b6304f1b9ed3f4d9173dd728a68c5c3f5a59b8ba7" S = "${WORKDIR}/php-${PV}" @@ -40,7 +40,7 @@ inherit autotools pkgconfig pythonnative gettext SSTATE_SCAN_FILES += "build-defs.h" # Common EXTRA_OECONF -COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared" +COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared --disable-opcache" EXTRA_OECONF = "--enable-mbstring \ --enable-wddx \ --enable-fpm \ @@ -49,6 +49,7 @@ EXTRA_OECONF = "--enable-mbstring \ --with-imap-ssl=${STAGING_DIR_HOST} \ --with-zlib=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \ + --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ ${COMMON_EXTRA_OECONF} \ " EXTRA_OECONF_virtclass-native = " \ -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-oe][PATCH v3] php: upgrade to 5.5.15 2015-01-05 10:33 ` [meta-oe][PATCH v2 01/12] php: upgrade to 5.5.15 Paul Eggleton @ 2015-01-07 11:53 ` Paul Eggleton 0 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-07 11:53 UTC (permalink / raw) To: openembedded-devel Based on the corresponding changes to the modphp recipe in meta-webserver. From the commit message for the modphp upgrade: * LIC_FILES_CHKSUM needed to change because the copyright year changed * Enabled mcrypt since upstream recommend this for acceptable performance * Disabled the opcache; this is a new feature in 5.5 and the configure check for it currently breaks when cross-compiling. Also fix an issue with the "phar" script which ended up with a shebang pointing into the workdir on the host. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- .../recipes-devtools/php/{php_5.4.33.bb => php_5.5.15.bb} | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) rename meta-oe/recipes-devtools/php/{php_5.4.33.bb => php_5.5.15.bb} (93%) diff --git a/meta-oe/recipes-devtools/php/php_5.4.33.bb b/meta-oe/recipes-devtools/php/php_5.5.15.bb similarity index 93% rename from meta-oe/recipes-devtools/php/php_5.4.33.bb rename to meta-oe/recipes-devtools/php/php_5.5.15.bb index 6fdfe0f..1031127 100644 --- a/meta-oe/recipes-devtools/php/php_5.4.33.bb +++ b/meta-oe/recipes-devtools/php/php_5.5.15.bb @@ -3,11 +3,11 @@ HOMEPAGE = "http://www.php.net" SECTION = "console/network" LICENSE = "PHP-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97" +LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108" BBCLASSEXTEND = "native" DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native \ - libc-client openssl" + libc-client openssl libmcrypt" DEPENDS_virtclass-native = "zlib-native libxml2-native" # The new PHP downloads server groups PHP releases by major version so find @@ -30,8 +30,8 @@ SRC_URI_append_class-target += " \ file://php-fpm-apache.conf \ " -SRC_URI[md5sum] = "c6878bb1cdb46bfc1e1a5cd67a024737" -SRC_URI[sha256sum] = "1a75b2d0835e74b8886cd3980d9598a0e06691441bb7f91d19b74c2278e40bb5" +SRC_URI[md5sum] = "5cb5f2ed9099299f8a4c952d59d93812" +SRC_URI[sha256sum] = "00f24226b12fee27e332383b6304f1b9ed3f4d9173dd728a68c5c3f5a59b8ba7" S = "${WORKDIR}/php-${PV}" @@ -40,7 +40,7 @@ inherit autotools pkgconfig pythonnative gettext SSTATE_SCAN_FILES += "build-defs.h" # Common EXTRA_OECONF -COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared" +COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared --disable-opcache" EXTRA_OECONF = "--enable-mbstring \ --enable-wddx \ --enable-fpm \ @@ -49,6 +49,7 @@ EXTRA_OECONF = "--enable-mbstring \ --with-imap-ssl=${STAGING_DIR_HOST} \ --with-zlib=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \ + --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ ${COMMON_EXTRA_OECONF} \ " EXTRA_OECONF_virtclass-native = " \ @@ -111,6 +112,7 @@ do_install_append_class-target() { rmdir ${TMP} TMP=`dirname ${TMP}`; done + sed -i 's:^#!/.*/php:#!${bindir}/php:' ${D}${bindir}/phar.phar } PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-oe][PATCH v2 02/12] libc-client: rename to uw-imap, upgrade to 2007f 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-05 10:33 ` Paul Eggleton 2015-01-05 10:33 ` [meta-oe][PATCH v2 03/12] php: integrate modphp Paul Eggleton ` (10 subsequent siblings) 12 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel * Upgrade to 2007f * Rename to uw-imap; this is the name used by Fedora and is much more sensible than libc-client * Fix errors when linking the library against code compiled with -fPIC such as mod-php (patch from Fedora). * Add a security patch from Fedora * Rename files directory to uw-imap Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- .../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} | 16 +++-- 4 files changed, 113 insertions(+), 5 deletions(-) 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} (66%) diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007e-shared.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007e-shared.patch new file mode 100644 index 0000000..4434e83 --- /dev/null +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007e-shared.patch @@ -0,0 +1,82 @@ +Fix linking libraries built with -fPIC with this library + +Patch borrowed from Fedora + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +Upstream-Status: Pending + +diff -up imap-2007e/src/osdep/unix/Makefile.shared imap-2007e/src/osdep/unix/Makefile +--- imap-2007e/src/osdep/unix/Makefile.shared 2009-07-07 19:28:02.909755512 -0500 ++++ imap-2007e/src/osdep/unix/Makefile 2009-07-07 19:29:35.870006799 -0500 +@@ -170,6 +170,10 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA + EXTRADRIVERS='$(EXTRADRIVERS)' EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\ + PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP) + ++# Need this for the shared library rule to work correctly ++.SUFFIXES: .o .so ++SOFILES=${BINARIES:.o=.so} ++ + + # Here if no make argument established + +@@ -845,18 +849,24 @@ vu2: # VAX Ultrix 2.3, etc. + + # Build it! + +-build: clean once $(ARCHIVE) ++build: clean once $(ARCHIVE) $(SHLIBNAME) + +-all: $(ARCHIVE) ++all: $(ARCHIVE) $(SHLIBNAME) + + $(ARCHIVE): $(BINARIES) + sh -c '$(RM) $(ARCHIVE) || true' + @$(CAT) ARCHIVE + @$(SH) ARCHIVE + +-.c.o: +- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c ++$(SHLIBNAME): $(SOFILES) ++ gcc -shared -Wl,-soname,$(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` ++ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so + ++.c.so: osdep.h ++ $(CC) -fPIC -DPIC -D_REENTRANT -c `$(CAT) CFLAGS` ${@:.so=.c} -o $@ ++ ++.c.o: ++ $(CC) -fPIC -DPIC -D_REENTRANT -c `$(CAT) CFLAGS` $*.c + + # Cleanup + +@@ -895,8 +905,7 @@ utf8aux.o: mail.h misc.h osdep.h utf8.h + + + # OS-dependent +- +-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ ++OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ + osdep.h env_unix.h tcp_unix.h \ + osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\ + auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \ +@@ -910,12 +919,19 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n + write.c sslstdio.c \ + strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ + OSCFLAGS ++ ++osdep.o: $(OSDEPS) ++ $(CC) -fPIC -DPIC -D_REENTRANT `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c ++ @echo ======================================================================== + @echo Building OS-dependent module + @echo If you get No such file error messages for files x509.h, ssl.h, + @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL + @echo is not installed on your system. Either install OpenSSL first + @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none +- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c ++ @echo ======================================================================== ++ ++osdep.so: $(OSDEPS) ++ $(CC) -fPIC -DPIC -D_REENTRANT `$(CAT) CFLAGS` `cat OSCFLAGS` -c osdep.c -o $@ + + osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c + $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007f-format-security.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007f-format-security.patch new file mode 100644 index 0000000..6ec0476 --- /dev/null +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007f-format-security.patch @@ -0,0 +1,20 @@ +Fix error found with "-Werror=format-security" flag + +Patch borrowed from Fedora + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +Upstream-Status: Pending + +diff -Naur imap-2007f.orig/src/osdep/unix/flocklnx.c imap-2007f/src/osdep/unix/flocklnx.c +--- imap-2007f.orig/src/osdep/unix/flocklnx.c 2011-07-23 02:20:11.000000000 +0200 ++++ imap-2007f/src/osdep/unix/flocklnx.c 2014-04-14 19:17:46.429000000 +0200 +@@ -57,7 +57,7 @@ + case ENOLCK: /* lock table is full */ + sprintf (tmp,"File locking failure: %s",strerror (errno)); + mm_log (tmp,WARN); /* give the user a warning of what happened */ +- if (!logged++) syslog (LOG_ERR,tmp); ++ if (!logged++) syslog (LOG_ERR, "%s", tmp); + /* return failure if non-blocking lock */ + if (op & LOCK_NB) return -1; + sleep (5); /* slow down in case it loops */ diff --git a/meta-oe/recipes-devtools/libc-client/files/quote_cctype.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/quote_cctype.patch similarity index 100% rename from meta-oe/recipes-devtools/libc-client/files/quote_cctype.patch rename to meta-oe/recipes-devtools/uw-imap/uw-imap/quote_cctype.patch diff --git a/meta-oe/recipes-devtools/libc-client/libc-client_2007e.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb similarity index 66% rename from meta-oe/recipes-devtools/libc-client/libc-client_2007e.bb rename to meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index 150ff90..e1a9877 100644 --- a/meta-oe/recipes-devtools/libc-client/libc-client_2007e.bb +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb @@ -6,13 +6,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a6a4ddbb7cd2999f6827ee143f6fcd97" DEPENDS = "openssl libpam" -PR = "r1" - SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.gz \ - file://quote_cctype.patch" + file://quote_cctype.patch \ + file://imap-2007e-shared.patch \ + file://imap-2007f-format-security.patch \ + " -SRC_URI[md5sum] = "7903800dc2604000016de070e0c55840" -SRC_URI[sha256sum] = "4b1137b87249782496ec3eeacaf83bbf09312a7d2ae3aead262179041b55565f" +SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369" +SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28" S = "${WORKDIR}/imap-${PV}" @@ -32,4 +33,9 @@ do_install() { install c-client/c-client.a ${D}${libdir}/libc-client.a } +RPROVIDES_${PN} = "libc-client" +RREPLACES_${PN} = "libc-client" +RCONFLICTS_${PN} = "libc-client" + ALLOW_EMPTY_${PN} = "1" + -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-oe][PATCH v2 03/12] php: integrate modphp 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-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 ` Paul Eggleton 2015-01-05 10:33 ` [meta-oe][PATCH v2 04/12] php: upgrade to 5.5.20 Paul Eggleton ` (9 subsequent siblings) 12 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel Build the mod_php Apache module within the main php recipe; this avoids files in the sysroot from stepping on eachother and therefore avoids the resulting build failure. Changes made: * Add an "apache2" PACKAGECONFIG, default disabled. This means that if you previously used the modphp recipe you now need to set PACKAGECONFIG for php to include "apache2". * Bring in most patches and configure options from the modphp recipe. * Specify ${libdir}/php5 as libdir. This avoids the PHP extensions directory being /usr/lib/extensions by default which is ugly. * Tidy up some superfluous/malformed entries in FILES_${PN}-pear * Drop obsolete PHP_MAJVER * Replace virtclass- override with class- Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-oe/recipes-devtools/php/php/70_mod_php5.conf | 12 ++ meta-oe/recipes-devtools/php/php/configure.patch | 11 ++ .../php/php/pthread-check-threads-m4.patch | 30 +++++ meta-oe/recipes-devtools/php/php_5.5.15.bb | 142 ++++++++++++++++----- 4 files changed, 163 insertions(+), 32 deletions(-) create mode 100644 meta-oe/recipes-devtools/php/php/70_mod_php5.conf create mode 100644 meta-oe/recipes-devtools/php/php/configure.patch create mode 100644 meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch diff --git a/meta-oe/recipes-devtools/php/php/70_mod_php5.conf b/meta-oe/recipes-devtools/php/php/70_mod_php5.conf new file mode 100644 index 0000000..1de6fb1 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/70_mod_php5.conf @@ -0,0 +1,12 @@ +# vim: ft=apache sw=4 ts=4 +<IfDefine PHP5> + # Load the module first + <IfModule !sapi_apache2.c> + LoadModule php5_module lib/apache2/modules/libphp5.so + </IfModule> + + # Set it to handle the files + AddHandler php5-script .php .phtml .php3 .php4 .php5 + AddType application/x-httpd-php-source .phps + DirectoryIndex index.html index.html.var index.php index.phtml +</IfDefine> diff --git a/meta-oe/recipes-devtools/php/php/configure.patch b/meta-oe/recipes-devtools/php/php/configure.patch new file mode 100644 index 0000000..c5334c7 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/configure.patch @@ -0,0 +1,11 @@ +--- php-5.1.6/configure.old 2006-09-12 07:54:14.000000000 -0700 ++++ php-5.1.6/configure 2006-09-12 07:54:37.000000000 -0700 +@@ -14715,8 +14715,6 @@ + + + +- unset ac_cv_func_dlopen +- unset ac_cv_func___dlopen + unset found + + echo $ac_n "checking for dlopen""... $ac_c" 1>&6 diff --git a/meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch b/meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch new file mode 100644 index 0000000..0c564cd --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch @@ -0,0 +1,30 @@ +From d8067ceacbf54e79c9c6b68675332c09eaa0b55d Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Mon, 8 Apr 2013 14:29:51 +0800 +Subject: [PATCH] pthread-check + +Enable pthreads support when cross-compiling + +Upstream-Status: Inapproprate [config] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + TSRM/threads.m4 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/TSRM/threads.m4 b/TSRM/threads.m4 +index 38494ce..15d9454 100644 +--- a/TSRM/threads.m4 ++++ b/TSRM/threads.m4 +@@ -86,7 +86,7 @@ int main() { + pthreads_working=no + ], [ + dnl For cross compiling running this test is of no use. NetWare supports pthreads +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes +-- +1.7.4.1 + diff --git a/meta-oe/recipes-devtools/php/php_5.5.15.bb b/meta-oe/recipes-devtools/php/php_5.5.15.bb index ff81aee..1e53a32 100644 --- a/meta-oe/recipes-devtools/php/php_5.5.15.bb +++ b/meta-oe/recipes-devtools/php/php_5.5.15.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." +SUMMARY = "A server-side, HTML-embedded scripting language" HOMEPAGE = "http://www.php.net" SECTION = "console/network" @@ -6,13 +6,9 @@ LICENSE = "PHP-3.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108" BBCLASSEXTEND = "native" -DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native \ - libc-client openssl libmcrypt" -DEPENDS_virtclass-native = "zlib-native libxml2-native" - -# The new PHP downloads server groups PHP releases by major version so find -# the major version of the PHP recipe. -PHP_MAJVER = "${@d.getVar('PV',1).split('.')[0]}" +DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \ + uw-imap openssl libmcrypt" +DEPENDS_class-native = "zlib-native libxml2-native" SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ file://acinclude-xml2-config.patch \ @@ -28,6 +24,9 @@ SRC_URI_append_class-target += " \ file://php_exec_native.patch \ file://php-fpm.conf \ file://php-fpm-apache.conf \ + file://configure.patch \ + file://pthread-check-threads-m4.patch \ + file://70_mod_php5.conf \ " SRC_URI[md5sum] = "5cb5f2ed9099299f8a4c952d59d93812" @@ -37,22 +36,38 @@ S = "${WORKDIR}/php-${PV}" inherit autotools pkgconfig pythonnative gettext +# phpize is not scanned for absolute paths by default (but php-config is). +# +SSTATE_SCAN_FILES += "phpize" SSTATE_SCAN_FILES += "build-defs.h" +PHP_LIBDIR = "${libdir}/php5" + # Common EXTRA_OECONF -COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared --disable-opcache" +COMMON_EXTRA_OECONF = "--enable-sockets \ + --enable-pcntl \ + --enable-shared \ + --disable-opcache \ + --disable-rpath \ + --with-pic \ + --libdir=${PHP_LIBDIR} \ +" EXTRA_OECONF = "--enable-mbstring \ --enable-wddx \ --enable-fpm \ + --enable-zip \ --with-imap=${STAGING_DIR_HOST} \ --with-gettext=${STAGING_LIBDIR}/.. \ --with-imap-ssl=${STAGING_DIR_HOST} \ --with-zlib=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \ --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ + --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ + --with-config-file-path=${sysconfdir}/php/apache2-php5 \ + ${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ ${COMMON_EXTRA_OECONF} \ " -EXTRA_OECONF_virtclass-native = " \ +EXTRA_OECONF_class-native = " \ --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \ --without-iconv \ ${COMMON_EXTRA_OECONF} \ @@ -64,26 +79,54 @@ PACKAGECONFIG_class-native = "" PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \ --with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ - , \ + ,--without-mysql --without-mysqli --without-pdo-mysql \ ,mysql5" PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \ --with-pdo-sqlite=${STAGING_LIBDIR}/.. \ , \ ,sqlite3" +PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" +PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2" +PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" + export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" -CFLAGS += " -D_GNU_SOURCE" +CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" EXTRA_OEMAKE = "INSTALL_ROOT=${D}" acpaths = "" +do_configure_prepend () { + rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4 + find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!' +} + +do_configure_append() { + # No, libtool, we really don't want rpath set... + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${HOST_SYS}-libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${HOST_SYS}-libtool +} + do_install_append_class-native() { - rm -rf ${D}/${libdir}/php/.registry - rm -rf ${D}/${libdir}/php/.channels - rm -rf ${D}/${libdir}/php/.[a-z]* + rm -rf ${D}/${PHP_LIBDIR}/php/.registry + rm -rf ${D}/${PHP_LIBDIR}/php/.channels + rm -rf ${D}/${PHP_LIBDIR}/php/.[a-z]* +} + +do_install_prepend() { + cat aclocal-copy/libtool.m4 aclocal-copy/lt~obsolete.m4 aclocal-copy/ltoptions.m4 \ + aclocal-copy/ltsugar.m4 aclocal-copy/ltversion.m4 > ${S}/build/libtool.m4 +} + +do_install_prepend_class-target() { + if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then + # Install dummy config file so apxs doesn't fail + install -d ${D}${sysconfdir}/apache2 + printf "\nLoadModule dummy_module modules/mod_dummy.so\n" > ${D}${sysconfdir}/apache2/httpd.conf + fi } # fixme @@ -112,19 +155,47 @@ do_install_append_class-target() { rmdir ${TMP} TMP=`dirname ${TMP}`; done + + if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then + install -d ${D}${libdir}/apache2/modules + install -d ${D}${sysconfdir}/apache2/modules.d + install -d ${D}${sysconfdir}/php/apache2-php5 + install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules + install -m 644 ${WORKDIR}/70_mod_php5.conf ${D}${sysconfdir}/apache2/modules.d + sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php5.conf + cat ${S}/php.ini-production | \ + sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ + > ${D}${sysconfdir}/php/apache2-php5/php.ini + rm -f ${D}${sysconfdir}/apache2/httpd.conf* + fi } -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" +SYSROOT_PREPROCESS_FUNCS += "php_sysroot_preprocess" + +php_sysroot_preprocess () { + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/phpize ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/php-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + + sed -i 's!eval echo /!eval echo ${STAGING_DIR_HOST}/!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/phpize + sed -i 's!^include_dir=.*!include_dir=${STAGING_INCDIR}/php!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/php-config +} + +MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp', '', d)}" + +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" RDEPENDS_${PN}-pear = "${PN}" RDEPENDS_${PN}-cli = "${PN}" +RDEPENDS_${PN}-modphp = "${PN} apache2" RDEPENDS_${PN}-dev = "${PN}" INITSCRIPT_PACKAGES = "${PN}-fpm" inherit update-rc.d -FILES_${PN}-dbg =+ "${bindir}/.debug" -FILES_${PN}-doc += "${libdir}/php/doc" +FILES_${PN}-dbg =+ "${bindir}/.debug \ + ${libdir}/apache2/modules/.debug" +FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc" FILES_${PN}-cli = "${bindir}/php" FILES_${PN}-cgi = "${bindir}/php-cgi" FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm" @@ -133,19 +204,26 @@ CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf" CONFFILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" INITSCRIPT_NAME_${PN}-fpm = "php-fpm" INITSCRIPT_PARAMS_${PN}-fpm = "defaults 60" -FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl ${libdir}/php/PEAR \ - ${libdir}/php/PEAR.php ${libdir}/php/System.php \ - ${libdir}php/peclcmd.php ${libdir}/php/pearcmd.php \ - ${libdir}/php/.channels ${libdir}/php/.channels/.alias \ - ${libdir}/php/.channels\__uri.reg \ - ${libdir}/php/.channels\pear.php.net.reg \ - ${libdir}/php/.channels/pecl.php.net.reg \ - ${libdir}/php/.registry ${libdir}/php/Archive/Tar.php \ - ${libdir}/php/Console/Getopt.php ${libdir}/php/OS/Guess.php \ +FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl ${PHP_LIBDIR}/php/PEAR \ + ${PHP_LIBDIR}/php/PEAR*.php ${PHP_LIBDIR}/php/System.php \ + ${PHP_LIBDIR}/php/peclcmd.php ${PHP_LIBDIR}/php/pearcmd.php \ + ${PHP_LIBDIR}/php/.channels ${PHP_LIBDIR}/php/.channels/.alias \ + ${PHP_LIBDIR}/php/.registry ${PHP_LIBDIR}/php/Archive/Tar.php \ + ${PHP_LIBDIR}/php/Console/Getopt.php ${PHP_LIBDIR}/php/OS/Guess.php \ + ${PHP_LIBDIR}/php/data/PEAR \ ${sysconfdir}/pear.conf" -FILES_${PN}-dev = "${includedir}/php ${libdir}/build ${bindir}/phpize \ - ${bindir}/php-config ${libdir}/php/.depdb \ - ${libdir}/php/.depdblock ${libdir}/php/.filemap \ - ${libdir}/php/.lock ${libdir}/php/test" -FILES_${PN} = "${libdir}/php" +FILES_${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ + ${bindir}/php-config ${PHP_LIBDIR}/php/.depdb \ + ${PHP_LIBDIR}/php/.depdblock ${PHP_LIBDIR}/php/.filemap \ + ${PHP_LIBDIR}/php/.lock ${PHP_LIBDIR}/php/test" +FILES_${PN} = "${PHP_LIBDIR}/php" FILES_${PN} += "${bindir}" + +SUMMARY_${PN}-modphp = "PHP module for the Apache HTTP server" +FILES_${PN}-modphp = "${libdir}/apache2 ${sysconfdir}" + +MODPHP_OLDPACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'modphp', '', d)}" +RPROVIDES_${PN}-modphp = "${MODPHP_OLDPACKAGE}" +RREPLACES_${PN}-modphp = "${MODPHP_OLDPACKAGE}" +RCONFLICTS_${PN}-modphp = "${MODPHP_OLDPACKAGE}" + -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-oe][PATCH v2 04/12] php: upgrade to 5.5.20 2015-01-05 10:33 [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Paul Eggleton ` (2 preceding siblings ...) 2015-01-05 10:33 ` [meta-oe][PATCH v2 03/12] php: integrate modphp Paul Eggleton @ 2015-01-05 10:33 ` Paul Eggleton 2015-01-05 10:33 ` [meta-webserver][PATCH v2 05/12] modphp: remove Paul Eggleton ` (8 subsequent siblings) 12 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel Among many fixes since 5.5.15, the following security issues were fixed: CVE-2014-8142 CVE-2014-3710 CVE-2014-3669 CVE-2014-3670 CVE-2014-3668 CVE-2014-3538 CVE-2014-3587 CVE-2014-2497 CVE-2014-5120 CVE-2014-3597 For more details please see the upstream changelog: http://php.net/ChangeLog-5.php Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-oe/recipes-devtools/php/{php_5.5.15.bb => php_5.5.20.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-devtools/php/{php_5.5.15.bb => php_5.5.20.bb} (98%) diff --git a/meta-oe/recipes-devtools/php/php_5.5.15.bb b/meta-oe/recipes-devtools/php/php_5.5.20.bb similarity index 98% rename from meta-oe/recipes-devtools/php/php_5.5.15.bb rename to meta-oe/recipes-devtools/php/php_5.5.20.bb index 1e53a32..7f11b7f 100644 --- a/meta-oe/recipes-devtools/php/php_5.5.15.bb +++ b/meta-oe/recipes-devtools/php/php_5.5.20.bb @@ -29,8 +29,8 @@ SRC_URI_append_class-target += " \ file://70_mod_php5.conf \ " -SRC_URI[md5sum] = "5cb5f2ed9099299f8a4c952d59d93812" -SRC_URI[sha256sum] = "00f24226b12fee27e332383b6304f1b9ed3f4d9173dd728a68c5c3f5a59b8ba7" +SRC_URI[md5sum] = "9dfc1d4d2b44fb7e2b4ee9651d032203" +SRC_URI[sha256sum] = "f28a150d1cd8991bd1a41dce4fdff4e343d1dbe01a48b9b44bea74532ce0391a" S = "${WORKDIR}/php-${PV}" -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-webserver][PATCH v2 05/12] modphp: remove 2015-01-05 10:33 [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Paul Eggleton ` (3 preceding siblings ...) 2015-01-05 10:33 ` [meta-oe][PATCH v2 04/12] php: upgrade to 5.5.20 Paul Eggleton @ 2015-01-05 10:33 ` Paul Eggleton 2015-01-05 10:33 ` [meta-webserver][PATCH v2 06/12] README: update for modphp merging into php Paul Eggleton ` (7 subsequent siblings) 12 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel This is now built out of the standard php recipe. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- .../0001-using-pkgconfig-to-check-libxml.patch | 74 ------ .../recipes-php/modphp/files/70_mod_php5.conf | 12 - .../recipes-php/modphp/files/configure.patch | 11 - .../modphp/files/php-CVE-2014-3587.patch | 31 --- .../modphp/files/php-CVE-2014-3597.patch | 282 --------------------- .../modphp/files/php-CVE-2014-5120.patch | 35 --- .../modphp/files/pthread-check-threads-m4.patch | 30 --- meta-webserver/recipes-php/modphp/modphp5.inc | 112 -------- meta-webserver/recipes-php/modphp/modphp_5.5.15.bb | 7 - 9 files changed, 594 deletions(-) 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/70_mod_php5.conf delete mode 100644 meta-webserver/recipes-php/modphp/files/configure.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/files/pthread-check-threads-m4.patch delete mode 100644 meta-webserver/recipes-php/modphp/modphp5.inc delete mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.15.bb diff --git a/meta-webserver/recipes-php/modphp/files/0001-using-pkgconfig-to-check-libxml.patch b/meta-webserver/recipes-php/modphp/files/0001-using-pkgconfig-to-check-libxml.patch deleted file mode 100644 index bab5ff2..0000000 --- a/meta-webserver/recipes-php/modphp/files/0001-using-pkgconfig-to-check-libxml.patch +++ /dev/null @@ -1,74 +0,0 @@ -[PATCH] using pkgconfig to check libxml - -Upstream-Status: Pending - -Use pkg-config for the libxml2 dependency, not the -config script. - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> ---- - acinclude.m4 | 48 ++++++------------------------------------------ - 1 file changed, 6 insertions(+), 42 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index d348f57..9f691a5 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2530,49 +2530,13 @@ dnl - dnl Common setup macro for libxml - dnl - AC_DEFUN([PHP_SETUP_LIBXML], [ --AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, --[ -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done --]) -+ PKG_CHECK_MODULES(PKG_XML2, [libxml-2.0],,) -+ if test "x$PKG_XML2_CFLAGS" != "x"; then -+ PHP_EVAL_INCLINE($PKG_XML2_CFLAGS, $1) -+ PHP_EVAL_LIBLINE($PKG_XML2_LIBS) -+ AC_DEFINE(HAVE_LIBXML, 1, [ ]) -+ $2 - -- if test -x "$ac_cv_php_xml2_config_path"; then -- XML2_CONFIG="$ac_cv_php_xml2_config_path" -- libxml_full_version=`$XML2_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $libxml_full_version -- IFS=$ac_IFS -- LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` -- if test "$LIBXML_VERSION" -ge "2006011"; then -- LIBXML_LIBS=`$XML2_CONFIG --libs` -- LIBXML_INCS=`$XML2_CONFIG --cflags` -- PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) -- PHP_EVAL_INCLINE($LIBXML_INCS) -- -- dnl Check that build works with given libs -- AC_CACHE_CHECK(whether libxml build works, php_cv_libxml_build_works, [ -- PHP_TEST_BUILD(xmlInitParser, -- [ -- php_cv_libxml_build_works=yes -- ], [ -- AC_MSG_RESULT(no) -- AC_MSG_ERROR([build test failed. Please check the config.log for details.]) -- ], [ -- [$]$1 -- ]) -- ]) -- if test "$php_cv_libxml_build_works" = "yes"; then -- AC_DEFINE(HAVE_LIBXML, 1, [ ]) -- fi -- $2 -- else -- AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) -- fi - ifelse([$3],[],,[else $3]) - fi - ]) --- -1.9.1 - diff --git a/meta-webserver/recipes-php/modphp/files/70_mod_php5.conf b/meta-webserver/recipes-php/modphp/files/70_mod_php5.conf deleted file mode 100644 index 1de6fb1..0000000 --- a/meta-webserver/recipes-php/modphp/files/70_mod_php5.conf +++ /dev/null @@ -1,12 +0,0 @@ -# vim: ft=apache sw=4 ts=4 -<IfDefine PHP5> - # Load the module first - <IfModule !sapi_apache2.c> - LoadModule php5_module lib/apache2/modules/libphp5.so - </IfModule> - - # Set it to handle the files - AddHandler php5-script .php .phtml .php3 .php4 .php5 - AddType application/x-httpd-php-source .phps - DirectoryIndex index.html index.html.var index.php index.phtml -</IfDefine> diff --git a/meta-webserver/recipes-php/modphp/files/configure.patch b/meta-webserver/recipes-php/modphp/files/configure.patch deleted file mode 100644 index c5334c7..0000000 --- a/meta-webserver/recipes-php/modphp/files/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-5.1.6/configure.old 2006-09-12 07:54:14.000000000 -0700 -+++ php-5.1.6/configure 2006-09-12 07:54:37.000000000 -0700 -@@ -14715,8 +14715,6 @@ - - - -- unset ac_cv_func_dlopen -- unset ac_cv_func___dlopen - unset found - - echo $ac_n "checking for dlopen""... $ac_c" 1>&6 diff --git a/meta-webserver/recipes-php/modphp/files/php-CVE-2014-3587.patch b/meta-webserver/recipes-php/modphp/files/php-CVE-2014-3587.patch deleted file mode 100644 index e1c40f2..0000000 --- a/meta-webserver/recipes-php/modphp/files/php-CVE-2014-3587.patch +++ /dev/null @@ -1,31 +0,0 @@ -modphp: Security Advisory - php - CVE-2014-3587 - -Upstream-Status: Backport - -Signed-off-by: Yue Tao <yue.tao@windriver.com> - -From 7ba1409a1aee5925180de546057ddd84ff267947 Mon Sep 17 00:00:00 2001 -From: Remi Collet <rcollet@redhat.com> -Date: Thu, 14 Aug 2014 17:19:03 -0700 -Subject: [PATCH] Fix bug #67716 - Segfault in cdf.c - ---- - ext/fileinfo/libmagic/cdf.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c -index 429f3b9..2c0a2d9 100644 ---- a/ext/fileinfo/libmagic/cdf.c -+++ b/ext/fileinfo/libmagic/cdf.c -@@ -820,7 +820,7 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, - q = (const uint8_t *)(const void *) - ((const char *)(const void *)p + ofs - - 2 * sizeof(uint32_t)); -- if (q > e) { -+ if (q < p || q > e) { - DPRINTF(("Ran of the end %p > %p\n", q, e)); - goto out; - } --- -1.7.9.5 - diff --git a/meta-webserver/recipes-php/modphp/files/php-CVE-2014-3597.patch b/meta-webserver/recipes-php/modphp/files/php-CVE-2014-3597.patch deleted file mode 100644 index 73f4e32..0000000 --- a/meta-webserver/recipes-php/modphp/files/php-CVE-2014-3597.patch +++ /dev/null @@ -1,282 +0,0 @@ -modphp: Security Advisory - php - CVE-2014-3597 - -Upstream-Status: Backport - -Signed-off-by: Yue Tao <yue.tao@windriver.com> - -From 2fefae47716d501aec41c1102f3fd4531f070b05 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Tue, 19 Aug 2014 08:33:49 +0200 -Subject: [PATCH] Fixed Sec Bug #67717 segfault in dns_get_record - CVE-2014-3597 - -Incomplete fix for CVE-2014-4049 - -Check possible buffer overflow -- pass real buffer end to dn_expand calls -- check buffer len before each read ---- - ext/standard/dns.c | 84 +++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 60 insertions(+), 24 deletions(-) - -diff --git a/ext/standard/dns.c b/ext/standard/dns.c -index 214a7dc..0b5e69c 100644 ---- a/ext/standard/dns.c -+++ b/ext/standard/dns.c -@@ -412,8 +412,14 @@ PHP_FUNCTION(dns_check_record) - - #if HAVE_FULL_DNS_FUNCS - -+#define CHECKCP(n) do { \ -+ if (cp + n > end) { \ -+ return NULL; \ -+ } \ -+} while (0) -+ - /* {{{ php_parserr */ --static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int store, int raw, zval **subarray) -+static u_char *php_parserr(u_char *cp, u_char *end, querybuf *answer, int type_to_fetch, int store, int raw, zval **subarray) - { - u_short type, class, dlen; - u_long ttl; -@@ -425,16 +431,18 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - - *subarray = NULL; - -- n = dn_expand(answer->qb2, answer->qb2+65536, cp, name, sizeof(name) - 2); -+ n = dn_expand(answer->qb2, end, cp, name, sizeof(name) - 2); - if (n < 0) { - return NULL; - } - cp += n; - -+ CHECKCP(10); - GETSHORT(type, cp); - GETSHORT(class, cp); - GETLONG(ttl, cp); - GETSHORT(dlen, cp); -+ CHECKCP(dlen); - if (type_to_fetch != T_ANY && type != type_to_fetch) { - cp += dlen; - return cp; -@@ -461,12 +469,14 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - - switch (type) { - case DNS_T_A: -+ CHECKCP(4); - add_assoc_string(*subarray, "type", "A", 1); - snprintf(name, sizeof(name), "%d.%d.%d.%d", cp[0], cp[1], cp[2], cp[3]); - add_assoc_string(*subarray, "ip", name, 1); - cp += dlen; - break; - case DNS_T_MX: -+ CHECKCP(2); - add_assoc_string(*subarray, "type", "MX", 1); - GETSHORT(n, cp); - add_assoc_long(*subarray, "pri", n); -@@ -485,7 +495,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - if (type == DNS_T_PTR) { - add_assoc_string(*subarray, "type", "PTR", 1); - } -- n = dn_expand(answer->qb2, answer->qb2+65536, cp, name, (sizeof name) - 2); -+ n = dn_expand(answer->qb2, end, cp, name, (sizeof name) - 2); - if (n < 0) { - return NULL; - } -@@ -495,18 +505,22 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - case DNS_T_HINFO: - /* See RFC 1010 for values */ - add_assoc_string(*subarray, "type", "HINFO", 1); -+ CHECKCP(1); - n = *cp & 0xFF; - cp++; -+ CHECKCP(n); - add_assoc_stringl(*subarray, "cpu", (char*)cp, n, 1); - cp += n; -+ CHECKCP(1); - n = *cp & 0xFF; - cp++; -+ CHECKCP(n); - add_assoc_stringl(*subarray, "os", (char*)cp, n, 1); - cp += n; - break; - case DNS_T_TXT: - { -- int ll = 0; -+ int l1 = 0, l2 = 0; - zval *entries = NULL; - - add_assoc_string(*subarray, "type", "TXT", 1); -@@ -515,37 +529,41 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - MAKE_STD_ZVAL(entries); - array_init(entries); - -- while (ll < dlen) { -- n = cp[ll]; -- if ((ll + n) >= dlen) { -+ while (l1 < dlen) { -+ n = cp[l1]; -+ if ((l1 + n) >= dlen) { - // Invalid chunk length, truncate -- n = dlen - (ll + 1); -+ n = dlen - (l1 + 1); -+ } -+ if (n) { -+ memcpy(tp + l2 , cp + l1 + 1, n); -+ add_next_index_stringl(entries, cp + l1 + 1, n, 1); - } -- memcpy(tp + ll , cp + ll + 1, n); -- add_next_index_stringl(entries, cp + ll + 1, n, 1); -- ll = ll + n + 1; -+ l1 = l1 + n + 1; -+ l2 = l2 + n; - } -- tp[dlen] = '\0'; -+ tp[l2] = '\0'; - cp += dlen; - -- add_assoc_stringl(*subarray, "txt", tp, (dlen>0)?dlen - 1:0, 0); -+ add_assoc_stringl(*subarray, "txt", tp, l2, 0); - add_assoc_zval(*subarray, "entries", entries); - } - break; - case DNS_T_SOA: - add_assoc_string(*subarray, "type", "SOA", 1); -- n = dn_expand(answer->qb2, answer->qb2+65536, cp, name, (sizeof name) -2); -+ n = dn_expand(answer->qb2, end, cp, name, (sizeof name) -2); - if (n < 0) { - return NULL; - } - cp += n; - add_assoc_string(*subarray, "mname", name, 1); -- n = dn_expand(answer->qb2, answer->qb2+65536, cp, name, (sizeof name) -2); -+ n = dn_expand(answer->qb2, end, cp, name, (sizeof name) -2); - if (n < 0) { - return NULL; - } - cp += n; - add_assoc_string(*subarray, "rname", name, 1); -+ CHECKCP(5*4); - GETLONG(n, cp); - add_assoc_long(*subarray, "serial", n); - GETLONG(n, cp); -@@ -559,6 +577,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - break; - case DNS_T_AAAA: - tp = (u_char*)name; -+ CHECKCP(8*2); - for(i=0; i < 8; i++) { - GETSHORT(s, cp); - if (s != 0) { -@@ -593,6 +612,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - case DNS_T_A6: - p = cp; - add_assoc_string(*subarray, "type", "A6", 1); -+ CHECKCP(1); - n = ((int)cp[0]) & 0xFF; - cp++; - add_assoc_long(*subarray, "masklen", n); -@@ -628,6 +648,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - cp++; - } - for (i = (n + 8) / 16; i < 8; i++) { -+ CHECKCP(2); - GETSHORT(s, cp); - if (s != 0) { - if (tp > (u_char *)name) { -@@ -657,7 +678,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - tp[0] = '\0'; - add_assoc_string(*subarray, "ipv6", name, 1); - if (cp < p + dlen) { -- n = dn_expand(answer->qb2, answer->qb2+65536, cp, name, (sizeof name) - 2); -+ n = dn_expand(answer->qb2, end, cp, name, (sizeof name) - 2); - if (n < 0) { - return NULL; - } -@@ -666,6 +687,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - } - break; - case DNS_T_SRV: -+ CHECKCP(3*2); - add_assoc_string(*subarray, "type", "SRV", 1); - GETSHORT(n, cp); - add_assoc_long(*subarray, "pri", n); -@@ -673,7 +695,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - add_assoc_long(*subarray, "weight", n); - GETSHORT(n, cp); - add_assoc_long(*subarray, "port", n); -- n = dn_expand(answer->qb2, answer->qb2+65536, cp, name, (sizeof name) - 2); -+ n = dn_expand(answer->qb2, end, cp, name, (sizeof name) - 2); - if (n < 0) { - return NULL; - } -@@ -681,21 +703,35 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int - add_assoc_string(*subarray, "target", name, 1); - break; - case DNS_T_NAPTR: -+ CHECKCP(2*2); - add_assoc_string(*subarray, "type", "NAPTR", 1); - GETSHORT(n, cp); - add_assoc_long(*subarray, "order", n); - GETSHORT(n, cp); - add_assoc_long(*subarray, "pref", n); -+ -+ CHECKCP(1); - n = (cp[0] & 0xFF); -- add_assoc_stringl(*subarray, "flags", (char*)++cp, n, 1); -+ cp++; -+ CHECKCP(n); -+ add_assoc_stringl(*subarray, "flags", (char*)cp, n, 1); - cp += n; -+ -+ CHECKCP(1); - n = (cp[0] & 0xFF); -- add_assoc_stringl(*subarray, "services", (char*)++cp, n, 1); -+ cp++; -+ CHECKCP(n); -+ add_assoc_stringl(*subarray, "services", (char*)cp, n, 1); - cp += n; -+ -+ CHECKCP(1); - n = (cp[0] & 0xFF); -- add_assoc_stringl(*subarray, "regex", (char*)++cp, n, 1); -+ cp++; -+ CHECKCP(n); -+ add_assoc_stringl(*subarray, "regex", (char*)cp, n, 1); - cp += n; -- n = dn_expand(answer->qb2, answer->qb2+65536, cp, name, (sizeof name) - 2); -+ -+ n = dn_expand(answer->qb2, end, cp, name, (sizeof name) - 2); - if (n < 0) { - return NULL; - } -@@ -888,7 +924,7 @@ PHP_FUNCTION(dns_get_record) - while (an-- && cp && cp < end) { - zval *retval; - -- cp = php_parserr(cp, &answer, type_to_fetch, store_results, raw, &retval); -+ cp = php_parserr(cp, end, &answer, type_to_fetch, store_results, raw, &retval); - if (retval != NULL && store_results) { - add_next_index_zval(return_value, retval); - } -@@ -901,7 +937,7 @@ PHP_FUNCTION(dns_get_record) - while (ns-- > 0 && cp && cp < end) { - zval *retval = NULL; - -- cp = php_parserr(cp, &answer, DNS_T_ANY, authns != NULL, raw, &retval); -+ cp = php_parserr(cp, end, &answer, DNS_T_ANY, authns != NULL, raw, &retval); - if (retval != NULL) { - add_next_index_zval(authns, retval); - } -@@ -913,7 +949,7 @@ PHP_FUNCTION(dns_get_record) - while (ar-- > 0 && cp && cp < end) { - zval *retval = NULL; - -- cp = php_parserr(cp, &answer, DNS_T_ANY, 1, raw, &retval); -+ cp = php_parserr(cp, end, &answer, DNS_T_ANY, 1, raw, &retval); - if (retval != NULL) { - add_next_index_zval(addtl, retval); - } --- -1.7.9.5 - diff --git a/meta-webserver/recipes-php/modphp/files/php-CVE-2014-5120.patch b/meta-webserver/recipes-php/modphp/files/php-CVE-2014-5120.patch deleted file mode 100644 index f2e23b3..0000000 --- a/meta-webserver/recipes-php/modphp/files/php-CVE-2014-5120.patch +++ /dev/null @@ -1,35 +0,0 @@ -modphp: Security Advisory - php - CVE-2014-5120 - -Upstream-Status: Backport - -Signed-off-by Yue Tao <yue.tao@windriver.com> - -From 706aefb78112a44d4932d4c9430c6a898696f51f Mon Sep 17 00:00:00 2001 -From: Stanislav Malyshev <stas@php.net> -Date: Mon, 18 Aug 2014 22:49:10 -0700 -Subject: [PATCH] Fix bug #67730 - Null byte injection possible with imagexxx - functions - ---- - ext/gd/gd_ctx.c | 5 +++++ - 2 files changed, 7 insertions(+) - -diff --git a/ext/gd/gd_ctx.c b/ext/gd/gd_ctx.c -index bff691f..eafbab5 100644 ---- a/ext/gd/gd_ctx.c -+++ b/ext/gd/gd_ctx.c -@@ -124,6 +124,11 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, - RETURN_FALSE; - } - } else if (Z_TYPE_P(to_zval) == IS_STRING) { -+ if (CHECK_ZVAL_NULL_PATH(to_zval)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid 2nd parameter, filename must not contain null bytes"); -+ RETURN_FALSE; -+ } -+ - stream = php_stream_open_wrapper(Z_STRVAL_P(to_zval), "wb", REPORT_ERRORS|IGNORE_PATH|IGNORE_URL_WIN, NULL); - if (stream == NULL) { - RETURN_FALSE; --- -1.7.9.5 - diff --git a/meta-webserver/recipes-php/modphp/files/pthread-check-threads-m4.patch b/meta-webserver/recipes-php/modphp/files/pthread-check-threads-m4.patch deleted file mode 100644 index 0c564cd..0000000 --- a/meta-webserver/recipes-php/modphp/files/pthread-check-threads-m4.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d8067ceacbf54e79c9c6b68675332c09eaa0b55d Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Mon, 8 Apr 2013 14:29:51 +0800 -Subject: [PATCH] pthread-check - -Enable pthreads support when cross-compiling - -Upstream-Status: Inapproprate [config] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - TSRM/threads.m4 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/TSRM/threads.m4 b/TSRM/threads.m4 -index 38494ce..15d9454 100644 ---- a/TSRM/threads.m4 -+++ b/TSRM/threads.m4 -@@ -86,7 +86,7 @@ int main() { - pthreads_working=no - ], [ - dnl For cross compiling running this test is of no use. NetWare supports pthreads -- pthreads_working=no -+ pthreads_working=yes - case $host_alias in - *netware*) - pthreads_working=yes --- -1.7.4.1 - diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc deleted file mode 100644 index f60c7bb..0000000 --- a/meta-webserver/recipes-php/modphp/modphp5.inc +++ /dev/null @@ -1,112 +0,0 @@ -SECTION = "console/network" -DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the apache php module." -LICENSE = "PHP-3.0" -INC_PR = "r1" -DEPENDS = "apache2-native apache2 zlib bzip2 libmcrypt" - -SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \ - file://configure.patch \ - file://pthread-check-threads-m4.patch \ - file://70_mod_php5.conf \ - file://0001-using-pkgconfig-to-check-libxml.patch \ - file://php-CVE-2014-5120.patch \ - file://php-CVE-2014-3587.patch \ - file://php-CVE-2014-3597.patch \ -" - -S = "${WORKDIR}/php-${PV}" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108" - -inherit autotools pkgconfig - -PNBLACKLIST[modphp] ?= "CONFLICT: 466 header files conflict with php" -# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h - -CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" - -EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs \ - --with-pic \ - --enable-maintainer-zts \ - --without-mysql \ - --disable-cgi \ - --disable-cli \ - --disable-pdo \ - --without-pear \ - --without-iconv \ - --disable-ipv6 \ - --disable-xml \ - --disable-xmlreader \ - --disable-xmlwriter \ - --disable-simplexml \ - --disable-dom \ - --disable-rpath \ - --libdir=${libdir}/php5 \ - --with-zlib --with-zlib-dir=${STAGING_DIR_TARGET}${exec_prefix} \ - --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ - --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ - --enable-zip \ - --enable-mbstring \ - --with-config-file-path=${sysconfdir}/php/apache2-php5 \ - ${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)}" - -PACKAGECONFIG ??= "mysql" -PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config,--without-mysqli,mysql5" -PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,mysql5" -PACKAGECONFIG[libxml] = "--enable-libxml,--disable-libxml,libxml2" -PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2" - -acpaths = "" - -do_configure_prepend () { - rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4 - find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!' -} - -do_configure_append() { - # No libtool, we really don't want rpath set... - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${HOST_SYS}-libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${HOST_SYS}-libtool -} - -do_install () { - install -d ${D}${libdir}/apache2/modules - install -d ${D}${sysconfdir}/apache2/modules.d - install -d ${D}${sysconfdir}/php/apache2-php5 - install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules - install -m 644 ${WORKDIR}/70_mod_php5.conf ${D}${sysconfdir}/apache2/modules.d - sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php5.conf - cat ${S}/php.ini-production | \ - sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ - > ${D}${sysconfdir}/php/apache2-php5/php.ini - - install -d ${D}${bindir} - install -m 755 scripts/phpize ${D}${bindir} - install -m 755 scripts/php-config ${D}${bindir} - cat aclocal-copy/libtool.m4 aclocal-copy/lt~obsolete.m4 aclocal-copy/ltoptions.m4 \ - aclocal-copy/ltsugar.m4 aclocal-copy/ltversion.m4 > ${S}/build/libtool.m4 - - oe_runmake install-build install-headers INSTALL_ROOT=${D} -} - -SYSROOT_PREPROCESS_FUNCS += "php_sysroot_preprocess" - -php_sysroot_preprocess () { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/phpize ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/php-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - - sed -i 's!eval echo /!eval echo ${STAGING_DIR_HOST}/!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/phpize - sed -i 's!^include_dir=.*!include_dir=${STAGING_INCDIR}/php!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/php-config -} - -# phpize is not scanned for absolute paths by default (but php-config is). -# -SSTATE_SCAN_FILES += "phpize" - -RDEPENDS_${PN} = "apache2" - -FILES_${PN} = "${libdir}/apache2 ${sysconfdir}" -FILES_${PN}-dev += "${bindir}/phpize ${bindir}/php-config ${libdir}/php5" -FILES_${PN}-dbg += "${libdir}/apache2/modules/.debug" - diff --git a/meta-webserver/recipes-php/modphp/modphp_5.5.15.bb b/meta-webserver/recipes-php/modphp/modphp_5.5.15.bb deleted file mode 100644 index aed620f..0000000 --- a/meta-webserver/recipes-php/modphp/modphp_5.5.15.bb +++ /dev/null @@ -1,7 +0,0 @@ -include modphp5.inc - -EXTRA_OECONF += "--disable-opcache" - -SRC_URI[md5sum] = "5cb5f2ed9099299f8a4c952d59d93812" -SRC_URI[sha256sum] = "00f24226b12fee27e332383b6304f1b9ed3f4d9173dd728a68c5c3f5a59b8ba7" - -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-webserver][PATCH v2 06/12] README: update for modphp merging into php 2015-01-05 10:33 [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Paul Eggleton ` (4 preceding siblings ...) 2015-01-05 10:33 ` [meta-webserver][PATCH v2 05/12] modphp: remove Paul Eggleton @ 2015-01-05 10:33 ` Paul Eggleton 2015-01-05 10:33 ` [meta-oe][PATCH v2 07/12] uw-imap: make libpam dependency dependent on DISTRO_FEATURES Paul Eggleton ` (6 subsequent siblings) 12 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-webserver/README | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/meta-webserver/README b/meta-webserver/README index f3fe735..379b54a 100644 --- a/meta-webserver/README +++ b/meta-webserver/README @@ -29,10 +29,24 @@ Layout ------ recipes-httpd/ Web servers -recipes-php/ PHP and PHP applications +recipes-php/ PHP applications +recipes-support/ Miscellaneous support recipes recipes-webadmin/ Standalone web administration interfaces +Notes +----- + +* This layer used to provide a modphp recipe that built mod_php, but + this is now built as part of the php recipe in meta-oe. However, since + apache2 is required to build mod_php, and apache2 recipe is in this + layer and recipes in meta-oe can't depend on it, mod_php is not built + by default. If you do wish to use mod_php, you need to add "apache2" + to the PACKAGECONFIG value for the php recipe in order to enable it. + See here for info on how to do that: + + http://www.yoctoproject.org/docs/current/ref-manual/ref-manual.html#var-PACKAGECONFIG + Maintenance ----------- -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-oe][PATCH v2 07/12] uw-imap: make libpam dependency dependent on DISTRO_FEATURES 2015-01-05 10:33 [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Paul Eggleton ` (5 preceding siblings ...) 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 ` Paul Eggleton 2015-01-05 10:33 ` [meta-oe][PATCH v2 08/12] php: add PACKAGECONFIG to fix implicit dependency on libpam Paul Eggleton ` (5 subsequent siblings) 12 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel If pam is not in DISTRO_FEATURES, we shouldn't be building it. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index e1a9877..52b689e 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb @@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a6a4ddbb7cd2999f6827ee143f6fcd97" -DEPENDS = "openssl libpam" +DEPENDS = "openssl" SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.gz \ file://quote_cctype.patch \ @@ -17,13 +17,16 @@ SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520 S = "${WORKDIR}/imap-${PV}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG[pam] = ",,libpam" + EXTRA_OEMAKE = "CC='${CC}'" HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h" do_compile() { echo "SSLINCLUDE=${STAGING_INCDIR} SSLLIB=${STAGING_LIBDIR}" > ${S}/SPECIALS - oe_runmake lnp + oe_runmake ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'lnp', 'slx', d)} } do_install() { -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-oe][PATCH v2 08/12] php: add PACKAGECONFIG to fix implicit dependency on libpam 2015-01-05 10:33 [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Paul Eggleton ` (6 preceding siblings ...) 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 ` Paul Eggleton 2015-01-05 10:33 ` [meta-oe][PATCH v2 09/12] php: add PACKAGECONFIG for imap Paul Eggleton ` (4 subsequent siblings) 12 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel Add a pam PACKAGECONFIG option defaulted from the pam DISTRO_FEATURES item, so that if pam isn't in DISTRO_FEATURES, it is explicitly disabled (and conversely if it is in DISTRO_FEATURES that we have an explicit dependency on libpam). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-oe/recipes-devtools/php/php_5.5.20.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/php/php_5.5.20.bb b/meta-oe/recipes-devtools/php/php_5.5.20.bb index 7f11b7f..03384cc 100644 --- a/meta-oe/recipes-devtools/php/php_5.5.20.bb +++ b/meta-oe/recipes-devtools/php/php_5.5.20.bb @@ -65,6 +65,7 @@ EXTRA_OECONF = "--enable-mbstring \ --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ --with-config-file-path=${sysconfdir}/php/apache2-php5 \ ${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \ ${COMMON_EXTRA_OECONF} \ " EXTRA_OECONF_class-native = " \ @@ -73,7 +74,8 @@ EXTRA_OECONF_class-native = " \ ${COMMON_EXTRA_OECONF} \ " -PACKAGECONFIG ??= "mysql sqlite3" +PACKAGECONFIG ??= "mysql sqlite3 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG_class-native = "" PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \ @@ -89,6 +91,7 @@ PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \ PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2" PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" +PACKAGECONFIG[pam] = ",,libpam" export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-oe][PATCH v2 09/12] php: add PACKAGECONFIG for imap 2015-01-05 10:33 [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Paul Eggleton ` (7 preceding siblings ...) 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 ` Paul Eggleton 2015-01-05 10:33 ` [meta-webserver][PATCH v2 10/12] xdebug: fix DEPENDS and un-blacklist Paul Eggleton ` (3 subsequent siblings) 12 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel Allow imap support to be easily disabled; default it to enabled based on previous configuration. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-oe/recipes-devtools/php/php_5.5.20.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-devtools/php/php_5.5.20.bb b/meta-oe/recipes-devtools/php/php_5.5.20.bb index 03384cc..ad6602a 100644 --- a/meta-oe/recipes-devtools/php/php_5.5.20.bb +++ b/meta-oe/recipes-devtools/php/php_5.5.20.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108" BBCLASSEXTEND = "native" DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \ - uw-imap openssl libmcrypt" + openssl libmcrypt" DEPENDS_class-native = "zlib-native libxml2-native" SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ @@ -56,9 +56,7 @@ EXTRA_OECONF = "--enable-mbstring \ --enable-wddx \ --enable-fpm \ --enable-zip \ - --with-imap=${STAGING_DIR_HOST} \ --with-gettext=${STAGING_LIBDIR}/.. \ - --with-imap-ssl=${STAGING_DIR_HOST} \ --with-zlib=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \ --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ @@ -74,7 +72,7 @@ EXTRA_OECONF_class-native = " \ ${COMMON_EXTRA_OECONF} \ " -PACKAGECONFIG ??= "mysql sqlite3 \ +PACKAGECONFIG ??= "mysql sqlite3 imap \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG_class-native = "" @@ -92,6 +90,10 @@ PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--witho PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2" PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" PACKAGECONFIG[pam] = ",,libpam" +PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ + --with-imap-ssl=${STAGING_DIR_HOST} \ + ,--without-imap --without-imap-ssl \ + ,uw-imap" export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-webserver][PATCH v2 10/12] xdebug: fix DEPENDS and un-blacklist 2015-01-05 10:33 [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Paul Eggleton ` (8 preceding siblings ...) 2015-01-05 10:33 ` [meta-oe][PATCH v2 09/12] php: add PACKAGECONFIG for imap Paul Eggleton @ 2015-01-05 10:33 ` Paul Eggleton 2015-01-05 10:33 ` [meta-webserver][PATCH v2 11/12] xdebug: update to 2.2.6 Paul Eggleton ` (2 subsequent siblings) 12 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel Now we use a single php recipe there is no conflict. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb b/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb index 66aff5e..6f472fb 100644 --- a/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb +++ b/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb @@ -2,9 +2,7 @@ SUMMARY = "Debugging and profiling extension for PHP" LICENSE = "Xdebug" LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16" -DEPENDS = "modphp" - -PNBLACKLIST[xdebug] ?= "CONFLICT: depends on blocked modphp" +DEPENDS = "php" SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-webserver][PATCH v2 11/12] xdebug: update to 2.2.6 2015-01-05 10:33 [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Paul Eggleton ` (9 preceding siblings ...) 2015-01-05 10:33 ` [meta-webserver][PATCH v2 10/12] xdebug: fix DEPENDS and un-blacklist Paul Eggleton @ 2015-01-05 10:33 ` 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 12 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- .../recipes-php/xdebug/{xdebug_2.2.5.bb => xdebug_2.2.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-webserver/recipes-php/xdebug/{xdebug_2.2.5.bb => xdebug_2.2.6.bb} (85%) diff --git a/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb b/meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb similarity index 85% rename from meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb rename to meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb index 6f472fb..1ecac88 100644 --- a/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb +++ b/meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb @@ -6,8 +6,8 @@ DEPENDS = "php" SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" -SRC_URI[md5sum] = "7e571ce8eb6fa969fd8263969019849d" -SRC_URI[sha256sum] = "adc6fe92dcff2368be94d20a5997aadb4d46d74551e2dd6602a704a35a195a6f" +SRC_URI[md5sum] = "f216356861e27284580d0208060ea7fa" +SRC_URI[sha256sum] = "6dd1cba0605e75009331aa3625a19ef49ade5a75aa9fe2ff8a818108d2cce84e" inherit autotools -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [meta-webserver][PATCH v2 12/12] phpmyadmin: update to 4.3.4 2015-01-05 10:33 [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Paul Eggleton ` (10 preceding siblings ...) 2015-01-05 10:33 ` [meta-webserver][PATCH v2 11/12] xdebug: update to 2.2.6 Paul Eggleton @ 2015-01-05 10:33 ` Paul Eggleton 2015-01-05 11:59 ` [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Martin Jansa 12 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-05 10:33 UTC (permalink / raw) To: openembedded-devel Drop patches merged upstream. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- .../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 +--- 4 files changed, 2 insertions(+), 106 deletions(-) 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%) diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch deleted file mode 100644 index e23f94b..0000000 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 304fb2b645b36a39e03b954fdbd567173ebe6448 Mon Sep 17 00:00:00 2001 -From: Marc Delisle <marc@infomarc.info> -Date: Wed, 1 Oct 2014 08:09:12 -0400 -Subject: [PATCH] Bug 4544: additional fix for 4.2.x - -Upstream-Status: Backport - -Signed-off-by: Marc Delisle <marc@infomarc.info> ---- - libraries/TableSearch.class.php | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php -index a0b3fa4..b7eb42f 100644 ---- a/libraries/TableSearch.class.php -+++ b/libraries/TableSearch.class.php -@@ -992,7 +992,8 @@ EOT; - $html_output .= '<td>' . $properties['collation'] . '</td>'; - $html_output .= '<td>' . $properties['func'] . '</td>'; - // here, the data-type attribute is needed for a date/time picker -- $html_output .= '<td data-type="' . $properties['type'] . '"' -+ $html_output .= '<td data-type="' -+ . htmlspecialchars($properties['type']) . '"' - . '>' . $properties['value'] . '</td>'; - $html_output .= '</tr>'; - //Displays hidden fields --- -1.7.10.4 - diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch deleted file mode 100644 index 27eac77..0000000 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 90ddeecf60fc029608b972e490b735f3a65ed0cb Mon Sep 17 00:00:00 2001 -From: Madhura Jayaratne <madhura.cj@gmail.com> -Date: Sun, 17 Aug 2014 08:52:05 -0400 -Subject: [PATCH] bug #4504 [security] Self-XSS in query charts - -Upstream-status: Backport - -Signed-off-by: Marc Delisle <marc@infomarc.info> ---- - js/tbl_chart.js | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - - 4.2.7.0 (2014-07-31) -diff --git a/js/tbl_chart.js b/js/tbl_chart.js -index 943d4ae..04c9c40 100644 ---- a/js/tbl_chart.js -+++ b/js/tbl_chart.js -@@ -47,7 +47,7 @@ function PMA_queryChart(data, columnNames, settings) { - }, - axes : { - xaxis : { -- label : settings.xaxisLabel -+ label : escapeHtml(settings.xaxisLabel) - }, - yaxis : { - label : settings.yaxisLabel --- -1.7.10.4 - diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch deleted file mode 100644 index 164a072..0000000 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0cd293f5e13aa245e4a57b8d373597cc0e421b6f Mon Sep 17 00:00:00 2001 -From: Madhura Jayaratne <madhura.cj@gmail.com> -Date: Sun, 17 Aug 2014 08:41:57 -0400 -Subject: [PATCH] bug #4505 [security] XSS in view operations page - -Upstream-Status: Backport - -Signed-off-by: Marc Delisle <marc@infomarc.info> ---- - ChangeLog | 3 +++ - js/functions.js | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index 7afac1a..cec9d77 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,6 +1,9 @@ - phpMyAdmin - ChangeLog - ====================== - -+4.2.7.1 (2014-08-17) -+- bug #4505 [security] XSS in view operations page -+ - 4.2.7.0 (2014-07-31) - - bug Broken links on home page - - bug #4494 Overlap in navigation panel -diff --git a/js/functions.js b/js/functions.js -index 09bfeda..a970a81 100644 ---- a/js/functions.js -+++ b/js/functions.js -@@ -3585,7 +3585,7 @@ AJAX.registerOnload('functions.js', function () { - var question = PMA_messages.strDropTableStrongWarning + ' '; - question += $.sprintf( - PMA_messages.strDoYouReally, -- 'DROP VIEW ' + PMA_commonParams.get('table') -+ 'DROP VIEW ' + escapeHtml(PMA_commonParams.get('table')) - ); - - $(this).PMA_confirm(question, $(this).attr('href'), function (url) { --- -1.7.10.4 - diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.3.4.bb similarity index 75% rename from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb rename to meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.3.4.bb index 7cc3604..76068e2 100644 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb +++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.3.4.bb @@ -6,13 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \ file://libraries/tcpdf/LICENSE.TXT;md5=5c87b66a5358ebcc495b03e0afcd342c" SRC_URI = "${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ - file://0001-bug-4504-security-Self-XSS-in-query-charts.patch \ - file://0001-bug-4505-security-XSS-in-view-operations-page.patch \ - file://0001-Bug-4544-additional-fix-for-4.2.x.patch \ file://apache.conf" -SRC_URI[md5sum] = "0dcd755450dac819f33502590c88ad29" -SRC_URI[sha256sum] = "5d101dd88a99a869bc0c684a7f687cf290abc4bf306daac73337cbde2d7743e4" +SRC_URI[md5sum] = "f811243e241ee81defb97e014ca713ef" +SRC_URI[sha256sum] = "91258e07e04e25c5e49284b194ebff8ffa807ad38832fbe802cc6af3f7cb96d3" S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" -- 1.9.3 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade 2015-01-05 10:33 [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade Paul Eggleton ` (11 preceding siblings ...) 2015-01-05 10:33 ` [meta-webserver][PATCH v2 12/12] phpmyadmin: update to 4.3.4 Paul Eggleton @ 2015-01-05 11:59 ` Martin Jansa 2015-01-07 10:14 ` Martin Jansa 12 siblings, 1 reply; 21+ messages in thread From: Martin Jansa @ 2015-01-05 11:59 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 5651 bytes --] 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. 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 [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade 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 2015-01-07 10:34 ` Paul Eggleton 2015-01-07 11:55 ` Paul Eggleton 0 siblings, 2 replies; 21+ messages in thread From: Martin Jansa @ 2015-01-07 10:14 UTC (permalink / raw) To: openembedded-devel [-- 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 --] ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade 2015-01-07 10:14 ` Martin Jansa @ 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 1 sibling, 2 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-07 10:34 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel On Wednesday 07 January 2015 11:14:23 Martin Jansa wrote: > 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] That is very strange. Do you perhaps have any information on how you might reproduce that? I did not receive any QA warnings when building this. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade 2015-01-07 10:34 ` Paul Eggleton @ 2015-01-07 10:41 ` Paul Eggleton 2015-01-07 10:42 ` Martin Jansa 1 sibling, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-07 10:41 UTC (permalink / raw) To: openembedded-devel On Wednesday 07 January 2015 10:34:43 Paul Eggleton wrote: > On Wednesday 07 January 2015 11:14:23 Martin Jansa wrote: > > 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] > > That is very strange. Do you perhaps have any information on how you might > reproduce that? I did not receive any QA warnings when building this. Actually I know why - for some reason poky.conf does not have file-rdeps in WARN_QA or ERROR_QA. Investigating. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade 2015-01-07 10:34 ` Paul Eggleton 2015-01-07 10:41 ` Paul Eggleton @ 2015-01-07 10:42 ` Martin Jansa 1 sibling, 0 replies; 21+ messages in thread From: Martin Jansa @ 2015-01-07 10:42 UTC (permalink / raw) To: Paul Eggleton; +Cc: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 999 bytes --] On Wed, Jan 07, 2015 at 10:34:43AM +0000, Paul Eggleton wrote: > On Wednesday 07 January 2015 11:14:23 Martin Jansa wrote: > > 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] > > That is very strange. Do you perhaps have any information on how you might > reproduce that? I did not receive any QA warnings when building this. Nothing special, it's shown in world builds as described in http://www.openembedded.org/wiki/Bitbake_World_Status_Setup > > Cheers, > Paul > > -- > > Paul Eggleton > Intel Open Source Technology Centre -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade 2015-01-07 10:14 ` Martin Jansa 2015-01-07 10:34 ` Paul Eggleton @ 2015-01-07 11:55 ` Paul Eggleton 2015-01-07 12:06 ` Paul Eggleton 1 sibling, 1 reply; 21+ messages in thread From: Paul Eggleton @ 2015-01-07 11:55 UTC (permalink / raw) To: openembedded-devel On Wednesday 07 January 2015 11:14:23 Martin Jansa wrote: > 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] OK, I've sent a v3 of just the offending patch, and pushed a new rebased paule/php branch. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [meta-oe/meta-webserver][PATCH v2 00/11] Merge modphp into php and upgrade 2015-01-07 11:55 ` Paul Eggleton @ 2015-01-07 12:06 ` Paul Eggleton 0 siblings, 0 replies; 21+ messages in thread From: Paul Eggleton @ 2015-01-07 12:06 UTC (permalink / raw) To: openembedded-devel On Wednesday 07 January 2015 11:55:08 Paul Eggleton wrote: > On Wednesday 07 January 2015 11:14:23 Martin Jansa wrote: > > 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] > > OK, I've sent a v3 of just the offending patch, and pushed a new rebased > paule/php branch. Actually, after rebuilding again, that hasn't fixed the warning despite the fact that the shebang is now correct. Sigh... Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2015-01-07 12:06 UTC | newest] Thread overview: 21+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 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 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
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.