From e7da7155e88b06720e58bf1487622dc314b7431e Mon Sep 17 00:00:00 2001 From: shealyw2 Date: Sun, 12 Jul 2015 06:06:39 +0000 Subject: [PATCH 1/2] Added php5.6.11 --- lib/autoparts/packages/php5.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/autoparts/packages/php5.rb b/lib/autoparts/packages/php5.rb index 571bacc..abaf87a 100644 --- a/lib/autoparts/packages/php5.rb +++ b/lib/autoparts/packages/php5.rb @@ -6,9 +6,9 @@ module Packages class Php5 < Package name 'php5' version '5.5.15' - description 'PHP 5.5: A popular general-purpose scripting language that is especially suited to web development. Prebuild extensions default + mbstring, mysql, sqlite3 and openssl' - source_url 'http://us.php.net/get/php-5.5.15.tar.gz/from/this/mirror' - source_sha1 'd9df11b97a9f1c686194e91165602f47e3bd74e6' + description 'PHP 5.6: A popular general-purpose scripting language that is especially suited to web development. Prebuild extensions default + mbstring, mysql, sqlite3 and openssl' + source_url 'http://php.net/get/php-5.6.11.tar.gz/from/this/mirror' + source_sha1 '85916b46c0d1f2a5315c84fb2773293f4084c3676ba4ed420d0432cbb60ff9d8' source_filetype 'tar.gz' category Category::WEB_DEVELOPMENT From 038b90f1ed394f9377c67a8ad6ff70c253c6f09e Mon Sep 17 00:00:00 2001 From: shealyw2 Date: Sun, 12 Jul 2015 23:27:16 +0000 Subject: [PATCH 2/2] Finished adding php 5.6.11 to other extensions * Changed all references to the previous php5 version to php 5.6.11 * Compiled and tested these changes --- lib/autoparts/packages/php5.rb | 8 ++++---- lib/autoparts/packages/php5_apache2.rb | 10 +++++----- lib/autoparts/packages/php5_ext.rb | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/autoparts/packages/php5.rb b/lib/autoparts/packages/php5.rb index abaf87a..9ac6a88 100644 --- a/lib/autoparts/packages/php5.rb +++ b/lib/autoparts/packages/php5.rb @@ -5,17 +5,17 @@ module Autoparts module Packages class Php5 < Package name 'php5' - version '5.5.15' + version '5.6.11' description 'PHP 5.6: A popular general-purpose scripting language that is especially suited to web development. Prebuild extensions default + mbstring, mysql, sqlite3 and openssl' source_url 'http://php.net/get/php-5.6.11.tar.gz/from/this/mirror' - source_sha1 '85916b46c0d1f2a5315c84fb2773293f4084c3676ba4ed420d0432cbb60ff9d8' + source_sha1 'ed572049e6be08a7595d722986d29ff9a7f636e9' source_filetype 'tar.gz' category Category::WEB_DEVELOPMENT depends_on 'libmcrypt' def compile - Dir.chdir("php-5.5.15") do + Dir.chdir("php-5.6.11") do args = [ "--with-mcrypt=#{get_dependency("libmcrypt").prefix_path}", # path @@ -48,7 +48,7 @@ def compile end def install - Dir.chdir("php-5.5.15") do + Dir.chdir("php-5.6.11") do execute 'make install' execute 'cp', 'php.ini-development', "#{lib_path}/php.ini" end diff --git a/lib/autoparts/packages/php5_apache2.rb b/lib/autoparts/packages/php5_apache2.rb index 0b6693e..5d1f907 100644 --- a/lib/autoparts/packages/php5_apache2.rb +++ b/lib/autoparts/packages/php5_apache2.rb @@ -5,10 +5,10 @@ module Autoparts module Packages class Php5Apache2 < Package name 'php5-apache2' - version '5.5.15' + version '5.6.11' description 'Php5 Apache: a php5 module for apache2.' - source_url 'http://us.php.net/get/php-5.5.15.tar.gz/from/this/mirror' - source_sha1 'd9df11b97a9f1c686194e91165602f47e3bd74e6' + source_url 'http://us.php.net/get/php-5.6.11.tar.gz/from/this/mirror' + source_sha1 'ed572049e6be08a7595d722986d29ff9a7f636e9' source_filetype 'tar.gz' category Category::WEB_DEVELOPMENT @@ -18,7 +18,7 @@ class Php5Apache2 < Package def compile apache2_libphp5_path.unlink if apache2_libphp5_path.exist? - Dir.chdir("php-5.5.15") do + Dir.chdir("php-5.6.11") do args = [ "--with-apxs2=#{apache2_dependency.bin_path + "apxs"}", "--with-mcrypt=#{get_dependency("libmcrypt").prefix_path}", @@ -51,7 +51,7 @@ def compile end def install - Dir.chdir("php-5.5.15") do + Dir.chdir("php-5.6.11") do lib_path.mkpath execute 'cp', 'php.ini-development', "#{lib_path}/php.ini" # force apache2 to rewrite its config to get a pristine config diff --git a/lib/autoparts/packages/php5_ext.rb b/lib/autoparts/packages/php5_ext.rb index d5987a8..ce01e68 100644 --- a/lib/autoparts/packages/php5_ext.rb +++ b/lib/autoparts/packages/php5_ext.rb @@ -9,14 +9,14 @@ module Php5Ext extend ActiveSupport::Concern included do - self.version '5.5.15' - self.source_url 'http://us.php.net/get/php-5.5.15.tar.gz/from/this/mirror' - self.source_sha1 'd9df11b97a9f1c686194e91165602f47e3bd74e6' + self.version '5.6.11' + self.source_url 'http://us.php.net/get/php-5.6.11.tar.gz/from/this/mirror' + self.source_sha1 'ed572049e6be08a7595d722986d29ff9a7f636e9' self.source_filetype 'tar.gz' self.depends_on 'php5' def php_extension_dir - "php-5.5.15/ext/" + php_extension_name + "php-5.6.11/ext/" + php_extension_name end