Be explicit about jarsigner algorithms

If these aren't specified, it works fine with the jdk6 version, but
produces an unusable (on Android) index.jar with the jdk7 version.

diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile
index 41c1eaddfdc986f09dbac8154843b3a40cff4c24..8420dcf7fc2582f9253443c536980226c5c42e2e 100644 (file)
--- a/buildserver/Vagrantfile
+++ b/buildserver/Vagrantfile
@@ -3,7 +3,7 @@ Vagrant::Config.run do |config|
   config.vm.box = "precise32"
   config.vm.box_url = "/shares/software/OS and Boot/precise32.box"
 
-  config.vm.customize ["modifyvm", :id, "--memory", "1536"]
+  config.vm.customize ["modifyvm", :id, "--memory", "2048"]
 
   config.vm.provision :shell, :path => "fixpaths.sh"
   # Set apt proxy - remove, or adjust this, accordingly!

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 39a2652bbed2a6ff19334d5542c3ffff964e16e1..bc2d9ac2bed1f06dc12dbbf9aba6536d71832b46 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -698,6 +698,7 @@ def main():
         # Sign the index...
         p = subprocess.Popen(['jarsigner', '-keystore', keystore,
             '-storepass', keystorepass, '-keypass', keypass,
+            '-digestalg', 'SHA1', '-sigalg', 'MD5withRSA',
             os.path.join('repo', 'index.jar') , repo_keyalias], stdout=subprocess.PIPE)
         output = p.communicate()[0]
         if p.returncode != 0: