Apache / PHP upgrades
v3 cover Apache / PHP upgrades
Changes since v2:
* Integrate Hongxu's updated TLS Next Protocol Negotiation support patch into the Apache 2.4.7 update patch
* Update modphp to version 5.5.9
* Update phpmyadmin to 4.1.8
The following changes since commit 8089aa451827cb791c7d795b9899dc152d1ceb66:
vlc: Fix build with flac-1.3.0 (2014-02-24 10:10:25 +0100)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib paule/webserver-upgrades
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/webserver-upgrades
Paul Eggleton (3):
apache2: update to 2.4.7
modphp: upgrade to 5.5.9
phpmyadmin: update to 4.1.8
...he2-native_2.4.6.bb => apache2-native_2.4.7.bb} | 6 +-
.../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 | 0
.../npn-patch-2.4.7.patch} | 111 +++++++++++++--------
.../replace-lynx-to-curl-in-apachectl-script.patch | 0
.../server-makefile.patch | 0
.../apache2/{apache2_2.4.6.bb => apache2_2.4.7.bb} | 8 +-
meta-webserver/recipes-php/modphp/modphp5.inc | 1 -
meta-webserver/recipes-php/modphp/modphp_5.5.2.bb | 7 --
meta-webserver/recipes-php/modphp/modphp_5.5.9.bb | 7 ++
.../{phpmyadmin_4.0.5.bb => phpmyadmin_4.1.8.bb} | 4 +-
15 files changed, 86 insertions(+), 58 deletions(-)
rename meta-webserver/recipes-httpd/apache2/{apache2-native_2.4.6.bb => apache2-native_2.4.7.bb} (84%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/apache-configure_perlbin.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/apache-ssl-ltmain-rpath.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/fix-libtool-name.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/httpd-2.4.1-corelimit.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/httpd-2.4.1-selinux.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/httpd-2.4.4-export.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6/httpd-2.4.4-r1332643.patch => apache2/npn-patch-2.4.7.patch} (80%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/replace-lynx-to-curl-in-apachectl-script.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/server-makefile.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.6.bb => apache2_2.4.7.bb} (95%)
delete mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.2.bb
create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.9.bb
rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_4.0.5.bb => phpmyadmin_4.1.8.bb} (87%)Signature · 1 line
1.8.5.3
PATCH v3 1/3 apache2: update to 2.4.7
* LIC_FILES_CHKSUM changed because of the introduction of an extra blank line in the LICENSE file (!)
* Refreshed TLS Next Protocol Negotiation support patch for conflict with 2.4.7. Thanks to Hongxu Jia for doing this work.
---
...he2-native_2.4.6.bb => apache2-native_2.4.7.bb} | 6 +-
.../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 | 0
.../npn-patch-2.4.7.patch} | 111 +++++++++++++--------
.../replace-lynx-to-curl-in-apachectl-script.patch | 0
.../server-makefile.patch | 0
.../apache2/{apache2_2.4.6.bb => apache2_2.4.7.bb} | 8 +-
11 files changed, 77 insertions(+), 48 deletions(-)
rename meta-webserver/recipes-httpd/apache2/{apache2-native_2.4.6.bb => apache2-native_2.4.7.bb} (84%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/apache-configure_perlbin.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/apache-ssl-ltmain-rpath.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/fix-libtool-name.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/httpd-2.4.1-corelimit.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/httpd-2.4.1-selinux.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/httpd-2.4.4-export.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6/httpd-2.4.4-r1332643.patch => apache2/npn-patch-2.4.7.patch} (80%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/replace-lynx-to-curl-in-apachectl-script.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2-2.4.6 => apache2}/server-makefile.patch (100%)
rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.6.bb => apache2_2.4.7.bb} (95%)meta-webserver/recipes-httpd/apache2/apache2-native_2.4.7.bb renamed from meta-webserver/recipes-httpd/apache2/apache2-native_2.4.6.bb +3 -3
@@ -12,9 +12,9 @@ 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] = "ea5e361ca37b8d7853404419dd502efe" -SRC_URI[sha256sum] = "dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" +SRC_URI[md5sum] = "170d7fb6fe5f28b87d1878020a9ab94e" +SRC_URI[sha256sum] = "64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b" do_configure () { ./configure --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-ssl-ltmain-rpath.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2/fix-libtool-name.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.6/fix-libtool-name.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.1-corelimit.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.6/httpd-2.4.1-corelimit.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.1-selinux.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.6/httpd-2.4.1-selinux.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.4-export.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.6/httpd-2.4.4-export.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2/npn-patch-2.4.7.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.6/httpd-2.4.4-r1332643.patch +70 -41
176 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.6/replace-lynx-to-curl-in-apachectl-script.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2/server-makefile.patch renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.6/server-makefile.patch +0 -0
meta-webserver/recipes-httpd/apache2/apache2_2.4.7.bb renamed from meta-webserver/recipes-httpd/apache2/apache2_2.4.6.bb +4 -4
@@ -11,17 +11,17 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://httpd-2.4.1-corelimit.patch \ file://httpd-2.4.4-export.patch \ file://httpd-2.4.1-selinux.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 \ file://httpd-2.4.3-fix-race-issue-of-dir-install.patch \ + file://npn-patch-2.4.7.patch \ file://init \ file://apache2-volatile.conf" -LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc" -SRC_URI[md5sum] = "ea5e361ca37b8d7853404419dd502efe" -SRC_URI[sha256sum] = "dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" +SRC_URI[md5sum] = "170d7fb6fe5f28b87d1878020a9ab94e" +SRC_URI[sha256sum] = "64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b" S = "${WORKDIR}/httpd-${PV}"
Signature · 1 line
1.8.5.3
PATCH v3 2/3 modphp: upgrade to 5.5.9
In reply to Paul Eggleton--- meta-webserver/recipes-php/modphp/modphp5.inc | 1 - meta-webserver/recipes-php/modphp/modphp_5.5.2.bb | 7 ------- meta-webserver/recipes-php/modphp/modphp_5.5.9.bb | 7 +++++++ 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.2.bb create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.9.bb
meta-webserver/recipes-php/modphp/modphp5.inc +0 -1
@@ -22,7 +22,6 @@ EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs \ --with-pic \ --enable-maintainer-zts \ --without-mysql \ - --enable-force-cgi-redirect \ --disable-cgi \ --disable-cli \ --disable-pdo \
meta-webserver/recipes-php/modphp/modphp_5.5.2.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include modphp5.inc - -EXTRA_OECONF += "--disable-opcache" - -SRC_URI[md5sum] = "caf7f4d86514a568fb3c8021b096a9f0" -SRC_URI[sha256sum] = "e72aaf1fa96eac0bff127bfc74c174d1de50cd3f66d7e0e1ee919674ab463bb7" -
meta-webserver/recipes-php/modphp/modphp_5.5.9.bb new file +7 -0
@@ -0,0 +1,7 @@ +include modphp5.inc + +EXTRA_OECONF += "--disable-opcache" + +SRC_URI[md5sum] = "c4a348a07b52f6e177d8fdc75fe507b1" +SRC_URI[sha256sum] = "9d1dea5195e2bcd928416130a6e19173d02bd36fb76c382522bf145c458fbed3" +
Signature · 1 line
1.8.5.3
PATCH v3 3/3 phpmyadmin: update to 4.1.8
In reply to Paul Eggleton---
.../phpmyadmin/{phpmyadmin_4.0.5.bb => phpmyadmin_4.1.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_4.0.5.bb => phpmyadmin_4.1.8.bb} (87%)meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.1.8.bb renamed from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.0.5.bb +2 -2
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \ SRC_URI = "${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ file://apache.conf" -SRC_URI[md5sum] = "5cc493908d09df1760c7cdcd1622ebf7" -SRC_URI[sha256sum] = "f4df1190441ce5e094183cfadf8aec4af3a4f131339599e6380a1c6ac0a11fe4" +SRC_URI[md5sum] = "14fd2f6d2f92a8dfb3954513da1c1687" +SRC_URI[sha256sum] = "857f133911eddcec16824f3ecc7a68f93288ab2a2f1943bfce3b06b58b625cd6" S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages"
Signature · 1 line
1.8.5.3