--- rpms/smeserver-freepbx/contribs10/smeserver-freepbx.spec 2022/03/25 04:44:48 1.3 +++ rpms/smeserver-freepbx/contribs10/smeserver-freepbx.spec 2022/07/22 06:54:14 1.13 @@ -1,10 +1,10 @@ -# $Id: smeserver-freepbx.spec,v 1.2 2021/11/11 04:56:32 jpp Exp $ +# $Id: smeserver-freepbx.spec,v 1.12 2022/07/22 06:47:36 jpp Exp $ # Authority: vip-ire # Name: Daniel Berteaud #%define fpbxversion 2.5.0 -%define version 13 -%define release 17 +%define version 14 +%define release 4 %define name smeserver-freepbx Summary: Asterisk web GUI @@ -14,20 +14,11 @@ Release: %{release}%{?dist} License: GPL Group: System/Servers Source: %{name}-%{version}.tar.gz - -Patch0: smeserver-freepbx-13.bz9702.udpports.patch -Patch1: smeserver-freepbx-13.bz9744.patch -Patch2: smeserver-freepbx-13.bz9702-2.patch -Patch3: smeserver-freepbx-13.bz9760.patch -Patch4: smeserver-freepbx-13.bz9918.defaultUDPports.patch -Patch5: smeserver-freepbx-13.bz9860.AutoUpgradeModules.patch -Patch6: smeserver-freepbx-13.bz9637.backupFBX.patch -Patch7: smeserver-freepbx-13.bz10120.noiseAmportal.patch -Patch8: smeserver-freepbx-13.bz10268.updatetktauth.patch -Patch9: smeserver-freepbx-13.bz10496.missing-tampered-files.patch -Patch10: smeserver-freepbx-13.bz10503.DeviceAndUser.patch -#### start SME10 patch -Patch11: smeserver-freepbx-bz11613-sme10.patch +Patch0: smeserver-freepbx-14-bz11940-bz9756-cron.patch +Patch1: smeserver-freepbx-14-bz11924-sounds.patch +Patch2: smeserver-freepbx-14-bz11986-service-fwconsole.patch +Patch3: smeserver-freepbx-14-bz12009-backup.patch +Patch4: smeserver-freepbx-14-bz12046-httpd24.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot URL: http://www.freepbx.org/ @@ -38,7 +29,9 @@ BuildRequires: tar Requires: mariadb Requires: nodejs >= 10 #Requires: php-pear php-cgi php-common php-curl php-mbstring php-gd php-mysql php-gettext php-bcmath php-zip php-xml php-imap php-json php-process php-snmp -Requires: php74-php-pear php74-php-cgi php74-php-common php74-php-curl php74-php-mbstring php74-php-gd php74-php-mysql php74-php-gettext php74-php-bcmath php74-php-zip php74-php-xml php74-php-imap php74-php-json php74-php-process php74-php-snmp +# freepbx 14 requires php56 +Requires: php56-php-pear php56-php-cgi php56-php-common php56-php-curl php56-php-mbstring php56-php-gd php56-php-mysql php56-php-gettext php56-php-bcmath php56-php-zip php56-php-xml php56-php-imap php56-php-json php56-php-process php56-php-snmp +#Requires: php74-php-pear php74-php-cgi php74-php-common php74-php-curl php74-php-mbstring php74-php-gd php74-php-mysql php74-php-gettext php74-php-bcmath php74-php-zip php74-php-xml php74-php-imap php74-php-json php74-php-process php74-php-snmp Requires: httpd Requires: php-pear Requires: /usr/sbin/asterisk @@ -64,7 +57,15 @@ Requires: unixODBC Requires: asterisk-odbc Requires: lame Requires: xz - +Requires: asterisk-ael asterisk-iax2 asterisk-fax asterisk-ldap asterisk-misdn +Requires: MySQL-python opus nmap icu vsftpd libicu-devel gcc-c++ +Requires: asterisk-moh-opsound-alaw asterisk-moh-opsound-g722 asterisk-moh-opsound-g729 asterisk-moh-opsound-gsm asterisk-moh-opsound-siren14 asterisk-moh-opsound-siren7 asterisk-moh-opsound-sln16 asterisk-moh-opsound-ulaw asterisk-moh-opsound-wav +Requires: asterisk-sounds-core-en-alaw asterisk-sounds-core-en-g722 asterisk-sounds-core-en-g729 asterisk-sounds-core-en-gsm asterisk-sounds-core-en-siren14 asterisk-sounds-core-en-siren7 asterisk-sounds-core-en-sln16 asterisk-sounds-core-en-ulaw asterisk-sounds-core-en-wav +# Requires: asterisk-sounds-core-fr-alaw asterisk-sounds-core-fr-g722 asterisk-sounds-core-fr-g729 asterisk-sounds-core-fr-gsm asterisk-sounds-core-fr-siren14 asterisk-sounds-core-fr-siren7 asterisk-sounds-core-fr-sln16 asterisk-sounds-core-fr-ulaw asterisk-sounds-core-fr-wav +# Requires: asterisk-sounds-core-it-alaw asterisk-sounds-core-it-g722 asterisk-sounds-core-it-g729 asterisk-sounds-core-it-gsm asterisk-sounds-core-it-siren14 asterisk-sounds-core-it-siren7 asterisk-sounds-core-it-sln16 asterisk-sounds-core-it-ulaw asterisk-sounds-core-it-wav +# Requires: asterisk-sounds-core-es-alaw asterisk-sounds-core-es-g722 asterisk-sounds-core-es-g729 asterisk-sounds-core-es-gsm asterisk-sounds-core-es-siren14 asterisk-sounds-core-es-siren7 asterisk-sounds-core-es-sln16 asterisk-sounds-core-es-ulaw asterisk-sounds-core-es-wav +Requires: e-smith-apache >= 2.6.0-19 +Requires: smeserver-php >= 3.0.0-43 #Buildarch: noarch AutoReqProv: no @@ -75,25 +76,42 @@ This package provide the integration of %changelog +* Fri Jul 22 2022 Jean-Philippe Pialasse 14-4.sme +- add to core backup [SME: 12009] +- httpd 2.4 syntax [SME: 12046] + +* Tue May 31 2022 Jean-Philippe Pialasse 14-3.sme +- fix service file fwconsole path [SME: 11986] + +* Sat Apr 16 2022 Jean-Philippe Pialasse 14-2.sme +- fix huge amount of error if asterisk disabled [SME: 9756] +- fix multiple email sent because of asterisk cron php path [SME: 11940] +- on uninstall remove asterisk crontab to avoid noise [SME: 10131] +- allow access to sounds folder for gui [SME: 11924] + +* Sun Mar 27 2022 Jean-Philippe Pialasse 14-1.sme +- first version 14 [SME: 11613] + * Wed Nov 10 2021 Jean-Philippe Pialasse 13-17.sme - first import to SME10 [SME: 11613] - make it Freepbx 14 compatible [SME: 10705]  - add dependencies for SME10 mariadb nodejs >= 10 php74* + add dependencies for SME10 mariadb nodejs >= 10 php70* remove missing rpms asterisk-sounds-extra-en-ulaw asterisk-resample asterisk-addons remove double owned folders /etc/asterisk /var/lib/asterisk systemd ready for asterisk(disabled), freepbx, httpd-fpbx smeserver-freepbx-update event created NEED TEST - php74-php-fpm fragment + php70-php-fpm fragment update httpd-fpbx template for php-fpm use - TODO : update httpd-e-smith to use php-fpm for fpbx - TODO : update install script for php74 + update httpd-e-smith to use php-fpm for fpbx + update install script for php74 add a copy of safe_asterisk - TODO : create php folders and set rights + create php folders and set rights improve logrotate * Mon Jan 20 2020 Jean-Philipe Pialasse 13-16.sme - add required modules to enable cel and cdr logging and search [SME: 10620] - add requires lame [SME: 9859] +- fix sounds ownership so they can be handled via gui [SME: 11924] * Mon Jan 29 2018 Jean-Philipe Pialasse 13-15.sme - fix warning tampered files in GUI [SME: 10496] @@ -328,23 +346,12 @@ This package provide the integration of - initial release %prep - %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 - -# until rebuilt of a smeserver-freepbx tar file: -rm -rf root/etc/e-smith/db/configuration/defaults/freepbx/DeviceAndUser -%patch11 -p1 %build # Build symlinks @@ -364,12 +371,14 @@ rm -rf $RPM_BUILD_ROOT --dir /var/service/httpd-fpbx/log 'attr(0755,root,root)' \ --file /var/service/httpd-fpbx/log/run 'attr(0755,root,root)' \ --dir /var/service/httpd-fpbx/log/supervise 'attr(0700,root,root)' \ - --dir /var/log/httpd-fpbx 'attr(0750,smelog,smelog)' \ --file /var/lib/asterisk/bin/genzaptelconf 'attr(0750,root,root)' \ - --file /var/lib/asterisk/agi-bin/trunk_alert_mail.agi 'attr(0750,asterisk,asterisk)' \ + --file /usr/share/asterisk/agi-bin/trunk_alert_mail.agi 'attr(0750,asterisk,asterisk)' \ --file /etc/logrotate.d/asterisk 'config(noreplace)' \ --dir /var/lib/php/fpbx-session 'attr(0770,root,asterisk)' \ - --file /usr/local/bin/safe_asterisk 'attr(0755,root,root)' \ + --file /usr/sbin/safe_asterisk 'attr(0755,root,root)' \ + --dir /var/log/php/freepbx 'attr(0770,root,asterisk)' \ + --dir /var/lib/php/freepbx/sessions 'attr(0770,root,asterisk)' \ + --dir /var/lib/php/freepbx/temp 'attr(0770,root,asterisk)' \ |grep -v '/var/lib/asterisk$'| grep -v '/etc/asterisk$' \ > %{name}-%{version}-%{release}-filelist @@ -390,8 +399,15 @@ fi %preun if [ $1 = 0 ] ; then - /etc/rc.d/init.d/freepbx stop >& /dev/null || : + /usr/bin/systemctl stop freepbx >& /dev/null || : fi - true +%postun +if [ $1 = 0 ] ; then + #remove cron for asterisk on uninstallation to avoid noise + /usr/bin/crontab -u asterisk -r >& /dev/null || : +fi +true + +