chiark / gitweb /
Ciaran Gultnieks [Sun, 11 Jan 2015 15:33:41 +0000 (15:33 +0000)]
Add option to not use rsync --checksum
Ciaran Gultnieks [Sun, 11 Jan 2015 15:26:15 +0000 (15:26 +0000)]
Documentation fix
Daniel Martí [Sun, 11 Jan 2015 13:24:45 +0000 (14:24 +0100)]
Complete missing server options
Daniel Martí [Sun, 11 Jan 2015 13:22:30 +0000 (14:22 +0100)]
scanner --nosvn was removed
Daniel Martí [Sun, 11 Jan 2015 13:21:22 +0000 (14:21 +0100)]
Complete update --nosign
Daniel Martí [Sun, 11 Jan 2015 13:19:31 +0000 (14:19 +0100)]
complete -h/--help for all commands implicitly
Daniel Martí [Sun, 11 Jan 2015 13:17:25 +0000 (14:17 +0100)]
Add bash-completion to pre-commit bash checks
Daniel Martí [Sun, 11 Jan 2015 13:16:57 +0000 (14:16 +0100)]
Add signindex to bash-completion
Ciaran Gultnieks [Sat, 10 Jan 2015 16:36:26 +0000 (16:36 +0000)]
Add fdroid signindex to sign previously unsigned indexes
Ciaran Gultnieks [Sat, 10 Jan 2015 16:35:12 +0000 (16:35 +0000)]
Add ability to not sign the indexes when doing fdroid update
Ciaran Gultnieks [Sat, 10 Jan 2015 15:44:16 +0000 (15:44 +0000)]
Allow repo pubkey to defined directly in config
Ciaran Gultnieks [Sat, 10 Jan 2015 15:15:23 +0000 (15:15 +0000)]
Extra debug logging when parsing manifests
Ciaran Gultnieks [Sat, 10 Jan 2015 15:15:01 +0000 (15:15 +0000)]
Sanitise tags at point of reading
Ciaran Gultnieks [Sat, 10 Jan 2015 15:13:38 +0000 (15:13 +0000)]
More detail for package ID mismatches
Daniel Martí [Sat, 10 Jan 2015 19:04:49 +0000 (20:04 +0100)]
fd-commit: read entire metadata files
Daniel Martí [Sat, 10 Jan 2015 12:49:54 +0000 (13:49 +0100)]
scanner: adapt to new scan_source format (fixes #59)
Daniel Martí [Fri, 9 Jan 2015 15:08:27 +0000 (16:08 +0100)]
pre-commit: differentiate sh and bash files
Daniel Martí [Fri, 9 Jan 2015 14:36:17 +0000 (15:36 +0100)]
hooks/pre-commit: Fix message
Daniel Martí [Tue, 6 Jan 2015 18:41:55 +0000 (19:41 +0100)]
Set up the ndk in $PATH before each build
Daniel Martí [Tue, 6 Jan 2015 13:40:31 +0000 (14:40 +0100)]
Don't allow --skip-scan if scandelete is set up
Daniel Martí [Tue, 6 Jan 2015 13:37:13 +0000 (14:37 +0100)]
Error if any scanignore/delete paths are useless
Daniel Martí [Tue, 6 Jan 2015 13:03:23 +0000 (14:03 +0100)]
Merge branch 'fix_build_exception' of https://gitlab.com/Rancor/fdroidserver
Rancor [Tue, 6 Jan 2015 11:37:34 +0000 (12:37 +0100)]
Removed second parameter in replace_config_vars call
Daniel Martí [Mon, 5 Jan 2015 12:07:22 +0000 (13:07 +0100)]
Properly capitalize all flavours (fixes org.ligi.fast)
Daniel Martí [Mon, 5 Jan 2015 11:59:33 +0000 (12:59 +0100)]
Gradle cleaner: support multilines with backslashes
Daniel Martí [Sun, 4 Jan 2015 23:29:27 +0000 (00:29 +0100)]
Fix build passing madness (closes #55)
Daniel Martí [Sun, 4 Jan 2015 19:52:27 +0000 (20:52 +0100)]
Remove trailing whitespace
Daniel Martí [Sun, 4 Jan 2015 19:51:56 +0000 (20:51 +0100)]
Merge branch 'fix_permission' of https://gitlab.com/Rancor/fdroidserver
Rancor [Sun, 4 Jan 2015 19:41:43 +0000 (20:41 +0100)]
Fixes #52 : Fix permission for executing android-ndk bin
Daniel Martí [Sun, 4 Jan 2015 19:41:22 +0000 (20:41 +0100)]
Never let build['ndk_path'] be None
Daniel Martí [Sun, 4 Jan 2015 03:26:24 +0000 (04:26 +0100)]
Add apis 20 and 21 to wp-fdroid's androidversion()
Daniel Martí [Sun, 4 Jan 2015 03:19:19 +0000 (04:19 +0100)]
Create the ndk_loc dir first (fixes #52)
Daniel Martí [Sun, 4 Jan 2015 00:45:52 +0000 (01:45 +0100)]
Don't crash if no suitable NDK is found
Daniel Martí [Fri, 2 Jan 2015 23:08:21 +0000 (00:08 +0100)]
Plaintext descriptions are no longer needed
Daniel Martí [Fri, 2 Jan 2015 23:02:54 +0000 (00:02 +0100)]
Add NDK r10d, this time alongside r9b
Specified per-build with ndk=<version> defaulting to the oldest, r9b.
Daniel Martí [Fri, 2 Jan 2015 21:26:22 +0000 (22:26 +0100)]
Don't run a global "gradle clean" which configures all projects
Also properly capitalize words for gradle tasks
Daniel Martí [Fri, 2 Jan 2015 21:19:24 +0000 (22:19 +0100)]
Bump to 0.3.0
Daniel Martí [Wed, 31 Dec 2014 16:18:19 +0000 (17:18 +0100)]
One remaining dump badging without output=False
Daniel Martí [Wed, 31 Dec 2014 15:42:26 +0000 (16:42 +0100)]
Apply some autopep8-python2 suggestions
Daniel Martí [Wed, 31 Dec 2014 15:34:11 +0000 (16:34 +0100)]
Make dump xmltree and dump badging silent again
Daniel Martí [Wed, 31 Dec 2014 12:29:03 +0000 (13:29 +0100)]
Fix gradleVersions without =
Ciaran Gultnieks [Tue, 30 Dec 2014 22:48:58 +0000 (22:48 +0000)]
Merge branch 'doc-update-v1' into 'master'
Update documentation re: testing32 image
Use different subsections for the Debian base box setup (which can be bypassed using the prebuilt image) and the F-Droid / SDK setup (which cannot be bypassed).
Side note: would it be possible to offer a torrent for testing32.box? The direct download is taking over 2 hours on a 50Mbps link.
See merge request !32
Daniel Martí [Tue, 30 Dec 2014 22:42:26 +0000 (23:42 +0100)]
Add nasm to the buildserver box (fixes: #51)
Daniel Martí [Tue, 23 Dec 2014 11:54:16 +0000 (12:54 +0100)]
Fix FDroidPopen refactor typo
Daniel Martí [Tue, 23 Dec 2014 11:24:07 +0000 (12:24 +0100)]
Catch new version of outputFile
Daniel Martí [Mon, 22 Dec 2014 17:18:07 +0000 (18:18 +0100)]
lint: warn (pedantic) about potentially dangerous auto updates
Daniel Martí [Mon, 22 Dec 2014 17:17:29 +0000 (18:17 +0100)]
lint: find the current build like checkupdates does
Kevin Cernekee [Sun, 21 Dec 2014 20:33:59 +0000 (12:33 -0800)]
manual: Clarify separation of Debian base box vs. F-Droid base box
Kevin Cernekee [Sun, 21 Dec 2014 19:02:47 +0000 (11:02 -0800)]
Update comment referring to old "raring32.box" image
Daniel Martí [Sun, 14 Dec 2014 14:43:22 +0000 (15:43 +0100)]
Don't break os.symlink if app names contain '/'
Daniel Martí [Sun, 14 Dec 2014 14:32:20 +0000 (15:32 +0100)]
Remove SilentPopen for consistency with SdkToolsPopen
Daniel Martí [Sun, 14 Dec 2014 14:18:30 +0000 (15:18 +0100)]
Merge branch 'master' of https://gitlab.com/eighthave/fdroidserver
Hans-Christoph Steiner [Tue, 9 Dec 2014 14:20:29 +0000 (15:20 +0100)]
do not set sdk_path in config.py if using system-provided aapt
By not setting sdk_path when /usr/bin/aapt is found, sdk_path then defaults
to $ANDROID_HOME when its used. Since in this case, aapt will be used from
the system path, using aapt entirely ignores sdk_path. If the user runs
`fdroid build` in this setup, sdk_path will be $ANDROID_HOME, so it should
check the env vars for it, but maybe that doesn't actually work like that
yet.
Hans-Christoph Steiner [Tue, 9 Dec 2014 14:15:36 +0000 (15:15 +0100)]
run all SDK tools commands using SdkToolsPopen
Hans-Christoph Steiner [Tue, 9 Dec 2014 13:12:41 +0000 (14:12 +0100)]
find cmds from SDK build-tools in a more flexible way, on the fly
This is a more flexible approach than testing for the complete SDK and
build-tools up front. This will only test for the commands that are
actually being run, so that if you only have `aapt` installed, you can do
`fdroid update` without errors, but other commands will still give
appropriate errors.
This also makes the build_tools item in config.py optional, it is only
needed if you want to force a specific version of the build-tools.
Hans-Christoph Steiner [Mon, 8 Dec 2014 21:55:14 +0000 (22:55 +0100)]
added test case for common.isApkDebuggable()
Just getting into the habit of adding tests to everything that I change...
Also, it should be useful to have an unsigned APK in the test collection,
since `fdroid update` should handle it gracefully and give a warning of
some kind.
Hans-Christoph Steiner [Mon, 8 Dec 2014 21:53:25 +0000 (22:53 +0100)]
switched last aapt call to use central config['aapt']
Hans-Christoph Steiner [Mon, 8 Dec 2014 21:02:17 +0000 (22:02 +0100)]
remove redundant test_sdk_exists() call, its called by test_build_tools_exists()
No need to call test_sdk_exists() before test_build_tools_exists() since
test_build_tools_exists() calls test_sdk_exists() as the first thing it
does.
Daniel Martí [Fri, 12 Dec 2014 11:57:12 +0000 (12:57 +0100)]
Bump build-tools again to 21.1.2
Daniel Martí [Fri, 12 Dec 2014 11:39:12 +0000 (12:39 +0100)]
Update build-tools to 21.1.1
Daniel Martí [Fri, 12 Dec 2014 11:39:04 +0000 (12:39 +0100)]
Update sdk to 24.0.1
Daniel Martí [Fri, 12 Dec 2014 11:34:28 +0000 (12:34 +0100)]
Add ruby tests to the pre-commit hook
Daniel Martí [Fri, 12 Dec 2014 11:29:16 +0000 (12:29 +0100)]
Add gradle 2.2.1 for plugin versions 1.0.X
Ciaran Gultnieks [Thu, 4 Dec 2014 11:38:02 +0000 (11:38 +0000)]
Add inkscape to buildserver
Daniel Martí [Mon, 17 Nov 2014 17:03:22 +0000 (17:03 +0000)]
Merge branch 'master' into 'master'
fix bugs in run-tests scripts
This fixes a couple of subtle bugs in `./run-tests` that only showed up recently.
See merge request !30
Hans-Christoph Steiner [Mon, 17 Nov 2014 16:40:48 +0000 (17:40 +0100)]
run-tests: properly handle zero and multiple args
The test for the help flag threw an error if there were 0 args, or if arg 1
was set to a space-separated list. The -z tests would fail if the arg was
set to a space-separated list.
Hans-Christoph Steiner [Mon, 17 Nov 2014 16:24:02 +0000 (17:24 +0100)]
run-tests: make sure not to include the bad APKs in tests/
These APKs are meant for specific tests, not the tests that want just a
collection of good APKs.
Ciaran Gultnieks [Mon, 17 Nov 2014 09:01:11 +0000 (09:01 +0000)]
Merge branch 'current-version-links' into 'master'
Current version links
This is the automatic generation of "current version" symlinks that @ciarang and I chatted about, and is discussed here: https://f-droid.org/forums/topic/static-urls-to-current-version-of-each-app/
See merge request !29
Daniel Martí [Sat, 15 Nov 2014 20:38:48 +0000 (21:38 +0100)]
Fix issue where the wrong gradle version may be used
Hans-Christoph Steiner [Sat, 11 Oct 2014 03:47:16 +0000 (23:47 -0400)]
server: always use same rsync destination path to allow for strict setups
for more info on how:
http://positon.org/rsync-command-restriction-over-ssh
http://ramblings.narrabilis.com/using-rsync-with-ssh
Hans-Christoph Steiner [Sat, 11 Oct 2014 03:50:27 +0000 (23:50 -0400)]
server: upload "current version" symlinks if requested
If `fdroid update` generates the "current version" symlinks, then
`fdroid server update` should upload them to the server.
Hans-Christoph Steiner [Sat, 11 Oct 2014 01:12:48 +0000 (21:12 -0400)]
remove url-unsafe characters from "current version" symlink names
This prevents the URL from having ugly %20 stuff in the app name.
Hans-Christoph Steiner [Sat, 11 Oct 2014 00:54:32 +0000 (20:54 -0400)]
when symlinking current version of app, include gpg sig if it exists
Let's make it easy for people to also find the GPG signature, and promote
easy verification!
Hans-Christoph Steiner [Sat, 11 Oct 2014 00:47:21 +0000 (20:47 -0400)]
static URLs to "Current Version" of each app
I wrote up the feature to automatically generate symlinks with a constant name
that points to the current release version. I have it on by default, with a
*config.py* option to turn it off. There is also an option to set where the
symlink name comes from which defaults to app['Name'] i.e. F-Droid.apk, but
can easily be set to app['id'], i.e. _org.fdroid.fdroid.apk_. I think the best
place for the symlinks is in the root of the repo, so like
https://f-droid.org/F-Droid.apk or https://guardianproject.info/fdroid/ChatSecure.apk
For the case of the current FDroid static link https://f-droid.org/FDroid.apk
it can just be a symlink to the generated one (https://f-droid.org/F-Droid.apk
or https://f-droid.org/org.fdroid.fdroid.apk). Right now, this feature is all
or nothing, meaning it generates symlinks for all apps in the repo, or none. I
can’t think of any problems that this might cause since its only symlinks, so
the amount of disk space is tiny. Also, I think it would be useful for having
an easy “Download this app” button on each app’s page on the “Browse” view. As
long as this button is less prominent than the “Download F-Droid” button, and
it is clear that it is better to use the FDroid app than doing direct
downloads. For the f-droid.org repo, the symlinks should probably be based on
app['id'] to prevent name conflicts.
more info here:
https://f-droid.org/forums/topic/static-urls-to-current-version-of-each-app/
Daniel Martí [Sun, 9 Nov 2014 13:36:58 +0000 (14:36 +0100)]
Properly catch return codes since -x is no longer used
Daniel Martí [Sun, 9 Nov 2014 13:34:24 +0000 (14:34 +0100)]
Don't accept pyflakes/pep8 not being installed, common err func
Daniel Martí [Sun, 9 Nov 2014 13:31:50 +0000 (14:31 +0100)]
List sh files to check like the python files
Daniel Martí [Sun, 9 Nov 2014 13:29:28 +0000 (14:29 +0100)]
git pre-commit hooks are always run from the root
No need to find out the basedir. We don't do it for the python tests anyway.
Ciaran Gultnieks [Fri, 7 Nov 2014 14:49:07 +0000 (14:49 +0000)]
Merge branch 'some-bug-fixes' into 'master'
Some bug fixes and things
A couple of useful bug fixes and commits.
See merge request !28
Ciaran Gultnieks [Fri, 7 Nov 2014 14:44:58 +0000 (14:44 +0000)]
Merge branch 'update-vagrantfile' into 'master'
Update Vagrantfile and docs to clarify v1.4.3 is ok
Saw in the server docs that we were recommending 1.3.x and saying 1.4.x was broken. I've confirmed that 1.4.x works, and updated things accordingly. Higher version might work, but figured minimal change to build stuff was best :)
See merge request !24
Hans-Christoph Steiner [Sat, 30 Aug 2014 15:07:29 +0000 (11:07 -0400)]
include test cases for python getsig replacement
This includes the old getsig.java since that is the canonical implementation
of that algorithm.
fixes #5 https://gitlab.com/fdroid/fdroidserver/issues/5
Hans-Christoph Steiner [Sat, 30 Aug 2014 04:45:12 +0000 (00:45 -0400)]
move apk signature verification into getsig() function
This makes the python replacement behave like an all-in-one replacement
for getsig.java.
fixes #5 https://gitlab.com/fdroid/fdroidserver/issues/5
Daniel Martí [Sat, 30 Aug 2014 02:53:55 +0000 (22:53 -0400)]
Replace getsig.java with a pure python implementation
Special thanks to deki for helping out with the certificate encodings:
https://gitlab.com/snippets/1842
fixes #5 https://gitlab.com/fdroid/fdroidserver/issues/5
Hans-Christoph Steiner [Sat, 30 Aug 2014 02:53:21 +0000 (22:53 -0400)]
use jarsigner to verify the APK signature is valid
By using jarsigner here, we can get rid of getsig.java, since the rest of
what getsig.java does can easily be handled in python. This simplifies
installation and deployment, and makes things work better cross-platform.
This also means that the fdroidserver Debian package no longer needs to
Build-Depends: on default-jdk, which makes builds in pbuilder run a lot
faster. :-)
refs #5 https://gitlab.com/fdroid/fdroidserver/issues/5
Daniel Martí [Wed, 5 Nov 2014 20:30:00 +0000 (21:30 +0100)]
Add support for gradle plugin version 0.14 in the wrapper
Ciaran Gultnieks [Mon, 27 Oct 2014 17:21:04 +0000 (17:21 +0000)]
Set correct defaults for Binaries metadata field
Ciaran Gultnieks [Fri, 24 Oct 2014 21:20:42 +0000 (22:20 +0100)]
Move build/fdroidserver info to META-INF
Daniel Martí [Fri, 24 Oct 2014 20:24:11 +0000 (22:24 +0200)]
Make lint report total app counts as well
Daniel Martí [Fri, 24 Oct 2014 20:23:58 +0000 (22:23 +0200)]
Fix all pep8 warnings
Ciaran Gultnieks [Fri, 24 Oct 2014 20:04:15 +0000 (21:04 +0100)]
Support for publishing signed binaries from elsewhere
Done after verifying that they match ones built using a recipe.
Everything in the metadata should be the same as normal, with the
addition of the Binaries: directive to specify where (with pattern
substitution) to get the binaries from.
Publishing only takes place if there is a proper match. (Which seems
very unlikely to be the case unless the exact same toolchain is used, so
I would imagine that unless the person building and signing the incoming
binaries uses fdroidserver to build them, probably the exact same
buildserver id, they will not match. But at least we have the
functionality to support that.)
Hans-Christoph Steiner [Tue, 14 Oct 2014 21:12:47 +0000 (17:12 -0400)]
add debug message to mark when syncing to Amazon S3 starts
Hans-Christoph Steiner [Fri, 10 Oct 2014 01:22:50 +0000 (21:22 -0400)]
fix rsync's chmod on local copy
rsync's --chmod works a bit oddly, it only affects the source files. To
make it set the destintation with the perms set in --chmod, the --perms
flag must also be included.
Hans-Christoph Steiner [Thu, 18 Sep 2014 17:56:11 +0000 (13:56 -0400)]
check the syntax of included shell scripts in the pre-commit hook
Hans-Christoph Steiner [Thu, 18 Sep 2014 17:47:47 +0000 (13:47 -0400)]
do not include timestamps in .gz files of docs
The timestamps in the .gz files are not used for anything, and they break
the reproducibility of the build. Giving --no-name means gzip will not
save the filename and timestamp in the gz file itself. When gunziping, the
current file name will be used, minus the .gz suffix.
Hans-Christoph Steiner [Sat, 30 Aug 2014 17:47:12 +0000 (13:47 -0400)]
jenkins: don't scan fdroidserver/ project for APKs
This was causing a number of problems:
* it would spend lots of time sorting through the tmp folders of APKs
created by previous runs of this script
* it would include the bad test APKs in tests/ as normal APKs
Daniel Martí [Thu, 23 Oct 2014 13:22:40 +0000 (15:22 +0200)]
Also bump build-tools in the example config
Daniel Martí [Thu, 23 Oct 2014 13:21:07 +0000 (15:21 +0200)]
Forgot to bump the build tools in the server config
Daniel Martí [Wed, 22 Oct 2014 13:01:01 +0000 (15:01 +0200)]
Bump build-tools to 21.0.2
Daniel Martí [Sat, 18 Oct 2014 09:55:06 +0000 (11:55 +0200)]
Add android-21 (5.0) target sdk to the buildserver
Daniel Martí [Wed, 15 Oct 2014 13:00:45 +0000 (15:00 +0200)]
Use '\s' instead of ' ' to identify spaces in regex