chiark / gitweb /
fdroidserver.git
10 years agoProperly complete partially written vercodes
Daniel Martí [Fri, 18 Apr 2014 21:56:25 +0000 (23:56 +0200)]
Properly complete partially written vercodes

10 years agoCount warnings and apps in lint
Daniel Martí [Fri, 18 Apr 2014 19:17:06 +0000 (21:17 +0200)]
Count warnings and apps in lint

10 years agoAdd summary-related lint warnings
Daniel Martí [Fri, 18 Apr 2014 18:54:44 +0000 (20:54 +0200)]
Add summary-related lint warnings

10 years agoOnly do the latest five tags when using UCM:Tags on git
Daniel Martí [Thu, 17 Apr 2014 19:05:18 +0000 (21:05 +0200)]
Only do the latest five tags when using UCM:Tags on git

10 years agoNo longer use universal_newlines
Daniel Martí [Thu, 17 Apr 2014 18:45:36 +0000 (20:45 +0200)]
No longer use universal_newlines

It was added in an attempt to get git clone/fetch output, which did not
succeed.

10 years agoFix donate/flattr links in web repo browser
Ciaran Gultnieks [Thu, 17 Apr 2014 11:12:50 +0000 (12:12 +0100)]
Fix donate/flattr links in web repo browser

10 years agoChange widget implementation to allow multiple instances
Ciaran Gultnieks [Thu, 17 Apr 2014 10:40:13 +0000 (11:40 +0100)]
Change widget implementation to allow multiple instances

10 years ago Merge branch 'master' into 'master'
Ciaran Gultnieks [Thu, 17 Apr 2014 11:06:35 +0000 (11:06 +0000)]
 Merge branch 'master' into 'master'

add Flattr button to app details pageMaster

10 years agoAlso ignore .bzr when scanning
Daniel Martí [Wed, 16 Apr 2014 19:06:24 +0000 (21:06 +0200)]
Also ignore .bzr when scanning

10 years agoAlso glob the 'rm' field
Daniel Martí [Tue, 15 Apr 2014 21:58:12 +0000 (23:58 +0200)]
Also glob the 'rm' field

10 years agoGlob scanignore and scandelete
Daniel Martí [Tue, 15 Apr 2014 21:53:44 +0000 (23:53 +0200)]
Glob scanignore and scandelete

These fields can still be used without globbing, but globbing can be very
useful in some cases.

10 years agoRewrite much of the source scanner
Daniel Martí [Tue, 15 Apr 2014 21:33:54 +0000 (23:33 +0200)]
Rewrite much of the source scanner

* Group apk, jar and zip files in the same case
* Use regex to support more patterns and be more flexible
* Only check for usual suspects in jar files (saves time)
* Also catch unknown zip-like files as warnings

10 years agoFix: some apks have a zip mimetype instead of a jar one
Daniel Martí [Tue, 15 Apr 2014 15:50:08 +0000 (17:50 +0200)]
Fix: some apks have a zip mimetype instead of a jar one

10 years agoFix apk path on gradle builds with many subdirs
Daniel Martí [Tue, 15 Apr 2014 09:50:02 +0000 (11:50 +0200)]
Fix apk path on gradle builds with many subdirs

10 years ago Merge branch 'master' into 'master'
Ciaran Gultnieks [Sun, 13 Apr 2014 18:57:05 +0000 (18:57 +0000)]
 Merge branch 'master' into 'master'

Updated manual with gitlab repo links

10 years agoupdated gitorious repo links to gitlab repo links
viccuad [Sat, 12 Apr 2014 15:07:31 +0000 (17:07 +0200)]
updated gitorious repo links to gitlab repo links

10 years agoremove border around Flattr button
Torsten Grote [Sat, 12 Apr 2014 11:33:07 +0000 (13:33 +0200)]
remove border around Flattr button

10 years agoadd Flattr button to app details page
Torsten Grote [Sat, 12 Apr 2014 11:27:34 +0000 (13:27 +0200)]
add Flattr button to app details page

10 years agoSupport gradle variables without an equals sign
Daniel Martí [Fri, 11 Apr 2014 23:00:59 +0000 (01:00 +0200)]
Support gradle variables without an equals sign

10 years agoFix counting of scanner problems
Daniel Martí [Fri, 11 Apr 2014 22:14:05 +0000 (00:14 +0200)]
Fix counting of scanner problems

10 years agoPoint wiki current/history links to gitlab
Ciaran Gultnieks [Fri, 11 Apr 2014 15:44:13 +0000 (16:44 +0100)]
Point wiki current/history links to gitlab

10 years ago Merge branch 'master' into 'master'
Ciaran Gultnieks [Thu, 10 Apr 2014 16:46:17 +0000 (16:46 +0000)]
 Merge branch 'master' into 'master'

fix tests

this fixes the copying of APKs in the test script

10 years agouse FDroid-standard naming when copying APKs for tests
Hans-Christoph Steiner [Thu, 10 Apr 2014 16:37:07 +0000 (12:37 -0400)]
use FDroid-standard naming when copying APKs for tests

This makes sure that there are no APKs with duplicate version codes.

10 years agomove run-tests to /bin/bash so we can use bashisms
Hans-Christoph Steiner [Thu, 10 Apr 2014 16:31:14 +0000 (12:31 -0400)]
move run-tests to /bin/bash so we can use bashisms

10 years agoFix Categories: default value
Daniel Martí [Thu, 10 Apr 2014 15:27:53 +0000 (17:27 +0200)]
Fix Categories: default value

10 years agoAdd buildserver details to AndroidManifest.xml
Ciaran Gultnieks [Thu, 10 Apr 2014 12:59:17 +0000 (13:59 +0100)]
Add buildserver details to AndroidManifest.xml

10 years agoPut commit hash of fdroidserver in use onto buildserver
Ciaran Gultnieks [Thu, 10 Apr 2014 12:58:42 +0000 (13:58 +0100)]
Put commit hash of fdroidserver in use onto buildserver

10 years agoSupport different identity file structures
Ciaran Gultnieks [Thu, 10 Apr 2014 12:57:16 +0000 (13:57 +0100)]
Support different identity file structures

Something to do with vagrant/paramiko versioning.

10 years agoFix snapshot logging error
Ciaran Gultnieks [Thu, 10 Apr 2014 12:56:45 +0000 (13:56 +0100)]
Fix snapshot logging error

10 years agoSpecify that scanner warnings are not counted
Daniel Martí [Tue, 8 Apr 2014 16:49:43 +0000 (18:49 +0200)]
Specify that scanner warnings are not counted

10 years ago Merge branch 'master' into 'master'
Ciaran Gultnieks [Tue, 8 Apr 2014 08:26:37 +0000 (08:26 +0000)]
 Merge branch 'master' into 'master'

implemeted support for using a smartcard for the repo signing key

This changeset implements using a smartcard (HSM) as the keystore for the signing key.  It also fixes lots of little bugs in the `fdroid init` process.

10 years agoadd note about automatically generated signing key after init
Hans-Christoph Steiner [Fri, 4 Apr 2014 04:20:34 +0000 (00:20 -0400)]
add note about automatically generated signing key after init

10 years agowarn user if smartcard keystore is set but opensc is not installed
Hans-Christoph Steiner [Fri, 4 Apr 2014 04:15:47 +0000 (00:15 -0400)]
warn user if smartcard keystore is set but opensc is not installed

10 years agosupport repo signing with a key on a smartcard
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.

10 years agofix bug setting repo_keyalias in init
Hans-Christoph Steiner [Fri, 4 Apr 2014 03:05:27 +0000 (23:05 -0400)]
fix bug setting repo_keyalias in init

10 years agofix bug listing new key created 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

10 years agoadd test case were init generates a keystore and uses it
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

10 years agoif keystore is given as arg to init, create keystore if it does not exist
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.

10 years ago'smartcardoptions' config item for setting up HSMs with fdroid
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.

10 years agomake repo_keyalias like a config option: leave it commented out
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.

10 years agouse default keystore path when generating a new setup with init
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.

10 years agowhen generating config.py during init, uncomment changed options
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.

10 years agoimproved error messages related to missing/non-functional SDK paths
Hans-Christoph Steiner [Thu, 3 Apr 2014 20:42:04 +0000 (16:42 -0400)]
improved error messages related to missing/non-functional SDK paths

10 years agoStop looking for builds when Maintainer Notes is found
Daniel Martí [Mon, 7 Apr 2014 16:14:36 +0000 (18:14 +0200)]
Stop looking for builds when Maintainer Notes is found

10 years agoValidate publish-related file existence before proceeding
Ciaran Gultnieks [Fri, 4 Apr 2014 14:37:18 +0000 (15:37 +0100)]
Validate publish-related file existence before proceeding

10 years agoUse keystore options correctly
Ciaran Gultnieks [Fri, 4 Apr 2014 14:31:07 +0000 (15:31 +0100)]
Use keystore options correctly

Corrects error in 525759b235f

10 years ago Merge branch 'master' into 'master'
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

10 years ago'ssh' python module no longer needed, only 'paramiko'
Hans-Christoph Steiner [Thu, 3 Apr 2014 16:34:01 +0000 (12:34 -0400)]
'ssh' python module no longer needed, only 'paramiko'

10 years agoenable Jenkins reporting of pylint errors and warnings
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.

10 years agojenkins-build: make pylint handle the hashlib hash classes properly
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.

10 years agoSwitch back to paramiko for all modules
Ciaran Gultnieks [Thu, 3 Apr 2014 16:14:59 +0000 (17:14 +0100)]
Switch back to paramiko for all modules

10 years agoAvoid printing the dir ''
Daniel Martí [Thu, 3 Apr 2014 14:10:54 +0000 (16:10 +0200)]
Avoid printing the dir ''

10 years agoMake pylint happy about re-using the 'added' var
Daniel Martí [Thu, 3 Apr 2014 14:05:15 +0000 (16:05 +0200)]
Make pylint happy about re-using the 'added' var

10 years agoscan_source: print problems, only return the total count
Daniel Martí [Thu, 3 Apr 2014 14:04:06 +0000 (16:04 +0200)]
scan_source: print problems, only return the total count

10 years agoMerge commit 'refs/merge-requests/140' of gitorious.org:f-droid/fdroidserver
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

10 years agouse the virtualenv python so pylint checks against its installed libs
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

10 years agomake jenkins script use bash so we can use bashisms
Hans-Christoph Steiner [Wed, 2 Apr 2014 22:32:41 +0000 (18:32 -0400)]
make jenkins script use bash so we can use bashisms

10 years agosetup.py: include 'ssh' and 'mwclient' as required libraries
Hans-Christoph Steiner [Wed, 2 Apr 2014 22:12:40 +0000 (18:12 -0400)]
setup.py: include 'ssh' and 'mwclient' as required libraries

10 years agoMerge commit 'refs/merge-requests/139' of gitorious.org:f-droid/fdroidserver
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

10 years agobuild and install getsig.class with setup.py
Hans-Christoph Steiner [Wed, 2 Apr 2014 19:15:27 +0000 (15:15 -0400)]
build and install getsig.class with setup.py

10 years agoinclude prefix in data_files install path so it installs correctly
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.

10 years agoinclude a setuptools MANIFEST to make sure things get installed
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.

10 years agoadd script for running build and tests in Jenkins
Hans-Christoph Steiner [Tue, 1 Apr 2014 20:17:03 +0000 (16:17 -0400)]
add script for running build and tests in Jenkins

10 years agoadd script to do a test run of creating a new repo
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.

10 years agodowncase setup.py name to match the name in the repo, Debian package, etc.
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.

10 years agoignore files created by setup.py processes
Hans-Christoph Steiner [Wed, 2 Apr 2014 18:39:50 +0000 (14:39 -0400)]
ignore files created by setup.py processes

10 years agoAdd default repotype() to make pylint happy
Daniel Martí [Wed, 2 Apr 2014 21:37:29 +0000 (23:37 +0200)]
Add default repotype() to make pylint happy

10 years agoFix output naming, remove redundant lstrip()
Daniel Martí [Tue, 1 Apr 2014 23:05:33 +0000 (01:05 +0200)]
Fix output naming, remove redundant lstrip()

10 years agoMerge commit 'refs/merge-requests/138' of gitorious.org:f-droid/fdroidserver
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

10 years agofix genkey key listing in `fdroid init`
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.

10 years agooops, include common. to call write_password_file()
Hans-Christoph Steiner [Tue, 1 Apr 2014 21:06:05 +0000 (17:06 -0400)]
oops, include common. to call write_password_file()

10 years agomove fdroid-icon.png to examples/
Hans-Christoph Steiner [Tue, 1 Apr 2014 20:57:49 +0000 (16:57 -0400)]
move fdroid-icon.png to examples/

10 years agoimproved warning when trying to init a dir with stuff in it
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

10 years agoMerge commit 'refs/merge-requests/137' of gitorious.org:f-droid/fdroidserver
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

10 years agoFix bankdroid build
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

10 years agoFix apk path on gradle builds where both subdir and flavour@dir are used
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

10 years agoAdd keyaliases config default
Daniel Martí [Tue, 1 Apr 2014 16:58:20 +0000 (18:58 +0200)]
Add keyaliases config default

10 years agoRemove ruby packages from buildserver
Ciaran Gultnieks [Tue, 1 Apr 2014 16:40:11 +0000 (17:40 +0100)]
Remove ruby packages from buildserver

10 years agoset the default keystore to the same as the default in `fdroid init`
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.

10 years agofix example files install in setup.py
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.

10 years agostop passing passphrases via args, instead use prepared files
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.

10 years agoFix indexing issue with recursive srclibs
Daniel Martí [Mon, 31 Mar 2014 17:23:48 +0000 (19:23 +0200)]
Fix indexing issue with recursive srclibs

10 years agoBetter identify empty licenses
Daniel Martí [Fri, 28 Mar 2014 10:40:58 +0000 (11:40 +0100)]
Better identify empty licenses

10 years agoError if buildjni= is present but no native code was packaged
Daniel Martí [Thu, 27 Mar 2014 18:22:21 +0000 (19:22 +0100)]
Error if buildjni= is present but no native code was packaged

10 years agoStart rewriting git@github submodues to use https
Daniel Martí [Thu, 27 Mar 2014 17:38:12 +0000 (18:38 +0100)]
Start rewriting git@github submodues to use https

10 years agoOnly make lists if a space follows the # or * sign
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...

10 years agoRevert "Wrap maintainer notes in <pre> to keep newlines and formatting"
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.

10 years agoWrap maintainer notes in <pre> to keep newlines and formatting
Daniel Martí [Mon, 24 Mar 2014 14:10:52 +0000 (15:10 +0100)]
Wrap maintainer notes in <pre> to keep newlines and formatting

10 years agoFormatting fail
Daniel Martí [Mon, 24 Mar 2014 09:19:39 +0000 (10:19 +0100)]
Formatting fail

10 years agoAlways run ndk-build with -j1
Daniel Martí [Mon, 24 Mar 2014 09:09:12 +0000 (10:09 +0100)]
Always run ndk-build with -j1

10 years agoAvoid some false positives in the punctuation check
Daniel Martí [Mon, 24 Mar 2014 00:02:11 +0000 (01:02 +0100)]
Avoid some false positives in the punctuation check

10 years agoIf given --verbose, don't print the whole error log again
Daniel Martí [Sat, 22 Mar 2014 23:10:33 +0000 (00:10 +0100)]
If given --verbose, don't print the whole error log again

10 years agoAlso show error messages when coming from UCM:Tags
Daniel Martí [Fri, 21 Mar 2014 18:19:17 +0000 (19:19 +0100)]
Also show error messages when coming from UCM:Tags

10 years agoBetter gradle signing keys regexes
Daniel Martí [Fri, 21 Mar 2014 18:11:52 +0000 (19:11 +0100)]
Better gradle signing keys regexes

10 years agoInclude possible src/AndroidManifest.xml gradle manifest path
Daniel Martí [Fri, 21 Mar 2014 18:11:38 +0000 (19:11 +0100)]
Include possible src/AndroidManifest.xml gradle manifest path

10 years agoProperly show checkupdates error messages
Daniel Martí [Fri, 21 Mar 2014 18:11:21 +0000 (19:11 +0100)]
Properly show checkupdates error messages

10 years agoFix checkupdates appid managing
Daniel Martí [Fri, 21 Mar 2014 18:11:08 +0000 (19:11 +0100)]
Fix checkupdates appid managing

10 years agoDon't use 'yes' as flavour
Daniel Martí [Fri, 21 Mar 2014 18:10:50 +0000 (19:10 +0100)]
Don't use 'yes' as flavour

10 years agoDon't crash when using gradle=yes
Daniel Martí [Wed, 19 Mar 2014 16:25:57 +0000 (17:25 +0100)]
Don't crash when using gradle=yes

10 years agoAdd "Update Check Name" for Tags/RM apps that programmatically change their appid
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