Skip to contentSkip to conversation

Merge modphp into php and upgrade

PATCH Superseded Paul Eggleton 3 participants 17 messages Jan 2, 2015

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Merge modphp into php and upgrade

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).

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 (11):
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
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}                              |  24 +-
 .../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 +-
 20 files changed, 358 insertions(+), 809 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} (51%)
 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%)
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH 1/11 php: upgrade to 5.5.15

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 <[email protected]>
---
 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%)
meta-oe/recipes-devtools/php/php_5.5.15.bb renamed from meta-oe/recipes-devtools/php/php_5.4.33.bb +6 -5
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
@@ -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 = " \
Signature · 1 line
1.9.3
author
#2 lore raw

PATCH 2/11 libc-client: rename to uw-imap, upgrade to 2007f

In reply to Paul Eggleton

* 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 <[email protected]>
---
 .../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%)
meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007e-shared.patch new file +82 -0
new file mode 100644
index 0000000..4434e83
@@ -0,0 +1,82 @@
+Fix linking libraries built with -fPIC with this library
+
+Patch borrowed from Fedora
+
+Signed-off-by: Paul Eggleton <[email protected]>
+
+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
meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007f-format-security.patch new file +20 -0
new file mode 100644
index 0000000..6ec0476
@@ -0,0 +1,20 @@
+Fix error found with "-Werror=format-security" flag
+
+Patch borrowed from Fedora
+
+Signed-off-by: Paul Eggleton <[email protected]>
+
+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 */
meta-oe/recipes-devtools/uw-imap/uw-imap/quote_cctype.patch renamed from meta-oe/recipes-devtools/libc-client/files/quote_cctype.patch +0 -0
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
meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb renamed from meta-oe/recipes-devtools/libc-client/libc-client_2007e.bb +11 -5
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
@@ -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"
+
Signature · 1 line
1.9.3
author
#3 lore raw

PATCH 3/11 php: integrate modphp

In reply to Paul Eggleton

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 enabled. This does mean that apache2 is a build dependency by default; if you don't want this, set your own PACKAGECONFIG value for the php recipe.
* Specify ${libdir}/php5 as libdir. This avoids the PHP extensions directory being /usr/lib/extensions by default which is ugly.
* Bring in most patches and configure options from the modphp recipe.
* Tidy up some superfluous/malformed entries in FILES_${PN}-pear
* Drop obsolete PHP_MAJVER
* Replace virtclass- override with class-

Signed-off-by Paul Eggleton <[email protected]>
---
 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         | 144 ++++++++++++++++-----
 4 files changed, 164 insertions(+), 33 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
meta-oe/recipes-devtools/php/php/70_mod_php5.conf new file +12 -0
new file mode 100644
index 0000000..1de6fb1
@@ -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>
meta-oe/recipes-devtools/php/php/configure.patch new file +11 -0
new file mode 100644
index 0000000..c5334c7
@@ -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
meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch new file +30 -0
new file mode 100644
index 0000000..0c564cd
@@ -0,0 +1,30 @@
+From d8067ceacbf54e79c9c6b68675332c09eaa0b55d Mon Sep 17 00:00:00 2001
+From: Jackie Huang <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta-oe/recipes-devtools/php/php_5.5.15.bb +111 -33

225 lines not on this page · raw message

Signature · 1 line
1.9.3
author
#7 lore raw

PATCH 4/11 php: upgrade to 5.5.20

In reply to Paul Eggleton

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 <[email protected]>
---
 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%)
meta-oe/recipes-devtools/php/php_5.5.20.bb renamed from meta-oe/recipes-devtools/php/php_5.5.15.bb +2 -2
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 0a99bb4..a99a877 100644
@@ -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}"
Signature · 1 line
1.9.3
author
#8 lore raw

PATCH 5/11 modphp: remove

In reply to Paul Eggleton

This is now built out of the standard php recipe.

Signed-off-by Paul Eggleton <[email protected]>
---
 .../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
meta-webserver/recipes-php/modphp/files/0001-using-pkgconfig-to-check-libxml.patch deleted +0 -74
deleted file mode 100644
index bab5ff2..0000000
@@ -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 <[email protected]>
----
- 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
-
meta-webserver/recipes-php/modphp/files/70_mod_php5.conf deleted +0 -12
deleted file mode 100644
index 1de6fb1..0000000
@@ -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>
meta-webserver/recipes-php/modphp/files/configure.patch deleted +0 -11
deleted file mode 100644
index c5334c7..0000000
@@ -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
meta-webserver/recipes-php/modphp/files/php-CVE-2014-3587.patch deleted +0 -31
deleted file mode 100644
index e1c40f2..0000000
@@ -1,31 +0,0 @@
-modphp: Security Advisory - php - CVE-2014-3587
-
-Upstream-Status: Backport
-
-Signed-off-by: Yue Tao <[email protected]>
-
-From 7ba1409a1aee5925180de546057ddd84ff267947 Mon Sep 17 00:00:00 2001
-From: Remi Collet <[email protected]>
-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
-
meta-webserver/recipes-php/modphp/files/php-CVE-2014-3597.patch deleted +0 -282

282 lines not on this page · raw message

meta-webserver/recipes-php/modphp/files/php-CVE-2014-5120.patch deleted +0 -35
deleted file mode 100644
index f2e23b3..0000000
@@ -1,35 +0,0 @@
-modphp: Security Advisory - php - CVE-2014-5120
-
-Upstream-Status: Backport
-
-Signed-off-by Yue Tao <[email protected]>
-
-From 706aefb78112a44d4932d4c9430c6a898696f51f Mon Sep 17 00:00:00 2001
-From: Stanislav Malyshev <[email protected]>
-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
-
meta-webserver/recipes-php/modphp/files/pthread-check-threads-m4.patch deleted +0 -30
deleted file mode 100644
index 0c564cd..0000000
@@ -1,30 +0,0 @@
-From d8067ceacbf54e79c9c6b68675332c09eaa0b55d Mon Sep 17 00:00:00 2001
-From: Jackie Huang <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-webserver/recipes-php/modphp/modphp5.inc deleted +0 -112

112 lines not on this page · raw message

meta-webserver/recipes-php/modphp/modphp_5.5.15.bb deleted +0 -7
deleted file mode 100644
index aed620f..0000000
@@ -1,7 +0,0 @@
-include modphp5.inc
-
-EXTRA_OECONF += "--disable-opcache"
-
-SRC_URI[md5sum] = "5cb5f2ed9099299f8a4c952d59d93812"
-SRC_URI[sha256sum] = "00f24226b12fee27e332383b6304f1b9ed3f4d9173dd728a68c5c3f5a59b8ba7"
-
Signature · 1 line
1.9.3
author
#9 lore raw

PATCH 6/11 uw-imap: make libpam dependency dependent on DISTRO_FEATURES

In reply to Paul Eggleton

If pam is not in DISTRO_FEATURES, we shouldn't be building it.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +6 -2
index e1a9877..867c2d0 100644
@@ -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,17 @@ SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520
 
 S = "${WORKDIR}/imap-${PV}"
 
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG[pam] = ",,libpam"
+
+#EXTRA_OEMAKE = "CC='${CC}' ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'PAMLDFLAGS= CHECKPW=psx', d)}"
 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() {
Signature · 1 line
1.9.3
author
#12 lore raw

PATCH 7/11 php: add PACKAGECONFIG to fix implicit dependency on libpam

In reply to Paul Eggleton

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 <[email protected]>
---
 meta-oe/recipes-devtools/php/php_5.5.20.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-oe/recipes-devtools/php/php_5.5.20.bb +4 -1
index a99a877..75bfca0 100644
@@ -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 apache2"
+PACKAGECONFIG ??= "mysql sqlite3 apache2 \
+                   ${@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}"
Signature · 1 line
1.9.3
author
#13 lore raw

PATCH 8/11 php: add PACKAGECONFIG for imap

In reply to Paul Eggleton

Allow imap support to be easily disabled; default it to enabled based on previous configuration.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta-oe/recipes-devtools/php/php_5.5.20.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta-oe/recipes-devtools/php/php_5.5.20.bb +6 -4
index 75bfca0..9e0f628 100644
@@ -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 apache2 \
+PACKAGECONFIG ??= "mysql sqlite3 imap apache2 \
                    ${@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}"
Signature · 1 line
1.9.3
author
#14 lore raw

PATCH 9/11 xdebug: fix DEPENDS and un-blacklist

In reply to Paul Eggleton

Now we use a single php recipe there is no conflict.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb +1 -3
index 66aff5e..6f472fb 100644
@@ -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"
Signature · 1 line
1.9.3
author
#15 lore raw

PATCH 10/11 xdebug: update to 2.2.6

In reply to Paul Eggleton
Signed-off-by Paul Eggleton <[email protected]>
---
 .../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%)
meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb renamed from meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb +2 -2
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
@@ -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
Signature · 1 line
1.9.3
author
#16 lore raw

PATCH 11/11 phpmyadmin: update to 4.3.4

In reply to Paul Eggleton

Drop patches merged upstream.

Signed-off-by Paul Eggleton <[email protected]>
---
 .../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%)
meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch deleted +0 -29
deleted file mode 100644
index e23f94b..0000000
@@ -1,29 +0,0 @@
-From 304fb2b645b36a39e03b954fdbd567173ebe6448 Mon Sep 17 00:00:00 2001
-From: Marc Delisle <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch deleted +0 -29
deleted file mode 100644
index 27eac77..0000000
@@ -1,29 +0,0 @@
-From 90ddeecf60fc029608b972e490b735f3a65ed0cb Mon Sep 17 00:00:00 2001
-From: Madhura Jayaratne <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch deleted +0 -43

43 lines not on this page · raw message

meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.3.4.bb renamed from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb +2 -5
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
@@ -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"
Signature · 1 line
1.9.3
#10 lore raw

Re: [meta-oe][PATCH 06/11] uw-imap: make libpam dependency dependent on DISTRO_FEATURES

In reply to Paul Eggleton
Quoted 21 lines · Paul Eggleton

If pam is not in DISTRO_FEATURES, we shouldn't be building it.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +1 -1
index e1a9877..867c2d0 100644
@@ -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 \

meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520 · line 23

Quoted 7 lines
meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +4 -0
@@ -17,13 +17,17 @@ SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520
 
 S = "${WORKDIR}/imap-${PV}"
 
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG[pam] = ",,libpam"
+
+#EXTRA_OEMAKE = "CC='${CC}' ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'PAMLDFLAGS= CHECKPW=psx', d)}"

^ is this needed to prevent autodetecting it from sysroot?

Quoted 19 lines
meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +1 -1
 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() {
Signature · 7 lines
1.9.3

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#4 lore raw

Re: [meta-oe][PATCH 03/11] php: integrate modphp

In reply to Paul Eggleton
Quoted 8 lines · Paul Eggleton

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 enabled. This does mean that apache2 is a build dependency by default; if you don't want this, set your own PACKAGECONFIG value for the php recipe.

I think it should be disabled by default, because meta-oe layer doesn't depend on meta-webserver layer where apache2 lives.

meta-webserver can have .bbappend which will add it to PACKAGECONFIG for xdebug to work with default php recipe.

Quoted 332 lines

* Specify ${libdir}/php5 as libdir. This avoids the PHP extensions directory being /usr/lib/extensions by default which is ugly.
* Bring in most patches and configure options from the modphp recipe.
* Tidy up some superfluous/malformed entries in FILES_${PN}-pear
* Drop obsolete PHP_MAJVER
* Replace virtclass- override with class-

Signed-off-by Paul Eggleton <[email protected]>
---
 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         | 144 ++++++++++++++++-----
 4 files changed, 164 insertions(+), 33 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
meta-oe/recipes-devtools/php/php/70_mod_php5.conf new file +12 -0
new file mode 100644
index 0000000..1de6fb1
@@ -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>
meta-oe/recipes-devtools/php/php/configure.patch new file +11 -0
new file mode 100644
index 0000000..c5334c7
@@ -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
meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch new file +30 -0
new file mode 100644
index 0000000..0c564cd
@@ -0,0 +1,30 @@
+From d8067ceacbf54e79c9c6b68675332c09eaa0b55d Mon Sep 17 00:00:00 2001
+From: Jackie Huang <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta-oe/recipes-devtools/php/php_5.5.15.bb +111 -33
index ff81aee..0a99bb4 100644
@@ -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,53 +36,97 @@ 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} \
 "
 
-PACKAGECONFIG ??= "mysql sqlite3"
+PACKAGECONFIG ??= "mysql sqlite3 apache2"
 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}"
+
Signature · 7 lines
1.9.3

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#11 lore raw

Re: [meta-oe][PATCH 06/11] uw-imap: make libpam dependency dependent on DISTRO_FEATURES

In reply to Martin Jansa
Quoted 9 lines · Martin Jansa

Review

Quoted 8 lines · Paul Eggleton

If pam is not in DISTRO_FEATURES, we shouldn't be building it.

Signed-off-by Paul Eggleton <paul.eggleton <at> linux.intel.com>
---
 meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb

Quoted 6 lines

meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb

Quoted 6 lines

index e1a9877..867c2d0 100644

meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +0 -0
 <at>  <at>  -4,7 +4,7  <at>  <at>  SECTION = "devel"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM =

"file://LICENSE.txt;md5=a6a4ddbb7cd2999f6827ee143f6fcd97"

Quoted 7 lines

meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb SECTION = "devel"

Quoted 7 lines
meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +1 -1
-DEPENDS = "openssl libpam"
+DEPENDS = "openssl"
 
 SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.gz \
            file://quote_cctype.patch \
 <at>  <at>  -17,13 +17,17  <at>  <at>  SRC_URI[sha256sum] =

"53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520

Quoted 4 lines
Quoted 4 lines

S = "${WORKDIR}/imap-${PV}"

+PACKAGECONFIG ??= "${ <at> bb.utils.contains('DISTRO_FEATURES', 'pam',

'pam', '', d)}"

Quoted 3 lines

meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520

Quoted 3 lines
meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +3 -0
+PACKAGECONFIG[pam] = ",,libpam"
+
+#EXTRA_OEMAKE = "CC='${CC}' ${ <at> bb.utils.contains('PACKAGECONFIG',

'pam', '', 'PAMLDFLAGS=

Quoted 3 lines

CHECKPW=psx', d)}"

^ is this needed to prevent autodetecting it from sysroot?

No, that's from an earlier attempt that I forgot to remove. Will fix in v2.

Cheers,
Paul

#5 lore raw

Re: [meta-oe][PATCH 03/11] php: integrate modphp

In reply to Martin Jansa
Quoted 5 lines · Martin Jansa <martin.jansa <at> gmail.com> writes:
Quoted 4 lines · Paul Eggleton

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.

Quoted 7 lines
Quoted 4 lines

Changes made:
* Add an "apache2" PACKAGECONFIG, default enabled. This does mean that apache2 is a build dependency by default; if you don't want this, set your own PACKAGECONFIG value for the php recipe.

I think it should be disabled by default, because meta-oe layer doesn't depend on meta-webserver layer where apache2 lives.

You're right, somehow I completely missed that - sorry. I'll fix in v2 on Monday.

Quoted 2 lines

meta-webserver can have .bbappend which will add it to PACKAGECONFIG for xdebug to work with default php recipe.

As you may recall I'm of the opinion that software layers should not be setting the policy of other layers, so I don't think this is really appropriate; I'll just have to live with the fact that users who want it will need to enable it themselves. In any case by the end of the patchset, xdebug depends on php rather than modphp so it should still build fine without apache2 in PACKAGECONFIG.

Cheers,
Paul

#6 lore raw

Re: [meta-oe][PATCH 03/11] php: integrate modphp

Quoted 20 lines · Paul Eggleton
Quoted 5 lines · Martin Jansa <martin.jansa <at> gmail.com> writes:
Quoted 4 lines · Paul Eggleton

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.

Quoted 7 lines
Quoted 4 lines

Changes made:
* Add an "apache2" PACKAGECONFIG, default enabled. This does mean that apache2 is a build dependency by default; if you don't want this, set your own PACKAGECONFIG value for the php recipe.

I think it should be disabled by default, because meta-oe layer doesn't depend on meta-webserver layer where apache2 lives.

You're right, somehow I completely missed that - sorry. I'll fix in v2 on Monday.

Quoted 2 lines

meta-webserver can have .bbappend which will add it to PACKAGECONFIG for xdebug to work with default php recipe.

Quoted 6 lines

As you may recall I'm of the opinion that software layers should not be setting the policy of other layers, so I don't think this is really appropriate; I'll just have to live with the fact that users who want it will need to enable it themselves. In any case by the end of the patchset, xdebug depends on php rather than modphp so it should still build fine without apache2 in PACKAGECONFIG.

Ah, ok, I was assuming that xdebug depends on php with apache2 PACKAGECONFIG enabled.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]