From 0ff0f44d987703d371a79cb44db2a2dec6d7f2d7 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 6 Oct 2016 13:09:42 -0300 Subject: [PATCH] Remove workarounds to sort extensions.ini since ports tree now has a better solution in place to track PHP modules dependencies --- src/etc/rc.php_ini_setup | 3 --- src/usr/local/sbin/pfSense-upgrade | 4 ---- 2 files changed, 7 deletions(-) diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup index 5c8c911258..966fb9fbb8 100755 --- a/src/etc/rc.php_ini_setup +++ b/src/etc/rc.php_ini_setup @@ -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") diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index dc88ae8e8c..0fb0588a45 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