diff options
| -rw-r--r-- | config/freeswitch/freeswitch.inc | 36 | ||||
| -rw-r--r-- | config/freeswitch/freeswitch.xml | 14 | ||||
| -rw-r--r-- | pkg_config.7.xml | 2 |
3 files changed, 32 insertions, 20 deletions
diff --git a/config/freeswitch/freeswitch.inc b/config/freeswitch/freeswitch.inc index fbc34bde..83871601 100644 --- a/config/freeswitch/freeswitch.inc +++ b/config/freeswitch/freeswitch.inc @@ -35,11 +35,6 @@ */ -$freeswitch_build_version = "1.0.3"; -$freeswitch_build_revision = "12228"; -$freeswitch_package_version = "0.8.1"; - - function guid() { if (function_exists('com_create_guid')){ @@ -1677,10 +1672,7 @@ function sync_package_freeswitch() function freeswitch_php_install_command() { global $config; - global $freeswitch_build_version; - global $freeswitch_build_revision; - global $freeswitch_package_version; - + $freeswitch_package_version = "0.8.2"; conf_mount_rw(); config_lock(); @@ -1691,8 +1683,28 @@ function freeswitch_php_install_command() exec("mkdir /usr/local/www/freeswitch/"); } - exec("tar zxvf /tmp/freeswitch.tgz -C /usr/local/"); - unlink_if_exists("/tmp/freeswitch.tgz"); + $struname = exec('uname -v'); + if (stristr($struname, 'FreeBSD 7.0')) { + $freebsd_version = "7.0"; + exec("cd /tmp; fetch +http://www.portableusbapps.com/packages/config/freeswitch/freeswitch.1.jun.2009.tgz"); + exec("tar zxvf /tmp/freeswitch.1.jun.2009.tgz -C +/usr/local/"); + unlink_if_exists("/tmp/freeswitch.1.jun.2009.tgz"); + + $freeswitch_build_version = "1.0.2"; + $freeswitch_build_revision = ""; + } + else { + exec("cd /tmp; fetch +http://www.portableusbapps.com/packages/config/freeswitch/freeswitch.tgz"); + exec("tar zxvf /tmp/freeswitch.tgz -C /usr/local/"); + unlink_if_exists("/tmp/freeswitch.tgz"); + + $freeswitch_build_version = "1.0.3"; + $freeswitch_build_revision = "12228"; + } + //make a backup copy of the default config exec("cp -R /usr/local/freeswitch/conf /usr/local/freeswitch/conf.rev".$freeswitch_build_revision.".orig"); @@ -2243,4 +2255,4 @@ function freeswitch_deinstall_command() } -?>
\ No newline at end of file +?> diff --git a/config/freeswitch/freeswitch.xml b/config/freeswitch/freeswitch.xml index 3fa497de..58ea5165 100644 --- a/config/freeswitch/freeswitch.xml +++ b/config/freeswitch/freeswitch.xml @@ -44,7 +44,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>FreeSWITCH Settings</name> - <version>0.8.1</version> + <version>0.8.2</version> <title>FreeSWITCH: Settings</title> <include_file>/usr/local/pkg/freeswitch.inc</include_file> <menu> @@ -113,11 +113,6 @@ </tabs> <configpath>installedpackages->package->$packagename->configuration->freeswitchsettings</configpath> <additional_files_needed> - <prefix>/tmp/</prefix> - <chmod>0755</chmod> - <item>http://www.portableusbapps.com/packages/config/freeswitch/freeswitch.tgz</item> - </additional_files_needed> - <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch.inc</item> @@ -167,6 +162,11 @@ <chmod>0755</chmod> <item>http://www.pfsense.com/packages/config/freeswitch/libodbc.so.1</item> </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/lib/</prefix> + <chmod>0755</chmod> + <item>http://www.pfsense.com/packages/config/freeswitch/libiconv.so.3</item> + </additional_files_needed> <additional_files_needed> <prefix>/tmp/</prefix> <chmod>0755</chmod> @@ -484,4 +484,4 @@ <custom_php_deinstall_command> freeswitch_deinstall_command(); </custom_php_deinstall_command> -</packagegui>
\ No newline at end of file +</packagegui> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 88020374..704bac84 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -92,7 +92,7 @@ <pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</pkginfolink> <config_file>http://www.pfsense.com/packages/config/freeswitch/freeswitch.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.8.1</version> + <version>0.8.2</version> <status>Beta</status> <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> |