aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormcrane <mctch@yahoo.com>2009-08-03 22:31:04 -0600
committermcrane <mctch@yahoo.com>2009-08-03 22:31:04 -0600
commit18a80c1fee1439987f436d255600c403201e1016 (patch)
treeb4829fde39b277c0e12c8c034e38afcfc719b9ed
parent477fbe3dfbe31d5e96766f730f1fa48ccd1b7387 (diff)
downloadpfsense-packages-18a80c1fee1439987f436d255600c403201e1016.tar.gz
pfsense-packages-18a80c1fee1439987f436d255600c403201e1016.tar.bz2
pfsense-packages-18a80c1fee1439987f436d255600c403201e1016.zip
FreeSWITCH dev fix syntax error add conf_mount_rw and config_lock back to install and deinstall
-rw-r--r--config/freeswitch_dev/freeswitch.xml2
-rw-r--r--config/freeswitch_dev/v_config.inc20
-rwxr-xr-xpkg_config.7.xml2
3 files changed, 18 insertions, 6 deletions
diff --git a/config/freeswitch_dev/freeswitch.xml b/config/freeswitch_dev/freeswitch.xml
index 407b289e..9fe0e780 100644
--- a/config/freeswitch_dev/freeswitch.xml
+++ b/config/freeswitch_dev/freeswitch.xml
@@ -44,7 +44,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>Settings</name>
- <version>0.9.5.9</version>
+ <version>0.9.6</version>
<title>Settings</title>
<include_file>/usr/local/pkg/v_config.inc</include_file>
<menu>
diff --git a/config/freeswitch_dev/v_config.inc b/config/freeswitch_dev/v_config.inc
index a7c77944..ef436f91 100644
--- a/config/freeswitch_dev/v_config.inc
+++ b/config/freeswitch_dev/v_config.inc
@@ -2968,15 +2968,18 @@ function pkg_add($pkg_download_path, $pkg_name)
chdir('/tmp/');
exec("fetch ".$pkg_download_path.$pkg_name);
exec("pkg_add -F ".$pkg_name);
- exec("rm $pkg_name);
+ exec("rm ".$pkg_name);
}
function v_php_install_command()
{
- global $config;
- //exec("/etc/./rc.conf_mount_rw");
- $v_package_version = "0.9.5.9";
+ conf_mount_rw();
+ config_lock();
+
+ global $config;
+
+ $v_package_version = "0.9.6";
$v_build_version = "1.0.4 pre 10";
$v_build_revision = "14306";
@@ -3773,6 +3776,9 @@ function v_php_install_command()
$config['installedpackages']['freeswitchsettings']['config'][0]['v_version'] = $v_build_version." revision ".$v_build_revision.".";
$config['installedpackages']['freeswitchsettings']['config'][0]['v_package_version'] = $v_package_version;
+
+ conf_mount_ro();
+ config_unlock();
}
@@ -3780,6 +3786,9 @@ function v_php_install_command()
function v_deinstall_command()
{
+ conf_mount_rw();
+ config_lock();
+
exec("killall -9 freeswitch");
exec("pkg_delete freeswitch-1.0.4");
@@ -3821,6 +3830,9 @@ function v_deinstall_command()
unlink_if_exists("/tmp/freeswitch.tar.gz");
unlink_if_exists("/tmp/pkg_mgr_FreeSWITCH.log");
+ conf_mount_ro();
+ config_unlock();
+
}
?>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index dadd0238..ad81fb9c 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -126,7 +126,7 @@
<pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</pkginfolink>
<config_file>http://www.pfsense.com/packages/config/freeswitch_dev/freeswitch.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
- <version>0.9.5.9</version>
+ <version>0.9.6</version>
<status>Beta</status>
<required_version>1.2.3</required_version>
<maintainer>markjcrane@gmail.com</maintainer>