kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-05 06:50:10 +01:00
Code Activity
7,222 Commits 1 Branch 59 Tags 40 MiB
ea9299f216
Commit Graph

7222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jochen Sprickerhof
ea9299f216 Use binary scanner with fdroid scanner path/to.apk 
Closes: #806
 2022-07-17 12:09:03 +00:00
Hans-Christoph Steiner
dc723e7108 Merge branch 'gradle-release-checksums.py' into 'master' 
update to gradle v7.5

See merge request fdroid/fdroidserver!1153
 2022-07-14 23:26:54 +00:00
fdroid-bot
848e29294c gradle v7.5 2022-07-14 23:10:37 +00:00
Hans-Christoph Steiner
3b1ab74354
gitlab-ci: 'Safety' now needs git to run 
Unhandled exception happened: [Errno 2] No such file or directory: 'git'
https://gitlab.com/fdroid/fdroidserver/-/jobs/2724632572
 2022-07-14 16:09:28 -07:00
Hans-Christoph Steiner
33f3b5d7a4 Merge branch 'linsui-master-patch-07322' into 'master' 
NDK r25

See merge request fdroid/fdroidserver!1151
 2022-07-14 21:54:20 +00:00
linsui
534c170615 NDK r25 2022-07-14 06:35:55 +00:00
Hans-Christoph Steiner
15a562e8b9 Merge branch 'ndk' into 'master' 
Update preinstalled NDK to r23c

See merge request fdroid/fdroidserver!1145
 2022-06-14 11:03:43 +00:00
linsui
5472cf88b8 Update preinstalled NDK to r23c 2022-06-14 11:03:42 +00:00
Jochen Sprickerhof
6f8afd340d Merge branch 'fix-ci-post-1134' into 'master' 
fix CI jobs post !1134

See merge request fdroid/fdroidserver!1144
 2022-06-10 11:01:45 +00:00
Hans-Christoph Steiner
e2d9dedbb1 build: add test to ensure the flags are passed to the buildserver 
!1141
 2022-06-08 21:15:51 +02:00
Hans-Christoph Steiner
2bf6848391 test_find_apksigner_system_package_android_home if build_tools is new enough 2022-06-08 20:39:44 +02:00
Hans-Christoph Steiner
f04af445dd gitlab-ci: upgrade 'servergitmirrors' job to Debian/bullseye-backports 
apksigner is now a requirement !1134
 2022-06-08 20:39:44 +02:00
Hans-Christoph Steiner
09e2c37404 gitlab-ci: port fedora job to fdroid/sdkmanager and Java 17 
This is also needed to support _apksigner_ as in !1134
 2022-06-08 19:37:29 +02:00
Hans-Christoph Steiner
39c1b11a14 Merge branch 'apksigner-entry-jar' into 'master' 
use apksigner to sign index-v2 with modern, supported algorithms

Closes #1005

See merge request fdroid/fdroidserver!1134
 2022-06-08 13:41:42 +00:00
Hans-Christoph Steiner
fe22958476
run-tests: skip tests that require apksigner when running on Java8 
The buildserver VM has not been upgraded yet to bullseye, so it is still on
Debian/stretch.  The buildserver VM does not need to run `fdroid update`,
`fdroid signindex`, etc. so this new apksigner requirement should not
affect app builds even though they are stuck on Debian/stretch.
 2022-06-07 16:56:25 +02:00
Hans-Christoph Steiner
3182b77d18
use apksigner to sign index-v2 with modern, supported algorithms 
The current signing method uses apksigner to sign the JAR so that it
will automatically select algorithms that are compatible with Android
SDK 23, which added the most recent algorithms:
https://developer.android.com/reference/java/security/Signature

This signing method uses then inherits the default signing algothim
settings, since Java and Android both maintain those.  That helps
avoid a repeat of being stuck on an old signing algorithm.  That means
specifically that this call to apksigner does not specify any of the
algorithms.

The old indexes must be signed by SHA1withRSA otherwise they will no
longer be compatible with old Androids.

apksigner 30.0.0+ is available in Debian/bullseye, Debian/buster-backports,
Ubuntu 21.10, and Ubuntu 20.04 from the fdroid PPA.  Here's a quick way to
test:

for f in `ls -1 /opt/android-sdk/build-tools/*/apksigner | sort ` /usr/bin/apksigner; do printf "$f : "; $f sign --v4-signing-enabled false; done

closes #1005
 2022-06-07 16:56:23 +02:00
Hans-Christoph Steiner
07a6ad6c1e Merge branch 'archive_sigs' into 'master' 
Archive _src.tar.gz.asc not .log.gz.asc

See merge request fdroid/fdroidserver!1143
 2022-06-07 11:37:54 +00:00
Jochen Sprickerhof
e6c875b77e Archive _src.tar.gz.asc not .log.gz.asc 2022-06-07 11:37:29 +00:00
Hans-Christoph Steiner
759fafd3ff Merge branch 'fix_nosign' into 'master' 
Fix --nosign semantics

See merge request fdroid/fdroidserver!1125
 2022-06-07 11:36:23 +00:00
Hans-Christoph Steiner
7544761e86
index: add test for --nosign config and file generation 2022-06-07 13:22:06 +02:00
Jochen Sprickerhof
9933f54093 Fix --nosign semantics 
This reverts parts of 197ca7e36 as it never triggered the
FDroidException as 'keystore' not in common.config is always False.
 2022-06-07 13:22:02 +02:00
Hans-Christoph Steiner
c3243c2cdf Merge branch 'index-v2' into 'master' 
Updates for index-v2

See merge request fdroid/fdroidserver!1140
 2022-06-07 10:52:12 +00:00
Jochen Sprickerhof
1073dd57f7 Make webBaseUrl configurable 2022-06-04 11:56:04 +02:00
Jochen Sprickerhof
72e3d07acb Simplify primary mirror logic 
Assume repo_url/archive_url to be valid URL and mark it as a primary
mirror.
 2022-06-04 11:56:04 +02:00
Hans-Christoph Steiner
dc971b39ee Merge branch 'scan_binary_server' into 'master' 
Pass --scan-binary to build server

See merge request fdroid/fdroidserver!1141
 2022-06-03 14:39:13 +00:00
Jochen Sprickerhof
edc9390628 Pass --scan-binary to build server 2022-06-03 14:27:58 +00:00
Hans-Christoph Steiner
0d1df0564f Merge branch 'archive_sigs' into 'master' 
Archive .idsig and .log.gz.asc files as well

See merge request fdroid/fdroidserver!1138
 2022-06-03 11:06:44 +00:00
Jochen Sprickerhof
8a2f013508 Archive .idsig and .log.gz.asc files as well 2022-06-03 10:56:22 +00:00
Hans-Christoph Steiner
94faece5ba Merge branch 'fix_pylint' into 'master' 
explicitly re-raising exceptions

See merge request fdroid/fdroidserver!1139
 2022-06-03 10:53:33 +00:00
Jochen Sprickerhof
4ce79a7eaa explicitly re-raising exceptions 
To fix pylint.
 2022-06-01 22:52:22 +02:00
Jochen Sprickerhof
2d0645c1c4 Merge branch 'get_apk_id_api_call' into 'master' 
allow common.get_apk_id() to be used in the API

See merge request fdroid/fdroidserver!1118
 2022-05-31 09:43:51 +00:00
Hans-Christoph Steiner
c6dcc82ca4 allow common.get_apk_id() to be used in the API 
If a project uses fdroidserver as a library, then just calls
common.get_apk_id(), it will now work.  Before, that project would have had
to include something like `common.config = {}` to avoid a stacktrace.
 2022-05-26 22:18:21 +02:00
Hans-Christoph Steiner
9605d4ecad Merge branch 'fix_issue_1006' into 'master' 
[import] Fix crash when no Gradle subdir is found

Closes #1006

See merge request fdroid/fdroidserver!1136
 2022-05-26 18:45:54 +00:00
FestplattenSchnitzel
5951a6c2b1 [import] Fix crash when no Gradle subdir is found 2022-05-26 17:59:41 +00:00
Hans-Christoph Steiner
fa14a0005d Merge branch 'ndk-release-checksums.py' into 'master' 
update NDK

See merge request fdroid/fdroidserver!1135
 2022-05-26 15:11:48 +00:00
fdroid-bot
762c945c42 Android NDK None (None) 2022-05-26 15:10:14 +00:00
Hans-Christoph Steiner
f83003eecf Merge branch 'agp' into 'master' 
AGP 7.2.0 requires gradle 7.3.3

See merge request fdroid/fdroidserver!1131
 2022-05-26 15:09:03 +00:00
linsui
b75a34241f Apply 2 suggestion(s) to 1 file(s) 2022-05-26 15:08:33 +00:00
linsui
2c1659935a AGP 7.2.0 requires gradle 7.3.3 2022-05-26 15:08:33 +00:00
Hans-Christoph Steiner
bc81237d0c Merge branch 'smartcardoptions-parsing' into 'master' 
Fix parsing of smartcardoptions config

See merge request fdroid/fdroidserver!1106
 2022-05-26 15:06:01 +00:00
Hans-Christoph Steiner
2639909f90 add test cases for parsing smartcardoptions config field 2022-05-26 16:49:43 +02:00
Danilo Bargen
a4d0698628 Fix parsing of smartcardoptions config 
With the previous code, a trailing newline would result in an empty
space being part of the list. When this is passed to keytool, it fails
with "Illegal option: ".

Instead of doing overly complicated regex based string substitution
followed by parametrized splitting, we can simply use `.split()`
without any parameters, and Python will automatically strip any
whitespace.
 2022-05-26 16:47:33 +02:00
Jochen Sprickerhof
05e6c293c0 Merge branch 'v2-btlog-sign' into 'master' 
update signing and btlog for index-v2

Closes #1005

See merge request fdroid/fdroidserver!1133
 2022-05-24 20:28:25 +00:00
Hans-Christoph Steiner
cbd4828561 include index-v2 in signindex tests 2022-05-24 11:35:46 +02:00
Hans-Christoph Steiner
5448fa2a2d
update: hide confusing androguard warning that is irrelevant here 
This is related to androguard features that fdroidserver does not use:
WARNING: Requested API level 31 is larger than maximum we have, returning API level 28 instead.
 2022-05-23 23:17:42 +02:00
Hans-Christoph Steiner
4ce3da476d
btlog: run black to format code 2022-05-23 23:17:40 +02:00
Hans-Christoph Steiner
7be0ec3572
btlog: include index-v2.json entry.json and entry.jar 2022-05-23 23:17:37 +02:00
Hans-Christoph Steiner
dc3175cc06 Merge branch 'deploy-index-v2' into 'master' 
deploy: handle index-v2 files on two pass sync methods

See merge request fdroid/fdroidserver!1132
 2022-05-23 13:51:11 +00:00
Hans-Christoph Steiner
2448f070e9 fix tests and docstring error 2022-05-23 15:34:30 +02:00
Hans-Christoph Steiner
293975d081
refactor comment into docstring for update_serverwebroot 2022-05-23 14:41:37 +02:00