rpms/php
7
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase to 8.0.20 #2095752

Browse Source 
clean unneeded dependency on useradd command #2095447
add upstream patch to initialize pcre before mbstring
retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi
add rpminspect configuration file

Related: #2095752
This commit is contained in:
Remi Collet 2022-06-13 14:21:35 +02:00
parent 050d6ec653
commit 6d932863d7
9 changed files with 143 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitignore vendored
View File

@ -4,17 +4,9 @@ TODO
php-5.*.xz
php-7.*.xz
php-7.*.xz.asc
/php-8.0.3.tar.xz
/php-8.0.3.tar.xz.asc
/php-8.0.4RC1.tar.xz
/php-8.0.4RC1.tar.xz.asc
/php-8.0.5RC1.tar.xz
/php-8.0.5RC1.tar.xz.asc
/php-8.0.5.tar.xz
/php-8.0.5.tar.xz.asc
/php-8.0.6.tar.xz
/php-8.0.6.tar.xz.asc
/php-8.0.12.tar.xz
/php-8.0.12.tar.xz.asc
php-8.1.*.xz
php-8.1.*.xz.asc
/php-8.0.13.tar.xz
/php-8.0.13.tar.xz.asc
/php-8.0.20.tar.xz
/php-8.0.20.tar.xz.asc

84
php-8.0.10-systzdata-v20.patch → php-8.0.10-systzdata-v21.patch
View File

@ -5,6 +5,7 @@ Add support for use of the system timezone database, rather
than embedding a copy. Discussed upstream but was not desired.
History:
r21: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi
r20: adapt for timelib 2020.03 (in 8.0.10RC1)
r19: adapt for timelib 2020.02 (in 8.0.0beta2)
r18: adapt for autotool change in 7.3.3RC1
@ -31,9 +32,10 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
r2: add filesystem trawl to set up name alias index
r1: initial revision
diff -up ./ext/date/config0.m4.systzdata ./ext/date/config0.m4
--- ./ext/date/config0.m4.systzdata 2021-08-10 11:35:28.000000000 +0200
+++ ./ext/date/config0.m4 2021-08-10 12:09:41.067003517 +0200
diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index 20e4164aaa..a61243646d 100644
--- a/ext/date/config0.m4
+++ b/ext/date/config0.m4
@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
dnl Check for strtoll, atoll
AC_CHECK_FUNCS(strtoll atoll)
@ -54,9 +56,10 @@ diff -up ./ext/date/config0.m4.systzdata ./ext/date/config0.m4
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 -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
--- ./ext/date/lib/parse_tz.c.systzdata 2021-08-10 11:35:28.000000000 +0200
+++ ./ext/date/lib/parse_tz.c 2021-08-10 12:12:13.191605207 +0200
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index e9bd0f136d..c04ff01adc 100644
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@ -26,8 +26,21 @@
#include "timelib.h"
#include "timelib_private.h"
@ -79,7 +82,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
#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 unsig
@@ -94,6 +107,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
{
uint32_t version;
@ -91,7 +94,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
/* read ID */
version = (*tzf)[3] - '0';
*tzf += 4;
@@ -435,7 +453,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
@@ -435,7 +453,467 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
}
}
@ -322,6 +325,44 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
+}
+
+
+/* Retrieve tzdata version. */
+static void retrieve_zone_version(timelib_tzdb *db)
+{
+ static char buf[30];
+ char path[PATH_MAX];
+ FILE *fp;
+
+ strncpy(path, ZONEINFO_PREFIX "/tzdata.zi", sizeof(path));
+
+ fp = fopen(path, "r");
+ if (fp) {
+ if (fgets(buf, sizeof(buf), fp)) {
+ if (!memcmp(buf, "# version ", 10) &&
+ isdigit(buf[10]) &&
+ isdigit(buf[11]) &&
+ isdigit(buf[12]) &&
+ isdigit(buf[13]) &&
+ islower(buf[14])) {
+ if (buf[14] >= 't') { /* 2022t = 2022.20 */
+ buf[17] = 0;
+ buf[16] = buf[14] - 't' + '0';
+ buf[15] = '2';
+ } else if (buf[14] >= 'j') { /* 2022j = 2022.10 */
+ buf[17] = 0;
+ buf[16] = buf[14] - 'j' + '0';
+ buf[15] = '1';
+ } else { /* 2022a = 2022.1 */
+ buf[16] = 0;
+ buf[15] = buf[14] - 'a' + '1';
+ }
+ buf[14] = '.';
+ db->version = buf+10;
+ }
+ }
+ fclose(fp);
+ }
+}
+
+/* Create the zone identifier index by trawling the filesystem. */
+static void create_zone_index(timelib_tzdb *db)
+{
@ -522,7 +563,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
{
int left = 0, right = tzdb->index_size - 1;
@@ -461,9 +901,48 @@ static int seek_to_tz_position(const uns
@@ -461,9 +939,49 @@ static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
return 0;
}
@ -559,6 +600,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
+ tmp->version = "0.system";
+ tmp->data = NULL;
+ create_zone_index(tmp);
+ retrieve_zone_version(tmp);
+ system_location_table = create_location_table();
+ fake_data_segment(tmp, system_location_table);
+ timezonedb_system = tmp;
@ -571,7 +613,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
}
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
@@ -475,7 +954,30 @@ const timelib_tzdb_index_entry *timelib_
@@ -475,7 +993,30 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
{
const unsigned char *tzf;
@ -603,7 +645,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
}
static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
@@ -517,6 +1019,8 @@ static timelib_tzinfo* timelib_tzinfo_ct
@@ -517,6 +1058,8 @@ static timelib_tzinfo* timelib_tzinfo_ctor(const char *name)
timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
{
const unsigned char *tzf;
@ -612,7 +654,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
timelib_tzinfo *tmp;
int version;
int transitions_result, types_result;
@@ -524,7 +1028,7 @@ timelib_tzinfo *timelib_parse_tzfile(con
@@ -524,7 +1067,7 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
*error_code = TIMELIB_ERROR_NO_ERROR;
@ -621,7 +663,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
tmp = timelib_tzinfo_ctor(timezone);
version = read_preamble(&tzf, tmp, &type);
@@ -563,11 +1067,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
@@ -563,11 +1106,36 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
}
skip_posix_string(&tzf, tmp);
@ -658,3 +700,19 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
} else {
*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
tmp = NULL;
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 2d5cffb963..389f09f313 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -457,7 +457,11 @@ PHP_MINFO_FUNCTION(date)
php_info_print_table_row(2, "date/time support", "enabled");
php_info_print_table_row(2, "timelib version", TIMELIB_ASCII_VERSION);
php_info_print_table_row(2, "\"Olson\" Timezone Database Version", tzdb->version);
+#ifdef HAVE_SYSTEM_TZDATA
+ php_info_print_table_row(2, "Timezone Database", "system");
+#else
php_info_print_table_row(2, "Timezone Database", php_date_global_timezone_db_enabled ? "external" : "internal");
+#endif
php_info_print_table_row(2, "Default timezone", guess_timezone(tzdb));
php_info_print_table_end();

2
php-8.0.0-parser.patch → php-8.0.19-parser.patch
View File

@ -11,6 +11,6 @@ diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
+ return;
+ }
+
$version = "4.9.0";
$version = "4.13.0";
$phpParserDir = __DIR__ . "/PHP-Parser-$version";
if (!is_dir($phpParserDir)) {

33
php-mbstring.patch Normal file
View File

@ -0,0 +1,33 @@
From 2eb2f9d74f22bf35a4915ec95afc53a47ebf1af9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 2 Jun 2022 08:05:22 +0200
Subject: [PATCH] Fix GH-8685 mbstring requires pcre
---
ext/mbstring/mbstring.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 48f22a682a19..4a4088aed3fb 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -161,9 +161,18 @@ static const php_mb_nls_ident_list php_mb_default_identify_list[] = {
/* }}} */
+/* {{{ mbstring_deps[] */
+static const zend_module_dep mbstring_deps[] = {
+ ZEND_MOD_REQUIRED("pcre")
+ ZEND_MOD_END
+};
+/* }}} */
+
/* {{{ zend_module_entry mbstring_module_entry */
zend_module_entry mbstring_module_entry = {
- STANDARD_MODULE_HEADER,
+ STANDARD_MODULE_HEADER_EX,
+ NULL,
+ mbstring_deps,
"mbstring",
ext_functions,
PHP_MINIT(mbstring),

6
php.conf
View File

@ -19,15 +19,13 @@ DirectoryIndex index.php
#
# Redirect to local php-fpm (no mod_php in default configuration)
#
<IfModule !mod_php5.c>
<IfModule !mod_php7.c>
<IfModule !mod_php.c>
# Enable http authorization headers
SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
<FilesMatch \.(php|phar)$>
SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost"
</FilesMatch>
</IfModule>
</IfModule>
#
@ -36,7 +34,7 @@ DirectoryIndex index.php
#
# mod_php options
#
<IfModule mod_php7.c>
<IfModule mod_php.c>
#
# Cause the PHP interpreter to handle files with a .php extension.
#

9
php.modconf
View File

@ -3,10 +3,11 @@
# easy for developers to write dynamically generated webpages.
#
# Cannot load both php5 and php7 modules
# Cannot load both php5, php7 and php modules
<IfModule !mod_php5.c>
<IfModule prefork.c>
LoadModule php7_module modules/libphp7.so
<IfModule !mod_php7.c>
<IfModule prefork.c>
LoadModule php_module modules/libphp.so
</IfModule>
</IfModule>
</IfModule>

24
php.spec
View File

@ -56,7 +56,7 @@
%bcond_with imap
%bcond_without lmdb
%global upver 8.0.13
%global upver 8.0.20
#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
@ -102,9 +102,9 @@ Patch9: php-8.0.6-deprecated.patch
# Functional changes
# Use system nikic/php-parser
Patch41: php-8.0.0-parser.patch
Patch41: php-8.0.19-parser.patch
# use system tzdata
Patch42: php-8.0.10-systzdata-v20.patch
Patch42: php-8.0.10-systzdata-v21.patch
# See http://bugs.php.net/53436
Patch43: php-7.4.0-phpize.patch
# Use -lldap_r for OpenLDAP
@ -123,6 +123,7 @@ Patch50: php-8.0.10-openssl3.patch
Patch51: php-8.0.13-crypt.patch
# Upstream fixes (100+)
Patch100: php-mbstring.patch
# Security fixes (200+)
@ -148,6 +149,7 @@ BuildRequires: pkgconfig(zlib) >= 1.2.0.4
BuildRequires: smtpdaemon
BuildRequires: pkgconfig(libedit)
BuildRequires: pkgconfig(libpcre2-8) >= 10.30
BuildRequires: pkgconfig(libxcrypt)
BuildRequires: bzip2
BuildRequires: perl-interpreter
BuildRequires: autoconf
@ -237,7 +239,6 @@ Summary: PHP FastCGI Process Manager
BuildRequires: libacl-devel
BuildRequires: pkgconfig(libsystemd) >= 209
Requires: php-common%{?_isa} = %{version}-%{release}
Requires(pre): /usr/sbin/useradd
%{?systemd_requires}
# To ensure correct /var/lib/php/session ownership:
Requires(pre): httpd-filesystem
@ -319,7 +320,7 @@ Requires: zlib-devel%{?_isa}
Provides: php-zts-devel = %{version}-%{release}
Provides: php-zts-devel%{?_isa} = %{version}-%{release}
%endif
Recommends: php-nikic-php-parser4 >= 4.3.0
Recommends: php-nikic-php-parser4 >= 4.13.0
%description devel
@ -724,6 +725,7 @@ rm ext/openssl/tests/p12_with_extra_certs.p12
%patch51 -p1 -b .libxcrypt
# upstream patches
%patch100 -p1 -b .up
# security patches
@ -732,7 +734,7 @@ rm ext/openssl/tests/p12_with_extra_certs.p12
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
cp Zend/LICENSE ZEND_LICENSE
cp TSRM/LICENSE TSRM_LICENSE
cp sapi/fpm/LICENSE fpm_LICENSE
cp ext/mbstring/libmbfl/LICENSE libmbfl_LICENSE
@ -753,8 +755,6 @@ mkdir build-cgi build-embedded \
# ----- Manage known as failed test -------
# affected by systzdata patch
rm ext/date/tests/timezone_location_get.phpt
rm ext/date/tests/timezone_version_get.phpt
rm ext/date/tests/timezone_version_get_basic1.phpt
# fails sometime
rm ext/sockets/tests/mcast_ipv?_recv.phpt
# cause stack exhausion
@ -1400,7 +1400,7 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%files common -f files.common
%doc EXTENSIONS NEWS UPGRADING* README.REDIST.BINS *md docs
%license LICENSE TSRM_LICENSE
%license LICENSE TSRM_LICENSE ZEND_LICENSE
%license libmagic_LICENSE
%license timelib_LICENSE
%doc php.ini-*
@ -1536,6 +1536,12 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%changelog
* Mon Jun 13 2022 Remi Collet <rcollet@redhat.com> - 8.0.20-1
- rebase to 8.0.20 #2095752
- clean unneeded dependency on useradd command #2095447
- add upstream patch to initialize pcre before mbstring
- retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi
* Wed Dec 15 2021 Remi Collet <rcollet@redhat.com> - 8.0.13-1
- rebase to 8.0.13 #2032429
- refresh configuration files from upstream

10
rpminspect.yaml Normal file
View File

@ -0,0 +1,10 @@
---
inspections:
# tracked as #1988529 php disables LTO in RHEL 9
lto: off
emptyrpm:
# metapackage
expected_empty:
- php

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (php-8.0.13.tar.xz) = cb00482b74146670c4644f4b5da63b40d9afd111e198cdf1e67bfcf4280501a657b4fbad8fd7580f4e3f537db3c8a9db5f4115d3a466392cefac9866e233fa49
SHA512 (php-8.0.13.tar.xz.asc) = 1988cd4158416b3853d5985a00a1f2c703aeb4496f22db4855279a10001d0ca95e080b8c89c2944e3addf952d37836c6b5a5f6d29bad5c9db6ccdfbced5c86bb
SHA512 (php-8.0.20.tar.xz) = 24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
SHA512 (php-8.0.20.tar.xz.asc) = 59cb79f14b36c4aa0b18caff0f7028bb2fb88c07bc188534b78124ef6a73c941bce651ae52a58571159ad406b961c45049503c0cb378a9eadd168250fb7dbc04