[PR PATCH] php-apache: fix module name

[PR PATCH] php-apache: fix module name

[sgn]

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

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

https://github.com/sgn/void-packages php-apache
https://github.com/void-linux/void-packages/pull/48028

php-apache: fix module name
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

Fix #48026 

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/48028.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php-apache-48028.patch --]
[-- Type: text/x-diff, Size: 5629 bytes --]

From d1e5661350faa4bdc3f4c0a7e337135c669bc2d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 2 Jan 2024 20:42:14 +0700
Subject: [PATCH 1/3] php8.1: for apache config

---
 srcpkgs/php8.1/files/apache.conf | 4 ++--
 srcpkgs/php8.1/template          | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.1/files/apache.conf b/srcpkgs/php8.1/files/apache.conf
index f321ec12d31bb..bc57ba73dbcdf 100644
--- a/srcpkgs/php8.1/files/apache.conf
+++ b/srcpkgs/php8.1/files/apache.conf
@@ -1,7 +1,7 @@
-# Required modules: dir_module, php8.1_module
+# Required modules: dir_module, php_module
 
 <IfModule dir_module>
-	<IfModule php8.1_module>
+	<IfModule php_module>
 		DirectoryIndex index.php index.html
 		<FilesMatch "\.php$">
 			SetHandler application/x-httpd-php
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 8859e22bf20f4..f24371f1f9453 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.26
-revision=3
+revision=4
 _php_version=8.1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -204,6 +204,9 @@ php8.1-apache_package() {
 	short_desc+=' - Apache SAPI'
 	depends="php${_php_version}>=${version}_${revision}"
 	conf_files="/etc/apache/extra/php${_php_version}_module.conf"
+	alternatives="
+	 php-apache:libphp.so:/usr/libexec/httpd/modules/libphp${_php_version}.so
+	 php-apache:php_module.conf:/etc/apache/extra/php${_php_version}_module.conf"
 	pkg_install() {
 		vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
 		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"

From ed567e4903be1f270f0664b1fcc61fa07f435b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 2 Jan 2024 20:42:26 +0700
Subject: [PATCH 2/3] php8.2: for apache config

---
 srcpkgs/php8.2/files/apache.conf | 4 ++--
 srcpkgs/php8.2/template          | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.2/files/apache.conf b/srcpkgs/php8.2/files/apache.conf
index 1c5e4e4e58c2c..bc57ba73dbcdf 100644
--- a/srcpkgs/php8.2/files/apache.conf
+++ b/srcpkgs/php8.2/files/apache.conf
@@ -1,7 +1,7 @@
-# Required modules: dir_module, php8.2_module
+# Required modules: dir_module, php_module
 
 <IfModule dir_module>
-	<IfModule php8.2_module>
+	<IfModule php_module>
 		DirectoryIndex index.php index.html
 		<FilesMatch "\.php$">
 			SetHandler application/x-httpd-php
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 913d7f0f7e0d8..a997219becf93 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2'
 pkgname=php8.2
 version=8.2.13
-revision=2
+revision=3
 _php_version=8.2
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -200,6 +200,9 @@ php8.2-apache_package() {
 	short_desc+=' - Apache SAPI'
 	depends="php${_php_version}>=${version}_${revision}"
 	conf_files="/etc/apache/extra/php${_php_version}_module.conf"
+	alternatives="
+	 php-apache:libphp.so:/usr/libexec/httpd/modules/libphp${_php_version}.so
+	 php-apache:php_module.conf:/etc/apache/extra/php${_php_version}_module.conf"
 	pkg_install() {
 		vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
 		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"

From e08a08bcff4daee382ebdf1f99994ee8f8d42df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 2 Jan 2024 20:42:32 +0700
Subject: [PATCH 3/3] php8.3: for apache config

---
 srcpkgs/php8.3/files/apache.conf | 4 ++--
 srcpkgs/php8.3/template          | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.3/files/apache.conf b/srcpkgs/php8.3/files/apache.conf
index e22ea2014a152..bc57ba73dbcdf 100644
--- a/srcpkgs/php8.3/files/apache.conf
+++ b/srcpkgs/php8.3/files/apache.conf
@@ -1,7 +1,7 @@
-# Required modules: dir_module, php8.3_module
+# Required modules: dir_module, php_module
 
 <IfModule dir_module>
-	<IfModule php8.3_module>
+	<IfModule php_module>
 		DirectoryIndex index.php index.html
 		<FilesMatch "\.php$">
 			SetHandler application/x-httpd-php
diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template
index 0014a4c3dce5a..07fdc87bbe18e 100644
--- a/srcpkgs/php8.3/template
+++ b/srcpkgs/php8.3/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.3'
 pkgname=php8.3
 version=8.3.0
-revision=2
+revision=3
 _php_version=8.3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -200,6 +200,9 @@ php8.3-apache_package() {
 	short_desc+=' - Apache SAPI'
 	depends="php${_php_version}>=${version}_${revision}"
 	conf_files="/etc/apache/extra/php${_php_version}_module.conf"
+	alternatives="
+	 php-apache:libphp.so:/usr/libexec/httpd/modules/libphp${_php_version}.so
+	 php-apache:php_module.conf:/etc/apache/extra/php${_php_version}_module.conf"
 	pkg_install() {
 		vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
 		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"

Re: [PR PATCH] [Merged]: php-apache: fix module name

[sgn]

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

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

php-apache: fix module name
https://github.com/void-linux/void-packages/pull/48028

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

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

Fix #48026 

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
-->