diff --git a/dev-lang/php/patches/php-5.6.4.patchset b/dev-lang/php/patches/php-5.6.33.patchset similarity index 95% rename from dev-lang/php/patches/php-5.6.4.patchset rename to dev-lang/php/patches/php-5.6.33.patchset index 018278b98..d1e5020ad 100644 --- a/dev-lang/php/patches/php-5.6.4.patchset +++ b/dev-lang/php/patches/php-5.6.33.patchset @@ -1,11 +1,11 @@ -From c7cb3fd284e68de9a3d13785ff963259fb227285 Mon Sep 17 00:00:00 2001 +From 089544e6c6fadc97801ca1ac5eee077985157467 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 16 Jan 2018 21:32:56 +0100 Subject: Import old patch: build system. diff --git a/acinclude.m4 b/acinclude.m4 -index 81dc0db..26a00ba 100644 +index 3db7438..4eaacc6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -762,7 +762,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[ @@ -18,7 +18,7 @@ index 81dc0db..26a00ba 100644 fi ]) diff --git a/aclocal.m4 b/aclocal.m4 -index 189149f..d0f3287 100644 +index 47f05b2..1d546e7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -762,7 +762,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[ @@ -55,7 +55,7 @@ index 2f82c34..b6a09d9 100644 CURL_CONFIG="curl-config" diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 -index 446c242..c2db008 100644 +index e643e52..517cf26 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -50,23 +50,23 @@ dnl @@ -113,7 +113,7 @@ index 446c242..c2db008 100644 if test -z "$GD_PNG_DIR"; then diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 -index a21ad2d..4ef3a98 100644 +index 845d446..3113459 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -20,23 +20,23 @@ if test "$PHP_ZIP" != "no"; then @@ -150,17 +150,17 @@ index a21ad2d..4ef3a98 100644 done fi -- -2.15.1 +2.16.1 -From 0a937da65315954e409f57d246ec7ddfe6c6f4a5 Mon Sep 17 00:00:00 2001 +From c9a09d3997cdf687c8accf2ddcc6e37ead08bf6e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 16 Jan 2018 21:34:13 +0100 Subject: Import old patch: code changes. diff --git a/ext/date/php_date.c b/ext/date/php_date.c -index bf29a56..17d2446 100644 +index 801208d..12170e3 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -33,8 +33,6 @@ @@ -173,7 +173,7 @@ index bf29a56..17d2446 100644 static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; } #endif diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c -index fe22366..14298fb 100644 +index 982c83c..9e17082 100644 --- a/ext/standard/microtime.c +++ b/ext/standard/microtime.c @@ -131,7 +131,7 @@ PHP_FUNCTION(getrusage) @@ -186,10 +186,10 @@ index fe22366..14298fb 100644 PHP_RUSAGE_PARA(ru_inblock); PHP_RUSAGE_PARA(ru_msgsnd); -- -2.15.1 +2.16.1 -From a1560ad74900a7408fe89df4b4e1719643794f1b Mon Sep 17 00:00:00 2001 +From 8a5654f65fbe4941b1f14d3c2552ddd5bb9cd2f8 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 16 Jan 2018 21:58:37 +0100 Subject: More build system fixes @@ -241,5 +241,5 @@ index ebf67cc..b53c7e2 100644 if test `echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then AC_MSG_ERROR([libz version greater or equal to 1.2.0.4 required]) -- -2.15.1 +2.16.1 diff --git a/dev-lang/php/php-5.6.4.recipe b/dev-lang/php/php-5.6.33.recipe similarity index 95% rename from dev-lang/php/php-5.6.4.recipe rename to dev-lang/php/php-5.6.33.recipe index 42e7dafac..3c05975ca 100644 --- a/dev-lang/php/php-5.6.4.recipe +++ b/dev-lang/php/php-5.6.33.recipe @@ -6,9 +6,9 @@ popular websites in the world." HOMEPAGE="https://php.net/" COPYRIGHT="2001-2014 PHP Group" LICENSE="PHP License v3.01" -REVISION="5" +REVISION="1" SOURCE_URI="https://php.net/get/php-$portVersion.tar.bz2/from/this/mirror" -CHECKSUM_SHA256="576f9001b612f5ddc22f447311bbec321e2c959b6a52259d664c4ba04ef044f1" +CHECKSUM_SHA256="07f696a9761dcd839e2045c95c3a4d2ffb52c54417477cca9d30a14975b831cc" SOURCE_FILENAME="php-$portVersion.tar.bz2" PATCHES="php-$portVersion.patchset"