summaryrefslogtreecommitdiff
path: root/lang/php8
diff options
context:
space:
mode:
authorIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-20 16:02:15 -0800
committerIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-20 16:02:15 -0800
commit5d8d4fbbcb5c5de9370711c19bb3510210989a98 (patch)
treed0754921833f413b7eb93fb6bb1b1c8a22fb0498 /lang/php8
parentd651082447b4392399a40ea1ae11d0bce4bfe83a (diff)
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset: find -L package/feeds/packages/ -name patches | \ sed 's/patches$/refresh/' | sort | xargs make Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'lang/php8')
-rw-r--r--lang/php8/patches/0007-Add-support-for-use-of-the-system-timezone-database.patch16
-rw-r--r--lang/php8/patches/0022-Use-system-timezone.patch4
-rw-r--r--lang/php8/patches/0025-php-5.4.9-fixheader.patch4
-rw-r--r--lang/php8/patches/0030-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch2
-rw-r--r--lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch6
-rw-r--r--lang/php8/patches/1004-disable-phar-command.patch2
-rw-r--r--lang/php8/patches/1010-Fix-opcache-jit-minilua-compiling.patch5
7 files changed, 12 insertions, 27 deletions
diff --git a/lang/php8/patches/0007-Add-support-for-use-of-the-system-timezone-database.patch b/lang/php8/patches/0007-Add-support-for-use-of-the-system-timezone-database.patch
index bb0462256..b5071bcd4 100644
--- a/lang/php8/patches/0007-Add-support-for-use-of-the-system-timezone-database.patch
+++ b/lang/php8/patches/0007-Add-support-for-use-of-the-system-timezone-database.patch
@@ -41,8 +41,6 @@ r1: initial revision
ext/date/lib/parse_tz.c | 535 +++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 545 insertions(+), 3 deletions(-)
-diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
-index 20e4164..a612436 100644
--- a/ext/date/config0.m4
+++ b/ext/date/config0.m4
@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
@@ -65,8 +63,6 @@ index 20e4164..a612436 100644
PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
-diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
-index 233c55c..4b70178 100644
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@ -26,8 +26,21 @@
@@ -91,7 +87,7 @@ index 233c55c..4b70178 100644
#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
# if defined(__LITTLE_ENDIAN__)
-@@ -94,6 +107,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+@@ -94,6 +107,11 @@ static int read_php_preamble(const unsig
{
uint32_t version;
@@ -103,7 +99,7 @@ index 233c55c..4b70178 100644
/* read ID */
version = (*tzf)[3] - '0';
*tzf += 4;
-@@ -418,7 +436,429 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
+@@ -418,7 +436,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
}
}
@@ -534,7 +530,7 @@ index 233c55c..4b70178 100644
{
int left = 0, right = tzdb->index_size - 1;
-@@ -444,9 +884,48 @@ static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
+@@ -444,9 +884,48 @@ static int seek_to_tz_position(const uns
return 0;
}
@@ -583,7 +579,7 @@ index 233c55c..4b70178 100644
}
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
-@@ -458,7 +937,30 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
+@@ -458,7 +937,30 @@ const timelib_tzdb_index_entry *timelib_
int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
{
const unsigned char *tzf;
@@ -615,7 +611,7 @@ index 233c55c..4b70178 100644
}
static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
-@@ -500,12 +1002,14 @@ static timelib_tzinfo* timelib_tzinfo_ctor(const char *name)
+@@ -500,12 +1002,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
{
const unsigned char *tzf;
@@ -631,7 +627,7 @@ index 233c55c..4b70178 100644
tmp = timelib_tzinfo_ctor(timezone);
version = read_preamble(&tzf, tmp, &type);
-@@ -540,11 +1044,36 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
+@@ -540,11 +1044,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
}
skip_posix_string(&tzf, tmp);
diff --git a/lang/php8/patches/0022-Use-system-timezone.patch b/lang/php8/patches/0022-Use-system-timezone.patch
index d17e161be..b7ad1882c 100644
--- a/lang/php8/patches/0022-Use-system-timezone.patch
+++ b/lang/php8/patches/0022-Use-system-timezone.patch
@@ -13,11 +13,9 @@ To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezon
ext/date/php_date.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
-diff --git a/ext/date/php_date.c b/ext/date/php_date.c
-index 8c0f5a6..6b650ac 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
-@@ -538,6 +538,23 @@ static char* guess_timezone(const timelib_tzdb *tzdb)
+@@ -538,6 +538,23 @@ static char* guess_timezone(const timeli
DATEG(timezone_valid) = 1;
return DATEG(default_timezone);
}
diff --git a/lang/php8/patches/0025-php-5.4.9-fixheader.patch b/lang/php8/patches/0025-php-5.4.9-fixheader.patch
index d5fba4b1a..0ecc680e2 100644
--- a/lang/php8/patches/0025-php-5.4.9-fixheader.patch
+++ b/lang/php8/patches/0025-php-5.4.9-fixheader.patch
@@ -7,11 +7,9 @@ Make generated php_config.h constant across rebuilds.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/configure.ac b/configure.ac
-index dcfe883..9b94618 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1280,7 +1280,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS)
+@@ -1278,7 +1278,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS)
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
diff --git a/lang/php8/patches/0030-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch b/lang/php8/patches/0030-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch
index 7bfe8b09b..9934d1b2c 100644
--- a/lang/php8/patches/0030-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch
+++ b/lang/php8/patches/0030-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch
@@ -7,8 +7,6 @@ Subject: Remove W3C validation icon to not expose the reader's IP address to
sapi/fpm/status.html.in | 5 -----
1 file changed, 5 deletions(-)
-diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in
-index d3b6d5e..f71d486 100644
--- a/sapi/fpm/status.html.in
+++ b/sapi/fpm/status.html.in
@@ -70,11 +70,6 @@
diff --git a/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch b/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
index baa57f940..6d95f5175 100644
--- a/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
+++ b/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
@@ -6,7 +6,7 @@ Subject: Add patch to remove build timestamps from generated binaries.
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
-@@ -791,7 +791,6 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
+@@ -791,7 +791,6 @@ PHPAPI ZEND_COLD void php_print_info(int
php_info_print_box_end();
php_info_print_table_start();
php_info_print_table_row(2, "System", ZSTR_VAL(php_uname));
@@ -54,7 +54,7 @@ Subject: Add patch to remove build timestamps from generated binaries.
fcgi_shutdown();
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
-@@ -633,8 +633,8 @@ static int do_cli(int argc, char **argv) /* {{{ */
+@@ -633,8 +633,8 @@ static int do_cli(int argc, char **argv)
goto out;
case 'v': /* show php version & quit */
@@ -67,7 +67,7 @@ Subject: Add patch to remove build timestamps from generated binaries.
#else
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
-@@ -1694,9 +1694,9 @@ int main(int argc, char *argv[])
+@@ -1691,9 +1691,9 @@ int main(int argc, char *argv[])
SG(request_info).no_headers = 1;
#if ZEND_DEBUG
diff --git a/lang/php8/patches/1004-disable-phar-command.patch b/lang/php8/patches/1004-disable-phar-command.patch
index 6fbc7ceb4..2ec2ceac7 100644
--- a/lang/php8/patches/1004-disable-phar-command.patch
+++ b/lang/php8/patches/1004-disable-phar-command.patch
@@ -11,7 +11,7 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -1417,13 +1417,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
+@@ -1423,13 +1423,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
diff --git a/lang/php8/patches/1010-Fix-opcache-jit-minilua-compiling.patch b/lang/php8/patches/1010-Fix-opcache-jit-minilua-compiling.patch
index cbabf9197..6f134fabb 100644
--- a/lang/php8/patches/1010-Fix-opcache-jit-minilua-compiling.patch
+++ b/lang/php8/patches/1010-Fix-opcache-jit-minilua-compiling.patch
@@ -8,8 +8,6 @@ Signed-off-by: Michael Heimpold <mhei@heimpold.de>
ext/opcache/jit/Makefile.frag | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag
-index d4f97de..7421897 100644
--- a/ext/opcache/jit/Makefile.frag
+++ b/ext/opcache/jit/Makefile.frag
@@ -1,6 +1,6 @@
@@ -20,6 +18,3 @@ index d4f97de..7421897 100644
$(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua
$(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc
---
-2.17.1
-