summaryrefslogtreecommitdiffstats
path: root/src/usr/local/sbin
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-10-06 13:09:42 -0300
committerRenato Botelho <renato@netgate.com>2016-10-06 13:09:42 -0300
commit0ff0f44d987703d371a79cb44db2a2dec6d7f2d7 (patch)
treea299c322dae66100ab355ccda69695086b801cde /src/usr/local/sbin
parentee9a44e740d76a447fff2324795e4691215c1bd1 (diff)
downloadpfsense-0ff0f44d987703d371a79cb44db2a2dec6d7f2d7.zip
pfsense-0ff0f44d987703d371a79cb44db2a2dec6d7f2d7.tar.gz
Remove workarounds to sort extensions.ini since ports tree now has a better solution in place to track PHP modules dependencies
Diffstat (limited to 'src/usr/local/sbin')
-rwxr-xr-xsrc/usr/local/sbin/pfSense-upgrade4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index dc88ae8..0fb0588 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -506,10 +506,6 @@ pkg_upgrade() {
delete_annotation=""
fi
- # XXX: workaround for #5300
- sort -u ${chroot_dir}/usr/local/etc/php/extensions.ini > /tmp/extensions.ini
- mv /tmp/extensions.ini ${chroot_dir}/usr/local/etc/php/extensions.ini
-
pkg ${pkg_chroot} annotate -q -M ${kernel_pkg} next_stage 3
next_stage=3
OpenPOWER on IntegriCloud