updated sauserprefs, markasjunk2 plugins

ircube-x/create_rpm

@@ -126,7 +126,8 @@ if [ " $key" = " Y" -o " $key" = " y" ] ; then
 		rpmbuild -ba $clean /tmp/ircube.spec
 	fi
 	/bin/rm -f /tmp/ircube.spec
-	build_arch=`rpmbuild --showrc|grep "^build arch" | awk '{print $4}'`
+	#build_arch=`rpmbuild --showrc|grep "^build arch" | awk '{print $4}'`
+	build_arch=noarch
 	rpm --addsign $rpmbuild/RPMS/$build_arch/ircube-"$version"-"1.$release".$dist.$build_arch.rpm
 	rpm --addsign $rpmbuild/SRPMS/ircube-"$version"-"1.$release".$dist.src.rpm
 	echo -n "RPM lint for ircube-"$version"-1."$release" (Y/N) - "

ircube-x/doc/ChangeLog

@@ -25,6 +25,8 @@ Release 1.0.0-1.1 Start 13/09/2022 End 20/04/2023
 20/07/2023
 11. markasjunk2.php: fixed syntax error
 12. roundcube_config: changed php-fpm.sock location to /run/php-fpm
+21/07/2023
+13. updated markasjunk2, sauserprefs plugins to latest from github
 
 * Thu 08 Sep 2022 14:38:16 +0000 Manvendra Bhangui <ircube@indimail.org> 1.0.0-1.1%{?dist}
 Release @version@-@release@ Start 13/03/2017 End 08/09/2022

ircube-x/ircube.spec.in

@@ -153,6 +153,7 @@ install -m 0644 %{name}-release %{buildroot}%{pluginbase}/%{name}/%{name}-releas
 %attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/localization/sk_SK.inc
 %attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/localization/fr_FR.inc
 %attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/localization/gl_ES.inc
+%attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/sauserprefs.sql
 %dir %attr(0755,root,root) %{pluginbase}/plugins/sauserprefs/skins
 %dir %attr(0755,root,root) %{pluginbase}/plugins/sauserprefs/skins/larry
 %dir %attr(0755,root,root) %{pluginbase}/plugins/sauserprefs/skins/larry/images
@@ -171,13 +172,18 @@ install -m 0644 %{name}-release %{buildroot}%{pluginbase}/%{name}/%{name}-releas
 %dir %attr(0755,root,root) %{pluginbase}/plugins/sauserprefs/skins/classic/templates
 %attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/skins/classic/templates/settingsedit.html
 %attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/skins/classic/templates/sauserprefs.html
-%attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/skins/classic/tabstyles.css
+%attr(644,root,root)       %{pluginbase}/plugins/sauserprefs/skins/elastic/sauserprefs.less
+%attr(644,root,root)       %{pluginbase}/plugins/sauserprefs/skins/elastic/sauserprefs.min.css
+%attr(644,root,root)       %{pluginbase}/plugins/sauserprefs/skins/elastic/tabstyles.less
+%attr(644,root,root)       %{pluginbase}/plugins/sauserprefs/skins/elastic/tabstyles.min.css
+%attr(644,root,root)       %{pluginbase}/plugins/sauserprefs/skins/elastic/templates/sauserprefs.html
+%attr(644,root,root)       %{pluginbase}/plugins/sauserprefs/skins/elastic/templates/settingsedit.html
 %attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/config.inc.php.dist
-%attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/sauserprefs.sql
 %attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/CHANGELOG
 %dir %attr(0755,root,root) %{pluginbase}/plugins/sauserprefs/lib
 %dir %attr(0755,root,root) %{pluginbase}/plugins/sauserprefs/lib/Roundcube
 %attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/lib/Roundcube/rcube_sauserprefs_storage_sql.php
+%attr(644,root,root)       %{pluginbase}/plugins/sauserprefs/lib/Roundcube/rcube_sauserprefs_storage.php
 %attr(0644,root,root)      %{pluginbase}/plugins/sauserprefs/sauserprefs.php
 %dir %attr(0755,root,root) %{pluginbase}/plugins/iwebadmin
 %attr(0664,root,root)      %{pluginbase}/plugins/iwebadmin/config.inc.php
@@ -221,12 +227,14 @@ install -m 0644 %{name}-release %{buildroot}%{pluginbase}/%{name}/%{name}-releas
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/localization/pt_BR.inc
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/localization/en_US.inc
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/localization/es_ES.inc
+%attr(644,root,root)       %{pluginbase}/plugins/markasjunk2/localization/da_DK.inc
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/localization/de_DE.inc
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/localization/sk_SK.inc
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/localization/fa_IR.inc
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/localization/fr_FR.inc
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/localization/nl_NL.inc
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/localization/gl_ES.inc
+%attr(644,root,root)       %{pluginbase}/plugins/markasjunk2/localization/zh_CN.inc
 %dir %attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/skins
 %dir %attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/skins/larry
 %dir %attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/skins/larry/images
@@ -238,12 +246,15 @@ install -m 0644 %{name}-release %{buildroot}%{pluginbase}/%{name}/%{name}-releas
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/skins/classic/images/messageactions.png
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/skins/classic/images/mail_toolbar.png
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/skins/classic/markasjunk2.css
+%attr(644,root,root)       %{pluginbase}/plugins/markasjunk2/skins/elastic/markasjunk2.less
+%attr(644,root,root)       %{pluginbase}/plugins/markasjunk2/skins/elastic/markasjunk2.min.css
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/config.inc.php.dist
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/markasjunk2.js
 %attr(0644,root,root)      %{pluginbase}/plugins/markasjunk2/CHANGELOG
 %attr(644,root,root)       %{pluginbase}/%{name}/%{name}-release
 %attr(644,root,root)       %{pluginbase}/%{name}/%{name}-rpm.info
 
+
 %doc %{_prefix}/share/indimail/doc/README-ircube.md
 %doc %{_prefix}/share/indimail/doc/COPYING.ircube
 

ircube-x/plugins/markasjunk2/CHANGELOG

@@ -1,6 +1,27 @@
 Roundcube Webmail MarkAsJunk2
 =============================
 
+ * email_learn driver: use new rcmail_resend_mail class (req RC 040a71e)
+ * Replace classes .markasjunk2Sel/.markasnotjunk2Sel with .pressed
+ * Add Elastic skin support
+ * Add markasjunk2_permanently_remove option (#56)
+ * Integration with Swipe plugin
+ * %xds marco replaced with %h:<header name>
+ * Fix check_request() bypass in places using get_uids() [CVE-2018-9846] (req RC 8e543f8)
+ * Add markasjunk2_allowed_hosts config option
+ * Add markasjunk2_host_config config option
+ * Pass source and destination mbox vars to driver fix save problems in edit_headers and sa_detact drivers (#58)
+ * Make flag defaults match markasjunk plugin from core (config change: to disable flagging set configs to false) (#59)
+ * Add markasjunk2_spam_only option
+
+Version 1.11.1 (2017-07-29, rc-1.3)
+=================================================
+ * Fix icon display on message view screen
+
+Version 1.11 (2017-06-14, rc-1.3)
+=================================================
+ * "Flattened" the larry theme: fresher look by removing shadows and gradients
+
 Version 1.10 (2017-01-02, rc-1.1)
 =================================================
  * Add JS event markasjunk2-update to allow other plugins to influence the spam/ham options show

ircube-x/plugins/markasjunk2/README.md

@@ -1,5 +1,12 @@
 Roundcube Webmail MarkAsJunk2
 =============================
+
+THIS PLUGIN IS NO LONGER MAINTAINED
+-----------------------------------
+The features of this plugin have been integrated into the markasjunk plugin in
+the Roundcube core (v1.4+), via [pull request 6504][pr6504]. This plugin is now
+obsolete.
+
 This plugin adds "mark as spam" or "mark as not spam" button to the message
 menu.
 
@@ -68,14 +75,14 @@ An [example driver][jsevents] is available to show how to use the JS events
 
 Several drivers are provided by default they are:
 
-**cmd_learn:** This driver calls an external command (for example bogo-learn) to
+**cmd_learn:** This driver calls an external command (for example salearn) to
 process the message
 
 **dir_learn:** This driver places a copy of the message in a predefined folder,
 for example to allow for processing later
 
 **email_learn:** This driver emails the message either as an attachment or
-directly to a set address
+directly to a set address. This driver requires Roundcube 1.4 or above.
 
 **sa_blacklist:** This driver adds the sender address of a spam message to the
 users blacklist (or whitelist of ham messages) Requires SAUserPrefs plugin
@@ -139,10 +146,11 @@ $config['markasjunk2_ham_patterns'] = array(
 );
 ```
 
+[pr6504]: https://github.com/roundcube/roundcubemail/pull/6504
 [thomas]: mailto:roundcube@gmail.com
-[rcmaj]: http://github.com/roundcube/roundcubemail/tree/master/plugins/markasjunk
-[rcplugrepo]: http://plugins.roundcube.net/packages/johndoh/markasjunk2
-[releases]: http://github.com/JohnDoh/Roundcube-Plugin-Mark-as-Junk-2/releases
-[gpl]: http://www.gnu.org/licenses/gpl.html
-[multidriver]: http://gist.github.com/JohnDoh/8173505
-[jsevents]: http://gist.github.com/JohnDoh/37ab8610f9fa63052197c89e5ef89266
+[rcmaj]: https://github.com/roundcube/roundcubemail/tree/master/plugins/markasjunk
+[rcplugrepo]: https://plugins.roundcube.net/packages/johndoh/markasjunk2
+[releases]: https://github.com/johndoh/roundcube-markasjunk2/releases
+[gpl]: https://www.gnu.org/licenses/gpl.html
+[multidriver]: https://gist.github.com/johndoh/8173505
+[jsevents]: https://gist.github.com/johndoh/37ab8610f9fa63052197c89e5ef89266

ircube-x/plugins/markasjunk2/composer.json

@@ -2,10 +2,10 @@
   "name": "johndoh/markasjunk2",
   "description": "Learn messages as Junk/Not Junk",
   "keywords": ["junk","spam","lean","move"],
-  "homepage": "http://github.com/JohnDoh/Roundcube-Plugin-Mark-as-Junk-2/",
+  "homepage": "https://github.com/johndoh/roundcube-markasjunk2/",
   "license": "GPL-3.0",
   "type": "roundcube-plugin",
-  "version": "1.10",
+  "version": "1.12",
   "authors": [
     {
       "name": "Philip Weir",
@@ -16,7 +16,7 @@
   "repositories": [
     {
       "type": "composer",
-      "url": "http://plugins.roundcube.net"
+      "url": "https://plugins.roundcube.net"
     }
   ],
   "require": {
@@ -25,7 +25,7 @@
   },
   "extra": {
     "roundcube": {
-      "min-version": "1.1-beta"
+      "min-version": "1.4"
     }
   }
 }

ircube-x/plugins/markasjunk2/config.inc.php

@@ -27,12 +27,12 @@
 $config['markasjunk2_unread_ham'] = false;
 
 // Add flag to messages marked as spam (flag will be removed when marking as ham)
-// If you do not want to use message flags set this to null
+// If you do not want to use message flags set this to false
 $config['markasjunk2_spam_flag'] = 'Junk';
 
 // Add flag to messages marked as ham (flag will be removed when marking as spam)
-// If you do not want to use message flags set this to null
-$config['markasjunk2_ham_flag'] = null;
+// If you do not want to use message flags set this to false
+$config['markasjunk2_ham_flag'] = 'NonJunk';
 
 // Write output from spam/ham commands to the log for debug
 $config['markasjunk2_debug'] = false;
@@ -51,6 +51,24 @@
 // Learn any message moved from the spam mailbox to the ham mailbox as ham (not just when the button is pressed)
 $config['markasjunk2_move_ham'] = false;
 
+// Some drivers create new copies of the target message(s), in this case the original message(s) will be deleted
+// Rather than deleting the message(s) (moving to Trash) setting this option true will cause the original message(s) to be permanently removed
+$config['markasjunk2_permanently_remove'] = false;
+
+// Display only a mark as spam button
+$config['markasjunk2_spam_only'] = false;
+
+// Activate MarkAsJunk2 for selected mail hosts only. If this is not set all mail hosts are allowed.
+// Example: $config['markasjunk2_allowed_hosts'] = array('mail1.domain.tld', 'mail2.domain.tld');
+$config['markasjunk2_allowed_hosts'] = null;
+
+// Load specific config for different mail hosts
+// Example: $config['markasjunk2_host_config'] = array(
+//    'mail1.domain.tld' => 'mail1_config.inc.php',
+//    'mail2.domain.tld' => 'mail2_config.inc.php',
+// );
+$config['markasjunk2_host_config'] = null;
+
 // cmd_learn Driver options
 // ------------------------
 // The command used to learn that a message is spam
@@ -59,9 +77,10 @@
 //      %l is replaced with the local part of the username (if the username is an email address)
 //      %d is replaced with the domain part of the username (if the username is an email address or default mail domain if not)
 //      %i is replaced with the email address from the user's default identity
-//      %xds is replaced with the X-DSPAM-Signature header
+//      %s is replaced with the email address the message is from
 //      %f is replaced with the path to the message file
-// If you do not want run the command set this to null
+//      %h:<header name> is replaced with the content of that header from the message (lower case) eg: %h:x-dspam-signature
+// If you do not want to run the command set this to null
 $config['markasjunk2_spam_cmd'] = '/usr/libexec/indimail/bogo-learn %m %u dummy spam %f';
 
 // The command used to learn that a message is ham
@@ -70,9 +89,10 @@
 //      %l is replaced with the local part of the username (if the username is an email address)
 //      %d is replaced with the domain part of the username (if the username is an email address or default mail domain if not)
 //      %i is replaced with the email address from the user's default identity
-//      %xds is replaced with the X-DSPAM-Signature header
+//      %s is replaced with the email address the message is from
 //      %f is replaced with the path to the message file
-// If you do not want run the command set this to null
+//      %h:<header name> is replaced with the content of that header from the message (lower case) eg: %h:x-dspam-signature
+// If you do not want to run the command set this to null
 $config['markasjunk2_ham_cmd'] = '/usr/libexec/indimail/bogo-learn %m %u dummy ham %f';
 
 // dir_learn Driver options
@@ -140,16 +160,16 @@
 // see the README for an example
 // TEST CAREFULLY BEFORE USE ON REAL MESSAGES
 $config['markasjunk2_spam_patterns'] = array(
-												'patterns' => array(),
-												'replacements' => array()
-												);
+                                                'patterns' => array(),
+                                                'replacements' => array()
+                                                );
 
 // Patterns to match and replace headers for spam messages
 // Replacement method uses preg_replace - http://www.php.net/manual/function.preg-replace.php
 // WARNING: Be sure to match the entire header line, including the name of the header, also use ^ and $ and the 'm' flag
 // see the README for an example
 // TEST CAREFULLY BEFORE USE ON REAL MESSAGES
 $config['markasjunk2_ham_patterns'] = array(
-												'patterns' => array(),
-												'replacements' => array()
-												);
+                                                'patterns' => array(),
+                                                'replacements' => array()
+                                                );

ircube-x/plugins/markasjunk2/config.inc.php.dist

@@ -21,18 +21,18 @@ $config['markasjunk2_ham_mbox'] = null;
 $config['markasjunk2_spam_mbox'] = null;
 
 // Mark messages as read when reporting them as spam
-$config['markasjunk2_read_spam'] = true;
+$config['markasjunk2_read_spam'] = false;
 
 // Mark messages as unread when reporting them as ham
 $config['markasjunk2_unread_ham'] = false;
 
 // Add flag to messages marked as spam (flag will be removed when marking as ham)
-// If you do not want to use message flags set this to null
+// If you do not want to use message flags set this to false
 $config['markasjunk2_spam_flag'] = 'Junk';
 
 // Add flag to messages marked as ham (flag will be removed when marking as spam)
-// If you do not want to use message flags set this to null
-$config['markasjunk2_ham_flag'] = null;
+// If you do not want to use message flags set this to false
+$config['markasjunk2_ham_flag'] = 'NonJunk';
 
 // Write output from spam/ham commands to the log for debug
 $config['markasjunk2_debug'] = false;
@@ -51,6 +51,24 @@ $config['markasjunk2_move_spam'] = false;
 // Learn any message moved from the spam mailbox to the ham mailbox as ham (not just when the button is pressed)
 $config['markasjunk2_move_ham'] = false;
 
+// Some drivers create new copies of the target message(s), in this case the original message(s) will be deleted
+// Rather than deleting the message(s) (moving to Trash) setting this option true will cause the original message(s) to be permanently removed
+$config['markasjunk2_permanently_remove'] = false;
+
+// Display only a mark as spam button
+$config['markasjunk2_spam_only'] = false;
+
+// Activate MarkAsJunk2 for selected mail hosts only. If this is not set all mail hosts are allowed.
+// Example: $config['markasjunk2_allowed_hosts'] = array('mail1.domain.tld', 'mail2.domain.tld');
+$config['markasjunk2_allowed_hosts'] = null;
+
+// Load specific config for different mail hosts
+// Example: $config['markasjunk2_host_config'] = array(
+//    'mail1.domain.tld' => 'mail1_config.inc.php',
+//    'mail2.domain.tld' => 'mail2_config.inc.php',
+// );
+$config['markasjunk2_host_config'] = null;
+
 // cmd_learn Driver options
 // ------------------------
 // The command used to learn that a message is spam
@@ -59,9 +77,10 @@ $config['markasjunk2_move_ham'] = false;
 //      %l is replaced with the local part of the username (if the username is an email address)
 //      %d is replaced with the domain part of the username (if the username is an email address or default mail domain if not)
 //      %i is replaced with the email address from the user's default identity
-//      %xds is replaced with the X-DSPAM-Signature header
+//      %s is replaced with the email address the message is from
 //      %f is replaced with the path to the message file
-// If you do not want run the command set this to null
+//      %h:<header name> is replaced with the content of that header from the message (lower case) eg: %h:x-dspam-signature
+// If you do not want to run the command set this to null
 $config['markasjunk2_spam_cmd'] = null;
 
 // The command used to learn that a message is ham
@@ -70,9 +89,10 @@ $config['markasjunk2_spam_cmd'] = null;
 //      %l is replaced with the local part of the username (if the username is an email address)
 //      %d is replaced with the domain part of the username (if the username is an email address or default mail domain if not)
 //      %i is replaced with the email address from the user's default identity
-//      %xds is replaced with the X-DSPAM-Signature header
+//      %s is replaced with the email address the message is from
 //      %f is replaced with the path to the message file
-// If you do not want run the command set this to null
+//      %h:<header name> is replaced with the content of that header from the message (lower case) eg: %h:x-dspam-signature
+// If you do not want to run the command set this to null
 $config['markasjunk2_ham_cmd'] = null;
 
 // dir_learn Driver options
@@ -140,16 +160,16 @@ $config['markasjunk2_amacube_config'] = '../amacube/config.inc.php';
 // see the README for an example
 // TEST CAREFULLY BEFORE USE ON REAL MESSAGES
 $config['markasjunk2_spam_patterns'] = array(
-												'patterns' => array(),
-												'replacements' => array()
-												);
+                                                'patterns' => array(),
+                                                'replacements' => array()
+                                                );
 
 // Patterns to match and replace headers for spam messages
 // Replacement method uses preg_replace - http://www.php.net/manual/function.preg-replace.php
 // WARNING: Be sure to match the entire header line, including the name of the header, also use ^ and $ and the 'm' flag
 // see the README for an example
 // TEST CAREFULLY BEFORE USE ON REAL MESSAGES
 $config['markasjunk2_ham_patterns'] = array(
-												'patterns' => array(),
-												'replacements' => array()
-												);
+                                                'patterns' => array(),
+                                                'replacements' => array()
+                                                );