/[smecontribs]/rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz12489-bz12263.patch
ViewVC logotype

Diff of /rpms/smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz12489-bz12263.patch

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

Revision 1.1 by jpp, Sat Feb 24 17:37:05 2024 UTC Revision 1.2 by jpp, Sat Feb 24 22:44:49 2024 UTC
# Line 1  Line 1 
1  diff -Nur --no-dereference smeserver-roundcube-1.2.old/createlinks smeserver-roundcube-1.2/createlinks  diff -Nur --no-dereference smeserver-roundcube-1.2.old/createlinks smeserver-roundcube-1.2/createlinks
2  --- smeserver-roundcube-1.2.old/createlinks     2024-02-24 09:22:05.481000000 -0500  --- smeserver-roundcube-1.2.old/createlinks     2024-02-24 09:22:05.481000000 -0500
3  +++ smeserver-roundcube-1.2/createlinks 2024-02-24 12:24:54.824000000 -0500  +++ smeserver-roundcube-1.2/createlinks 2024-02-24 17:35:58.066000000 -0500
4  @@ -8,7 +8,8 @@  @@ -8,7 +8,7 @@
5   #see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event   #see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event
6    
7   foreach my $file (qw(   foreach my $file (qw(
8  -                /etc/systemd/system-preset/49-koozali.preset  -                /etc/systemd/system-preset/49-koozali.preset
9  +        /etc/systemd/system-preset/49-koozali.preset  +        /etc/systemd/system-preset/49-koozali.preset
 +       /etc/httpd/conf/httpd.conf  
10   ))   ))
11   {   {
12       templates2events( $file, $event );       templates2events( $file, $event );
13  @@ -38,6 +39,7 @@  @@ -36,8 +36,10 @@
14         ))
15     {
16       templates2events("/usr/share/roundcubemail/plugins/managesieve/config.inc.php", $event);       templates2events("/usr/share/roundcubemail/plugins/managesieve/config.inc.php", $event);
17    +    templates2events("/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php", $event);
18       templates2events("/etc/roundcubemail/config.inc.php", $event);       templates2events("/etc/roundcubemail/config.inc.php", $event);
19       templates2events("/etc/e-smith/sql/init/80roundcube", $event);       templates2events("/etc/e-smith/sql/init/80roundcube", $event);
20  +  +
# Line 34  diff -Nur --no-dereference smeserver-rou Line 36  diff -Nur --no-dereference smeserver-rou
36      ))      ))
37   {   {
38       event_link("qmail-update-user", $event, "20");       event_link("qmail-update-user", $event, "20");
39  +    event_link("roundcube-conf", $event, "20");  +    event_link("roundcube-conf", $event, "03");
40   }   }
41   safe_symlink("/usr/share/php/Net/LDAP3","root/usr/share/pear/Net/LDAP3");   safe_symlink("/usr/share/php/Net/LDAP3","root/usr/share/pear/Net/LDAP3");
42   safe_symlink("/usr/share/php/Net/LDAP3.php","root/usr/share/pear/Net/LDAP3.php");   safe_symlink("/usr/share/php/Net/LDAP3.php","root/usr/share/pear/Net/LDAP3.php");
# Line 225  diff -Nur --no-dereference smeserver-rou Line 227  diff -Nur --no-dereference smeserver-rou
227   }   }
228  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube
229  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube   1969-12-31 19:00:00.000000000 -0500  --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube   1969-12-31 19:00:00.000000000 -0500
230  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube       2024-02-24 11:22:54.752000000 -0500  +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube       2024-02-24 16:55:55.607000000 -0500
231  @@ -0,0 +1,67 @@  @@ -0,0 +1,67 @@
232  +{  +{
233  + my $phpversion="81";  + my $phpversion="81";
# Line 237  diff -Nur --no-dereference smeserver-rou Line 239  diff -Nur --no-dereference smeserver-rou
239  +    my $memory_limit = ($roundcube{MemoryLimit} || '512M');  +    my $memory_limit = ($roundcube{MemoryLimit} || '512M');
240  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
241  +    my $open_basedir= $roundcube{PHPBaseDir} || '';  +    my $open_basedir= $roundcube{PHPBaseDir} || '';
242  +    $open_basedir = "/usr/share/roundcube:/var/lib/roundcube:/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";  +    $open_basedir = "/usr/share/roundcubemail:/var/lib/roundcube:/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";
243  +    my $id = 'roundcube';  +    my $id = 'roundcube';
244  +    my $max_children = $roundcube{'PHPmaxChildren'} || 20;  +    my $max_children = $roundcube{'PHPmaxChildren'} || 20;
245  +    my $min_spare_servers = $roundcube{'PHPminServers'} || 4;  +    my $min_spare_servers = $roundcube{'PHPminServers'} || 4;
# Line 294  diff -Nur --no-dereference smeserver-rou Line 296  diff -Nur --no-dereference smeserver-rou
296  +}  +}
297  +}  +}
298  +  +
299    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server
300    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server   1969-12-31 19:00:00.000000000 -0500
301    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/20nextcloud_attachment_server       2024-02-24 17:24:25.423000000 -0500
302    @@ -0,0 +1,5 @@
303    +// Full URL to the Nextcloud server
304    +// e.g. https://example.com/nextcloud if in sub-path
305    +// or https://cloud.example.com if in root
306    +$config["nextcloud_attachment_server"] = "https://{$roundcube{'nextcloudURI'}||$nextcloud{'Virtualhost'}||$DomainName."/nextcloud"}";
307    +
308    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/25nextcloud_attachment_username smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/25nextcloud_attachment_username
309    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/25nextcloud_attachment_username 1969-12-31 19:00:00.000000000 -0500
310    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/25nextcloud_attachment_username     2024-02-24 17:25:55.035000000 -0500
311    @@ -0,0 +1,11 @@
312    +// Username resolving strategy from internal Roundcube
313    +// username which usually is the email address e.g. user@example.com or IMAP User
314    +// Placeholders are replaced as following
315    +// %s => verbatim RC username as reported by rcmail->get_user_name(). Depending on config loginuser@domain or login
316    +// %i => username used to login to imap. usually equal to %s
317    +// %e => user email
318    +// %l, %u => email localpart (%u is for backward compatibility)
319    +// %d => email domain
320    +// %h => IMAP Host
321    +$config["nextcloud_attachment_username"] = "%u";
322    +
323    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/30dont_try_mail_password smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/30dont_try_mail_password
324    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/30dont_try_mail_password        1969-12-31 19:00:00.000000000 -0500
325    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/30dont_try_mail_password    2024-02-24 17:25:48.875000000 -0500
326    @@ -0,0 +1,4 @@
327    +// Don't try the email password at all, because we know it won't work
328    +// Defaults to false, i.e. try the password
329    +$config["nextcloud_attachment_dont_try_mail_password"] = false;
330    +
331    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/33folder smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/33folder
332    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/33folder        1969-12-31 19:00:00.000000000 -0500
333    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/33folder    2024-02-24 17:32:13.004000000 -0500
334    @@ -0,0 +1,12 @@
335    +// Name for the sub-folder to upload to
336    +// Defaults to "Mail Attachments"
337    +// Can't be sub-folder of sub-folder link folder/sub
338    +$config["nextcloud_attachment_folder"] = "{$roundcube{'nextcloudFolder'}||'Mail Attachments'}";
339    +
340    +// Translate the folder name according to the users configured locale
341    +// When activating this $config["nextcloud_attachment_folder"] has to be an array
342    +// of locale => name, e.g.
343    +// $config["nextcloud_attachment_folder"] = ["en_US" => "Mail Attachments", "de_DE" => "E-Mail Anhänge"]
344    +// If locale doesn't exist, en_US or first will be used
345    +// Defaults to false
346    +$config["nextcloud_attachment_folder_translate_name"] = false;
347    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/35softlimit smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/35softlimit
348    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/35softlimit     1969-12-31 19:00:00.000000000 -0500
349    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/35softlimit 2024-02-24 17:29:39.128000000 -0500
350    @@ -0,0 +1,5 @@
351    +// Limit to show a warning at for large attachments.
352    +// has to be smaller then $config['max_message_size']
353    +// set to null to disable
354    +$config["nextcloud_attachment_softlimit"] = "{$roundcube{'NCsoftlimit'}||$qmail{'MaxMessageSize'}||'25M'}";
355    +
356    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/37behavior smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/37behavior
357    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/37behavior      1969-12-31 19:00:00.000000000 -0500
358    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/37behavior  2024-02-24 17:31:24.266000000 -0500
359    @@ -0,0 +1,6 @@
360    +// Behavior if $config['max_message_size'] is hit.
361    +// "prompt" to show dialog a la outlook or apple
362    +// "upload" to automatically upload without asking a la google
363    +// Defaults to "prompt"
364    +$config["nextcloud_attachment_behavior"] = "{$roundcube{'nextcloudBehavior'}||'prompt'}";
365    +
366    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/40excludeUsers smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/40excludeUsers
367    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/40excludeUsers  1969-12-31 19:00:00.000000000 -0500
368    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/40excludeUsers      2024-02-24 17:33:50.406000000 -0500
369    @@ -0,0 +1,57 @@
370    +// List of users to exclude
371    +// They won't be able to interact with the plugin at all
372    +// No prompts, no automatic uploading, no settings.
373    +// List by RC username or resolved username e.g. ["user@demo.com", "user"]
374    +$config["nextcloud_attachment_exclude_users"] = [];
375    +
376    +// Exclude users listed by uid (you need add the mapping to the address book) or email in any of the following
377    +// address books. This allows you to configure a hidden LDAP address book containing the users
378    +// to exclude.
379    +//
380    +// Hide an addressbook by setting
381    +// $config['ldap_public'][*] = [
382    +//      ...
383    +//      'hidden' => true,
384    +// ...
385    +//  ];
386    +// in the global config.
387    +//
388    +// Add the uid mapping via
389    +// $config['ldap_public'][*] = [
390    +//      ...
391    +//      'fieldmap' => [
392    +//          ...
393    +//     //internal => ldapattr
394    +//          'uid' => 'uid',
395    +//          ...
396    +//      ],
397    +//      ...
398    +// ]
399    +// in the global config. Replace mapped attribute with appropriate value for your directory e.g. cn
400    +// And replace "*" with the appropriate address book name
401    +$config["nextcloud_attachment_exclude_users_in_addr_books"] = [];
402    +
403    +// Exclude users that have a mapped value in an address book
404    +// format [ [ 'address_book', 'mapped_attribute', 'matched_value' ], ... ]
405    +//
406    +// Resulting in every user listed in the address book "address_book"
407    +// to be excluded if they have a "mapped_attribute", matching "matched_value".
408    +//
409    +// E.g. ['public', 'memberOf', 'cn=no_cloud,ou=groups,dc=example,dc=com']
410    +//
411    +// multiple attributes and multiple address books are supported
412    +$config["nextcloud_attachment_exclude_users_with_addr_book_value"] = [];
413    +
414    +// Exclude user that that are in a given group in an address book
415    +// format [ [ 'address_book', 'group' ], ... ]
416    +//
417    +// Resulting in every user listed in the address book "address_book" that is
418    +// is in group "group" to be excluded. You have to correctly configure the group
419    +// mapping for the LDAP entry
420    +//
421    +// E.g. ['public', 'nocloud']
422    +//
423    +// multiple groups and multiple address books are supported
424    +$config["nextcloud_attachment_exclude_users_in_addr_book_group"] = [];
425    +
426    +
427    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/60verify_https smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/60verify_https
428    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/60verify_https  1969-12-31 19:00:00.000000000 -0500
429    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/60verify_https      2024-02-24 17:34:52.039000000 -0500
430    @@ -0,0 +1,4 @@
431    +// Enable/Disable certificate validation for https on WebDAV and API requests
432    +// Defaults to true (enabled)
433    +$config["nextcloud_attachment_verify_https"] = {$roundcube{'nextcloudVerifyCerts'}||'true'};
434    +
435    diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/template-begin smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/template-begin
436    --- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/template-begin  1969-12-31 19:00:00.000000000 -0500
437    +++ smeserver-roundcube-1.2/root/etc/e-smith/templates/usr/share/roundcubemail/plugins/nextcloud_attachments/config.inc.php/template-begin      2024-02-24 17:20:03.116000000 -0500
438    @@ -0,0 +1,14 @@
439    +{
440    +    $OUT = <<HERE;
441    +<?php
442    +/*
443    +HERE
444    +
445    +    $OUT .=
446    +    Text::Template::_load_text("/etc/e-smith/templates-default/template-begin");
447    +
448    +    $OUT .= <<HERE;
449    +*/
450    +HERE
451    +
452    +}
453  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/usr/bin/rcplugin_update.sh smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh  diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/usr/bin/rcplugin_update.sh smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh
454  --- smeserver-roundcube-1.2.old/root/usr/bin/rcplugin_update.sh 2024-02-24 09:22:05.482000000 -0500  --- smeserver-roundcube-1.2.old/root/usr/bin/rcplugin_update.sh 2024-02-24 09:22:05.482000000 -0500
455  +++ smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh     2024-02-24 11:27:35.284000000 -0500  +++ smeserver-roundcube-1.2/root/usr/bin/rcplugin_update.sh     2024-02-24 17:36:14.068000000 -0500
456  @@ -1,19 +1,20 @@  @@ -1,19 +1,20 @@
457   #!/bin/bash   #!/bin/bash
458  -/sbin/e-smith/db configuration setprop php AllowUrlFopen On  -/sbin/e-smith/db configuration setprop php AllowUrlFopen On

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