From c780e165e5dd10e65bb8a8cb394c201232596b40 Mon Sep 17 00:00:00 2001 From: Wolodja Wentland Date: Fri, 29 Apr 2016 10:40:44 +0200 Subject: [PATCH] Do not hardcode composer checksum This allows composer installs to function even if the installer checksum changes, and doesn't force us to update the formula whenever their installer changes. We can do this now as composer upstream provides the checksum on https://composer.github.io/installer.sig since 2016-04-28. --- php/composer.sls | 2 +- php/map.jinja | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/php/composer.sls b/php/composer.sls index 7cc8f14..7aa9747 100644 --- a/php/composer.sls +++ b/php/composer.sls @@ -18,7 +18,7 @@ get-composer: - mode: 0755 - unless: test -f {{ install_file }} - source: https://getcomposer.org/installer - - source_hash: {{ php.composer_hash }} + - source_hash: https://composer.github.io/installer.sig - require: - pkg: php diff --git a/php/map.jinja b/php/map.jinja index 37074c7..8bbd1dd 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -70,7 +70,6 @@ 'local_bin': '/usr/local/bin', 'temp_dir': '/tmp', 'composer_bin': 'composer', - 'composer_hash': 'sha256=50b383348173bd454ed8d962253a85b7d194f071e3f8e7f74817512221efc569', }, 'RedHat': { 'php_pkg': 'php', @@ -111,7 +110,6 @@ 'local_bin': '/usr/local/bin', 'temp_dir': '/tmp', 'composer_bin': 'composer', - 'composer_hash': 'sha256=50b383348173bd454ed8d962253a85b7d194f071e3f8e7f74817512221efc569', }, 'Suse': { 'php_pkg': 'php5', @@ -143,7 +141,6 @@ 'local_bin': '/usr/local/bin', 'temp_dir': '/tmp', 'composer_bin': 'composer', - 'composer_hash': 'sha256=50b383348173bd454ed8d962253a85b7d194f071e3f8e7f74817512221efc569', }, }, merge=salt['pillar.get']('php:lookup')) %}