[meta-webserver][PATCH 0/2] PHP/phpMyAdmin upgrades again

[meta-webserver][PATCH 0/2] PHP/phpMyAdmin upgrades again

[Paul Eggleton]

Of course, no sooner than we have the previous upgrades merged, a new 
release happens upstream. In the PHP case the upgrade contains several
CVE fixes so it's definitely worth applying.


The following changes since commit 54b9d0199e55027bd4b54fc5c6ee488d117a46da:

  phpmyadmin: update to 4.1.8 (2014-03-06 12:12:15 +0000)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib paule/webserver-upgrades2
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/webserver-upgrades2

Paul Eggleton (2):
  modphp: update to 5.5.10
  phpmyadmin: update to 4.1.9

 meta-webserver/recipes-php/modphp/modphp_5.5.10.bb                 | 7 +++++++
 meta-webserver/recipes-php/modphp/modphp_5.5.9.bb                  | 7 -------
 .../phpmyadmin/{phpmyadmin_4.1.8.bb => phpmyadmin_4.1.9.bb}        | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.10.bb
 delete mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.9.bb
 rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_4.1.8.bb => phpmyadmin_4.1.9.bb} (87%)

-- 
1.8.5.3

[meta-webserver][PATCH 1/2] modphp: update to 5.5.10

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-webserver/recipes-php/modphp/modphp_5.5.10.bb | 7 +++++++
 meta-webserver/recipes-php/modphp/modphp_5.5.9.bb  | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.10.bb
 delete mode 100644 meta-webserver/recipes-php/modphp/modphp_5.5.9.bb

diff --git a/meta-webserver/recipes-php/modphp/modphp_5.5.10.bb b/meta-webserver/recipes-php/modphp/modphp_5.5.10.bb
new file mode 100644
index 0000000..fcdb11e
--- /dev/null
+++ b/meta-webserver/recipes-php/modphp/modphp_5.5.10.bb
@@ -0,0 +1,7 @@
+include modphp5.inc
+
+EXTRA_OECONF += "--disable-opcache"
+
+SRC_URI[md5sum] = "d608230c7890b6a0cc5b92e66e866226"
+SRC_URI[sha256sum] = "bb34e61f8e6f56c612867bfe85d144d5045cd5e44497539bc126a4e8c6795419"
+
diff --git a/meta-webserver/recipes-php/modphp/modphp_5.5.9.bb b/meta-webserver/recipes-php/modphp/modphp_5.5.9.bb
deleted file mode 100644
index 4243ece..0000000
--- a/meta-webserver/recipes-php/modphp/modphp_5.5.9.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include modphp5.inc
-
-EXTRA_OECONF += "--disable-opcache"
-
-SRC_URI[md5sum] = "c4a348a07b52f6e177d8fdc75fe507b1"
-SRC_URI[sha256sum] = "9d1dea5195e2bcd928416130a6e19173d02bd36fb76c382522bf145c458fbed3"
-
-- 
1.8.5.3

[meta-webserver][PATCH 2/2] phpmyadmin: update to 4.1.9

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../phpmyadmin/{phpmyadmin_4.1.8.bb => phpmyadmin_4.1.9.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_4.1.8.bb => phpmyadmin_4.1.9.bb} (87%)

diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.1.8.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.1.9.bb
similarity index 87%
rename from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.1.8.bb
rename to meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.1.9.bb
index 388f188..cd15889 100644
--- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.1.8.bb
+++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.1.9.bb
@@ -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] = "14fd2f6d2f92a8dfb3954513da1c1687"
-SRC_URI[sha256sum] = "857f133911eddcec16824f3ecc7a68f93288ab2a2f1943bfce3b06b58b625cd6"
+SRC_URI[md5sum] = "420c836228ceab8df5557c92e56021d7"
+SRC_URI[sha256sum] = "efc5bd669324cd094cc1912afee9c91fd052fe9f226f767f7ec7b31a1796ce2c"
 
 S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages"
 
-- 
1.8.5.3