kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00
Code Activity
7,237 Commits 1 Branch 59 Tags 40 MiB
42ef7c3406
Commit Graph

7237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hans-Christoph Steiner
053a64718a
deploy: handle index-v2 files on two pass sync methods 
When using rsync or s3cmd, the upload is done in multiple passes. This
reduces the chance of interfering with an existing client-server
interaction.

- rsync: In the first pass, upload without the index files and delay
  the deletion as much as possible.  That keeps the repo functional
  while this update is running.  Then second pass uploads the index
  files.

- s3cmd: In the first pass, only new files are uploaded.  In the
  second pass, changed files are uploaded, overwriting what is on the
  server.  On the third/last pass, the indexes are uploaded, and any
  removed files are deleted from the server.  The last pass is the
  only pass to use a full MD5 checksum of all files to detect changes.
 2022-05-23 14:41:34 +02:00
Jochen Sprickerhof
39329b289b Merge branch 'run-tests-in-buildserver' into 'master' 
gitlab-ci: run test suite in the buildserver environment

See merge request fdroid/fdroidserver!1129
 2022-05-23 12:29:36 +00:00
Hans-Christoph Steiner
e6944ea4c2
gitlab-ci: run test suite in the buildserver environment 
Run the whole test suite in an environment that is like the
buildserver guest VM.  This installs python3-babel because that is
only used by the test suite, and not needed in the buildserver.

Some extra packages are required for this test run that are not
provided by the buildserver since they are not needed there:

 * gnupg-agent for the full signing setup
 * python3-babel for compiling localization files
 * python3-clint for fancy progress bars for users

fdroid/ci-images-base is deprecated and archived.
 2022-05-23 14:12:06 +02:00
Hans-Christoph Steiner
9eeabddcf0 Merge branch 'skip_apk' into 'master' 
Don't include disabled apks in the index

Closes #1002

See merge request fdroid/fdroidserver!1126
 2022-05-23 12:05:40 +00:00
Jochen Sprickerhof
b07d23ff5c Don't include disabled apks in the index 
This needs a rerun of `fdroid update --clean`.

In case a build is disabled delete_disabled_builds takes care of
deleting it from the repo. But this only works if the apk follows the
normal name pattern. Otherwise it will stay in the folder and be picked
up by process_apks and added to the index.

Closes: #1002
 2022-05-23 11:47:53 +00:00
Hans-Christoph Steiner
40f761c482 Merge branch 'index_v2' into 'master' 
Index v2

See merge request fdroid/fdroidserver!1092
 2022-05-23 10:39:17 +00:00
Jochen Sprickerhof
d70e5c2cd9 Index v2 2022-05-23 10:39:17 +00:00
Hans-Christoph Steiner
45e79b1223 Merge branch 'linsui-master-patch-66548' into 'master' 
scanner: add me.pushy

See merge request fdroid/fdroidserver!1130
 2022-05-23 07:30:14 +00:00
linsui
13534bf02e scanner: add me.pushy 2022-05-21 12:25:11 +00:00
Jochen Sprickerhof
4babf6fce9 Merge branch 'run-tests-in-buildserver' into 'master' 
scanner: include dexdump in buildserver for APK analysis

See merge request fdroid/fdroidserver!1127
 2022-05-20 13:30:14 +00:00
Hans-Christoph Steiner
6ef60f0d6b
scanner: include dexdump in buildserver for APK analysis 
This scanner feature is not yet ready for the production buildserver but it
is already useful in CI.
 2022-05-19 15:45:26 +02:00
Hans-Christoph Steiner
ddcbe23f9e Merge branch 'keep-index-v1.json' into 'master' 
signindex: do not remove index-v1.json after signing

Closes #969

See merge request fdroid/fdroidserver!1124
 2022-05-17 13:56:32 +00:00
Hans-Christoph Steiner
73c31e6e63
signindex: do not remove index-v1.json after signing 
With ~index-v2, the model is changing to offer the plain JSON file for easy
consumption.  Then gpgsign will also provide a detached PGP signature for
systems that would rather verify based on PGP signatures than JAR signatures.

!1080
closes #969
 2022-05-17 15:38:06 +02:00
Hans-Christoph Steiner
8f6bc1114a Merge branch 'duplicate_permissions' into 'master' 
Fix and merge androguard_test into update.TestCase

See merge request fdroid/fdroidserver!1121
 2022-05-10 14:58:11 +00:00
Jochen Sprickerhof
08e3e445fb Merge androguard_test into update.TestCase 2022-05-10 14:40:03 +00:00
Jochen Sprickerhof
e82888837e Fix androguard_test 
- SdkToolsPopen expects a list.
- info.guardianproject.urzip.apk is not in the repo.
- scan_apk_aapt was removed in 08931f45 so define output.
 2022-05-10 14:40:03 +00:00
Jochen Sprickerhof
1b67af4367 Merge branch 'net-download-file' into 'master' 
net: improve parsing filenames from URL

See merge request fdroid/fdroidserver!1122
 2022-05-10 11:54:26 +00:00
Hans-Christoph Steiner
107593d3ba net: improve parsing filenames from URL 
This is more relevant to issuebot than fdroidserver, but it can't hurt here
also.
 2022-05-09 20:59:15 +02:00
Jochen Sprickerhof
f8789f2997 Merge branch 'nonfree' into 'master' 
scanner: add kotlinx-coroutines-play-services

See merge request fdroid/fdroidserver!1120
 2022-05-08 09:33:35 +00:00
linsui
df1e0e30d5 fix tests 2022-05-07 02:17:26 +00:00
linsui
c16d170f12 scanner: add kotlinx-coroutines-play-services 2022-05-07 01:49:56 +00:00
Jochen Sprickerhof
f4771da597 Merge branch 'kts' into 'master' 
scanner: scan gradle.kts

See merge request fdroid/fdroidserver!1119
 2022-05-06 19:21:51 +00:00
linsui
90bc8e1e8f scan gradle.kts 2022-05-07 00:43:55 +08:00
Jochen Sprickerhof
0aca165b4e Merge branch 'nonfreelib' into 'master' 
scanner: add more nonfree libs

See merge request fdroid/fdroidserver!1116
 2022-05-06 10:38:37 +00:00
linsui
4f04bd9200 Update scanner.py 2022-05-05 03:39:49 +00:00
Jochen Sprickerhof
7fabbc9cad Merge branch 'gitlab-ci-fix-job-post-dexdump' into 'master' 
gitlab-ci: fix debian_testing and ubuntu_lts_ppa jobs

See merge request fdroid/fdroidserver!1115
 2022-05-04 15:05:26 +00:00
Hans-Christoph Steiner
cea192b9fb
gitlab-ci: fix debian_testing and ubuntu_lts_ppa jobs 
!1110
These setups did not have dexdump at all.
 2022-05-03 22:05:39 +02:00
Hans-Christoph Steiner
1ae6e4e254 Merge branch 'dexdump_nooutput' into 'master' 
Silence dexdump output in build --verbose

See merge request fdroid/fdroidserver!1114
 2022-05-03 17:57:43 +00:00
Jochen Sprickerhof
50e680be93 Silence dexdump output in build --verbose 2022-05-03 18:30:02 +02:00
Hans-Christoph Steiner
6318bf0f5d Merge branch 'scanner_dexdump' into 'master' 
[scanner] replace apkanalyzer by dexdump

See merge request fdroid/fdroidserver!1110
 2022-05-03 15:18:21 +00:00
Jochen Sprickerhof
c80fdd5ce8 Handle BadZipFile 2022-05-03 14:59:52 +00:00
Jochen Sprickerhof
925cdbe542 Improve recursion warning, thx Hans! 2022-05-03 14:59:52 +00:00
Jochen Sprickerhof
94ccd022c4 Add apk.embedded_1.apk test 2022-05-03 14:59:52 +00:00
Jochen Sprickerhof
9eaab6050e Fix variable name 2022-05-03 14:59:52 +00:00
Jochen Sprickerhof
91320fa10e Rework code 2022-05-03 14:59:52 +00:00