Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3802794
D2476.id6241.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
D2476.id6241.diff
View Options
diff --git a/map.jinja b/map.jinja
--- a/map.jinja
+++ b/map.jinja
@@ -94,10 +94,10 @@
'rubygem': 'rubygem-',
},
'FreeBSD' : {
- 'pecl': 'php74-pecl-',
- 'php': 'php74-',
+ 'pecl': 'php81-pecl-',
+ 'php': 'php81-',
'python2': 'py27-',
- 'python3': 'py37-',
+ 'python3': 'py38-',
'rubygem': 'rubygem-',
},
}, default='Debian') %}
@@ -186,7 +186,7 @@
'node': 'node',
'pear': 'pear',
'phpcs': 'pear-PHP_CodeSniffer',
- 'phpunit': 'phpunit8-php74',
+ 'phpunit': 'phpunit9-php81',
'postgresql': 'postgresql13-server',
'sphinx': 'py36-sphinx',
'tcl': 'tcl86',
diff --git a/roles/devserver/userland-software/files/make.conf b/roles/devserver/userland-software/files/make.conf
--- a/roles/devserver/userland-software/files/make.conf
+++ b/roles/devserver/userland-software/files/make.conf
@@ -17,4 +17,4 @@
WITH_CCACHE_BUILD=yes
CCACHE_DIR=/var/cache/ccache
-DEFAULT_VERSIONS+= php=7.4 mysql=10.2m apache=2.4 python=3.8 python3=3.8 python2=2.7 tcl=8.6
+DEFAULT_VERSIONS+= php=8.1 mysql=10.2m apache=2.4 python=3.8 python3=3.8 python2=2.7 tcl=8.6
diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
--- a/roles/shellserver/userland-software/base.sls
+++ b/roles/shellserver/userland-software/base.sls
@@ -129,6 +129,7 @@
- php71
- php72
- php73
+ - php74
{% endif %}
languages:
@@ -139,7 +140,7 @@
{% if grains['os_family'] == 'Debian' %}
- php7.4
{% elif grains['os'] == 'FreeBSD' %}
- - php74
+ - php81
{% endif %}
# -------------------------------------------------------------
@@ -154,12 +155,14 @@
- {{ packages_prefixes.php }}curl
- {{ packages_prefixes.php }}gd
- {{ packages_prefixes.php }}intl
- - {{ packages_prefixes.php }}json
- {{ packages_prefixes.php }}mbstring
- {{ packages_prefixes.php }}soap
- {{ packages_prefixes.php }}xml
- {{ packages_prefixes.php }}xsl
+
{% if grains['os_family'] == 'Debian' %}
+ - {{ packages_prefixes.php }}json
+
# On Debian, these PDO extensions doesn't follow regular names
# but are installed if you require the legacy extension name.
- {{ packages_prefixes.php }}mysql
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Nov 30, 11:55 (18 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2272942
Default Alt Text
D2476.id6241.diff (2 KB)
Attached To
Mode
D2476: Bump PHP and Python versions on FreeBSD
Attached
Detach File
Event Timeline
Log In to Comment