From 08d8f0456f89c33cd65b8cde27aede047eee0fcd Mon Sep 17 00:00:00 2001
From: Miguel Jacq <mig@mig5.net>
Date: Fri, 10 Jul 2026 08:01:20 +1000
Subject: [PATCH] Use Ondrej's PHP repo for Ubuntu, not Launchpad

---
 scripts/setup-php-sources.sh | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/scripts/setup-php-sources.sh b/scripts/setup-php-sources.sh
index b670df6..7a9e794 100755
--- a/scripts/setup-php-sources.sh
+++ b/scripts/setup-php-sources.sh
@@ -3,30 +3,17 @@
 set -euo pipefail
 
 . /etc/os-release
-case "${ID}" in
-  ubuntu)
-    apt-get update
-    apt-get install -y --no-install-recommends software-properties-common
-    # Adds both deb and deb-src for Ondřej’s PPA
-    add-apt-repository -y -s ppa:ondrej/php
-    ;;
-  debian)
-    # Official way per deb.sury.org README
-    curl -fsSL -o /tmp/debsuryorg-archive-keyring.deb \
-      https://packages.sury.org/debsuryorg-archive-keyring.deb
-    # SHA256SUM matches what https://mirrors.dotsrc.org/deb.sury.org/bind-dev/dists/bullseye/main/binary-amd64/Packages shows
-    echo "7511384559c9ddf1d5ce5f60be429ae9d4e7d01d9480d6f1b7a30c0810cf8b60 /tmp/debsuryorg-archive-keyring.deb" | sha256sum -c -
-    dpkg -i /tmp/debsuryorg-archive-keyring.deb
+curl -fsSL -o /tmp/debsuryorg-archive-keyring.deb \
+https://packages.sury.org/debsuryorg-archive-keyring.deb
+# SHA256SUM matches what https://mirrors.dotsrc.org/deb.sury.org/bind-dev/dists/bullseye/main/binary-amd64/Packages shows
+echo "7511384559c9ddf1d5ce5f60be429ae9d4e7d01d9480d6f1b7a30c0810cf8b60 /tmp/debsuryorg-archive-keyring.deb" | sha256sum -c -
+dpkg -i /tmp/debsuryorg-archive-keyring.deb
 
-    codename="$(lsb_release -sc)"
-    cat >/etc/apt/sources.list.d/php.list <<EOF
+codename="$(lsb_release -sc)"
+cat >/etc/apt/sources.list.d/php.list <<EOF
 deb     [signed-by=/usr/share/keyrings/debsuryorg-archive-keyring.gpg] https://packages.sury.org/php/ ${codename} main
 deb-src [signed-by=/usr/share/keyrings/debsuryorg-archive-keyring.gpg] https://packages.sury.org/php/ ${codename} main
 EOF
-    ;;
-  *)
-    echo "Unsupported distro ID=${ID}" >&2; exit 2;;
-esac
 
 apt-get update;
 apt-get install -y --no-install-recommends php${PHP_VER}-dev