From 0c2c76a6dcc7d71c1b6a7528383bcb36370c094d Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Mon, 23 Aug 2021 15:17:33 -0400
Subject: [PATCH] Patch upstream to install php-xml instead of php-xsl

---
 .github/workflows/commit-tests.yml          |  1 -
 tests/system-setup/upgrade-from-upstream.sh | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/commit-tests.yml b/.github/workflows/commit-tests.yml
index 04918b9e..02cb8209 100644
--- a/.github/workflows/commit-tests.yml
+++ b/.github/workflows/commit-tests.yml
@@ -31,7 +31,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: sudo update-alternatives --set php /usr/bin/php7.2
-      - run: sudo apt-get install -y php-xml
       - name: setup
         run: sudo -E tests/system-setup/upgrade-from-upstream.sh basic totpuser
       - name: test-runner
diff --git a/tests/system-setup/upgrade-from-upstream.sh b/tests/system-setup/upgrade-from-upstream.sh
index 72e6057d..ed4713a0 100755
--- a/tests/system-setup/upgrade-from-upstream.sh
+++ b/tests/system-setup/upgrade-from-upstream.sh
@@ -78,6 +78,16 @@ upstream_install() {
         sed -i 's|\(.*include:.*zones\.conf.*\)|cat >> /etc/nsd/nsd.conf <<EOF\n  do-ip4: yes\n  do-ip6: no\nremote-control:\n  control-enable: no\nEOF\n\n\1|' setup/dns.sh \
             || die "Couldn't patch setup/dns.sh !!"
     fi
+
+    if [ ! -z "$PHP_XSL_PACKAGE" ]; then
+        # For Github Actions - github's ubuntu 18 includes multiple
+        # PHP versions pre-installed and the php-xsl package for these
+        # versions is a virtual package of package php-xml. To handle
+        # this, change the setup scripts so that $PHP_XSL_PACKAGE
+        # (php-xml) is installed instead of php-xsl.
+        H2 "Patching upstream setup/zpush.sh to install $PHP_XSL_PACKAGE instead of php-xsl"
+        sed -i "s/php-xsl/$PHP_XSL_PACKAGE/g" setup/zpush.sh
+    fi
     
     H2 "Run upstream setup"
     if ! setup/start.sh; then