3 files changed, 0 insertions, 250 deletions
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 499a5d85a0c4..4fb703c9f5d1 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,8 +1,6 @@
 AUX 20php5-envd 145 BLAKE2B 06476b8fc04d1e835496b417ac752f0834ddbe8584e4fddc6db0aa5e6845b82cdea0a1355c77125375dcdd0f0a3c19de5f3a8a64ee93950f96c437a16f971567 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce
-AUX php-7.1.25-intl-detect-icu-via-pkg-config.patch 4608 BLAKE2B 3639c5a39bae61d3032c18a85982769c2d8a5837a67cc8b3ec7cd25263d15f4923a04c74f21b10cd5cc17c0cd9d657431dc3052cddaa289a6eb1dac0cf975350 SHA512 567fb3486af02e487cdde11e2a6f706b2fc19722e5e9f4b63320bb2226e30ff79b14780f3f661378bf5bea2150b47af93fb5b39003465895fdf420691d4dbc44
 AUX php-7.1.25-intl-use-icu-namespace.patch 11396 BLAKE2B 7664703a7bafb38d252f5eeec926ee0b7eaf4d75e71ef98c2e7d3f612b7d48d38b66764286d67299a38a704500db2e3215dc375d64a8f277b904aff80211fa60 SHA512 c7b61cade203a338a576aff0b4b76a22f0d686d53e91fbf4c5171e0429317460f7404c78a0c076a3000957100af2d17caba6245bf37afc6177fb43c7fafa7679
 AUX php-7.2.13-intl-use-icu-namespace.patch 11499 BLAKE2B 0dca597d5afd0309595499e3ff860e2d83183e570d02f202a1e2966d430606f09b8dc7427c4007e791914c8ee093a2e7cbf7372baa7896ac06d1912f2e707c09 SHA512 1332eb76feda2100685e319ae046512cf12b55a0d2be537c2172ccf035b547d851f84fb7941389882d7e3d674d91441e018c7b8f1e3f0d4cced05c314d5821fe
-AUX php-7.3.2-fix-iptcembed-bug77546.patch 5521 BLAKE2B b03839e092308b4fbbb1624015ca77e9c7acd71efb5bfdb4bc003decdfca86b89e5e462c1e1df69b97c71415fa9207fbe723add1239b99b5db502884e3fcd799 SHA512 68c88ecd93f3b45e8967f61db06da4aa77054879a3e18137c94fab9524e53a841b19ac0b179467cfd9ba5a9cf5c0091e6a36b56e7291501bc123057487aa13d8
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
 AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
 AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875
diff --git a/dev-lang/php/files/php-7.1.25-intl-detect-icu-via-pkg-config.patch b/dev-lang/php/files/php-7.1.25-intl-detect-icu-via-pkg-config.patch
deleted file mode 100644
index 2d4254d6e59e..000000000000
--- a/dev-lang/php/files/php-7.1.25-intl-detect-icu-via-pkg-config.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Based on the following upstream commits:
-
-https://github.com/php/php-src/commit/9a8e7b571896f39f83cb000fdb7c466b6d328d52
-https://github.com/php/php-src/pull/3701
-https://github.com/php/php-src/commit/2bd299f7318492fd7e5cafffa562d76ba60e69d4
-
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2205,52 +2205,16 @@ dnl
- dnl Common setup macro for ICU
- dnl
- AC_DEFUN([PHP_SETUP_ICU],[
--  PHP_ARG_WITH(icu-dir,,
--  [  --with-icu-dir=DIR      Specify where ICU libraries and headers can be found], DEFAULT, no)
-+  PKG_CHECK_MODULES([ICU], [icu-io >= 50.1])
- 
--  if test "$PHP_ICU_DIR" = "no"; then
--    PHP_ICU_DIR=DEFAULT
--  fi
--
--  if test "$PHP_ICU_DIR" = "DEFAULT"; then
--    dnl Try to find icu-config
--    AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin])
--  else
--    ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
--  fi
--
--  AC_MSG_CHECKING([for location of ICU headers and libraries])
--
--  dnl Trust icu-config to know better what the install prefix is..
--  icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
--  if test "$?" != "0" || test -z "$icu_install_prefix"; then
--    AC_MSG_RESULT([not found])
--    AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works.])
--  else
--    AC_MSG_RESULT([$icu_install_prefix])
--
--    dnl Check ICU version
--    AC_MSG_CHECKING([for ICU 4.0 or greater])
--    icu_version_full=`$ICU_CONFIG --version`
--    ac_IFS=$IFS
--    IFS="."
--    set $icu_version_full
--    IFS=$ac_IFS
--    icu_version=`expr [$]1 \* 1000 + [$]2`
--    AC_MSG_RESULT([found $icu_version_full])
--
--    if test "$icu_version" -lt "4000"; then
--      AC_MSG_ERROR([ICU version 4.0 or later is required])
--    fi
-+  PHP_EVAL_INCLINE($ICU_CFLAGS)
-+  PHP_EVAL_LIBLINE($ICU_LIBS, $1)
- 
--    ICU_VERSION=$icu_version
--    ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
--    ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
--    PHP_EVAL_INCLINE($ICU_INCS)
--    PHP_EVAL_LIBLINE($ICU_LIBS, $1)
-+  ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
-+  ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
- 
--    ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags`
--    ICU_CXXFLAGS="$ICU_CXXFLAGS -DU_USING_ICU_NAMESPACE=1"
-+  if test "$PKG_CONFIG icu-io --atleast-version=60"; then
-+    ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
-   fi
- ])
- 
---- a/ext/intl/config.m4
-+++ b/ext/intl/config.m4
-@@ -9,15 +9,7 @@ if test "$PHP_INTL" != "no"; then
-   PHP_SETUP_ICU(INTL_SHARED_LIBADD)
-   PHP_SUBST(INTL_SHARED_LIBADD)
-   PHP_REQUIRE_CXX()
--  INTL_COMMON_FLAGS="$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
--  if test "$icu_version" -ge "4002"; then
--    icu_spoof_src=" spoofchecker/spoofchecker_class.c \
--    spoofchecker/spoofchecker.c\
--    spoofchecker/spoofchecker_create.c\
--    spoofchecker/spoofchecker_main.c"
--  else
--    icu_spoof_src=""
--  fi
-+  INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
-   PHP_NEW_EXTENSION(intl, php_intl.c \
-     intl_error.c \
-     intl_convert.c \
-@@ -68,9 +60,12 @@ if test "$PHP_INTL" != "no"; then
-     transliterator/transliterator_methods.c \
-     uchar/uchar.c \
-     idn/idn.c \
--    $icu_spoof_src, $ext_shared,,$INTL_COMMON_FLAGS,cxx)
-+    spoofchecker/spoofchecker_class.c \
-+    spoofchecker/spoofchecker.c\
-+    spoofchecker/spoofchecker_create.c\
-+    spoofchecker/spoofchecker_main.c, $ext_shared,,$INTL_COMMON_FLAGS,cxx)
- 
--  PHP_INTL_CXX_SOURCES="intl_convertcpp.cpp \
-+  PHP_INTL_CPP_SOURCES="intl_convertcpp.cpp \
-     common/common_enum.cpp \
-     common/common_date.cpp \
-     dateformat/dateformat_format_object.cpp \
-@@ -89,11 +84,12 @@ if test "$PHP_INTL" != "no"; then
-     breakiterator/rulebasedbreakiterator_methods.cpp \
-     breakiterator/codepointiterator_internal.cpp \
-     breakiterator/codepointiterator_methods.cpp"
--  PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $ICU_CXXFLAGS"
-+
-+  PHP_INTL_CPP_FLAGS="$ICU_CXXFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
-   if test "$ext_shared" = "no"; then
--    PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS)
-+    PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS)
-   else
--    PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS, shared_objects_intl, yes)
-+    PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS, shared_objects_intl, yes)
-   fi
- 
-   PHP_ADD_BUILD_DIR($ext_builddir/collator)
--- 
-2.19.2
-
diff --git a/dev-lang/php/files/php-7.3.2-fix-iptcembed-bug77546.patch b/dev-lang/php/files/php-7.3.2-fix-iptcembed-bug77546.patch
deleted file mode 100644
index e157d250f2fb..000000000000
--- a/dev-lang/php/files/php-7.3.2-fix-iptcembed-bug77546.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-https://git.php.net/?p=php-src.git;a=commit;h=f27f9022660d28c13c6209f4679768dcbd961b43
-
---- a/ext/standard/iptc.c
-+++ b/ext/standard/iptc.c
-@@ -273,7 +273,7 @@ PHP_FUNCTION(iptcembed)
- 					iptcdata_len++; /* make the length even */
- 				}
- 
--				psheader[ 2 ] = (char) (iptcdata_len+28)>>8;
-+				psheader[ 2 ] = (char) ((iptcdata_len+28)>>8);
- 				psheader[ 3 ] = (iptcdata_len+28)&0xff;
- 
- 				for (inx = 0; inx < 28; inx++) {
---- /dev/null
-+++ b/ext/standard/tests/image/iptcembed_002.phpt
-@@ -0,0 +1,110 @@
-+--TEST--
-+iptcembed() valid jpg stream
-+--FILE--
-+<?php
-+/*
-+# source code to generate base64 use behind as $base64_1x1_jpeg
-+# we don't want to be gd library dependant for this test
-+$file="1x1.jpg";
-+$ret=imagejpeg(imagecreatetruecolor(1, 1), $file, 100);
-+echo md5(file_get_contents($file)).PHP_EOL;
-+echo base64_encode(file_get_contents($file)).PHP_EOL;
-+unlink($file);
-+*/
-+
-+/*
-+test description :
-+1) create local file 1x1 jpeg (without iptc) (use base64 content to create file)
-+2) generate iptcdata string with function iptc_make_tag describe behind
-+3) use iptcembed php function with our 1x1 jpeg file and our iptcdata string
-+4) write local file2 with iptcembed return content
-+5) various check on file2 to verify that's a valid jpeg file with our tags
-+*/
-+
-+
-+#iptc_make_tag function from http://php.net/iptcembed
-+function iptc_make_tag($rec, $data, $value)
-+  {
-+    $length = strlen($value);
-+    $retval = chr(0x1C) . chr($rec) . chr($data);
-+    if($length < 0x8000) { $retval .= chr($length >> 8) .  chr($length & 0xFF); }
-+    else { $retval .= chr(0x80) .  chr(0x04) .  chr(($length >> 24) & 0xFF) .  chr(($length >> 16) & 0xFF) .  chr(($length >> 8) & 0xFF) .  chr($length & 0xFF); }
-+    return $retval . $value;
-+  }
-+
-+
-+$file="1x1.jpg";
-+$file2="1x1_with_iptc_tags.jpg";
-+$base64_1x1_jpeg="/9j/4AAQSkZJRgABAQEAYABgAAD//gA8Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2ODApLCBxdWFsaXR5ID0gMTAwCv/bAEMAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAAEAAQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP8AP/oA/9k=";
-+#write file
-+$fd=fopen($file,"wb");
-+if ($fd) { fputs($fd,base64_decode($base64_1x1_jpeg)); fclose($fd); }
-+else { echo "error cant write $file".PHP_EOL;exit(1); }
-+#check file md5
-+$md5=md5_file($file);
-+if ($md5!="07dd8594450e8c18ab8a79d7cb4573c7") { echo "md5 error".PHP_EOL;exit(1); }
-+#check jpeg properties
-+list($width, $height, $type, $attr) = getimagesize($file,$info);
-+if ($width!=1) { echo "width error".PHP_EOL;exit(1); }
-+if ($height!=1) { echo "height error".PHP_EOL;exit(1); }
-+if ($type!=2) { echo "type error".PHP_EOL;exit(1); }
-+if (!isset($info["APP0"])) { echo "APP0 error".PHP_EOL;exit(1); }
-+
-+#our iptc tags
-+$tags=array();
-+$tags["2#105"]= "Tauren";
-+$tags["2#120"]= "Tauren with Trunk";
-+$tags["2#110"]= "Copyright 2004-2016, Blizzard";
-+$tags["2#025"]= "Tauren, Chaman, Blizzard";
-+$tags["2#090"]= "Thunder Bluffs";
-+#feed iptc string for iptcembed
-+$iptc='';
-+foreach ($tags as $tag => $string) { $rec=$tag[0]; $tag = substr($tag, 2); $iptc .= iptc_make_tag($rec, $tag, $string); }
-+#check iptc string md5
-+if (md5(base64_encode($iptc))!="7056c4b3060f92a4f9e5b7d0caa61859") { echo "iptc md5 error".PHP_EOL;exit(1); }
-+
-+#use iptcembed to get jpeg stream content with iptc tags
-+$content = iptcembed($iptc, $file,0);
-+
-+#write new image with iptc tags
-+if ($content === false) {echo "iptcembed error".PHP_EOL;exit(1); }
-+$fd=fopen($file2,"wb");
-+if ($fd) { fputs($fd,$content); fclose($fd); }
-+else { echo "error cant write $file2".PHP_EOL;exit(1); }
-+
-+
-+#check jpeg properties for new image with iptc tags
-+echo "new generated image with itpc tags : $file2".PHP_EOL;
-+$ret = getimagesize($file2,$info);
-+if ($ret===false) { echo "getimagesize error".PHP_EOL;exit(1); }
-+list($width, $height, $type, $attr) = $ret;
-+if ($width!=1) { echo "width error".PHP_EOL;exit(1); }
-+if ($height!=1) { echo "height error".PHP_EOL;exit(1); }
-+if ($type!=2) { echo "type error".PHP_EOL;exit(1); }
-+if (!isset($info["APP0"])) { echo "APP0 error".PHP_EOL;exit(1); }
-+if (!isset($info["APP13"])) { echo "APP13 error".PHP_EOL;exit(1); }
-+
-+$error=0;
-+$iptc_data_from_created_image = iptcparse($info['APP13']);
-+foreach ($tags as $tag => $string) {
-+  #check if tag exists
-+  if (!isset($iptc_data_from_created_image[$tag])) {
-+    echo "error iptc tag $tag not found".PHP_EOL;
-+    $error++;
-+  } else {
-+    #check value
-+    if ($iptc_data_from_created_image[$tag][0]!=$string) {
-+      echo "error tag $tag : bad value ($string != ".$iptc_data_from_created_image[$tag][0].")".PHP_EOL;
-+      $error++;
-+    }
-+  }
-+}
-+#clean before exit
-+@unlink($file);
-+@unlink($file2);
-+if ($error==0) { echo "OK".PHP_EOL;exit(0);}
-+echo "something wrong: $error errors".PHP_EOL;
-+?>
-+--EXPECT--
-+new generated image with itpc tags : 1x1_with_iptc_tags.jpg
-+OK
---