chiark / gitweb /
Hans-Christoph Steiner [Fri, 4 Apr 2014 04:05:22 +0000 (00:05 -0400)]
support repo signing with a key on a smartcard
This assumes that the smartcard is already setup with a signing key. init
does not generate a key on the smartcard, and skips genkey() if things are
configured to use a smartcard.
This also does not touch APK signing because that is a much more elaborate
question, since each app is signed by its own key.
Hans-Christoph Steiner [Fri, 4 Apr 2014 03:05:27 +0000 (23:05 -0400)]
fix bug setting repo_keyalias in init
Hans-Christoph Steiner [Fri, 4 Apr 2014 03:00:36 +0000 (23:00 -0400)]
fix bug listing new key created in init
Oops, a typo with a ] in
e53092cffa993031cdd6f3269ca792e42b41a9a6
Hans-Christoph Steiner [Fri, 4 Apr 2014 02:17:52 +0000 (22:17 -0400)]
add test case were init generates a keystore and uses it
Hans-Christoph Steiner [Fri, 4 Apr 2014 02:30:43 +0000 (22:30 -0400)]
if keystore is given as arg to init, create keystore if it does not exist
Previously, `fdroid init --keystore /tmp/foo` expected the keystore to
exist, or it quit with an error. But I've changed my mind, I think it is
useful to have it generate a new keystore at that location if it does not
exist. For example, in tests/run-tests.sh. It still will not clobber an
existing file at that location.
Hans-Christoph Steiner [Fri, 4 Apr 2014 02:07:45 +0000 (22:07 -0400)]
'smartcardoptions' config item for setting up HSMs with fdroid
These options are needed to configure Java's keytool and jarsigner to use
a Hardware Security Module aka HSM aka smartcard. The defaults provided
are meant to make things work as easily as possible.
Hans-Christoph Steiner [Fri, 4 Apr 2014 01:44:40 +0000 (21:44 -0400)]
make repo_keyalias like a config option: leave it commented out
Before, the code relies on repo_keyalias being None, which does not feel
conffile-like. Now, its commented out if its not set.
Hans-Christoph Steiner [Fri, 4 Apr 2014 01:42:23 +0000 (21:42 -0400)]
use default keystore path when generating a new setup with init
Before, the path to the keystore was also hardcoded in init.py, this makes
init now get it from the defaults set in common.py.
Hans-Christoph Steiner [Fri, 4 Apr 2014 01:02:18 +0000 (21:02 -0400)]
when generating config.py during init, uncomment changed options
The defaults are set in config.py and are often commented out. Before, the
regex would only change the value, but leave it commented out. Now, it
will also uncomment it.
Hans-Christoph Steiner [Thu, 3 Apr 2014 20:42:04 +0000 (16:42 -0400)]
improved error messages related to missing/non-functional SDK paths
Daniel Martí [Mon, 7 Apr 2014 16:14:36 +0000 (18:14 +0200)]
Stop looking for builds when Maintainer Notes is found
Ciaran Gultnieks [Fri, 4 Apr 2014 14:37:18 +0000 (15:37 +0100)]
Validate publish-related file existence before proceeding
Ciaran Gultnieks [Fri, 4 Apr 2014 14:31:07 +0000 (15:31 +0100)]
Use keystore options correctly
Corrects error in
525759b235f
Ciaran Gultnieks [Thu, 3 Apr 2014 16:51:15 +0000 (16:51 +0000)]
Merge branch 'master' into 'master'
build and test fixes
various fixes for the build process and tests
Hans-Christoph Steiner [Thu, 3 Apr 2014 16:34:01 +0000 (12:34 -0400)]
'ssh' python module no longer needed, only 'paramiko'
Hans-Christoph Steiner [Thu, 3 Apr 2014 15:54:08 +0000 (11:54 -0400)]
enable Jenkins reporting of pylint errors and warnings
fatals still can not be enabled because of a bug in pylint when running in
a virtualenv:
https://bitbucket.org/logilab/pylint/issue/73/pylint-is-unable-to-import
running pylint in the virtualenv would not be needed once mwclient is
packaged for Debian and installed that way.
Hans-Christoph Steiner [Wed, 2 Apr 2014 23:53:53 +0000 (19:53 -0400)]
jenkins-build: make pylint handle the hashlib hash classes properly
hashlib uses some magic to load whatever is built into the local openssl.
pylint gets confused by this, so we need a pylint plugin to trick pylint
into thinking everything is good.
Ciaran Gultnieks [Thu, 3 Apr 2014 16:14:59 +0000 (17:14 +0100)]
Switch back to paramiko for all modules
Daniel Martí [Thu, 3 Apr 2014 14:10:54 +0000 (16:10 +0200)]
Avoid printing the dir ''
Daniel Martí [Thu, 3 Apr 2014 14:05:15 +0000 (16:05 +0200)]
Make pylint happy about re-using the 'added' var
Daniel Martí [Thu, 3 Apr 2014 14:04:06 +0000 (16:04 +0200)]
scan_source: print problems, only return the total count
Daniel Martí [Thu, 3 Apr 2014 11:01:09 +0000 (13:01 +0200)]
Merge commit 'refs/merge-requests/140' of gitorious.org:f-droid/fdroidserver
Hans-Christoph Steiner [Wed, 2 Apr 2014 23:52:47 +0000 (19:52 -0400)]
use the virtualenv python so pylint checks against its installed libs
Hans-Christoph Steiner [Wed, 2 Apr 2014 22:32:41 +0000 (18:32 -0400)]
make jenkins script use bash so we can use bashisms
Hans-Christoph Steiner [Wed, 2 Apr 2014 22:12:40 +0000 (18:12 -0400)]
setup.py: include 'ssh' and 'mwclient' as required libraries
Daniel Martí [Wed, 2 Apr 2014 22:12:11 +0000 (00:12 +0200)]
Merge commit 'refs/merge-requests/139' of gitorious.org:f-droid/fdroidserver
Hans-Christoph Steiner [Wed, 2 Apr 2014 19:15:27 +0000 (15:15 -0400)]
build and install getsig.class with setup.py
Hans-Christoph Steiner [Wed, 2 Apr 2014 18:41:20 +0000 (14:41 -0400)]
include prefix in data_files install path so it installs correctly
setuptools wants to stick any relative install path in data_files into the
.egg package. Things are not setup to use the egg now. We might want to
consider using sticking files into the egg via pkg_resource in the future.
Hans-Christoph Steiner [Wed, 2 Apr 2014 00:04:20 +0000 (20:04 -0400)]
include a setuptools MANIFEST to make sure things get installed
Using `python setup.py install`, things in non-standard python paths need
to be added to the MANIFEST in order for them to be included and installed.
There might be a better solution for this, but I haven't found it.
Hans-Christoph Steiner [Tue, 1 Apr 2014 20:17:03 +0000 (16:17 -0400)]
add script for running build and tests in Jenkins
Hans-Christoph Steiner [Tue, 1 Apr 2014 20:16:24 +0000 (16:16 -0400)]
add script to do a test run of creating a new repo
This tests/ folder can then be used for all sorts of tests, including
standard python tests.
Hans-Christoph Steiner [Wed, 2 Apr 2014 18:38:57 +0000 (14:38 -0400)]
downcase setup.py name to match the name in the repo, Debian package, etc.
Hans-Christoph Steiner [Wed, 2 Apr 2014 18:39:50 +0000 (14:39 -0400)]
ignore files created by setup.py processes
Daniel Martí [Wed, 2 Apr 2014 21:37:29 +0000 (23:37 +0200)]
Add default repotype() to make pylint happy
Daniel Martí [Tue, 1 Apr 2014 23:05:33 +0000 (01:05 +0200)]
Fix output naming, remove redundant lstrip()
Daniel Martí [Tue, 1 Apr 2014 23:03:36 +0000 (01:03 +0200)]
Merge commit 'refs/merge-requests/138' of gitorious.org:f-droid/fdroidserver
Hans-Christoph Steiner [Tue, 1 Apr 2014 21:37:37 +0000 (17:37 -0400)]
fix genkey key listing in `fdroid init`
FDroidPopen() does not have a way to send to stdin, so we will use the
password file for now. In the long run, at least the keypass should always
be sent via stdin rather than via a file. Ideally, storepass would be too,
but if they are different, then storepass is less important.
Hans-Christoph Steiner [Tue, 1 Apr 2014 21:06:05 +0000 (17:06 -0400)]
oops, include common. to call write_password_file()
Hans-Christoph Steiner [Tue, 1 Apr 2014 20:57:49 +0000 (16:57 -0400)]
move fdroid-icon.png to examples/
Hans-Christoph Steiner [Tue, 1 Apr 2014 18:56:11 +0000 (14:56 -0400)]
improved warning when trying to init a dir with stuff in it
Daniel Martí [Tue, 1 Apr 2014 21:47:11 +0000 (23:47 +0200)]
Merge commit 'refs/merge-requests/137' of gitorious.org:f-droid/fdroidserver
Daniel Martí [Tue, 1 Apr 2014 17:29:37 +0000 (19:29 +0200)]
Fix bankdroid build
All console stuff should be avoided already with just readLine
Daniel Martí [Tue, 1 Apr 2014 17:25:43 +0000 (19:25 +0200)]
Fix apk path on gradle builds where both subdir and flavour@dir are used
Daniel Martí [Tue, 1 Apr 2014 16:58:20 +0000 (18:58 +0200)]
Add keyaliases config default
Ciaran Gultnieks [Tue, 1 Apr 2014 16:40:11 +0000 (17:40 +0100)]
Remove ruby packages from buildserver
Hans-Christoph Steiner [Tue, 1 Apr 2014 01:42:46 +0000 (21:42 -0400)]
set the default keystore to the same as the default in `fdroid init`
This should keep things simple and consistent.
Hans-Christoph Steiner [Tue, 1 Apr 2014 01:29:51 +0000 (21:29 -0400)]
fix example files install in setup.py
This also makes the file layout in git basically the same as the installed
file layout, using an examples/ dir. I'm not sure if config.buildserver.py
is an example conf file, or a conf file that is actually in use, so I did
not move it.
Hans-Christoph Steiner [Tue, 1 Apr 2014 01:02:42 +0000 (21:02 -0400)]
stop passing passphrases via args, instead use prepared files
Any process can read the process table, and can therefore see the entire
command line of any other process. That means its a bad idea to ever put
passwords as part of a command line. Python is executing keytool and
jarsigner command lines here, so now instead of putting the password on the
command line, a file is passed instead with suitable file permissions.
This should reduce the exposure a lot. But still, sensitive passwords
should not be written to any text file.
This change requires OpenJDK-7 since the :file option to -storepass and
-keypass was only added in Java 7's keytool and jarsigner.
Daniel Martí [Mon, 31 Mar 2014 17:23:48 +0000 (19:23 +0200)]
Fix indexing issue with recursive srclibs
Daniel Martí [Fri, 28 Mar 2014 10:40:58 +0000 (11:40 +0100)]
Better identify empty licenses
Daniel Martí [Thu, 27 Mar 2014 18:22:21 +0000 (19:22 +0100)]
Error if buildjni= is present but no native code was packaged
Daniel Martí [Thu, 27 Mar 2014 17:38:12 +0000 (18:38 +0100)]
Start rewriting git@github submodues to use https
Daniel Martí [Thu, 27 Mar 2014 16:51:34 +0000 (17:51 +0100)]
Only make lists if a space follows the # or * sign
This prevents making a list item out of lines such as:
*.rom images and allows using...
Daniel Martí [Tue, 25 Mar 2014 08:41:55 +0000 (09:41 +0100)]
Revert "Wrap maintainer notes in <pre> to keep newlines and formatting"
This reverts commit
94bb9d935593eeb9738aa389afd2a3119ccb7b84.
Daniel Martí [Mon, 24 Mar 2014 14:10:52 +0000 (15:10 +0100)]
Wrap maintainer notes in <pre> to keep newlines and formatting
Daniel Martí [Mon, 24 Mar 2014 09:19:39 +0000 (10:19 +0100)]
Formatting fail
Daniel Martí [Mon, 24 Mar 2014 09:09:12 +0000 (10:09 +0100)]
Always run ndk-build with -j1
Daniel Martí [Mon, 24 Mar 2014 00:02:11 +0000 (01:02 +0100)]
Avoid some false positives in the punctuation check
Daniel Martí [Sat, 22 Mar 2014 23:10:33 +0000 (00:10 +0100)]
If given --verbose, don't print the whole error log again
Daniel Martí [Fri, 21 Mar 2014 18:19:17 +0000 (19:19 +0100)]
Also show error messages when coming from UCM:Tags
Daniel Martí [Fri, 21 Mar 2014 18:11:52 +0000 (19:11 +0100)]
Better gradle signing keys regexes
Daniel Martí [Fri, 21 Mar 2014 18:11:38 +0000 (19:11 +0100)]
Include possible src/AndroidManifest.xml gradle manifest path
Daniel Martí [Fri, 21 Mar 2014 18:11:21 +0000 (19:11 +0100)]
Properly show checkupdates error messages
Daniel Martí [Fri, 21 Mar 2014 18:11:08 +0000 (19:11 +0100)]
Fix checkupdates appid managing
Daniel Martí [Fri, 21 Mar 2014 18:10:50 +0000 (19:10 +0100)]
Don't use 'yes' as flavour
Daniel Martí [Wed, 19 Mar 2014 16:25:57 +0000 (17:25 +0100)]
Don't crash when using gradle=yes
Daniel Martí [Tue, 18 Mar 2014 22:37:15 +0000 (23:37 +0100)]
Add "Update Check Name" for Tags/RM apps that programmatically change their appid
Daniel Martí [Tue, 18 Mar 2014 14:44:39 +0000 (15:44 +0100)]
Support auto names on gradle projects
Daniel Martí [Tue, 18 Mar 2014 11:47:35 +0000 (12:47 +0100)]
Make SilentPopen use FDroidPopen, switch a few from silent to regular
Daniel Martí [Tue, 18 Mar 2014 11:46:40 +0000 (12:46 +0100)]
Print version names and srclibs for reference
Daniel Martí [Tue, 18 Mar 2014 11:26:24 +0000 (12:26 +0100)]
A couple more rules for lint
Daniel Martí [Tue, 18 Mar 2014 11:20:51 +0000 (12:20 +0100)]
Make "reading config.py" a debug print
Daniel Martí [Tue, 18 Mar 2014 11:15:50 +0000 (12:15 +0100)]
Separate lint messages into warnings and pedantic warnings
Daniel Martí [Tue, 18 Mar 2014 07:22:36 +0000 (08:22 +0100)]
Properly use logging.warn in some places
Daniel Martí [Mon, 17 Mar 2014 13:52:01 +0000 (14:52 +0100)]
Try to fix <pre> issues on large lastbuilds
Daniel Martí [Mon, 17 Mar 2014 13:37:57 +0000 (14:37 +0100)]
Capitalize gradle flavour commands to avoid confusion
Daniel Martí [Sun, 16 Mar 2014 22:38:00 +0000 (23:38 +0100)]
Properly identify jar files
Ciaran Gultnieks [Sun, 16 Mar 2014 22:34:13 +0000 (22:34 +0000)]
Ciaran Gultnieks [Sun, 16 Mar 2014 22:12:37 +0000 (22:12 +0000)]
Don't use an autoname if it's not found
Ciaran Gultnieks [Sun, 16 Mar 2014 08:43:54 +0000 (08:43 +0000)]
Don't look for strings in unrelated projects
Ciaran Gultnieks [Sun, 16 Mar 2014 08:43:24 +0000 (08:43 +0000)]
Extra debug logging for autoname gathering
Ciaran Gultnieks [Sun, 16 Mar 2014 08:22:35 +0000 (08:22 +0000)]
Simplify/unify checkupdates file write and commit message
Ciaran Gultnieks [Sat, 15 Mar 2014 17:28:34 +0000 (17:28 +0000)]
Formatting
Ciaran Gultnieks [Sat, 15 Mar 2014 17:23:20 +0000 (17:23 +0000)]
Don't skip checkupdates commits due to no message
Daniel Martí [Thu, 13 Mar 2014 09:31:22 +0000 (10:31 +0100)]
Also strip project.properties of ant keysigning options
Daniel Martí [Tue, 11 Mar 2014 16:37:42 +0000 (17:37 +0100)]
Fix buildserver build_tools version
Daniel Martí [Tue, 11 Mar 2014 16:33:19 +0000 (17:33 +0100)]
Properly default to the highest version of gradle
Daniel Martí [Tue, 11 Mar 2014 08:03:18 +0000 (09:03 +0100)]
Treat None and Static UCMs equally when doing checkupdates
Ciaran Gultnieks [Tue, 11 Mar 2014 07:55:46 +0000 (07:55 +0000)]
Clarify non-auto-update error message
Ciaran Gultnieks [Tue, 11 Mar 2014 07:53:30 +0000 (07:53 +0000)]
Don't do autoname when update checking is disabled
Much of that stuff has checking set to None because the source repo is
not accessible. Attempting to pull it is just filling logs with
exception messages which are likely to be masking real errors.
Daniel Martí [Tue, 11 Mar 2014 07:32:10 +0000 (08:32 +0100)]
Always write Auto Name changes
Daniel Martí [Sun, 9 Mar 2014 22:11:10 +0000 (23:11 +0100)]
Bump default build-tools version
Daniel Martí [Fri, 7 Mar 2014 14:38:24 +0000 (15:38 +0100)]
Bump build-tools version
Daniel Martí [Fri, 7 Mar 2014 14:37:14 +0000 (15:37 +0100)]
Clean up the gradle script a bit
Daniel Martí [Fri, 7 Mar 2014 14:21:28 +0000 (15:21 +0100)]
Bump sdk to 22.6
Daniel Martí [Fri, 7 Mar 2014 14:21:18 +0000 (15:21 +0100)]
Add support for gradle 1.11 (and plugin ver 0.9)
Daniel Martí [Thu, 6 Mar 2014 10:10:54 +0000 (11:10 +0100)]
Update BV notation in the manual
Daniel Martí [Wed, 5 Mar 2014 12:22:58 +0000 (13:22 +0100)]
Don't reset a repo if its .fdroidvcs file ends with a newline
Daniel Martí [Wed, 5 Mar 2014 11:32:36 +0000 (12:32 +0100)]
Remove gradle wrapper binaries and scripts
Ciaran Gultnieks [Tue, 4 Mar 2014 23:55:55 +0000 (23:55 +0000)]
Same again, for native code message