From 6962aacc84b50467e387294386b4cf51906f1dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 12 Oct 2024 16:22:33 +0200 Subject: Bump roundcube --- flakes/etherpad-lite/flake.lock | 2 +- flakes/flake.lock | 68 +++---- flakes/grocy/flake.lock | 2 +- .../pkgs/webapps/roundcubemail/add_all.patch | 198 ++++++++------------- .../pkgs/webapps/roundcubemail/default.nix | 20 +-- .../pkgs/webapps/roundcubemail/md5.patch | 22 +++ .../roundcubemail/plugins/carddav/default.nix | 6 +- .../roundcubemail/plugins/contextmenu/default.nix | 4 +- .../plugins/contextmenu_folder/default.nix | 4 +- .../roundcubemail/plugins/ident_switch/default.nix | 4 +- .../plugins/thunderbird_labels/default.nix | 4 +- flakes/private/system/flake.lock | 2 +- flakes/surfer/flake.lock | 2 +- 13 files changed, 151 insertions(+), 187 deletions(-) create mode 100644 flakes/mypackages/pkgs/webapps/roundcubemail/md5.patch (limited to 'flakes') diff --git a/flakes/etherpad-lite/flake.lock b/flakes/etherpad-lite/flake.lock index 4b29cff..9dad8ce 100644 --- a/flakes/etherpad-lite/flake.lock +++ b/flakes/etherpad-lite/flake.lock @@ -58,7 +58,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../mypackages", "type": "path" }, diff --git a/flakes/flake.lock b/flakes/flake.lock index 802849b..6b47e58 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock @@ -3016,7 +3016,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../../mypackages", "type": "path" }, @@ -3033,7 +3033,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../mypackages", "type": "path" }, @@ -3050,7 +3050,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../mypackages", "type": "path" }, @@ -3067,7 +3067,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../../mypackages", "type": "path" }, @@ -3084,7 +3084,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../mypackages", "type": "path" }, @@ -3101,7 +3101,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../../mypackages", "type": "path" }, @@ -3118,7 +3118,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../../mypackages", "type": "path" }, @@ -3135,7 +3135,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../mypackages", "type": "path" }, @@ -3152,7 +3152,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../mypackages", "type": "path" }, @@ -3169,7 +3169,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../mypackages", "type": "path" }, @@ -3186,7 +3186,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../../mypackages", "type": "path" }, @@ -3203,7 +3203,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../../mypackages", "type": "path" }, @@ -3220,7 +3220,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../../mypackages", "type": "path" }, @@ -3753,7 +3753,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-60yr/wCF+U3z+wYR+UEgM+68nc4/CWkoIAjJsMpUG8c=", + "narHash": "sha256-pt0n3b0uM8pxY1SxkPgafBgBDUboUx003n+yIwtTl/Y=", "path": "../systems/backup-2", "type": "path" }, @@ -3776,7 +3776,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-9geQj091r2/Sxi8/ghsp5mO8MIT/kT+nEL3PKgwuApc=", + "narHash": "sha256-izVZ+2P6LDO788FQ804uDu8QirOsQjTr3CRxcYH39aU=", "path": "../systems/dilion", "type": "path" }, @@ -3824,7 +3824,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-MB/c+BVgQQ3qjAchd1Oe8qvg9UbFcY0xhxpj9RkEOnI=", + "narHash": "sha256-k4D9leVixmuVR9Wo2jNA6DOG5djTjC2PR6LgklnqFw4=", "path": "../systems/eldiron", "type": "path" }, @@ -3850,7 +3850,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-nV8j6HW6B93HEbeiy43tKCGV9J6xR7jIkAUZVbkKDt4=", + "narHash": "sha256-zJp2k6UsFeK/UicvWtC1nUwI+pzQ4Hjo4CqWWsHn/hY=", "path": "../systems/monitoring-1", "type": "path" }, @@ -3875,7 +3875,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-4vXBjKeelh3z1l7ZYO0ucB2cZPuVJsYX7yZV3MDGqdk=", + "narHash": "sha256-592TidI79fw+WU2WR1G1oFlBlp9VaV6w8TUc1d2r2A0=", "path": "../systems/quatresaisons", "type": "path" }, @@ -3895,7 +3895,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-wAhvhb/zq5upukz/cfyN1nRfYTcFby8OJi2yFaZBGIM=", + "narHash": "sha256-oqbfAKq3GO2Kl+JzXi/k/O9HszWztHxy6CrOL/or1m8=", "path": "../systems/zoldene", "type": "path" }, @@ -7499,7 +7499,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", + "narHash": "sha256-Mz6LcYYOO+Le7QLMF0DgHQhxsW2rwlVlOPjQ7qVMPkA=", "path": "../../flakes/private/system", "type": "path" }, @@ -7518,7 +7518,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", + "narHash": "sha256-Mz6LcYYOO+Le7QLMF0DgHQhxsW2rwlVlOPjQ7qVMPkA=", "path": "../../flakes/private/system", "type": "path" }, @@ -7571,7 +7571,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=", + "narHash": "sha256-CAHlCHER4gZyTBFePdnwe1Nc4vou7kX32CCswH7R8UE=", "path": "../../flakes/etherpad-lite", "type": "path" }, @@ -7613,7 +7613,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=", + "narHash": "sha256-vac+qxaNDCm32tPdRs7P8tk1aSAdSMiu5bUBV8qMkjA=", "path": "../../flakes/grocy", "type": "path" }, @@ -7694,7 +7694,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../../flakes/mypackages", "type": "path" }, @@ -7817,7 +7817,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=", + "narHash": "sha256-qslNggHZT+PwW8BuwH4I6SXetJuqwPyu/pIQzfzPJ54=", "path": "../../flakes/surfer", "type": "path" }, @@ -7962,7 +7962,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=", + "narHash": "sha256-CAHlCHER4gZyTBFePdnwe1Nc4vou7kX32CCswH7R8UE=", "path": "./etherpad-lite", "type": "path" }, @@ -8004,7 +8004,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=", + "narHash": "sha256-vac+qxaNDCm32tPdRs7P8tk1aSAdSMiu5bUBV8qMkjA=", "path": "./grocy", "type": "path" }, @@ -8104,7 +8104,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "./mypackages", "type": "path" }, @@ -8409,7 +8409,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", + "narHash": "sha256-Mz6LcYYOO+Le7QLMF0DgHQhxsW2rwlVlOPjQ7qVMPkA=", "path": "./private/system", "type": "path" }, @@ -8451,7 +8451,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=", + "narHash": "sha256-qslNggHZT+PwW8BuwH4I6SXetJuqwPyu/pIQzfzPJ54=", "path": "./surfer", "type": "path" }, @@ -9015,7 +9015,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", + "narHash": "sha256-Mz6LcYYOO+Le7QLMF0DgHQhxsW2rwlVlOPjQ7qVMPkA=", "path": "../../flakes/private/system", "type": "path" }, @@ -9034,7 +9034,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", + "narHash": "sha256-Mz6LcYYOO+Le7QLMF0DgHQhxsW2rwlVlOPjQ7qVMPkA=", "path": "../../flakes/private/system", "type": "path" }, @@ -9053,7 +9053,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", + "narHash": "sha256-Mz6LcYYOO+Le7QLMF0DgHQhxsW2rwlVlOPjQ7qVMPkA=", "path": "../../flakes/private/system", "type": "path" }, @@ -9072,7 +9072,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", + "narHash": "sha256-Mz6LcYYOO+Le7QLMF0DgHQhxsW2rwlVlOPjQ7qVMPkA=", "path": "../../flakes/private/system", "type": "path" }, diff --git a/flakes/grocy/flake.lock b/flakes/grocy/flake.lock index 3e8cb41..7e027d4 100644 --- a/flakes/grocy/flake.lock +++ b/flakes/grocy/flake.lock @@ -58,7 +58,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../mypackages", "type": "path" }, diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/add_all.patch b/flakes/mypackages/pkgs/webapps/roundcubemail/add_all.patch index ba651e2..e987fda 100644 --- a/flakes/mypackages/pkgs/webapps/roundcubemail/add_all.patch +++ b/flakes/mypackages/pkgs/webapps/roundcubemail/add_all.patch @@ -1,30 +1,60 @@ -diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php -index 0552b89c2..1b84e1b4e 100644 ---- a/program/include/rcmail_output_html.php -+++ b/program/include/rcmail_output_html.php -@@ -1013,13 +1013,13 @@ EOF; - // use minified file if exists (not in development mode) - if (!$this->devel_mode && !preg_match('/\.min\.' . $ext . '$/', $file)) { - $minified_file = substr($file, 0, strlen($ext) * -1) . 'min.' . $ext; -- if ($fs = @filemtime($this->assets_dir . $minified_file)) { -- return $minified_file . '?s=' . $fs; -+ if ($fs = @md5_file($this->assets_dir . $minified_file)) { -+ return $minified_file . '?s=' . substr($fs, 0, 6); +diff --git a/program/actions/mail/index.php b/program/actions/mail/index.php +--- a/program/actions/mail/index.php 1970-01-01 01:00:01.000000000 +0100 ++++ b/program/actions/mail/index.php 2024-08-10 01:49:10.362367233 +0200 +@@ -146,7 +146,7 @@ + 'copy', 'move', 'quota', 'replyall', 'replylist', 'stillsearching', + 'flagged', 'unflagged', 'unread', 'deleted', 'replied', 'forwarded', + 'priority', 'withattachment', 'fileuploaderror', 'mark', 'markallread', +- 'folders-cur', 'folders-sub', 'folders-all', 'cancel', 'bounce', 'bouncemsg', ++ 'folders-cur', 'folders-sub', 'folders-allsubscribed', 'folders-all', 'cancel', 'bounce', 'bouncemsg', + 'sendingmessage'); } } +diff --git a/program/actions/mail/search.php b/program/actions/mail/search.php +--- a/program/actions/mail/search.php 1970-01-01 01:00:01.000000000 +0100 ++++ b/program/actions/mail/search.php 2024-08-10 01:53:20.152011854 +0200 +@@ -83,6 +83,10 @@ -- if ($fs = @filemtime($this->assets_dir . $file)) { -- $file .= '?s=' . $fs; -+ if ($fs = @md5_file($this->assets_dir . $file)) { -+ $file .= '?s=' . substr($fs, 0, 6); + // search all, current or subfolders folders + if ($scope == 'all') { ++ $mboxes = $RCMAIL->storage->list_folders('', '*', 'mail', null, true); ++ natcasesort($mboxes); // we want natural alphabetic sorting of folders in the result set ++ } ++ else if ($scope == 'allsubscribed') { + $mboxes = $rcmail->storage->list_folders_subscribed('', '*', 'mail', null, true); + // we want natural alphabetic sorting of folders in the result set + natcasesort($mboxes); +@@ -93,7 +97,7 @@ + array_unshift($mboxes, $mbox); + } + +- if ($scope != 'all') { ++ if ($scope != 'all' && $scope != 'allsubscribed') { + // Remember current folder, it can change in meantime (plugins) + // but we need it to e.g. recognize Sent folder to handle From/To column later + $rcmail->output->set_env('mailbox', $mbox); +@@ -158,7 +162,7 @@ + $rcmail->output->show_message('searchnomatch', 'notice'); + $rcmail->output->set_env('multifolder_listing', isset($result) ? !empty($result->multi) : false); + +- if (isset($result) && !empty($result->multi) && $scope == 'all') { ++ if (isset($result) && !empty($result->multi) && ($scope == 'all' || $scope == 'allsubscribed')) { + $rcmail->output->command('select_folder', ''); + } } +@@ -266,7 +270,7 @@ + } + + // save search modifiers for the current folder to user prefs +- if ($scope != 'all') { ++ if ($scope != 'all' && $scope != 'allsubscribed') { + $search_mods = self::search_mods(); + $search_mods_value = array_fill_keys(array_keys($subject), 1); - return $file; diff --git a/program/js/app.js b/program/js/app.js -index 2094b7b7b..06fe96a80 100644 ---- a/program/js/app.js -+++ b/program/js/app.js -@@ -2277,6 +2277,9 @@ function rcube_webmail() +--- a/program/js/app.js 1970-01-01 01:00:01.000000000 +0100 ++++ b/program/js/app.js 2024-08-10 01:44:57.834696269 +0200 +@@ -2311,6 +2311,9 @@ } tree += ''; @@ -35,10 +65,9 @@ index 2094b7b7b..06fe96a80 100644 // build subject link diff --git a/program/localization/en_CA/labels.inc b/program/localization/en_CA/labels.inc -index 03c1c8e11..8d67a49ac 100644 ---- a/program/localization/en_CA/labels.inc -+++ b/program/localization/en_CA/labels.inc -@@ -128,6 +128,7 @@ $labels['markunread'] = 'As unread'; +--- a/program/localization/en_CA/labels.inc 1970-01-01 01:00:01.000000000 +0100 ++++ b/program/localization/en_CA/labels.inc 2024-08-10 01:46:39.151767483 +0200 +@@ -128,6 +128,7 @@ $labels['markflagged'] = 'As flagged'; $labels['markunflagged'] = 'As unflagged'; $labels['moreactions'] = 'More actions...'; @@ -46,7 +75,7 @@ index 03c1c8e11..8d67a49ac 100644 $labels['folders-all'] = 'All folders'; $labels['more'] = 'More'; $labels['back'] = 'Back'; -@@ -184,6 +185,7 @@ $labels['namex'] = 'Name'; +@@ -184,6 +185,7 @@ $labels['searchscope'] = 'Scope'; $labels['currentfolder'] = 'Current folder'; $labels['subfolders'] = 'This and subfolders'; @@ -55,10 +84,9 @@ index 03c1c8e11..8d67a49ac 100644 $labels['openinextwin'] = 'Open in new window'; $labels['emlsave'] = 'Download (.eml)'; diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc -index a442965de..b5b4839e3 100644 ---- a/program/localization/en_GB/labels.inc -+++ b/program/localization/en_GB/labels.inc -@@ -135,6 +135,7 @@ $labels['moreactions'] = 'More actions...'; +--- a/program/localization/en_GB/labels.inc 1970-01-01 01:00:01.000000000 +0100 ++++ b/program/localization/en_GB/labels.inc 2024-08-10 01:47:14.141137558 +0200 +@@ -139,6 +139,7 @@ $labels['markallread'] = 'Mark all as read'; $labels['folders-cur'] = 'Selected folder only'; $labels['folders-sub'] = 'Selected folder and its subfolders'; @@ -66,7 +94,7 @@ index a442965de..b5b4839e3 100644 $labels['folders-all'] = 'All folders'; $labels['more'] = 'More'; $labels['back'] = 'Back'; -@@ -221,6 +222,7 @@ $labels['namex'] = 'Name'; +@@ -225,6 +226,7 @@ $labels['searchscope'] = 'Scope'; $labels['currentfolder'] = 'Current folder'; $labels['subfolders'] = 'This and subfolders'; @@ -75,10 +103,9 @@ index a442965de..b5b4839e3 100644 $labels['searchinterval-1W'] = 'older than a week'; $labels['searchinterval-1M'] = 'older than a month'; diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc -index 2e8ec8009..c7736557f 100644 ---- a/program/localization/en_US/labels.inc -+++ b/program/localization/en_US/labels.inc -@@ -158,6 +158,7 @@ $labels['moreactions'] = 'More actions...'; +--- a/program/localization/en_US/labels.inc 1970-01-01 01:00:01.000000000 +0100 ++++ b/program/localization/en_US/labels.inc 2024-08-10 01:47:40.749419031 +0200 +@@ -162,6 +162,7 @@ $labels['markallread'] = 'Mark all as read'; $labels['folders-cur'] = 'Selected folder only'; $labels['folders-sub'] = 'Selected folder and its subfolders'; @@ -86,7 +113,7 @@ index 2e8ec8009..c7736557f 100644 $labels['folders-all'] = 'All folders'; $labels['more'] = 'More'; $labels['back'] = 'Back'; -@@ -249,6 +250,7 @@ $labels['namex'] = 'Name'; +@@ -253,6 +254,7 @@ $labels['searchscope'] = 'Scope'; $labels['currentfolder'] = 'Current folder'; $labels['subfolders'] = 'This and subfolders'; @@ -95,10 +122,9 @@ index 2e8ec8009..c7736557f 100644 $labels['searchinterval-1W'] = 'older than a week'; $labels['searchinterval-1M'] = 'older than a month'; diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc -index 6db44f95c..ad83e15d8 100644 ---- a/program/localization/fr_FR/labels.inc -+++ b/program/localization/fr_FR/labels.inc -@@ -135,6 +135,7 @@ $labels['moreactions'] = 'Plus d’actions…'; +--- a/program/localization/fr_FR/labels.inc 1970-01-01 01:00:01.000000000 +0100 ++++ b/program/localization/fr_FR/labels.inc 2024-08-10 01:48:22.494860699 +0200 +@@ -139,6 +139,7 @@ $labels['markallread'] = 'Tout marquer comme lu'; $labels['folders-cur'] = 'Dossier sélectionné seulement'; $labels['folders-sub'] = 'Dossier sélectionné et ses sous-dossiers'; @@ -106,7 +132,7 @@ index 6db44f95c..ad83e15d8 100644 $labels['folders-all'] = 'Tous les dossiers'; $labels['more'] = 'Plus'; $labels['back'] = 'Retour'; -@@ -221,6 +222,7 @@ $labels['namex'] = 'Nom'; +@@ -225,6 +226,7 @@ $labels['searchscope'] = 'Portée'; $labels['currentfolder'] = 'Répertoire actuel'; $labels['subfolders'] = 'Ceci et les sous-dossiers'; @@ -114,96 +140,14 @@ index 6db44f95c..ad83e15d8 100644 $labels['allfolders'] = 'Tous les dossiers'; $labels['searchinterval-1W'] = 'plus d’une semaine'; $labels['searchinterval-1M'] = 'plus d’un mois'; -diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc -index 8e0c642f6..ac79780e0 100644 ---- a/program/steps/mail/func.inc -+++ b/program/steps/mail/func.inc -@@ -110,8 +110,8 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { - 'copy', 'move', 'quota', 'replyall', 'replylist', 'stillsearching', - 'flagged', 'unflagged', 'unread', 'deleted', 'replied', 'forwarded', - 'priority', 'withattachment', 'fileuploaderror', 'mark', 'markallread', -- 'folders-cur', 'folders-sub', 'folders-all', 'cancel', 'bounce', 'bouncemsg', -- 'sendingmessage'); -+ 'folders-cur', 'folders-sub', 'folders-allsubscribed', 'folder-all', -+ 'cancel', 'bounce', 'bouncemsg', 'sendingmessage'); - } - } - -diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc -index f60528835..836a715b0 100644 ---- a/program/steps/mail/search.inc -+++ b/program/steps/mail/search.inc -@@ -86,7 +86,7 @@ else if (strlen(trim($str))) { - } - - // save search modifiers for the current folder to user prefs -- $mkey = $scope == 'all' ? '*' : $mbox; -+ $mkey = ($scope == 'all' || $scope == 'allsubscribed') ? '*' : $mbox; - $search_mods = rcmail_search_mods(); - $search_mods[$mkey] = array_fill_keys(array_keys($subject), 1); - -@@ -124,6 +124,10 @@ if (!empty($continue) && isset($_SESSION['search']) && $_SESSION['search_request - if ($search_str) { - // search all, current or subfolders folders - if ($scope == 'all') { -+ $mboxes = $RCMAIL->storage->list_folders('', '*', 'mail', null, true); -+ natcasesort($mboxes); // we want natural alphabetic sorting of folders in the result set -+ } -+ else if ($scope == 'allsubscribed') { - $mboxes = $RCMAIL->storage->list_folders_subscribed('', '*', 'mail', null, true); - natcasesort($mboxes); // we want natural alphabetic sorting of folders in the result set - } -@@ -133,7 +137,7 @@ if ($search_str) { - array_unshift($mboxes, $mbox); - } - -- if ($scope != 'all') { -+ if ($scope != 'all' && $scope != 'allsubscribed') { - // Remember current folder, it can change in meantime (plugins) - // but we need it to e.g. recognize Sent folder to handle From/To column later - $RCMAIL->output->set_env('mailbox', $mbox); -@@ -194,7 +198,7 @@ else { - $count = 0; - $OUTPUT->show_message('searchnomatch', 'notice'); - $OUTPUT->set_env('multifolder_listing', (bool)$result->multi); -- if ($result->multi && $scope == 'all') { -+ if ($result->multi && ($scope == 'all' || $scope == 'allsubscribed')) { - $OUTPUT->command('select_folder', ''); - } - } -diff --git a/skins/classic/templates/mail.html b/skins/classic/templates/mail.html -index 666adf606..23d12a275 100644 ---- a/skins/classic/templates/mail.html -+++ b/skins/classic/templates/mail.html -@@ -106,6 +106,7 @@ -
    • -
    • -
    • -+
    • -
    • - - diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html -index 51dbfcd30..4c2281281 100644 ---- a/skins/elastic/templates/mail.html -+++ b/skins/elastic/templates/mail.html -@@ -77,6 +77,7 @@ - + -diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html -index 5ef0bc211..e0e8280ad 100644 ---- a/skins/larry/templates/mail.html -+++ b/skins/larry/templates/mail.html -@@ -56,6 +56,7 @@ - -
    • -
    • -+
    • -
    • - -
    diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix index a786e86..f83e61b 100644 --- a/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix +++ b/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix @@ -1,6 +1,6 @@ { varDir ? "/var/lib/roundcubemail" , roundcube_config ? "/etc/roundcube/config.php" -, stdenv, fetchurl, jre, unzip, lib, callPackage }: +, stdenv, fetchurl, which, nodePackages, lib, callPackage }: let defaultInstall = '' mkdir -p $out @@ -52,22 +52,20 @@ let passthru = toPassthru newRoundcube pkg.plugins (pkg.skins ++ skins); }); in newRoundcube; - shrinker = fetchurl { - url = "https://dl.google.com/closure-compiler/compiler-20200719.zip"; - sha256 = "0j46y9ack2yq67naca6nfysbmyilwjlkl29dbswidf1lq09yhhj3"; - }; package = stdenv.mkDerivation rec { - version = "1.4.15"; + version = "1.6.8"; name = "roundcubemail-${version}"; src= fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/${name}-complete.tar.gz"; - sha256 = "sha256-0CRVGmPCjMOUPEELpWk93TifchXUbzhUvS55IOgaAh8="; + sha256 = "sha256-hGi+AgSnNMV0re9L4BV4x9xPq5wv40ADvzQaK9IO/So="; }; - patches = [ ./add_all.patch ]; # This patch includes js modification which requires to re-run the jsshrink below - buildInputs = [ unzip jre ]; + patches = [ + ./add_all.patch # This patch includes js modification which requires to re-run the jsshrink below + ./md5.patch + ]; + buildInputs = [ which nodePackages.uglify-js ]; buildPhase = '' - mkdir -p /tmp - unzip -p "${shrinker}" "*.jar" > "/tmp/compiler.jar" + sed -i -e "s/uglify-js/uglifyjs/g" ./bin/jsshrink.sh ./bin/jsshrink.sh sed -i \ -e "s|RCUBE_INSTALL_PATH . 'temp.*|'${varDir}/cache';|" \ diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/md5.patch b/flakes/mypackages/pkgs/webapps/roundcubemail/md5.patch new file mode 100644 index 0000000..36b30c2 --- /dev/null +++ b/flakes/mypackages/pkgs/webapps/roundcubemail/md5.patch @@ -0,0 +1,22 @@ +diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php +index 0552b89c2..1b84e1b4e 100644 +--- a/program/include/rcmail_output_html.php ++++ b/program/include/rcmail_output_html.php +@@ -1013,13 +1013,13 @@ EOF; + // use minified file if exists (not in development mode) + if (!$this->devel_mode && !preg_match('/\.min\.' . $ext . '$/', $file)) { + $minified_file = substr($file, 0, strlen($ext) * -1) . 'min.' . $ext; +- if ($fs = @filemtime($this->assets_dir . $minified_file)) { +- return $minified_file . '?s=' . $fs; ++ if ($fs = @md5_file($this->assets_dir . $minified_file)) { ++ return $minified_file . '?s=' . substr($fs, 0, 6); + } + } + +- if ($fs = @filemtime($this->assets_dir . $file)) { +- $file .= '?s=' . $fs; ++ if ($fs = @md5_file($this->assets_dir . $file)) { ++ $file .= '?s=' . substr($fs, 0, 6); + } + + return $file; diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/carddav/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/carddav/default.nix index ad6856b..a9e7821 100644 --- a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/carddav/default.nix +++ b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/carddav/default.nix @@ -1,7 +1,7 @@ { buildPlugin }: buildPlugin rec { appName = "carddav"; - version = "3.0.3"; - url = "https://github.com/blind-coder/rcmcarddav/releases/download/v${version}/${appName}-${version}.tar.bz2"; - sha256 = "0cf5rnqkhhag2vdy808zfpr4l5586fn43nvcia8ac1ha58azrxal"; + version = "5.1.0"; + url = "https://github.com/mstilkerich/rcmcarddav/releases/download/v${version}/${appName}-v${version}.tar.gz"; + sha256 = "sha256-lmeTr1i1oO65IQcry6NRxL1iEi+QxW0K6r9dyv/wJis="; } diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix index 34a43a7..9e56784 100644 --- a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix +++ b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix @@ -1,7 +1,7 @@ { buildPlugin }: buildPlugin rec { appName = "contextmenu"; - version = "3.2"; + version = "3.3.1"; url = "https://github.com/johndoh/roundcube-${appName}/archive/${version}.tar.gz"; - sha256 = "1j7qns42bvgwav8d5n8g16iajyrhydd76hgil8625f3xyjbv4mx0"; + sha256 = "sha256-Y4IPe6EWvfU3pRq1MBTMMDxF9GXj/x4xDTMz5klAwLs="; } diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix index e5cb46d..d3c3683 100644 --- a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix +++ b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix @@ -1,7 +1,7 @@ { buildPlugin }: buildPlugin rec { appName = "contextmenu_folder"; - version = "1.3.3"; + version = "2.0.2"; url = "https://github.com/random-cuber/${appName}/archive/${version}.tar.gz"; - sha256 = "1ngfws1v8qrpa52rjh7kirc98alchk2vbqwra86h00agyjjlcc57"; + sha256 = "sha256-P/T7EZPKzcz1R5iDZU+V+5sWnli9OCwSziWm8oPuuFM="; } diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix index 3e10fee..14815f6 100644 --- a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix +++ b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix @@ -1,7 +1,7 @@ { buildPlugin }: buildPlugin rec { appName = "ident_switch"; - version = "4.2"; + version = "4.4.2"; url = "https://bitbucket.org/BoresExpress/${appName}/get/${version}.tar.gz"; - sha256 = "0rf2krjsnly4i0mzgsbx09xckr3p9a9dzxf8qq4lkyng1a7dvjkq"; + sha256 = "sha256-+3rus8+2PU1E1/8U6KeJJNm6JpJq7elyL07BDR0UsZg="; } diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix index b67f16a..4e1ab51 100644 --- a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix +++ b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix @@ -1,7 +1,7 @@ { buildPlugin }: buildPlugin rec { appName = "thunderbird_labels"; - version = "v1.4.2"; + version = "v1.6.1"; url = "https://github.com/mike-kfed/roundcube-${appName}/archive/${version}.tar.gz"; - sha256 = "00dqqlq6m8a6dwynp6gwfimc10anbs8kh0qdy8xvq2l06hk6jxyc"; + sha256 = "sha256-2zVGoIMwO+zg3v/MZmGdvc7Qyrcyyf6Hua0fRc7ewuU="; } diff --git a/flakes/private/system/flake.lock b/flakes/private/system/flake.lock index c6362c5..c0c8048 100644 --- a/flakes/private/system/flake.lock +++ b/flakes/private/system/flake.lock @@ -69,7 +69,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../../mypackages", "type": "path" }, diff --git a/flakes/surfer/flake.lock b/flakes/surfer/flake.lock index 8ebbf92..1d39b30 100644 --- a/flakes/surfer/flake.lock +++ b/flakes/surfer/flake.lock @@ -41,7 +41,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", + "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=", "path": "../mypackages", "type": "path" }, -- cgit v1.2.3