chiark / gitweb /
Marcus Hoffmann [Tue, 12 Sep 2017 23:40:09 +0000 (01:40 +0200)]
checkupdates: fix google play check method
This has never worked with python3 and was also not properly adapted to
apps as objects. So we fix both of these issues.
Hans-Christoph Steiner [Tue, 12 Sep 2017 15:33:51 +0000 (15:33 +0000)]
Merge branch 'refuse-publishing-duplicate-apks' into 'master'
proper error message when publishing with the same app in repo and unsigned
See merge request !329
Hans-Christoph Steiner [Tue, 12 Sep 2017 15:29:29 +0000 (15:29 +0000)]
Merge branch 'warn_on_aar' into 'master'
scanner: warn on aar files
See merge request !332
Hans-Christoph Steiner [Mon, 11 Sep 2017 15:47:57 +0000 (15:47 +0000)]
Merge branch 'scanner_refactoring' into 'master'
Scanner refactoring
See merge request !330
Marcus Hoffmann [Sun, 3 Sep 2017 22:57:38 +0000 (00:57 +0200)]
scanner: warn on aar files
Marcus Hoffmann [Mon, 11 Sep 2017 14:46:54 +0000 (16:46 +0200)]
scanner: rename variables, use os.path.relpath
* rename fd -> path_in_build_dir
* rename fp -> filepath
* use os.path.reldir instead of string manipulation
Marcus Hoffmann [Mon, 4 Sep 2017 14:11:27 +0000 (16:11 +0200)]
scanner: more descriptive variable names from os.walk
This uses the names from python documentation of os.walk().
Michael Pöhn [Tue, 30 May 2017 12:53:54 +0000 (14:53 +0200)]
proper error message when publishing with the same app in repo and unsigned
Hans-Christoph Steiner [Thu, 7 Sep 2017 09:51:08 +0000 (09:51 +0000)]
Merge branch 'close-subprocess-file-handles' into 'master'
make sure file-streams of subprocesses get closed
See merge request !328
Hans-Christoph Steiner [Thu, 7 Sep 2017 09:49:51 +0000 (09:49 +0000)]
Merge branch 'close-subprocess-file-handles' into 'master'
make sure file-streams of subprocesses get closed
See merge request !328
Hans-Christoph Steiner [Thu, 7 Sep 2017 09:04:25 +0000 (09:04 +0000)]
Merge branch 'signatures-subcommand' into 'master'
signatures command
See merge request !327
Michael Pöhn [Thu, 7 Sep 2017 00:36:58 +0000 (02:36 +0200)]
make sure file-streams of subprocesses get closed
Michael Pöhn [Wed, 6 Sep 2017 13:54:16 +0000 (15:54 +0200)]
added signatures subcommand
Hans-Christoph Steiner [Tue, 5 Sep 2017 14:45:57 +0000 (14:45 +0000)]
Merge branch 'dont-list-fdroid-subcommands-in-random-order' into 'master'
don't list fdroid subcommands in random order
See merge request !326
Michael Pöhn [Mon, 4 Sep 2017 12:29:30 +0000 (14:29 +0200)]
dont list fdroid subcommands in random order
Marcus Hoffmann [Sun, 3 Sep 2017 17:30:00 +0000 (19:30 +0200)]
remove trailing whitespace
Marcus Hoffmann [Sun, 3 Sep 2017 16:33:03 +0000 (18:33 +0200)]
makebuildserver: add comment about not upgrading sdk-tools
Michael Pöhn [Fri, 1 Sep 2017 12:21:05 +0000 (12:21 +0000)]
Merge branch 'apk_output_location' into 'master'
handle gradle-plugin 3.0 output apk location
Closes #363
See merge request !321
Hans-Christoph Steiner [Thu, 31 Aug 2017 19:51:09 +0000 (19:51 +0000)]
Merge branch 'metadata_v0_test' into 'master'
bump fdroid version to test against to 0.8 remove legacy handling
See merge request !324
Marcus Hoffmann [Thu, 31 Aug 2017 18:36:07 +0000 (20:36 +0200)]
CI: bump fdroid version to test against to 0.8 remove legacy handling
Bump to latest released version, remove all handling of things that
changed in a backward incompatible way before.
Hans-Christoph Steiner [Thu, 31 Aug 2017 12:48:18 +0000 (12:48 +0000)]
Merge branch 'mr/update_docker-py' into 'master'
setup.py: unstick docker-py and requests dependencies
See merge request !318
Marcus Hoffmann [Mon, 28 Aug 2017 15:05:24 +0000 (15:05 +0000)]
Merge branch 'mr/verify_ca_certs_v2' into 'master'
makebuildserver: verify https all requests to avoid urllib3 warnings
See merge request !316
Marcus Hoffmann [Sun, 27 Aug 2017 22:40:49 +0000 (22:40 +0000)]
Merge branch 'revert-
af707cd1' into 'master'
Revert "setup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to support it"
See merge request !322
Marcus Hoffmann [Sun, 27 Aug 2017 22:07:49 +0000 (22:07 +0000)]
Revert "setup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to support it"
This reverts commit
af707cd1cb86ff8c3f8931adc0f874cd976cf391
Marcus Hoffmann [Sun, 27 Aug 2017 21:58:40 +0000 (21:58 +0000)]
setup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to support it
Latest pyasn1-modules hard codes pyasn1-0.3.2, so this currently break our tests.
Ref: https://github.com/etingof/pyasn1-modules/issues/4
Marcus Hoffmann [Sun, 27 Aug 2017 19:41:16 +0000 (19:41 +0000)]
Merge branch 'mr/update_platforms_tools' into 'master'
makebuildserver: update platform and build tool releases
See merge request !317
Marcus Hoffmann [Sat, 26 Aug 2017 15:03:13 +0000 (17:03 +0200)]
add comments to gradle output directories
Marcus Hoffmann [Sat, 26 Aug 2017 10:55:34 +0000 (12:55 +0200)]
handle gradle-plugin 3.0 output apk location
This commit adds support for new gradle plugin 3.0 output directories.
The new structure looks like this:
build/outputs/apk/<flavour1><Flavour2>/release/*.apk
Note the capitalization on the different flavour components.
So if we build a specific flavour combination we add this combination to
the path where we look for an output .apk.
Closes #363
Based on !320 by: Michel Le Bihan <michel@lebihan.pl>
Signed-off-by: Marcus Hoffmann <bubuiic@aol.com>
Michael Pöhn [Tue, 22 Aug 2017 16:46:07 +0000 (16:46 +0000)]
Merge branch 'local_metadata' into 'master'
metadata: also read .fdroid.txt metadata
Closes #364
See merge request !319
Marcus Hoffmann [Mon, 21 Aug 2017 22:03:43 +0000 (00:03 +0200)]
metadata: also read .fdroid.txt metadata
This is documented as working here:
https://f-droid.org/docs/Building_Applications/
(second to last paragraph)
fixes #364
Marcus Hoffmann [Wed, 16 Aug 2017 23:47:06 +0000 (01:47 +0200)]
setup.py: unstick docker-py and requests dependencies
docker-py 1.10.6 is the last version released under docker-py, after that it
will be just docker, but has breaking changes, see:
https://github.com/docker/docker-py/releases/tag/2.0.0
Update the list of allowed versions of requests to docker-py master.
Marcus Hoffmann [Wed, 16 Aug 2017 22:41:23 +0000 (00:41 +0200)]
makebuildserver: update platform and build tool releases
Update platform-25 to r03
Update platform-26 to r02
Add build-tools_r26.0.1
sha256 signatures locally computed after verifying the sha1 signature provided
by the repository2-1.xml file.
All these will be downloaded and installed in the buildserver through
provision-android-sdk anyway but this adds them to the cache.
Marcus Hoffmann [Wed, 16 Aug 2017 22:49:53 +0000 (00:49 +0200)]
makebuildserver: verify https all requests to avoid urllib3 warnings
According to http://docs.python-requests.org/en/master/user/advanced/#ca-certificates
python-requests >= 2.4.0 will use the certifi provided certificates.
We already recommend installing python3-certifi in the docs.
On debian requests is patched to use the system trust store instead.
Hans-Christoph Steiner [Tue, 15 Aug 2017 15:49:58 +0000 (15:49 +0000)]
Merge branch 'gradle-updates' into 'master'
makebuildserver: add Gradle 3.5.1, 4.0.1, 4.0.2 and 4.1
See merge request !313
Hans-Christoph Steiner [Tue, 15 Aug 2017 15:48:50 +0000 (15:48 +0000)]
Merge branch 'ndk-r15c' into 'master'
makebuildserver: upgrade NDK r15b to r15c
See merge request !314
relan [Mon, 7 Aug 2017 11:46:08 +0000 (14:46 +0300)]
makebuildserver: add Gradle 3.5.1, 4.0.1, 4.0.2 and 4.1
Android Gradle plugin 3.0.0 requires Gradle 4.1.
relan [Fri, 11 Aug 2017 07:19:40 +0000 (10:19 +0300)]
makebuildserver: upgrade NDK r15b to r15c
Hans-Christoph Steiner [Thu, 27 Jul 2017 01:21:28 +0000 (18:21 -0700)]
metadata: handle empty YAML files without crashing
!311
Hans-Christoph Steiner [Wed, 26 Jul 2017 22:34:13 +0000 (15:34 -0700)]
update: test metadata creation using internal and external templates
There is a hardcoded template in update.py, and there is also the
possibility for the user to create a template.yml. This tests both of them
and cleans up the related code a bit.
#352 !310
Hans-Christoph Steiner [Wed, 26 Jul 2017 13:38:47 +0000 (06:38 -0700)]
add missing comma in setup.py
Hans-Christoph Steiner [Wed, 26 Jul 2017 18:14:33 +0000 (18:14 +0000)]
Merge branch 'metadata' into 'master'
preserve order and formatting on creating Metadata from Yaml template (closes #352)
Closes #352
See merge request !310
Izzy [Wed, 26 Jul 2017 07:22:01 +0000 (09:22 +0200)]
preserve order and formatting on creating Metadata from Yaml template (closes #352)
Hans-Christoph Steiner [Wed, 19 Jul 2017 14:21:50 +0000 (16:21 +0200)]
Bump to 0.8
Hans-Christoph Steiner [Wed, 19 Jul 2017 14:12:06 +0000 (16:12 +0200)]
update pypi "classifiers"
Hans-Christoph Steiner [Wed, 19 Jul 2017 14:08:21 +0000 (16:08 +0200)]
update README to point to https://f-droid.org/docs
Hans-Christoph Steiner [Wed, 19 Jul 2017 14:03:50 +0000 (16:03 +0200)]
update file list in setup.py
Hans-Christoph Steiner [Wed, 26 Jul 2017 05:06:42 +0000 (05:06 +0000)]
Merge branch 'metadata' into 'master'
Updating syntax check for Flattr (see #284)
See merge request !309
Izzy [Thu, 20 Jul 2017 18:26:25 +0000 (20:26 +0200)]
Updating syntax check for Flattr (see #284)
Hans-Christoph Steiner [Thu, 20 Jul 2017 03:58:27 +0000 (03:58 +0000)]
Merge branch '0.8-fixes' into 'master'
0.8 fixes
Closes #325, #347, and #309
See merge request !304
Hans-Christoph Steiner [Wed, 19 Jul 2017 21:59:47 +0000 (23:59 +0200)]
Hans-Christoph Steiner [Wed, 19 Jul 2017 21:58:07 +0000 (23:58 +0200)]
include all test files in source tarball
Hans-Christoph Steiner [Wed, 19 Jul 2017 13:56:50 +0000 (15:56 +0200)]
gitlab-ci: filter new build fields in metadata_v0 test
Hans-Christoph Steiner [Wed, 19 Jul 2017 08:59:05 +0000 (10:59 +0200)]
update: always include name/summary/desc in index.xml if available
With the new localization support, the name/summary/description in the
metadata file becomes the global override. So most apps are not going to
have those fields present in their metadata file. This fixes the index.xml
generation to fall back to the localized versions of those fields when they
are not set in the metadata field.
https://forum.f-droid.org/t/what-has-happend-to-osmand
Hans-Christoph Steiner [Wed, 19 Jul 2017 07:56:28 +0000 (09:56 +0200)]
add new files to MANIFEST.in
They need to be there in order to be included in the source tarball.
Hans-Christoph Steiner [Wed, 19 Jul 2017 07:55:45 +0000 (09:55 +0200)]
wp-droid: move deprecated Wordpress plugin to its own repo
closes #325
Hans-Christoph Steiner [Mon, 17 Jul 2017 10:11:33 +0000 (12:11 +0200)]
verify: if downloading from /repo/ fails, try /archive/
The Builds entries in metadata/ files do not easily say whether a
given APK is in the repo/ or the archive/. So it should also try to
download the official APK from the archive/ when verifying.
Hans-Christoph Steiner [Sat, 15 Jul 2017 20:15:30 +0000 (20:15 +0000)]
keep .apk file ext when diffoscope'ing Binaries:
Hans-Christoph Steiner [Sat, 15 Jul 2017 21:42:29 +0000 (23:42 +0200)]
rewritemeta: only print file type if its changing
Hans-Christoph Steiner [Wed, 19 Jul 2017 11:02:06 +0000 (13:02 +0200)]
server: report errors pushing to git mirrors
This makes `fdroid server update` fail if pushing to one of the git mirrors
fails. This is what happens if the other methods fail, e.g. rsync or S3.
closes #347
Hans-Christoph Steiner [Wed, 19 Jul 2017 10:59:20 +0000 (12:59 +0200)]
server: include gitlab raw URLs as git mirrors
gitlab serves raw files from a CDN, so its appropriate to use the raw URL.
@pserwylo @grote and I discussed it and found a reference, but I can't find
that reference now.
Since the client will try the next mirror if one fails, it makes sense to
include both the gitlab raw and gitlab pages URLs to the mirror. The
gitlab pages deploy process is still a bit flaky anyway.
Hans-Christoph Steiner [Mon, 10 Jul 2017 15:13:26 +0000 (17:13 +0200)]
server: only rm git mirror if the git history is getting too large
git hosts like github, gitlab, bitbucket usually allow 1 gig repos. This
changes the git mirroring behavior to keep the history until the repo hits
1 gig. Keeping history makes updates a lot faster, since the whole repo
does not need to be pushed on each update.
Hans-Christoph Steiner [Sat, 8 Jul 2017 10:11:42 +0000 (12:11 +0200)]
update: force checkout .gitlab-ci.yml when updating git mirrors
closes #309
Hans-Christoph Steiner [Fri, 7 Jul 2017 15:52:53 +0000 (17:52 +0200)]
server: smooth out btlog transfer for offline signing setups
It turns out it is error prone to `git push` to a non-bare git repo. For
the offline signing machine, the git remote needs to be a regular git repo
in a directory on a thumbdrive so that once the thumbdrive is plugged into
an online machine, that git repo can be transferred to the online machine.
Hans-Christoph Steiner [Mon, 17 Jul 2017 06:33:02 +0000 (06:33 +0000)]
Merge branch 'xmlicons' into 'master'
have fallback for XML icons also consider res/mipmap*
See merge request !307
Izzy [Sun, 16 Jul 2017 22:54:33 +0000 (00:54 +0200)]
have fallback for XML icons also consider res/mipmap*
several apps (e.g.
[FastHub](http://apt.qumran.org/fdroid/index/apk/com.fastaccess.github)
and [Monety](http://apt.qumran.org/fdroid/index/apk/open.currency)) have
their ic_launcher.png files not in res/drawable*dpi/, but in
res/mipmap*/ -- so the regex has been adjusted by this patch.
Additionally: if the only icon for a given resolution was an XML without
existing fallback-PNG, it should be considered "non existent" (ie.
"empty_density").
Hans-Christoph Steiner [Sun, 16 Jul 2017 14:21:46 +0000 (14:21 +0000)]
Merge branch 'metadata' into 'master'
adding example metadata template (closes #345)
Closes #345
See merge request !306
Izzy [Sat, 15 Jul 2017 15:22:18 +0000 (17:22 +0200)]
using a "real category" as example
Izzy [Sat, 15 Jul 2017 14:52:08 +0000 (16:52 +0200)]
adding example metadata template (closes #345)
Hans-Christoph Steiner [Mon, 10 Jul 2017 09:08:45 +0000 (09:08 +0000)]
Merge branch 'metadata' into 'master'
--create-metadata: use yaml.dump() and (if exists) template.yml
See merge request !305
Izzy [Sat, 8 Jul 2017 12:41:19 +0000 (14:41 +0200)]
--create-metadata: only set default empty values if not using template.py
Izzy [Sat, 8 Jul 2017 12:21:49 +0000 (14:21 +0200)]
enable user to have presets for metadata by using a template.yml (see #345)
Izzy [Sat, 8 Jul 2017 12:07:11 +0000 (14:07 +0200)]
make --create-metadata use yaml.dump instead of ruamel (solves #345)
Hans-Christoph Steiner [Fri, 7 Jul 2017 13:50:11 +0000 (15:50 +0200)]
ensure that mirror URLs always include the repodir
Since the mirror URLs are per repo section (repo/archive), the mirror URLs
must include the repodir at the end. This was missing for servergitmirrors
found by @cde when working on fdroidclient#35
Hans-Christoph Steiner [Fri, 7 Jul 2017 11:02:32 +0000 (11:02 +0000)]
Merge branch 'master' into 'master'
Also search for apk in build/outputs/apk/release
See merge request !303
mimi89999 [Fri, 7 Jul 2017 10:21:09 +0000 (12:21 +0200)]
Also search for apk in build/outputs/apk/release
Hans-Christoph Steiner [Thu, 6 Jul 2017 22:49:26 +0000 (22:49 +0000)]
Merge branch 'metadata' into 'master'
--create-metadata: make sure apk[name] is not empty
See merge request !302
Izzy [Thu, 6 Jul 2017 22:18:08 +0000 (00:18 +0200)]
--create-metadata: make sure apk[name] is not empty
Hans-Christoph Steiner [Thu, 6 Jul 2017 21:53:31 +0000 (21:53 +0000)]
Merge branch 'sudo' into 'master'
add new 'sudo=' Build field
Closes #317
See merge request !297
Hans-Christoph Steiner [Wed, 28 Jun 2017 21:01:45 +0000 (23:01 +0200)]
support configing buildserver VM per-build with sudo=
This adds the 'sudo' build field, which is just a script that is run as
root. For more info, see the issue that this closes:
refs #318
closes #317
Michael Pöhn [Thu, 6 Jul 2017 15:29:19 +0000 (15:29 +0000)]
Merge branch 'yaml-template' into 'master'
update: remove ruamel requirement, and improve '--create-metadata'
Closes #343
See merge request !300
Hans-Christoph Steiner [Thu, 6 Jul 2017 09:24:55 +0000 (11:24 +0200)]
handle App instance with no Builds when writing YAML
Hans-Christoph Steiner [Thu, 6 Jul 2017 11:25:14 +0000 (13:25 +0200)]
update: update openssl KnownVuln scan to handle all recent versions
Thanks to @bubu for reporting!
Hans-Christoph Steiner [Thu, 6 Jul 2017 09:06:47 +0000 (11:06 +0200)]
update: remove ruamel requirement, and improve '--create-metadata'
If ruamel.yaml is not available, this will fallback to using PyYAML. This
also adds some blank fields to the newly created template to make it easy
for human editors to fill in.
closes #343
Hans-Christoph Steiner [Thu, 6 Jul 2017 11:29:36 +0000 (11:29 +0000)]
Merge branch 'some-data-related-fixed' into 'master'
support manually adding per-Build Anti-Features in metadata, and other fixes
Closes #322 and #331
See merge request !296
Hans-Christoph Steiner [Tue, 4 Jul 2017 15:40:02 +0000 (17:40 +0200)]
update: find PNG when recommended icon is an XML file
APKs can now use XML files for vector graphics like the app icon. `aapt`
returns the XML file by default, and perhaps also androguard. This
checks if the icon is an XML file, and if so, it tries to find a PNG in
the APK with the same name and density to use instead
closes #322
This should also ultimately make the XML file available as an icon source
as well fdroidclient#1091
Hans-Christoph Steiner [Tue, 4 Jul 2017 15:18:21 +0000 (17:18 +0200)]
update: normalize var name to apkzip
Hans-Christoph Steiner [Thu, 29 Jun 2017 14:00:16 +0000 (16:00 +0200)]
jenkins: document build/sign test flow
Hans-Christoph Steiner [Wed, 28 Jun 2017 14:55:34 +0000 (16:55 +0200)]
buildserver: support any recent NDK version, with stable filenames
Now that the download file name and type seems to have stabilized, I
think we no longer need to manually specify each new added release in
this script to unpack.
closes #331
Hans-Christoph Steiner [Tue, 27 Jun 2017 21:55:38 +0000 (23:55 +0200)]
support manually adding per-build antiFeatures in metadata
For cases like the OpenVPN vuln that was recently announced, it is useful
for fdroiddata maintainers to be able to mark builds that have known
vulnerabilities.
Michael Pöhn [Tue, 27 Jun 2017 20:46:19 +0000 (22:46 +0200)]
lint: check all build fields against accepted list
This makes sure there are no typoed or wrong build fields in all metadata
files.
Hans-Christoph Steiner [Thu, 6 Jul 2017 08:10:14 +0000 (08:10 +0000)]
Merge branch '343-ruamel-yaml-version-check' into 'master'
check version of ruamel.yaml and raise according error message
See merge request !301
Michael Pöhn [Thu, 6 Jul 2017 07:07:54 +0000 (09:07 +0200)]
check version of ruamel.yaml and raise according error message
Hans-Christoph Steiner [Wed, 5 Jul 2017 20:34:35 +0000 (20:34 +0000)]
Merge branch 'antifeature' into 'master'
added new AntiFeature: ApplicationDebuggable
See merge request !298
Hans-Christoph Steiner [Wed, 5 Jul 2017 20:31:23 +0000 (20:31 +0000)]
Merge branch 'metadata' into 'master'
create_metadata: do not skip APK files having no name
See merge request !299
Izzy [Wed, 5 Jul 2017 20:31:21 +0000 (20:31 +0000)]
create_metadata: do not skip APK files having no name
Izzy [Tue, 4 Jul 2017 19:15:04 +0000 (21:15 +0200)]
added new AntiFeature: ApplicationDebuggable
Useful e.g. for "test repositories" to indicate an app was compiled with
"application-debuggable"
Hans-Christoph Steiner [Tue, 4 Jul 2017 12:53:21 +0000 (14:53 +0200)]
gitlab-ci: remove hacks need to support Debian/jessie
Hans-Christoph Steiner [Tue, 4 Jul 2017 12:34:42 +0000 (14:34 +0200)]
Merge branch 'ndk' into 'master'
NDK r14b and r15b
See merge request !293
Hans-Christoph Steiner [Tue, 4 Jul 2017 12:24:17 +0000 (12:24 +0000)]
Merge branch '290-make-rewrite-metadata-respect-key-word-sort-order' into 'master'
Resolve "make `fdroid rewritemeta` respect key-word sort order for YAML files"
Closes #290
See merge request !295
Michael Pöhn [Tue, 4 Jul 2017 11:51:59 +0000 (11:51 +0000)]
Merge branch '290-make-rewrite-metadata-respect-key-word-sort-order' into 'master'
rewritemeta: respect key-word sort order for YAML files
Closes #290
See merge request !263