From 6f01bd4b023e20e8cf4dc883ddb3737bc843643a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 12:38:08 +0100
Subject: [PATCH 01/68] Fix ndk install typo

---
 makebuildserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makebuildserver.py b/makebuildserver.py
index e02e05e1..6ecf3601 100755
--- a/makebuildserver.py
+++ b/makebuildserver.py
@@ -71,7 +71,7 @@ cachefiles = [
     ]
 if config['arch64']:
     cachefiles.extend([
-    ('android-ndk-r9b-linux-x64_64.tar.bz2',
+    ('android-ndk-r9b-linux-x86_64.tar.bz2',
      'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
      '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
     ('android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',

From 57fde3de0f5987cde3fcdec493fd193a25199985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 23 Dec 2013 12:04:50 +0100
Subject: [PATCH 02/68] Only add AF xml element if there actually are AFs

---
 fdroidserver/update.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 7d761212..2446f852 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -578,7 +578,8 @@ def make_index(apps, apks, repodir, archive, categories):
             # filtering can be removed in time...
             if 'UpstreamNonFree' in af:
                 af.remove('UpstreamNonFree')
-            addElement('antifeatures', ','.join(af), doc, apel)
+            if af:
+                addElement('antifeatures', ','.join(af), doc, apel)
         if app['Requires Root']:
             addElement('requirements', 'root', doc, apel)
 

From d4b0556dcb2b8bab49cebdf0047d6ccdb0483439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 26 Dec 2013 19:18:36 +0100
Subject: [PATCH 03/68] Avoid strange outcomes of "adb devices"

---
 fdroidserver/install.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index b61cfcb4..0f444cff 100644
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -33,7 +33,11 @@ def devices():
     p = FDroidPopen(["adb", "devices"])
     if p.returncode != 0:
         raise Exception("An error occured when finding devices: %s" % p.stderr)
-    return [l.split()[0] for l in p.stdout.splitlines()[1:-1]]
+    lines = p.stdout.splitlines()
+    if len(lines) < 3:
+        return []
+    lines = lines[1:-1]
+    return [l.split()[0] for l in lines]
 
 
 def main():

From 3ed8ed60b95ac68140c2d21e6b699b647c4122d2 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 28 Dec 2013 10:35:40 +0000
Subject: [PATCH 04/68] Fix latestapps stats, broken in 59cde15ad1

---
 fdroidserver/stats.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py
index be62f650..31784d3f 100644
--- a/fdroidserver/stats.py
+++ b/fdroidserver/stats.py
@@ -210,7 +210,6 @@ def main():
     for antifeature, count in afs.iteritems():
         f.write(antifeature + ' ' + str(count) + '\n')
     f.close()
-    return
 
     # Calculate and write stats for licenses...
     licenses = {}

From e987fb17582e092e401650d77f04e2a257e34f25 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 28 Dec 2013 10:35:50 +0000
Subject: [PATCH 05/68] Some minor stats improvements

---
 fdroidserver/stats.py | 100 ++++++++++++++++++++++++------------------
 1 file changed, 58 insertions(+), 42 deletions(-)

diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py
index 31784d3f..c7bfde39 100644
--- a/fdroidserver/stats.py
+++ b/fdroidserver/stats.py
@@ -49,6 +49,8 @@ def main():
                       help="Spew out even more information than normal")
     parser.add_option("-d", "--download", action="store_true", default=False,
                       help="Download logs we don't have")
+    parser.add_option("--nologs", action="store_true", default=False,
+                      help="Don't do anything logs-related")
     (options, args) = parser.parse_args()
 
     config = common.read_config(options)
@@ -105,51 +107,55 @@ def main():
             if ssh is not None:
                 ssh.close()
 
-    # Process logs
-    if options.verbose:
-        print 'Processing logs...'
-    logexpr = '(?P<ip>[.:0-9a-fA-F]+) - - \[(?P<time>.*?)\] "GET (?P<uri>.*?) HTTP/1.\d" (?P<statuscode>\d+) \d+ "(?P<referral>.*?)" "(?P<useragent>.*?)"'
-    logsearch = re.compile(logexpr).search
-    apps = {}
-    unknownapks = []
     knownapks = common.KnownApks()
-    for logfile in glob.glob(os.path.join(logsdir,'access-*.log.gz')):
-        if options.verbose:
-            print '...' + logfile
-        p = subprocess.Popen(["zcat", logfile], stdout = subprocess.PIPE)
-        matches = (logsearch(line) for line in p.stdout)
-        for match in matches:
-            if match and match.group('statuscode') == '200':
-                uri = match.group('uri')
-                if uri.endswith('.apk'):
-                    _, apkname = os.path.split(uri)
-                    app = knownapks.getapp(apkname)
-                    if app:
-                        appid, _ = app
-                        if appid in apps:
-                            apps[appid] += 1
-                        else:
-                            apps[appid] = 1
-                    else:
-                        if not apkname in unknownapks:
-                            unknownapks.append(apkname)
+    unknownapks = []
 
-    # Calculate and write stats for total downloads...
-    lst = []
-    alldownloads = 0
-    for app, count in apps.iteritems():
-        lst.append(app + " " + str(count))
-        if config['stats_to_carbon']:
-            carbon_send('fdroid.download.' + app.replace('.', '_'), count)
-        alldownloads += count
-    lst.append("ALL " + str(alldownloads))
-    f = open('stats/total_downloads_app.txt', 'w')
-    f.write('# Total downloads by application, since October 2011\n')
-    for line in sorted(lst):
-        f.write(line + '\n')
-    f.close()
+    if not options.nologs:
+        # Process logs
+        if options.verbose:
+            print 'Processing logs...'
+        apps = {}
+        logexpr = '(?P<ip>[.:0-9a-fA-F]+) - - \[(?P<time>.*?)\] "GET (?P<uri>.*?) HTTP/1.\d" (?P<statuscode>\d+) \d+ "(?P<referral>.*?)" "(?P<useragent>.*?)"'
+        logsearch = re.compile(logexpr).search
+        for logfile in glob.glob(os.path.join(logsdir,'access-*.log.gz')):
+            if options.verbose:
+                print '...' + logfile
+            p = subprocess.Popen(["zcat", logfile], stdout = subprocess.PIPE)
+            matches = (logsearch(line) for line in p.stdout)
+            for match in matches:
+                if match and match.group('statuscode') == '200':
+                    uri = match.group('uri')
+                    if uri.endswith('.apk'):
+                        _, apkname = os.path.split(uri)
+                        app = knownapks.getapp(apkname)
+                        if app:
+                            appid, _ = app
+                            if appid in apps:
+                                apps[appid] += 1
+                            else:
+                                apps[appid] = 1
+                        else:
+                            if not apkname in unknownapks:
+                                unknownapks.append(apkname)
+
+        # Calculate and write stats for total downloads...
+        lst = []
+        alldownloads = 0
+        for app, count in apps.iteritems():
+            lst.append(app + " " + str(count))
+            if config['stats_to_carbon']:
+                carbon_send('fdroid.download.' + app.replace('.', '_'), count)
+            alldownloads += count
+        lst.append("ALL " + str(alldownloads))
+        f = open('stats/total_downloads_app.txt', 'w')
+        f.write('# Total downloads by application, since October 2011\n')
+        for line in sorted(lst):
+            f.write(line + '\n')
+        f.close()
 
     # Calculate and write stats for repo types...
+    if options.verbose:
+        print "Processing repo types..."
     repotypes = {}
     for app in metaapps:
         if len(app['Repo Type']) == 0:
@@ -169,6 +175,8 @@ def main():
     f.close()
 
     # Calculate and write stats for update check modes...
+    if options.verbose:
+        print "Processing update check modes..."
     ucms = {}
     for app in metaapps:
         checkmode = app['Update Check Mode'].split('/')[0]
@@ -181,6 +189,8 @@ def main():
         f.write(checkmode + ' ' + str(count) + '\n')
     f.close()
 
+    if options.verbose:
+        print "Processing categories..."
     ctgs = {}
     for app in metaapps:
         if app['Categories'] is None:
@@ -196,6 +206,8 @@ def main():
         f.write(category + ' ' + str(count) + '\n')
     f.close()
 
+    if options.verbose:
+        print "Processing antifeatures..."
     afs = {}
     for app in metaapps:
         if app['AntiFeatures'] is None:
@@ -212,6 +224,8 @@ def main():
     f.close()
 
     # Calculate and write stats for licenses...
+    if options.verbose:
+        print "Processing licenses..."
     licenses = {}
     for app in metaapps:
         license = app['License']
@@ -225,13 +239,15 @@ def main():
     f.close()
 
     # Write list of latest apps added to the repo...
+    if options.verbose:
+        print "Processing latest apps..."
     latest = knownapks.getlatest(10)
     f = open('stats/latestapps.txt', 'w')
     for app in latest:
         f.write(app + '\n')
     f.close()
 
-    if len(unknownapks) > 0:
+    if unknownapks:
         print '\nUnknown apks:'
         for apk in unknownapks:
             print apk

From ecd074c196872ff6249be28d04269b20fbb9eb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 11:25:15 +0100
Subject: [PATCH 06/68] Warn about prebuilt jar files when scanning

---
 fdroidserver/build.py  | 2 +-
 fdroidserver/common.py | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 0bc49874..a861bc79 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -436,7 +436,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
     if len(buildprobs) > 0:
         print 'Scanner found ' + str(len(buildprobs)) + ' problems:'
         for problem in buildprobs:
-            print '...' + problem
+            print '    %s' % problem
         if not force:
             raise BuildException("Can't build due to " +
                 str(len(buildprobs)) + " scanned problems")
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index a49e069d..1119c267 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1237,6 +1237,9 @@ def scan_source(build_dir, root_dir, thisbuild):
         else:
             problems.append('Found %s at %s' % (what, fd))
 
+    def warnproblem(what, fd, fp):
+        print 'Warning: Found %s at %s' % (what, fd)
+
     # Iterate through all files in the source code...
     for r,d,f in os.walk(build_dir):
         for curfile in f:
@@ -1265,6 +1268,8 @@ def scan_source(build_dir, root_dir, thisbuild):
                 handleproblem('binary executable', fd, fp)
             elif mime == 'application/jar' and fp.endswith('.apk'):
                 removeproblem('APK file', fd, fp)
+            elif mime == 'application/jar' and fp.endswith('.jar'):
+                warnproblem('JAR file', fd, fp)
 
             elif curfile.endswith('.java'):
                 for line in file(fp):

From 23aa016a8d4a032e5de209383992786a9eb6e7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 11:33:37 +0100
Subject: [PATCH 07/68] Make sure to match filename extensions without being
 case sensitive

---
 fdroidserver/common.py | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 1119c267..38e70a2a 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -169,6 +169,11 @@ def read_app_args(args, allapps, allow_vercodes=False):
 
     return apps
 
+def has_extension(filename, extension):
+    name, ext = os.path.splitext(filename)
+    ext = ext.lower()[1:]
+    return ext == extension
+
 apk_regex = None
 
 def apknameinfo(filename):
@@ -619,7 +624,7 @@ def fetch_real_name(app_dir, flavour):
     name_search = re.compile(r'.*android:label="([^"]+)".*').search
     app_found = False
     for f in manifest_paths(app_dir, flavour):
-        if not f.endswith(".xml"):
+        if not has_extension(f, 'xml'):
             continue
         xml_dir = os.path.join(f[:-19], 'res', 'values')
         for line in file(f):
@@ -635,7 +640,7 @@ def fetch_real_name(app_dir, flavour):
 # Retrieve the version name
 def version_name(original, app_dir, flavour):
     for f in manifest_paths(app_dir, flavour):
-        if not f.endswith(".xml"):
+        if not has_extension(f, 'xml'):
             continue
         xml_dir = os.path.join(f[:-19], 'res', 'values')
         string = retrieve_string(xml_dir, original)
@@ -683,7 +688,7 @@ def parse_androidmanifests(paths):
 
     for path in paths:
 
-        gradle = path.endswith("gradle")
+        gradle = has_extension(path, 'gradle')
         version = None
         vercode = None
         # Remember package name, may be defined separately from version+vercode
@@ -1009,12 +1014,12 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
         for path in manifest_paths(root_dir, flavour):
             if not os.path.isfile(path):
                 continue
-            if path.endswith('.xml'):
+            if has_extension(path, 'xml'):
                 if subprocess.call(['sed','-i',
                     's/android:versionName="[^"]*"/android:versionName="' + build['version'] + '"/g',
                     path]) != 0:
                     raise BuildException("Failed to amend manifest")
-            elif path.endswith('.gradle'):
+            elif has_extension(path, 'gradle'):
                 if subprocess.call(['sed','-i',
                     's/versionName[ ]*=[ ]*"[^"]*"/versionName = "' + build['version'] + '"/g',
                     path]) != 0:
@@ -1024,12 +1029,12 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
         for path in manifest_paths(root_dir, flavour):
             if not os.path.isfile(path):
                 continue
-            if path.endswith('.xml'):
+            if has_extension(path, 'xml'):
                 if subprocess.call(['sed','-i',
                     's/android:versionCode="[^"]*"/android:versionCode="' + build['vercode'] + '"/g',
                     path]) != 0:
                     raise BuildException("Failed to amend manifest")
-            elif path.endswith('.gradle'):
+            elif has_extension(path, 'gradle'):
                 if subprocess.call(['sed','-i',
                     's/versionCode[ ]*=[ ]*[0-9]*/versionCode = ' + build['vercode'] + '/g',
                     path]) != 0:
@@ -1060,7 +1065,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
     if build['fixapos']:
         for root, dirs, files in os.walk(os.path.join(root_dir, 'res')):
             for filename in files:
-                if filename.endswith('.xml'):
+                if has_extension(filename, 'xml'):
                     if subprocess.call(['sed','-i','s@' +
                         r"\([^\\]\)'@\1\\'" +
                         '@g',
@@ -1071,7 +1076,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
     if build['fixtrans']:
         for root, dirs, files in os.walk(os.path.join(root_dir, 'res')):
             for filename in files:
-                if filename.endswith('.xml'):
+                if has_extension(filename, 'xml'):
                     f = open(os.path.join(root, filename))
                     changed = False
                     outlines = []
@@ -1170,7 +1175,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
 
     return (root_dir, srclibpaths)
 
-
 # Scan the source code in the given directory (and all subdirectories)
 # and return a list of potential problems.
 def scan_source(build_dir, root_dir, thisbuild):
@@ -1266,12 +1270,12 @@ def scan_source(build_dir, root_dir, thisbuild):
                 handleproblem('static library', fd, fp)
             elif mime == 'application/x-executable':
                 handleproblem('binary executable', fd, fp)
-            elif mime == 'application/jar' and fp.endswith('.apk'):
+            elif mime == 'application/jar' and has_extension(fp, 'apk'):
                 removeproblem('APK file', fd, fp)
-            elif mime == 'application/jar' and fp.endswith('.jar'):
+            elif mime == 'application/jar' and has_extension(fp, 'jar'):
                 warnproblem('JAR file', fd, fp)
 
-            elif curfile.endswith('.java'):
+            elif has_extension(fp, 'java'):
                 for line in file(fp):
                     if 'DexClassLoader' in line:
                         handleproblem('DexClassLoader', fd, fp)

From 44e2c339e0cc9879d06a37eba4e9e2406672bc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 16:33:42 +0100
Subject: [PATCH 08/68] Update gendocs from 2011-04 to 2013-02

---
 docs/gendocs.sh       | 283 +++++++++++++++++++++++++++---------------
 docs/gendocs_template |  51 +++++---
 2 files changed, 217 insertions(+), 117 deletions(-)

diff --git a/docs/gendocs.sh b/docs/gendocs.sh
index c8abd55f..e4bfc9fd 100755
--- a/docs/gendocs.sh
+++ b/docs/gendocs.sh
@@ -2,10 +2,10 @@
 # gendocs.sh -- generate a GNU manual in many formats.  This script is
 #   mentioned in maintain.texi.  See the help message below for usage details.
 
-scriptversion=2011-04-08.14
+scriptversion=2013-02-03.15
 
-# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+# Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,6 +30,12 @@ scriptversion=2011-04-08.14
 #
 # An up-to-date copy is also maintained in Gnulib (gnu.org/software/gnulib).
 
+# TODO:
+# - image importation was only implemented for HTML generated by
+#   makeinfo.  But it should be simple enough to adjust.
+# - images are not imported in the source tarball.  All the needed
+#   formats (PDF, PNG, etc.) should be included.
+
 prog=`basename "$0"`
 srcdir=`pwd`
 
@@ -39,38 +45,47 @@ templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/
 : ${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="}
 : ${MAKEINFO="makeinfo"}
 : ${TEXI2DVI="texi2dvi -t @finalout"}
-: ${DVIPS="dvips"}
 : ${DOCBOOK2HTML="docbook2html"}
 : ${DOCBOOK2PDF="docbook2pdf"}
-: ${DOCBOOK2PS="docbook2ps"}
 : ${DOCBOOK2TXT="docbook2txt"}
 : ${GENDOCS_TEMPLATE_DIR="."}
+: ${PERL='perl'}
 : ${TEXI2HTML="texi2html"}
 unset CDPATH
 unset use_texi2html
 
 version="gendocs.sh $scriptversion
 
-Copyright 2010 Free Software Foundation, Inc.
+Copyright 2013 Free Software Foundation, Inc.
 There is NO warranty.  You may redistribute this software
 under the terms of the GNU General Public License.
 For more information about these matters, see the files named COPYING."
 
 usage="Usage: $prog [OPTION]... PACKAGE MANUAL-TITLE
 
-Generate various output formats from PACKAGE.texinfo (or .texi or .txi) source.
-See the GNU Maintainers document for a more extensive discussion:
+Generate output in various formats from PACKAGE.texinfo (or .texi or
+.txi) source.  See the GNU Maintainers document for a more extensive
+discussion:
   http://www.gnu.org/prep/maintain_toc.html
 
 Options:
-  -s SRCFILE  read Texinfo from SRCFILE, instead of PACKAGE.{texinfo|texi|txi}
-  -o OUTDIR   write files into OUTDIR, instead of manual/.
-  --email ADR use ADR as contact in generated web pages.
-  --docbook   convert to DocBook too (xml, txt, html, pdf and ps).
-  --html ARG  pass indicated ARG to makeinfo or texi2html for HTML targets.
-  --texi2html use texi2html to generate HTML targets.
-  --help      display this help and exit successfully.
-  --version   display version information and exit successfully.
+  --email ADR use ADR as contact in generated web pages; always give this.
+
+  -s SRCFILE   read Texinfo from SRCFILE, instead of PACKAGE.{texinfo|texi|txi}
+  -o OUTDIR    write files into OUTDIR, instead of manual/.
+  -I DIR       append DIR to the Texinfo search path.
+  --common ARG pass ARG in all invocations.
+  --html ARG   pass ARG to makeinfo or texi2html for HTML targets.
+  --info ARG   pass ARG to makeinfo for Info, instead of --no-split.
+  --no-ascii   skip generating the plain text output.
+  --source ARG include ARG in tar archive of sources.
+  --split HOW  make split HTML by node, section, chapter; default node.
+
+  --texi2html  use texi2html to make HTML target, with all split versions.
+  --docbook    convert through DocBook too (xml, txt, html, pdf).
+
+  --help       display this help and exit successfully.
+  --version    display version information and exit successfully.
 
 Simple example: $prog --email bug-gnu-emacs@gnu.org emacs \"GNU Emacs Manual\"
 
@@ -80,12 +95,12 @@ Typical sequence:
   wget \"$templateurl\"
   $prog --email BUGLIST MANUAL \"GNU MANUAL - One-line description\"
 
-Output will be in a new subdirectory \"manual\" (by default, use -o OUTDIR
-to override).  Move all the new files into your web CVS tree, as
-explained in the Web Pages node of maintain.texi.
+Output will be in a new subdirectory \"manual\" (by default;
+use -o OUTDIR to override).  Move all the new files into your web CVS
+tree, as explained in the Web Pages node of maintain.texi.
 
-Please use the --email ADDRESS option to specify your bug-reporting
-address in the generated HTML pages.
+Please use the --email ADDRESS option so your own bug-reporting
+address will be used in the generated HTML pages.
 
 MANUAL-TITLE is included as part of the HTML <title> of the overall
 manual/index.html file.  It should include the name of the package being
@@ -102,11 +117,14 @@ If a manual's Texinfo sources are spread across several directories,
 first copy or symlink all Texinfo sources into a single directory.
 (Part of the script's work is to make a tar.gz of the sources.)
 
-You can set the environment variables MAKEINFO, TEXI2DVI, TEXI2HTML, and
-DVIPS to control the programs that get executed, and
+As implied above, by default monolithic Info files are generated.
+If you want split Info, or other Info options, use --info to override.
+
+You can set the environment variables MAKEINFO, TEXI2DVI, TEXI2HTML,
+and PERL to control the programs that get executed, and
 GENDOCS_TEMPLATE_DIR to control where the gendocs_template file is
 looked for.  With --docbook, the environment variables DOCBOOK2HTML,
-DOCBOOK2PDF, DOCBOOK2PS, and DOCBOOK2TXT are also respected.
+DOCBOOK2PDF, and DOCBOOK2TXT are also consulted.
 
 By default, makeinfo and texi2dvi are run in the default (English)
 locale, since that's the language of most Texinfo manuals.  If you
@@ -116,29 +134,37 @@ SETLANG setting in the source.
 Email bug reports or enhancement requests to bug-texinfo@gnu.org.
 "
 
-calcsize()
-{
-  size=`ls -ksl $1 | awk '{print $1}'`
-  echo $size
-}
-
 MANUAL_TITLE=
 PACKAGE=
 EMAIL=webmasters@gnu.org  # please override with --email
+commonarg= # passed to all makeinfo/texi2html invcations.
+dirargs=   # passed to all tools (-I dir).
+dirs=      # -I's directories.
 htmlarg=
+infoarg=--no-split
+generate_ascii=true
 outdir=manual
+source_extra=
+split=node
 srcfile=
 
 while test $# -gt 0; do
   case $1 in
-    --email) shift; EMAIL=$1;;
-    --help) echo "$usage"; exit 0;;
-    --version) echo "$version"; exit 0;;
-    -s) shift; srcfile=$1;;
-    -o) shift; outdir=$1;;
-    --docbook) docbook=yes;;
-    --html) shift; htmlarg=$1;;
+    -s)          shift; srcfile=$1;;
+    -o)          shift; outdir=$1;;
+    -I)          shift; dirargs="$dirargs -I '$1'"; dirs="$dirs $1";;
+    --common)    shift; commonarg=$1;;
+    --docbook)   docbook=yes;;
+    --email)     shift; EMAIL=$1;;
+    --html)      shift; htmlarg=$1;;
+    --info)      shift; infoarg=$1;;
+    --no-ascii)  generate_ascii=false;;
+    --source)    shift; source_extra=$1;;
+    --split)     shift; split=$1;;
     --texi2html) use_texi2html=1;;
+
+    --help)      echo "$usage"; exit 0;;
+    --version)   echo "$version"; exit 0;;
     -*)
       echo "$0: Unknown option \`$1'." >&2
       echo "$0: Try \`--help' for more information." >&2
@@ -156,6 +182,9 @@ while test $# -gt 0; do
   shift
 done
 
+# makeinfo uses the dirargs, but texi2dvi doesn't.
+commonarg=" $dirargs $commonarg"
+
 # For most of the following, the base name is just $PACKAGE
 base=$PACKAGE
 
@@ -183,57 +212,106 @@ if test ! -r $GENDOCS_TEMPLATE_DIR/gendocs_template; then
   exit 1
 fi
 
+# Function to return size of $1 in something resembling kilobytes.
+calcsize()
+{
+  size=`ls -ksl $1 | awk '{print $1}'`
+  echo $size
+}
+
+# copy_images OUTDIR HTML-FILE...
+# -------------------------------
+# Copy all the images needed by the HTML-FILEs into OUTDIR.  Look
+# for them in the -I directories.
+copy_images()
+{
+  local odir
+  odir=$1
+  shift
+  $PERL -n -e "
+BEGIN {
+  \$me = '$prog';
+  \$odir = '$odir';
+  @dirs = qw($dirs);
+}
+" -e '
+/<img src="(.*?)"/g && ++$need{$1};
+
+END {
+  #print "$me: @{[keys %need]}\n";  # for debugging, show images found.
+  FILE: for my $f (keys %need) {
+    for my $d (@dirs) {
+      if (-f "$d/$f") {
+        use File::Basename;
+        my $dest = dirname ("$odir/$f");
+        #
+        use File::Path;
+        -d $dest || mkpath ($dest)
+          || die "$me: cannot mkdir $dest: $!\n";
+        #
+        use File::Copy;
+        copy ("$d/$f", $dest)
+          || die "$me: cannot copy $d/$f to $dest: $!\n";
+        next FILE;
+      }
+    }
+    die "$me: $ARGV: cannot find image $f\n";
+  }
+}
+' -- "$@" || exit 1
+}
+
 case $outdir in
   /*) abs_outdir=$outdir;;
   *)  abs_outdir=$srcdir/$outdir;;
 esac
 
-echo Generating output formats for $srcfile
-
-cmd="$SETLANG $MAKEINFO -o $PACKAGE.info \"$srcfile\""
-echo "Generating info files... ($cmd)"
-eval "$cmd"
+echo "Making output for $srcfile"
+echo " in `pwd`"
 mkdir -p "$outdir/"
+
+cmd="$SETLANG $MAKEINFO -o $PACKAGE.info $commonarg $infoarg \"$srcfile\""
+echo "Generating info... ($cmd)"
+eval "$cmd"
 tar czf "$outdir/$PACKAGE.info.tar.gz" $PACKAGE.info*
+ls -l "$outdir/$PACKAGE.info.tar.gz"
 info_tgz_size=`calcsize "$outdir/$PACKAGE.info.tar.gz"`
 # do not mv the info files, there's no point in having them available
 # separately on the web.
 
-cmd="$SETLANG ${TEXI2DVI} \"$srcfile\""
-echo "Generating dvi ... ($cmd)"
+cmd="$SETLANG $TEXI2DVI $dirargs \"$srcfile\""
+printf "\nGenerating dvi... ($cmd)\n"
 eval "$cmd"
-
-# now, before we compress dvi:
-echo Generating postscript...
-${DVIPS} $PACKAGE -o
-gzip -f -9 $PACKAGE.ps
-ps_gz_size=`calcsize $PACKAGE.ps.gz`
-mv $PACKAGE.ps.gz "$outdir/"
-
 # compress/finish dvi:
 gzip -f -9 $PACKAGE.dvi
 dvi_gz_size=`calcsize $PACKAGE.dvi.gz`
 mv $PACKAGE.dvi.gz "$outdir/"
+ls -l "$outdir/$PACKAGE.dvi.gz"
 
-cmd="$SETLANG ${TEXI2DVI} --pdf \"$srcfile\""
-echo "Generating pdf ... ($cmd)"
+cmd="$SETLANG $TEXI2DVI --pdf $dirargs \"$srcfile\""
+printf "\nGenerating pdf... ($cmd)\n"
 eval "$cmd"
 pdf_size=`calcsize $PACKAGE.pdf`
 mv $PACKAGE.pdf "$outdir/"
+ls -l "$outdir/$PACKAGE.pdf"
 
-cmd="$SETLANG $MAKEINFO -o $PACKAGE.txt --no-split --no-headers \"$srcfile\""
-echo "Generating ASCII... ($cmd)"
-eval "$cmd"
-ascii_size=`calcsize $PACKAGE.txt`
-gzip -f -9 -c $PACKAGE.txt >"$outdir/$PACKAGE.txt.gz"
-ascii_gz_size=`calcsize "$outdir/$PACKAGE.txt.gz"`
-mv $PACKAGE.txt "$outdir/"
+if $generate_ascii; then
+  opt="-o $PACKAGE.txt --no-split --no-headers $commonarg"
+  cmd="$SETLANG $MAKEINFO $opt \"$srcfile\""
+  printf "\nGenerating ascii... ($cmd)\n"
+  eval "$cmd"
+  ascii_size=`calcsize $PACKAGE.txt`
+  gzip -f -9 -c $PACKAGE.txt >"$outdir/$PACKAGE.txt.gz"
+  ascii_gz_size=`calcsize "$outdir/$PACKAGE.txt.gz"`
+  mv $PACKAGE.txt "$outdir/"
+  ls -l "$outdir/$PACKAGE.txt" "$outdir/$PACKAGE.txt.gz"
+fi
 
 html_split()
 {
-  opt="--split=$1 $htmlarg --node-files"
+  opt="--split=$1 --node-files $commonarg $htmlarg"
   cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html $opt \"$srcfile\""
-  echo "Generating html by $1... ($cmd)"
+  printf "\nGenerating html by $1... ($cmd)\n"
   eval "$cmd"
   split_html_dir=$PACKAGE.html
   (
@@ -249,32 +327,39 @@ html_split()
 }
 
 if test -z "$use_texi2html"; then
-  opt="--no-split --html -o $PACKAGE.html $htmlarg"
+  opt="--no-split --html -o $PACKAGE.html $commonarg $htmlarg"
   cmd="$SETLANG $MAKEINFO $opt \"$srcfile\""
-  echo "Generating monolithic html... ($cmd)"
+  printf "\nGenerating monolithic html... ($cmd)\n"
   rm -rf $PACKAGE.html  # in case a directory is left over
   eval "$cmd"
   html_mono_size=`calcsize $PACKAGE.html`
   gzip -f -9 -c $PACKAGE.html >"$outdir/$PACKAGE.html.gz"
   html_mono_gz_size=`calcsize "$outdir/$PACKAGE.html.gz"`
+  copy_images "$outdir/" $PACKAGE.html
   mv $PACKAGE.html "$outdir/"
+  ls -l "$outdir/$PACKAGE.html" "$outdir/$PACKAGE.html.gz"
 
-  cmd="$SETLANG $MAKEINFO --html -o $PACKAGE.html $htmlarg \"$srcfile\""
-  echo "Generating html by node... ($cmd)"
+  opt="--html -o $PACKAGE.html --split=$split $commonarg $htmlarg"
+  cmd="$SETLANG $MAKEINFO $opt \"$srcfile\""
+  printf "\nGenerating html by $split... ($cmd)\n"
   eval "$cmd"
   split_html_dir=$PACKAGE.html
+  copy_images $split_html_dir/ $split_html_dir/*.html
   (
-   cd ${split_html_dir} || exit 1
-   tar -czf "$abs_outdir/${PACKAGE}.html_node.tar.gz" -- *.html
+    cd $split_html_dir || exit 1
+    tar -czf "$abs_outdir/$PACKAGE.html_$split.tar.gz" -- *
   )
-  html_node_tgz_size=`calcsize "$outdir/${PACKAGE}.html_node.tar.gz"`
-  rm -f "$outdir"/html_node/*.html
-  mkdir -p "$outdir/html_node/"
-  mv ${split_html_dir}/*.html "$outdir/html_node/"
-  rmdir ${split_html_dir}
-else
-  cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html $htmlarg \"$srcfile\""
-  echo "Generating monolithic html... ($cmd)"
+  eval \
+    html_${split}_tgz_size=`calcsize "$outdir/$PACKAGE.html_$split.tar.gz"`
+  rm -rf "$outdir/html_$split/"
+  mv $split_html_dir "$outdir/html_$split/"
+  du -s "$outdir/html_$split/"
+  ls -l "$outdir/$PACKAGE.html_$split.tar.gz"
+
+else # use texi2html:
+  opt="--output $PACKAGE.html $commonarg $htmlarg"
+  cmd="$SETLANG $TEXI2HTML $opt \"$srcfile\""
+  printf "\nGenerating monolithic html with texi2html... ($cmd)\n"
   rm -rf $PACKAGE.html  # in case a directory is left over
   eval "$cmd"
   html_mono_size=`calcsize $PACKAGE.html`
@@ -287,18 +372,20 @@ else
   html_split section
 fi
 
-echo Making .tar.gz for sources...
+printf "\nMaking .tar.gz for sources...\n"
 d=`dirname $srcfile`
 (
   cd "$d"
-  srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null` || true
-  tar cvzfh "$abs_outdir/$PACKAGE.texi.tar.gz" $srcfiles
+  srcfiles=`ls -d *.texinfo *.texi *.txi *.eps $source_extra 2>/dev/null` || true
+  tar czfh "$abs_outdir/$PACKAGE.texi.tar.gz" $srcfiles
+  ls -l "$abs_outdir/$PACKAGE.texi.tar.gz"
 )
 texi_tgz_size=`calcsize "$outdir/$PACKAGE.texi.tar.gz"`
 
 if test -n "$docbook"; then
-  cmd="$SETLANG $MAKEINFO -o - --docbook \"$srcfile\" > ${srcdir}/$PACKAGE-db.xml"
-  echo "Generating docbook XML... ($cmd)"
+  opt="-o - --docbook $commonarg"
+  cmd="$SETLANG $MAKEINFO $opt \"$srcfile\" >${srcdir}/$PACKAGE-db.xml"
+  printf "\nGenerating docbook XML... ($cmd)\n"
   eval "$cmd"
   docbook_xml_size=`calcsize $PACKAGE-db.xml`
   gzip -f -9 -c $PACKAGE-db.xml >"$outdir/$PACKAGE-db.xml.gz"
@@ -306,8 +393,9 @@ if test -n "$docbook"; then
   mv $PACKAGE-db.xml "$outdir/"
 
   split_html_db_dir=html_node_db
-  cmd="${DOCBOOK2HTML} -o $split_html_db_dir \"${outdir}/$PACKAGE-db.xml\""
-  echo "Generating docbook HTML... ($cmd)"
+  opt="$commonarg -o $split_html_db_dir"
+  cmd="$DOCBOOK2HTML $opt \"${outdir}/$PACKAGE-db.xml\""
+  printf "\nGenerating docbook HTML... ($cmd)\n"
   eval "$cmd"
   (
     cd ${split_html_db_dir} || exit 1
@@ -319,33 +407,28 @@ if test -n "$docbook"; then
   mv ${split_html_db_dir}/*.html "$outdir/html_node_db/"
   rmdir ${split_html_db_dir}
 
-  cmd="${DOCBOOK2TXT} \"${outdir}/$PACKAGE-db.xml\""
-  echo "Generating docbook ASCII... ($cmd)"
+  cmd="$DOCBOOK2TXT \"${outdir}/$PACKAGE-db.xml\""
+  printf "\nGenerating docbook ASCII... ($cmd)\n"
   eval "$cmd"
   docbook_ascii_size=`calcsize $PACKAGE-db.txt`
   mv $PACKAGE-db.txt "$outdir/"
 
-  cmd="${DOCBOOK2PS} \"${outdir}/$PACKAGE-db.xml\""
-  echo "Generating docbook PS... ($cmd)"
-  eval "$cmd"
-  gzip -f -9 -c $PACKAGE-db.ps >"$outdir/$PACKAGE-db.ps.gz"
-  docbook_ps_gz_size=`calcsize "$outdir/$PACKAGE-db.ps.gz"`
-  mv $PACKAGE-db.ps "$outdir/"
-
-  cmd="${DOCBOOK2PDF} \"${outdir}/$PACKAGE-db.xml\""
-  echo "Generating docbook PDF... ($cmd)"
+  cmd="$DOCBOOK2PDF \"${outdir}/$PACKAGE-db.xml\""
+  printf "\nGenerating docbook PDF... ($cmd)\n"
   eval "$cmd"
   docbook_pdf_size=`calcsize $PACKAGE-db.pdf`
   mv $PACKAGE-db.pdf "$outdir/"
 fi
 
-echo "Writing index file..."
+printf "\nMaking index file...\n"
 if test -z "$use_texi2html"; then
-   CONDS="/%%IF  *HTML_SECTION%%/,/%%ENDIF  *HTML_SECTION%%/d;\
-          /%%IF  *HTML_CHAPTER%%/,/%%ENDIF  *HTML_CHAPTER%%/d"
+  CONDS="/%%IF  *HTML_SECTION%%/,/%%ENDIF  *HTML_SECTION%%/d;\
+         /%%IF  *HTML_CHAPTER%%/,/%%ENDIF  *HTML_CHAPTER%%/d"
 else
-   CONDS="/%%ENDIF.*%%/d;/%%IF  *HTML_SECTION%%/d;/%%IF  *HTML_CHAPTER%%/d"
+  # should take account of --split here.
+  CONDS="/%%ENDIF.*%%/d;/%%IF  *HTML_SECTION%%/d;/%%IF  *HTML_CHAPTER%%/d"
 fi
+
 curdate=`$SETLANG date '+%B %d, %Y'`
 sed \
    -e "s!%%TITLE%%!$MANUAL_TITLE!g" \
@@ -360,13 +443,11 @@ sed \
    -e "s!%%INFO_TGZ_SIZE%%!$info_tgz_size!g" \
    -e "s!%%DVI_GZ_SIZE%%!$dvi_gz_size!g" \
    -e "s!%%PDF_SIZE%%!$pdf_size!g" \
-   -e "s!%%PS_GZ_SIZE%%!$ps_gz_size!g" \
    -e "s!%%ASCII_SIZE%%!$ascii_size!g" \
    -e "s!%%ASCII_GZ_SIZE%%!$ascii_gz_size!g" \
    -e "s!%%TEXI_TGZ_SIZE%%!$texi_tgz_size!g" \
    -e "s!%%DOCBOOK_HTML_NODE_TGZ_SIZE%%!$html_node_db_tgz_size!g" \
    -e "s!%%DOCBOOK_ASCII_SIZE%%!$docbook_ascii_size!g" \
-   -e "s!%%DOCBOOK_PS_GZ_SIZE%%!$docbook_ps_gz_size!g" \
    -e "s!%%DOCBOOK_PDF_SIZE%%!$docbook_pdf_size!g" \
    -e "s!%%DOCBOOK_XML_SIZE%%!$docbook_xml_size!g" \
    -e "s!%%DOCBOOK_XML_GZ_SIZE%%!$docbook_xml_gz_size!g" \
diff --git a/docs/gendocs_template b/docs/gendocs_template
index 81fc836b..63fbe539 100644
--- a/docs/gendocs_template
+++ b/docs/gendocs_template
@@ -1,18 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!--#include virtual="/server/header.html" -->
+<title>%%TITLE%% - GNU Project - Free Software Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<h2>%%TITLE%%</h2>
 
-<head>
-<title>%%TITLE%%</title>
-<meta http-equiv="content-type" content='text/html; charset=utf-8' />
-<link rel="stylesheet" type="text/css" href="/gnu.css" />
-<link rev="made" href="admin-0droid.org" />
-</head>
-
-<body>
-
-<h3>%%TITLE%%</h3>
+<address>Free Software Foundation</address>
+<address>last updated %%DATE%%</address>
 
 <p>This manual (%%PACKAGE%%) is available in the following formats:</p>
 
@@ -53,16 +45,43 @@
     (%%ASCII_GZ_SIZE%%K bytes gzipped)</a>.</li>
 <li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file
     (%%DVI_GZ_SIZE%%K bytes gzipped)</a>.</li>
-<li><a href="%%PACKAGE%%.ps.gz">PostScript file
-    (%%PS_GZ_SIZE%%K bytes gzipped)</a>.</li>
 <li><a href="%%PACKAGE%%.pdf">PDF file
     (%%PDF_SIZE%%K bytes)</a>.</li>
 <li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source
     (%%TEXI_TGZ_SIZE%%K bytes gzipped tar file).</a></li>
 </ul>
 
+<p>You can <a href="http://shop.fsf.org/">buy printed copies of
+some manuals</a> (among other items) from the Free Software Foundation;
+this helps support FSF activities.</p>
+
 <p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%%
 script</a>.)</p>
 
+<!-- If needed, change the copyright block at the bottom. In general,
+     all pages on the GNU web server should have the section about
+     verbatim copying.  Please do NOT remove this without talking
+     with the webmasters first.
+     Please make sure the copyright date is consistent with the document
+     and that it is like this: "2001, 2002", not this: "2001-2002". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:gnu@gnu.org">&lt;gnu@gnu.org&gt;</a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:%%EMAIL%%">&lt;%%EMAIL%%&gt;</a>.</p>
+
+<p>Copyright &copy; 2013 Free Software Foundation, Inc.</p>
+
+<p>Verbatim copying and distribution of this entire article are
+permitted worldwide, without royalty, in any medium, provided this
+notice, and the copyright notice, are preserved.</p>
+
+</div>
+</div>
 </body>
 </html>

From f5946a687e3dd22ad869c785d531b8a59770ef73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 16:48:07 +0100
Subject: [PATCH 09/68] Change texi encoding to utf-8 from us-ascii

---
 docs/fdroid.texi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 829dfe9f..9e7872dd 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -1,6 +1,7 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
 @setfilename fdroid.info
+@documentencoding UTF-8
 @settitle F-Droid Server Manual
 @c %**end of header
 

From 6773d5e70b17025431e824fe729794aa24275d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 16:54:26 +0100
Subject: [PATCH 10/68] Update the docs with the new package argument syntax
 and 'fdroid install'

---
 docs/fdroid.texi | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 9e7872dd..e0867fc3 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -307,12 +307,12 @@ To build a single version of a single application, you could run the
 following:
 
 @example
-./fdroid build --package=org.fdroid.fdroid --vercode 16
+./fdroid build org.fdroid.fdroid:16
 @end example
 
 This attempts to build version code 16 (which is version 0.25) of the F-Droid
-client. Many of the tools recognise this @code{--package} parameter, allowing
-their activity to be limited to just a single package.
+client. Many of the tools recognise arguments as packages, allowing their
+activity to be limited to just a limited set of packages.
 
 If the build above was successful, two files will have been placed in the
 @code{unsigned} directory:
@@ -361,15 +361,14 @@ party.
 
 @section Direct Installation
 
-You can also build and install directly to a connected device or emulator using
-the @code{--install} switch. If you do this without using @code{--package} and
-@code{--vercode} then all versions of all packages will be installed (with each
-individual version overwriting the previous!). In most cases, this will not be
-what you want to do, so execution will stop straight away. However, you can
-override this if you're sure that's what you want, by using @code{--all}.
-Note that currently, no sanity checks are performed with this mode, so that if 
-the version is incorrect or that if the package name is different, you won't 
-be informed.
+You can also build and install directly to a connected device or emulator
+using the @code{fdroid install} command. If you do this without passing
+packages as arguments then all the latest built and signed version available
+of each package will be installed . In most cases, this will not be what you
+want to do, so execution will stop straight away. However, you can override
+this if you're sure that's what you want, by using @code{--all}.  Note that
+currently, no sanity checks are performed with this mode, so if the files in
+the signed output directory were modified, you won't be notified.
 
 
 @node Importing Applications

From 4ac7b02f5371c759970eba45c6761ddcb9d85e04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 17:02:19 +0100
Subject: [PATCH 11/68] There is no longer any Vagrantfile

---
 docs/fdroid.texi | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index e0867fc3..0a42c97f 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -1396,14 +1396,12 @@ boot, you need to set @code{GRUB_RECORDFAIL_TIMEOUT} to a value other than
 -1 in @code{/etc/grub/default} and then run @code{update-grub}.
 @end enumerate
 
-You may also want to edit @code{buildserver/Vagrantfile} - in particular
-there is a path for retrieving the base box if it doesn't exist, and an
-apt proxy definition, both of which may need customising for your
-environment.
 
 With this base box available, you should then create @code{makebs.config.py},
 using @code{makebs.config.sample.py} as a reference - look at the settings and
 documentation there to decide if any need changing to suit your environment.
+There is a path for retrieving the base box if it doesn't exist, and an apt
+proxy definition, both of which may need customising for your environment.
 You can then go to the @code{fdroidserver} directory and run this:
 
 @example
@@ -1425,9 +1423,9 @@ can supply a pre-populated cache directory which includes not only these
 downloads, but also .tar.gz files for all the relevant additions. If the
 provisioning scripts detect these, they will be used in preference to
 running the android tools. For example, if you have
-@code{buildserver/addons/cache/platforms/android-15.tar.gz} that will be
-used when installing the android-15 platform, instead of re-downloading it
-using @code{android update sdk --no-ui -t android-15}.
+@code{buildserver/addons/cache/platforms/android-19.tar.gz} that will be
+used when installing the android-19 platform, instead of re-downloading it
+using @code{android update sdk --no-ui -t android-19}.
 
 Once it's complete you'll have a new base box called 'buildserver' which is
 what's used for the actual builds. You can then build packages as normal,

From e237310c0f6407fa172754935753b366d89057ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 17:02:48 +0100
Subject: [PATCH 12/68] Separate dependencies, some aren't needed if you are
 using a VM

---
 docs/fdroid.texi | 49 +++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 0a42c97f..083ed55d 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -94,34 +94,11 @@ all, of the following:
 
 @itemize @bullet
 @item
-All SDK platforms requested by the apps you want to build
-(The Android SDK is made available by Google under a proprietary license but
-within that, the SDK platforms, support library and some other components are 
-under the Apache license and source code is provided. 
-Google APIs, used for building apps using Google Maps, are free to the extent 
-that the library comes pre-installed on the device.
-Google Play Services, Google Admob and others are proprietary and shouldn't be
-included in the main F-Droid repository.)
-@item
-A version of the Android NDK
-@item
-Ant
-@item
-Ant Contrib Tasks (Debian package ant-contrib)
-@item
-Maven (Debian package maven)
-@item
-JavaCC (Debian package javacc)
-@item
 JDK (Debian package openjdk-6-jdk): openjdk-6 is recommended though openjdk-7
 should work too
 @item
 VCS clients: svn, git, git-svn, hg, bzr
 @item
-Miscellaneous packages listed in 
-buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
-of the F-Droid server repository
-@item
 A keystore for holding release keys. (Safe, secure and well backed up!)
 @end itemize
 
@@ -143,6 +120,32 @@ Imaging (debian package python-imaging)
 Magic (debian package python-magic)
 @end itemize
 
+On the other hand, if you want to build the apps directly on your system
+without the 'Build Server' system, you may need:
+
+@itemize @bullet
+@item
+All SDK platforms requested by the apps you want to build
+(The Android SDK is made available by Google under a proprietary license but
+within that, the SDK platforms, support library and some other components are 
+under the Apache license and source code is provided. 
+Google APIs, used for building apps using Google Maps, are free to the extent 
+that the library comes pre-installed on the device.
+Google Play Services, Google Admob and others are proprietary and shouldn't be
+included in the main F-Droid repository.)
+@item
+A version of the Android NDK
+@item
+Ant with Contrib Tasks (Debian packages ant and ant-contrib)
+@item
+Maven (Debian package maven)
+@item
+JavaCC (Debian package javacc)
+@item
+Miscellaneous packages listed in 
+buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+of the F-Droid server repository
+@end itemize
 
 @node Setup
 @chapter Setup

From a638202ec6a0fa0333b33304bc884da18e797bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 17:04:16 +0100
Subject: [PATCH 13/68] Remove trailing spaces and tabs

---
 config.sample.py                  |   2 +-
 docs/fdroid.texi                  | 214 +++++++++++++++---------------
 fd-commit                         |   2 +-
 fdroidserver/build.py             |   8 +-
 fdroidserver/common.py            |  22 +--
 fdroidserver/getsig/getsig.java   |   6 +-
 fdroidserver/import.py            |   2 +-
 fdroidserver/install.py           |   2 +-
 fdroidserver/metadata.py          |   2 +-
 fdroidserver/scanner.py           |   2 +-
 fdroidserver/update.py            |   8 +-
 makebuildserver.py                |   2 +-
 wp-fdroid/android-permissions.php |   2 +-
 wp-fdroid/wp-fdroid.php           |  10 +-
 14 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/config.sample.py b/config.sample.py
index 394fed34..ea113beb 100644
--- a/config.sample.py
+++ b/config.sample.py
@@ -40,7 +40,7 @@ repo_url = "https://f-droid.org/repo"
 repo_name = "F-Droid"
 repo_icon = "fdroid-icon.png"
 repo_description = """
-The official repository of the F-Droid client. Applications in this repository 
+The official repository of the F-Droid client. Applications in this repository
 are either official binaries built by the original application developers, or
 are binaries built from source by the admin of f-droid.org using the tools on
 https://gitorious.org/f-droid.
diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 083ed55d..7ad95630 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -81,11 +81,11 @@ GNU/Linux
 @item
 Python 2.x
 @item
-The Android SDK Tools and Build-tools. 
-Note that F-Droid does not assume that you have the Android SDK in your 
-@code{PATH}: these directories will be specified in your repository 
-configuration. Recent revisions of the SDK have @code{aapt} located in 
-android-sdk/build-tools/ and it may be necessary to make a symlink to it in 
+The Android SDK Tools and Build-tools.
+Note that F-Droid does not assume that you have the Android SDK in your
+@code{PATH}: these directories will be specified in your repository
+configuration. Recent revisions of the SDK have @code{aapt} located in
+android-sdk/build-tools/ and it may be necessary to make a symlink to it in
 android-sdk/platform-tools/
 @end itemize
 
@@ -127,9 +127,9 @@ without the 'Build Server' system, you may need:
 @item
 All SDK platforms requested by the apps you want to build
 (The Android SDK is made available by Google under a proprietary license but
-within that, the SDK platforms, support library and some other components are 
-under the Apache license and source code is provided. 
-Google APIs, used for building apps using Google Maps, are free to the extent 
+within that, the SDK platforms, support library and some other components are
+under the Apache license and source code is provided.
+Google APIs, used for building apps using Google Maps, are free to the extent
 that the library comes pre-installed on the device.
 Google Play Services, Google Admob and others are proprietary and shouldn't be
 included in the main F-Droid repository.)
@@ -142,7 +142,7 @@ Maven (Debian package maven)
 @item
 JavaCC (Debian package javacc)
 @item
-Miscellaneous packages listed in 
+Miscellaneous packages listed in
 buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
 of the F-Droid server repository
 @end itemize
@@ -347,18 +347,18 @@ A similar effect could by achieved by simply deleting the output files from
 @code{unsigned} after the build, but with the risk of forgetting to do so!
 
 Along similar lines (and only in conjunction with @code{--test}, you can use
-@code{--force} to force a build of a Disabled application, where normally it 
-would be completely ignored. Similarly a version that was found to contain 
-ELFs or known non-free libraries can be forced to build. See also — 
+@code{--force} to force a build of a Disabled application, where normally it
+would be completely ignored. Similarly a version that was found to contain
+ELFs or known non-free libraries can be forced to build. See also —
 scanignore= and scandelete= in the Build Version section.
 
-If the build was unsuccessful, you can find out why by looking at the output 
-in the logs/ directory. If that isn't illuminating, try building the app the 
+If the build was unsuccessful, you can find out why by looking at the output
+in the logs/ directory. If that isn't illuminating, try building the app the
 regular way, step by step: android update project, ndk-build, ant debug.
 
-Note that source code repositories often contain prebuilt libraries. If the 
-app is being considered for the main F-Droid repository, it is important that 
-all such prebuilts are built either via the metadata or by a reputable third 
+Note that source code repositories often contain prebuilt libraries. If the
+app is being considered for the main F-Droid repository, it is important that
+all such prebuilts are built either via the metadata or by a reputable third
 party.
 
 
@@ -509,10 +509,10 @@ This is converted to (@code{<categories>}) in the public index file.
 
 @cindex license
 
-The overall license for the application, or in certain cases, for the 
-source code only. 
+The overall license for the application, or in certain cases, for the
+source code only.
 
-Common values: 
+Common values:
 
 @itemize @bullet
 
@@ -534,8 +534,8 @@ GNU GPL version 3 or later
 
 @item
 @samp{GPL}
-An unspecified GPL version. Use this only as a last resort or if there is 
-some confusion over compatiblity of component licenses: particularly the use of 
+An unspecified GPL version. Use this only as a last resort or if there is
+some confusion over compatiblity of component licenses: particularly the use of
 Apache libraries with GPLv2 source code.
 
 @item
@@ -578,10 +578,10 @@ checkupdates} is run.
 
 @cindex Name
 
-The name of the application. Normally, this field should not be present since 
-the application's correct name is retrieved from the APK file. However, in a 
-situation where an APK contains a bad or missing application name, it can be 
-overridden using this. Note that this only overrides the name in the list of 
+The name of the application. Normally, this field should not be present since
+the application's correct name is retrieved from the APK file. However, in a
+situation where an APK contains a bad or missing application name, it can be
+overridden using this. Note that this only overrides the name in the list of
 apps presented in the client; it doesn't changed the name or application label
 in the source code.
 
@@ -664,8 +664,8 @@ A litecoin address for donating to the project.
 
 @cindex Summary
 
-A brief summary of what the application is. Since the summary is only allowed 
-one line on the list of the F-Droid client, keeping it to within 32 characters 
+A brief summary of what the application is. Since the summary is only allowed
+one line on the list of the F-Droid client, keeping it to within 32 characters
 will ensure it fits even on the smallest screens.
 
 @node Description
@@ -673,8 +673,8 @@ will ensure it fits even on the smallest screens.
 
 @cindex Description
 
-A full description of the application, relevant to the latest version. 
-This can span multiple lines (which should be kept to a maximum of 80 
+A full description of the application, relevant to the latest version.
+This can span multiple lines (which should be kept to a maximum of 80
 characters), and is terminated by a line containing a single '.'.
 
 Basic MediaWiki-style formatting can be used. Leaving a blank line starts a
@@ -694,11 +694,11 @@ Bulletted lists are done by simply starting each item with a @code{*} on
 a new line, and numbered lists are the same but using @code{#}. There is
 currently no support for nesting lists - you can have one level only.
 
-It can be helpful to note information pertaining to updating from an 
-earlier version; whether the app contains any prebuilts built by the 
-upstream developers or whether non-free elements were removed; whether the 
-app is in rapid development or whether the latest version lags behind the 
-current version; whether the app supports multiple architectures or whether 
+It can be helpful to note information pertaining to updating from an
+earlier version; whether the app contains any prebuilts built by the
+upstream developers or whether non-free elements were removed; whether the
+app is in rapid development or whether the latest version lags behind the
+current version; whether the app supports multiple architectures or whether
 there is a maximum SDK specified (such info not being recorded in the index).
 
 This is converted to (@code{<desc>}) in the public index file.
@@ -795,8 +795,8 @@ can also be achieved by starting the commit ID with '!')
 The purpose of this feature is to allow non-buildable releases (e.g. the source
 is not published) to be flagged, so the scripts don't generate repeated
 messages about them. (And also to record the information for review later).
-If an apk has already been built, disabling causes it to be deleted once 
-@code{fdroid update} is run; this is the procedure if ever a version has to 
+If an apk has already been built, disabling causes it to be deleted once
+@code{fdroid update} is run; this is the procedure if ever a version has to
 be replaced.
 
 @item subdir=<path>
@@ -822,13 +822,13 @@ is sdk-location. Typically, if you get a message along the lines of:
 try enabling this option.
 
 @item target=<target>
-Specifies a particular SDK target for compilation, overriding the 
-project.properties of the app and possibly sub-projects. Note that this does 
-not change the target SDK in the AndroidManifest.xml — the level of features 
-that can be included in the build. This is likely to cause the whole build.xml 
-to be rewritten, which is fine if it's a 'standard' android file or doesn't 
-already exist, but not a good idea if it's heavily customised. If you get an 
-error about invalid target, first try @code{init=rm -rf bin/}; otherwise this 
+Specifies a particular SDK target for compilation, overriding the
+project.properties of the app and possibly sub-projects. Note that this does
+not change the target SDK in the AndroidManifest.xml — the level of features
+that can be included in the build. This is likely to cause the whole build.xml
+to be rewritten, which is fine if it's a 'standard' android file or doesn't
+already exist, but not a good idea if it's heavily customised. If you get an
+error about invalid target, first try @code{init=rm -rf bin/}; otherwise this
 parameter should do the trick.
 
 Please note that gradle builds should be using compilesdk=.
@@ -867,8 +867,8 @@ If specified, the package version in AndroidManifest.xml is replaced
 with the version name for the build as specified in the metadata.
 
 This is useful for cases when upstream repo failed to update it for
-specific tag; to build an arbitrary revision; to make it apparent that 
-the version differs significantly from upstream; or to make it apparent 
+specific tag; to build an arbitrary revision; to make it apparent that
+the version differs significantly from upstream; or to make it apparent
 which architecture or platform the apk is designed to run on.
 
 @item forcevercode=yes
@@ -902,18 +902,18 @@ Specifies a list of external libraries (jar files) from the
 of the project. Separate items with semicolons.
 
 @item srclibs=a@@r;b@@r1;
-Specifies a list of source libraries or Android projects. Separate items with 
-semicolons, and each item is of the form name@@rev where name is the predefined 
-source library name and rev is the revision or tag in source control to use. 
+Specifies a list of source libraries or Android projects. Separate items with
+semicolons, and each item is of the form name@@rev where name is the predefined
+source library name and rev is the revision or tag in source control to use.
 
-Each srclib has a metadata file under srclibs/ in the repository directory, 
-and the source code is stored in build/srclib/. 
-Repo Type: and Repo: are specified in the same way as for apps; Subdir: can be 
-a comma separated list, for when directories are renamed by upstream; Update 
-Project: updates the projects in the working directory and one level down; 
-Prepare: can be used for any kind of preparation: in particular if you need to 
-update the project with a particular target. You can then also use $$name$$ in 
-the init/prebuild/build command to substitute the relative path to the library 
+Each srclib has a metadata file under srclibs/ in the repository directory,
+and the source code is stored in build/srclib/.
+Repo Type: and Repo: are specified in the same way as for apps; Subdir: can be
+a comma separated list, for when directories are renamed by upstream; Update
+Project: updates the projects in the working directory and one level down;
+Prepare: can be used for any kind of preparation: in particular if you need to
+update the project with a particular target. You can then also use $$name$$ in
+the init/prebuild/build command to substitute the relative path to the library
 directory, but it could need tweaking if you've changed into another directory.
 
 @item patch=x
@@ -940,7 +940,7 @@ You can use $$name$$ to substitute the path to a referenced srclib - see
 the @code{srclib} directory for details of this.
 
 You can use $$SDK$$, $$NDK$$ and $$MVN3$$ to substitute the paths to the
-android SDK and NDK directories, and maven 3 executable respectively e.g. 
+android SDK and NDK directories, and maven 3 executable respectively e.g.
 for when you need to run @code{android update project} explicitly.
 
 @item scanignore=path1;path2;...
@@ -1008,7 +1008,7 @@ of the checked out repo. Not yet implemented for gradle.
 Specify an alternate ant command (target) instead of the default
 'release'. It can't be given any flags, such as the path to a build.xml.
 
-@item novcheck=yes 
+@item novcheck=yes
 Don't check that the version name and code in the resulting apk are
 correct by looking at the build output - assume the metadata is
 correct. This takes away a useful level of sanity checking, and should
@@ -1026,9 +1026,9 @@ Another example, using extra parameters:
 @cindex AntiFeatures
 
 This is optional - if present, it contains a comma-separated list of any of
-the following values, describing an anti-feature the application has. 
-Even though such apps won't be displayed unless a settings box is ticked, 
-it is a good idea to mention the reasons for the anti-feature(s) in the 
+the following values, describing an anti-feature the application has.
+Even though such apps won't be displayed unless a settings box is ticked,
+it is a good idea to mention the reasons for the anti-feature(s) in the
 description:
 
 @itemize @bullet
@@ -1038,18 +1038,18 @@ description:
 
 @item
 @samp{Tracking} - the application tracks and reports your activity to
-somewhere without your consent. It's commonly used for when developers 
-obtain crash logs without the user's consent, or when an app is useless 
+somewhere without your consent. It's commonly used for when developers
+obtain crash logs without the user's consent, or when an app is useless
 without some kind of authentication.
 
 @item
-@samp{NonFreeNet} - the application relies on computational services that 
-are impossible to replace or that the replacement cannot be connected to 
+@samp{NonFreeNet} - the application relies on computational services that
+are impossible to replace or that the replacement cannot be connected to
 without major changes to the app.
 
 @item
-@samp{NonFreeAdd} - the application promotes non-Free add-ons, such that the 
-app is effectively an advert for other non-free software and such software is 
+@samp{NonFreeAdd} - the application promotes non-Free add-ons, such that the
+app is effectively an advert for other non-free software and such software is
 not clearly labelled as such.
 
 @item
@@ -1067,9 +1067,9 @@ include it.
 If this field is present, the application does not get put into the public
 index. This allows metadata to be retained while an application is temporarily
 disabled from being published. The value should be a description of why the
-application is disabled. No apks or source code archives are deleted: to purge 
-an apk see the Build Version section or delete manually for developer builds. 
-The field is therefore used when an app has outlived it's usefulness, because 
+application is disabled. No apks or source code archives are deleted: to purge
+an apk see the Build Version section or delete manually for developer builds.
+The field is therefore used when an app has outlived it's usefulness, because
 the source tarball is retained.
 
 @node Requires Root
@@ -1079,8 +1079,8 @@ the source tarball is retained.
 
 Set this optional field to "Yes" if the application requires root
 privileges to be usable. This lets the client filter it out if the
-user so desires. Whether root is required or not, it is good to give 
-a paragraph in the description to the conditions on which root may be 
+user so desires. Whether root is required or not, it is good to give
+a paragraph in the description to the conditions on which root may be
 asked for and the reason for it.
 
 @node Update Check Mode
@@ -1097,37 +1097,37 @@ Valid modes are:
 @itemize
 @item
 @code{None} - No checking is done because there's no appropriate automated way
-of doing so. Updates should be checked for manually. Use this, for example, 
-when deploying betas or patched versions; when builds are done in a directory 
-different to where the AndroidManifest.xml is; if the developers use the 
-gradle build system and store version info in a separate file; if the 
-developers make a new branch for each release and don't make tags; or if you've 
+of doing so. Updates should be checked for manually. Use this, for example,
+when deploying betas or patched versions; when builds are done in a directory
+different to where the AndroidManifest.xml is; if the developers use the
+gradle build system and store version info in a separate file; if the
+developers make a new branch for each release and don't make tags; or if you've
 changed the package name or version code logic.
 @item
 @code{Static} - No checking is done - either development has ceased or new versions
-are not desired. This method is also used when there is no other checking method 
+are not desired. This method is also used when there is no other checking method
 available and the upstream developer keeps us posted on new versions.
 @item
-@code{RepoManifest} - At the most recent commit, the AndroidManifest.xml file 
+@code{RepoManifest} - At the most recent commit, the AndroidManifest.xml file
 is looked for in the directory where it was found in the the most recent build.
-The appropriateness of this method depends on the development process used by 
-the application's developers. You should not specify this method unless you're 
-sure it's appropriate. For example, some developers bump the version when 
+The appropriateness of this method depends on the development process used by
+the application's developers. You should not specify this method unless you're
+sure it's appropriate. For example, some developers bump the version when
 commencing development instead of when publishing.
-It will return an error if the AndroidManifest.xml has moved to a different 
-directory or if the package name has changed. 
-The current version that it gives may not be accurate, since not all 
-versions are fit to be published. Therefore, before building, it is often 
-necessary to check if the current version has been published somewhere by the 
-upstream developers, either by checking for apks that they distribute or for 
-tags in the source code repository. 
+It will return an error if the AndroidManifest.xml has moved to a different
+directory or if the package name has changed.
+The current version that it gives may not be accurate, since not all
+versions are fit to be published. Therefore, before building, it is often
+necessary to check if the current version has been published somewhere by the
+upstream developers, either by checking for apks that they distribute or for
+tags in the source code repository.
 
-It currently works for every repository type to different extents, except 
-the srclib repo type. For git, git-svn and hg repo types, you may use 
-"RepoManifest/yourbranch" as UCM so that "yourbranch" would be the branch used 
-in place of the default one.  The default values are "master" for git, 
-"default" for hg and none for git-svn (it stays in the same branch). 
-On the other hand, branch support hasn't been implemented yet in bzr and svn, 
+It currently works for every repository type to different extents, except
+the srclib repo type. For git, git-svn and hg repo types, you may use
+"RepoManifest/yourbranch" as UCM so that "yourbranch" would be the branch used
+in place of the default one.  The default values are "master" for git,
+"default" for hg and none for git-svn (it stays in the same branch).
+On the other hand, branch support hasn't been implemented yet in bzr and svn,
 but RepoManifest may still be used without it.
 @item
 @code{RepoTrunk} - For svn and git-svn repositories, especially those who
@@ -1141,10 +1141,10 @@ that number.
 source repository is checked, looking for the highest version code. The
 appropriateness of this method depends on the development process used by the
 application's developers. You should not specify this method unless you're sure
-it's appropriate. It shouldn't be used if the developers like to tag betas or 
-are known to forget to tag releases. Like RepoManifest, it will not return the 
+it's appropriate. It shouldn't be used if the developers like to tag betas or
+are known to forget to tag releases. Like RepoManifest, it will not return the
 correct value if the directory containing the AndroidManifest.xml has moved.
-Despite these caveats, it is the often the favourite update check mode. 
+Despite these caveats, it is the often the favourite update check mode.
 
 It currently only works for git, hg, bzr and git-svn repositories. In the case
 of the latter, the repo URL must encode the path to the trunk and tags or else
@@ -1204,8 +1204,8 @@ of versions to keep.
 
 @cindex Auto Update Mode
 
-This determines the method using for auto-generating new builds when new 
-releases are available - in other words, adding a new Build Version line to the 
+This determines the method using for auto-generating new builds when new
+releases are available - in other words, adding a new Build Version line to the
 metadata.
 This happens in conjunction with the 'Update Check Mode' functionality - i.e.
 when an update is detected by that, it is also processed by this.
@@ -1237,10 +1237,10 @@ above, you would specify that as "Version +-fdroid %v" - "-fdroid" is the suffix
 
 The name of the version that is current. There may be newer versions of the
 application than this (e.g. betas), and there will almost certainly be older
-ones. This should be the one that is recommended for general use. 
-In the event that there is no source code for the current version, or that 
-non-free libraries are being used, this would ideally be the latest 
-version that is still free, though it may still be expedient to 
+ones. This should be the one that is recommended for general use.
+In the event that there is no source code for the current version, or that
+non-free libraries are being used, this would ideally be the latest
+version that is still free, though it may still be expedient to
 retain the automatic update check — see No Source Since.
 
 This field is normally automatically updated - see Update Check Mode.
@@ -1267,7 +1267,7 @@ This is converted to (@code{<marketvercode>}) in the public index file.
 @cindex No Source Since
 
 In case we are missing the source code for the Current Version reported by
-Upstream, or that non-free elements have been introduced, this defines the 
+Upstream, or that non-free elements have been introduced, this defines the
 first version that began to miss source code.
 Apps that are missing source code for just one or a few versions, but provide
 source code for newer ones are not to be considered here - this field is
@@ -1374,7 +1374,7 @@ would fail.
 
 Unless you're very trusting. you should create one of these for yourself
 from verified standard Ubuntu installation media. However, you could skip
-over the next few paragraphs (and sacrifice some security) by downloading 
+over the next few paragraphs (and sacrifice some security) by downloading
 @url{https://f-droid.org/raring32.box} or @url{https://f-droid.org/raring64.box}.
 
 Documentation for creating a base box can be found at
diff --git a/fd-commit b/fd-commit
index 8b78d93b..47b0e34b 100755
--- a/fd-commit
+++ b/fd-commit
@@ -11,7 +11,7 @@ fi
 while read line; do
 	if [[ "$line" == *M*metadata/*.txt ]]; then
 		file=${line##* }
-		
+
 		id=${file##*/}
 		id=${id%.txt*}
 		if [ $# -gt 0 ]; then
diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index a861bc79..32c43a32 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -464,7 +464,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
             print "Running 'build' commands in %s" % root_dir
 
         p = FDroidPopen(['bash', '-x', '-c', cmd], cwd=root_dir)
-        
+
         if p.returncode != 0:
             raise BuildException("Error running build command for %s:%s" %
                     (app['id'], thisbuild['version']), p.stdout, p.stderr)
@@ -533,7 +533,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
             raise BuildException("Expected to find buildozer-compatible spec at {0}"
                     .format(spec))
 
-        defaults = {'orientation': 'landscape', 'icon': '', 
+        defaults = {'orientation': 'landscape', 'icon': '',
                 'permissions': '', 'android.api': "18"}
         bconfig = ConfigParser(defaults, allow_no_value=True)
         bconfig.read(spec)
@@ -550,7 +550,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         cmd += ' ANDROIDAPI=' + str(bconfig.get('app', 'android.api'))
         cmd += ' VIRTUALENV=virtualenv'
         cmd += ' ./distribute.sh'
-        cmd += ' -m ' + "'" + ' '.join(modules) + "'" 
+        cmd += ' -m ' + "'" + ' '.join(modules) + "'"
         cmd += ' -d fdroid'
         if subprocess.call(cmd, cwd='python-for-android', shell=True) != 0:
             raise BuildException("Distribute build failed")
@@ -614,7 +614,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
 
         if flavour in ['main', 'yes', '']:
             flavour = ''
-        
+
         commands = [config['gradle']]
         if 'preassemble' in thisbuild:
             for task in thisbuild['preassemble'].split():
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 38e70a2a..f2e4b661 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -492,7 +492,7 @@ class vcs_svn(vcs):
     def userargs(self):
         if self.username is None:
             return ['--non-interactive']
-        return ['--username', self.username, 
+        return ['--username', self.username,
                 '--password', self.password,
                 '--non-interactive']
 
@@ -615,7 +615,7 @@ def manifest_paths(app_dir, flavour):
     if flavour:
         possible_manifests.append(
                 os.path.join(app_dir, 'src', flavour, 'AndroidManifest.xml'))
-    
+
     return [path for path in possible_manifests if os.path.isfile(path)]
 
 # Retrieve the package name
@@ -839,7 +839,7 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None, target=None,
             if p.returncode != 0:
                 raise BuildException("Error running prepare command for srclib %s"
                         % name, p.stdout, p.stderr)
-        
+
         if srclib["Update Project"] == "Yes":
             print "Updating srclib %s at path %s" % (name, libdir)
             cmd = [os.path.join(config['sdk_path'], 'tools', 'android'),
@@ -1234,7 +1234,7 @@ def scan_source(build_dir, root_dir, thisbuild):
     def removeproblem(what, fd, fp):
         print 'Removing %s at %s' % (what, fd)
         os.remove(fp)
-    
+
     def handleproblem(what, fd, fp):
         if todelete(fd):
             removeproblem(what, fd, fp)
@@ -1285,7 +1285,7 @@ def scan_source(build_dir, root_dir, thisbuild):
     # Presence of a jni directory without buildjni=yes might
     # indicate a problem... (if it's not a problem, explicitly use
     # buildjni=no to bypass this check)
-    if (os.path.exists(os.path.join(root_dir, 'jni')) and 
+    if (os.path.exists(os.path.join(root_dir, 'jni')) and
             thisbuild.get('buildjni') is None):
         msg = 'Found jni directory, but buildjni is not enabled'
         problems.append(msg)
@@ -1381,19 +1381,19 @@ class AsynchronousFileReader(threading.Thread):
     in a separate thread. Pushes read lines on a queue to
     be consumed in another thread.
     '''
- 
+
     def __init__(self, fd, queue):
         assert isinstance(queue, Queue.Queue)
         assert callable(fd.readline)
         threading.Thread.__init__(self)
         self._fd = fd
         self._queue = queue
- 
+
     def run(self):
         '''The body of the tread: read lines and put them on the queue.'''
         for line in iter(self._fd.readline, ''):
             self._queue.put(line)
- 
+
     def eof(self):
         '''Check whether there is no more content to expect.'''
         return not self.is_alive() and self._queue.empty()
@@ -1419,14 +1419,14 @@ def FDroidPopen(commands, cwd=None):
     result = PopenResult()
     p = subprocess.Popen(commands, cwd=cwd,
             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    
+
     stdout_queue = Queue.Queue()
     stdout_reader = AsynchronousFileReader(p.stdout, stdout_queue)
     stdout_reader.start()
     stderr_queue = Queue.Queue()
     stderr_reader = AsynchronousFileReader(p.stderr, stderr_queue)
     stderr_reader.start()
-    
+
     # Check the queues for output (until there is no more to get)
     while not stdout_reader.eof() or not stderr_reader.eof():
         # Show what we received from standard output
@@ -1460,7 +1460,7 @@ def remove_signing_keys(build_dir):
 
             with open(path, "r") as o:
                 lines = o.readlines()
-            
+
             opened = 0
             with open(path, "w") as o:
                 for line in lines:
diff --git a/fdroidserver/getsig/getsig.java b/fdroidserver/getsig/getsig.java
index e4dd1269..78e7ac0c 100644
--- a/fdroidserver/getsig/getsig.java
+++ b/fdroidserver/getsig/getsig.java
@@ -10,7 +10,7 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
 public class getsig {
- 
+
     public static void main(String[] args) {
 
         String apkPath = null;
@@ -29,12 +29,12 @@ public class getsig {
             System.out.println("Specify the APK file to get the signature from!");
             System.exit(1);
         }
- 
+
         try {
 
             JarFile apk = new JarFile(apkPath);
             java.security.cert.Certificate[] certs = null;
- 
+
             Enumeration entries = apk.entries();
             while (entries.hasMoreElements()) {
                 JarEntry je = (JarEntry) entries.nextElement();
diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index 0703eb85..3a4d3f75 100644
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -244,7 +244,7 @@ def main():
     else:
         spec = os.path.join(root_dir, 'buildozer.spec')
         if os.path.exists(spec):
-            defaults = {'orientation': 'landscape', 'icon': '', 
+            defaults = {'orientation': 'landscape', 'icon': '',
                     'permissions': '', 'android.api': "18"}
             bconfig = ConfigParser(defaults, allow_no_value=True)
             bconfig.read(spec)
diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index 0f444cff..ca32137d 100644
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -85,7 +85,7 @@ def main():
 
         apks = { common.apknameinfo(apkfile)[0] : apkfile for apkfile in
                 sorted(glob.glob(os.path.join(output_dir, '*.apk'))) }
-    
+
     for appid, apk in apks.iteritems():
         # Get device list each time to avoid device not found errors
         devs = devices()
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 2deb1a4a..1dc948ed 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -27,7 +27,7 @@ class MetaDataException(Exception):
     def __str__(self):
         return repr(self.value)
 
-# Designates a metadata field type and checks that it matches 
+# Designates a metadata field type and checks that it matches
 #
 # 'name'     - The long name of the field type
 # 'matching' - List of possible values or regex expression
diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 0e02ed0d..64cebfb2 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -89,7 +89,7 @@ def main():
                     # Do the scan...
                     buildprobs = common.scan_source(build_dir, root_dir, thisbuild)
                     for problem in buildprobs:
-                        problems.append(problem + 
+                        problems.append(problem +
                             ' in ' + app['id'] + ' ' + thisbuild['version'])
 
         except BuildException as be:
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 2446f852..0b705312 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -542,7 +542,7 @@ def make_index(apps, apks, repodir, archive, categories):
                 if app['id'] == link:
                     return ("fdroid.app:" + link, app['Name'])
             raise MetaDataException("Cannot resolve app id " + link)
-        addElement('desc', 
+        addElement('desc',
                 metadata.description_html(app['Description'], linkres), doc, apel)
         addElement('license', app['License'], doc, apel)
         if 'Categories' in app:
@@ -618,7 +618,7 @@ def make_index(apps, apks, repodir, archive, categories):
             if app['Requires Root']:
                 if 'ACCESS_SUPERUSER' not in apk['permissions']:
                     apk['permissions'].append('ACCESS_SUPERUSER')
-                
+
             if len(apk['permissions']) > 0:
                 addElement('permissions', ','.join(apk['permissions']), doc, apkel)
             if 'nativecode' in apk and len(apk['nativecode']) > 0:
@@ -639,7 +639,7 @@ def make_index(apps, apks, repodir, archive, categories):
         if not options.quiet:
             print "Creating signed index."
             print "Key fingerprint:", repo_pubkey_fingerprint
-        
+
         #Create a jar of the index...
         p = subprocess.Popen(['jar', 'cf', 'index.jar', 'index.xml'],
             cwd=repodir, stdout=subprocess.PIPE)
@@ -860,7 +860,7 @@ def main():
                 print "Generated skeleton metadata for " + apk['id']
             else:
                 print "WARNING: " + apk['apkname'] + " (" + apk['id'] + ") has no metadata"
-                print "       " + apk['name'] + " - " + apk['version']  
+                print "       " + apk['name'] + " - " + apk['version']
 
     if len(repodirs) > 1:
         archive_old_apks(apps, apks, repodirs[0], repodirs[1], config['archive_older'])
diff --git a/makebuildserver.py b/makebuildserver.py
index 6ecf3601..24774164 100755
--- a/makebuildserver.py
+++ b/makebuildserver.py
@@ -124,7 +124,7 @@ if 'aptproxy' in config and config['aptproxy']:
 vagrantfile += """
   config.vm.provision :chef_solo do |chef|
     chef.cookbooks_path = "cookbooks"
-    chef.log_level = :debug 
+    chef.log_level = :debug
     chef.json = {
       :settings => {
         :sdk_loc => "/home/vagrant/android-sdk",
diff --git a/wp-fdroid/android-permissions.php b/wp-fdroid/android-permissions.php
index e19b897a..c59bc6d4 100644
--- a/wp-fdroid/android-permissions.php
+++ b/wp-fdroid/android-permissions.php
@@ -15,7 +15,7 @@ class AndroidPermissions
 		$this->android_strings_file_path = $android_strings_file_path_in;
 		$this->cache_file_path = $cache_file_path_in;
 	}
-	
+
 	// Returns an associative array with android permissions and data about them
 	function get_permissions_array() {
 
diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index c837c024..70fcedd2 100644
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -93,7 +93,7 @@ class FDroid
 		if($query_vars['fdcategory'] == 'All categories') {
 			unset($query_vars['fdcategory']);
 		}
-		
+
 		if($query_vars['fdid']!==null) {
 			$out.=$this->get_app($query_vars);
 		} else {
@@ -533,7 +533,7 @@ class FDroid
 
 				$out.='<form name="categoryform" action="" method="get">';
 				$out.=$this->makeformdata($query_vars);
-				
+
 				$out.='<select name="fdcategory" style="color:#333333;" onChange="document.categoryform.submit();">';
 				foreach($categories as $category) {
 					$out.='<option';
@@ -542,7 +542,7 @@ class FDroid
 					$out.='>'.$category.'</option>';
 				}
 				$out.='</select>';
-				
+
 				$out.='</form>'."\n";
 			}
 			else {
@@ -820,7 +820,7 @@ function widget_fdroidlatest($args) {
 	extract($args);
 	echo $before_widget;
 	echo $before_title . 'Latest Apps' . $after_title;
-	
+
 	$handle = fopen(getenv('DOCUMENT_ROOT').'/repo/latestapps.dat', 'r');
 	if ($handle) {
 		while (($buffer = fgets($handle, 4096)) !== false) {
@@ -837,7 +837,7 @@ function widget_fdroidlatest($args) {
 		}
 		fclose($handle);
 	}
-	
+
 	echo $after_widget;
 }
 

From 69980ed6a509ea4d69f7903d4512d56e9d64e153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 17:11:38 +0100
Subject: [PATCH 14/68] Strip unnecessary exts from updateplugin and
 makebuildserver

---
 makebuildserver.py => makebuildserver | 0
 updateplugin.sh => updateplugin       | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename makebuildserver.py => makebuildserver (100%)
 rename updateplugin.sh => updateplugin (100%)

diff --git a/makebuildserver.py b/makebuildserver
similarity index 100%
rename from makebuildserver.py
rename to makebuildserver
diff --git a/updateplugin.sh b/updateplugin
similarity index 100%
rename from updateplugin.sh
rename to updateplugin

From f13fea8f8e81efb3e6bc6bae1d8840b353a046c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 17:11:52 +0100
Subject: [PATCH 15/68] Move example configs to a separate dir, add envs

---
 config.sample.py => sampleconfigs/config.sample.py              | 2 ++
 .../makebs.config.sample.py                                     | 2 ++
 2 files changed, 4 insertions(+)
 rename config.sample.py => sampleconfigs/config.sample.py (99%)
 rename makebs.config.sample.py => sampleconfigs/makebs.config.sample.py (95%)

diff --git a/config.sample.py b/sampleconfigs/config.sample.py
similarity index 99%
rename from config.sample.py
rename to sampleconfigs/config.sample.py
index ea113beb..0f4aeb2c 100644
--- a/config.sample.py
+++ b/sampleconfigs/config.sample.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python2
+
 # Copy this file to config.py, then amend the settings below according to
 # your system configuration.
 
diff --git a/makebs.config.sample.py b/sampleconfigs/makebs.config.sample.py
similarity index 95%
rename from makebs.config.sample.py
rename to sampleconfigs/makebs.config.sample.py
index 5969e20b..14fcaae5 100644
--- a/makebs.config.sample.py
+++ b/sampleconfigs/makebs.config.sample.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python2
+
 # You will need to alter these before running makebuildserver.py
 
 # Name of the base box to use...

From 96a84afc8a598b81d4569e5d85712b1c1cbb5c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 17:15:27 +0100
Subject: [PATCH 16/68] Add copyright notices to bash scripts

---
 README                     |  2 --
 completion/bash-completion | 18 +++++++++++++++++-
 fd-commit                  | 19 +++++++++++++++++--
 fdroid                     |  3 ++-
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/README b/README
index 58951b61..ee354e8d 100644
--- a/README
+++ b/README
@@ -1,4 +1,3 @@
-
 F-Droid is an installable catalogue of FOSS (Free and Open Source Software)
 applications for the Android platform. The client makes it easy to browse,
 install, and keep track of updates on your device.
@@ -11,4 +10,3 @@ assist in creating, testing and submitting metadata to the main repository.
 For documentation, please see the docs directory.
 
 Alternatively, visit http://f-droid.org/manual/
-
diff --git a/completion/bash-completion b/completion/bash-completion
index 12d7fe0d..b2644d2b 100644
--- a/completion/bash-completion
+++ b/completion/bash-completion
@@ -1,7 +1,23 @@
 #!/bin/bash
 #
-# fdroid completion support.
+# bash-completion - part of the FDroid server tools
+# Commits updates to apps, allowing you to edit the commit messages
 #
+# Copyright (C) 2013 Daniel Martí <mvdan@mvdan.cc>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # 'fdroid' is aliased automatically, but aliases to it are not. For instance,
 # to alias 'fd' to 'fdroid' and have competion available:
 #
diff --git a/fd-commit b/fd-commit
index 47b0e34b..a4e12113 100755
--- a/fd-commit
+++ b/fd-commit
@@ -1,6 +1,22 @@
 #!/bin/bash
-
+#
+# fd-commit - part of the FDroid server tools
 # Commits updates to apps, allowing you to edit the commit messages
+#
+# Copyright (C) 2013 Daniel Martí <mvdan@mvdan.cc>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 commands=()
 
@@ -72,4 +88,3 @@ done < <(git status --porcelain)
 for cmd in "${commands[@]}"; do
 	eval "$cmd"
 done
-
diff --git a/fdroid b/fdroid
index e7b54d91..0f75fc96 100755
--- a/fdroid
+++ b/fdroid
@@ -2,7 +2,8 @@
 # -*- coding: utf-8 -*-
 #
 # fdroid.py - part of the FDroid server tools
-# Copyright (C) 2010-12, Ciaran Gultnieks, ciaran@ciarang.com
+# Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com
+# Copyright (C) 2013 Daniel Martí <mvdan@mvdan.cc>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

From 90c27da3ead06cf95a3b114877ceb93c469f37c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 30 Dec 2013 17:18:45 +0100
Subject: [PATCH 17/68] Fix makebuildserver after rename, tidy gitignores

---
 .gitignore                            | 12 ------------
 docs/.gitignore                       | 14 +++++++++++++-
 docs/fdroid.texi                      |  2 +-
 makebuildserver                       |  2 +-
 sampleconfigs/makebs.config.sample.py |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index cdf207c3..b442d84d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,15 +6,3 @@
 *.box
 # files generated by build
 FDroidServer.egg-info/
-# generated docs files
-docs/fdroid.aux
-docs/fdroid.cp
-docs/fdroid.cps
-docs/fdroid.fn
-docs/fdroid.info
-docs/fdroid.ky
-docs/fdroid.log
-docs/fdroid.pg
-docs/fdroid.toc
-docs/fdroid.tp
-docs/fdroid.vr
diff --git a/docs/.gitignore b/docs/.gitignore
index 2886ec4f..642a2e6a 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1 +1,13 @@
-manual/
+/manual/
+# generated docs files
+/fdroid.aux
+/fdroid.cp
+/fdroid.cps
+/fdroid.fn
+/fdroid.info
+/fdroid.ky
+/fdroid.log
+/fdroid.pg
+/fdroid.toc
+/fdroid.tp
+/fdroid.vr
diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 7ad95630..a0006388 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -1408,7 +1408,7 @@ proxy definition, both of which may need customising for your environment.
 You can then go to the @code{fdroidserver} directory and run this:
 
 @example
-./makebuildserver.py
+./makebuildserver
 @end example
 
 This will take a long time, and use a lot of bandwidth - most of it spent
diff --git a/makebuildserver b/makebuildserver
index 24774164..3e81da79 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -44,7 +44,7 @@ options, args = parser.parse_args()
 config = {}
 execfile('makebs.config.py', config)
 
-if not os.path.exists('makebuildserver.py') or not os.path.exists(serverdir):
+if not os.path.exists('makebuildserver') or not os.path.exists(serverdir):
     print 'This must be run from the correct directory!'
     sys.exit(1)
 
diff --git a/sampleconfigs/makebs.config.sample.py b/sampleconfigs/makebs.config.sample.py
index 14fcaae5..4370765d 100644
--- a/sampleconfigs/makebs.config.sample.py
+++ b/sampleconfigs/makebs.config.sample.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2
 
-# You will need to alter these before running makebuildserver.py
+# You will need to alter these before running ./makebuildserver
 
 # Name of the base box to use...
 basebox = "raring32"

From 10fff5a12c44ab2b97cffc144f7dee5b75615480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 31 Dec 2013 10:17:49 +0100
Subject: [PATCH 18/68] Remove a few unnecessary vars

---
 completion/bash-completion | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/completion/bash-completion b/completion/bash-completion
index b2644d2b..4ac8602b 100644
--- a/completion/bash-completion
+++ b/completion/bash-completion
@@ -18,8 +18,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# 'fdroid' is aliased automatically, but aliases to it are not. For instance,
-# to alias 'fd' to 'fdroid' and have competion available:
+# 'fdroid' is completed automatically, but aliases to it are not.
+# For instance, to alias 'fd' to 'fdroid' and have competion available:
 #
 #	alias fd='fdroid'
 #	complete -F _fdroid fd
@@ -54,8 +54,7 @@ __apk_package() {
 }
 
 __apk_vercode() {
-	local p
-	p=${cur:0:-1}
+	local p=${cur:0:-1}
 
 	files=( ${1}/${p}_*.apk )
 	[ -f "${files[0]}" ] || return
@@ -66,8 +65,7 @@ __apk_vercode() {
 }
 
 __vercode() {
-	local p
-	p=${cur:0:-1}
+	local p=${cur:0:-1}
 
 	COMPREPLY=( $( compgen -P "${p}:" -W "$( while read line; do
 		if [[ "$line" == "Build Version:"* ]]
@@ -243,14 +241,13 @@ __complete_init() {
 }
 
 _fdroid() {
-	local cmd cmds aliased
+	local cmd cmds
 	cmd=${COMP_WORDS[1]}
 	cmds=" build init install update publish checkupdates import
  rewritemeta scanner verify stats server "
-	aliased=false
 
 	for c in $cmds; do eval "_fdroid_${c} () {
-		local cur prev cmds opts lopts
+		local cur prev opts lopts
 		__fdroid_init ${c};
 	}"; done
 

From 6b3dac7411d91d53d8b37317400450aace74e77a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 31 Dec 2013 10:18:04 +0100
Subject: [PATCH 19/68] Small bash tweaks to fd-commit

---
 fd-commit | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/fd-commit b/fd-commit
index a4e12113..2596e9ae 100755
--- a/fd-commit
+++ b/fd-commit
@@ -41,11 +41,7 @@ while read line; do
 			$found || continue
 		fi
 
-		if [ -d metadata/$id ]; then
-		   	extra=metadata/$id
-		else
-			extra=
-		fi
+		[ -d metadata/$id ] && extra=metadata/$id || extra=
 
 		name= autoname=
 		while read l; do
@@ -64,10 +60,10 @@ while read line; do
 			fullname="$id"
 		fi
 
-		newbuild=0
+		newbuild=false
 		while read l; do
 			if [[ "$l" == "+Build:"* ]]; then
-				newbuild=1
+				newbuild=true
 				build=${l#*:}
 				version=${build%%,*}
 				build=${build#*,}
@@ -75,10 +71,10 @@ while read line; do
 			fi
 		done < <(git diff HEAD -- "$file")
 
-		if [ $newbuild -eq 0 ]; then
-			message="$fullname:"
-		else
+		if $newbuild ; then
 			message="Update $fullname to $version ($vercode)"
+		else
+			message="$fullname:"
 		fi
 
 		commands+=("git commit -m '$message' -e -v -- $file $extra")

From ca7f83e859962f94eb4bee1983db426fb58c7c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 31 Dec 2013 10:43:47 +0100
Subject: [PATCH 20/68] Fix gradle patching when using @..

---
 fdroidserver/build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 32c43a32..5e2b4846 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -606,7 +606,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
                         's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+level+'@g',
                         'build.gradle'], cwd=gradle_dir)
 
-        for root, dirs, files in os.walk(build_dir):
+        for root, dirs, files in os.walk(gradle_dir):
             for f in files:
                 if f == 'build.gradle':
                     adapt_gradle(os.path.join(root, f))

From 23f5a4b1add06b29348edb60ec7dea515b1d78c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 31 Dec 2013 10:47:50 +0100
Subject: [PATCH 21/68] New field: Provides

---
 docs/fdroid.texi         | 12 ++++++++++++
 fdroidserver/metadata.py |  3 +++
 fdroidserver/update.py   |  6 ++++++
 3 files changed, 21 insertions(+)

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index a0006388..842d8d60 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -461,6 +461,7 @@ The following sections describe the fields recognised within the file.
 * Categories::
 * License::
 * Name::
+* Provides::
 * Auto Name::
 * Web Site::
 * Source Code::
@@ -585,6 +586,17 @@ overridden using this. Note that this only overrides the name in the list of
 apps presented in the client; it doesn't changed the name or application label
 in the source code.
 
+@node Provides
+@section Provides
+
+@cindex Provides
+
+Comma-separated list of application IDs that this app provides. In other
+words, if the user has any of these apps installed, F-Droid will show this app
+as installed instead. It will also appear if the user clicks on urls linking
+to the other app IDs. Useful when an app switches package name, or when you
+want an app to act as multiple apps.
+
 @node Web Site
 @section Web Site
 
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 1dc948ed..337a7d4d 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -472,6 +472,7 @@ def parse_metadata(metafile):
 
     # Defaults for fields that come from metadata...
     thisinfo['Name'] = None
+    thisinfo['Provides'] = None
     thisinfo['Auto Name'] = ''
     thisinfo['Categories'] = 'None'
     thisinfo['Description'] = []
@@ -641,6 +642,8 @@ def write_metadata(dest, app):
         writefield('Disabled')
     if app['AntiFeatures']:
         writefield('AntiFeatures')
+    if app['Provides']:
+        writefield('Provides')
     writefield('Categories')
     writefield('License')
     writefield('Web Site')
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 0b705312..b1393b82 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -71,6 +71,9 @@ def update_wiki(apps, apks):
                 app['License'],
                 app.get('Requires Root', 'No'))
 
+        if app['Provides']:
+            wikidata += "This app provides: %s" % ', '.join(app['Summary'].split(','))
+
         wikidata += app['Summary']
         wikidata += " - [http://f-droid.org/repository/browse/?fdid=" + app['id'] + " view in repository]\n\n"
 
@@ -580,6 +583,9 @@ def make_index(apps, apks, repodir, archive, categories):
                 af.remove('UpstreamNonFree')
             if af:
                 addElement('antifeatures', ','.join(af), doc, apel)
+        if app['Provides']:
+            pv = app['Provides'].split(',')
+            addElement('provides', ','.join(pv), doc, apel)
         if app['Requires Root']:
             addElement('requirements', 'root', doc, apel)
 

From 4b8ab5edb2a9379aacb183bc01531ee25e79cbd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 31 Dec 2013 11:57:35 +0100
Subject: [PATCH 22/68] Add Dogecoin support, some None fixes

---
 fdroidserver/metadata.py |  8 ++++++++
 fdroidserver/update.py   | 17 ++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 337a7d4d..07a0cd3f 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -93,6 +93,11 @@ valuetypes = {
         [ "Litecoin" ],
         [ ]),
 
+    'dogecoin' : FieldType("Dogecoin address",
+        r'^D[a-zA-Z0-9]{33}$', None,
+        [ "Dogecoin" ],
+        [ ]),
+
     'Bool' : FieldType("Boolean",
         ['Yes', 'No'], None,
         [ "Requires Root" ],
@@ -485,6 +490,7 @@ def parse_metadata(metafile):
     thisinfo['FlattrID'] = None
     thisinfo['Bitcoin'] = None
     thisinfo['Litecoin'] = None
+    thisinfo['Dogecoin'] = None
     thisinfo['Disabled'] = None
     thisinfo['AntiFeatures'] = None
     thisinfo['Archive Policy'] = None
@@ -657,6 +663,8 @@ def write_metadata(dest, app):
         writefield('Bitcoin')
     if app['Litecoin']:
         writefield('Litecoin')
+    if app['Dogecoin']:
+        writefield('Dogecoin')
     mf.write('\n')
     if app['Name']:
         writefield('Name')
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index b1393b82..aa606a7e 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -56,7 +56,7 @@ def update_wiki(apps, apks):
         if app['AntiFeatures']:
             for af in app['AntiFeatures'].split(','):
                 wikidata += '{{AntiFeature|' + af + '}}\n'
-        wikidata += '{{App|id=%s|name=%s|added=%s|lastupdated=%s|source=%s|tracker=%s|web=%s|donate=%s|flattr=%s|bitcoin=%s|litecoin=%s|license=%s|root=%s}}\n'%(
+        wikidata += '{{App|id=%s|name=%s|added=%s|lastupdated=%s|source=%s|tracker=%s|web=%s|donate=%s|flattr=%s|bitcoin=%s|litecoin=%s|dogecoin=%s|license=%s|root=%s}}\n'%(
                 app['id'],
                 app['Name'],
                 time.strftime('%Y-%m-%d', app['added']) if 'added' in app else '',
@@ -68,6 +68,7 @@ def update_wiki(apps, apks):
                 app['FlattrID'],
                 app['Bitcoin'],
                 app['Litecoin'],
+                app['Dogecoin'],
                 app['License'],
                 app.get('Requires Root', 'No'))
 
@@ -484,7 +485,7 @@ def make_index(apps, apks, repodir, archive, categories):
         addElement('description', config['repo_description'], doc, repoel)
     repoel.setAttribute("timestamp", str(int(time.time())))
 
-    if config['repo_keyalias'] is not None:
+    if config['repo_keyalias']:
 
         # Generate a certificate fingerprint the same way keytool does it
         # (but with slightly different formatting)
@@ -538,7 +539,7 @@ def make_index(apps, apks, repodir, archive, categories):
             addElement('lastupdated', time.strftime('%Y-%m-%d', app['lastupdated']), doc, apel)
         addElement('name', app['Name'], doc, apel)
         addElement('summary', app['Summary'], doc, apel)
-        if app['icon'] is not None:
+        if app['icon']:
             addElement('icon', app['icon'], doc, apel)
         def linkres(link):
             for app in apps:
@@ -558,13 +559,15 @@ def make_index(apps, apks, repodir, archive, categories):
         addElement('web', app['Web Site'], doc, apel)
         addElement('source', app['Source Code'], doc, apel)
         addElement('tracker', app['Issue Tracker'], doc, apel)
-        if app['Donate'] is not None:
+        if app['Donate']:
             addElement('donate', app['Donate'], doc, apel)
-        if app['Bitcoin'] is not None:
+        if app['Bitcoin']:
             addElement('bitcoin', app['Bitcoin'], doc, apel)
-        if app['Litecoin'] is not None:
+        if app['Litecoin']:
             addElement('litecoin', app['Litecoin'], doc, apel)
-        if app['FlattrID'] is not None:
+        if app['Dogecoin']:
+            addElement('dogecoin', app['Dogecoin'], doc, apel)
+        if app['FlattrID']:
             addElement('flattr', app['FlattrID'], doc, apel)
 
         # These elements actually refer to the current version (i.e. which

From a0cadda69c352e4c76263446014193fa4e1fd4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 31 Dec 2013 18:09:46 +0100
Subject: [PATCH 23/68] Properly escape fd-commit commit messages

---
 fd-commit | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fd-commit b/fd-commit
index 2596e9ae..be62a049 100755
--- a/fd-commit
+++ b/fd-commit
@@ -77,7 +77,8 @@ while read line; do
 			message="$fullname:"
 		fi
 
-		commands+=("git commit -m '$message' -e -v -- $file $extra")
+		message=${message//\"/\\\"}
+		commands+=("git commit -m \"$message\" -e -v -- $file $extra")
 	fi
 done < <(git status --porcelain)
 

From 8ade1e713383aa810abe4fc480eb9b82caad077d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 2 Jan 2014 19:16:11 +0100
Subject: [PATCH 24/68] Integer fields cannot have leading zeros

---
 fdroidserver/metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 07a0cd3f..fe6dc4c1 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -75,7 +75,7 @@ class FieldType():
 # Generic value types
 valuetypes = {
     'int' : FieldType("Integer",
-        r'^[0-9]+$', None,
+        r'^[1-9][0-9]*$', None,
         [ 'FlattrID' ],
         [ 'vercode' ]),
 

From b725acf55b2dd26cd8deb36c68b2083fbd0d52e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 2 Jan 2014 19:28:55 +0100
Subject: [PATCH 25/68] New 'lint' subcommand in testing phase

---
 fdroid                         |  1 +
 fdroidserver/common.py         |  7 ++-
 fdroidserver/lint.py           | 82 ++++++++++++++++++++++++++++++++++
 sampleconfigs/config.sample.py |  7 +++
 4 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 fdroidserver/lint.py

diff --git a/fdroid b/fdroid
index 0f75fc96..02396313 100755
--- a/fdroid
+++ b/fdroid
@@ -30,6 +30,7 @@ commands = [
         "checkupdates",
         "import",
         "rewritemeta",
+        "lint",
         "scanner",
         "stats",
         "server"]
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index f2e4b661..aefa78de 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -60,7 +60,12 @@ def read_config(opts, config_file='config.py'):
         'archive_older': 0,
         'max_icon_size': 72,
         'stats_to_carbon': False,
-        'repo_maxage': 0
+        'repo_maxage': 0,
+        'char_limits': {
+            'Summary' : 40,
+            'Description' : 1500
+        }
+
     }
     config = {}
 
diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
new file mode 100644
index 00000000..4ff4b43e
--- /dev/null
+++ b/fdroidserver/lint.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+#
+# rewritemeta.py - part of the FDroid server tool
+# Copyright (C) 2010-12, Ciaran Gultnieks, ciaran@ciarang.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See th
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public Licen
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from optparse import OptionParser
+import common, metadata
+
+config = None
+options = None
+
+appid = None
+
+def warn(message):
+    global appid
+    if appid:
+        print "%s:" % appid
+        appid = None
+    print('    %s' % message)
+
+def main():
+
+    global config, options, appid
+
+    # Parse command line...
+    parser = OptionParser(usage="Usage: %prog [options] [APPID [APPID ...]]")
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (options, args) = parser.parse_args()
+
+    config = common.read_config(options)
+
+    # Get all apps...
+    allapps = metadata.read_metadata(xref=False)
+    apps = common.read_app_args(args, allapps, False)
+
+    for app in apps:
+        appid = app['id']
+        lastcommit = ''
+
+        for build in app['builds']:
+            if 'commit' in build and 'disable' not in build:
+                lastcommit = build['commit']
+
+        if (app['Update Check Mode'] == 'RepoManifest' and
+                any(s in lastcommit for s in ('.', ',', '_', '-', '/'))):
+            warn("Last used commit '%s' looks like a tag, but Update Check Mode is RepoManifest" % lastcommit)
+
+        summ_chars = len(app['Summary'])
+        if summ_chars > config['char_limits']['Summary']:
+            warn("Summary of length %s is over the %i char limit" % (
+                summ_chars, config['char_limits']['Summary']))
+
+        desc_chars = 0
+        for line in app['Description']:
+            desc_chars += len(line)
+        if desc_chars > config['char_limits']['Description']:
+            warn("Description of length %s is over the %i char limit" % (
+                desc_chars, config['char_limits']['Description']))
+
+        if not appid:
+            print
+
+    print "Finished."
+
+if __name__ == "__main__":
+    main()
+
diff --git a/sampleconfigs/config.sample.py b/sampleconfigs/config.sample.py
index 0f4aeb2c..6f4988d3 100644
--- a/sampleconfigs/config.sample.py
+++ b/sampleconfigs/config.sample.py
@@ -118,3 +118,10 @@ carbon_port = 2003
 #Set this to true to always use a build server. This saves specifying the
 #--server option on dedicated secure build server hosts.
 build_server_always = False
+
+# Limit in number of characters that fields can take up
+# Only the fields listed here are supported, defaults shown
+char_limits: {
+    'Summary' : 40
+    'Description' : 1500
+}

From 0a3bf7431cc4b27cffb572274d17313eb62d764f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 3 Jan 2014 00:12:42 +0100
Subject: [PATCH 26/68] Add fdroid lint completion

---
 completion/bash-completion | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/completion/bash-completion b/completion/bash-completion
index 4ac8602b..8423b3e0 100644
--- a/completion/bash-completion
+++ b/completion/bash-completion
@@ -190,6 +190,19 @@ __complete_rewritemeta() {
 	esac
 }
 
+__complete_lint() {
+	opts="-h -v"
+	lopts="--help --verbose"
+	case "${cur}" in
+		-*)
+			__complete_options
+			return 0;;
+		*)
+			__package
+			return 0;;
+	esac
+}
+
 __complete_scanner() {
 	opts="-h -v"
 	lopts="--help --verbose --nosvn"
@@ -244,7 +257,7 @@ _fdroid() {
 	local cmd cmds
 	cmd=${COMP_WORDS[1]}
 	cmds=" build init install update publish checkupdates import
- rewritemeta scanner verify stats server "
+ rewritemeta lint scanner verify stats server "
 
 	for c in $cmds; do eval "_fdroid_${c} () {
 		local cur prev opts lopts

From f3d85eb310bb50729af60d4378dca5b9f8717242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 3 Jan 2014 20:49:20 +0100
Subject: [PATCH 27/68] Start publishing indexes with index version "10"

---
 fdroidserver/update.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index aa606a7e..883bbb12 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -469,6 +469,7 @@ def make_index(apps, apks, repodir, archive, categories):
     doc.appendChild(root)
 
     repoel = doc.createElement("repo")
+
     if archive:
         repoel.setAttribute("name", config['archive_name'])
         if config['repo_maxage'] != 0:
@@ -476,6 +477,7 @@ def make_index(apps, apks, repodir, archive, categories):
         repoel.setAttribute("icon", os.path.basename(config['archive_icon']))
         repoel.setAttribute("url", config['archive_url'])
         addElement('description', config['archive_description'], doc, repoel)
+
     else:
         repoel.setAttribute("name", config['repo_name'])
         if config['repo_maxage'] != 0:
@@ -483,6 +485,8 @@ def make_index(apps, apks, repodir, archive, categories):
         repoel.setAttribute("icon", os.path.basename(config['repo_icon']))
         repoel.setAttribute("url", config['repo_url'])
         addElement('description', config['repo_description'], doc, repoel)
+
+    repoel.setAttribute("version", "10")
     repoel.setAttribute("timestamp", str(int(time.time())))
 
     if config['repo_keyalias']:

From 483816bc9c82a17466bf593bba8431e24150915a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 6 Jan 2014 12:08:57 +0100
Subject: [PATCH 28/68] Don't forcefully remove libs/<arch>, we now see
 binaries

---
 fdroidserver/build.py  | 10 ----------
 fdroidserver/common.py |  5 +----
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 5e2b4846..6bbb87d4 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -420,16 +420,6 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         raise BuildException("Error cleaning %s:%s" %
                 (app['id'], thisbuild['version']), p.stdout, p.stderr)
 
-    # Also clean jni
-    print "Cleaning jni dirs..."
-    for baddir in [
-            'libs/armeabi-v7a', 'libs/armeabi',
-            'libs/mips', 'libs/x86', 'obj']:
-        badpath = os.path.join(build_dir, baddir)
-        if os.path.exists(badpath):
-            print "Removing '%s'" % badpath
-            shutil.rmtree(badpath)
-
     # Scan before building...
     print "Scanning source for common problems..."
     buildprobs = common.scan_source(build_dir, root_dir, thisbuild)
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index aefa78de..47a006b4 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -943,10 +943,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
         for d in update_dirs:
             # Remove gen and bin dirs in libraries
             # rid of them...
-            for baddir in [
-                    'gen', 'bin', 'obj', # ant
-                    'libs/armeabi-v7a', 'libs/armeabi', # jni
-                    'libs/mips', 'libs/x86']:
+            for baddir in ['gen', 'bin', 'obj']
                 badpath = os.path.join(root_dir, d, baddir)
                 if os.path.exists(badpath):
                     print "Removing '%s'" % badpath

From 5522d9bcd9fb4f73b6210a97f590ac031bac5ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 6 Jan 2014 12:44:48 +0100
Subject: [PATCH 29/68] Run ant clean in update= dirs instead of removing dirs

---
 fdroidserver/common.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 47a006b4..f648ef7d 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -941,13 +941,9 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
                 os.remove(buildxml)
 
         for d in update_dirs:
-            # Remove gen and bin dirs in libraries
-            # rid of them...
-            for baddir in ['gen', 'bin', 'obj']
-                badpath = os.path.join(root_dir, d, baddir)
-                if os.path.exists(badpath):
-                    print "Removing '%s'" % badpath
-                    shutil.rmtree(badpath)
+            subdir = os.path.join(root_dir, d)
+            # Clean update dirs via ant
+            p = FDroidPopen(['ant', 'clean'], cwd=subdir)
             dparms = parms + ['-p', d]
             if options.verbose:
                 if d == '.':

From e0061c69bd04e1db20f6d465cb213c0221bdf359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 08:52:13 +0100
Subject: [PATCH 30/68] Add "Added on" to apks on wordpress (#157)

---
 wp-fdroid/wp-fdroid.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index 70fcedd2..792db5b4 100644
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -156,6 +156,9 @@ class FDroid
 						case "name":
 							$name=$el;
 							break;
+						case "added":
+							$added=$el;
+							break;
 						case "icon":
 							$icon=$el;
 							break;
@@ -306,6 +309,7 @@ class FDroid
 				foreach($apks as $apk) {
 					$first = $i+1==count($apks);
 					$out.="<p><b>Version ".$apk['version']."</b><br />";
+					$out.="Added on ".$apk['added']."<br />";
 
 					// Is this source or binary?
 					$srcbuild = isset($apk['srcname']) && file_exists($this->site_path.'/repo/'.$apk['srcname']);

From 1cf40636d393e10ef7a70f54b8ba02ce791ea1a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 10:04:11 +0100
Subject: [PATCH 31/68] Improve checkupdates regex, support quotes better for
 build.gradle

---
 fdroidserver/checkupdates.py | 6 +++++-
 fdroidserver/common.py       | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index eff43ff4..d7c89eec 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -197,7 +197,11 @@ def check_repomanifest(app, branch=None):
         if not vercode:
             return (None,"Couldn't find latest version code")
 
-        return (version, str(int(vercode)))
+        vercode = str(int(vercode))
+
+        print "Manifest exists. Found version %s (%s)" % (version, vercode)
+
+        return (version, vercode)
 
     except BuildException as be:
         msg = "Could not scan app %s due to BuildException: %s" % (app['id'], be)
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index f648ef7d..6b82a701 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -683,9 +683,9 @@ def parse_androidmanifests(paths):
     vnsearch = re.compile(r'.*android:versionName="([^"]+?)".*').search
     psearch = re.compile(r'.*package="([^"]+)".*').search
 
-    vcsearch_g = re.compile(r'.*versionCode[ =]*([0-9]+?)[^\d].*').search
-    vnsearch_g = re.compile(r'.*versionName[ =]*"([^"]+?)".*').search
-    psearch_g = re.compile(r'.*packageName[ =]*"([^"]+)".*').search
+    vcsearch_g = re.compile(r'.*versionCode[ ]*=[ ]*["\']*([0-9]+?)[^\d].*').search
+    vnsearch_g = re.compile(r'.*versionName[ ]*=[ ]*(["\'])((?:(?=(\\?))\3.)*?)\1.*').search
+    psearch_g = re.compile(r'.*packageName[ ]*=[ ]*["\']([^"]+)["\'].*').search
 
     max_version = None
     max_vercode = None
@@ -713,7 +713,7 @@ def parse_androidmanifests(paths):
                 else:
                     matches = vnsearch(line)
                 if matches:
-                    version = matches.group(1)
+                    version = matches.group(2 if gradle else 1)
             if not vercode:
                 if gradle:
                     matches = vcsearch_g(line)

From b79a9304572e3196c470c4e12c4458694d3ea3d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 10:12:24 +0100
Subject: [PATCH 32/68] Don't change gradle_plugin in build.gradle files, also
 do srclibs

---
 config.buildserver.py          |  1 -
 fdroidserver/build.py          | 25 +++++++++++++------------
 sampleconfigs/config.sample.py |  6 ------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/config.buildserver.py b/config.buildserver.py
index 38e919f8..152a46e8 100644
--- a/config.buildserver.py
+++ b/config.buildserver.py
@@ -3,4 +3,3 @@ ndk_path = "/home/vagrant/android-ndk"
 build_tools = "19.0.1"
 mvn3 = "mvn"
 gradle = "gradle"
-gradle_plugin = "0.7.+"
diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 6bbb87d4..483375e5 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -369,14 +369,16 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
         subprocess.call(['vagrant', 'suspend'], cwd='builder')
 
 def adapt_gradle(path):
-    if options.verbose:
-        print "Adapting build.gradle at %s" % path
+    for root, dirs, files in os.walk(path):
+        for f in files:
+            if f == 'build.gradle':
+                if options.verbose:
+                    print "Adapting build.gradle at %s" % path
 
-    subprocess.call(['sed', '-i',
-            's@buildToolsVersion[ ]*["\\\'][0-9\.]*["\\\']@buildToolsVersion "'+ config['build_tools'] +'"@g', path])
-
-    subprocess.call(['sed', '-i',
-            's@com.android.tools.build:gradle:[0-9\.\+]*@com.android.tools.build:gradle:'+ config['gradle_plugin'] +'@g', path])
+                subprocess.call(['sed', '-i',
+                        's@buildToolsVersion[ ]*["\\\'][0-9\.]*["\\\']@buildToolsVersion "'
+                        + config['build_tools'] + '"@g', path])
+                break
 
 
 def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_dir, tmp_dir, force, onserver):
@@ -596,11 +598,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
                         's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+level+'@g',
                         'build.gradle'], cwd=gradle_dir)
 
-        for root, dirs, files in os.walk(gradle_dir):
-            for f in files:
-                if f == 'build.gradle':
-                    adapt_gradle(os.path.join(root, f))
-                    break
+        adapt_gradle(gradle_dir)
+
+        for name, number, libpath in srclibpaths:
+            adapt_gradle(libpath)
 
         if flavour in ['main', 'yes', '']:
             flavour = ''
diff --git a/sampleconfigs/config.sample.py b/sampleconfigs/config.sample.py
index 6f4988d3..ec62d2e4 100644
--- a/sampleconfigs/config.sample.py
+++ b/sampleconfigs/config.sample.py
@@ -21,12 +21,6 @@ mvn3 = "mvn3"
 # Command for running Gradle (command or full path)
 gradle = "gradle"
 
-# Android gradle plugin version
-# "0.5.+" -> gradle 1.7
-# "0.6.+" -> gradle 1.8
-# "0.7.+" -> gradle 1.9
-gradle_plugin = "0.7.+"
-
 # Max height and width (in pixels) for the icons in the repo
 # This corresponds to 72x72 pixels, i.e. mdpi
 icon_max_size = 72

From d700b92e1da588a6de1b43324ea093c6da4f21d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 11:16:58 +0100
Subject: [PATCH 33/68] Add icon helper functions for later use

---
 fdroidserver/update.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 883bbb12..841b45b5 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -34,6 +34,23 @@ import common, metadata
 from metadata import MetaDataException
 from PIL import Image
 
+
+def get_densities():
+    return [480, 320, 240, 160, 120]
+
+def launcher_size(density):
+    return (density * 48) / 160
+
+def icon_dens_label(density):
+    return "icon-%s" % density
+
+def get_icon_dir(density):
+    return os.path.join(repodir, "icons-%s" % density)
+
+def get_icon_dirs(repodir):
+    for density in get_densities():
+        yield get_icon_dir(density)
+
 def update_wiki(apps, apks):
     """Update the wiki
 
@@ -677,7 +694,7 @@ def make_index(apps, apks, repodir, archive, categories):
             print output
 
     # Copy the repo icon into the repo directory...
-    icon_dir=os.path.join(repodir ,'icons')
+    icon_dir = os.path.join(repodir ,'icons')
     iconfilename = os.path.join(icon_dir, os.path.basename(config['repo_icon']))
     shutil.copyfile(config['repo_icon'], iconfilename)
 

From 906d44514aa5db9a7c27d72ccaca3ef4f9518f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 12:06:39 +0100
Subject: [PATCH 34/68] Rewrite: Do icons per density, /icons being mdpi by
 default

---
 fdroidserver/update.py | 114 ++++++++++++++++++++++++++++-------------
 1 file changed, 77 insertions(+), 37 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 841b45b5..2c359507 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -36,20 +36,23 @@ from PIL import Image
 
 
 def get_densities():
-    return [480, 320, 240, 160, 120]
+    return ['480', '320', '240', '160', '120']
 
 def launcher_size(density):
-    return (density * 48) / 160
+    return (int(density) * 48) / 160
 
 def icon_dens_label(density):
     return "icon-%s" % density
 
-def get_icon_dir(density):
+def get_icon_dir(repodir, density):
+    if density is None:
+        return os.path.join(repodir, "icons")
     return os.path.join(repodir, "icons-%s" % density)
 
 def get_icon_dirs(repodir):
     for density in get_densities():
-        yield get_icon_dir(density)
+        yield get_icon_dir(repodir, density)
+    yield os.path.join(repodir, "icons")
 
 def update_wiki(apps, apks):
     """Update the wiki
@@ -271,30 +274,36 @@ def delete_disabled_builds(apps, apkcache, repodirs):
                 if apkfilename in apkcache:
                     del apkcache[apkfilename]
 
-def resize_icon(iconpath):
+def resize_icon(iconpath, density):
+
     try:
         im = Image.open(iconpath)
-        if any(length > config['max_icon_size'] for length in im.size):
+        size = launcher_size(density)
+
+        if any(length > size for length in im.size):
             print iconpath, "is too large:", im.size
-            im.thumbnail((config['max_icon_size'], config['max_icon_size']),
-                    Image.ANTIALIAS)
+            im.thumbnail((size, size), Image.ANTIALIAS)
             print iconpath, "new size:", im.size
             im.save(iconpath, "PNG")
+
         else:
             if options.verbose:
                 print iconpath, "is small enough:", im.size
+
     except Exception,e:
-        print "ERROR: Failed processing {0} - {1}".format(iconpath, e)
+        print "ERROR: Failed resizing {0} - {1}".format(iconpath, e)
 
 def resize_all_icons(repodirs):
     """Resize all icons that exceed the max size
 
-    :param apps: list of all applications, as per metadata.read_metadata
     :param repodirs: the repo directories to process
     """
     for repodir in repodirs:
-        for iconpath in glob.glob(os.path.join(repodir, 'icons', '*.png')):
-            resize_icon(iconpath)
+        for density in get_densities():
+            icon_dir = get_icon_dir(repodir, density)
+            icon_glob = os.path.join(repodir, icon_dir, '*.png')
+            for iconpath in glob.glob(icon_glob):
+                resize_icon(iconpath)
 
 def scan_apks(apps, apkcache, repodir, knownapks):
     """Scan the apks in the given repo directory.
@@ -311,18 +320,21 @@ def scan_apks(apps, apkcache, repodir, knownapks):
 
     cachechanged = False
 
-    icon_dir = os.path.join(repodir ,'icons')
-    # Delete and re-create the icon directory...
-    if options.clean and os.path.exists(icon_dir):
-        shutil.rmtree(icon_dir)
-    if not os.path.exists(icon_dir):
-        os.makedirs(icon_dir)
+    icon_dirs = get_icon_dirs(repodir)
+    for icon_dir in icon_dirs:
+        if os.path.exists(icon_dir):
+            if options.clean:
+                shutil.rmtree(icon_dir)
+                os.makedirs(icon_dir)
+        else:
+            os.makedirs(icon_dir)
+
     apks = []
     name_pat = re.compile(".*name='([a-zA-Z0-9._]*)'.*")
     vercode_pat = re.compile(".*versionCode='([0-9]*)'.*")
     vername_pat = re.compile(".*versionName='([^']*)'.*")
     label_pat = re.compile(".*label='(.*?)'(\n| [a-z]*?=).*")
-    icon_pat = re.compile(".*icon='([^']+?)'.*")
+    icon_pat = re.compile(".*application-icon-([0-9]+):'([^']+?)'.*")
     sdkversion_pat = re.compile(".*'([0-9]*)'.*")
     string_pat = re.compile(".*'([^']*)'.*")
     for apkfile in glob.glob(os.path.join(repodir, '*.apk')):
@@ -353,8 +365,8 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                                   'dump', 'badging', apkfile],
                                  stdout=subprocess.PIPE)
             output = p.communicate()[0]
-            if options.verbose:
-                print output
+            #if options.verbose:
+                #print output
             if p.returncode != 0:
                 print "ERROR: Failed to get apk information"
                 sys.exit(1)
@@ -370,9 +382,14 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                         sys.exit(1)
                 elif line.startswith("application:"):
                     thisinfo['name'] = re.match(label_pat, line).group(1)
+                elif line.startswith("application-icon-"):
                     match = re.match(icon_pat, line)
                     if match:
-                        thisinfo['iconsrc'] = match.group(1)
+                        density = match.group(1)
+                        path = match.group(2)
+                        if 'icons_src' not in thisinfo:
+                            thisinfo['icons_src'] = {}
+                        thisinfo['icons_src'][density] = path
                 elif line.startswith("sdkVersion:"):
                     thisinfo['sdkversion'] = re.match(sdkversion_pat, line).group(1)
                 elif line.startswith("native-code:"):
@@ -429,21 +446,44 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 sys.exit(1)
             thisinfo['sig'] = output[7:].strip()
 
+            iconfilename = "%s.%s.png" % (
+                    thisinfo['id'],
+                    thisinfo['versioncode'])
+
             # Extract the icon file...
-            if 'iconsrc' in thisinfo:
+            empty_densities = []
+            for density in get_densities():
+                label = icon_dens_label(density)
+                if density not in thisinfo['icons_src']:
+                    empty_densities.append(density)
+                    continue
                 apk = zipfile.ZipFile(apkfile, 'r')
-                thisinfo['icon'] = (thisinfo['id'] + '.' +
-                    str(thisinfo['versioncode']) + '.png')
-                iconpath = os.path.join(icon_dir, thisinfo['icon'])
+                iconsrc = thisinfo['icons_src'][density]
+                icon_dir = get_icon_dir(repodir, density)
+                icondest = os.path.join(icon_dir, iconfilename)
+
                 try:
-                    iconfile = open(iconpath, 'wb')
-                    iconfile.write(apk.read(thisinfo['iconsrc']))
+                    iconfile = open(icondest, 'wb')
+                    iconfile.write(apk.read(iconsrc))
                     iconfile.close()
+                    thisinfo[label] = iconfilename 
+
                 except:
                     print "WARNING: Error retrieving icon file"
+                    del thisinfo[label]
+                    del thisinfo['icons_src'][density]
+                    empty_densities.append(density)
+
                 apk.close()
 
-                resize_icon(iconpath)
+                resize_icon(icondest, density)
+
+            # TODO: Handle empty_densities
+
+            # Copy from icons-mdpi to icons since mdpi is the baseline density
+            shutil.copyfile(
+                    os.path.join(get_icon_dir(repodir, '160'), iconfilename),
+                    os.path.join(get_icon_dir(repodir, None), iconfilename))
 
             # Record in known apks, getting the added date at the same time..
             added = knownapks.recordapk(thisinfo['apkname'], thisinfo['id'])
@@ -842,21 +882,21 @@ def main():
 
         if added:
             app['added'] = added
-        else:
-            if options.verbose:
-                print "WARNING: Don't know when " + app['id'] + " was added"
+        #else:
+            #if options.verbose:
+                #print "WARNING: Don't know when " + app['id'] + " was added"
         if lastupdated:
             app['lastupdated'] = lastupdated
-        else:
-            if options.verbose:
-                print "WARNING: Don't know when " + app['id'] + " was last updated"
+        #else:
+            #if options.verbose:
+                #print "WARNING: Don't know when " + app['id'] + " was last updated"
 
         if bestver == 0:
             if app['Name'] is None:
                 app['Name'] = app['id']
             app['icon'] = None
-            if options.verbose and app['Disabled'] is None:
-                print "WARNING: Application " + app['id'] + " has no packages"
+            #if options.verbose and app['Disabled'] is None:
+                #print "WARNING: Application " + app['id'] + " has no packages"
         else:
             if app['Name'] is None:
                 app['Name'] = bestapk['name']

From cdcbb082691dc990b281f99d6bd13e5421863900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 12:20:24 +0100
Subject: [PATCH 35/68] Finish TODO; Fill missing icon densities the best we
 can

---
 fdroidserver/update.py | 44 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 2c359507..b274dab3 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -451,8 +451,9 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                     thisinfo['versioncode'])
 
             # Extract the icon file...
+            densities = get_densities()
             empty_densities = []
-            for density in get_densities():
+            for density in densities:
                 label = icon_dens_label(density)
                 if density not in thisinfo['icons_src']:
                     empty_densities.append(density)
@@ -478,7 +479,46 @@ def scan_apks(apps, apkcache, repodir, knownapks):
 
                 resize_icon(icondest, density)
 
-            # TODO: Handle empty_densities
+            last_density = None
+            # First try resizing down to not lose quality
+            for density in densities:
+                if density not in empty_densities:
+                    last_density = density
+                    continue
+                if last_density is None:
+                    continue
+                if options.verbose:
+                    print "Density %s not available, resizing down from %s" % (
+                            density, last_density)
+
+                last_iconpath = os.path.join(
+                        get_icon_dir(repodir, last_density), iconfilename)
+                iconpath = os.path.join(
+                        get_icon_dir(repodir, density), iconfilename)
+                im = Image.open(last_iconpath)
+                size = launcher_size(density)
+
+                im.thumbnail((size, size), Image.ANTIALIAS)
+                im.save(iconpath, "PNG")
+                empty_densities.remove(density)
+
+            last_density = None
+            # Then just copy from the highest resolution available
+            for density in reversed(densities):
+                if density not in empty_densities:
+                    last_density = density
+                    continue
+                if last_density is None:
+                    continue
+                if options.verbose:
+                    print "Density %s not available, copying from lower density %s" % (
+                            density, last_density)
+
+                shutil.copyfile(
+                        os.path.join(get_icon_dir(repodir, last_density), iconfilename),
+                        os.path.join(get_icon_dir(repodir, density), iconfilename))
+
+                empty_densities.remove(density)
 
             # Copy from icons-mdpi to icons since mdpi is the baseline density
             shutil.copyfile(

From 63104871f627c3eb53afd8d494652280c8bc1dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 12:21:21 +0100
Subject: [PATCH 36/68] Remove icon_max_size from the sample config

---
 sampleconfigs/config.sample.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sampleconfigs/config.sample.py b/sampleconfigs/config.sample.py
index ec62d2e4..8b9e64a2 100644
--- a/sampleconfigs/config.sample.py
+++ b/sampleconfigs/config.sample.py
@@ -21,10 +21,6 @@ mvn3 = "mvn3"
 # Command for running Gradle (command or full path)
 gradle = "gradle"
 
-# Max height and width (in pixels) for the icons in the repo
-# This corresponds to 72x72 pixels, i.e. mdpi
-icon_max_size = 72
-
 # Set the maximum age (in days) of an index that a client should accept from
 # this repo. Setting it to 0 or not setting it at all disables this
 # functionality. If you do set this to a non-zero value, you need to ensure

From cb319a60339189e9e1ea495ae8c570005a00d9ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 12:24:15 +0100
Subject: [PATCH 37/68] Uncomment verbose messages, fix -I

---
 fdroidserver/update.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index b274dab3..45d6ae50 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -301,9 +301,9 @@ def resize_all_icons(repodirs):
     for repodir in repodirs:
         for density in get_densities():
             icon_dir = get_icon_dir(repodir, density)
-            icon_glob = os.path.join(repodir, icon_dir, '*.png')
+            icon_glob = os.path.join(icon_dir, '*.png')
             for iconpath in glob.glob(icon_glob):
-                resize_icon(iconpath)
+                resize_icon(iconpath, density)
 
 def scan_apks(apps, apkcache, repodir, knownapks):
     """Scan the apks in the given repo directory.
@@ -365,8 +365,6 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                                   'dump', 'badging', apkfile],
                                  stdout=subprocess.PIPE)
             output = p.communicate()[0]
-            #if options.verbose:
-                #print output
             if p.returncode != 0:
                 print "ERROR: Failed to get apk information"
                 sys.exit(1)
@@ -922,21 +920,21 @@ def main():
 
         if added:
             app['added'] = added
-        #else:
-            #if options.verbose:
-                #print "WARNING: Don't know when " + app['id'] + " was added"
+        else:
+            if options.verbose:
+                print "WARNING: Don't know when " + app['id'] + " was added"
         if lastupdated:
             app['lastupdated'] = lastupdated
-        #else:
-            #if options.verbose:
-                #print "WARNING: Don't know when " + app['id'] + " was last updated"
+        else:
+            if options.verbose:
+                print "WARNING: Don't know when " + app['id'] + " was last updated"
 
         if bestver == 0:
             if app['Name'] is None:
                 app['Name'] = app['id']
             app['icon'] = None
-            #if options.verbose and app['Disabled'] is None:
-                #print "WARNING: Application " + app['id'] + " has no packages"
+            if options.verbose and app['Disabled'] is None:
+                print "WARNING: Application " + app['id'] + " has no packages"
         else:
             if app['Name'] is None:
                 app['Name'] = bestapk['name']

From efacffb615931435caa0e4f7d95a491eede60285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 13:23:24 +0100
Subject: [PATCH 38/68] New lint feature: Summary forms

---
 fdroidserver/lint.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 4ff4b43e..3def6ff7 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -65,6 +65,11 @@ def main():
             warn("Summary of length %s is over the %i char limit" % (
                 summ_chars, config['char_limits']['Summary']))
 
+        if app['Summary']:
+            lastchar = app['Summary'][-1]
+            if any(lastchar==c for c in ['.', ',', '!', '?']):
+                warn("Summary should not end with a %s" % lastchar)
+
         desc_chars = 0
         for line in app['Description']:
             desc_chars += len(line)

From f0f623c61d5414a6b81f0e737a93d5cc599ca7c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 13:30:08 +0100
Subject: [PATCH 39/68] Update the fdroid-icon.png, still static at 48px

---
 fdroid-icon.png | Bin 2017 -> 3367 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/fdroid-icon.png b/fdroid-icon.png
index 717577be38a89e6617caeb0ed2678ae4ff000271..0c0d41738f054eaa77bba0ef0785e87227aa2692 100644
GIT binary patch
delta 3364
zcmV+<4cqeJ52qTCB!2{RLP=Bz2nYy#2xN!=000SaNLh0L019CM019CN{LD%v0000P
zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$Q5_CmabW~|{Y-IpOEktr}
zX=EU5Z)b09!MJ+>000(rMObt}b#!QNasX0qVr6o4AWdO%bbo1XWqP*yq%i;h08(^C
zSad^gaCvfRXJ~W)Lqi}zbaZlQVs&(BZ*DD9Xkl_?L2PMjWguvDbZ|N^FJp3LVRUJB
zWn*t`ZEtRKE^l&YFKlUJWo~n2b1!0fEpuTnGcGVMUV~b^000aINkl<ZXx`PCdyH*Y
zUB^Fb?em;-=6`YTyzk81cKWz&X(<#6)<lJ9LNtMxh=G5>kc%a#e-H~qlr*u5^dB`Q
zD4NiJ3^6Gxkw0z|V~jDhRK!}LrM=Hi@64UK^PV~T?AKbqpMUIqUUz0XQ)@!m$;w`P
zpOdw|-`{)vwoz4nny(VTV_%=X(|8^O^Nl}wboIHnGk@UEe{JRw&`)Z>SHF6G?Xm^H
znNI=dK`(sqYcqGeUBTzr^a60cz>Eb@qu&H#U{uhjAAf4G_I3mR_*08DL7xUjfw;h&
z6L|8`wHHzI+2X$swWIc*z1;{Dm>wdR_-CJdbnQg|)9=Jz_{-^UsPYN&Uw%ssSFGBR
zpCoWq+JCAn8l!&-U<^-v<u}(pIpD;dD~&3jDc916DwW_}bJL4|{xc7L*fr{>%Epv1
zSPT}7#Smaj{%lMDSZr}Oxl-|(;(eP;+Bj+BBqZ}8&WAW@k@*(Rhh)V(^ZD<fD1xe@
zYRD4O)n#7}_mwQ;ztgDlnSRXX)-d{ee?9XX?|*yOFa6CU?|H<8`U8Z$L5ZNK3W|bC
zG4E`c&t>4f&*$Ce-jG|K6+ig9Dk=t1!^IzEy7HR*{uAd{pXkS9Z&g`+sPe1tzW-sf
z<t~u=n>a}ZhL@BiP4GU$t3%Ww>IX&#EGnQ16hoE1r#>?=AeF=5fB}QDc&=<JH9m4^
z9)B2k5mXllHgFPSF!>6_l_Z|;e{YSE^23ZYrilG@?!14Wpq!wZ9n?<W^PmQDGw}|V
zU%8FCc_-~;lbid`a_&J(tr7PKDkz2^0AtPYu>@4TNn{J}(?SBKOW}p*9l!R--!nCK
zPxt>XUj7!P>2H(D5}q_SGSz}apFJ0M`hT8Fo1f<6KmXfwcGzt%@sH1airepB!Rc;c
zJ{?7xL!JD9&P0UNt@ljECpe$5w-@sMyT3319^k<{KMMOlhhYRSDNZtcXK0F-4ABe`
zhiHbE+~iE_VSe_$-@){0cy#D2A9~Lp5$(((Vh}NCF+?~S0ad55U&HwVyu>(3h=1aQ
zbMqfObde!@FP34vq_>Q0VDyt1u^%{et=X~nLOO={oPc<P7jiOsL@hL+0Tp6@vyhAF
zdQz>ScyUJrYlD|IPEtC%^h`**W>v&6P>T>9x|E1xYWxmXlm9@~bj|0en$sSZIXY(3
z9TI~{xqS0mhi_WGK`XsdXe=$FRewJBlHz<Wb>{`|6z7Cp{b#(-4y^Us&1VVy%Xnw<
z;fvu;=mQF5PRN|#oX2^ObDqpO)=OXE;>tf2QiU{Y^TVZYvZa4VoNeQr<RepD1}-zW
z%=QgKR@_5*iRUi=0quCF5BzsocTck)zm9jdAYr>iR8C+*s)TW5^RUH06n_OgSIy_x
zxc;{U{x+zr6WL2dt?Ot<7RrGTSXfhMeZZjV*wm-__t(EiMee0sg+!LvPp;v7T$qjN
zrjcUqjwRqlFRU%=`=(}sD&{~=!5K%w^T6{IQL_MS2h?~d3FsqZP*ohuD9dP?|3}25
zY7f}_{$A$2=yS&scx7qr$$y>QsgIw#w|Z`Rrd$n5Jr>5iVbOKK7PZgGwf|lBZs?UV
z+9#%dr&cyMGWY6_qiboBJ$4{bA9ket*yE;RW&C%`f%#<&jh}2as<9~ly4fl{@ywH}
z;fV+Uy!)~5e5h2eeApPKy3!bow+Fqy_hbGjN5bmfq_eX0)Myc;vwyz$Z6iGM!e4y!
z+p6e^2t53yXTEdaU6a4?z#Zem)>@3oUDR|PQBhGu6)%eSg7Zq|^C*;gA;}!6Q<BsZ
zr=B=-M2RCxJZa{OH3XG>EsAQE;#sB09U>sovdI4g>COkf|5xX;H}rw`e(}Qj2i`IB
z!SUJA#=qSN@tsYy*nebT@!qpRK*6f!$)_k{qytbC@gA>=v3Y%iF&Lv@Iz_9Ym->1R
zuWFjAJVa^u%fOf3kO0PfY<6~}@xppofG8y10jzxzEAD|&j2f&6(rP1NMAD8)q6iCA
z>QyS$Dy3SLG${8Xo@xP5`}UxNx_H;oxT%%UUpbb5wf1z|34h|GYc32B=t<WU5;p)l
zA)7ZgNYWHUQ1N+5EkYQE#oRO8Y%nxCM{4rO<fJR+9%$+9n~#Eok=n6g6oe%8s7Mj+
za;fOR2DwjIAP`S<eUt6o7AiumQli<cQ*G2J*K0WE$o50x{gA!g9rpM33HN`@<lG!u
zYoZ36@0n#6xPJ`3Q#}wVjv@d_=KCCro(2l(m;$^N&-SGi+Hr~j=H@4;ogU4dF}D#)
zK|rZep*l83b7q>o<z=?l*IB)Gm5G@dq&bc?;0n+TfbRJZ#aZI`QUWD$g8Exci0(qx
zf>lUYHfcu*m2$w@a|>uGz>2VcW0P<{B#sjT1NEUQ&3}<$f<}YU`8gURBdlD$#Kw&k
zX6_m$B)}^8J|F7`u7h>RF&Yp^Qr8!G1~p&}7%|Xlv$eScs@!&W4nEs!vHIF7Ns@H!
z9~IhRi;bJ>jE#*lK0gPICKI!Bti67Xt)(k87w*Oz2Eq4hpqG|UP)<Yc173<aEr>`r
zW}Cu+cYl^|;=N~jY78xxkuYNU%1QxV2b{1o-`Uz?<<*OnfZFNPG@8RCQH0swz^G#S
z0z{X{(b@8-6PXfcxf83`oQPM{7fD4Gn|j*q2y2wn^OFRs+_<`e%d&1l8gA4$yD-a{
zGt*S7l`fff7!q!*VSv$@xxD<{-R(x2qrrpG6My&s3NG_SBGJBu6=MuW6(2^Zc!uhA
zoENg)kaiSxr9C%0&dk{}-44XWnF+4GbeY|q9Y9%IUg6I1NwiwST1y=6b9%<&GMD>-
z9C7?Q5dj#qe|mE@dAH2B+o%ddjT%OvI#l7_`xo=RoQ2v@9VtSsVlXCPesO`_A8dmv
zB7cJQDQG~oUZ=gci*<3HiACQ;$$Jz5FI^4vJ8~XBEm;(U2(?-jR0v8Xf^r#a3Y!!N
z0AuoU*#q@zl~RyPSrO7Gg7OfRYMnMaXcnPTKekbN{Gq;Rt@NZ%H;ftsf>0`#K!qfV
z8B*|(Ba<voY&M|LsA3G5&Y|8YahBno>wlVKxl+M<aA{naXNBWF78yCA52)xZ_MhJc
zkiZbsYI%v!YB4549EM!Ic%@r?ojbS4<n%ZOgPPoQSC*EGu$q@1wp0V>h}$g;Ams`;
zf6VFNBm_jeN$l24tQb5>shXQk)M{ga#z>P&xkQ>IfO7Gb%k1v#F)?upamtO=HGj6(
z*Ygam!uaGQ&N+OR;L?<8txl5lC9JpP1A4HG=$MjM!HB_GOSMuVNn-ZbH))<e#r$n^
zTz&O&o-<HZS5{eFUg^sPx%A8BGE-+3h*BZkS_4&vn!_ZLpDo@j0ee`e>Q7>W`9SjC
zj`xgCO`#$zUt2=5lzOwt+1nSerhij%NU!}~%xkqOcinRjsZ-LZ#n$RFHn0REQ#dat
zIAHpdHMRyoiw<OB@A5v8uM9DI>J;8(T)%XcEORtQPjTNnA7EnQG?h{bE$n@0sLuTS
z9CzIF4jg6DEMsly5~|AN+#+Gh@zOs$5g+CQ{*XFoFr=nlP%D(iCMfUi(tq0B<?4@K
zW?}JmD)l<k^9#%_ETAF;#*q1<Y3zk?cbm1PE4VCSc<dBy)5IO?yl*CvX(9Q({>MN?
zS`f)Rs5LZa&l0b%&<<N%e)%O%PfpTkj!>x&5!e6`kIPb$sLkH?2K!qZs0w2fQ<&xq
z?aU)@;bZ&36IsWEl!Kv^-hZjgtKw0_8p;z3j5l}KURz;vb(KwSfGVX*1r?7=i>9v%
zrE;0^xkXx9BTeNkfj^?PDD7St<&ctkP$P*GES|tN8J=Av$Re_&P26sgMiIt9tzM^E
zZ&0e%@#SH5960aaG*~0zPvQgrLYll^gG#ycP3zW@qD!Rk6;UNqNPjU{+aRbnDc7f{
z7{y|63W+L_C_a(@lcWP53+R6yOQ2RQ|8X3}zpiEOR$D3^wEtU<nA(fa0*F_f=l}Hz
zvPf&u&DY8jf9_<Btxtb_NU8pzqQ8hz?R{mGLX}Ei+qf4Yin*ch2q^u>LE(@t@8R*W
uXVaO1XI&C~{=fd=%N;u>ZY}<_T>lGsjzDg?SAT&30000<MNUMnLSTYPDtIdZ

delta 2003
zcmV;^2Q2uf8sQI+B!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z1SbFh1SbL6PaS{&00(qQL_t(&-tC!ta8y?v$3N%Zy}Q{B8z6-63M2!C0<D5$OJM*P
zly(6heGEE?)7B1yExO7~QOXp{h?Hk5wsjpl4mcoCu^kbuT7NEq(yhgUU`tzM+CW1H
z5Rw|gYuVR*9RJuGW=%KAhD`#_@SDkGchB$c`F+p%{=UE8IV;G+!jWJZPy!qd1@w+S
z3s4M<3<dOmTx$#p`B@WC84Bpl0p)BC;N5x7pErOQ@JKikd_7kX%|78sa1pR4pVbEt
zbb^H=!Iyzw1AlvgLg3rLJwOHE0_uP_fQ`;;fQC>&@00J`E;`5N0+)ak;Lb9BD=-yU
z2AIygV>)AEC685a{{J(e5s<9}pKZ}3a5x+Z?#cYFZlh2*62#&B`@m;f49hmYS7w>_
zA}|U#+fgOErX9!#z9u91<G^jeoQxn_Td>{02w<i2S$`3566kd;JJBHktJaQd4*o5m
zJY(oN;3%-o$%D3RCU7hi(3fO@a!Dy`LIIr@^l4p7p`~+2-_du@po2nHGM_#IOb3QK
zYSY%jYy%z#W&tl`4kW6g;UCW1_x&yb@MN$YTX89vcB0>-6)vr>yDgsQngeNH2~tXV
zYFU-77Jn!ON|D=K@$!eAOQDteNw936w54|bZw;c2Cq+98CO+jWz&dXTp`xNGGja{S
z!#N;aVkSW1<11K~O*+j~XxdSa5CS`9F6**FCN#w@q_l)4Xng66Av}t7NFk7bltQM7
zA+8cc$}~lqeUOfC+D}Re5@9x`1OgOIIhVHzWq-<9^Xt{??qcPij&G51nY82fhpDrP
zf@Dq1n>-owCQrr+lC`md<f*tPbt>*josPRxr{nI_nYcSum(WsY6Pj^0;WFwIE~7rF
z8VyO+_#~+s|4AxVV@k2k8O?yLRXeNi{=J+_t_4oCqVbP8{fq@X6AI`%oblO4V`_z`
z!hc(Ja?#Q0NDxYX?UdqEF`H5p-#?&U@v6nX+x!PZ0ezAa{O!Oxr)94U1@tGHW6Vk+
zC-?_}Uu7u9AH$L0j8H(|2@KIn+(Ydv*3i<229v0Xap{e7pnwpf!@LK9e_}Dd(SBUT
zT7PLukW6$udI29~#PPXsBsdbdx78d7M}L9>_)QBbl)wsLXQmi>Dtw3n6|>18bvllD
z!DtnPlun`ufl{bqT{h_%D51x=UPwct`dvs<w&cX>ERs7D&;X;g91sp|T1s6(w!qx|
zJ@lD1fL_x}@eKBYOI!_BN}2w%B|;JSM)^U3fj=5X(bN(O#}*+x3aY<V9Vu%?f`3Kl
zw$nCvNA$ouq6b#YqH)tHN*^uf%$no4dTJEk*N=;P&(Y@_14-1x!GfNX`{YtWWp|zj
zkW!*}6-wt<Ab`P-52L;=#<AKcrBjMgRY5_y7b#`O^QAigGzXQ8o2>oLei}|)`JXiu
z3iL1U!Qu@QP}Lg{00NG^+r;w=4u3LuxSxf;yo>%7J@6K~h+Q_QuZgl{^$`|)v696b
zCQvrKC`XcX?V<iEeWDjrJip)|Uz%OPl1-EF_jdE@`eUqLdYH=JonX){et!B&fbla1
zvU={@Ty9EUP5A2$z~xqW@rifoS>oY=@7~Hkch&KeZ~mP(x7YH~p>tGjJ%7Q%>3cX`
zb%{roj-h9Xhd+cr!lfxU27u`K6g5XLFmL%-gd%up?Gb!_jWvIsO8CtnPi;=url%j?
zM>1jYwRs~rwEHZ!b%X3c^kTZM+%l#Z%e47LB*@Pzr{OEoh(}EZRQQ=TyCU5-n>L@F
zT$;WWYe?J}09036Rcu?L2!Fx9_SAFY-xpDu`y>IiRhJMVtyZy1=~JiXQEv<tD(>e6
zVCSae1Ros6men5+y<jlm%Y&Ho)iPe&e1fWXnix<~h)Yw@H&>%-3dQ{jNF}T;*#Y_K
zdfSGAD)99MBl*jQkJDU#WeR=Ee7ybFGd%Oy0gmkZgpqgj;mM8ZTz}ZVvyM3nM`I-0
z3_jK29S8+<I~)nV2aIds_fDJLge94L-w<BgRL!EVyv|dbC$Vz-6zWbyiAPQRz1@_S
z`Dm!U!t#gSqI9s2anlE4+ih0mt-u3W7S(8P2POd38Sf8-0{X-4RbfRDtlBY!enSdb
zeD7Y?eeVE=BMsEoM1MKBtBz;q@8`#}A`H8|H%pwIXse|N1@!H}iy0r8z=%*lm+b+t
zLjir5bC?(&3h3i=zi<*PUO$0(Pmcv5*tNBqjmzI>_qG}|x61srpXUe9-PvyN8HcO+
z&SB=xP(XLLSlEu=3prQfYjUZ~E=|FuDJY7-wk1Z&#xm`k8h^P^Ko{MrLfI%~nG(yi
zvNn93X$t@6)=>cObwf<GT>`*KWZk(3?Ud70D}H0U^m5k$)8EOT1n?>_K8ss<MgcUO
zn~wXl_zk&w%>`#V`Wr#sSrv{1BfuB32}CHMTN!>^fNy1EK}&7FnZ!2%+yv0Q0F2hJ
zyxMP%^GV>&0!*+si?$!i64-CE_*Gxm9dL@<D&Rniw)gHVei2}M3kkpHx^pn&7yGf{
lNN{`(ext&X;Ka_F|Gzh*>#qG$GE)Em002ovPDHLkV1i{3zoP&E


From f1a1b553af0f5292ca43ad412388fb019cfe1b53 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 7 Jan 2014 13:39:05 +0000
Subject: [PATCH 40/68] Don't busy-wait on buildserver output

---
 fdroidserver/build.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 483375e5..e244e2df 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -332,6 +332,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
                 output += chan.recv(1024)
             while chan.recv_stderr_ready():
                 error += chan.recv_stderr(1024)
+            time.sleep(0.1)
         print "...getting exit status"
         returncode = chan.recv_exit_status()
         while True:

From ab1565ac027c78c51659041d588498429f4f3d7c Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 7 Jan 2014 13:39:31 +0000
Subject: [PATCH 41/68] A little bit of extra checkupdates diagnostics

---
 fdroidserver/checkupdates.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index d7c89eec..00ea0146 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -114,6 +114,8 @@ def check_tags(app):
         hcode = "0"
 
         for tag in vcs.gettags():
+            if options.verbose:
+                print "Check tag: '{0}'".format(tag)
             vcs.gotorevision(tag)
 
             # Only process tags where the manifest exists...

From 41503aa7bc221d3871fcaf2da7146733f7a97873 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 7 Jan 2014 13:39:48 +0000
Subject: [PATCH 42/68] Use app categories as wiki categories

---
 fdroidserver/update.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 45d6ae50..e08f397a 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -187,6 +187,8 @@ def update_wiki(apps, apks):
             wikidata += '\n[[Category:Apps that are disabled]]\n'
         if app['Update Check Mode'] == 'None' and not app['Disabled']:
             wikidata += '\n[[Category:Apps with no update check]]\n'
+        for appcat in [c.strip() for c in app['Categories'].split(',')]:
+            wikidata += '\n[[Category:{0}]]\n'.format(appcat)
 
         # We can't have underscores in the page name, even if they're in
         # the package ID, because MediaWiki messes with them...

From e78878c2ea537732ee8dc0f415561f8cbb69c878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 15:55:07 +0100
Subject: [PATCH 43/68] Add 640 dpi icons dir

---
 fdroidserver/update.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index e08f397a..6906b932 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -36,14 +36,11 @@ from PIL import Image
 
 
 def get_densities():
-    return ['480', '320', '240', '160', '120']
+    return ['640', '480', '320', '240', '160', '120']
 
 def launcher_size(density):
     return (int(density) * 48) / 160
 
-def icon_dens_label(density):
-    return "icon-%s" % density
-
 def get_icon_dir(repodir, density):
     if density is None:
         return os.path.join(repodir, "icons")
@@ -454,11 +451,12 @@ def scan_apks(apps, apkcache, repodir, knownapks):
             densities = get_densities()
             empty_densities = []
             for density in densities:
-                label = icon_dens_label(density)
                 if density not in thisinfo['icons_src']:
                     empty_densities.append(density)
                     continue
                 apk = zipfile.ZipFile(apkfile, 'r')
+                if 'icons' not in thisinfo:
+                    thisinfo['icons'] = {}
                 iconsrc = thisinfo['icons_src'][density]
                 icon_dir = get_icon_dir(repodir, density)
                 icondest = os.path.join(icon_dir, iconfilename)
@@ -467,11 +465,11 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                     iconfile = open(icondest, 'wb')
                     iconfile.write(apk.read(iconsrc))
                     iconfile.close()
-                    thisinfo[label] = iconfilename 
+                    thisinfo['icons'][density] = iconfilename 
 
                 except:
                     print "WARNING: Error retrieving icon file"
-                    del thisinfo[label]
+                    del thisinfo['icons'][density]
                     del thisinfo['icons_src'][density]
                     empty_densities.append(density)
 

From e81a3bae04380456d7485dc139fa45a34a8aa55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 16:16:26 +0100
Subject: [PATCH 44/68] Use application: and launchable-activity: icons as
 fallback

---
 fdroidserver/update.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 6906b932..4a86611b 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -334,6 +334,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
     vername_pat = re.compile(".*versionName='([^']*)'.*")
     label_pat = re.compile(".*label='(.*?)'(\n| [a-z]*?=).*")
     icon_pat = re.compile(".*application-icon-([0-9]+):'([^']+?)'.*")
+    icon_pat_nodpi = re.compile(".*icon='([^']+?)'.*")
     sdkversion_pat = re.compile(".*'([0-9]*)'.*")
     string_pat = re.compile(".*'([^']*)'.*")
     for apkfile in glob.glob(os.path.join(repodir, '*.apk')):
@@ -379,13 +380,27 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                         sys.exit(1)
                 elif line.startswith("application:"):
                     thisinfo['name'] = re.match(label_pat, line).group(1)
+                    if 'icons_src' not in thisinfo:
+                        thisinfo['icons_src'] = {}
+                    # Keep path to non-dpi icon in case we need it
+                    match = re.match(icon_pat_nodpi, line)
+                    if match:
+                        thisinfo['icons_src']['-1'] = match.group(1)
+                elif line.startswith("launchable-activity:"):
+                    if 'icons_src' not in thisinfo:
+                        thisinfo['icons_src'] = {}
+                    # Only use launchable-activity as fallback to application
+                    elif '-1' not in thisinfo['icons_src']:
+                        match = re.match(icon_pat_nodpi, line)
+                        if match:
+                            thisinfo['icons_src']['-1'] = match.group(1)
                 elif line.startswith("application-icon-"):
+                    if 'icons_src' not in thisinfo:
+                        thisinfo['icons_src'] = {}
                     match = re.match(icon_pat, line)
                     if match:
                         density = match.group(1)
                         path = match.group(2)
-                        if 'icons_src' not in thisinfo:
-                            thisinfo['icons_src'] = {}
                         thisinfo['icons_src'][density] = path
                 elif line.startswith("sdkVersion:"):
                     thisinfo['sdkversion'] = re.match(sdkversion_pat, line).group(1)
@@ -477,8 +492,8 @@ def scan_apks(apps, apkcache, repodir, knownapks):
 
                 resize_icon(icondest, density)
 
-            last_density = None
             # First try resizing down to not lose quality
+            last_density = None
             for density in densities:
                 if density not in empty_densities:
                     last_density = density
@@ -500,8 +515,8 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 im.save(iconpath, "PNG")
                 empty_densities.remove(density)
 
-            last_density = None
             # Then just copy from the highest resolution available
+            last_density = None
             for density in reversed(densities):
                 if density not in empty_densities:
                     last_density = density

From d9d8448035fbd9a528205bb18721371e53331b9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 16:17:38 +0100
Subject: [PATCH 45/68] Keep the same ZipFile instance to retrieve all the
 icons

---
 fdroidserver/update.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 4a86611b..67088b6e 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -458,6 +458,8 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 sys.exit(1)
             thisinfo['sig'] = output[7:].strip()
 
+            apk = zipfile.ZipFile(apkfile, 'r')
+
             iconfilename = "%s.%s.png" % (
                     thisinfo['id'],
                     thisinfo['versioncode'])
@@ -469,7 +471,6 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 if density not in thisinfo['icons_src']:
                     empty_densities.append(density)
                     continue
-                apk = zipfile.ZipFile(apkfile, 'r')
                 if 'icons' not in thisinfo:
                     thisinfo['icons'] = {}
                 iconsrc = thisinfo['icons_src'][density]
@@ -488,10 +489,10 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                     del thisinfo['icons_src'][density]
                     empty_densities.append(density)
 
-                apk.close()
-
                 resize_icon(icondest, density)
 
+            apk.close()
+
             # First try resizing down to not lose quality
             last_density = None
             for density in densities:

From 1f2b95c218c20a322d92a7ab90cb0fdd4e236d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 16:25:29 +0100
Subject: [PATCH 46/68] Don't print twice as many lines when resizing icons

---
 fdroidserver/update.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 67088b6e..6ce6b2aa 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -280,9 +280,9 @@ def resize_icon(iconpath, density):
         size = launcher_size(density)
 
         if any(length > size for length in im.size):
-            print iconpath, "is too large:", im.size
+            oldsize = im.size
             im.thumbnail((size, size), Image.ANTIALIAS)
-            print iconpath, "new size:", im.size
+            print iconpath, "was too large at", oldsize, "- new size is", im.size
             im.save(iconpath, "PNG")
 
         else:

From 4d23f9573722103e5a86d81a55a2e6fafd5dac87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 16:34:24 +0100
Subject: [PATCH 47/68] Create icons dicts like the rest

---
 fdroidserver/update.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 6ce6b2aa..b786ed9b 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -361,6 +361,8 @@ def scan_apks(apps, apkcache, repodir, knownapks):
             thisinfo['size'] = os.path.getsize(apkfile)
             thisinfo['permissions'] = []
             thisinfo['features'] = []
+            thisinfo['icons_src'] = {}
+            thisinfo['icons'] = {}
             p = subprocess.Popen([os.path.join(config['sdk_path'], 'build-tools', config['build_tools'], 'aapt'),
                                   'dump', 'badging', apkfile],
                                  stdout=subprocess.PIPE)
@@ -380,23 +382,17 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                         sys.exit(1)
                 elif line.startswith("application:"):
                     thisinfo['name'] = re.match(label_pat, line).group(1)
-                    if 'icons_src' not in thisinfo:
-                        thisinfo['icons_src'] = {}
                     # Keep path to non-dpi icon in case we need it
                     match = re.match(icon_pat_nodpi, line)
                     if match:
                         thisinfo['icons_src']['-1'] = match.group(1)
                 elif line.startswith("launchable-activity:"):
-                    if 'icons_src' not in thisinfo:
-                        thisinfo['icons_src'] = {}
                     # Only use launchable-activity as fallback to application
-                    elif '-1' not in thisinfo['icons_src']:
+                    if '-1' not in thisinfo['icons_src']:
                         match = re.match(icon_pat_nodpi, line)
                         if match:
                             thisinfo['icons_src']['-1'] = match.group(1)
                 elif line.startswith("application-icon-"):
-                    if 'icons_src' not in thisinfo:
-                        thisinfo['icons_src'] = {}
                     match = re.match(icon_pat, line)
                     if match:
                         density = match.group(1)
@@ -471,8 +467,6 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 if density not in thisinfo['icons_src']:
                     empty_densities.append(density)
                     continue
-                if 'icons' not in thisinfo:
-                    thisinfo['icons'] = {}
                 iconsrc = thisinfo['icons_src'][density]
                 icon_dir = get_icon_dir(repodir, density)
                 icondest = os.path.join(icon_dir, iconfilename)
@@ -491,6 +485,9 @@ def scan_apks(apps, apkcache, repodir, knownapks):
 
                 resize_icon(icondest, density)
 
+            if '-1' in thisinfo['icons_src']:
+                pass #TODO
+
             apk.close()
 
             # First try resizing down to not lose quality

From 92cab5036880220c5a887b0b93d979df1c440622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 17:01:51 +0100
Subject: [PATCH 48/68] Support application and launchable-activity icons as
 fallback

---
 fdroidserver/update.py | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index b786ed9b..dd2f8728 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -38,9 +38,12 @@ from PIL import Image
 def get_densities():
     return ['640', '480', '320', '240', '160', '120']
 
-def launcher_size(density):
+def dpi_to_px(density):
     return (int(density) * 48) / 160
 
+def px_to_dpi(px):
+    return (int(px) * 160) / 48
+
 def get_icon_dir(repodir, density):
     if density is None:
         return os.path.join(repodir, "icons")
@@ -277,7 +280,7 @@ def resize_icon(iconpath, density):
 
     try:
         im = Image.open(iconpath)
-        size = launcher_size(density)
+        size = dpi_to_px(density)
 
         if any(length > size for length in im.size):
             oldsize = im.size
@@ -483,10 +486,24 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                     del thisinfo['icons_src'][density]
                     empty_densities.append(density)
 
-                resize_icon(icondest, density)
-
             if '-1' in thisinfo['icons_src']:
-                pass #TODO
+                iconsrc = thisinfo['icons_src']['-1']
+                iconpath = os.path.join(
+                        get_icon_dir(repodir, None), iconfilename)
+                iconfile = open(iconpath, 'wb')
+                iconfile.write(apk.read(iconsrc))
+                iconfile.close()
+                im = Image.open(iconpath)
+                dpi = px_to_dpi(im.size[0])
+                for density in densities:
+                    if density in thisinfo['icons']:
+                        break
+                    if dpi >= int(density):
+                        thisinfo['icons'][density] = iconfilename
+                        shutil.move(iconpath,
+                                os.path.join(get_icon_dir(repodir, density), iconfilename))
+                        empty_densities.remove(density)
+                        break
 
             apk.close()
 
@@ -507,7 +524,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 iconpath = os.path.join(
                         get_icon_dir(repodir, density), iconfilename)
                 im = Image.open(last_iconpath)
-                size = launcher_size(density)
+                size = dpi_to_px(density)
 
                 im.thumbnail((size, size), Image.ANTIALIAS)
                 im.save(iconpath, "PNG")
@@ -531,6 +548,11 @@ def scan_apks(apps, apkcache, repodir, knownapks):
 
                 empty_densities.remove(density)
 
+            for density in densities:
+                icon_dir = get_icon_dir(repodir, density)
+                icondest = os.path.join(icon_dir, iconfilename)
+                resize_icon(icondest, density)
+
             # Copy from icons-mdpi to icons since mdpi is the baseline density
             shutil.copyfile(
                     os.path.join(get_icon_dir(repodir, '160'), iconfilename),

From bce5f451693fb47275f8bc021082a54482d75ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 17:02:59 +0100
Subject: [PATCH 49/68] Avoid possible crashes

* No 160 dpi icon available
* Trying to resize a non-existing icon
* Non-dpi icon being lower density than ldpi
---
 fdroidserver/update.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index dd2f8728..2e95d025 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -278,6 +278,9 @@ def delete_disabled_builds(apps, apkcache, repodirs):
 
 def resize_icon(iconpath, density):
 
+    if not os.path.isfile(iconpath):
+        return
+
     try:
         im = Image.open(iconpath)
         size = dpi_to_px(density)
@@ -498,7 +501,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 for density in densities:
                     if density in thisinfo['icons']:
                         break
-                    if dpi >= int(density):
+                    if density == densities[-1] or dpi >= int(density):
                         thisinfo['icons'][density] = iconfilename
                         shutil.move(iconpath,
                                 os.path.join(get_icon_dir(repodir, density), iconfilename))
@@ -554,9 +557,10 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 resize_icon(icondest, density)
 
             # Copy from icons-mdpi to icons since mdpi is the baseline density
-            shutil.copyfile(
-                    os.path.join(get_icon_dir(repodir, '160'), iconfilename),
-                    os.path.join(get_icon_dir(repodir, None), iconfilename))
+            baseline = os.path.join(get_icon_dir(repodir, '160'), iconfilename)
+            if os.path.isfile(baseline):
+                shutil.copyfile(baseline,
+                        os.path.join(get_icon_dir(repodir, None), iconfilename))
 
             # Record in known apks, getting the added date at the same time..
             added = knownapks.recordapk(thisinfo['apkname'], thisinfo['id'])

From 958eae4f86850f9f892b70870850742d1c2bfcd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 17:59:02 +0100
Subject: [PATCH 50/68] Bump index version to 11, add index version changelog

---
 docs/index_versions.md | 11 +++++++++++
 fdroidserver/update.py |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 docs/index_versions.md

diff --git a/docs/index_versions.md b/docs/index_versions.md
new file mode 100644
index 00000000..af903b8b
--- /dev/null
+++ b/docs/index_versions.md
@@ -0,0 +1,11 @@
+### 11 (January 2014)
+
+* Support per-density icon folders (/icons-\*)
+
+### 10 (January 2014)
+
+* First version
+
+### 0 (?)
+
+* No version yet declared
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 2e95d025..698b8ac5 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -620,7 +620,7 @@ def make_index(apps, apks, repodir, archive, categories):
         repoel.setAttribute("url", config['repo_url'])
         addElement('description', config['repo_description'], doc, repoel)
 
-    repoel.setAttribute("version", "10")
+    repoel.setAttribute("version", "11")
     repoel.setAttribute("timestamp", str(int(time.time())))
 
     if config['repo_keyalias']:

From 334a221893d28892fe0e5ba44c38da6f628437b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 19:22:07 +0100
Subject: [PATCH 51/68] Fix: Re-add <icon> element to index

---
 fdroidserver/update.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 698b8ac5..ce976e72 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -508,6 +508,9 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                         empty_densities.remove(density)
                         break
 
+            if thisinfo['icons']:
+                thisinfo['icon'] = iconfilename
+
             apk.close()
 
             # First try resizing down to not lose quality

From 8cb00b289fbbb5aeade216c71c6bbcf52aa419af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 8 Jan 2014 09:00:40 +0100
Subject: [PATCH 52/68] Avoid crashes on package: group() calls

---
 fdroidserver/build.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index e244e2df..03289b19 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -690,11 +690,18 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
     for line in output.splitlines():
         if line.startswith("package:"):
             pat = re.compile(".*name='([a-zA-Z0-9._]*)'.*")
-            foundid = re.match(pat, line).group(1)
+            m = pat.match(line)
+            if m:
+                foundid = m.group(1)
             pat = re.compile(".*versionCode='([0-9]*)'.*")
-            vercode = re.match(pat, line).group(1)
+            m = pat.match(line)
+            if m:
+                vercode = m.group(1)
             pat = re.compile(".*versionName='([^']*)'.*")
-            version = re.match(pat, line).group(1)
+            m = pat.match(line)
+            if m:
+                version = m.group(1)
+
     if thisbuild['novcheck']:
         vercode = thisbuild['vercode']
         version = thisbuild['version']

From 883d63f2c3e2fcf93dc2d9559ec51af4ba7960d0 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 8 Jan 2014 10:56:53 +0000
Subject: [PATCH 53/68] Only conditionally try to remove completed box

---
 makebuildserver | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/makebuildserver b/makebuildserver
index 3e81da79..8235577a 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -201,5 +201,8 @@ vagrant(['package', '--output', os.path.join('..', boxfile)], serverdir)
 print "Adding box"
 vagrant(['box', 'add', 'buildserver', boxfile, '-f'])
 
-os.remove(boxfile)
+# Remove box file if it exists (older vagrant versions left it there, newer
+# ones seem to delete it
+if os.path.exists(boxfile):
+    os.remove(boxfile)
 

From 0178c4b5c5d2a525cfe42ef1519176bc58c79b6c Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 8 Jan 2014 11:21:30 +0000
Subject: [PATCH 54/68] Change recommended base box from Ubuntu to Debian

---
 docs/fdroid.texi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 842d8d60..6c734b63 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -1374,7 +1374,7 @@ applications.
 @section Setting up a build server
 
 In addition to the basic setup previously described, you will also need
-a Vagrant-compatible Ubuntu Raring base box called 'raring32' (or raring64
+a Vagrant-compatible Debian Testing base box called 'testing32' (or testing64
 for a 64-bit VM, if you want it to be much slower, and require more disk
 space).
 
@@ -1385,9 +1385,9 @@ for example, having subversion v1.6 on the host and v1.7 on the guest
 would fail.
 
 Unless you're very trusting. you should create one of these for yourself
-from verified standard Ubuntu installation media. However, you could skip
+from verified standard Debian installation media. However, you could skip
 over the next few paragraphs (and sacrifice some security) by downloading
-@url{https://f-droid.org/raring32.box} or @url{https://f-droid.org/raring64.box}.
+@url{https://f-droid.org/testing32.box}.
 
 Documentation for creating a base box can be found at
 @url{http://docs.vagrantup.com/v1/docs/base_boxes.html}.

From 42c010de936880978c9a427f1a3b7e6784b30157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 8 Jan 2014 13:19:57 +0100
Subject: [PATCH 55/68] Raise summary char limit default to 50, fix
 config.sample.py

---
 fdroidserver/common.py         | 2 +-
 sampleconfigs/config.sample.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 6b82a701..be9bf6dc 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -62,7 +62,7 @@ def read_config(opts, config_file='config.py'):
         'stats_to_carbon': False,
         'repo_maxage': 0,
         'char_limits': {
-            'Summary' : 40,
+            'Summary' : 50,
             'Description' : 1500
         }
 
diff --git a/sampleconfigs/config.sample.py b/sampleconfigs/config.sample.py
index 8b9e64a2..d352fa02 100644
--- a/sampleconfigs/config.sample.py
+++ b/sampleconfigs/config.sample.py
@@ -111,7 +111,7 @@ build_server_always = False
 
 # Limit in number of characters that fields can take up
 # Only the fields listed here are supported, defaults shown
-char_limits: {
-    'Summary' : 40
+char_limits = {
+    'Summary' : 50,
     'Description' : 1500
 }

From 0aaa9000f8cf545bd5bfa41b6538d56c91dbde97 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 8 Jan 2014 16:26:04 +0000
Subject: [PATCH 56/68] Update base box in sample config too

---
 sampleconfigs/makebs.config.sample.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sampleconfigs/makebs.config.sample.py b/sampleconfigs/makebs.config.sample.py
index 4370765d..7dc42ba5 100644
--- a/sampleconfigs/makebs.config.sample.py
+++ b/sampleconfigs/makebs.config.sample.py
@@ -3,11 +3,13 @@
 # You will need to alter these before running ./makebuildserver
 
 # Name of the base box to use...
-basebox = "raring32"
+basebox = "testing32"
 
 # Location where raring32.box can be found, if you don't already have
-# it. Could be set to https://f-droid.org/raring32.box if you like...
-baseboxurl = "/shares/software/OS and Boot/raring32.box"
+# it. For security reasons, it's recommended that you make your own
+# in a secure environment using trusted media (see the manual) but
+# you can use this default if you like...
+baseboxurl = "https://f-droid.org/testing32.box"
 
 memory = 3584
 

From 6e1b1e00c19a695fc55947e485c63134fc93fdf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 8 Jan 2014 18:17:00 +0100
Subject: [PATCH 57/68] Fix email, url and docs in setup.py

---
 setup.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index cb6a3a81..25d6be85 100644
--- a/setup.py
+++ b/setup.py
@@ -7,13 +7,15 @@ setup(name='FDroidServer',
       description='F-Droid Server Tools',
       long_description=open('README').read(),
       author='The F-Droid Project',
-      author_email='admin@f-droid.org',
-      url='http://f-droid.org',
+      author_email='team@f-droid.org',
+      url='https://f-droid.org',
       packages=['fdroidserver'],
       scripts=['fdroid'],
       data_files=[
         ('share/doc/fdroidserver/examples',
-         ['config.buildserver.py', 'config.sample.py', 'makebs.config.sample.py',
+         [ 'config.buildserver.py',
+             'sampleconfigs/config.sample.py',
+             'sampleconfigs/makebs.config.sample.py',
           'fdroid-icon.png']),
         ],
       install_requires=[

From 879d8dd0cc81ecce7f3ce57b773138d9472f03a1 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Thu, 9 Jan 2014 12:33:48 +0000
Subject: [PATCH 58/68] Transfer apk info when archiving

Just dropping this apk entry temporarily caused an old version of the
app to appear on the wiki as a failing build. (only for one cycle after
the archiving happened). Moving it to the archived apks list ought to
resolve that problem.
---
 fdroidserver/update.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index ce976e72..e204b638 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -828,7 +828,7 @@ def make_index(apps, apks, repodir, archive, categories):
 
 
 
-def archive_old_apks(apps, apks, repodir, archivedir, defaultkeepversions):
+def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversions):
 
     for app in apps:
 
@@ -854,6 +854,7 @@ def archive_old_apks(apps, apks, repodir, archivedir, defaultkeepversions):
                 if 'srcname' in apk:
                     shutil.move(os.path.join(repodir, apk['srcname']),
                         os.path.join(archivedir, apk['srcname']))
+                archapks.append(apk)
                 apks.remove(apk)
 
 
@@ -1013,7 +1014,7 @@ def main():
                 print "       " + apk['name'] + " - " + apk['version']
 
     if len(repodirs) > 1:
-        archive_old_apks(apps, apks, repodirs[0], repodirs[1], config['archive_older'])
+        archive_old_apks(apps, apks, archapks, repodirs[0], repodirs[1], config['archive_older'])
 
     # Make the index for the main repo...
     make_index(apps, apks, repodirs[0], False, categories)

From d83a723f5c7ef6d4be593a8916ee369d2ab425c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 9 Jan 2014 15:44:58 +0100
Subject: [PATCH 59/68] Install gradle version 1.4, 1.6, 1.7, 1.8 and 1.9 to
 /opt/gradle

---
 .../fdroidbuild-general/recipes/default.rb    | 27 +++++++++----------
 makebuildserver                               | 12 +++++++++
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index 0764eb23..8587f3d9 100644
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -19,26 +19,25 @@ if node['kernel']['machine'] == "x86_64"
   end
 end
 
-script "install-gradle" do
+script "add-gradle-dir" do
   cwd "/tmp"
   interpreter "bash"
-  code "
-    unzip /vagrant/cache/gradle-1.9-bin.zip
-    mv gradle-1.9 /opt/gradle
-  "
+  code "mkdir -p /opt/gradle"
   not_if "test -d /opt/gradle"
 end
 
-execute "add-gradle-home" do
-  user user
-  command "echo \"export GRADLE_HOME=/opt/gradle\" >> /home/#{user}/.bsenv"
-  not_if "grep GRADLE_HOME /home/#{user}/.bsenv"
-end
-execute "add-gradle-bin" do
-  user user
-  command "echo \"export PATH=\\$PATH:/opt/gradle/bin\" >> /home/#{user}/.bsenv"
-  not_if "grep gradle/bin /home/#{user}/.bsenv"
+%w{1.4 1.6 1.7 1.8 1.9}.each do |ver|
+  script "install-gradle-#{ver}" do
+    cwd "/tmp"
+    interpreter "bash"
+    code "
+      unzip /vagrant/cache/gradle-#{ver}-bin.zip
+      mv gradle-#{ver} /opt/gradle/#{ver}
+    "
+    not_if "test -d /opt/gradle/#{ver}"
+  end
 end
+
 execute "add-bsenv" do
   user user
   command "echo \". ./.bsenv \" >> /home/#{user}/.bashrc"
diff --git a/makebuildserver b/makebuildserver
index 8235577a..96443a72 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -62,6 +62,18 @@ cachefiles = [
     ('android-sdk_r22.3-linux.tgz',
      'http://dl.google.com/android/android-sdk_r22.3-linux.tgz',
      '4077575c98075480e0156c10e48a1521e31c7952768271a206870e6813057f4f'),
+    ('gradle-1.4-bin.zip',
+     'http://services.gradle.org/distributions/gradle-1.4-bin.zip',
+     'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),
+    ('gradle-1.6-bin.zip',
+     'http://services.gradle.org/distributions/gradle-1.6-bin.zip',
+     'de3e89d2113923dcc2e0def62d69be0947ceac910abd38b75ec333230183fac4'),
+    ('gradle-1.7-bin.zip',
+     'http://services.gradle.org/distributions/gradle-1.7-bin.zip',
+     '360c97d51621b5a1ecf66748c718594e5f790ae4fbc1499543e0c006033c9d30'),
+    ('gradle-1.8-bin.zip',
+     'http://services.gradle.org/distributions/gradle-1.8-bin.zip',
+     'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703'),
     ('gradle-1.9-bin.zip',
      'http://services.gradle.org/distributions/gradle-1.9-bin.zip',
      '097ddc2bcbc9da2bb08cbf6bf8079585e35ad088bafd42e8716bc96405db98e9'),

From 12c05c06f241cedb55c02d67b4b01e56e5ab95f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 9 Jan 2014 16:27:18 +0100
Subject: [PATCH 60/68] Add gradle-1.10

---
 makebuildserver | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/makebuildserver b/makebuildserver
index 96443a72..a6e67c74 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -77,6 +77,9 @@ cachefiles = [
     ('gradle-1.9-bin.zip',
      'http://services.gradle.org/distributions/gradle-1.9-bin.zip',
      '097ddc2bcbc9da2bb08cbf6bf8079585e35ad088bafd42e8716bc96405db98e9'),
+    ('gradle-1.10-bin.zip',
+     'http://services.gradle.org/distributions/gradle-1.10-bin.zip',
+     '6e6db4fc595f27ceda059d23693b6f6848583950606112b37dfd0e97a0a0a4fe'),
     ('Kivy-1.7.2.tar.gz',
      'http://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1')

From 06f9a42601b40da68d271a0a84171bc459a9945a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 9 Jan 2014 16:27:34 +0100
Subject: [PATCH 61/68] Move gradle to its own cookbook

---
 .../fdroidbuild-general/recipes/default.rb    | 19 ----------------
 .../cookbooks/gradle/recipes/default.rb       | 22 +++++++++++++++++++
 2 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 buildserver/cookbooks/gradle/recipes/default.rb

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index 8587f3d9..95a86dcd 100644
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -19,25 +19,6 @@ if node['kernel']['machine'] == "x86_64"
   end
 end
 
-script "add-gradle-dir" do
-  cwd "/tmp"
-  interpreter "bash"
-  code "mkdir -p /opt/gradle"
-  not_if "test -d /opt/gradle"
-end
-
-%w{1.4 1.6 1.7 1.8 1.9}.each do |ver|
-  script "install-gradle-#{ver}" do
-    cwd "/tmp"
-    interpreter "bash"
-    code "
-      unzip /vagrant/cache/gradle-#{ver}-bin.zip
-      mv gradle-#{ver} /opt/gradle/#{ver}
-    "
-    not_if "test -d /opt/gradle/#{ver}"
-  end
-end
-
 execute "add-bsenv" do
   user user
   command "echo \". ./.bsenv \" >> /home/#{user}/.bashrc"
diff --git a/buildserver/cookbooks/gradle/recipes/default.rb b/buildserver/cookbooks/gradle/recipes/default.rb
new file mode 100644
index 00000000..60a00750
--- /dev/null
+++ b/buildserver/cookbooks/gradle/recipes/default.rb
@@ -0,0 +1,22 @@
+
+user = node[:settings][:user]
+
+script "add-gradle-dir" do
+  cwd "/tmp"
+  interpreter "bash"
+  code "mkdir -p /opt/gradle"
+  not_if "test -d /opt/gradle"
+end
+
+%w{1.4 1.6 1.7 1.8 1.9 1.10}.each do |ver|
+  script "install-gradle-#{ver}" do
+    cwd "/tmp"
+    interpreter "bash"
+    code "
+      unzip /vagrant/cache/gradle-#{ver}-bin.zip
+      mv gradle-#{ver} /opt/gradle/#{ver}
+    "
+    not_if "test -d /opt/gradle/#{ver}"
+  end
+end
+

From db33ae75e597fa2c2ac4dd398034b69878578437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 9 Jan 2014 16:29:25 +0100
Subject: [PATCH 62/68] Revert "Add gradle-1.10" since it's not compatible yet

---
 buildserver/cookbooks/gradle/recipes/default.rb | 2 +-
 makebuildserver                                 | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/buildserver/cookbooks/gradle/recipes/default.rb b/buildserver/cookbooks/gradle/recipes/default.rb
index 60a00750..2a64e21a 100644
--- a/buildserver/cookbooks/gradle/recipes/default.rb
+++ b/buildserver/cookbooks/gradle/recipes/default.rb
@@ -8,7 +8,7 @@ script "add-gradle-dir" do
   not_if "test -d /opt/gradle"
 end
 
-%w{1.4 1.6 1.7 1.8 1.9 1.10}.each do |ver|
+%w{1.4 1.6 1.7 1.8 1.9}.each do |ver|
   script "install-gradle-#{ver}" do
     cwd "/tmp"
     interpreter "bash"
diff --git a/makebuildserver b/makebuildserver
index a6e67c74..96443a72 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -77,9 +77,6 @@ cachefiles = [
     ('gradle-1.9-bin.zip',
      'http://services.gradle.org/distributions/gradle-1.9-bin.zip',
      '097ddc2bcbc9da2bb08cbf6bf8079585e35ad088bafd42e8716bc96405db98e9'),
-    ('gradle-1.10-bin.zip',
-     'http://services.gradle.org/distributions/gradle-1.10-bin.zip',
-     '6e6db4fc595f27ceda059d23693b6f6848583950606112b37dfd0e97a0a0a4fe'),
     ('Kivy-1.7.2.tar.gz',
      'http://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1')

From c0987b680387ec533c0817e81726e8cd414a1691 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Thu, 9 Jan 2014 21:31:08 +0000
Subject: [PATCH 63/68] A scientific solution to issues with vagrant 1.3.5

---
 fdroidserver/build.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 03289b19..515b553f 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -102,6 +102,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
                     if options.verbose:
                         print "...suspending"
                     vagrant(['suspend'], cwd='builder')
+                    print "...waiting a sec..."
+                    time.sleep(10)
                 p = subprocess.Popen(['VBoxManage', 'snapshot', get_builder_vm_id(), 'restore', 'fdroidclean'],
                     cwd='builder', stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
                 output = p.communicate()[0]
@@ -112,6 +114,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
                     retcode, output = vagrant(['up'], cwd='builder')
                     if retcode != 0:
                         raise BuildException("Failed to start build server")
+                    print "...waiting a sec..."
+                    time.sleep(10)
                     vm_ok = True
                 else:
                     print "...failed to reset to snapshot"
@@ -178,10 +182,14 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
         if p.returncode != 0:
             print output
             raise BuildException("Failed to take snapshot")
+        print "...waiting a sec..."
+        time.sleep(10)
         print "Restarting new build server"
         retcode, _ = vagrant(['up'], cwd='builder')
         if retcode != 0:
             raise BuildException("Failed to start build server")
+        print "...waiting a sec..."
+        time.sleep(10)
         # Make sure it worked...
         p = subprocess.Popen(['VBoxManage', 'snapshot', get_builder_vm_id(), 'list', '--details'],
             cwd='builder', stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

From c31b0ccf2e15c564065e8800da9dd30fdadccf23 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Thu, 9 Jan 2014 21:31:58 +0000
Subject: [PATCH 64/68] Better makebuildserver verbose output

(and always delete box file, its always there, despite my earlier commit
saying it wasn't)
---
 makebuildserver | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/makebuildserver b/makebuildserver
index 96443a72..adaacc4f 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -209,12 +209,11 @@ while not ready:
                 print "Status: " + line
 
 print "Packaging"
-vagrant(['package', '--output', os.path.join('..', boxfile)], serverdir)
+vagrant(['package', '--output', os.path.join('..', boxfile)], serverdir,
+        printout=options.verbose)
 print "Adding box"
-vagrant(['box', 'add', 'buildserver', boxfile, '-f'])
+vagrant(['box', 'add', 'buildserver', boxfile, '-f'],
+        printout=options.verbose)
 
-# Remove box file if it exists (older vagrant versions left it there, newer
-# ones seem to delete it
-if os.path.exists(boxfile):
-    os.remove(boxfile)
+os.remove(boxfile)
 

From b30fd68485e3adf041921dcb94d4227b89459112 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Thu, 9 Jan 2014 21:32:58 +0000
Subject: [PATCH 65/68] Vagrant version notes in manual

---
 docs/fdroid.texi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 6c734b63..16681408 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -111,7 +111,8 @@ VirtualBox (debian package virtualbox)
 @item
 Ruby (debian packages ruby and rubygems)
 @item
-Vagrant (gem install vagrant)
+Vagrant (unpackaged) Be sure to use 1.3.x because 1.4.x is completely broken
+(at the time of writing, the forthcoming 1.4.3 might work)
 @item
 Paramiko (debian package python-paramiko)
 @item

From ca7cea37f81a591e24617c1436acd7da8c216250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 9 Jan 2014 18:30:35 +0100
Subject: [PATCH 66/68] Add our gradle wrapper script

---
 .../cookbooks/gradle/recipes/default.rb       | 99 ++++++++++++++++++-
 makebuildserver                               |  1 +
 2 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/buildserver/cookbooks/gradle/recipes/default.rb b/buildserver/cookbooks/gradle/recipes/default.rb
index 2a64e21a..89f5144c 100644
--- a/buildserver/cookbooks/gradle/recipes/default.rb
+++ b/buildserver/cookbooks/gradle/recipes/default.rb
@@ -1,11 +1,18 @@
 
 user = node[:settings][:user]
 
-script "add-gradle-dir" do
+script "add-gradle-bindir" do
   cwd "/tmp"
   interpreter "bash"
-  code "mkdir -p /opt/gradle"
-  not_if "test -d /opt/gradle"
+  code "mkdir -p /opt/gradle/bin"
+  not_if "test -d /opt/gradle/bin"
+end
+
+script "add-gradle-verdir" do
+  cwd "/tmp"
+  interpreter "bash"
+  code "mkdir -p /opt/gradle/versions"
+  not_if "test -d /opt/gradle/versions"
 end
 
 %w{1.4 1.6 1.7 1.8 1.9}.each do |ver|
@@ -14,9 +21,91 @@ end
     interpreter "bash"
     code "
       unzip /vagrant/cache/gradle-#{ver}-bin.zip
-      mv gradle-#{ver} /opt/gradle/#{ver}
+      mv gradle-#{ver} /opt/gradle/versions/#{ver}
     "
-    not_if "test -d /opt/gradle/#{ver}"
+    not_if "test -d /opt/gradle/versions/#{ver}"
   end
 end
 
+script "add-gradle-wrapper" do
+  cwd "/tmp"
+  interpreter "bash"
+  code %{cat << EOF > /opt/gradle/bin/gradle
+#!/bin/bash
+
+bindir=$(dirname $0)
+basedir=$(dirname $bindir)
+verdir="${basedir}/versions"
+args=("$@")
+pushd "${verdir}" &>/dev/null
+
+v_all=(*/)
+v_all=(${v_all[@]%/})
+
+v_def=${v_all[-1]}
+echo "Available gradle versions: ${v_all[@]}"
+
+popd &>/dev/null
+
+run_gradle() {
+	${verdir}/${v_found}/bin/gradle "${args[@]}"
+	exit $?
+}
+
+# key-value pairs of what gradle version each gradle plugin version
+# should accept
+d_plugin_k=(0.7 0.6 0.5 0.4 0.3 0.2)
+d_plugin_v=(1.9 1.8 1.6 1.6 1.4 1.4)
+
+# Latest takes priority
+files=(build.gradle)
+
+for f in ${files[@]}; do
+	[[ -f $f ]] || continue
+	while read l; do
+		if [[ "$l" == *'com.android.tools.build:gradle:'* ]]; then
+			plugin_pver=$(echo -n "$l" | sed "s/.*com.android.tools.build:gradle:\\([0-9\\.\\+]\\+\\).*/\\1/")
+		elif [[ "$l" == *'gradleVersion'* ]]; then
+			wrapper_ver=$(echo -n "$l" | sed "s/.*gradleVersion[ ]*=[ ]*[\"']\\([0-9\\.]\\+\\)[\"'].*/\\1/")
+		fi
+	done < $f
+done
+
+if [[ -n $wrapper_ver ]]; then
+	v_found=$wrapper_ver
+	echo "Found $v_found via gradleVersion"
+	run_gradle
+fi
+
+if [[ -n $plugin_pver ]]; then
+	i=0
+	match=false
+	for k in ${d_plugin_k[@]}; do
+		if [[ $plugin_pver == ${k}* ]]; then
+			plugin_ver=${d_plugin_v[$i]}
+			match=true
+			break
+		fi
+		let i++
+	done
+	if $match; then
+		v_found=$plugin_ver
+		echo "Found $v_found via gradle plugin version ${k}*"
+	fi
+fi
+
+[[ -n $v_found ]] && run_gradle
+
+echo "No suitable gradle version found - defaulting to $v_def"
+v_found=$v_def
+run_gradle
+
+EOF
+  }
+end
+
+execute "add-android-ndk-path" do
+  user user
+  command "echo \"export PATH=\\$PATH:/opt/gradle/bin #PATH-GRADLE\" >> /home/#{user}/.bsenv"
+  not_if "grep PATH-GRADLE /home/#{user}/.bsenv"
+end
diff --git a/makebuildserver b/makebuildserver
index adaacc4f..55c5aa1f 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -147,6 +147,7 @@ vagrantfile += """
     chef.add_recipe "fdroidbuild-general"
     chef.add_recipe "android-sdk"
     chef.add_recipe "android-ndk"
+    chef.add_recipe "gradle"
     chef.add_recipe "kivy"
   end
 end

From 6daeb625ab07add87150a7a15646432025a0209e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 10 Jan 2014 19:54:53 +0100
Subject: [PATCH 67/68] Check sha256 sums via hashlib

---
 makebuildserver | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/makebuildserver b/makebuildserver
index 55c5aa1f..f616170e 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -4,6 +4,7 @@ import os
 import sys
 import subprocess
 import time
+import hashlib
 from optparse import OptionParser
 
 def vagrant(params, cwd=None, printout=False):
@@ -98,16 +99,26 @@ else:
      'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
      '606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')])
 wanted = []
+
+def sha256_for_file(path):
+    with open(path, 'r') as f:
+        s = hashlib.sha256()
+        while True:
+            data = f.read(4096)
+            if not data:
+                break
+            s.update(data)
+        return s.hexdigest()
+
 for f, src, shasum in cachefiles:
-    if not os.path.exists(os.path.join(cachedir, f)):
+    relpath = os.path.join(cachedir, f)
+    if not os.path.exists(relpath):
         print "Downloading " + f + " to cache"
         if subprocess.call(['wget', src], cwd=cachedir) != 0:
             print "...download of " + f + " failed."
             sys.exit(1)
     if shasum:
-        p = subprocess.Popen(['shasum', '-a', '256', os.path.join(cachedir, f)],
-                stdout=subprocess.PIPE)
-        v = p.communicate()[0].split(' ')[0]
+        v = sha256_for_file(relpath)
         if v != shasum:
             print "Invalid shasum of '" + v + "' detected for " + f
             sys.exit(1)

From 6dc2bb84499830d1ed2a1590143bd686ac69b644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 10 Jan 2014 20:10:20 +0100
Subject: [PATCH 68/68] Move gradle script to separate file, install it
 properly

---
 .../cookbooks/gradle/recipes/default.rb       | 79 ++-----------------
 buildserver/cookbooks/gradle/recipes/gradle   | 68 ++++++++++++++++
 2 files changed, 76 insertions(+), 71 deletions(-)
 create mode 100755 buildserver/cookbooks/gradle/recipes/gradle

diff --git a/buildserver/cookbooks/gradle/recipes/default.rb b/buildserver/cookbooks/gradle/recipes/default.rb
index 89f5144c..b13e397e 100644
--- a/buildserver/cookbooks/gradle/recipes/default.rb
+++ b/buildserver/cookbooks/gradle/recipes/default.rb
@@ -1,6 +1,9 @@
 
 user = node[:settings][:user]
 
+gradle_script = IO.read(File.join(
+	File.expand_path(File.dirname(__FILE__)), "gradle"))
+
 script "add-gradle-bindir" do
   cwd "/tmp"
   interpreter "bash"
@@ -30,78 +33,12 @@ end
 script "add-gradle-wrapper" do
   cwd "/tmp"
   interpreter "bash"
-  code %{cat << EOF > /opt/gradle/bin/gradle
-#!/bin/bash
-
-bindir=$(dirname $0)
-basedir=$(dirname $bindir)
-verdir="${basedir}/versions"
-args=("$@")
-pushd "${verdir}" &>/dev/null
-
-v_all=(*/)
-v_all=(${v_all[@]%/})
-
-v_def=${v_all[-1]}
-echo "Available gradle versions: ${v_all[@]}"
-
-popd &>/dev/null
-
-run_gradle() {
-	${verdir}/${v_found}/bin/gradle "${args[@]}"
-	exit $?
-}
-
-# key-value pairs of what gradle version each gradle plugin version
-# should accept
-d_plugin_k=(0.7 0.6 0.5 0.4 0.3 0.2)
-d_plugin_v=(1.9 1.8 1.6 1.6 1.4 1.4)
-
-# Latest takes priority
-files=(build.gradle)
-
-for f in ${files[@]}; do
-	[[ -f $f ]] || continue
-	while read l; do
-		if [[ "$l" == *'com.android.tools.build:gradle:'* ]]; then
-			plugin_pver=$(echo -n "$l" | sed "s/.*com.android.tools.build:gradle:\\([0-9\\.\\+]\\+\\).*/\\1/")
-		elif [[ "$l" == *'gradleVersion'* ]]; then
-			wrapper_ver=$(echo -n "$l" | sed "s/.*gradleVersion[ ]*=[ ]*[\"']\\([0-9\\.]\\+\\)[\"'].*/\\1/")
-		fi
-	done < $f
-done
-
-if [[ -n $wrapper_ver ]]; then
-	v_found=$wrapper_ver
-	echo "Found $v_found via gradleVersion"
-	run_gradle
-fi
-
-if [[ -n $plugin_pver ]]; then
-	i=0
-	match=false
-	for k in ${d_plugin_k[@]}; do
-		if [[ $plugin_pver == ${k}* ]]; then
-			plugin_ver=${d_plugin_v[$i]}
-			match=true
-			break
-		fi
-		let i++
-	done
-	if $match; then
-		v_found=$plugin_ver
-		echo "Found $v_found via gradle plugin version ${k}*"
-	fi
-fi
-
-[[ -n $v_found ]] && run_gradle
-
-echo "No suitable gradle version found - defaulting to $v_def"
-v_found=$v_def
-run_gradle
-
+  code "
+    cat << \"EOF\" > /opt/gradle/bin/gradle
+#{gradle_script}
 EOF
-  }
+    chmod a+x /opt/gradle/bin/gradle
+  "
 end
 
 execute "add-android-ndk-path" do
diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle
new file mode 100755
index 00000000..652de586
--- /dev/null
+++ b/buildserver/cookbooks/gradle/recipes/gradle
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+bindir="$(dirname $0)"
+basedir="$(dirname $bindir)"
+verdir="${basedir}/versions"
+args=("$@")
+pushd "${verdir}" &>/dev/null
+
+v_all=(*/)
+v_all=(${v_all[@]%/})
+
+v_def=${v_all[-1]}
+echo "Available gradle versions: ${v_all[@]}"
+
+popd &>/dev/null
+
+run_gradle() {
+	${verdir}/${v_found}/bin/gradle "${args[@]}"
+	exit $?
+}
+
+# key-value pairs of what gradle version each gradle plugin version
+# should accept
+d_plugin_k=(0.7 0.6 0.5 0.4 0.3 0.2)
+d_plugin_v=(1.9 1.8 1.6 1.6 1.4 1.4)
+
+# Latest takes priority
+files=(build.gradle)
+
+for f in ${files[@]}; do
+	[[ -f $f ]] || continue
+	while read l; do
+		if [[ $l == *'com.android.tools.build:gradle:'* ]]; then
+			plugin_pver=$(echo -n "$l" | sed "s/.*com.android.tools.build:gradle:\\([0-9\\.\\+]\\+\\).*/\\1/")
+		elif [[ $l == *'gradleVersion'* ]]; then
+			wrapper_ver=$(echo -n "$l" | sed "s/.*gradleVersion[ ]*=[ ]*[\"']\\([0-9\\.]\\+\\)[\"'].*/\\1/")
+		fi
+	done < $f
+done
+
+if [[ -n $wrapper_ver ]]; then
+	v_found=$wrapper_ver
+	echo Found $v_found via gradleVersion
+	run_gradle
+fi
+
+if [[ -n $plugin_pver ]]; then
+	i=0
+	match=false
+	for k in ${d_plugin_k[@]}; do
+		if [[ $plugin_pver == ${k}* ]]; then
+			plugin_ver=${d_plugin_v[$i]}
+			match=true
+			break
+		fi
+		let i++
+	done
+	if $match; then
+		v_found=$plugin_ver
+		echo Found $v_found via gradle plugin version $k
+	fi
+fi
+
+[[ -n $v_found ]] && run_gradle
+
+echo No suitable gradle version found - defaulting to $v_def
+v_found=$v_def
+run_gradle