summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-10-13 09:10:31 -0300
committerRenato Botelho <renato@netgate.com>2015-10-13 09:10:31 -0300
commitd6e8a994f1384ed6cf3f454bd3eff43a0a9fade3 (patch)
tree26134ffb300d74b83ccc2d1f642820faa555e7b5
parent844556b21ecb112a3c9c51236f1852f2c7eb6729 (diff)
downloadpfsense-d6e8a994f1384ed6cf3f454bd3eff43a0a9fade3.zip
pfsense-d6e8a994f1384ed6cf3f454bd3eff43a0a9fade3.tar.gz
Ticket #5300:
Add a workaround to fix the issue of extensions.ini out of order ending up breaking PHP. Since the only dependency we have is suhosin that depends of session, alphabetical sort does the trick for now while a proper solution is not handled by the ports tree
-rwxr-xr-xsrc/usr/local/sbin/pfSense-upgrade4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index 2aaf563..4bee713 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -338,6 +338,10 @@ pkg_upgrade() {
fi
fi
+ # XXX: workaround for #5300
+ sort -u ${chroot_dir}/usr/local/etc/php/extensions.ini > /tmp/extensions.ini
+ mv /tmp/extensions.ini /usr/local/etc/php/extensions.ini
+
pkg ${pkg_chroot} annotate -q -M ${kernel_pkg} next_stage 3
next_stage=3
OpenPOWER on IntegriCloud