Litespeed

3 files changed, 75 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7afc5c8e8f33..6009a3d87d52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by makepkg 6.0.1
-# Tue Feb  1 16:18:50 UTC 2022
+# Fri Feb 18 10:52:48 UTC 2022
 pkgbase = php72
 	pkgdesc = PHP 7.2.34 compiled as to not conflict with mainline php
 	pkgver = 7.2.34
@@ -65,6 +65,7 @@ pkgbase = php72
 	makedepends = pam
 	makedepends = libsodium
 	options = !lto
+	source = make-tests.patch
 	source = pear-config-patcher.php
 	source = php-makefile-patcher.php
 	source = php-apache.conf
@@ -82,6 +83,7 @@ pkgbase = php72
 	source = php-phpinfo.patch
 	source = timezonedb-guess.patch
 	source = timezonedb-php7.2.patch
+	sha256sums = e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b
 	sha256sums = 0b7e98dca9c996ec10cb9b3f6296bb7547c68797fd5f35006fdfd3e97700672d
 	sha256sums = ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52
 	sha256sums = 6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91
@@ -168,6 +170,15 @@ pkgname = php72-apache
 	backup = etc/httpd/conf/extra/
 	backup = etc/php72/php.ini
 
+pkgname = php72-litespeed
+	pkgdesc = LiteSpeed SAPI for php72
+	depends = php72=7.2.34
+	depends = libxml2
+	depends = pcre2
+	depends = libedit
+	depends = argon2
+	backup = etc/php72/php.ini
+
 pkgname = php72-pear
 	pkgdesc = PHP Extension and Application Repository (PEAR) for php72
 	depends = php72=7.2.34
diff --git a/PKGBUILD b/PKGBUILD
index 0823c36f7cc3..f9da613745c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,17 @@
 ###############################################################################
 # Generated by arch-phpbs: https://github.com/lamskoy/arch-phpbs
 #
-# My packages on AUR: php81 php74 php72 php55 php54
-# Co-maintaining on AUR: php73
+# Maintaining/co-maintaining on AUR: php81 php80 php74 php73 php72 php71 php70 php55 php54 php53
 #
 # Thanks to:
 #
+# AUR php80 Co-maintainer: Timo Sarawinski
+# AUR php70 and php71 Co-maintainer: William Gathoye <william@gathoye.be>
 # AUR php74 Co-maintainer: Tomasz Gruszka <tompear79@gmail.com>
 # AUR php73 Co-maintainer: Matt Harrison <matt@harrison.us.com>
 # AUR php73 Contirubutor: Pierre Schmitz <pierre@archlinux.de>
 # AUR php55 Original maintainer: Raphaël Doursenaud <rdoursenaud@gmail.com>
+# AUR php53 Original maintainer: Felix Yan <felixonmars@archlinux.org>
 ###############################################################################
 _phpbase="72"
 _suffix=""
@@ -35,7 +37,9 @@ _build_sapi_ini_cgi="etc/php72"
 _build_sapi_ini_cli="etc/php72"
 _build_sapi_ini_embed="etc/php72"
 _build_sapi_ini_fpm="etc/php72"
+_build_sapi_ini_litespeed="etc/php72"
 _build_sapi_ini_phpdbg="etc/php72"
+_build_sapi_litespeed="--with-litespeed"
 _build_shared_gd="1"
 _build_shared_json="1"
 _build_shared_libedit="0"
@@ -65,6 +69,7 @@ pkgname=(
     "php72-fpm"
     "php72-embed"
     "php72-apache"
+    "php72-litespeed"
     "php72-pear"
     "php72-pecl"
     "php72-phpdbg"
@@ -122,6 +127,7 @@ pkgname=(
     "php72-opcache"
 )
 source=(
+    "make-tests.patch"
     "pear-config-patcher.php"
     "php-makefile-patcher.php"
     "php-apache.conf"
@@ -500,6 +506,7 @@ _build_sapi() {
 
     pushd "build-${_sapi}"
      ./configure ${_phpconfig} ${_commands}
+    patch -p1 -i "${srcdir}/make-tests.patch"
 
     if (($_sapi != "cli")); then
         make clean
@@ -612,6 +619,22 @@ build() {
         --disable-phpdbg \
     "
 
+    # litespeed
+    _cflags="${CFLAGS}"
+    export CFLAGS="${CFLAGS} -Wno-error=format-security"
+    _build_sapi "litespeed" "\
+        --sysconfdir=/${_build_sapi_ini_litespeed} \
+        --with-config-file-path=/${_build_sapi_ini_litespeed} \
+        --disable-all \
+        --disable-cgi \
+        --disable-cli \
+        --disable-fpm \
+        --disable-embed \
+        --disable-phpdbg \
+        ${_build_sapi_litespeed} \
+    "
+    export CFLAGS="${_cflags}"
+
     # fpm
     _build_sapi "fpm" "\
         --sysconfdir=/${_build_sapi_ini_fpm} \
@@ -641,6 +664,7 @@ build() {
         --enable-embed=shared \
         --enable-fpm \
         ${_phpextensions_fpm} \
+        ${_build_sapi_litespeed} \
     "
     fi
 
@@ -948,6 +972,30 @@ package_php72-phpdbg() {
 }
 # phpdbg sapi end
 
+# litespeed sapi
+package_php72-litespeed() {
+    _sapi="litespeed"
+    pkgdesc="LiteSpeed SAPI for ${pkgbase}"
+    depends=("${pkgbase}=${pkgver}")
+    depends+=("${_sapi_depends[@]}")
+    if ((_build_ini_per_sapi || _build_per_sapi)); then
+        pushd "build-${_sapi}"
+    else
+        pushd "build-cli"
+    fi
+    if ((_build_ini_per_sapi)); then
+        install -D -m644 "../php-${pkgver}/php.ini-production" "${pkgdir}/${_build_sapi_ini_cgi}/php.ini"
+        backup=("${_build_sapi_ini_cgi}/php.ini")
+    fi
+    case "${_phpbase}" in
+        *)
+            install -D -m755 sapi/litespeed/php "${pkgdir}/usr/bin/ls${pkgbase}"
+            ;;
+    esac
+    popd
+}
+# litespeed sapi end
+
 ###############################################################################
 # PEAR + PECL
 ###############################################################################
@@ -1492,7 +1540,8 @@ package_php72-readline() {
 }
 
 
-sha256sums=('0b7e98dca9c996ec10cb9b3f6296bb7547c68797fd5f35006fdfd3e97700672d'
+sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
+            '0b7e98dca9c996ec10cb9b3f6296bb7547c68797fd5f35006fdfd3e97700672d'
             'ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52'
             '6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
             '409e11bc6a2c18707dfc44bc61c820ddfd81e17481470f3405ee7822d8379903'
diff --git a/make-tests.patch b/make-tests.patch
new file mode 100644
index 000000000000..fe7d21ea5aab
--- /dev/null
+++ b/make-tests.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -213,7 +213,7 @@
+ 		fi; \
+ 		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
+ 		TEST_PHP_SRCDIR=$(top_srcdir) \
+-		CC="$(CC)" \
++		REPORT_EXIT_STATUS=1 NO_INTERACTION=1 SKIP_ONLINE_TESTS=1 SKIP_SLOW_TESTS=1 CC="$(CC)" \
+ 			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+ 		TEST_RESULT_EXIT_CODE=$$?; \
+ 		rm $(top_builddir)/tmp-php.ini; \