Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #51076 (race condition in shtool's mkdir -p)

Author: m6w6

build/shtool

@@ -1003,7 +1003,14 @@ mkdir )
                     if [ ".$opt_t" = .yes ]; then
                         echo "mkdir $pathcomp" 1>&2
                     fi
-                    mkdir $pathcomp || errstatus=$?
+					# See https://bugs.php.net/51076
+					# The fix is from Debian who have sent it
+					# upstream, too; but upstream seems dead.
+                    mkdir $pathcomp || {
+                        _errstatus=$?
+                        [ -d "$pathcomp" ] || errstatus=${_errstatus}
+                        unset _errstatus
+                    }
                     if [ ".$opt_o" != . ]; then
                         if [ ".$opt_t" = .yes ]; then
                             echo "chown $opt_o $pathcomp" 1>&2