1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 22:40:12 +01:00
Commit Graph

5026 Commits

Author SHA1 Message Date
Hans-Christoph Steiner
9f553186e8 gitlab-ci: switch debian_testing to use androguard 2018-02-20 16:30:06 +01:00
Hans-Christoph Steiner
008110889a update: fix crash from missing file extension in extracted icon
I missed this in 40fac10ebc, yay tests!
2018-02-20 16:29:52 +01:00
Hans-Christoph Steiner
c679b5b144 Merge branch 'use-androguard-first' into 'master'
use androguard first

Closes #236

See merge request fdroid/fdroidserver!465
2018-02-19 18:53:42 +00:00
Hans-Christoph Steiner
44ebf701e1 Merge branch 'support-xml-icons' into 'master'
Support XML icons

Closes #392

See merge request fdroid/fdroidserver!464
2018-02-19 16:58:28 +00:00
Hans-Christoph Steiner
d1ded7f64d update: use androguard by default if it is available
closes #236
2018-02-15 14:28:48 +01:00
Hans-Christoph Steiner
40fac10ebc update: extract and store XML icons
These can then be used by the client.

#344
#392
2018-02-15 14:28:45 +01:00
Hans-Christoph Steiner
5281228ea5 update: switch to new androguard v3.1 API based on lxml
apkobject.get_android_manifest_xml() used to return a xml.dom.minidom
object, now it returns an lxml.etree.Element object.
2018-02-15 14:28:45 +01:00
Hans-Christoph Steiner
5713b54e0b update: find alternate PNGs for apps that have an XML app icon
Apps can now use an XML icon, but if the app supports older Android
versions, it'll also contain PNG versions of the same icon.  This finds
those PNGs and uses them instead.

#344
closes #392
fdroiddata#913
2018-02-15 14:28:45 +01:00
Hans-Christoph Steiner
699b3e4c69 update: fix min/target/max edge case parsing with androguard
In order to test that aapt defaults minSdkVersion to 3, I ran this script
then compared the output with meld:

cd $ANDROID_HOME/build-tools
for d in *.*; do echo $d; $ANDROID_HOME/build-tools/$d/aapt dump badging /home/hans/code/fdroid/server/tests/repo/com.politedroid_3.apk > /tmp/${d}.txt; done
meld /tmp/17.0.0.txt /tmp/26.0.2.txt /tmp/27.0.3.txt
2018-02-15 14:28:45 +01:00
Marcus
e6208da7ca Merge branch 'fix-excessive-ndk' into 'master'
makebuildserver: do not provision excessive NDKs

See merge request fdroid/fdroidserver!463
2018-02-14 23:54:00 +00:00
Marcus
997289d9ca Merge branch 'fdroid-deploy' into 'master'
rename `fdroid server` to `fdroid deploy` and deprecate 'init'

Closes #264

See merge request fdroid/fdroidserver!462
2018-02-14 21:51:11 +00:00
relan
2c0e430a2d makebuildserver: do not provision excessive NDKs
When a new minor version of an NDK is released, it replaces an older one,
e.g. r16 with r16b (see commit 6f295cb). But old NDK package remains in
the cache and provisioning script unpacks it too as it matches the mask.

Fix NDK provisioning to unzip only while-listed versions.
2018-02-14 09:11:40 +03:00
Hans-Christoph Steiner
1725e09f7e rename fdroid server to fdroid deploy and deprecate 'init'
`fdroid server init` is has not been needed for a long time.  And 'server'
is the only subcommand that has its own subsubcommands.  This turns it into
only `fdroid deploy`, which does what `fdroid server update` does. This
also changes the bash completion to use `fdroid deploy`.  But the old
`fdroid server update` and `fdroid server init` commands remain working.

closes #264
2018-02-13 12:54:48 +01:00
Hans-Christoph Steiner
bffa6a73be Translated using Weblate (Tibetan)
Currently translated at 87.6% (397 of 453 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/bo/

fix all errors in Weblate
2018-02-13 09:41:15 +01:00
Hans-Christoph Steiner
3a7abcfe66 Translated using Weblate (Tibetan)
Currently translated at 87.6% (397 of 453 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/bo/
2018-02-13 09:34:33 +01:00
Hans-Christoph Steiner
dbb6fe6af5 fix format string issues in Tibetan 2018-02-13 09:22:57 +01:00
Hans-Christoph Steiner
483b0289e9 switch gettext translation files to po-unwrapped format
Weblate, gettext, and Python-Babel all seem to have slightly different
wrapping rules.  This leads to lots of annoying diffs and git merge
conflicts.  So just don't wrap at all! :-D
2018-02-13 09:17:28 +01:00
Hans-Christoph Steiner
d7af22b48e Weblate (closes !461)
Squashed commit of the following:

commit ecf5d51455
Author: Tobias_Groza <tobias.groza@outlook.de>
Date:   Fri Feb 9 15:45:56 2018 +0000

    Translated using Weblate (German)

    Currently translated at 45.3% (180 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 8e88ed041a
Author: Takumi Shoji <azumukupoe1999@gmail.com>
Date:   Wed Feb 7 13:31:22 2018 +0000

    Added translation using Weblate (Japanese)

commit 1cb941084b
Author: Марс Ямбар <mjambarmeta@gmail.com>
Date:   Sun Feb 4 11:31:42 2018 +0000

    Translated using Weblate (Ukrainian)

    Currently translated at 42.4% (169 of 398 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/uk/

commit 765b98f46f
Author: anonymous <>
Date:   Sun Feb 4 09:24:22 2018 +0000

    Translated using Weblate (German)

    Currently translated at 43.0% (171 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 9cadc4463a
Author: Follpvosten <wolfi@karpador.xyz>
Date:   Sun Feb 4 09:24:10 2018 +0000

    Translated using Weblate (German)

    Currently translated at 42.8% (170 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 50065b4e35
Author: anonymous <>
Date:   Sun Feb 4 09:22:12 2018 +0000

    Translated using Weblate (German)

    Currently translated at 42.5% (169 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 8a752cdd9d
Author: ezjerry liao <ezjerry@gmail.com>
Date:   Fri Feb 2 08:56:38 2018 +0000

    Translated using Weblate (Chinese (Traditional))

    Currently translated at 100.0% (397 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/

commit dd63360aae
Author: Andreas Kleinert <Andy.Kleinert@gmail.com>
Date:   Thu Feb 1 18:53:17 2018 +0000

    Translated using Weblate (German)

    Currently translated at 41.0% (163 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 51b8b24f54
Author: anonymous <>
Date:   Thu Feb 1 18:48:47 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.7% (158 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 41c9716d20
Author: Andreas Kleinert <Andy.Kleinert@gmail.com>
Date:   Thu Feb 1 18:47:31 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.5% (157 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 50cc7dba10
Author: anonymous <>
Date:   Thu Feb 1 18:45:21 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.5% (157 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 4ac4c4d829
Author: Andreas Kleinert <Andy.Kleinert@gmail.com>
Date:   Thu Feb 1 18:45:08 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.5% (157 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 95fe106077
Author: anonymous <>
Date:   Thu Feb 1 18:44:58 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.5% (157 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 1b08bc809e
Author: Andreas Kleinert <Andy.Kleinert@gmail.com>
Date:   Thu Feb 1 18:44:08 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.5% (157 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 96e9647bde
Author: anonymous <>
Date:   Thu Feb 1 18:41:24 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.5% (157 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit fe2b29d432
Author: Andreas Kleinert <Andy.Kleinert@gmail.com>
Date:   Thu Feb 1 18:40:49 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.5% (157 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 7c7877eded
Author: Luca D'Amico <damico.luca91@live.it>
Date:   Mon Jan 29 16:54:49 2018 +0000

    Translated using Weblate (Italian)

    Currently translated at 36.2% (144 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/it/

commit 51a301b206
Author: anonymous <>
Date:   Sun Jan 28 22:10:11 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.5% (157 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 8956165544
Author: dadnal <liberapay-weblate@com.beintner.de>
Date:   Sun Jan 28 22:09:42 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.2% (156 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit f9ef03ddc3
Author: anonymous <>
Date:   Sun Jan 28 22:09:32 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.2% (156 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit d26423fb9a
Author: dadnal <liberapay-weblate@com.beintner.de>
Date:   Sun Jan 28 22:09:20 2018 +0000

    Translated using Weblate (German)

    Currently translated at 39.0% (155 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 4b2f03f310
Author: anonymous <>
Date:   Sun Jan 28 22:08:41 2018 +0000

    Translated using Weblate (German)

    Currently translated at 38.7% (154 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit c13c602ae6
Author: dadnal <liberapay-weblate@com.beintner.de>
Date:   Sun Jan 28 22:08:06 2018 +0000

    Translated using Weblate (German)

    Currently translated at 38.5% (153 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 195dddd89a
Author: anonymous <>
Date:   Sun Jan 28 22:07:22 2018 +0000

    Translated using Weblate (German)

    Currently translated at 38.5% (153 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit e44c705053
Author: dadnal <liberapay-weblate@com.beintner.de>
Date:   Sun Jan 28 22:06:51 2018 +0000

    Translated using Weblate (German)

    Currently translated at 38.2% (152 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 02a6882ea2
Author: anonymous <>
Date:   Sun Jan 28 22:05:31 2018 +0000

    Translated using Weblate (German)

    Currently translated at 37.7% (150 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 68b8c4bc06
Author: dadnal <liberapay-weblate@com.beintner.de>
Date:   Sun Jan 28 22:05:17 2018 +0000

    Translated using Weblate (German)

    Currently translated at 37.5% (149 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/

commit 40810ad9f9
Author: Alireza A. A <alir425p@gmail.com>
Date:   Thu Jan 18 17:22:49 2018 +0000

    Translated using Weblate (Persian)

    Currently translated at 0.2% (1 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/fa/

commit f1c8192d0e
Author: ezjerry liao <ezjerry@gmail.com>
Date:   Mon Jan 22 09:04:22 2018 +0000

    Translated using Weblate (Chinese (Traditional))

    Currently translated at 100.0% (397 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/

commit e92e8664f9
Author: Jeff Huang <s8321414@gmail.com>
Date:   Tue Jan 16 02:37:32 2018 +0000

    Translated using Weblate (Chinese (Traditional))

    Currently translated at 100.0% (397 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/

commit e09a832dd0
Author: jxt <chihsun.tsai@gmail.com>
Date:   Mon Jan 15 00:38:41 2018 +0000

    Translated using Weblate (Chinese (Traditional))

    Currently translated at 100.0% (397 of 397 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/

commit b22859288f
Author: monolifed <monolifed@gmail.com>
Date:   Sat Jan 6 23:24:19 2018 +0000

    Translated using Weblate (Turkish)

    Currently translated at 37.4% (149 of 398 strings)

    Translation: F-Droid/F-Droid Server
    Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/tr/
2018-02-13 08:53:05 +01:00
Hans-Christoph Steiner
1f99a27a9c Revert "wiki: include per-app link to all related activity on gitlab.com"
This reverts commit a57f17b276.

Turns out this was totally useless, this can be fully handled in
https://f-droid.org/wiki/page/Template:App since it already has the
Application ID there.
2018-02-12 12:15:56 +01:00
Hans-Christoph Steiner
d8679c3cad Merge branch 'git-svn-improvements' into 'master'
git-svn improvements

See merge request fdroid/fdroidserver!453
2018-02-12 11:18:02 +00:00
Hans-Christoph Steiner
1626655879 Merge branch 'import-for-issuebot' into 'master'
`fdroid import` fixes for issuebot

See merge request fdroid/fdroidserver!452
2018-02-12 11:08:55 +00:00
Hans-Christoph Steiner
dc26e7f79f git-svn: check HTTPS connection with Python Requests
git-svn will put up the "Reject/Accept" prompt if it encounters a bad HTTPS
certificate.  I could find no way to stop it from doing that.  So instead,
this checks the HTTPS connection with an HTTP HEAD request first.
2018-02-12 12:07:24 +01:00
Hans-Christoph Steiner
a1075f45cc git-svn: require working HTTPS for all Subversion URLs
Subversion does not verify each commit as strongly as git does, so HTTPS is
really important.  Also, there is the possibility of injecting code into
`fdroid checkupdate` calls if plain HTTP is used.
2018-02-12 12:07:24 +01:00
Hans-Christoph Steiner
dd93ee6c9b git: use /bin/true for 'askpass' to prevent all password prompts
This uses both the env vars and the command line options to ensure
that it works with as many versions of git as possible.  Also, git-svn
uses the env vars, but not necessarily the command line options.

This uses /bin/true to pretend that it succesfully got the password.
If password auth is truly required, then it will fail further on down
the line.
2018-02-12 12:07:24 +01:00
Hans-Christoph Steiner
574fa15fce git: make explicit that git configs are calling cmd line utilities
These are not boolean values, but command line utilities which return a
guaranteed exit status.
2018-02-12 12:07:24 +01:00
Hans-Christoph Steiner
c67ed5e85f git-svn: use '--' to isolate user input in command lines 2018-02-12 12:07:24 +01:00
Hans-Christoph Steiner
62db94d96e Merge branch 'build-36h' into 'master'
build: set overall timeout to 36 hours

See merge request fdroid/fdroidserver!460
2018-02-12 11:06:34 +00:00
Hans-Christoph Steiner
a40b79eb9d import: fix crash when importing from local git repo 2018-02-12 12:05:27 +01:00
Hans-Christoph Steiner
559adb207b import: get build dir from settings.gradle
Most projects set a single build dir in settings.gradle, so its worth
trying here.
2018-02-12 12:05:27 +01:00
Hans-Christoph Steiner
64938d9104 import: switch to .yml as default metadata format 2018-02-12 12:05:27 +01:00
Hans-Christoph Steiner
d4e64bda4c Merge branch 'timeout_flag' into 'master'
build: clear timeout flag before every build

See merge request fdroid/fdroidserver!455
2018-02-12 12:01:46 +01:00
Hans-Christoph Steiner
2238b5cafd Merge branch 'metadata-write-int' into 'master'
metadata: write values of TYPE_INT fields

See merge request fdroid/fdroidserver!456
2018-02-12 10:57:38 +00:00
Hans-Christoph Steiner
ef9b89f4ec Merge branch 'remove-ndk-r9b' into 'master'
makebuildserver: remove NDK r9b to save 1.6 GB of disk space

See merge request fdroid/fdroidserver!459
2018-02-12 10:55:02 +00:00
Hans-Christoph Steiner
8326e62235 Merge branch 'ndk-r16b' into 'master'
makebuildserver: upgrade NDK r16 to r16b

See merge request fdroid/fdroidserver!458
2018-02-12 10:54:31 +00:00
Hans-Christoph Steiner
9ba9c6cc3d Merge branch 'gradle-4.5.1' into 'master'
makebuildserver: add Gradle 4.5.1

See merge request fdroid/fdroidserver!457
2018-02-12 10:54:06 +00:00
relan
c0f323e343 build: set overall timeout to 36 hours
Currently f-droid.org has a lot of pending builds and big delays
between "fdroid build --all" runs. Bump overall build time limit from
12 hours to 36 hours to increase buildserver throughput.
2018-02-12 13:45:53 +03:00
relan
76da21f121 makebuildserver: remove NDK r9b to save 1.6 GB of disk space
NDK r9b is used by only one app (net.gorry.android.input.nicownng) that
was last updated in 2015.
2018-02-12 09:16:55 +03:00
relan
6f295cb3d3 makebuildserver: upgrade NDK r16 to r16b 2018-02-11 10:20:42 +03:00
relan
5387fe85a7 makebuildserver: add Gradle 4.5.1 2018-02-11 10:08:06 +03:00
relan
4d56c6c262 metadata: write values of TYPE_INT fields
Otherwise we end up with empty values after "fdroid rewritemeta".
2018-02-11 09:51:53 +03:00
Marcus Hoffmann
39a5637df2
build: clear timeout flag before every build
This fixes the weird logging behaviour where after a build that timed
out all subsequent failed builds would also show up as timed out.
2018-02-07 20:47:50 +01:00
Hans-Christoph Steiner
bc5bf7e0ec Merge branch 'translation-app-field' into 'master'
metadata: add new Translation app field for URL for contributions

See merge request fdroid/fdroidserver!450
2018-02-05 15:16:43 +00:00
Hans-Christoph Steiner
eac391c58f Merge branch 'popen-stdin-devnull' into 'master'
common: use /dev/null as stdin when calling subprocess.Popen()

See merge request fdroid/fdroidserver!451
2018-02-05 14:46:08 +00:00
Hans-Christoph Steiner
05eef5a454 metadata: add new Translation app field for URL for contributions
This is a field requested from a bunch of translators so they can easily
find where to translate apps:
https://forum.f-droid.org/t/translation-field-for-app-entries/1403/5
2018-02-05 15:45:12 +01:00
relan
946a1461f2 common: use /dev/null as stdin when calling subprocess.Popen()
We always want to run all utilities non-interactively. By default
subprocess.Popen() inherits stdin descriptor from parent process, i.e.
when fdroid is run from an interactive shell, subprocesses may expect
input from it.

Reading from /dev/null immediately returns EOF, failing any user prompt
and preventing us from hang.
2018-02-05 15:34:42 +03:00
Hans-Christoph Steiner
5db86215f6 lint: check srclibs has name and @ in it
fdroiddata!2863
2018-01-31 13:33:36 +01:00
Hans-Christoph Steiner
4b0f9d6653 Merge branch 'master' into 'master'
Option --resetserver does nothing; have it used instead

See merge request fdroid/fdroidserver!449
2018-01-31 10:01:18 +00:00
csagan5
427427481e Change --resetserver to --reset-server for consistency 2018-01-30 20:45:03 +01:00
csagan5
cf54c9514c Option --resetserver does nothing; have it used instead 2018-01-30 14:50:35 +01:00
Hans-Christoph Steiner
adaf97a3cb Merge branch 'build-timeout-customization' into 'master'
build: make per-build hard time limit customizable

See merge request fdroid/fdroidserver!446
2018-01-30 11:22:08 +01:00