1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-05 23:10:12 +01:00
Commit Graph

6236 Commits

Author SHA1 Message Date
Michael Pöhn
5c3db9a7cc rewritemeta: overwrite existing metadata only if no exception occurred 2020-08-20 20:40:15 +02:00
Michael Pöhn
c45ef453fd remove SUPPORTED_FORMATS list from rewritemeta 2020-08-20 20:40:15 +02:00
Michael Pöhn
fac033314a fix a comment and a warning 2020-08-20 20:40:15 +02:00
Michael Pöhn
f5a5fffb10 purge accepted_formats from config 2020-08-20 20:40:15 +02:00
Michael Pöhn
40cbbd3173 update changelog: remove txt metadata support 2020-08-20 20:40:15 +02:00
Michael Pöhn
f8bc51399e remove txt from nightly default supported metadata formats 2020-08-20 20:40:15 +02:00
Michael Pöhn
4dc503ed28 remove txt form accepted format list 2020-08-20 20:40:15 +02:00
Michael Pöhn
fd2cfb0c7d remove code for copying txt srclibs to buildserver 2020-08-20 20:40:15 +02:00
Michael Pöhn
681a27546c fix linking to yml metadata in wiki 2020-08-20 20:40:15 +02:00
Michael Pöhn
cb368a674c remove txt srclib support 2020-08-20 20:40:15 +02:00
Michael Pöhn
c8f25c2652 remove txt metadata support 2020-08-20 20:40:15 +02:00
Michael Pöhn
2ec90bb490 remove support for rewriting to txt 2020-08-20 20:40:15 +02:00
Michael Pöhn
bc1398f594 remove json metadata support 2020-08-20 20:40:15 +02:00
Hans-Christoph Steiner
29eea3f739 Merge branch 'androguard_minsdk' into 'master'
common: use androguard to figure out minSDK version

Closes #816

See merge request fdroid/fdroidserver!785
2020-08-20 12:45:28 +00:00
Marcus Hoffmann
ba28b44ae7 common: use androguard to figure out minSDK version
Closes: #816
2020-08-19 19:49:39 +02:00
Marcus
89dac62b10 Merge branch 'fix-gradlew-fdroid' into 'master'
gradlew-fdroid: fix random failures due to empty $line, closes #815

Closes #815

See merge request fdroid/fdroidserver!784
2020-08-19 15:12:26 +00:00
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