* [PATCH 0/7] Apache/modphp/phpMyAdmin updates
@ 2013-05-10 18:09 Paul Eggleton
2013-05-10 18:09 ` [PATCH 1/7] apache2: update to 2.4.4 Paul Eggleton
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Paul Eggleton @ 2013-05-10 18:09 UTC (permalink / raw)
To: openembedded-devel
The following changes since commit cc0067dc0c7ea469057238db6422864d1bce311c:
rp-pppoe: fix multilib SRC_URI reference (2013-05-10 09:47:01 -0400)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib paule/webserver-updates
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/webserver-updates
Paul Eggleton (7):
apache2: update to 2.4.4
apache2: drop unneeded workaround for apr/apr-util config script issue
modphp: update to 5.4.15
modphp: fix text relocation QA warning
modphp: fix re-exec of do_install
phpmyadmin: update to 3.5.8.1
phpmyadmin: remove dependency on bash
.../apache-configure_perlbin.patch | 0
.../apache-ssl-ltmain-rpath.patch | 0
.../fix-libtool-name.patch | 0
.../httpd-2.4.1-corelimit.patch | 0
.../httpd-2.4.1-selinux.patch | 0
.../httpd-2.4.4-export.patch} | 6 +--
.../httpd-2.4.4-r1332643.patch} | 44 +++++++++++-----------
.../replace-lynx-to-curl-in-apachectl-script.patch | 0
.../server-makefile.patch | 0
...he2-native_2.4.3.bb => apache2-native_2.4.4.bb} | 5 +--
.../apache2/{apache2_2.4.3.bb => apache2_2.4.4.bb} | 22 +++--------
meta-webserver/recipes-php/modphp/modphp5.inc | 3 +-
meta-webserver/recipes-php/modphp/modphp_5.4.14.bb | 4 --
meta-webserver/recipes-php/modphp/modphp_5.4.15.bb | 4 ++
...phpmyadmin_3.5.2.2.bb => phpmyadmin_3.5.8.1.bb} | 9 +++--
15 files changed, 44 insertions(+), 53 deletions(-)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/apache-configure_perlbin.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/apache-ssl-ltmain-rpath.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/fix-libtool-name.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/httpd-2.4.1-corelimit.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/httpd-2.4.1-selinux.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3/httpd-2.4.1-export.patch => apache2-2.4.4/httpd-2.4.4-export.patch} (81%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3/httpd-2.4.2-r1332643.patch => apache2-2.4.4/httpd-2.4.4-r1332643.patch} (88%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/replace-lynx-to-curl-in-apachectl-script.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/server-makefile.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-native_2.4.3.bb => apache2-native_2.4.4.bb} (89%)
rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.3.bb => apache2_2.4.4.bb} (85%)
delete mode 100644 meta-webserver/recipes-php/modphp/modphp_5.4.14.bb
create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.4.15.bb
rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_3.5.2.2.bb => phpmyadmin_3.5.8.1.bb} (76%)
--
1.8.1.2
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/7] apache2: update to 2.4.4 2013-05-10 18:09 [PATCH 0/7] Apache/modphp/phpMyAdmin updates Paul Eggleton @ 2013-05-10 18:09 ` Paul Eggleton 2013-05-10 18:09 ` [PATCH 2/7] apache2: drop unneeded workaround for apr/apr-util config script issue Paul Eggleton ` (5 subsequent siblings) 6 siblings, 0 replies; 8+ messages in thread From: Paul Eggleton @ 2013-05-10 18:09 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- .../apache-configure_perlbin.patch | 0 .../apache-ssl-ltmain-rpath.patch | 0 .../fix-libtool-name.patch | 0 .../httpd-2.4.1-corelimit.patch | 0 .../httpd-2.4.1-selinux.patch | 0 .../httpd-2.4.4-export.patch} | 6 +-- .../httpd-2.4.4-r1332643.patch} | 44 +++++++++++----------- .../replace-lynx-to-curl-in-apachectl-script.patch | 0 .../server-makefile.patch | 0 ...he2-native_2.4.3.bb => apache2-native_2.4.4.bb} | 5 +-- .../apache2/{apache2_2.4.3.bb => apache2_2.4.4.bb} | 9 ++--- 11 files changed, 31 insertions(+), 33 deletions(-) rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/apache-configure_perlbin.patch (100%) rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/apache-ssl-ltmain-rpath.patch (100%) rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/fix-libtool-name.patch (100%) rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/httpd-2.4.1-corelimit.patch (100%) rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/httpd-2.4.1-selinux.patch (100%) rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3/httpd-2.4.1-export.patch => apache2-2.4.4/httpd-2.4.4-export.patch} (81%) rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3/httpd-2.4.2-r1332643.patch => apache2-2.4.4/httpd-2.4.4-r1332643.patch} (88%) rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/replace-lynx-to-curl-in-apachectl-script.patch (100%) rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.3 => apache2-2.4.4}/server-makefile.patch (100%) rename meta-webserver/recipes-httpd/apache2/{apache2-native_2.4.3.bb => apache2-native_2.4.4.bb} (89%) rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.3.bb => apache2_2.4.4.bb} (95%) diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-configure_perlbin.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-configure_perlbin.patch similarity index 100% rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-configure_perlbin.patch rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-configure_perlbin.patch diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-ssl-ltmain-rpath.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch similarity index 100% rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-ssl-ltmain-rpath.patch rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/fix-libtool-name.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/fix-libtool-name.patch similarity index 100% rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/fix-libtool-name.patch rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.4/fix-libtool-name.patch diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-corelimit.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-corelimit.patch similarity index 100% rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-corelimit.patch rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-corelimit.patch diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-selinux.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-selinux.patch similarity index 100% rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-selinux.patch rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-selinux.patch diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-export.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-export.patch similarity index 81% rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-export.patch rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-export.patch index ed629bf..afbed8e 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-export.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-export.patch @@ -8,8 +8,8 @@ Upstream-Status: Pending Note: EXPORT_DIRS change is conditional on using shared apr ---- httpd-2.4.1/server/Makefile.in.export -+++ httpd-2.4.1/server/Makefile.in +--- httpd-2.4.4/server/Makefile.in.export ++++ httpd-2.4.4/server/Makefile.in @@ -57,9 +57,6 @@ export_files: ( for dir in $(EXPORT_DIRS); do \ ls $$dir/*.h ; \ @@ -17,6 +17,6 @@ Note: EXPORT_DIRS change is conditional on using shared apr - for dir in $(EXPORT_DIRS_APR); do \ - ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \ - done; \ - ) | sort -u > $@ + ) | sed -e s,//,/,g | sort -u > $@ exports.c: export_files diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.2-r1332643.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-r1332643.patch similarity index 88% rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.2-r1332643.patch rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-r1332643.patch index 16fd7d7..ba28231 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.2-r1332643.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-r1332643.patch @@ -23,8 +23,8 @@ http://svn.apache.org/viewvc?view=revision&revision=1332643 Upstream-Status: Backport ---- httpd-2.4.2/modules/ssl/ssl_private.h -+++ httpd-2.4.2/modules/ssl/ssl_private.h +--- httpd-2.4.4/modules/ssl/ssl_private.h ++++ httpd-2.4.4/modules/ssl/ssl_private.h @@ -139,6 +139,11 @@ #define HAVE_FIPS #endif @@ -37,7 +37,7 @@ Upstream-Status: Backport #if (OPENSSL_VERSION_NUMBER >= 0x10000000) #define MODSSL_SSL_CIPHER_CONST const #define MODSSL_SSL_METHOD_CONST const -@@ -811,6 +816,7 @@ +@@ -840,6 +845,7 @@ int ssl_callback_ServerNameIndication(SSL *, int *, modssl_ctx_t *); int ssl_callback_SessionTicket(SSL *, unsigned char *, unsigned char *, EVP_CIPHER_CTX *, HMAC_CTX *, int); #endif @@ -45,9 +45,9 @@ Upstream-Status: Backport /** Session Cache Support */ void ssl_scache_init(server_rec *, apr_pool_t *); ---- httpd-2.4.2/modules/ssl/mod_ssl.c -+++ httpd-2.4.2/modules/ssl/mod_ssl.c -@@ -260,6 +260,18 @@ +--- httpd-2.4.4/modules/ssl/mod_ssl.c ++++ httpd-2.4.4/modules/ssl/mod_ssl.c +@@ -272,6 +272,18 @@ static const command_rec ssl_config_cmds[] = { AP_END_CMD }; @@ -66,9 +66,9 @@ Upstream-Status: Backport /* * the various processing hooks */ ---- httpd-2.4.2/modules/ssl/mod_ssl.h -+++ httpd-2.4.2/modules/ssl/mod_ssl.h -@@ -63,5 +63,26 @@ +--- httpd-2.4.4/modules/ssl/mod_ssl.h ++++ httpd-2.4.4/modules/ssl/mod_ssl.h +@@ -63,5 +63,26 @@ APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *)); APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *)); @@ -95,9 +95,9 @@ Upstream-Status: Backport + #endif /* __MOD_SSL_H__ */ /** @} */ ---- httpd-2.4.2/modules/ssl/ssl_engine_init.c -+++ httpd-2.4.2/modules/ssl/ssl_engine_init.c -@@ -681,6 +681,11 @@ +--- httpd-2.4.4/modules/ssl/ssl_engine_init.c ++++ httpd-2.4.4/modules/ssl/ssl_engine_init.c +@@ -725,6 +725,11 @@ static void ssl_init_ctx_callbacks(server_rec *s, #endif SSL_CTX_set_info_callback(ctx, ssl_callback_Info); @@ -109,8 +109,8 @@ Upstream-Status: Backport } static void ssl_init_ctx_verify(server_rec *s, ---- httpd-2.4.2/modules/ssl/ssl_engine_io.c -+++ httpd-2.4.2/modules/ssl/ssl_engine_io.c +--- httpd-2.4.4/modules/ssl/ssl_engine_io.c ++++ httpd-2.4.4/modules/ssl/ssl_engine_io.c @@ -28,6 +28,7 @@ core keeps dumping.'' -- Unknown */ @@ -119,7 +119,7 @@ Upstream-Status: Backport #include "apr_date.h" /* _________________________________________________________________ -@@ -297,6 +298,7 @@ +@@ -297,6 +298,7 @@ typedef struct { apr_pool_t *pool; char buffer[AP_IOBUFSIZE]; ssl_filter_ctx_t *filter_ctx; @@ -127,7 +127,7 @@ Upstream-Status: Backport } bio_filter_in_ctx_t; /* -@@ -1374,6 +1376,27 @@ +@@ -1385,6 +1387,27 @@ static apr_status_t ssl_io_filter_input(ap_filter_t *f, APR_BRIGADE_INSERT_TAIL(bb, bucket); } @@ -155,7 +155,7 @@ Upstream-Status: Backport return APR_SUCCESS; } -@@ -1855,6 +1878,7 @@ +@@ -1866,6 +1889,7 @@ static void ssl_io_input_add_filter(ssl_filter_ctx_t *filter_ctx, conn_rec *c, inctx->block = APR_BLOCK_READ; inctx->pool = c->pool; inctx->filter_ctx = filter_ctx; @@ -163,8 +163,8 @@ Upstream-Status: Backport } /* The request_rec pointer is passed in here only to ensure that the ---- httpd-2.4.2/modules/ssl/ssl_engine_kernel.c -+++ httpd-2.4.2/modules/ssl/ssl_engine_kernel.c +--- httpd-2.4.4/modules/ssl/ssl_engine_kernel.c ++++ httpd-2.4.4/modules/ssl/ssl_engine_kernel.c @@ -29,6 +29,7 @@ time I was too famous.'' -- Unknown */ @@ -173,10 +173,10 @@ Upstream-Status: Backport #include "util_md5.h" static void ssl_configure_env(request_rec *r, SSLConnRec *sslconn); -@@ -2143,3 +2144,84 @@ - return -1; +@@ -2186,3 +2187,84 @@ int ssl_callback_SRPServerParams(SSL *ssl, int *ad, void *arg) } - #endif + + #endif /* OPENSSL_NO_SRP */ + +#ifdef HAVE_TLS_NPN +/* diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/replace-lynx-to-curl-in-apachectl-script.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch similarity index 100% rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/replace-lynx-to-curl-in-apachectl-script.patch rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/server-makefile.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/server-makefile.patch similarity index 100% rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/server-makefile.patch rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.4/server-makefile.patch diff --git a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.3.bb b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.4.bb similarity index 89% rename from meta-webserver/recipes-httpd/apache2/apache2-native_2.4.3.bb rename to meta-webserver/recipes-httpd/apache2/apache2-native_2.4.4.bb index 064e6bd..2855648 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.3.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.4.bb @@ -5,7 +5,6 @@ HOMEPAGE = "http://httpd.apache.org/" DEPENDS = "expat-native pcre-native apr-native apr-util-native" SECTION = "net" LICENSE = "Apache-2.0" -PR = "r0" inherit native @@ -14,8 +13,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2" S = "${WORKDIR}/httpd-${PV}" LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc" -SRC_URI[md5sum] = "87aaf7bc7e8715f0455997bb8c6791aa" -SRC_URI[sha256sum] = "d82102b9c111f1892fb20a2bccf4370de579c6521b2f172ed0b36f2759fb249e" +SRC_URI[md5sum] = "0e712ee2119cd798c8ae39d5f11a9206" +SRC_URI[sha256sum] = "92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c" do_configure () { ./configure --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb similarity index 95% rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb index 5589f1f..42a7b16 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb @@ -5,14 +5,13 @@ HOMEPAGE = "http://httpd.apache.org/" DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util" SECTION = "net" LICENSE = "Apache-2.0" -PR = "r1" SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://server-makefile.patch \ file://httpd-2.4.1-corelimit.patch \ - file://httpd-2.4.1-export.patch \ + file://httpd-2.4.4-export.patch \ file://httpd-2.4.1-selinux.patch \ - file://httpd-2.4.2-r1332643.patch \ + file://httpd-2.4.4-r1332643.patch \ file://apache-configure_perlbin.patch \ file://replace-lynx-to-curl-in-apachectl-script.patch \ file://apache-ssl-ltmain-rpath.patch \ @@ -20,8 +19,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://init" LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc" -SRC_URI[md5sum] = "87aaf7bc7e8715f0455997bb8c6791aa" -SRC_URI[sha256sum] = "d82102b9c111f1892fb20a2bccf4370de579c6521b2f172ed0b36f2759fb249e" +SRC_URI[md5sum] = "0e712ee2119cd798c8ae39d5f11a9206" +SRC_URI[sha256sum] = "92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c" S = "${WORKDIR}/httpd-${PV}" -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/7] apache2: drop unneeded workaround for apr/apr-util config script issue 2013-05-10 18:09 [PATCH 0/7] Apache/modphp/phpMyAdmin updates Paul Eggleton 2013-05-10 18:09 ` [PATCH 1/7] apache2: update to 2.4.4 Paul Eggleton @ 2013-05-10 18:09 ` Paul Eggleton 2013-05-10 18:09 ` [PATCH 3/7] modphp: update to 5.4.15 Paul Eggleton ` (4 subsequent siblings) 6 siblings, 0 replies; 8+ messages in thread From: Paul Eggleton @ 2013-05-10 18:09 UTC (permalink / raw) To: openembedded-devel The fix for the apr-1-config/apu-1-config path issue has been in OE-Core for some time now (OE-Core commit ab56f1063a666df5faddd97f44758c8ae378e51c) so we no longer need these workarounds. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb index 42a7b16..cf1e469 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb @@ -31,8 +31,8 @@ CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl " EXTRA_OECONF = "--enable-ssl \ --with-ssl=${STAGING_LIBDIR}/.. \ --with-expat=${STAGING_LIBDIR}/.. \ - --with-apr=${WORKDIR}/apr-1-config \ - --with-apr-util=${WORKDIR}/apu-1-config \ + --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ + --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \ --enable-info \ --enable-rewrite \ --with-dbm=sdbm \ @@ -48,15 +48,6 @@ EXTRA_OECONF = "--enable-ssl \ --enable-mpms-shared \ ac_cv_have_threadsafe_pollset=no" -do_configure_prepend() { - # FIXME: this hack is required to work around an issue with apr/apr-util - # Can be removed when fixed in OE-Core (also revert --with-* options above) - # see http://bugzilla.yoctoproject.org/show_bug.cgi?id=3267 - cp ${STAGING_BINDIR_CROSS}/apr-1-config ${STAGING_BINDIR_CROSS}/apu-1-config ${WORKDIR} - sed -i -e 's:location=source:location=installed:' ${WORKDIR}/apr-1-config - sed -i -e 's:location=source:location=installed:' ${WORKDIR}/apu-1-config -} - do_install_append() { install -d ${D}/${sysconfdir}/init.d cat ${WORKDIR}/init | \ -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/7] modphp: update to 5.4.15 2013-05-10 18:09 [PATCH 0/7] Apache/modphp/phpMyAdmin updates Paul Eggleton 2013-05-10 18:09 ` [PATCH 1/7] apache2: update to 2.4.4 Paul Eggleton 2013-05-10 18:09 ` [PATCH 2/7] apache2: drop unneeded workaround for apr/apr-util config script issue Paul Eggleton @ 2013-05-10 18:09 ` Paul Eggleton 2013-05-10 18:09 ` [PATCH 4/7] modphp: fix text relocation QA warning Paul Eggleton ` (3 subsequent siblings) 6 siblings, 0 replies; 8+ messages in thread From: Paul Eggleton @ 2013-05-10 18:09 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-webserver/recipes-php/modphp/modphp_5.4.14.bb | 4 ---- meta-webserver/recipes-php/modphp/modphp_5.4.15.bb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 meta-webserver/recipes-php/modphp/modphp_5.4.14.bb create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.4.15.bb diff --git a/meta-webserver/recipes-php/modphp/modphp_5.4.14.bb b/meta-webserver/recipes-php/modphp/modphp_5.4.14.bb deleted file mode 100644 index 5fea8fb..0000000 --- a/meta-webserver/recipes-php/modphp/modphp_5.4.14.bb +++ /dev/null @@ -1,4 +0,0 @@ -include modphp5.inc - -SRC_URI[md5sum] = "cfdc044be2c582991a1fe0967898fa38" -SRC_URI[sha256sum] = "5450f3843bc651eb3fb00601f0cce1930aaaf65c7c966c02fe4a46f9c81be20a" diff --git a/meta-webserver/recipes-php/modphp/modphp_5.4.15.bb b/meta-webserver/recipes-php/modphp/modphp_5.4.15.bb new file mode 100644 index 0000000..7d90dc8 --- /dev/null +++ b/meta-webserver/recipes-php/modphp/modphp_5.4.15.bb @@ -0,0 +1,4 @@ +include modphp5.inc + +SRC_URI[md5sum] = "145ea5e845e910443ff1eddb3dbcf56a" +SRC_URI[sha256sum] = "2d2285da48ccd2db311b2608fdfafd18b363a9f7e3796d53dd53e5b6752a0136" -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/7] modphp: fix text relocation QA warning 2013-05-10 18:09 [PATCH 0/7] Apache/modphp/phpMyAdmin updates Paul Eggleton ` (2 preceding siblings ...) 2013-05-10 18:09 ` [PATCH 3/7] modphp: update to 5.4.15 Paul Eggleton @ 2013-05-10 18:09 ` Paul Eggleton 2013-05-10 18:09 ` [PATCH 5/7] modphp: fix re-exec of do_install Paul Eggleton ` (2 subsequent siblings) 6 siblings, 0 replies; 8+ messages in thread From: Paul Eggleton @ 2013-05-10 18:09 UTC (permalink / raw) To: openembedded-devel Fixes the following warning: WARNING: QA Issue: ELF binary '${WORKDIR}/packages-split/modphp/usr/lib/apache2/modules/libphp5.so' has relocations in .text Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-webserver/recipes-php/modphp/modphp5.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc index 6b227af..62b59a1 100644 --- a/meta-webserver/recipes-php/modphp/modphp5.inc +++ b/meta-webserver/recipes-php/modphp/modphp5.inc @@ -19,6 +19,7 @@ inherit autotools 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 \ --enable-force-cgi-redirect \ -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/7] modphp: fix re-exec of do_install 2013-05-10 18:09 [PATCH 0/7] Apache/modphp/phpMyAdmin updates Paul Eggleton ` (3 preceding siblings ...) 2013-05-10 18:09 ` [PATCH 4/7] modphp: fix text relocation QA warning Paul Eggleton @ 2013-05-10 18:09 ` Paul Eggleton 2013-05-10 18:09 ` [PATCH 6/7] phpmyadmin: update to 3.5.8.1 Paul Eggleton 2013-05-10 18:09 ` [PATCH 7/7] phpmyadmin: remove dependency on bash Paul Eggleton 6 siblings, 0 replies; 8+ messages in thread From: Paul Eggleton @ 2013-05-10 18:09 UTC (permalink / raw) To: openembedded-devel Copying files and then modifying them is preferred rather than the other way around because then the modification can never be run twice if the function is re-executed on an existing work directory. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-webserver/recipes-php/modphp/modphp5.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc index 62b59a1..192abd7 100644 --- a/meta-webserver/recipes-php/modphp/modphp5.inc +++ b/meta-webserver/recipes-php/modphp/modphp5.inc @@ -65,8 +65,8 @@ do_install () { install -d ${D}${sysconfdir}/apache2/modules.d install -d ${D}${sysconfdir}/php/apache2-php5 install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules - sed -i s,lib/,${libdir}/, ${WORKDIR}/70_mod_php5.conf 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 -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/7] phpmyadmin: update to 3.5.8.1 2013-05-10 18:09 [PATCH 0/7] Apache/modphp/phpMyAdmin updates Paul Eggleton ` (4 preceding siblings ...) 2013-05-10 18:09 ` [PATCH 5/7] modphp: fix re-exec of do_install Paul Eggleton @ 2013-05-10 18:09 ` Paul Eggleton 2013-05-10 18:09 ` [PATCH 7/7] phpmyadmin: remove dependency on bash Paul Eggleton 6 siblings, 0 replies; 8+ messages in thread From: Paul Eggleton @ 2013-05-10 18:09 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- .../phpmyadmin/{phpmyadmin_3.5.2.2.bb => phpmyadmin_3.5.8.1.bb} | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_3.5.2.2.bb => phpmyadmin_3.5.8.1.bb} (85%) diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb similarity index 85% rename from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb rename to meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb index 996aa63..54cacb5 100644 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb +++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb @@ -5,13 +5,11 @@ LICENSE = "GPLv2 & LGPLv3 & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \ file://libraries/tcpdf/LICENSE.TXT;md5=5c87b66a5358ebcc495b03e0afcd342c" -PR = "r1" - SRC_URI = "${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ file://apache.conf" -SRC_URI[md5sum] = "3f8993fe0f2fee1a022768278c6a270b" -SRC_URI[sha256sum] = "d02de081c522d3026f4a8418538f7ff05adf280afa404851a5f7f4ef895b4a7d" +SRC_URI[md5sum] = "76976c227041ac7109506b29aec3083a" +SRC_URI[sha256sum] = "c66737ff55369b1c9e4b116e68f3c517faf7c4bc17e289d008d74fde6c8260f6" S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 7/7] phpmyadmin: remove dependency on bash 2013-05-10 18:09 [PATCH 0/7] Apache/modphp/phpMyAdmin updates Paul Eggleton ` (5 preceding siblings ...) 2013-05-10 18:09 ` [PATCH 6/7] phpmyadmin: update to 3.5.8.1 Paul Eggleton @ 2013-05-10 18:09 ` Paul Eggleton 6 siblings, 0 replies; 8+ messages in thread From: Paul Eggleton @ 2013-05-10 18:09 UTC (permalink / raw) To: openembedded-devel Remove some mostly superfluous scripts for adding additional mimetype support that add an explicit dependency on bash. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb index 54cacb5..e48e515 100644 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb +++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb @@ -21,6 +21,9 @@ do_install() { install -d ${D}${sysconfdir}/apache2/conf.d install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf + + # Remove a few scripts that explicitly require bash (!) + rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh } FILES_${PN} = "${datadir}/${BPN} \ -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-05-10 18:28 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-05-10 18:09 [PATCH 0/7] Apache/modphp/phpMyAdmin updates Paul Eggleton 2013-05-10 18:09 ` [PATCH 1/7] apache2: update to 2.4.4 Paul Eggleton 2013-05-10 18:09 ` [PATCH 2/7] apache2: drop unneeded workaround for apr/apr-util config script issue Paul Eggleton 2013-05-10 18:09 ` [PATCH 3/7] modphp: update to 5.4.15 Paul Eggleton 2013-05-10 18:09 ` [PATCH 4/7] modphp: fix text relocation QA warning Paul Eggleton 2013-05-10 18:09 ` [PATCH 5/7] modphp: fix re-exec of do_install Paul Eggleton 2013-05-10 18:09 ` [PATCH 6/7] phpmyadmin: update to 3.5.8.1 Paul Eggleton 2013-05-10 18:09 ` [PATCH 7/7] phpmyadmin: remove dependency on bash Paul Eggleton
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox