commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2022-11-11 14:36:13
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1597 (New)
Package is "php7"
Fri Nov 11 14:36:13 2022 rev:119 rq:1035032 version:7.4.33
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2022-11-04
17:31:45.111792629 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.1597/php7.changes 2022-11-11
14:36:16.506218605 +0100
@@ -1,0 +2,6 @@
+Thu Nov 10 09:57:02 UTC 2022 - pgaj...@suse.com
+
+- hardcode openssl version, openssl3 will not be supported
+ https://www.php.net/manual/en/openssl.requirements.php
+
+---
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.1uXIwC/_old 2022-11-11 14:36:17.290223132 +0100
+++ /var/tmp/diff_new_pack.1uXIwC/_new 2022-11-11 14:36:17.294223155 +0100
@@ -116,6 +116,7 @@
BuildRequires: libacl-devel
BuildRequires: libapparmor-devel
BuildRequires: libbz2-devel
+BuildRequires: libopenssl-1_1-devel
BuildRequires: libtidy-devel
BuildRequires: libtiff-devel
BuildRequires: libtool
@@ -146,7 +147,6 @@
BuildRequires: pkgconfig(libzip) >= 0.11
BuildRequires: pkgconfig(odbc)
BuildRequires: pkgconfig(oniguruma)
-BuildRequires: pkgconfig(openssl) >= 1.0.1
BuildRequires: pkgconfig(sqlite3) > 3.7.4
BuildRequires: pkgconfig(zlib) >= 1.2.0.4
%if %{build_firebird}
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2022-11-04 17:31:42
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.2275 (New)
Package is "php7"
Fri Nov 4 17:31:42 2022 rev:118 rq:1033030 version:7.4.33
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2022-10-01
17:42:56.509646710 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.2275/php7.changes 2022-11-04
17:31:45.111792629 +0100
@@ -1,0 +2,10 @@
+Thu Nov 3 10:21:36 UTC 2022 - pgaj...@suse.com
+
+- version update to 7.4.33
+ * This is security release that fixes an OOB read due to insufficient
+input validation in imageloadfont(), and a buffer overflow in
+hash_update() on long parameter.
+ * CVE-2022-37454 [bsc#1204577], CVE-2022-31630 [bsc#1204979]
+ https://www.php.net/ChangeLog-7.php#7.4.33
+
+---
Old:
php-7.4.32.tar.xz
php-7.4.32.tar.xz.asc
New:
php-7.4.33.tar.xz
php-7.4.33.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.ldyDkS/_old 2022-11-04 17:31:46.279798913 +0100
+++ /var/tmp/diff_new_pack.ldyDkS/_new 2022-11-04 17:31:46.287798956 +0100
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.32
+Version:7.4.33
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.32.tar.xz -> php-7.4.33.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.32.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.2275/php-7.4.33.tar.xz differ: char 26,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2022-10-01 17:42:45
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.2275 (New)
Package is "php7"
Sat Oct 1 17:42:45 2022 rev:117 rq:1006913 version:7.4.32
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2022-06-13
13:01:58.761070827 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.2275/php7.changes 2022-10-01
17:42:56.509646710 +0200
@@ -1,0 +2,11 @@
+Thu Sep 29 10:17:46 UTC 2022 - pgaj...@suse.com
+
+- version update to 7.4.32
+ * This is security release that addresses an infinite recursion with
specially
+constructed phar files, and prevents a clash with variable name mangling
for
+the __Host/__Secure HTTP headers.
+ * CVEs fixed: CVE-2022-31628, CVE-2022-31629
+ https://www.php.net/ChangeLog-7.php#7.4.32
+ https://www.php.net/ChangeLog-7.php#7.4.31
+
+---
Old:
php-7.4.30.tar.xz
php-7.4.30.tar.xz.asc
New:
php-7.4.32.tar.xz
php-7.4.32.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.mnctxZ/_old 2022-10-01 17:42:57.413648354 +0200
+++ /var/tmp/diff_new_pack.mnctxZ/_new 2022-10-01 17:42:57.421648369 +0200
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.30
+Version:7.4.32
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.30.tar.xz -> php-7.4.32.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.30.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.2275/php-7.4.32.tar.xz differ: char 27,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2022-06-13 13:01:54
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1548 (New)
Package is "php7"
Mon Jun 13 13:01:54 2022 rev:116 rq:981969 version:7.4.30
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2022-05-08
21:52:44.267492216 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1548/php7.changes 2022-06-13
13:01:58.761070827 +0200
@@ -1,0 +2,7 @@
+Fri Jun 10 04:34:52 UTC 2022 - pgaj...@suse.com
+
+- version update to 7.4.30
+ * This is a security release.
+ https://www.php.net/ChangeLog-7.php#7.4.30
+
+---
Old:
php-7.4.29.tar.xz
php-7.4.29.tar.xz.asc
New:
php-7.4.30.tar.xz
php-7.4.30.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.8R2FnV/_old 2022-06-13 13:01:59.749072208 +0200
+++ /var/tmp/diff_new_pack.8R2FnV/_new 2022-06-13 13:01:59.757072218 +0200
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.29
+Version:7.4.30
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.29.tar.xz -> php-7.4.30.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.29.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.1548/php-7.4.30.tar.xz differ: char 27,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2022-05-08 21:52:31
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1538 (New)
Package is "php7"
Sun May 8 21:52:31 2022 rev:115 rq:975375 version:7.4.29
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2022-04-23
00:25:14.639749227 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1538/php7.changes 2022-05-08
21:52:44.267492216 +0200
@@ -1,0 +2,8 @@
+Fri May 6 09:38:30 UTC 2022 - pgaj...@suse.com
+
+- security update [bsc#1197644]
+- added patches
+ fix
https://github.com/php/php-src/commit/771dbdb319fa7f90584f6b2cc2c54ccff570492d
+ + php7-signedness-php_filter_validate_domain.patch
+
+---
New:
php7-signedness-php_filter_validate_domain.patch
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.uTYdNi/_old 2022-05-08 21:52:44.983493118 +0200
+++ /var/tmp/diff_new_pack.uTYdNi/_new 2022-05-08 21:52:44.987493122 +0200
@@ -102,6 +102,8 @@
Patch19:php-build-reproducible-phar.patch
#
https://github.com/php/php-src/commit/b3646440b1808abf0874b6f89027ce53ec5da03f
Patch20:php7-gd-removed-unused-constants.patch
+#
https://github.com/php/php-src/commit/771dbdb319fa7f90584f6b2cc2c54ccff570492d
+Patch21:php7-signedness-php_filter_validate_domain.patch
BuildRequires: apache-rpm-macros
BuildRequires: autoconf
BuildRequires: bison
@@ -964,6 +966,7 @@
%patch17 -p1
%patch19 -p1
%patch20 -p1
+%patch21 -p1
# use system pcre2
rm -r ext/pcre/pcre2lib
++ php7-signedness-php_filter_validate_domain.patch ++
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 95f7a99e34b1..b57473676282 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -496,7 +496,7 @@ void
php_filter_validate_regexp(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
}
}
-static int _php_filter_validate_domain(char * domain, int len, zend_long
flags) /* {{{ */
+static int _php_filter_validate_domain(char * domain, size_t len, zend_long
flags) /* {{{ */
{
char *e, *s, *t;
size_t l;
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2022-04-23 00:25:04
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1538 (New)
Package is "php7"
Sat Apr 23 00:25:04 2022 rev:114 rq:971313 version:7.4.29
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2022-04-14
17:25:31.695267792 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1538/php7.changes 2022-04-23
00:25:14.639749227 +0200
@@ -1,0 +2,11 @@
+Wed Apr 20 17:49:17 UTC 2022 - pgaj...@suse.com
+
+- version update to 7.4.29:
+ Core:
+No source changes to this release. This update allows for
+re-building the Windows binaries against upgraded dependencies
+which have received security updates.
+ Date:
+Updated to latest IANA timezone database (2022a).
+
+---
Old:
php-7.4.28.tar.xz
php-7.4.28.tar.xz.asc
New:
php-7.4.29.tar.xz
php-7.4.29.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.b2AcS6/_old 2022-04-23 00:25:15.927749913 +0200
+++ /var/tmp/diff_new_pack.b2AcS6/_new 2022-04-23 00:25:15.931749915 +0200
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.28
+Version:7.4.29
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.28.tar.xz -> php-7.4.29.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.28.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.1538/php-7.4.29.tar.xz differ: char 27,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2022-04-14 17:24:59
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1941 (New)
Package is "php7"
Thu Apr 14 17:24:59 2022 rev:113 rq:969706 version:7.4.28
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2022-04-10
19:05:45.382265833 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1941/php7.changes 2022-04-14
17:25:31.695267792 +0200
@@ -1,0 +2,5 @@
+Mon Apr 11 19:36:58 UTC 2022 - pgaj...@suse.com
+
+- fpm %postrans: check whether sytemctl is available
+
+---
@@ -4,0 +10 @@
+ [boo#1197994]
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.vkfBuV/_old 2022-04-14 17:25:32.479268709 +0200
+++ /var/tmp/diff_new_pack.vkfBuV/_new 2022-04-14 17:25:32.483268713 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package php7
+# spec file
#
# Copyright (c) 2022 SUSE LLC
#
@@ -1346,7 +1346,9 @@
%endif
%posttrans
+if [ -x /usr/bin/systemctl ]; then
%_restart_on_update php-fpm.service
+fi
%endif
%if "%{flavor}" == "embed"
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2022-04-10 19:05:30
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1900 (New)
Package is "php7"
Sun Apr 10 19:05:30 2022 rev:112 rq:967926 version:7.4.28
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2022-04-03
21:30:37.820061133 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1900/php7.changes 2022-04-10
19:05:45.382265833 +0200
@@ -1,0 +2,5 @@
+Fri Apr 8 21:49:52 UTC 2022 - Arjen de Korte
+
+- Disable build with '-z now' as it breaks the php-mysql extension
+
+---
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.dhrGON/_old 2022-04-10 19:05:46.230256445 +0200
+++ /var/tmp/diff_new_pack.dhrGON/_new 2022-04-10 19:05:46.234256400 +0200
@@ -1012,6 +1012,8 @@
export EXTENSION_DIR=%{extension_dir}
# Fix build-cli for arm and aarch64
export LIBS=-ltinfo
+# Some extensions are broken when linking with -z now
+export SUSE_ZNOW=0
# build function
Build()
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2022-04-03 21:30:34
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1900 (New)
Package is "php7"
Sun Apr 3 21:30:34 2022 rev:111 rq:966278 version:7.4.28
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2022-02-21
17:45:53.723581442 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.1900/php7.changes 2022-04-03
21:30:37.820061133 +0200
@@ -1,0 +2,5 @@
+Thu Mar 31 18:42:35 UTC 2022 - Arjen de Korte
+
+- build PHP-FPM with libacl support (boo#1196870)
+
+---
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.YtAozC/_old 2022-04-03 21:30:40.080035833 +0200
+++ /var/tmp/diff_new_pack.YtAozC/_new 2022-04-03 21:30:40.080035833 +0200
@@ -1,7 +1,7 @@
#
# spec file for package php7
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -111,6 +111,7 @@
BuildRequires: gcc-c++
BuildRequires: gmp-devel
BuildRequires: gpg2
+BuildRequires: libacl-devel
BuildRequires: libapparmor-devel
BuildRequires: libbz2-devel
BuildRequires: libtidy-devel
@@ -1087,8 +1088,9 @@
%if "%{flavor}" == "fpm"
Build fpm \
---with-fpm-systemd \
--enable-fpm \
+--with-fpm-acl \
+--with-fpm-systemd \
--with-fpm-user=%{apache_user} \
--with-fpm-group=%{apache_group} \
--bindir=%{_bindir} \
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2022-02-21 17:45:47
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1958 (New)
Package is "php7"
Mon Feb 21 17:45:47 2022 rev:110 rq:955789 version:7.4.28
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2022-01-11
00:02:34.577276242 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.1958/php7.changes 2022-02-21
17:45:53.723581442 +0100
@@ -1,0 +2,6 @@
+Fri Feb 18 07:05:10 UTC 2022 - Arjen de Korte
+
+- updated to 7.4.28: This is a security release (CVE-2021-21708). See
+ https://www.php.net/ChangeLog-7.php#7.4.28
+
+---
Old:
php-7.4.27.tar.xz
php-7.4.27.tar.xz.asc
New:
php-7.4.28.tar.xz
php-7.4.28.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.JL342n/_old 2022-02-21 17:45:54.575581695 +0100
+++ /var/tmp/diff_new_pack.JL342n/_new 2022-02-21 17:45:54.579581697 +0100
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.27
+Version:7.4.28
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.27.tar.xz -> php-7.4.28.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.27.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.1958/php-7.4.28.tar.xz differ: char 27,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2022-01-11 00:01:58
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1892 (New)
Package is "php7"
Tue Jan 11 00:01:58 2022 rev:109 rq:945331 version:7.4.27
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-12-21
18:40:35.197871417 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.1892/php7.changes 2022-01-11
00:02:34.577276242 +0100
@@ -1,0 +2,6 @@
+Sun Jan 9 10:40:43 UTC 2022 - Arjen de Korte
+
+- use /tmp to store session information (boo#1194414)
+ % php-ini.patch
+
+---
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.s3pJb3/_old 2022-01-11 00:02:35.321276893 +0100
+++ /var/tmp/diff_new_pack.s3pJb3/_new 2022-01-11 00:02:35.325276897 +0100
@@ -168,8 +168,6 @@
%if "%{flavor}" == ""
Requires: php-sapi = %{version}
Requires: timezone
-Requires(pre): group(www)
-Requires(pre): user(wwwrun)
Recommends: php-ctype = %{version}
Recommends: php-dom = %{version}
Recommends: php-iconv = %{version}
@@ -318,6 +316,8 @@
BuildRequires: php = %{version}
BuildRequires: pkgconfig(libsystemd) >= 209
Requires: php = %{version}
+Requires: group(www)
+Requires: user(wwwrun)
Provides: php-fpm = %{version}
Provides: php-sapi = %{version}
Conflicts: php-fpm < %{version}
@@ -1284,8 +1284,6 @@
fi
echo "${zend_}extension=$ext.so" >>
%{buildroot}%{php_sysconf}/conf.d/$ext.ini
done
-# directory for sessions
-install -d %{buildroot}%{_localstatedir}/lib/%{php_name}
# fix symlink (bnc#734176)
ln -s %{_bindir}/php %{buildroot}%{_bindir}/%{php_name}
# install the macros file:
@@ -1366,7 +1364,6 @@
%dir %{extension_dir}
%dir %{php_sysconf}
%dir %{php_sysconf}/conf.d
-%attr(0755, %{apache_user}, root) %dir %{_localstatedir}/lib/%{php_name}
%files cli
%defattr(-, root, root)
++ php-ini.patch ++
--- /var/tmp/diff_new_pack.s3pJb3/_old 2022-01-11 00:02:35.417276978 +0100
+++ /var/tmp/diff_new_pack.s3pJb3/_new 2022-01-11 00:02:35.421276981 +0100
@@ -29,13 +29,4 @@
; Maximum number of links. -1 means no limit.
; http://php.net/mysqli.max-links
-@@ -1354,7 +1355,7 @@ session.save_handler = files
- ; where MODE is the octal representation of the mode. Note that this
- ; does not overwrite the process's umask.
- ; http://php.net/session.save-path
--;session.save_path = "/tmp"
-+session.save_path = "/var/lib/php7"
-
- ; Whether to use strict session mode.
- ; Strict session mode does not accept an uninitialized session ID, and
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-12-21 18:40:23
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.2520 (New)
Package is "php7"
Tue Dec 21 18:40:23 2021 rev:108 rq:941269 version:7.4.27
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-12-06
23:59:15.492590714 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.2520/php7.changes 2021-12-21
18:40:35.197871417 +0100
@@ -1,0 +2,6 @@
+Thu Dec 16 15:28:52 UTC 2021 - Arjen de Korte
+
+- updated to 7.4.27: This is a bug fix release. See
+ https://www.php.net/ChangeLog-7.php#7.4.27
+
+---
Old:
php-7.4.26.tar.xz
php-7.4.26.tar.xz.asc
New:
php-7.4.27.tar.xz
php-7.4.27.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.vBRU3G/_old 2021-12-21 18:40:35.793871952 +0100
+++ /var/tmp/diff_new_pack.vBRU3G/_new 2021-12-21 18:40:35.797871955 +0100
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.26
+Version:7.4.27
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.26.tar.xz -> php-7.4.27.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.26.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.2520/php-7.4.27.tar.xz differ: char 27,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-12-06 23:59:07
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.31177 (New)
Package is "php7"
Mon Dec 6 23:59:07 2021 rev:107 rq:935379 version:7.4.26
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-11-20
22:48:13.323824092 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.31177/php7.changes 2021-12-06
23:59:15.492590714 +0100
@@ -1,0 +2,6 @@
+Wed Dec 1 21:44:34 UTC 2021 - Arjen de Korte
+
+- provide configuration for PHP-FPM out of the box (boo#1192414)
+- package missing php.ini for PHP-FPM (boo#1192672)
+
+---
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.KMGeFN/_old 2021-12-06 23:59:16.248588040 +0100
+++ /var/tmp/diff_new_pack.KMGeFN/_new 2021-12-06 23:59:16.252588026 +0100
@@ -1246,12 +1246,16 @@
%if "%{flavor}" == "fpm"
make install-binaries INSTALL_ROOT=%{buildroot}
install -dm 755 %{buildroot}%{php_sysconf}/fpm
+sed "s=@extdir@=%{extension_dir}=" php.ini-production >
%{buildroot}%{php_sysconf}/fpm/php.ini
#install fpm init script.
install -D -m 0644 sapi/fpm/php-fpm.service
%{buildroot}%{_unitdir}/php-fpm.service
ln -s service %{buildroot}%{_sbindir}/rcphp-fpm
# bug 1173786
install -d -m 0755 %{buildroot}%{_tmpfilesdir}
install -m 0644 %{SOURCE12} %{buildroot}%{_tmpfilesdir}/php-fpm.conf
+# bug 1192414
+mv %{buildroot}%{php_sysconf}/fpm/php-fpm.conf{.default,}
+mv %{buildroot}%{php_sysconf}/fpm/php-fpm.d/www.conf{.default,}
%endif
%if "%{flavor}" == ""
@@ -1336,7 +1340,7 @@
%if 0%{?suse_version} > 1500
%service_del_postun_without_restart php-fpm.service
%else
-%service_del_postun -n php-fpm.service
+%service_del_postun php-fpm.service
%endif
%posttrans
@@ -1406,8 +1410,9 @@
%{_sbindir}/php-fpm
%dir %{php_sysconf}/fpm
%dir %{php_sysconf}/fpm/php-fpm.d
-%config %{php_sysconf}/fpm/php-fpm.conf.default
-%config %{php_sysconf}/fpm/php-fpm.d/www.conf.default
+%config(noreplace) %{php_sysconf}/fpm/php.ini
+%config(noreplace) %{php_sysconf}/fpm/php-fpm.conf
+%config(noreplace) %{php_sysconf}/fpm/php-fpm.d/www.conf
%{_mandir}/man8/php-fpm.8%{?ext_man}
%{_sbindir}/rcphp-fpm
%dir %{_datadir}/%{php_name}/fpm
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-11-20 22:47:54
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1895 (New)
Package is "php7"
Sat Nov 20 22:47:54 2021 rev:106 rq:932279 version:7.4.26
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-10-26
20:13:29.722003517 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1895/php7.changes 2021-11-20
22:48:13.323824092 +0100
@@ -1,0 +2,7 @@
+Thu Nov 18 13:40:56 UTC 2021 - Arjen de Korte
+
+- updated to 7.4.26: This is a security release (CVE-2021-21707)
+ which also contains several bug fixes.
+ See https://www.php.net/ChangeLog-7.php#7.4.26
+
+---
Old:
php-7.4.25.tar.xz
php-7.4.25.tar.xz.asc
New:
php-7.4.26.tar.xz
php-7.4.26.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.Q7Olu0/_old 2021-11-20 22:48:14.091821547 +0100
+++ /var/tmp/diff_new_pack.Q7Olu0/_new 2021-11-20 22:48:14.095821534 +0100
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.25
+Version:7.4.26
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.25.tar.xz -> php-7.4.26.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.25.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.1895/php-7.4.26.tar.xz differ: char 28,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-10-26 20:13:27
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1890 (New)
Package is "php7"
Tue Oct 26 20:13:27 2021 rev:105 rq:927032 version:7.4.25
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-10-11
15:31:17.134813063 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1890/php7.changes 2021-10-26
20:13:29.722003517 +0200
@@ -1,0 +2,7 @@
+Fri Oct 22 15:30:41 UTC 2021 - Arjen de Korte
+
+- updated to 7.4.25: This is a security release (CVE-2021-21703)
+ which also contains several bug fixes.
+ See https://www.php.net/ChangeLog-7.php#7.4.25
+
+---
Old:
php-7.4.24.tar.xz
php-7.4.24.tar.xz.asc
New:
php-7.4.25.tar.xz
php-7.4.25.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.cKITPK/_old 2021-10-26 20:13:30.438003895 +0200
+++ /var/tmp/diff_new_pack.cKITPK/_new 2021-10-26 20:13:30.446003900 +0200
@@ -1,5 +1,5 @@
#
-# spec file
+# spec file for package php7
#
# Copyright (c) 2021 SUSE LLC
#
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.24
+Version:7.4.25
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.24.tar.xz -> php-7.4.25.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.24.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.1890/php-7.4.25.tar.xz differ: char 27,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2021-10-11 15:30:42 Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new.2443 (New) Package is "php7" Mon Oct 11 15:30:42 2021 rev:104 rq:923058 version:7.4.24 Changes: --- /work/SRC/openSUSE:Factory/php7/php7.changes2021-09-26 21:49:02.470802763 +0200 +++ /work/SRC/openSUSE:Factory/.php7.new.2443/php7.changes 2021-10-11 15:31:17.134813063 +0200 @@ -1,0 +2,9 @@ +Mon Sep 27 14:23:28 UTC 2021 - pgaj...@suse.com + +- previous version updates fixes also: + CVE-2020-7068,CVE-2020-7069,CVE-2020-7070,CVE-2020-7071, + CVE-2021-21702,CVE-2021-21704,CVE-2021-21705 + bsc#1175223,bsc#1177351,bsc#1177352,bsc#1180706, + bsc#1182049,bsc#1188035,bsc#1188037 + +--- Other differences: -- ++ php7.spec ++ --- /var/tmp/diff_new_pack.md5z1S/_old 2021-10-11 15:31:18.086814589 +0200 +++ /var/tmp/diff_new_pack.md5z1S/_new 2021-10-11 15:31:18.090814596 +0200 @@ -1,5 +1,5 @@ # -# spec file for package php7 +# spec file # # Copyright (c) 2021 SUSE LLC #
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-09-26 21:48:24
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1899 (New)
Package is "php7"
Sun Sep 26 21:48:24 2021 rev:103 rq:921178 version:7.4.24
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-09-20
23:32:07.427097274 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1899/php7.changes 2021-09-26
21:49:02.470802763 +0200
@@ -1,0 +2,7 @@
+Thu Sep 23 19:09:45 UTC 2021 - Arjen de Korte
+
+- updated to 7.4.24: This is a security release (CVE-2021-21706)
+ which also contains several bug fixes.
+ See https://www.php.net/ChangeLog-7.php#7.4.24
+
+---
Old:
php-7.4.23.tar.xz
php-7.4.23.tar.xz.asc
New:
php-7.4.24.tar.xz
php-7.4.24.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.jg6LEx/_old 2021-09-26 21:49:03.190803565 +0200
+++ /var/tmp/diff_new_pack.jg6LEx/_new 2021-09-26 21:49:03.194803570 +0200
@@ -1,5 +1,5 @@
#
-# spec file
+# spec file for package php7
#
# Copyright (c) 2021 SUSE LLC
#
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.23
+Version:7.4.24
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.23.tar.xz -> php-7.4.24.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.23.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.1899/php-7.4.24.tar.xz differ: char 27,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-09-20 23:31:54
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1899 (New)
Package is "php7"
Mon Sep 20 23:31:54 2021 rev:102 rq:919076 version:7.4.23
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-09-03
21:25:37.546142581 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1899/php7.changes 2021-09-20
23:32:07.427097274 +0200
@@ -1,0 +2,7 @@
+Wed Sep 15 07:36:53 UTC 2021 - pgaj...@suse.com
+
+- added patches
+
https://github.com/php/php-src/commit/b3646440b1808abf0874b6f89027ce53ec5da03f
+ + php7-gd-removed-unused-constants.patch
+
+---
New:
php7-gd-removed-unused-constants.patch
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.ycWzbA/_old 2021-09-20 23:32:08.231098267 +0200
+++ /var/tmp/diff_new_pack.ycWzbA/_new 2021-09-20 23:32:08.235098272 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package php7
+# spec file
#
# Copyright (c) 2021 SUSE LLC
#
@@ -100,6 +100,8 @@
Patch17:php-date-regenerate-lexers.patch
# PATCH-FEATURE-UPSTREAM https://github.com/php/php-src/pull/6564
Patch19:php-build-reproducible-phar.patch
+#
https://github.com/php/php-src/commit/b3646440b1808abf0874b6f89027ce53ec5da03f
+Patch20:php7-gd-removed-unused-constants.patch
BuildRequires: apache-rpm-macros
BuildRequires: autoconf
BuildRequires: bison
@@ -960,6 +962,7 @@
%patch12 -p1
%patch17 -p1
%patch19 -p1
+%patch20 -p1
# use system pcre2
rm -r ext/pcre/pcre2lib
++ php7-gd-removed-unused-constants.patch ++
Index: php-7.4.23/ext/gd/gd.c
===
--- php-7.4.23.orig/ext/gd/gd.c 2021-09-15 09:21:15.503241059 +0200
+++ php-7.4.23/ext/gd/gd.c 2021-09-15 09:29:04.434022076 +0200
@@ -91,6 +91,10 @@ static int le_gd, le_gd_font;
#define M_PI 3.14159265358979323846
#endif
+#define PHP_GD_FLIP_HORIZONTAL 1
+#define PHP_GD_FLIP_VERTICAL 2
+#define PHP_GD_FLIP_BOTH 3
+
#ifdef HAVE_GD_FREETYPE
static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int, int);
#endif
@@ -1137,9 +1141,9 @@ PHP_MINIT_FUNCTION(gd)
/* GD2 image format types */
REGISTER_LONG_CONSTANT("IMG_GD2_RAW", GD2_FMT_RAW, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORINZONTAL,
CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", GD_FLIP_VERTICAL, CONST_CS
| CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", GD_FLIP_BOTH, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", PHP_GD_FLIP_HORIZONTAL,
CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", PHP_GD_FLIP_VERTICAL,
CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", PHP_GD_FLIP_BOTH, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS |
CONST_PERSISTENT);
@@ -4696,15 +4700,15 @@ PHP_FUNCTION(imageflip)
}
switch (mode) {
- case GD_FLIP_VERTICAL:
+ case PHP_GD_FLIP_VERTICAL:
gdImageFlipVertical(im);
break;
- case GD_FLIP_HORINZONTAL:
+ case PHP_GD_FLIP_HORIZONTAL:
gdImageFlipHorizontal(im);
break;
- case GD_FLIP_BOTH:
+ case PHP_GD_FLIP_BOTH:
gdImageFlipBoth(im);
break;
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-09-03 21:25:31
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1899 (New)
Package is "php7"
Fri Sep 3 21:25:31 2021 rev:101 rq:914424 version:7.4.23
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-08-02
12:05:47.957646725 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1899/php7.changes 2021-09-03
21:25:37.546142581 +0200
@@ -1,0 +2,6 @@
+Thu Aug 26 15:32:39 UTC 2021 - Arjen de Korte
+
+- updated to 7.4.23: This is a security release which also contains
+ several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.23
+
+---
Old:
php-7.4.22.tar.xz
php-7.4.22.tar.xz.asc
New:
php-7.4.23.tar.xz
php-7.4.23.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.2LA3cy/_old 2021-09-03 21:25:38.158143219 +0200
+++ /var/tmp/diff_new_pack.2LA3cy/_new 2021-09-03 21:25:38.162143224 +0200
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.22
+Version:7.4.23
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.22.tar.xz -> php-7.4.23.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.22.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.1899/php-7.4.23.tar.xz differ: char 28,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-08-02 12:05:01
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1899 (New)
Package is "php7"
Mon Aug 2 12:05:01 2021 rev:100 rq:909233 version:7.4.22
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-07-04
22:10:32.669321129 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1899/php7.changes 2021-08-02
12:05:47.957646725 +0200
@@ -1,0 +2,6 @@
+Thu Jul 29 16:39:59 UTC 2021 - Arjen de Korte
+
+- updated to 7.4.22: This is a security and bug fix release. See
+ https://www.php.net/ChangeLog-7.php#7.4.22
+
+---
Old:
php-7.4.21.tar.xz
php-7.4.21.tar.xz.asc
New:
php-7.4.22.tar.xz
php-7.4.22.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.s92acc/_old 2021-08-02 12:05:48.769646552 +0200
+++ /var/tmp/diff_new_pack.s92acc/_new 2021-08-02 12:05:48.773646551 +0200
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.21
+Version:7.4.22
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.21.tar.xz -> php-7.4.22.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.21.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.1899/php-7.4.22.tar.xz differ: char 27,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-07-04 22:10:31
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.2625 (New)
Package is "php7"
Sun Jul 4 22:10:31 2021 rev:99 rq:903559 version:7.4.21
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-06-06
22:40:19.479356710 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.2625/php7.changes 2021-07-04
22:10:32.669321129 +0200
@@ -1,0 +2,6 @@
+Thu Jul 1 16:40:55 UTC 2021 - Arjen de Korte
+
+- updated to 7.4.21: This is a security release which also contains
+ several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.21
+
+---
Old:
php-7.4.20.tar.xz
php-7.4.20.tar.xz.asc
New:
php-7.4.21.tar.xz
php-7.4.21.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.2qOJYK/_old 2021-07-04 22:10:33.301316240 +0200
+++ /var/tmp/diff_new_pack.2qOJYK/_new 2021-07-04 22:10:33.305316210 +0200
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.20
+Version:7.4.21
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.20.tar.xz -> php-7.4.21.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.20.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.2625/php-7.4.21.tar.xz differ: char 27,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-06-06 22:40:16
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1898 (New)
Package is "php7"
Sun Jun 6 22:40:16 2021 rev:98 rq:897259 version:7.4.20
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-05-08
22:07:16.59300 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1898/php7.changes 2021-06-06
22:40:19.479356710 +0200
@@ -1,0 +2,6 @@
+Thu Jun 3 17:13:28 UTC 2021 - Arjen de Korte
+
+- updated to 7.4.20: This is a bug fix release. See
+ https://www.php.net/ChangeLog-7.php#7.4.20
+
+---
Old:
php-7.4.19.tar.xz
php-7.4.19.tar.xz.asc
New:
php-7.4.20.tar.xz
php-7.4.20.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.Ljwjlx/_old 2021-06-06 22:40:20.131357987 +0200
+++ /var/tmp/diff_new_pack.Ljwjlx/_new 2021-06-06 22:40:20.135357995 +0200
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.19
+Version:7.4.20
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.19.tar.xz -> php-7.4.20.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.19.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.1898/php-7.4.20.tar.xz differ: char 27,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-05-02 18:35:11
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.1947 (New)
Package is "php7"
Sun May 2 18:35:11 2021 rev:96 rq:889478 version:7.4.18
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-04-18
21:45:15.676737147 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new.1947/php7.changes 2021-05-02
18:35:17.329159302 +0200
@@ -1,0 +2,6 @@
+Fri Apr 30 07:46:25 UTC 2021 - Arjen de Korte
+
+- updated to 7.4.18: This is a security bug fix release. See
+ https://www.php.net/ChangeLog-7.php#7.4.18
+
+---
Old:
php-7.4.16.tar.xz
php-7.4.16.tar.xz.asc
New:
php-7.4.18.tar.xz
php-7.4.18.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.TOp4VF/_old 2021-05-02 18:35:18.405154717 +0200
+++ /var/tmp/diff_new_pack.TOp4VF/_new 2021-05-02 18:35:18.409154700 +0200
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.16
+Version:7.4.18
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
++ php-7.4.16.tar.xz -> php-7.4.18.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.16.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.1947/php-7.4.18.tar.xz differ: char 26,
line 1
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-04-18 21:45:06
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.12324 (New)
Package is "php7"
Sun Apr 18 21:45:06 2021 rev:95 rq:885701 version:7.4.16
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-03-10
08:49:48.958428255 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.12324/php7.changes 2021-04-18
21:45:15.676737147 +0200
@@ -1,0 +2,6 @@
+Tue Apr 13 20:19:05 UTC 2021 - Arjen de Korte
+
+- Do not hard-depend on systemd: use systemd_ordering instead of
+ systemd_requires.
+
+---
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.tpilWa/_old 2021-04-18 21:45:16.968739332 +0200
+++ /var/tmp/diff_new_pack.tpilWa/_new 2021-04-18 21:45:16.968739332 +0200
@@ -276,7 +276,7 @@
Requires: apache2-prefork
Requires: php = %{version}
Requires(post): %{_sbindir}/a2enmod
-Requires(preun): %{_sbindir}/a2enmod
+Requires(preun):%{_sbindir}/a2enmod
Provides: mod_php_any = %{version}
Provides: php-sapi = %{version}
Obsoletes: apache2-mod_php5
@@ -319,7 +319,7 @@
Provides: php-fpm = %{version}
Provides: php-sapi = %{version}
Conflicts: php-fpm < %{version}
-%systemd_requires
+%{?systemd_ordering}
%description
PHP is a server-side, cross-platform HTML embedded scripting language.
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-02-11 12:46:42
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.28504 (New)
Package is "php7"
Thu Feb 11 12:46:42 2021 rev:93 rq:869234 version:7.4.15
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2021-01-15
19:45:41.505973897 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.28504/php7.changes 2021-02-11
12:47:45.485521260 +0100
@@ -1,0 +2,25 @@
+Mon Feb 1 20:12:24 UTC 2021 - Arjen de Korte
+
+- updated to 7.4.15: This is a security release which also contains
+ several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.15
+- suppress warning for all flavors not equal to "" in multibuild
+ % php7.rpmlintrc
+
+---
+Fri Jan 29 13:02:30 UTC 2021 - Arjen de Korte
+
+- add versioning to php-sapi as well
+
+---
+Sat Jan 23 21:27:09 UTC 2021 - Arjen de Korte
+
+- require this PHP version of subpackages in Recommends/Suggests
+- run apache-rex tests in php7:test as packages need to be build
+ first (otherwise tests run with previous version)
+
+---
+Sun Jan 17 10:25:54 UTC 2021 - Arjen de Korte
+
+- add php_cfgdir and php_extdir macros
+
+---
Old:
php-7.4.14.tar.xz
php-7.4.14.tar.xz.asc
New:
php-7.4.15.tar.xz
php-7.4.15.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.UIqQjm/_old 2021-02-11 12:47:46.653522960 +0100
+++ /var/tmp/diff_new_pack.UIqQjm/_new 2021-02-11 12:47:46.657522967 +0100
@@ -53,7 +53,7 @@
%define build_argon2 1
%endif
Name: %{pprefix}%{php_name}%{psuffix}
-Version:7.4.14
+Version:7.4.15
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
@@ -156,34 +156,39 @@
BuildRequires: pkgconfig(libargon2)
%endif
%if "%{flavor}" == "test"
+BuildRequires: apache-rex
+BuildRequires: mod_php_any = %{version}
BuildRequires: php-cli = %{version}
+BuildRequires: php-fpm = %{version}
+%apache_rex_deps
%endif
%if "%{flavor}" == ""
-Requires: php-sapi
+Requires: php-sapi = %{version}
Requires: timezone
Requires(pre): group(www)
Requires(pre): user(wwwrun)
-Recommends: php-ctype
-Recommends: php-dom
-Recommends: php-iconv
-Recommends: php-json
-Recommends: php-openssl
-Recommends: php-sqlite
-Recommends: php-tokenizer
-Recommends: php-xmlreader
-Recommends: php-xmlwriter
+Recommends: php-ctype = %{version}
+Recommends: php-dom = %{version}
+Recommends: php-iconv = %{version}
+Recommends: php-json = %{version}
+Recommends: php-openssl = %{version}
+Recommends: php-sqlite = %{version}
+Recommends: php-tokenizer = %{version}
+Recommends: php-xmlreader = %{version}
+Recommends: php-xmlwriter = %{version}
# Recommends instead of Requires smtp_daemon bsc#1115213
Recommends: smtp_daemon
-# suggest %%{php_name}-* instead of php-* [bsc#1022158c#4]
-Suggests: %{php_name}-cli
-Suggests: %{php_name}-gd
-Suggests: %{php_name}-gettext
-Suggests: %{php_name}-mbstring
-Suggests: %{php_name}-mysql
+# Suggest php-* = %%{version} instead of php-* [bsc#1022158c#4]
+Suggests: php-cli = %{version}
+Suggests: php-gd = %{version}
+Suggests: php-gettext = %{version}
+Suggests: php-mbstring = %{version}
+Suggests: php-mysql = %{version}
## Provides
Provides: php = %{version}
Provides: php-api = %{apiver}
+Provides: php-zend-abi = %{zendver}
Provides: php(api) = %{apiver}
Provides: php(zend-abi) = %{zendver}
# builtin extensions
@@ -219,7 +224,7 @@
Group: Development/Libraries/PHP
Requires: php = %{version}
Provides: php-cli = %{version}
-Provides: php-sapi = cli
+Provides: php-sapi = %{version}
Conflicts: php-cli < %{version}
%description cli
@@ -264,7 +269,6 @@
%if "%{flavor}" == "apache2"
Summary:PHP7 module for the Apache 2.x webserver
Group: Development/Libraries/PHP
-BuildRequires: apache-rex
BuildRequires: apache-rpm-macros-control
BuildRequires: apache2-devel
BuildRequires: php = %{version}
@@ -274,9 +278,8 @@
Requires(post): %{_sbindir}/a2enmod
Requires(preun): %{_sbindir}/a2enmod
Provides: mod_php_any = %{version}
-Provides: php-sapi = %{flavor}
+Provides: php-sapi =
commit php7 for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2021-01-15 19:45:37 Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new.28504 (New) Package is "php7" Fri Jan 15 19:45:37 2021 rev:92 rq:863278 version:7.4.14 Changes: --- /work/SRC/openSUSE:Factory/php7/php7.changes2021-01-08 17:34:26.249092595 +0100 +++ /work/SRC/openSUSE:Factory/.php7.new.28504/php7.changes 2021-01-15 19:45:41.505973897 +0100 @@ -1,0 +2,30 @@ +Fri Jan 15 09:02:57 UTC 2021 - Arjen de Korte + +- deleted patch (redundant cast, both sides are already signed int) + - php-odbc-cmp-int-cast.patch + +--- +Wed Jan 13 20:04:12 UTC 2021 - Arjen de Korte + +- install php7-cli if no sapi is selected upon php7 installation +- add conflicts with earlier version of php-cli, php-fastcgi and + php-fpm + +--- +Mon Jan 11 12:39:11 UTC 2021 - Arjen de Korte + +- put CLI binary in -cli subpackage so that other moduldes can depend + on the php base package that remains (and provides files and maps + common for all) + +--- +Fri Jan 8 13:50:58 UTC 2021 - Arjen de Korte + +- use pkgconfig() to resolve BuildRequires where upstream uses it too +- since php-7.4.0 when using --with-external-gd the configure options + --with-xpm, --with-freetype and --with-jpeg are not needed anymore + (and neither are the respective BuildRequires) +- add Recommends: php-openssl as many modules can optionally use it +- use new %ldconfig macros in Tumbleweed + +--- Old: php-odbc-cmp-int-cast.patch Other differences: -- ++ php7.spec ++ 820 lines (skipped) between /work/SRC/openSUSE:Factory/php7/php7.spec and /work/SRC/openSUSE:Factory/.php7.new.28504/php7.spec
commit php7 for openSUSE:Factory
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2020-12-09 22:11:12
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.2328 (New)
Package is "php7"
Wed Dec 9 22:11:12 2020 rev:89 rq:853525 version:7.4.13
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2020-12-02
13:57:36.961762865 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.2328/php7.changes 2020-12-09
22:11:13.815055417 +0100
@@ -1,0 +2,9 @@
+Fri Dec 4 20:10:10 UTC 2020 - Arjen de Korte
+
+- do not add mod_php to httpd.conf during %install (better fix for
+ new apache2 from Apache development repo)
+ + php-install-mod_php.patch
+- do not build php-cgi when not needed
+- only build extensions in cli
+
+---
New:
php-install-mod_php.patch
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.2dUxUw/_old 2020-12-09 22:11:14.791056407 +0100
+++ /var/tmp/diff_new_pack.2dUxUw/_new 2020-12-09 22:11:14.791056407 +0100
@@ -63,6 +63,7 @@
Patch6: php-openssl.patch
Patch7: php-systzdata-v19.patch
Patch8: php-systemd-unit.patch
+Patch9: php-install-mod_php.patch
Patch10:php-embed.patch
## Bugfix patches
# following patch is to fix configure tests for crypt; the aim is to have php
@@ -82,6 +83,7 @@
BuildRequires: apache-rpm-macros
BuildRequires: apache-rpm-macros-control
BuildRequires: apache2-devel
+BuildRequires: apache2-prefork
BuildRequires: autoconf
BuildRequires: bison
BuildRequires: curl
@@ -222,7 +224,8 @@
Requires: %{apache_mmn}
Requires: %{name} = %{version}
Requires: apache2-prefork
-Requires(pre): apache2
+Requires(post): %{_sbindir}/a2enmod
+Requires(preun): %{_sbindir}/a2enmod
Provides: mod_php_any = %{version}
Provides: php-date = %{version}
Provides: php-filter = %{version}
@@ -913,6 +916,7 @@
%patch6
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%patch10 -p1
%patch12 -p1
%patch14 -p1
@@ -1015,10 +1019,6 @@
--with-system-tzdata=%{_datadir}/zoneinfo \
--with-mhash \
--disable-phpdbg \
-%if %{build_sodium}
---with-sodium=shared \
-%endif
---with-zip=shared \
%if %{build_argon2}
--with-password-argon2=%{_usr} \
%endif
@@ -1052,13 +1052,15 @@
Build apache2 \
--with-apxs2=%{apache_apxs} \
--disable-all \
+--disable-cgi \
--disable-cli
# fast-cgi sapi
Build fastcgi \
--bindir=%{_bindir} \
---disable-cli \
---disable-all
+--disable-all \
+--enable-cgi \
+--disable-cli
Build fpm \
--with-fpm-systemd \
@@ -1066,14 +1068,16 @@
--with-fpm-user=wwwrun \
--with-fpm-group=www \
--bindir=%{_bindir} \
---disable-cli \
--disable-all \
+--disable-cgi \
+--disable-cli \
--localstatedir=%{_localstatedir}
Build embed \
--enable-embed=shared \
---disable-cli \
---disable-all
+--disable-all \
+--disable-cgi \
+--disable-cli
Build cli \
--enable-cli \
@@ -1138,6 +1142,10 @@
%endif
--with-pdo-pgsql=shared,%{_usr} \
--with-pdo-odbc=shared,unixODBC,%{_usr} \
+%if %{build_sodium}
+--with-sodium=shared \
+%endif
+--enable-opcache=shared \
--with-zip=shared \
--enable-intl=shared \
--disable-cgi
@@ -1268,17 +1276,17 @@
%post -n apache2-mod_%{name}
#some distro versions does not have this tool.
if [ -x %{_sbindir}/a2enmod ]; then
-if a2enmod -q php5 && ! a2enmod -q php7; then
-a2dismod php5
-a2enmod php7
+if %{_sbindir}/a2enmod -q php5 && ! %{_sbindir}/a2enmod -q php7; then
+%{_sbindir}/a2enmod -d php5
+%{_sbindir}/a2enmod php7
fi
fi
%preun -n apache2-mod_%{name}
if [ "$1" = "0" ]; then
if [ -x %{_sbindir}/a2enmod ]; then
-if a2enmod -q php7; then
-a2dismod php7
+if %{_sbindir}/a2enmod -q php7; then
+%{_sbindir}/a2enmod -d php7
fi
fi
fi
@@ -1298,6 +1306,7 @@
%post embed -p /sbin/ldconfig
%postun embed -p /sbin/ldconfig
+
%postun -n apache2-mod_%{name}
# request restart apache instanaces (which loaded php7) after
apache2-mod_%{name} package update
if [ $1 -eq 1 ]; then
++ php-install-mod_php.patch ++
Don't attempt to add the module with a LoadModule line to the
httpd.conf file. This won't work in the buildroot and also is
not how modules are loaded in Apache in (open)SUSE.
Index: php-7.4.13/sapi/apache2handler/config.m4
===
--- php-7.4.13.orig/sapi/apache2handler/config.m4 2020-11-24
11:03:34.0 +0100
+++
commit php7 for openSUSE:Factory
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2020-12-02 13:57:34
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.5913 (New)
Package is "php7"
Wed Dec 2 13:57:34 2020 rev:88 rq:851805 version:7.4.13
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2020-11-30
09:53:31.505759840 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.5913/php7.changes 2020-12-02
13:57:36.961762865 +0100
@@ -1,0 +2,5 @@
+Sun Nov 29 13:42:37 UTC 2020 - Arjen de Korte
+
+- fix building with new apache2 from Apache development repo
+
+---
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.NTqpde/_old 2020-12-02 13:57:38.129764096 +0100
+++ /var/tmp/diff_new_pack.NTqpde/_new 2020-12-02 13:57:38.133764100 +0100
@@ -1186,6 +1186,13 @@
%install
%if !%{with test}
+# create httpd.conf file with a LoadModule line for apxs
+mkdir -p %{buildroot}%{apache_sysconfdir}
+cat > %{buildroot}%{apache_sysconfdir}/httpd.conf << EOF
+# DO NOT INSTALL THIS FILE
+LoadModule alias_module %{apache_libexecdir}-prefork/mod_alias.so
+EOF
+
# install function
Install()
{
@@ -1201,6 +1208,7 @@
Install fpm
Install embed
rm %{buildroot}%{_libdir}/libphp7.la
+rm %{buildroot}%{apache_sysconfdir}/httpd.conf*
# generate php.ini from php.ini-production:
install -dm 755 %{buildroot}/%{php_sysconf}/conf.d
___
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
[opensuse-commit] commit php7 for openSUSE:Factory
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2020-11-30 09:53:17
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.5913 (New)
Package is "php7"
Mon Nov 30 09:53:17 2020 rev:87 rq:851286 version:7.4.13
Changes:
--- /work/SRC/openSUSE:Factory/php7/php7.changes2020-11-02
14:04:10.652671609 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.5913/php7.changes 2020-11-30
09:53:31.505759840 +0100
@@ -1,0 +2,13 @@
+Fri Nov 27 09:56:49 UTC 2020 - pgaj...@suse.com
+
+- do not build firebird extension in any case
+
+---
+Thu Nov 26 06:13:43 UTC 2020 - Arjen de Korte
+
+- updated to 7.4.13: This is a security release which also contains
+ several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.13
+- deleted patch (upstreamed)
+ - php-fix_net-snmp_disable_MD5.patch
+
+---
Old:
php-7.4.12.tar.xz
php-7.4.12.tar.xz.asc
php-fix_net-snmp_disable_MD5.patch
New:
php-7.4.13.tar.xz
php-7.4.13.tar.xz.asc
Other differences:
--
++ php7.spec ++
--- /var/tmp/diff_new_pack.0bTlKV/_old 2020-11-30 09:53:32.445760735 +0100
+++ /var/tmp/diff_new_pack.0bTlKV/_new 2020-11-30 09:53:32.449760739 +0100
@@ -30,18 +30,14 @@
%global zendver 20190902
%define extension_dir %{_libdir}/%{name}/extensions
%define php_sysconf %{_sysconfdir}/%{name}
-%if 0%{?is_opensuse} || 0%{?sle_version} >= 150200
-%define build_firebird 1
-%else
%define build_firebird 0
-%endif
%define build_sodium 1
%define build_argon2 0
%if %{?suse_version} >= 1500
%define build_argon2 1
%endif
Name: php7%{psuffix}
-Version:7.4.12
+Version:7.4.13
Release:0
Summary:Interpreter for the PHP scripting language version 7
License:PHP-3.01
@@ -77,8 +73,6 @@
Patch12:php-crypt-tests.patch
# https://bugs.php.net/bug.php?id=53007
Patch14:php-odbc-cmp-int-cast.patch
-# https://bugs.php.net/bug.php?id=70461
-Patch15:php-fix_net-snmp_disable_MD5.patch
# should be upstreamed, will do later
Patch17:php-date-regenerate-lexers.patch
# build fixes in SLE12
@@ -922,7 +916,6 @@
%patch10 -p1
%patch12 -p1
%patch14 -p1
-%patch15
%patch17 -p1
%if 0%{?suse_version} <= 1315
%patch18 -p1
++ php-7.4.12.tar.xz -> php-7.4.13.tar.xz ++
/work/SRC/openSUSE:Factory/php7/php-7.4.12.tar.xz
/work/SRC/openSUSE:Factory/.php7.new.5913/php-7.4.13.tar.xz differ: char 27,
line 1
++ php-odbc-cmp-int-cast.patch ++
--- /var/tmp/diff_new_pack.0bTlKV/_old 2020-11-30 09:53:32.573760857 +0100
+++ /var/tmp/diff_new_pack.0bTlKV/_new 2020-11-30 09:53:32.573760857 +0100
@@ -1,18 +1,18 @@
https://bugs.php.net/bug.php?id=53007
-Index: php-7.3.0/ext/odbc/php_odbc.c
+Index: php-7.4.13/ext/odbc/php_odbc.c
===
php-7.3.0.orig/ext/odbc/php_odbc.c 2018-12-04 17:12:22.0 +0100
-+++ php-7.3.0/ext/odbc/php_odbc.c 2018-12-10 10:19:02.668378553 +0100
-@@ -1804,7 +1804,7 @@ static void php_odbc_fetch_hash(INTERNAL
-
- if (rc == SQL_SUCCESS_WITH_INFO) {
- ZVAL_STRINGL(, buf,
result->longreadlen);
+--- php-7.4.13.orig/ext/odbc/php_odbc.c2020-11-24 11:03:41.0
+0100
php-7.4.13/ext/odbc/php_odbc.c 2020-11-26 08:19:46.512139501 +0100
+@@ -1811,7 +1811,7 @@ static void php_odbc_fetch_hash(INTERNAL
+ } else if (rc != SQL_SUCCESS) {
+ php_error_docref(NULL, E_WARNING,
"Cannot get data of column #%d (retcode %u)", i + 1, rc);
+ ZVAL_FALSE();
- } else if (result->values[i].vallen ==
SQL_NULL_DATA) {
+ } else if ((int)result->values[i].vallen ==
(int)SQL_NULL_DATA) {
ZVAL_NULL();
break;
} else {
-@@ -1813,7 +1813,7 @@ static void php_odbc_fetch_hash(INTERNAL
+@@ -1820,7 +1820,7 @@ static void php_odbc_fetch_hash(INTERNAL
break;
default:
@@ -21,16 +21,16 @@
ZVAL_NULL();
break;
}
-@@ -1956,7 +1956,7 @@ PHP_FUNCTION(odbc_fetch_into)
- }
- if (rc == SQL_SUCCESS_WITH_INFO) {
-
