[PR PATCH] php8.1: update to 8.1.8, add changelog URL, fix manpages

[PR PATCH] php8.1: update to 8.1.8, add changelog URL, fix manpages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1502 bytes --]

There is a new pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages php8.1
https://github.com/void-linux/void-packages/pull/37949

php8.1: update to 8.1.8, add changelog URL, fix manpages
The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to $version.

<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37949.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php8.1-37949.patch --]
[-- Type: text/x-diff, Size: 1415 bytes --]

From 6b6b0b186f34aace9fd1b5395b4c1483aee0cbee Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 9 Jul 2022 22:39:56 +0530
Subject: [PATCH] php8.1: update to 8.1.8, add changelog URL

The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to $version.
---
 srcpkgs/php8.1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index e2f1ed0807d2..c307e3315505 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.7
-revision=2
+version=8.1.8
+revision=1
 _php_version=8.1
 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=5f0b422a117633c86d48d028934b8dc078309d4247e7565ea34b2686189abdd8
+checksum=889d910558d2492f7f2236921b9bcde620674c8b684ec02d126060f8ca45dc8d
 
 conf_files="/etc/php${_php_version}/php.ini"
 

Re: [PR PATCH] [Updated] php8.1: update to 8.1.8, add changelog URL, fix manpages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1507 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages php8.1
https://github.com/void-linux/void-packages/pull/37949

php8.1: update to 8.1.8, add changelog URL, fix manpages
The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to $version.

<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37949.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php8.1-37949.patch --]
[-- Type: text/x-diff, Size: 2840 bytes --]

From 905477bddccdf673740649fecc3e6e5c4e78a54d Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 00:08:58 +0530
Subject: [PATCH 1/2] php8.1: fix man pages

---
 srcpkgs/php8.1/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index e2f1ed0807d2..88228d93e1ad 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,10 +1,10 @@
 # Template file for 'php8.1'
 pkgname=php8.1
 version=8.1.7
-revision=2
+revision=3
 _php_version=8.1
 wrksrc="php-${version}"
-hostmakedepends="bison pkg-config apache-devel"
+hostmakedepends="bison pkg-config apache-devel groff"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
@@ -153,6 +153,14 @@ do_install() {
 	vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
 	# remove static modules
 	rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
+
+	# fix .so in manpages
+	cd ${DESTDIR}/usr/share/man
+	for file in $(grep -l -e '^\.so[[:space:]]' -R .); do
+		vsed -i $file -e 's=^\(\.[^\.]*\)=\1'${_php_version}=
+		soelim $file | grep -iv '^\.lf' > $file.temp
+		mv $file.temp $file
+	done
 }
 
 php8.1-devel_package() {

From f9d8a2cb17ab47c2c4f1e6b212158a626e441514 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 9 Jul 2022 22:39:56 +0530
Subject: [PATCH 2/2] php8.1: update to 8.1.8, add changelog URL

The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to $version.
---
 srcpkgs/php8.1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 88228d93e1ad..87a101d60878 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.7
-revision=3
+version=8.1.8
+revision=1
 _php_version=8.1
 wrksrc="php-${version}"
 hostmakedepends="bison pkg-config apache-devel groff"
@@ -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=5f0b422a117633c86d48d028934b8dc078309d4247e7565ea34b2686189abdd8
+checksum=889d910558d2492f7f2236921b9bcde620674c8b684ec02d126060f8ca45dc8d
 
 conf_files="/etc/php${_php_version}/php.ini"
 

Re: [PR PATCH] [Updated] php8.1: update to 8.1.8, add changelog URL, fix manpages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1508 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages php8.1
https://github.com/void-linux/void-packages/pull/37949

php8.1: update to 8.1.8, add changelog URL, fix manpages
The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37949.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php8.1-37949.patch --]
[-- Type: text/x-diff, Size: 2850 bytes --]

From 905477bddccdf673740649fecc3e6e5c4e78a54d Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 00:08:58 +0530
Subject: [PATCH 1/2] php8.1: fix man pages

---
 srcpkgs/php8.1/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index e2f1ed0807d2..88228d93e1ad 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,10 +1,10 @@
 # Template file for 'php8.1'
 pkgname=php8.1
 version=8.1.7
-revision=2
+revision=3
 _php_version=8.1
 wrksrc="php-${version}"
-hostmakedepends="bison pkg-config apache-devel"
+hostmakedepends="bison pkg-config apache-devel groff"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
@@ -153,6 +153,14 @@ do_install() {
 	vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
 	# remove static modules
 	rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
+
+	# fix .so in manpages
+	cd ${DESTDIR}/usr/share/man
+	for file in $(grep -l -e '^\.so[[:space:]]' -R .); do
+		vsed -i $file -e 's=^\(\.[^\.]*\)=\1'${_php_version}=
+		soelim $file | grep -iv '^\.lf' > $file.temp
+		mv $file.temp $file
+	done
 }
 
 php8.1-devel_package() {

From c3dc665af22c4c8fc23635a1c29facb14b5f0bcd Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 9 Jul 2022 22:39:56 +0530
Subject: [PATCH 2/2] php8.1: update to 8.1.8, add changelog URL

The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.
---
 srcpkgs/php8.1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 88228d93e1ad..87a101d60878 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.7
-revision=3
+version=8.1.8
+revision=1
 _php_version=8.1
 wrksrc="php-${version}"
 hostmakedepends="bison pkg-config apache-devel groff"
@@ -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=5f0b422a117633c86d48d028934b8dc078309d4247e7565ea34b2686189abdd8
+checksum=889d910558d2492f7f2236921b9bcde620674c8b684ec02d126060f8ca45dc8d
 
 conf_files="/etc/php${_php_version}/php.ini"
 

Re: [PR PATCH] [Updated] php8.1: update to 8.1.8, add changelog URL

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1497 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages php8.1
https://github.com/void-linux/void-packages/pull/37949

php8.1: update to 8.1.8, add changelog URL
The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37949.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php8.1-37949.patch --]
[-- Type: text/x-diff, Size: 1426 bytes --]

From d2ecb6b7556d4e65714ecca0d43c9fb49b86c551 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 01:05:39 +0530
Subject: [PATCH] php8.1: update to 8.1.8, add changelog URL

The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.
---
 srcpkgs/php8.1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index e2f1ed0807d2..c307e3315505 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.7
-revision=2
+version=8.1.8
+revision=1
 _php_version=8.1
 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=5f0b422a117633c86d48d028934b8dc078309d4247e7565ea34b2686189abdd8
+checksum=889d910558d2492f7f2236921b9bcde620674c8b684ec02d126060f8ca45dc8d
 
 conf_files="/etc/php${_php_version}/php.ini"
 

Re: [PR PATCH] [Updated] php8.1: update to 8.1.8, add changelog URL

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1497 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages php8.1
https://github.com/void-linux/void-packages/pull/37949

php8.1: update to 8.1.8, add changelog URL
The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37949.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php8.1-37949.patch --]
[-- Type: text/x-diff, Size: 3162 bytes --]

From a516e62ca299a27edbcc634f7ffef3892366d77d Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 00:08:58 +0530
Subject: [PATCH 1/2] php8.1: fix man pages

Replace man pages containing only a single `.so` directive with
symlinks to the intended man page
---
 srcpkgs/php8.1/template | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index e2f1ed0807d2..7c3456e3df08 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
 version=8.1.7
-revision=2
+revision=3
 _php_version=8.1
 wrksrc="php-${version}"
 hostmakedepends="bison pkg-config apache-devel"
@@ -141,6 +141,17 @@ do_build() {
 	make ${makejobs} ${_make_env}
 }
 
+_fix_manpages() {
+	# replace man pages containing only a single `.so` directive with
+	# symlinks to the intended man page
+	for file in $(find "${PKGDESTDIR:-$DESTDIR}/usr/share/man" -type f); do
+		test 1 -eq $(cat "$file" | wc -l)  || continue
+		grep -q '^\.so[[:space:]]' "$file" || continue
+		target=$(sed "$file" -e 's/^\.so[[:space:]]*//' -e s='\.'=${_php_version}.=)
+		ln -sf "../${target#/}" "$file"
+	done
+}
+
 do_install() {
 	cd ${wrksrc}/build
 	local _env="INSTALL_ROOT=${DESTDIR}"
@@ -153,6 +164,8 @@ do_install() {
 	vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
 	# remove static modules
 	rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
+
+	_fix_manpages
 }
 
 php8.1-devel_package() {
@@ -182,6 +195,7 @@ php8.1-cgi_package() {
 	pkg_install() {
 		cd ${wrksrc}/build
 		make INSTALL_ROOT=${PKGDESTDIR} install-cgi
+		_fix_manpages
 	}
 }
 

From 6373bbda2ced6495ee57ea527a14c06b40763bb3 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 01:05:39 +0530
Subject: [PATCH 2/2] php8.1: update to 8.1.8, add changelog URL

The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.
---
 srcpkgs/php8.1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 7c3456e3df08..5764916bb596 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.7
-revision=3
+version=8.1.8
+revision=1
 _php_version=8.1
 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=5f0b422a117633c86d48d028934b8dc078309d4247e7565ea34b2686189abdd8
+checksum=889d910558d2492f7f2236921b9bcde620674c8b684ec02d126060f8ca45dc8d
 
 conf_files="/etc/php${_php_version}/php.ini"
 

Re: [PR PATCH] [Updated] php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages php8.1
https://github.com/void-linux/void-packages/pull/37949

php8.1: update to 8.1.8, add changelog URL, fix man pages
The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.


Replace man pages containing only a single `.so` directive with
symlinks to the intended man page.


<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37949.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php8.1-37949.patch --]
[-- Type: text/x-diff, Size: 3277 bytes --]

From a8b017466a84bdf46fe6bd1576c07087cc38a081 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 00:08:58 +0530
Subject: [PATCH 1/2] php8.1: fix man pages

Replace man pages containing only a single `.so` directive with
symlinks to the intended man page
---
 srcpkgs/php8.1/template | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index e2f1ed0807d2..0364fd6d4834 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
 version=8.1.7
-revision=2
+revision=3
 _php_version=8.1
 wrksrc="php-${version}"
 hostmakedepends="bison pkg-config apache-devel"
@@ -141,6 +141,22 @@ do_build() {
 	make ${makejobs} ${_make_env}
 }
 
+_fix_manpages() {
+	# replace man pages containing only a single `.so` directive with
+	# symlinks to the intended man page
+	for file in $(find "${PKGDESTDIR:-$DESTDIR}/usr/share/man" -type f); do
+		test 1 -eq $(cat "$file" | wc -l)  || continue
+		grep -q '^\.so[[:space:]]' "$file" || continue
+		target=$(sed "$file" -e 's/^\.so[[:space:]]*//' -e s='\.'=${_php_version}.=)
+		if [ "${target##*.}" = "${file##*.}" ]; then
+			target="${target##*/}"
+		else
+			target="../${target#/}"
+		fi
+		ln -sf "$target" "$file"
+	done
+}
+
 do_install() {
 	cd ${wrksrc}/build
 	local _env="INSTALL_ROOT=${DESTDIR}"
@@ -153,6 +169,8 @@ do_install() {
 	vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
 	# remove static modules
 	rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
+
+	_fix_manpages
 }
 
 php8.1-devel_package() {
@@ -182,6 +200,7 @@ php8.1-cgi_package() {
 	pkg_install() {
 		cd ${wrksrc}/build
 		make INSTALL_ROOT=${PKGDESTDIR} install-cgi
+		_fix_manpages
 	}
 }
 

From 261494d3b6bb46e6a8bf5950dd16c2988a0c9566 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 01:05:39 +0530
Subject: [PATCH 2/2] php8.1: update to 8.1.8, add changelog URL

The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.
---
 srcpkgs/php8.1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 0364fd6d4834..6560459a6c4b 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.7
-revision=3
+version=8.1.8
+revision=1
 _php_version=8.1
 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=5f0b422a117633c86d48d028934b8dc078309d4247e7565ea34b2686189abdd8
+checksum=889d910558d2492f7f2236921b9bcde620674c8b684ec02d126060f8ca45dc8d
 
 conf_files="/etc/php${_php_version}/php.ini"
 

Re: php8.1: update to 8.1.8, add changelog URL, fix man pages

[meator]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

New comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#issuecomment-1179671771

Comment:
What's wrong about having manpages linked via `.so manX/MANPAGE.X`?

Re: [PR PATCH] [Updated] php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages php8.1
https://github.com/void-linux/void-packages/pull/37949

php8.1: update to 8.1.8, add changelog URL, fix man pages
The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.


Replace man pages containing only a single `.so` directive with
symlinks to the intended man page.


<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37949.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php8.1-37949.patch --]
[-- Type: text/x-diff, Size: 2565 bytes --]

From 3ecaa4d42c72be2b4cdf5884911d71b41b68a580 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 00:08:58 +0530
Subject: [PATCH 1/2] php8.1: fix man pages

---
 srcpkgs/php8.1/template | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index e2f1ed0807d2..2d603568a9ca 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
 version=8.1.7
-revision=2
+revision=3
 _php_version=8.1
 wrksrc="php-${version}"
 hostmakedepends="bison pkg-config apache-devel"
@@ -34,6 +34,18 @@ if [ -n "$CROSS_BUILD" ]; then
 		 -DHAVE_SHM_MMAP_FILE"
 fi
 
+post_extract() {
+	# Fix .so links in man pages
+	#
+	# This is needed because of the configure option -
+	#     --program-suffix=${_php_version}
+	#
+	_regexp='^[[:space:]]*\.so[[:space:]]'
+	for file in $(grep -l -e "$_regexp" -R .); do
+		vsed -i "$file" -e "/$_regexp/"'s=^[[:space:]]*\.[^.]*=&'${_php_version}=
+	done
+}
+
 do_build() {
 	local _phpconfig="--srcdir=.. \
 		--config-cache \

From 8eaaa0ddf4bede923550ea778ad7a4e22ecff031 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 01:05:39 +0530
Subject: [PATCH 2/2] php8.1: update to 8.1.8, add changelog URL

The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.
---
 srcpkgs/php8.1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 2d603568a9ca..fac320d8ca1c 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.7
-revision=3
+version=8.1.8
+revision=1
 _php_version=8.1
 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=5f0b422a117633c86d48d028934b8dc078309d4247e7565ea34b2686189abdd8
+checksum=889d910558d2492f7f2236921b9bcde620674c8b684ec02d126060f8ca45dc8d
 
 conf_files="/etc/php${_php_version}/php.ini"
 

Re: php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#issuecomment-1179689408

Comment:
@meator I had thought that the man pages weren't working because they were contained only an `.so` directive, and thought that it could be fixed by converting it into a symlink.

But now I've realized that the `.so` directive was **referencing a man page that didn't exist**, and that's why the man page wasn't working.

I've changed the logic accordingly.  
Thanks for pointing that out. :+1: 

Re: php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#issuecomment-1188898516

Comment:
Pinging @TinfoilSubmarine for review

Re: [PR REVIEW] php8.1: update to 8.1.8, add changelog URL, fix man pages

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#discussion_r924478188

Comment:
I would rather not have a regex running directly in the template because it is harder to understand what is happening (at least for me :/ )... Could we just include a patch with the result of this regex instead? You could include this shell-fu as a comment at the top so it's easy to update if there was ever a new manpage that needed to be fixed.

```
Fix .so links in man pages
    
This is needed because of the configure option -
	--program-suffix=${_php_version}
    
_regexp='^[[:space:]]*\.so[[:space:]]'
_php_version=8.1
for file in $(grep -l -e "$_regexp" -R .); do
	sed --debug -i "$file" -e "/$_regexp/"'s=^[[:space:]]*\.[^.]*=&'${_php_version}=
done

diff --git a/ext/phar/phar.phar.1.in b/ext/phar/phar.phar.1.in
index b5eecbfe..5852619e 100644
--- a/ext/phar/phar.phar.1.in
+++ b/ext/phar/phar.phar.1.in
@@ -1 +1 @@
-.so man1/phar.1
+.so man1/phar8.1.1
diff --git a/sapi/cgi/php-cgi.1.in b/sapi/cgi/php-cgi.1.in
index 340e6c5d..8b39d023 100644
--- a/sapi/cgi/php-cgi.1.in
+++ b/sapi/cgi/php-cgi.1.in
@@ -1 +1 @@
-.so man1/php.1
+.so man1/php8.1.1
```

Re: [PR REVIEW] php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 349 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#discussion_r924608783

Comment:
Hmm... I could simplify it to this -
```sh
for file in $(grep '^\.so ' -lR .); do
	vsed -i "$file" -e 's/^\.so [^.]*/&'${_php_version}/
done
```

But you're right, a patch is easier to understand.

Re: [PR REVIEW] php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#discussion_r924614068

Comment:
My only concern is that a patch needs to be updated manually, but the `vsed` works automatically.

IMHO, things that need to be update manually are only updated when somebody **detects** it's broken, and not when it's **actually** broken.

Re: [PR REVIEW] php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#discussion_r924621509

Comment:
- I could simplify the regex as shown above, and add a detailed comment explaining what's being done.
- I could add a patch instead of the regex and paste the regex in the patch comments, as you suggested.

Which one should I do?

Re: [PR REVIEW] php8.1: update to 8.1.8, add changelog URL, fix man pages

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#discussion_r924654815

Comment:
patch

Re: [PR REVIEW] php8.1: update to 8.1.8, add changelog URL, fix man pages

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 294 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#discussion_r924656357

Comment:
alternatively, if these manpages are generated in the build process, find where they are being generated and fix the problem, not the symptoms

Re: [PR PATCH] [Updated] php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages php8.1
https://github.com/void-linux/void-packages/pull/37949

php8.1: update to 8.1.8, add changelog URL, fix man pages
The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.

I've also changed the `.so` directives in man pages to point to the
correct man pages. Previously they pointed to the man pages of php 7.4

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37949.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php8.1-37949.patch --]
[-- Type: text/x-diff, Size: 3165 bytes --]

From b1e632be05471375e8f9210b796b2ddb8bc31b4e Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 00:08:58 +0530
Subject: [PATCH 1/2] php8.1: Fix .so links in man pages

---
 srcpkgs/php8.1/patches/fix-manpages.patch | 25 +++++++++++++++++++++++
 srcpkgs/php8.1/template                   |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/php8.1/patches/fix-manpages.patch

diff --git a/srcpkgs/php8.1/patches/fix-manpages.patch b/srcpkgs/php8.1/patches/fix-manpages.patch
new file mode 100644
index 000000000000..06b5b7d0cf0a
--- /dev/null
+++ b/srcpkgs/php8.1/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.1.1
+--- a/sapi/cgi/php-cgi.1.in
++++ b/sapi/cgi/php-cgi.1.in
+@@ -1 +1 @@
+-.so man1/php.1
++.so man1/php8.1.1
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index e2f1ed0807d2..7c9b7151e5b1 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
 version=8.1.7
-revision=2
+revision=3
 _php_version=8.1
 wrksrc="php-${version}"
 hostmakedepends="bison pkg-config apache-devel"

From 825e13c868aa0081f552d2c88e1ea129db28a251 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 01:05:39 +0530
Subject: [PATCH 2/2] php8.1: update to 8.1.8, add changelog URL

The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.
---
 srcpkgs/php8.1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 7c9b7151e5b1..c307e3315505 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.7
-revision=3
+version=8.1.8
+revision=1
 _php_version=8.1
 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=5f0b422a117633c86d48d028934b8dc078309d4247e7565ea34b2686189abdd8
+checksum=889d910558d2492f7f2236921b9bcde620674c8b684ec02d126060f8ca45dc8d
 
 conf_files="/etc/php${_php_version}/php.ini"
 

Re: [PR REVIEW] php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#discussion_r925534356

Comment:
Okay.

Re: [PR REVIEW] php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#discussion_r925534427

Comment:
Done.

Re: [PR REVIEW] php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#discussion_r925534356

Comment:
Okay

Re: php8.1: update to 8.1.8, add changelog URL, fix man pages

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#issuecomment-1191004559

Comment:
looks fine I guess. php isn't my wheelhouse so I'll not comment on the rest

Re: php8.1: update to 8.1.8, add changelog URL, fix man pages

[subnut]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37949#issuecomment-1191299314

Comment:
@TinfoilSubmarine Please review

Re: [PR PATCH] [Merged]: php8.1: update to 8.1.8, add changelog URL, fix man pages

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1498 bytes --]

There's a merged pull request on the void-packages repository

php8.1: update to 8.1.8, add changelog URL, fix man pages
https://github.com/void-linux/void-packages/pull/37949

Description:
The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.

I've also changed the `.so` directives in man pages to point to the
correct man pages. Previously they pointed to the man pages of php 7.4

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->