kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 21:30:10 +01:00
Code Activity
6,120 Commits 1 Branch 59 Tags 44 MiB
41ea5eba15
Commit Graph

6120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans-Christoph Steiner
f8a1b45df5 gradlew-fdroid: fix random failures due to empty $line, closes #815 2020-08-19 16:28:58 +02:00
Hans-Christoph Steiner
6258a939e6 Merge branch 'smartcard_hsm' into 'master' 
switch publish to common.sign_apk and support smartcard HSMs for app signing

See merge request fdroid/fdroidserver!782
 2020-08-17 10:09:35 +00:00
Marcus Hoffmann
a8e9653b96 update: make --create-key work with a HSM 2020-08-14 17:27:58 +02:00
Marcus Hoffmann
004d13a48a make publish and update work with a smartcard HSM 
Followup to fdroid/fdroidserver!779.

We need to add smartcardoptions to every call to keytool and jarsigner
as well as handle when keypass not being required and not allowed for
pkcs11 keystores.
 2020-08-14 17:27:58 +02:00
Marcus Hoffmann
066978cbcf publish: use common signing method 
This is currently still jarsigner based but will at least use sha256
when possible
 2020-08-14 15:07:04 +02:00
Marcus Hoffmann
6128f93d26 publish: keystore "NONE" is a special case and doesn't need to exist 2020-08-14 15:06:33 +02:00
Marcus
11236deec6 Merge branch 'patch-1' into 'master' 
Spelling: Deploy key, stripping, SSH

See merge request fdroid/fdroidserver!781
 2020-08-13 15:03:42 +00:00
Marcus
a997ad7b84 Merge branch 'smartcard-hsm-fixes' into 'master' 
Smart Card HSM fixes

See merge request fdroid/fdroidserver!779
 2020-08-13 15:02:04 +00:00
Marcus Hoffmann
c3c6a20b7c gradlew-fdroid: fix typo 6.5 -> 6.6 2020-08-11 19:04:19 +02:00
Marcus Hoffmann
d3e8766a3c add gradle 6.6 2020-08-11 09:13:20 +02:00
Marcus
b3fb632846 Merge branch 'platform29-05' into 'master' 
Add platform-29_r05

See merge request fdroid/fdroidserver!780
 2020-08-11 07:09:20 +00:00
Allan Nordhøy
df7bc77465 Spelling: Deploy key, stripping, SSH 2020-08-10 10:53:23 +00:00
TacoTheDank
7c44669501 Add platform-29_r05 2020-08-09 20:06:30 -04:00
Hans-Christoph Steiner
226f490c52 declare LICENSE file in setup.cfg 2020-08-07 15:30:33 +02:00
Hans-Christoph Steiner
f779ce276a 'keypass' is not required in config if using a HSM 2020-08-07 15:30:33 +02:00
Hans-Christoph Steiner
d213c8b37c update: validate smartcardoptions when using a HSM for the keystore 2020-08-07 15:30:33 +02:00
Hans-Christoph Steiner
7dcf4f5680 index: smartcardoptions is a list or tuple, but only lists can be added 2020-08-07 15:30:33 +02:00
Hans-Christoph Steiner
54257f8f6a init: generate opensc-fdroid.cfg rather than copying from examples 
This file is so simple, it is better to skip the complexity of trying to
find the installed examples folder, especially when considering Windows and
macOS, with their odd paths.
 2020-08-07 15:30:33 +02:00
Hans-Christoph Steiner
838eee355f Merge branch 'import-kivy' into 'master' 
import kivy and two fixes

See merge request fdroid/fdroidserver!778
 2020-08-07 11:09:12 +00:00
Hans-Christoph Steiner
a6c60a908a import: add support for kivy buildozer projects 2020-08-07 12:48:15 +02:00
Hans-Christoph Steiner
960d31af2a import: standardize on 'appid' var name for Application ID 
The rest of the fdroidserver code uses 'appid' or 'packageName'.  The official
Android name is "Application ID".  "Package Name" is the Java term, and it
is used in Android in Java code.
 2020-07-30 14:57:19 +02:00
Hans-Christoph Steiner
2858c73b87 gradlew-fdroid: more robust method for handling Windows linefeeds 
The bash pattern matching was getting confused by the Windows linefeeds,
this strips them before the string hits the bash pattern tricks.

* https://github.com/premnirmal/StockTicker/issues/145
 2020-07-30 14:57:19 +02:00
Hans-Christoph Steiner
10fa912c16 deploy: remove git remotes not enabled in servergitmirrors 
If the repo operator removes an item from servergitmirrors, it should auto-
matically remove the remote.
 2020-07-30 14:57:19 +02:00
Hans-Christoph Steiner
5d28eec115 Merge branch 'buster-basebox-checksums' into 'master' 
add checksums for basebox-buster64 0.6.0

See merge request fdroid/fdroidserver!777
 2020-07-22 11:31:05 +00:00
Michael Pöhn
d4296fdf3b add official checksums for basebox-buster64 0.6.0 2020-07-22 13:09:26 +02:00
Marcus
9c072690eb Merge branch 'buildtools3001' into 'master' 
Add buildTools 30.0.1 and platform-29_r04

See merge request fdroid/fdroidserver!776
 2020-07-18 23:43:53 +00:00
TacoTheDank
3de9e46702 Add platform-29_r04 2020-07-18 19:22:50 -04:00
TacoTheDank
cfed640adc Add buildTools 30.0.1 2020-07-18 19:17:42 -04:00
Marcus
f5a32aa69e Merge branch 'add_gradle_651' into 'master' 
Add gradle 6.5.1

See merge request fdroid/fdroidserver!775
 2020-07-13 18:44:14 +00:00
Hans-Christoph Steiner
c8b0e9d509 Merge branch 'log_timestamp' into 'master' 
Add timstamp to logs

See merge request fdroid/fdroidserver!774
 2020-07-07 15:12:13 +00:00
xynngh
393f08ff25 Add gradle 6.5.1 2020-07-07 14:02:56 +04:00
Jochen Sprickerhof
d8b73dd241 Add timstamp to logs 2020-07-04 18:56:10 +02:00
Hans-Christoph Steiner
174bbf0bdc
jenkins-setup-build-environment: fix my stoopid typo 2020-06-29 09:56:37 +02:00
Hans-Christoph Steiner
e659a5353d
provision-apt-get-install: gpg needs to come from stretch-backports 
https://gitlab.com/eighthave/fdroiddata/-/jobs/611438997
Otherwise it fails to install:

```
  gpg : Depends: gpgconf (= 2.2.20-1~bpo9+1)
        Depends: libassuan0 (>= 2.5.0) but 2.4.3-2 is to be installed
        Depends: libgpg-error0 (>= 1.35) but 1.26-2 is to be installed
```

* 7e8c244473
* !769
 2020-06-25 18:08:31 +02:00
Hans-Christoph Steiner
f70a4e11dd
jenkins-setup-build-environment: --skip-scan on old builds 
The scanner has gotten stricter: !758

[skip ci] since this only affects jenkins.debian.net
 2020-06-25 11:53:29 +02:00
Marcus
1902bfb6fc Merge branch 'fix_760' into 'master' 
update.py (and index.py) refactoring

Closes #524 and #760

See merge request fdroid/fdroidserver!756
 2020-06-24 22:37:51 +00:00
Marcus Hoffmann
3ebc44c54f fix tests after they switched to yaml 2020-06-25 00:07:42 +02:00
Marcus Hoffmann
07caa88920 don't include the localized metadata things for /archive 
We haven't done this so far and it's a potential big change in archive
size and update performance.
 2020-06-25 00:07:42 +02:00
Marcus Hoffmann
d720c99ae5 refactor update.py:main 
This makes update.py:main a lot saner by removing a lot of the
implicit assumptions between the different stages of generating the
repository index.

* mostly unify repo and archive processing, that means the archive is
  now actually getting the same treatment regarding i.e. fastlane data.
  Previously the archive didn't get considered at all here.
* already filter the list of apps to include in a repo in update.py and
  give that prefiltered list to index. This makes sure we actually only
  copy fastlane/triple-t/etc. stuff for apps ending up in the index.
  This both, can save a lot of time if there are a lot of old /build
  dirs lying around and doesn't clutter /repo with things that aren't
  referenced from the index.

Closes fdroid/fdroidserver#524
 2020-06-24 23:53:36 +02:00
Marcus Hoffmann
e66683720b move index sorting to index module 
This is a historic detail of the index format, so move it there.
For wiki update and status json there's really no reason why this should
be done in alphabetic app name order. Use the default sort order by
appid.
 2020-06-24 23:53:36 +02:00
Marcus Hoffmann
8c71637d43 update: make copy_triple_t_store_metadata and insert_localized_app_metadata not assume /repo 
This will enable copying the localized metadata to the archive as well.
 2020-06-24 23:53:36 +02:00
Marcus Hoffmann
ee4ee85cbd update:archive_old_apks: handle apps with no CVC 
If an app doesn't have a CVC, we can just skip any special archive
handling.
Also rename weirdly named `res` to `apkList`.
 2020-06-24 23:53:36 +02:00
Marcus Hoffmann
ee162d9e62 gitignore tests/repo/status 2020-06-24 23:53:35 +02:00
Marcus Hoffmann
03881154c6 metadata: make linkresolver an actual object 
Previously this was magically capturing the apps dict when passing it around as a
function. This also moved the code to the metadata module.

Add a test doing read_metadata where the linkresolver is used. This
happens when the apps we read have a [[app.id]] link to another app.
 2020-06-24 23:53:35 +02:00
Marcus Hoffmann
a4177e5ec3 add test for correct whatsnew handling without CVC 2020-06-24 23:53:35 +02:00
Marcus
ed8c87950d Merge branch 'replacement-var-abs-path' into 'master' 
Replacement var abs path

Closes #725

See merge request fdroid/fdroidserver!770
 2020-06-24 21:01:35 +00:00
Hans-Christoph Steiner
5fce16c847
remove unused, confusing arg to common.getsrclib() 2020-06-24 22:40:27 +02:00
Hans-Christoph Steiner
d0f426e076
replace $$srclib$$ with an absolute path 
closes #725
 2020-06-24 22:40:26 +02:00
Marcus
b3f5176654 Merge branch 'fix-bugs' into 'master' 
Fix bugs

Closes #725

See merge request fdroid/fdroidserver!769
 2020-06-24 20:04:51 +00:00
Hans-Christoph Steiner
1e6f99988a fix typo when looking for build.gradle.kts 2020-06-24 21:43:58 +02:00