From 7f030324042e69dfd66d8107240c946ff5b8c8c5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Sat, 14 Dec 2024 18:09:44 -0500 Subject: [PATCH] * Sat Dec 14 2024 Jean-Philippe Pialasse 1.6-4.sme - fix roundcube not working on initial install [SME: 12812] --- .gitignore | 1 + createlinks | 6 ++++++ .../post-transaction-actions.d/roundcubemail.action | 1 + root/etc/e-smith/events/actions/roundcube-conf | 8 ++++++-- .../e-smith/templates/etc/php-fpm.d/www.conf/15roundcube | 2 +- smeserver-roundcube.spec | 7 ++++++- 6 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 root/etc/dnf/plugins/post-transaction-actions.d/roundcubemail.action diff --git a/.gitignore b/.gitignore index af31932..88c6bed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.rpm *.log *spec-20**.bak +*gz diff --git a/createlinks b/createlinks index 7c8f529..3747530 100644 --- a/createlinks +++ b/createlinks @@ -33,6 +33,8 @@ for my $event (qw( conf-roundcube roundcube-update console-save + post-install + post-upgrade )) { templates2events("/usr/share/roundcubemail/plugins/managesieve/config.inc.php", $event); @@ -47,6 +49,8 @@ for my $event (qw( smeserver-roundcube-update conf-roundcube roundcube-update + post-install + post-upgrade )) { templates2events("/etc/opt/remi/php81/php-fpm.d/www.conf",$event); @@ -65,6 +69,8 @@ foreach my $event (qw( smeserver-roundcube-update conf-roundcube roundcube-update + post-install + post-upgrade )) { event_link("qmail-update-user", $event, "20"); diff --git a/root/etc/dnf/plugins/post-transaction-actions.d/roundcubemail.action b/root/etc/dnf/plugins/post-transaction-actions.d/roundcubemail.action new file mode 100644 index 0000000..1829f03 --- /dev/null +++ b/root/etc/dnf/plugins/post-transaction-actions.d/roundcubemail.action @@ -0,0 +1 @@ +roundcubemail:any:/sbin/e-smith/signal-event smeserver-roundcube diff --git a/root/etc/e-smith/events/actions/roundcube-conf b/root/etc/e-smith/events/actions/roundcube-conf index 79243c1..351a526 100644 --- a/root/etc/e-smith/events/actions/roundcube-conf +++ b/root/etc/e-smith/events/actions/roundcube-conf @@ -3,12 +3,16 @@ /usr/bin/sed -i -e 's/^.*error_reporting.*$/ \/\/rem/' /usr/share/roundcubemail/program/lib/Roundcube/bootstrap.php # update composer +# if installed before user apache becoem an alias of www 102 +/bin/rpm --setugids roundcubemail +/bin/rpm --setperms roundcubemail + # disabled by default for SME11 as we would rather the stability of rpms #/usr/bin/rcplugin_update.sh # prevent bug with spell checker: An error was encountered on the server. Please try again later. -pushd /usr/share/myspell +pushd /usr/share/myspell >/dev/null [ -f en.dic ] || ln -s en_US.dic en.dic [ -f en.aff ] || ln -s en_US.aff en.aff -popd +popd >/dev/null diff --git a/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube index f08b6dd..72b8044 100644 --- a/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube +++ b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube @@ -10,7 +10,7 @@ if ($PHP_VERSION eq $phpversion){ my $open_basedir= $roundcube{PHPBaseDir} || ''; my $include_path = ".:/usr/share/pear-addons:/usr/share/pear:/usr/share/pear-data/:/usr/share/php". ":/opt/remi/php81/root/usr/share/pear:/opt/remi/php81/root/usr/share/php". - ":/opt/remi/php81/root/usr/share/pear-data/:/opt/remi/php82/root/usr/share/pear-data/: /opt/remi/php83/root/usr/share/pear-data/"; + ":/opt/remi/php81/root/usr/share/pear-data/:/opt/remi/php82/root/usr/share/pear-data/:/opt/remi/php83/root/usr/share/pear-data/"; $open_basedir = "/usr/share/roundcubemail:/etc/roundcubemail/:/var/log/roundcubemail:/var/lib/roundcubemail:/var/log/roundcube.log:/var/lib/php/roundcube:/home/e-smith/files/roundcube:/dev/urandom:/proc/meminfo:/usr/share/GeoIP/GeoLite2-Country.mmdb:/proc/cpuinfo:$open_basedir:$include_path"; my $id = 'roundcube'; my $max_children = $roundcube{'PHPmaxChildren'} || 20; diff --git a/smeserver-roundcube.spec b/smeserver-roundcube.spec index 17639a2..d778bc5 100644 --- a/smeserver-roundcube.spec +++ b/smeserver-roundcube.spec @@ -1,6 +1,6 @@ %define name smeserver-roundcube %define version 1.6 -%define release 3 +%define release 4 Summary: smserver rpm to setup roundcube, an IMAP mail client Name: %{name} @@ -16,6 +16,7 @@ BuildArchitectures: noarch BuildRequires: smeserver-devtools Requires: smeserver-release >= 11.0 Requires: smeserver-apache >= 11.0 +Requires: smeserver-php Requires: roundcubemail >= 1.6 Requires: roundcubemail < 1.7 Requires: composer >= 2.7.8 @@ -38,6 +39,7 @@ Requires: roundcube-plugin-contextmenu Requires: php-sabre-dav php-sabre-event php-sabre-http php-sabre-uri2 php-sabre-vobject4 php-sabre-xml2 Requires: php81-php-pspell php82-php-pspell php83-php-pspell Requires: enchant php81-php-enchant php82-php-enchant php83-php-enchant +Requires: php81-php-xml php82-php-xml php83-php-xml Requires: hunspell-en hunspell-en-GB AutoReqProv: no @@ -83,6 +85,9 @@ fi %attr(755,root,root) /usr/bin/rcplugin_update.sh %changelog +* Sat Dec 14 2024 Jean-Philippe Pialasse 1.6-4.sme +- fix roundcube not working on initial install [SME: 12812] + * Sun Sep 01 2024 Jean-Philippe Pialasse 1.6-3.sme - initial version for SME11 [SME: 12617] - build and require rpm for plugins and skins