/[smecontribs]/rpms/smeserver-freepbx/contribs10/smeserver-freepbx-bz11613-sme10.patch

Diff of /rpms/smeserver-freepbx/contribs10/smeserver-freepbx-bz11613-sme10.patch

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.4 by jpp,
Sun Mar 27 20:19:53 2022 UTC
+Revision 1.5 by jpp,
Mon Mar 28 02:15:04 2022 UTC
 Line 1
  diff -Nur --no-dereference smeserver-freepbx-13.old/createlinks smeserver-freepbx-13/createlinks
  --- smeserver-freepbx-13.old/createlinks        2022-03-24 23:13:37.415000000 -0400
- +++ smeserver-freepbx-13/createlinks    2022-03-27 16:19:38.048000000 -0400
+ +++ smeserver-freepbx-13/createlinks    2022-03-27 21:28:09.866000000 -0400
- @@ -4,23 +4,23 @@
+ @@ -2,25 +2,12 @@
-  # Start and stop links
+  use esmith::Build::CreateLinks  qw(:all);
+ -# Start and stop links
+ +# force default php to php56
+ +safe_symlink("/usr/bin/php56", "root/usr/sbin/php");
+ +safe_symlink("/usr/bin/php56", "/usr/local/sbin/php");
  -service_link_enhanced("freepbx", "S98", "7");
  -service_link_enhanced("freepbx", "K10", "6");
-Line 19 
 diff -Nur --no-dereference smeserver-fre
+Line 24 
 diff -Nur --no-dereference smeserver-fre
  -service_link_enhanced("dahdi", "K16", "6");
  -service_link_enhanced("dahdi", "K16", "0");
  -service_link_enhanced("dahdi", "K16", "1");
- +#service_link_enhanced("freepbx", "S98", "7");
+ -
- +#service_link_enhanced("freepbx", "K10", "6");
- +#service_link_enhanced("freepbx", "K10", "0");
- +#service_link_enhanced("freepbx", "K10", "1");
- +
- +#service_link_enhanced("httpd-fpbx", "S86", "7");
- +#service_link_enhanced("httpd-fpbx", "K15", "6");
- +#service_link_enhanced("httpd-fpbx", "K15", "0");
- +#service_link_enhanced("httpd-fpbx", "K15", "1");
- +
- +#service_link_enhanced("dahdi", "S09", "7");
- +#service_link_enhanced("dahdi", "K16", "6");
- +#service_link_enhanced("dahdi", "K16", "0");
- +#service_link_enhanced("dahdi", "K16", "1");
  -safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-fpbx');
  -safe_symlink("/var/service/httpd-fpbx" , 'root/service/httpd-fpbx');
  +#safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-fpbx');
-Line 41 
 diff -Nur --no-dereference smeserver-fre
+Line 32 
 diff -Nur --no-dereference smeserver-fre
   # Panel links
- @@ -37,6 +37,8 @@
+ @@ -37,6 +24,8 @@
   templates2events("/etc/httpd/conf/httpd.conf", $event);
   templates2events("/etc/httpd/fpbx-conf/httpd.conf", qw(freepbx-update bootstrap-console-save conf-userpanel));
   templates2events("/etc/e-smith/sql/init/30freepbx_mysql_create_database", qw(freepbx-update bootstrap-console-save));
-Line 50 
 diff -Nur --no-dereference smeserver-fre
+Line 41 
 diff -Nur --no-dereference smeserver-fre
   event_link("freepbx-checkinstall", $event, "10");
   event_link("freepbx-checkinstall-backup", $event, "11");
- @@ -48,17 +50,46 @@
+ @@ -48,17 +37,46 @@
   safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");
   safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
   safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-fpbx");
-Line 100 
 diff -Nur --no-dereference smeserver-fre
+Line 91 
 diff -Nur --no-dereference smeserver-fre
  +event_link("systemd-default", $event, "88");
  +event_link("systemd-reload", $event, "89");
  +
- diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-amportal.conf smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-amportal.conf
- --- smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-amportal.conf      2022-03-24 23:13:37.422000000 -0400
- +++ smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-amportal.conf  2022-03-27 16:11:55.606000000 -0400
- @@ -1,4 +1,5 @@
-  #!/bin/bash
- +. /opt/remi/php56/enable
-  # Change FreePBX database settings that should have come from /etc/amportal.conf,
-  # this is a dynamic template for FreePBX > 1.9 as it update the file on the fly, and also the db
  diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-checkinstall smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-checkinstall
  --- smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-checkinstall       2022-03-24 23:13:37.431000000 -0400
- +++ smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-checkinstall   2022-03-27 16:11:55.183000000 -0400
+ +++ smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-checkinstall   2022-03-27 21:53:33.588000000 -0400
- @@ -1,26 +1,28 @@
+ @@ -4,23 +4,24 @@
-  #!/bin/bash
- +. /opt/remi/php56/enable
-  DBNAME=$(/sbin/e-smith/db configuration getprop freepbx DbName)
   DBUSER=$(/sbin/e-smith/db configuration getprop freepbx DbUser)
   DBPASS=$(/sbin/e-smith/db configuration getprop freepbx DbPassword)
   CDRDBNAME=$(/sbin/e-smith/db configuration getprop freepbx CdrDbName)
-Line 147 
 diff -Nur --no-dereference smeserver-fre
+Line 125 
 diff -Nur --no-dereference smeserver-fre
           mysql -e "grant all privileges on $CDRDBNAME.* to '$DBUSER'@'localhost' identified by '$DBPASS';"
           mysql -e 'flush privileges;'
           if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql ]; then
- @@ -31,8 +33,19 @@
+ @@ -31,9 +32,21 @@
           fi
   fi
-Line 158 
 diff -Nur --no-dereference smeserver-fre
+Line 136 
 diff -Nur --no-dereference smeserver-fre
  +
   # Chown dir to allow user asterisk to create its files
   chown asterisk:asterisk /var/lib/asterisk
- +# workaround as freepbx is expecting them in /var not /usr/share
- +pushd /var/lib/asterisk
- +if [[ ! -d /usr/share/asterisk/documentation ]];  then ln -s /usr/share/asterisk/documentation  ; fi
- +if [[ ! -d /usr/share/asterisk/moh ]];  then ln -s /usr/share/asterisk/moh  ; fi
- +if [[ ! -d /usr/share/asterisk/sounds ]];  then ln -s /usr/share/asterisk/sounds/ ; fi
- +popd
+ +# workaround as freepbx is expecting them in /var not /usr/share
+ +#pushd /var/lib/asterisk
+ +#if [[ ! -d /var/lib/asterisk/documentation ]];  then ln -s /usr/share/asterisk/documentation  ; fi
+ +#if [[ ! -d /var/lib/asterisk/moh ]];  then ln -s /usr/share/asterisk/moh  ; fi
+ +#if [[ ! -d /var/lib/asterisk/sounds ]];  then ln -s /usr/share/asterisk/sounds/ ; fi
+ +#popd
+ +
   # Run the install script only if it's a new install
   # Upgrades have to be done through freePBX and the online repository
+  if [ ! -d /opt/freepbx/admin ]; then
  @@ -44,7 +57,11 @@
           ./start_asterisk start >> /root/freepbx_install.log 2>&1
          echo "" >> /root/freepbx_install.log
-Line 180 
 diff -Nur --no-dereference smeserver-fre
+Line 160 
 diff -Nur --no-dereference smeserver-fre
          else
                  echo "error: /usr/share/freepbx/sources/freepbx/ doesn't exists"
                  exit 1
- @@ -73,5 +90,6 @@
+ @@ -72,6 +89,6 @@
+  # update modules
   /usr/sbin/fwconsole ma upgrade framework
   /usr/sbin/fwconsole ma upgradeall -R standard -R extended
-  /usr/sbin/fwconsole  ma refreshsignatures
+ -/usr/sbin/fwconsole  ma refreshsignatures
  -
- +/usr/sbin/fwconsole ma download ucp
+ +/usr/sbin/fwconsole ma refreshsignatures
- +/usr/sbin/fwconsole ma install ucp
+ +/usr/sbin/fwconsole ma downloadinstall userman certman ucp
   exit 0
- diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-checkinstall-backup smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-checkinstall-backup
+ diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/asterisk/asterisk.conf/10dirs smeserver-freepbx-13/root/etc/e-smith/templates/etc/asterisk/asterisk.conf/10dirs
- --- smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-checkinstall-backup        2022-03-24 23:13:37.418000000 -0400
+ --- smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/asterisk/asterisk.conf/10dirs       2016-06-13 08:03:08.000000000 -0400
- +++ smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-checkinstall-backup    2022-03-27 16:11:54.985000000 -0400
+ +++ smeserver-freepbx-13/root/etc/e-smith/templates/etc/asterisk/asterisk.conf/10dirs   2022-03-27 21:39:15.866000000 -0400
- @@ -1,4 +1,5 @@
+ @@ -3,7 +3,8 @@
-  #!/bin/sh
+  astmoddir => { return '/usr/lib64/asterisk/modules' if -d '/usr/lib64/asterisk/modules';
- +. /opt/remi/php56/enable
+                 return '/usr/lib/asterisk/modules' if -d '/usr/lib/asterisk/modules'; }
+  astvarlibdir => /var/lib/asterisk
-  DBNAME=$(/sbin/e-smith/db configuration getprop freepbx DbName)
+ -astdatadir => /var/lib/asterisk
-  backuppath='/home/e-smith/files/freepbx'
+ +astdatadir => { return '/var/lib/asterisk' if -d '/var/lib/asterisk/documentation' ;
- diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-dump-astdb smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-dump-astdb
+ +               return '/usr/share/asterisk' if -d  '/usr/share/asterisk/documentation';}
- --- smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-dump-astdb 2022-03-24 23:13:37.403000000 -0400
+  astagidir => /var/lib/asterisk/agi-bin
- +++ smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-dump-astdb     2022-03-27 16:11:55.380000000 -0400
+  astspooldir => /var/spool/asterisk
- @@ -1,4 +1,4 @@
+  astrundir => /var/run/asterisk
- -#!/usr/bin/env php
- +#!/usr/bin/env php56
-  <?php
-  // No use outputting anything, as env forces php headers to appear. Sigh.
  diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database smeserver-freepbx-13/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database
  --- smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database    2016-06-13 08:03:08.000000000 -0400
  +++ smeserver-freepbx-13/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database        2022-03-27 16:11:55.804000000 -0400

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1