mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-04 14:30:30 +03:00 
			
		
		
		
	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.
This commit is contained in:
		
							parent
							
								
									adffec7364
								
							
						
					
					
						commit
						af391c7679
					
				
					 2 changed files with 2 additions and 1 deletions
				
			
		
							
								
								
									
										2
									
								
								buildserver/Vagrantfile
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								buildserver/Vagrantfile
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -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!
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue