/[smecontribs]/rpms/smeserver-freepbx/contribs10/smeserver-freepbx-14-go15.patch
ViewVC logotype

Diff of /rpms/smeserver-freepbx/contribs10/smeserver-freepbx-14-go15.patch

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

Revision 1.1 by jpp, Thu Dec 15 05:08:55 2022 UTC Revision 1.2 by jpp, Thu Dec 15 05:18:58 2022 UTC
# Line 1  Line 1 
1  diff -Nur --no-dereference smeserver-freepbx-14.old/createlinks smeserver-freepbx-14/createlinks  diff -Nur --no-dereference smeserver-freepbx-14.old/createlinks smeserver-freepbx-14/createlinks
2  --- smeserver-freepbx-14.old/createlinks        2022-12-14 23:37:45.763000000 -0500  --- smeserver-freepbx-14.old/createlinks        2022-12-14 23:37:45.763000000 -0500
3  +++ smeserver-freepbx-14/createlinks    2022-12-15 00:07:43.397000000 -0500  +++ smeserver-freepbx-14/createlinks    2022-12-15 00:17:45.820000000 -0500
4  @@ -3,8 +3,8 @@  @@ -3,8 +3,8 @@
5   use esmith::Build::CreateLinks  qw(:all);   use esmith::Build::CreateLinks  qw(:all);
6    
# Line 31  diff -Nur --no-dereference smeserver-fre Line 31  diff -Nur --no-dereference smeserver-fre
31   event_link("freepbx-checkinstall-backup", $event, "11");   event_link("freepbx-checkinstall-backup", $event, "11");
32  diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/e-smith/events/actions/freepbx-checkinstall smeserver-freepbx-14/root/etc/e-smith/events/actions/freepbx-checkinstall  diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/e-smith/events/actions/freepbx-checkinstall smeserver-freepbx-14/root/etc/e-smith/events/actions/freepbx-checkinstall
33  --- smeserver-freepbx-14.old/root/etc/e-smith/events/actions/freepbx-checkinstall       2022-12-14 23:37:45.781000000 -0500  --- smeserver-freepbx-14.old/root/etc/e-smith/events/actions/freepbx-checkinstall       2022-12-14 23:37:45.781000000 -0500
34  +++ smeserver-freepbx-14/root/etc/e-smith/events/actions/freepbx-checkinstall   2022-12-14 23:40:43.021000000 -0500  +++ smeserver-freepbx-14/root/etc/e-smith/events/actions/freepbx-checkinstall   2022-12-15 00:17:35.927000000 -0500
35  @@ -53,6 +53,19 @@  @@ -53,19 +53,32 @@
36   # Upgrades have to be done through freePBX and the online repository   # Upgrades have to be done through freePBX and the online repository
37   if [ ! -d /opt/freepbx/admin ]; then   if [ ! -d /opt/freepbx/admin ]; then
38       mkdir -p /opt/freepbx       mkdir -p /opt/freepbx
# Line 41  diff -Nur --no-dereference smeserver-fre Line 41  diff -Nur --no-dereference smeserver-fre
41  +    php="/usr/bin/php74"  +    php="/usr/bin/php74"
42  +    if [[ $version -ge 16 ]]  +    if [[ $version -ge 16 ]]
43  +    then  +    then
44  +      php="/usr/bin/php80"  +      php="/usr/bin/php74"
45  +    elif [[ $version -lt 15 ]]  +    elif [[ $version -lt 15 ]]
46  +    then  +    then
47  +      php="/usr/bin/php56"  +      php="/usr/bin/php56"
# Line 52  diff -Nur --no-dereference smeserver-fre Line 52  diff -Nur --no-dereference smeserver-fre
52       if [ -e /usr/share/freepbx/sources/freepbx/ ]; then       if [ -e /usr/share/freepbx/sources/freepbx/ ]; then
53           cd /usr/share/freepbx/sources/freepbx/           cd /usr/share/freepbx/sources/freepbx/
54          echo "Starting Asterisk..." > /root/freepbx_install.log          echo "Starting Asterisk..." > /root/freepbx_install.log
55  @@ -101,7 +114,7 @@           ./start_asterisk start >> /root/freepbx_install.log 2>&1
56            echo "" >> /root/freepbx_install.log
57            echo "Installing FreePBX..." >> /root/freepbx_install.log
58    -       echo "a" | ./install --webroot="/opt/freepbx" \
59    +       echo "a" |$php --define sys_temp_dir=/var/spool/asterisk/tmp/ --define allow_url_fopen=1 --define memory_limit=256M /usr/share/freepbx/sources/freepbx/install --webroot="/opt/freepbx" \
60                    --dbengine="mysql" --dbname="freepbxdb" --dbuser="freepbxuser" --dbpass="$DBPASS" -n \
61                    --cdrdbname="$CDRDBNAME" --astmoddir=/usr/lib64/asterisk/modules/ \
62                    --astagidir=/usr/share/asterisk/agi-bin/ --ampsbin=/usr/sbin --ampcgibin=/opt/freepbx/cgi-bin \
63                    >> /root/freepbx_install.log 2>&1
64            else
65    -               echo "error: /usr/share/freepbx/sources/freepbx/ doesn't exists"
66    +               echo "error: /usr/share/freepbx/sources/freepbx/ doesn't exists"
67                    exit 1
68            fi
69     else
70    @@ -95,13 +108,14 @@
71     php="/usr/bin/php74"
72     if [[ $version -ge 16 ]]
73     then
74    -  php="/usr/bin/php80"
75    +  #version we have is not fully compatible, need newer source
76    +  php="/usr/bin/php74"
77     elif [[ $version -lt 15 ]]
78     then
79     php="/usr/bin/php56"     php="/usr/bin/php56"
80   fi   fi
81   ln -sf $php /usr/sbin/php   ln -sf $php /usr/sbin/php

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed