From 569e9fa156097bec18111c05f868243da2096f48 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 20 Apr 2026 19:05:56 +0200
Subject: [PATCH 1/6] gitlab-ci: manual install of 'progress' on macOS

The Homebrew package still uses a release that uses clint, not progress.
---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d65b3f9..b6ceeb2b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -547,6 +547,9 @@ macOS:
     - /bin/bash --version
     - /bin/bash -n tests/run-tests
 
+    # TODO remove the packages below once they are included in the Homebrew package
+    - $(brew --prefix fdroidserver)/libexec/bin/python3 -m pip install progress
+
     # test fdroidserver from git with current package's dependencies
     - fdroid="$(brew --prefix fdroidserver)/libexec/bin/python3 $PWD/fdroid" ./tests/run-tests
 

From 69a94496c6323e848f0a0192c8410103d6ec74ca Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 20 Apr 2026 19:11:03 +0200
Subject: [PATCH 2/6] gitlab-ci: remove packages included in fdroidserver PPA
 package

```console
$ wget https://launchpadlibrarian.net/801346669/fdroidserver_2.4.2-1~jammy_all.deb
$ dpkg -I fdroidserver_2.4.2-1~jammy_all.deb |grep Depends:
 Depends: androguard, python3, python3-asn1crypto, python3-clint, python3-defusedxml, python3-git, python3-magic, python3-oscrypto, python3-paramiko, python3-pil, python3-platformdirs, python3-qrcode, python3-requests, python3-ruamel.yaml, python3-tomli | python3 (>> 3.11), python3-yaml, python3:any, sdkmanager, yamllint, apksigner (>= 31), default-jdk-headless | java-compiler, python3-biplist, python3-libcloud, python3-pycountry, rsync, s3cmd
$
```
---
 .gitlab-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6ceeb2b..6063baa3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -176,10 +176,7 @@ ubuntu_lts_ppa:
         dexdump
         fdroidserver
         git
-        python3-biplist
-        python3-pycountry
         python3-setuptools
-        sdkmanager
 
     # Test things work with a default branch other than 'master'
     - git config --global init.defaultBranch thisisnotmasterormain

From cddab966754f69b280b204f372bb7ab545a110d7 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 20 Apr 2026 19:33:51 +0200
Subject: [PATCH 3/6] gitlab-ci: python3-progress is not yet Depends: in PPA

!1792
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6063baa3..e6baa5e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -176,6 +176,7 @@ ubuntu_lts_ppa:
         dexdump
         fdroidserver
         git
+        python3-progress
         python3-setuptools
 
     # Test things work with a default branch other than 'master'

From 836acc1b13fe4772d6ca454d5932366566eef4de Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 20 Apr 2026 19:11:47 +0200
Subject: [PATCH 4/6] gitlab-ci: !1792 removed clint, stop manually installing
 on Fedora

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6baa5e4..4ee84d84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -492,7 +492,7 @@ fedora_latest:
     - dnf -y install --nobest --allowerasing *.rpm
     - ./setup.py sdist
     - useradd -m -c "test account" --password "fakepassword"  testuser
-    - su testuser --login --command "cd `pwd`; $pip install --user dist/fdroidserver-*.tar.gz; $pip install --user clint; $pip install --user git+https://github.com/wbond/oscrypto.git@1547f535001ba568b239b8797465536759c742a3"
+    - su testuser --login --command "cd `pwd`; $pip install --user dist/fdroidserver-*.tar.gz; $pip install --user git+https://github.com/wbond/oscrypto.git@1547f535001ba568b239b8797465536759c742a3"
     - export OPENSSL_ENABLE_SHA1_SIGNATURES=1
     - export OPENSSL_ENABLE_MD5_VERIFY=1
     - test -e ~testuser/.local/share/locale/de/LC_MESSAGES/fdroidserver.mo

From 4303c0d87b56468069c0a6c1a742f3fecf413800 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 20 Apr 2026 19:15:38 +0200
Subject: [PATCH 5/6] gitlab-ci: remove packages from Debian/testing job that
 are Depends:

https://packages.debian.org/testing/fdroidserver
---
 .gitlab-ci.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ee84d84..1145dd0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,20 +136,13 @@ debian_testing:
   script:
     - apt-get install
         aapt
-        androguard
-        apksigner
         dexdump
         fdroidserver
         git
         gnupg
         ipfs-cid
         python3-babel
-        python3-biplist
-        python3-defusedxml
-        python3-libcloud
-        python3-pycountry
         python3-setuptools
-        sdkmanager
     - python3 -c 'import fdroidserver'
     - python3 -c 'import androguard'
     - python3 -c 'import sdkmanager'

From 80d94601fc3898eaab02a0d30975eaab08c47208 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 20 Apr 2026 19:16:22 +0200
Subject: [PATCH 6/6] gitlab-ci: python3-progress is not yet Depends: in
 testing

!1792
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1145dd0f..0ae5a937 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -142,6 +142,7 @@ debian_testing:
         gnupg
         ipfs-cid
         python3-babel
+        python3-progress
         python3-setuptools
     - python3 -c 'import fdroidserver'
     - python3 -c 'import androguard'