Skip to contentSkip to conversation

php: check for existance of directory before 'rmdir' in do_install_append_class-target

PATCH New Derek Straka 1 participant 2 messages Jan 24, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 php: check for existance of directory before 'rmdir' in do_install_append_class-target

---
 meta-oe/recipes-devtools/php/php.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-devtools/php/php.inc +3 -1
index 67d2362..793ffe8 100644
@@ -166,7 +166,9 @@ do_install_append_class-target() {
 
     TMP=`dirname ${D}/${TMPDIR}`
     while test ${TMP} != ${D}; do
-        rmdir ${TMP}
+        if [ -d ${TMP} ]; then
+            rmdir ${TMP}
+        fi
         TMP=`dirname ${TMP}`;
     done
 
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/2 php: update to 5.6.17 and 5.5.31

Fixes CVE-2016-1903 and other bugs
https://secure.php.net/ChangeLog-5.php
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-1903

---
 .../change-AC_TRY_RUN-to-AC_TRY_LINK.patch                           | 0
 meta-oe/recipes-devtools/php/php_5.5.30.bb                           | 4 ----
 meta-oe/recipes-devtools/php/php_5.5.31.bb                           | 4 ++++
 meta-oe/recipes-devtools/php/php_5.6.16.bb                           | 5 -----
 meta-oe/recipes-devtools/php/php_5.6.17.bb                           | 5 +++++
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-devtools/php/{php-5.6.16 => php-5.6.17}/change-AC_TRY_RUN-to-AC_TRY_LINK.patch (100%)
 delete mode 100644 meta-oe/recipes-devtools/php/php_5.5.30.bb
 create mode 100644 meta-oe/recipes-devtools/php/php_5.5.31.bb
 delete mode 100644 meta-oe/recipes-devtools/php/php_5.6.16.bb
 create mode 100644 meta-oe/recipes-devtools/php/php_5.6.17.bb
meta-oe/recipes-devtools/php/php-5.6.17/change-AC_TRY_RUN-to-AC_TRY_LINK.patch renamed from meta-oe/recipes-devtools/php/php-5.6.16/change-AC_TRY_RUN-to-AC_TRY_LINK.patch +0 -0
similarity index 100%
rename from meta-oe/recipes-devtools/php/php-5.6.16/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
rename to meta-oe/recipes-devtools/php/php-5.6.17/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
meta-oe/recipes-devtools/php/php_5.5.30.bb deleted +0 -4
deleted file mode 100644
index 2bfadc1..0000000
@@ -1,4 +0,0 @@
-require php.inc
-
-SRC_URI[md5sum] = "181d153c9fba7ff46534df1bdab4d853"
-SRC_URI[sha256sum] = "e7332a713cecdd1cb44a1b1336739885c9789f633f0f51236b25e48ab03c3b29"
meta-oe/recipes-devtools/php/php_5.5.31.bb new file +4 -0
new file mode 100644
index 0000000..cdd89b4
@@ -0,0 +1,4 @@
+require php.inc
+
+SRC_URI[md5sum] = "ebb66ad8e2bcf1a966b10d86e81a0119"
+SRC_URI[sha256sum] = "fb4a382b9a9dceb749b7ef047d8251320bc8d371c843714e5b4f4b70d61ba277"
meta-oe/recipes-devtools/php/php_5.6.16.bb deleted +0 -5
deleted file mode 100644
index 822c090..0000000
@@ -1,5 +0,0 @@
-require php.inc
-
-SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch"
-SRC_URI[md5sum] = "765b164b89af1f03ae2fdf39a4e4e1df"
-SRC_URI[sha256sum] = "4fe6f40964c1bfaba05fc144ba20a2cdad33e11685f4f101ea5a48b98bbcd2ae"
meta-oe/recipes-devtools/php/php_5.6.17.bb new file +5 -0
new file mode 100644
index 0000000..d92d92b
@@ -0,0 +1,5 @@
+require php.inc
+
+SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch"
+SRC_URI[md5sum] = "23e2183852b172a8e2b2c739b7dde4ca"
+SRC_URI[sha256sum] = "77b45f56a1e63e75bb22b42cfb8b438ec4083c59ce774b4d7c1685544b7add3b"
Signature · 1 line
1.9.1