diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index e63a9b5df..d7695abb9 100644 --- a/.docker/release/files/usr/local/include/application.ini +++ b/.docker/release/files/usr/local/include/application.ini @@ -292,5 +292,5 @@ dev_email = "" dev_password = "" [version] -current = "2.7.1" +current = "2.7.2" saved = "Mon, 23 Aug 2021 07:55:13 +0000" diff --git a/README.md b/README.md index 0b507b619..6daddb5a4 100644 --- a/README.md +++ b/README.md @@ -129,23 +129,23 @@ RainLoop 1.15 vs SnappyMail |js/* |RainLoop |Snappy | |--------------- |--------: |--------: | -|admin.js |2.158.025 | 88.633 | -|app.js |4.215.733 | 446.059 | -|boot.js | 672.433 | 2.856 | +|admin.js |2.158.025 | 86.143 | +|app.js |4.215.733 | 435.037 | +|boot.js | 672.433 | 2.707 | |libs.js | 647.679 | 213.208 | |polyfills.js | 325.908 | 0 | |serviceworker.js | 0 | 285 | -|TOTAL |8.019.778 | 751.041 | +|TOTAL |8.019.778 | 737.380 | |js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |------: |--------: |--------: | -|admin.min.js | 255.514 | 45.597 | 73.899 | 13.933 | 60.674 | 12.463 | -|app.min.js | 516.000 | 228.862 |140.430 | 67.769 |110.657 | 57.420 | -|boot.min.js | 66.456 | 1.648 | 22.553 | 986 | 20.043 | 822 | +|admin.min.js | 255.514 | 43.930 | 73.899 | 13.591 | 60.674 | 12.162 | +|app.min.js | 516.000 | 222.420 |140.430 | 66.268 |110.657 | 56.207 | +|boot.min.js | 66.456 | 1.621 | 22.553 | 983 | 20.043 | 805 | |libs.min.js | 574.626 | 102.959 |177.280 | 37.514 |151.855 | 33.617 | |polyfills.min.js | 32.608 | 0 | 11.315 | 0 | 10.072 | 0 | -|TOTAL |1.445.204 | 379.066 |425.477 |120.202 |353.301 |104.322 | -|TOTAL (no admin) |1.189.690 | 333.469 |351.061 |106.269 |292.627 | 91.859 | +|TOTAL |1.445.204 | 370.930 |425.477 |118.356 |353.301 |102.791 | +|TOTAL (no admin) |1.189.690 | 327.000 |351.061 |104.765 |292.627 | 90.629 | For a user its around 68% smaller and faster than traditional RainLoop. @@ -184,12 +184,12 @@ For a user its around 68% smaller and faster than traditional RainLoop. |css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli | |------------ |-------: |------: |------: |------: |--------: | -|app.css | 340.334 | 93.382 | 46.959 | 17.277 | 14.966 | -|app.min.css | 274.791 | 75.885 | 39.618 | 15.430 | 13.632 | +|app.css | 340.334 | 92.117 | 46.959 | 17.079 | 14.790 | +|app.min.css | 274.791 | 74.827 | 39.618 | 15.259 | 13.473 | |boot.css | | 1.326 | | 664 | 545 | |boot.min.css | | 1.071 | | 590 | 474 | -|admin.css | | 40.355 | | 8.507 | 7.437 | -|admin.min.css | | 31.835 | | 7.465 | 6.628 | +|admin.css | | 39.492 | | 8.354 | 7.308 | +|admin.min.css | | 31.114 | | 7.324 | 6.506 | ### Squire vs CKEditor diff --git a/integrations/nextcloud/snappymail/VERSION b/integrations/nextcloud/snappymail/VERSION index 5588ae827..fbafd6b60 100755 --- a/integrations/nextcloud/snappymail/VERSION +++ b/integrations/nextcloud/snappymail/VERSION @@ -1 +1 @@ -2.7.1 \ No newline at end of file +2.7.2 \ No newline at end of file diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index f85b92bbf..9dfbe71ee 100644 --- a/integrations/nextcloud/snappymail/appinfo/info.xml +++ b/integrations/nextcloud/snappymail/appinfo/info.xml @@ -4,7 +4,7 @@ SnappyMail SnappyMail Webmail Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "SnappyMail webmail" section. There, click on the link to go to the SnappyMail admin panel. The default user/password is admin/12345. This version is based on SnappyMail 2.6.0 (2021-07). - 2.7.1 + 2.7.2 agpl SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli SnappyMail diff --git a/package.json b/package.json index 3b650bedc..ba1c834b6 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "title": "SnappyMail", "description": "Simple, modern & fast web-based email client", "private": true, - "version": "2.7.1", + "version": "2.7.2", "homepage": "https://snappymail.eu", "author": { "name": "DJ Maze", diff --git a/release.php b/release.php index ff3c8961d..e43fd8dd1 100755 --- a/release.php +++ b/release.php @@ -238,14 +238,22 @@ echo "{$zip_destination} created\n{$tar_destination}.gz created\n"; // Arch User Repository if ($options['aur']) { - $b2sums = extension_loaded('blake2') - ? [ - b2sum("{$tar_destination}.gz"), - b2sum(__DIR__ . '/arch/snappymail.sysusers'), - b2sum(__DIR__ . '/arch/snappymail.tmpfiles') - ] - : []; -/* + // extension_loaded('blake2') + if (!function_exists('b2sum') && $b2sum = trim(`which b2sum`)) { + function b2sum($file) { + $file = escapeshellarg($file); + exec("b2sum --binary {$file} 2>&1", $output, $exitcode); + $output = explode(' ', implode("\n", $output)); + return $output[0]; + } + } + + $b2sums = function_exists('b2sum') ? [ + b2sum("{$tar_destination}.gz"), + b2sum(__DIR__ . '/arch/snappymail.sysusers'), + b2sum(__DIR__ . '/arch/snappymail.tmpfiles') + ] : []; + file_put_contents('arch/.SRCINFO', 'pkgbase = snappymail pkgdesc = modern PHP webmail client pkgver = '.$package->version.' @@ -268,7 +276,7 @@ if ($options['aur']) { pkgname = snappymail '); -*/ + $file = __DIR__ . '/arch/PKGBUILD'; if (is_file($file)) { $PKGBUILD = file_get_contents($file);