9551 Commits

Author SHA1 Message Date
Hans-Christoph Steiner
c634315596 Merge branch 'getref' into 'master'
Fix git getref for tag starting with @

See merge request fdroid/fdroidserver!1813
2026-05-05 21:40:51 +00:00
Hans-Christoph Steiner
e9f875b2d8 added test case 2026-05-05 21:24:24 +00:00
linsui
00af928a47 Fix git getref for tag starting with @ 2026-05-05 21:24:24 +00:00
Jochen Sprickerhof
96b57b35f6 Merge branch 'fix_kernel_upgrade' into 'master'
buildserver: rally make sure that all packages are upgraded

See merge request fdroid/fdroidserver!1821
2026-05-03 09:41:50 +02:00
Jochen Sprickerhof
4dc612169a buildserver: rally make sure that all packages are upgraded
This reverts b150a292 and uses dist-upgrade instead.
2026-05-03 09:37:26 +02:00
Jochen Sprickerhof
cd2ce57600 Merge branch 'fix_kernel_upgrade' into 'master'
buildserver: make sure everything is upgraded

See merge request fdroid/fdroidserver!1820
2026-05-03 08:04:24 +02:00
Jochen Sprickerhof
b150a292c9 buildserver: make sure everything is upgraded
I found this in the logs:

The following packages have been kept back:
  linux-image-amd64

Not sure why apt is holding it back, probably some unclean base image.
Work around it for now to make sure we have the newest kernel.
2026-05-03 08:03:32 +02:00
Hans-Christoph Steiner
8cc35314d1 update CHANGELOG.md 2026-05-01 22:52:00 +02:00
Hans-Christoph Steiner
ec5183a67d Merge branch 'fix-tests-with-sdkmanager-0.7.x' into 'master'
stop accessing private variable in sdkmanager in tests

See merge request fdroid/fdroidserver!1818
2026-05-01 20:47:58 +00:00
Hans-Christoph Steiner
2333b5c1fb stop accessing private variable in sdkmanager in tests
sdkmanager@3ff3706e70752fbd0f712818b760dcabda8de405 changed the name
of the variable that was being accessed.  This instead uses a private
function, but that function already fits the PEP naming standards and has
remained unchanged since the beginning of _sdkmanager_.
2026-05-01 22:29:25 +02:00
Hans-Christoph Steiner
290b831b24 Merge branch 'gitlab-ci-stop-false-pages-fails' into 'master'
gitlab-ci: "pages" should not fail if "Build documentation" didn't run

See merge request fdroid/fdroidserver!1811
2026-05-01 20:25:50 +00:00
Hans-Christoph Steiner
c03fa27b78 gitlab-ci: "pages" should not fail if "Build documentation" didn't run
"Build documentation" job generates _docs/build/html_ but does not always
get triggered.  The "pages" optionally depends on "Build documentation',
but is set to always run. So if "Build documentation" did not run, then
"pages" just prints warning and quits.

Maybe there is a better way to do this with GitLab CI config?

This should stop this from happening:
https://gitlab.com/fdroid/fdroidserver/-/jobs/14033426852
2026-05-01 22:24:12 +02:00
Jochen Sprickerhof
7c16c4c67f Merge branch 'revert-8ee03b2a' into 'master'
Revert "Merge branch 'patch-2' into 'master'"

See merge request fdroid/fdroidserver!1817
2026-05-01 17:55:19 +02:00
Jochen Sprickerhof
2fa518a38f Revert "Merge branch 'patch-2' into 'master'"
This reverts merge request !1814
2026-05-01 17:51:56 +02:00
Jochen Sprickerhof
1baa7f6408 Merge branch 'fix_grub-pc' into 'master'
buildserver: fix grub-pc install

See merge request fdroid/fdroidserver!1816
2026-05-01 17:50:53 +02:00
Licaon_Kter
eb9b6aaeed buildserver: fix grub-pc install 2026-05-01 17:42:10 +02:00
Hans-Christoph Steiner
8ee03b2ada Merge branch 'patch-2' into 'master'
Disable algif in VM

See merge request fdroid/fdroidserver!1814
2026-05-01 07:06:06 +00:00
Licaon_Kter
b491b1b802 Disable algif in VM 2026-04-30 15:45:36 +00:00
linsui
ccd47917c6 Merge branch 'gradletasks' into 'master'
build: run gradle tasks one by one

See merge request fdroid/fdroidserver!1628
2026-04-29 14:05:47 +00:00
linsui
08908374b4 build_local_run: run gradle tasks one by one 2026-04-29 14:02:03 +00:00
linsui
c256ff020d Merge branch 'checkupdatesubmodule' into 'master'
checkupdate: run deinit submodule before checkout

See merge request fdroid/fdroidserver!1805
2026-04-27 17:07:53 +00:00
linsui
4ecd71a1f7 checkupdates: run deinit before checkout 2026-04-27 17:06:10 +00:00
linsui
8de55eed3a Merge branch 'category-description' into 'master'
Add localized category to tests

See merge request fdroid/fdroidserver!1812
2026-04-22 18:58:04 +00:00
Torsten Grote
950412185a Allow description for categories 2026-04-22 15:46:43 -03:00
Torsten Grote
a2574360d9 Add localized category to tests 2026-04-22 15:01:20 -03:00
Hans-Christoph Steiner
532fa59e30 Merge branch 'category-description' into 'master'
Add category description to tests

See merge request fdroid/fdroidserver!1810
2026-04-22 07:20:27 +00:00
Torsten Grote
36e75c29e6 Add category description to tests 2026-04-21 20:10:03 -03:00
linsui
6efa23ded6 Merge branch 'gitlab-ci-fix-all-jobs-for-progress-lib' into 'master'
Fix all the jobs to use _progress_ instead of _clint_ !1792; clean manual dep cruft

See merge request fdroid/fdroidserver!1809
2026-04-21 14:39:20 +00:00
Hans-Christoph Steiner
80d94601fc gitlab-ci: python3-progress is not yet Depends: in testing
!1792
2026-04-20 19:34:31 +02:00
Hans-Christoph Steiner
4303c0d87b gitlab-ci: remove packages from Debian/testing job that are Depends:
https://packages.debian.org/testing/fdroidserver
2026-04-20 19:34:28 +02:00
Hans-Christoph Steiner
836acc1b13 gitlab-ci: !1792 removed clint, stop manually installing on Fedora 2026-04-20 19:34:24 +02:00
Hans-Christoph Steiner
cddab96675 gitlab-ci: python3-progress is not yet Depends: in PPA
!1792
2026-04-20 19:34:20 +02:00
Hans-Christoph Steiner
69a94496c6 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
$
```
2026-04-20 19:17:22 +02:00
Hans-Christoph Steiner
569e9fa156 gitlab-ci: manual install of 'progress' on macOS
The Homebrew package still uses a release that uses clint, not progress.
2026-04-20 19:17:22 +02:00
Hans-Christoph Steiner
94ec80e9de Merge branch 'fix-publish-return-value' into 'master'
fix exit status integer overflow

See merge request fdroid/fdroidserver!1806
2026-04-20 17:08:03 +00:00
Hans-Christoph Steiner
bbc5182b06 fix all other cases of sys.exit() overflow 2026-04-20 16:58:30 +00:00
Michael Pöhn
d1df6be2e2 🐛 publish: fix exit status integer overflow
publish.py currently uses the number of failed verifications as exit
status. `sys.exit(failed)` Whenever the number of failed verification
attempts is divisible by 256 the return status is 0. exit status 0
however conveys that there were no errors, so as long as an attacker can
controll the number of verification failures they can use this to turn
off verification alltogether.
2026-04-20 16:58:30 +00:00
Hans-Christoph Steiner
f569301ada Merge branch 'remove-NSFW' into 'master'
remove NSFW Anti-Feature

See merge request fdroid/fdroidserver!1807
2026-04-20 14:49:51 +00:00
Hans-Christoph Steiner
0b6ec94af7 remove NSFW Anti-Feature
admin#634
fdroiddata#3867
2026-04-20 14:40:29 +00:00
linsui
b3a0160b13 Merge branch 'gradlepath' into 'master'
fix gradle output path

See merge request fdroid/fdroidserver!1030
2026-04-13 17:23:06 +00:00
linsui
ad8bfca824 fix gradle output path 2026-04-13 17:21:32 +00:00
Hans-Christoph Steiner
3dac2c3d5b Merge branch 'clint-to-progress' into 'master'
Replace python clint by python progress

Closes #1274

See merge request fdroid/fdroidserver!1792
2026-04-13 14:44:21 +00:00
Benson Muite
3e7d495b95 Replace python clint by python progress 2026-04-13 14:44:20 +00:00
Hans-Christoph Steiner
b284d5044e Merge branch 'gradle-clean' into 'master'
Don't run gradle clean

See merge request fdroid/fdroidserver!1800
2026-03-26 19:50:12 +00:00
linsui
fe938367de Don't run gradle clean 2026-03-26 19:18:35 +00:00
Hans-Christoph Steiner
34e4a609a1 Merge branch 'gitlab-ci-fix-pip-audit' into 'master'
gitlab-ci: make pip_audit ignore CVE-2026-4539

See merge request fdroid/fdroidserver!1803
2026-03-26 19:18:22 +00:00
Hans-Christoph Steiner
d539c2d5de gitlab-ci: make pip_audit ignore CVE-2026-4539
* pygments is not used directly
* pygments is pulled in by androguard
* the issue is DoS when doing syntax highlighting
* https://www.resolvedsecurity.com/vulnerability-catalog/CVE-2026-4539
2026-03-26 20:15:50 +01:00
Hans-Christoph Steiner
5e0b6a8515 Merge branch 'patch-3' into 'master'
Conform to PEP 639

See merge request fdroid/fdroidserver!1793
2026-03-19 17:56:06 +00:00
Benson Muite
c47c39794f Conform to PEP 639
- Use full SPDX license identifier
- Add link to license file
- Remove outdated license specifier
2026-03-19 17:55:13 +00:00
Hans-Christoph Steiner
b28f5945fd Merge branch 'jvm-download' into 'master'
disable gradle jvm auto download

See merge request fdroid/fdroidserver!1798
2026-03-18 08:33:11 +00:00