diff options
| author | Renato Botelho <renato@netgate.com> | 2016-08-09 11:07:34 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-08-09 11:07:34 -0300 |
| commit | 495527b1eb4a34e208abac97b40e8b36ca81a3e2 (patch) | |
| tree | 09b3f7c2912f96b3ae7b587d50d08b920fc6acde | |
| parent | 02fe49648a91554baecb9028ecdc3132ee04f37e (diff) | |
| download | pfsense-495527b1eb4a34e208abac97b40e8b36ca81a3e2.zip pfsense-495527b1eb4a34e208abac97b40e8b36ca81a3e2.tar.gz | |
Remove workarounds to sort extensions.ini since ports tree now has a better solution in place to track PHP modules dependencies
| -rwxr-xr-x | src/etc/rc.php_ini_setup | 2 | ||||
| -rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup index ddf8f5a..a676d4d 100755 --- a/src/etc/rc.php_ini_setup +++ b/src/etc/rc.php_ini_setup @@ -69,8 +69,6 @@ else fi fi -/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 a5ebc38..22406bf 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -397,10 +397,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 |
