From a97ca2363114362c7e19502cc01dfc7792898784 Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Mon, 17 May 2021 18:03:47 -0400
Subject: [PATCH] Don't try to enable extensions

---
 dist/arch/PKGBUILD     | 27 +++++++++++----------------
 dist/arch/arsse.sh     | 13 +++----------
 dist/arch/php-fpm.conf |  5 -----
 3 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD
index 17672b1..5a78040 100644
--- a/dist/arch/PKGBUILD
+++ b/dist/arch/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname="arsse"
-pkgver=0.9.1.r10.7abdf05
+pkgver=0.9.1.r14.e2b182e
 pkgrel=1
 epoch=
 pkgdesc="RSS/Atom newsfeed synchronization server"
@@ -39,21 +39,16 @@ build() {
 
 package() {
     depends=("php" "php-intl" "php-sqlite" "php-fpm")
-    cd "$pkgdir"
-    mkdir -p "usr/bin" "usr/share/webapps/arsse" "usr/share/doc/arsse" "usr/share/licenses/arsse" "usr/lib/systemd/system" "usr/lib/sysusers.d" "etc/php/php-fpm.d/" "etc/webapps/arsse" "etc/webapps/arsse/nginx"
     cd "$srcdir/arsse"
-    cp dist/arch/arsse.sh "$pkgdir/usr/bin/arsse"
-    cp -r lib locale sql vendor www CHANGELOG UPGRADING README.md arsse.php "$pkgdir/usr/share/webapps/arsse"
-    cp -r manual/* "$pkgdir/usr/share/doc/arsse"
-    cp LICENSE AUTHORS "$pkgdir/usr/share/licenses/arsse"
-    cp dist/arch/*.service "$pkgdir/usr/lib/systemd/system"
-    cp dist/arch/sysuser.conf "$pkgdir/usr/lib/sysusers.d/arsse.conf"
-    cp dist/arch/php-fpm.conf "$pkgdir/etc/php/php-fpm.d/arsse.conf"
-    cp dist/arch/config.php config.defaults.php "$pkgdir/etc/webapps/arsse"
-    cp dist/arch/nginx/* "$pkgdir/etc/webapps/arsse/nginx"
-    cd "$pkgdir"
-    chmod -R a=rX *
-    chmod a=rx usr/bin/arsse
-    chmod u=r etc/webapps/arsse/*
+    install -DTm755 dist/arch/arsse.sh "$pkgdir/usr/bin/arsse"
+    install -D lib locale sql vendor www CHANGELOG UPGRADING README.md arsse.php "$pkgdir/usr/share/webapps/arsse"
+    install -D manual/* "$pkgdir/usr/share/doc/arsse"
+    install -D LICENSE AUTHORS "$pkgdir/usr/share/licenses/arsse"
+    install -D dist/arch/*.service "$pkgdir/usr/lib/systemd/system"
+    install -DT dist/arch/sysuser.conf "$pkgdir/usr/lib/sysusers.d/arsse.conf"
+    install -DT dist/arch/php-fpm.conf "$pkgdir/etc/php/php-fpm.d/arsse.conf"
+    install -Dm640 dist/arch/config.php "$pkgdir/etc/webapps/arsse"
+    install -D config.defaults.php "$pkgdir/etc/webapps/arsse"
+    install -D dist/arch/nginx/* "$pkgdir/etc/webapps/arsse/nginx"
     ln -sT "/etc/webapps/arsse/config.php" "usr/share/webapps/arsse/config.php"
 }
diff --git a/dist/arch/arsse.sh b/dist/arch/arsse.sh
index adc286e..c065c29 100644
--- a/dist/arch/arsse.sh
+++ b/dist/arch/arsse.sh
@@ -1,10 +1,3 @@
-#! /usr/bin/bash
-
-if [ `id -u` -eq 0 ]; then
-    setpriv --clear-groups --inh-caps -all --egid=arsse --euid=arsse php /usr/share/webapps/arsse/arsse.php $@
-elif [ `id -un` == "arsse" ]; then
-    php /usr/share/webapps/arsse/arsse.php $@
-else
-    echo "Not authorized." >&2
-    exit 1
-fi
+#! /usr/bin/php
+<?php
+require "/usr/share/webapps/arsse/arsse.php";
diff --git a/dist/arch/php-fpm.conf b/dist/arch/php-fpm.conf
index ca7f3af..4d15ae1 100644
--- a/dist/arch/php-fpm.conf
+++ b/dist/arch/php-fpm.conf
@@ -9,8 +9,3 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
-
-php_value[extension] = intl
-php_value[extension] = dom
-php_value[extension] = iconv
-php_value[extension] = sqlite3