mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove workarounds to sort extensions.ini since ports tree now has a better solution in place to track PHP modules dependencies

Browse Source
This commit is contained in:
Renato Botelho 2016-10-06 13:09:42 -03:00
parent ee9a44e740
commit 0ff0f44d98
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/etc/rc.php_ini_setup
View File

@ -101,9 +101,6 @@ else
fi
fi
/bin/chmod 0644 /usr/local/etc/php/extensions.ini
/usr/bin/sort -u -o /usr/local/etc/php/extensions.ini /usr/local/etc/php/extensions.ini
# Set upload directory
if [ "$PLATFORM" = "nanobsd" ]; then
UPLOADTMPDIR=$(/usr/local/sbin/read_global_var upload_path "/root")

4
src/usr/local/sbin/pfSense-upgrade
View File

@ -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