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

[subnut <subnut@users.noreply.github.com>]

[-- 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"