From aaa4d99f533f0904cee4fa2a3a7a1659d717c535 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 1 Aug 2022 20:47:41 -0400
Subject: [PATCH 1/3] php8.0: update to 8.0.21.

fix .so links in man pages, add changelog URL (thanks @subnut)
---
 srcpkgs/php8.0/patches/fix-manpages.patch | 25 +++++++++++++++++++++++
 srcpkgs/php8.0/template                   |  7 ++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/php8.0/patches/fix-manpages.patch

diff --git a/srcpkgs/php8.0/patches/fix-manpages.patch b/srcpkgs/php8.0/patches/fix-manpages.patch
new file mode 100644
index 000000000000..d956c2904653
--- /dev/null
+++ b/srcpkgs/php8.0/patches/fix-manpages.patch
@@ -0,0 +1,25 @@
+This patch fixes .so links in man pages.
+It's needed because of the configure option -
+
+    --program-suffix=${_php_version}
+
+The changes made by this patch should be the same as the changes made by this
+block of code -
+
+    _regexp='^[[:space:]]*\.so[[:space:]]'
+    for file in $(grep -l -e "$_regexp" -R .); do
+    	vsed -i "$file" -e "/$_regexp/"'s=^[[:space:]]*\.[^.]*=&'${_php_version}=
+    done
+
+Where _php_version is defined in the template file.
+
+--- a/ext/phar/phar.phar.1.in
++++ b/ext/phar/phar.phar.1.in
+@@ -1 +1 @@
+-.so man1/phar.1
++.so man1/phar8.0.1
+--- a/sapi/cgi/php-cgi.1.in
++++ b/sapi/cgi/php-cgi.1.in
+@@ -1 +1 @@
+-.so man1/php.1
++.so man1/php8.0.1
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 7746ee52c732..48c8f2d386cc 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.0'
 pkgname=php8.0
-version=8.0.20
-revision=2
+version=8.0.21
+revision=1
 _php_version=8.0
 wrksrc="php-${version}"
 hostmakedepends="bison pkg-config apache-devel"
@@ -14,8 +14,9 @@ short_desc="HTML-embedded scripting language"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://www.php.net"
+changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=7e21fd985966264194cde63503b57fd0f0170b32a39bd7af2384c1071b50f164
+checksum=2f51f6e90e2e8efd3a20db08f0dd61d7f8d5a9362f8c7325f1ad28ccea5be0ac
 
 conf_files="/etc/php${_php_version}/php.ini"
 

From af4c683e967ca85480e92e45fdd96cd483b75a15 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 2 Aug 2022 09:27:47 -0400
Subject: [PATCH 2/3] composer8.0: update to 2.3.10.

---
 srcpkgs/composer8.0/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/composer8.0/template b/srcpkgs/composer8.0/template
index 1781bba63c84..ac5fc310df4a 100644
--- a/srcpkgs/composer8.0/template
+++ b/srcpkgs/composer8.0/template
@@ -1,6 +1,6 @@
 # Template file for 'composer8.0'
 pkgname=composer8.0
-version=2.3.7
+version=2.3.10
 revision=1
 build_style=fetch
 depends="php8.0"
@@ -11,7 +11,7 @@ homepage="https://getcomposer.org/"
 changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="3f2d46787d51070f922bf991aa08324566f726f186076c2a5e4e8b01a8ea3fd0
+checksum="d808272f284fa8e0f8b470703e1438ac8f362030bbc9d12e29530277d767aff0
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 
 do_install() {

From c4778e1b66161458dc2731ea1b22aaa5eb5c6815 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 2 Aug 2022 09:27:50 -0400
Subject: [PATCH 3/3] composer8.1: update to 2.3.10.

---
 srcpkgs/composer8.1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/composer8.1/template b/srcpkgs/composer8.1/template
index 9c69c8868749..e78c09bd575f 100644
--- a/srcpkgs/composer8.1/template
+++ b/srcpkgs/composer8.1/template
@@ -1,6 +1,6 @@
 # Template file for 'composer8.1'
 pkgname=composer8.1
-version=2.3.7
+version=2.3.10
 revision=1
 build_style=fetch
 depends="php8.1"
@@ -11,7 +11,7 @@ homepage="https://getcomposer.org/"
 changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="3f2d46787d51070f922bf991aa08324566f726f186076c2a5e4e8b01a8ea3fd0
+checksum="d808272f284fa8e0f8b470703e1438ac8f362030bbc9d12e29530277d767aff0
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 
 do_install() {