From a51116ef7f8fabc9e5e15748b7602cb844c66593 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 5 May 2026 23:10:49 +0200
Subject: [PATCH] gitlab-ci: update ubuntu_lts_ppa job for 26.04 resolute

apt-key is no more...
---
 .gitlab-ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f6304bd..6d898618 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,10 +160,12 @@ ubuntu_lts_ppa:
     - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "fdroid/fdroidserver"
   script:
     - export ANDROID_HOME=/usr/lib/android-sdk
-    - apt-get install gnupg
-    - while ! apt-key adv --keyserver keyserver.ubuntu.com --recv-key 9AAC253193B65D4DF1D0A13EEC4632C79C5E0151; do sleep 15; done
+    - apt-get install curl gpg gpg-agent
+    - export fingerprint=9aac253193b65d4df1d0a13eec4632c79c5e0151
+    - export keyring=/usr/share/keyrings/ppa.gpg
+    - while ! curl "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x$fingerprint" | gpg --dearmor > $keyring; do sleep 15; done
     - export RELEASE=$(sed -n 's,^Suites\x3a \([a-z]*\).*,\1,p' /etc/apt/sources.list.d/*.sources | head -1)
-    - echo "deb http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list
+    - echo "deb [signed-by=$keyring] https://ppa.launchpadcontent.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list
     - apt-get update
     - apt-get dist-upgrade
     - apt-get install --install-recommends