php: bump version (#7096)

* php: Updated LICENSE

* php: bump version

* php: bump version

* Delete php-7.4.16.patchset

* Delete php8-8.1.3.patchset

* Delete php-7.4.16.recipe

* Delete php8-8.1.3.recipe

* Update php8-8.1.9.recipe

* Update php-7.4.30.recipe

* Update php-7.4.30.recipe

* Update php-7.4.30.recipe
This commit is contained in:
kenmays
2022-08-14 07:24:32 -07:00
committed by GitHub
parent 316da332f5
commit afeabff2a0
5 changed files with 34 additions and 36 deletions

View File

@@ -1,7 +1,7 @@
--------------------------------------------------------------------
--------------------------------------------------------------------
The PHP License, version 3.01
Copyright (c) 1999 - 2009 The PHP Group. All rights reserved.
--------------------------------------------------------------------
Copyright (c) 1999 - 2022 The PHP Group. All rights reserved.
--------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
@@ -9,22 +9,22 @@ are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
3. The name "PHP" must not be used to endorse or promote products
derived from this software without prior written permission. For
written permission, please contact group@php.net.
4. Products derived from this software may not be called "PHP", nor
may "PHP" appear in their name, without prior written permission
from group@php.net. You may indicate that your software works in
conjunction with PHP by saying "Foo for PHP" instead of calling
it "PHP Foo" or "phpfoo"
5. The PHP Group may publish revised and/or new versions of the
license from time to time. Each version will be given a
distinguishing version number.
@@ -41,27 +41,27 @@ are met:
"This product includes PHP software, freely available from
<http://www.php.net/software/>".
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------
--------------------------------------------------------------------
This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.
The PHP Group can be contacted via Email at group@php.net.
For more information on the PHP Group and the PHP project,
For more information on the PHP Group and the PHP project,
please see <http://www.php.net>.
PHP includes the Zend Engine, freely available at

View File

@@ -1,11 +1,11 @@
From 786d243c65c614a2294f3520898c34482679d740 Mon Sep 17 00:00:00 2001
From: <pulkomandy@pulkomandy.tk>
From 5bbf2128e8afd39c8dcbc7f75a177e041ec492f8 Mon Sep 17 00:00:00 2001
From: "pulkomandy@pulkomandy.tk" <pulkomandy@pulkomandy.tk>
Date: Thu, 4 Mar 2021 23:40:05 +0000
Subject: Build fixes
diff --git a/configure.ac b/configure.ac
index e1adda7..546621f 100644
index 4174a99..d9ad262 100644
--- a/configure.ac
+++ b/configure.ac
@@ -393,9 +393,9 @@ dnl Some systems (OpenServer 5) dislike -lsocket -lnsl, so we try to avoid -lnsl
@@ -62,7 +62,7 @@ index 0bc0cce..bbd925d 100644
size_t i;
unsigned char *end = buf + len;
diff --git a/ext/fileinfo/libmagic/encoding.c b/ext/fileinfo/libmagic/encoding.c
index 121bbd7..2d4e8ce 100644
index 079896d..aaaddf3 100644
--- a/ext/fileinfo/libmagic/encoding.c
+++ b/ext/fileinfo/libmagic/encoding.c
@@ -44,14 +44,14 @@ FILE_RCSID("@(#)$File: encoding.c,v 1.20 2019/04/15 16:48:41 christos Exp $")
@@ -307,17 +307,17 @@ index 0f1f036..2351b9c 100644
#endif
--
2.30.0
2.36.1
From 8ef0a50e1c9373a462625811547b4a4930cdaf12 Mon Sep 17 00:00:00 2001
From f0e80c47fcf5557c628ec65ff152f03afec3d020 Mon Sep 17 00:00:00 2001
From: Ian Corbitt <ian@ihatemyisp.net>
Date: Sun, 7 Mar 2021 10:54:45 +0000
Subject: resolv.h fix
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 339c45a..19f10f7 100644
index dc85c45..113029a 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -48,7 +48,7 @@
@@ -792,5 +792,5 @@ index 0000000..8639c04
+__END_DECLS
+#endif /* !_RESOLV_H_ */
--
2.30.0
2.36.1

View File

@@ -1,4 +1,4 @@
From d1fedfb7f6afb369a83fcba01325309ff6294726 Mon Sep 17 00:00:00 2001
From d73a3549a568d1eb8d58b46e5f4251179d2fa7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 19 Feb 2022 19:29:19 +0100
Subject: Teaching m4 about Haiku
@@ -48,17 +48,17 @@ index 209f92b..3855c8d 100644
AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h)
fi
--
2.30.2
2.36.1
From 1fa6a4748cdd9f5a2553c19aa6ec9478bc1cf0cf Mon Sep 17 00:00:00 2001
From efedb861425148922cce3abd6b297eb6212edfad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 19 Feb 2022 19:31:37 +0100
Subject: PCNTL build fix
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index c1c99ab..9fefeff 100644
index 06db55f..8a33043 100644
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -50,6 +50,10 @@
@@ -73,10 +73,10 @@ index c1c99ab..9fefeff 100644
static PHP_GINIT_FUNCTION(pcntl);
--
2.30.2
2.36.1
From c794c60abf23bfb42c5778568d29d7e48c8f5b35 Mon Sep 17 00:00:00 2001
From f2d213692626462617d2619831b3a3952ae2fe93 Mon Sep 17 00:00:00 2001
From: Victor Gamper <victor@wenzeslaus.de>
Date: Mon, 14 Mar 2022 22:40:30 +0000
Subject: php8: fix 32-bit
@@ -126,5 +126,5 @@ index 3855c8d..e05393c 100644
AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h)
fi
--
2.30.2
2.36.1

View File

@@ -4,16 +4,16 @@ especially suited to web development.
Fast, flexible and pragmatic, PHP powers everything from your blog to the most \
popular websites in the world."
HOMEPAGE="https://php.net/"
COPYRIGHT="2001-2020 PHP Group"
COPYRIGHT="2001-2022 PHP Group"
LICENSE="PHP License v3.01"
REVISION="3"
REVISION="1"
SOURCE_URI="https://php.net/get/php-$portVersion.tar.bz2/from/this/mirror"
CHECKSUM_SHA256="85710f007cfd0fae94e13a02a3a036f4e81ef43693260cae8a2e1ca93659ce3e"
CHECKSUM_SHA256="b601bb12e53720469b60ea816776cac1c0696b09888a11ad2379b2eee835386e"
SOURCE_FILENAME="php-$portVersion.tar.bz2"
PATCHES="php-$portVersion.patchset"
ADDITIONAL_FILES="userlaunch.in"
ARCHITECTURES="all !x86_gcc2 ?x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
GLOBAL_WRITABLE_FILES="
@@ -87,7 +87,6 @@ BUILD_PREREQUIRES="
cmd:autoreconf
cmd:awk
cmd:bison
cmd:freetype_config$secondaryArchSuffix
cmd:gcc$secondaryArchSuffix
cmd:icu_config$secondaryArchSuffix
cmd:make

View File

@@ -8,7 +8,7 @@ COPYRIGHT="2001-2022 PHP Group"
LICENSE="PHP License v3.01"
REVISION="1"
SOURCE_URI="https://php.net/get/php-$portVersion.tar.bz2/from/this/mirror"
CHECKSUM_SHA256="354c4e2c506046eca812d1fc2526884a2f54b5e3d20ef0ede919a69eb232d0be"
CHECKSUM_SHA256="9ebb0e2e571db6fd5930428dcb2d19ed3e050338ec1f1347c282cae92fc086ff"
SOURCE_FILENAME="php-$portVersion.tar.bz2"
SOURCE_DIR="php-$portVersion"
PATCHES="php8-$portVersion.patchset"
@@ -98,7 +98,6 @@ BUILD_PREREQUIRES="
cmd:autoreconf
cmd:awk
cmd:bison
# cmd:freetype_config$secondaryArchSuffix
cmd:gcc$secondaryArchSuffix
cmd:icu_config$secondaryArchSuffix
cmd:make