Apache/modphp/phpMyAdmin updates
cover Apache/modphp/phpMyAdmin updates
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%)Signature · 1 line
1.8.1.2
PATCH 1/7 apache2: update to 2.4.4
---
.../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%)meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-configure_perlbin.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-configure_perlbin.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-ssl-ltmain-rpath.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2-2.4.4/fix-libtool-name.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/fix-libtool-name.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-corelimit.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-corelimit.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-selinux.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-selinux.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-export.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-export.patch +3 -3
@@ -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
meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-r1332643.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.2-r1332643.patch +22 -22
111 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/replace-lynx-to-curl-in-apachectl-script.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2-2.4.4/server-makefile.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/server-makefile.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2-native_2.4.4.bb renamed from meta-webserver/recipes-httpd/apache2/apache2-native_2.4.3.bb +2 -3
@@ -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 \
meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb renamed from meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb +4 -5
@@ -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}"
Signature · 1 line
1.8.1.2
PATCH 2/7 apache2: drop unneeded workaround for apr/apr-util config script issue
In reply to Paul EggletonThe 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.
--- meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb +2 -11
@@ -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 | \
Signature · 1 line
1.8.1.2
PATCH 5/7 modphp: fix re-exec of do_install
In reply to Paul EggletonCopying 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.
--- meta-webserver/recipes-php/modphp/modphp5.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-webserver/recipes-php/modphp/modphp5.inc +1 -1
@@ -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
Signature · 1 line
1.8.1.2
PATCH 3/7 modphp: update to 5.4.15
In reply to Paul Eggleton--- 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
meta-webserver/recipes-php/modphp/modphp_5.4.14.bb deleted +0 -4
@@ -1,4 +0,0 @@ -include modphp5.inc - -SRC_URI[md5sum] = "cfdc044be2c582991a1fe0967898fa38" -SRC_URI[sha256sum] = "5450f3843bc651eb3fb00601f0cce1930aaaf65c7c966c02fe4a46f9c81be20a"
meta-webserver/recipes-php/modphp/modphp_5.4.15.bb new file +4 -0
@@ -0,0 +1,4 @@ +include modphp5.inc + +SRC_URI[md5sum] = "145ea5e845e910443ff1eddb3dbcf56a" +SRC_URI[sha256sum] = "2d2285da48ccd2db311b2608fdfafd18b363a9f7e3796d53dd53e5b6752a0136"
Signature · 1 line
1.8.1.2
PATCH 4/7 modphp: fix text relocation QA warning
In reply to Paul EggletonFixes the following warning:
WARNING: QA Issue: ELF binary '${WORKDIR}/packages-split/modphp/usr/lib/apache2/modules/libphp5.so' has relocations in .text
--- meta-webserver/recipes-php/modphp/modphp5.inc | 1 + 1 file changed, 1 insertion(+)
meta-webserver/recipes-php/modphp/modphp5.inc +1 -0
@@ -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 \
Signature · 1 line
1.8.1.2
PATCH 6/7 phpmyadmin: update to 3.5.8.1
In reply to Paul Eggleton---
.../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%)meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb renamed from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb +2 -4
@@ -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"
Signature · 1 line
1.8.1.2
PATCH 7/7 phpmyadmin: remove dependency on bash
In reply to Paul EggletonRemove some mostly superfluous scripts for adding additional mimetype support that add an explicit dependency on bash.
--- meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb +3 -0
@@ -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} \
Signature · 1 line
1.8.1.2