[oe-commits] Kang Kai : php: upgrade from 5.5.24 to 5.5.26

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: ee4e79caf9759d4fe2dc548e3cde44b5d0f1c730
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=ee4e79caf9759d4fe2dc548e3cde44b5d0f1c730

Author: Kang Kai <kai.kang at windriver.com>
Date:   Fri Jun 19 10:15:03 2015 +0800

php: upgrade from 5.5.24 to 5.5.26

Upgrade php from 5.5.24 to 5.5.26. Remove part 2 of phar-makefile.patch
which is useless.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-devtools/php/php/phar-makefile.patch          | 9 ---------
 meta-oe/recipes-devtools/php/{php_5.5.24.bb => php_5.5.26.bb} | 4 ++--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/meta-oe/recipes-devtools/php/php/phar-makefile.patch b/meta-oe/recipes-devtools/php/php/phar-makefile.patch
index 2851b0f..2f7fe34 100644
--- a/meta-oe/recipes-devtools/php/php/phar-makefile.patch
+++ b/meta-oe/recipes-devtools/php/php/phar-makefile.patch
@@ -33,12 +33,3 @@ index 6516ddf..36e6cf4 100644
  
  $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
  	- at test -d $(builddir)/phar || mkdir $(builddir)/phar
-@@ -39,7 +28,7 @@ install-pharcmd: pharcmd
- 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- 	$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
- 	- at rm -f $(INSTALL_ROOT)$(bindir)/phar
--	$(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
-+	$(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- 	@$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1
- 	@$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1
diff --git a/meta-oe/recipes-devtools/php/php_5.5.24.bb b/meta-oe/recipes-devtools/php/php_5.5.26.bb
similarity index 98%
rename from meta-oe/recipes-devtools/php/php_5.5.24.bb
rename to meta-oe/recipes-devtools/php/php_5.5.26.bb
index 4d23341..1935ca1 100644
--- a/meta-oe/recipes-devtools/php/php_5.5.24.bb
+++ b/meta-oe/recipes-devtools/php/php_5.5.26.bb
@@ -30,8 +30,8 @@ SRC_URI_append_class-target += " \
             file://php-fpm.service \
           "
 
-SRC_URI[md5sum] = "f9a8f3e4bb88b33b087bd63732b1402a"
-SRC_URI[sha256sum] = "801b5cf2e0c01b07314d4ac3c8a7c28d524bdd8263ebdd0e33a99008251316a2"
+SRC_URI[md5sum] = "383a4b35327809afd2822e1e5efc8ee1"
+SRC_URI[sha256sum] = "816afffdb03ff4c542bc172a2f77f9c69b817df82d60cce05c1b4f578c2c926e"
 
 S = "${WORKDIR}/php-${PV}"