From af391c76790af9d0f50ff40dab29cc05b2be39bc Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 11 Apr 2013 17:27:46 +0100 Subject: [PATCH] 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. --- buildserver/Vagrantfile | 2 +- fdroidserver/update.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile index 41c1eadd..8420dcf7 100644 --- 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 39a2652b..bc2d9ac2 100644 --- 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: -- 2.30.2