Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3747061
D2081.id5251.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
D2081.id5251.diff
View Options
diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
--- a/pillar/webserver/sites.sls
+++ b/pillar/webserver/sites.sls
@@ -65,8 +65,8 @@
php_custom_builds:
php56:
mode: release
- version: 5.6.38
- hash: d65b231bbdd63be4439ef5ced965cfd63e62983429dbd4dfcfb49981593ebc03
+ version: 5.6.40
+ hash: ffd025d34623553ab2f7fd8fb21d0c9e6f9fa30dc565ca03a1d7b763023fba00
php_fpm_instances:
# PHP 7.2, generally installed as package/port
diff --git a/roles/webserver-legacy/php-builder/source.sls b/roles/webserver-legacy/php-builder/source.sls
--- a/roles/webserver-legacy/php-builder/source.sls
+++ b/roles/webserver-legacy/php-builder/source.sls
@@ -37,6 +37,8 @@
def get_build_directory(build):
return "/opt/php/_builds/" + build
+def get_install_directory(build):
+ return "/opt/php/" + build
def get_extract_archive_command(archive, directory):
return "tar xjf " + archive + " --strip-components=1 -C " + directory
@@ -108,26 +110,29 @@
config["php_build_" + build_name + "_phase1_patch"] = {'file.patch': [
{'name': directory + '/ext/mbstring/php_mbregex.c'},
{'source': 'salt://roles/webserver-legacy/php-builder/files/fix-bug-76113.patch'},
- {'hash': '609629c38fa9d8e520e3dadc3fae942d'},
]}
# Task: build PHP
# Task: install PHP
for build_name, build in __pillar__["php_custom_builds"].items():
- directory = get_build_directory(build_name)
+ build_directory = get_build_directory(build_name)
+ install_directory = get_install_directory(build_name)
+
config["php_build_" + build_name + "_phase2_compile"] = {'cmd.run': [
{'names': [
- "cd " + directory,
get_configure(build["version"], build_name),
- "make"
+ "make",
+ "touch .built",
]},
+ {'cwd': build_directory},
{'user': builder_user},
- {'creates': directory + "/configure"},
+ {'creates': build_directory + "/.built"},
]}
config["php_build_" + build_name + "_phase2_install"] = {'cmd.run': [
{'name': "make install"},
- {'creates': directory + "/configure"},
+ {'cwd': build_directory},
+ {'creates': install_directory + "/bin/php"},
]}
return config
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Nov 17, 00:24 (21 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2248297
Default Alt Text
D2081.id5251.diff (2 KB)
Attached To
Mode
D2081: Upgrade legacy PHP 5 to last 5.6.40
Attached
Detach File
Event Timeline
Log In to Comment