roundcube: 1.3.10 -> 1.4.0

https://roundcube.net/news/2019/11/09/roundcube-1.4.0-released

* `curl` cmd in the test can fail as roundcube returns a http/401 if
  unauthorized (and we're explicitly requesting the login form). By
  checking if the `persistent_login` plugin is loaded, the assertion is
  still valid)

* Use `$argv[0]` to determine install path in the installer script. I'm
  not exactly sure why, but it seems as `__DIR__` now resolves symlinks
  which breaks the installer if roundcube is in a `buildEnv` with
  third-party plugins.
This commit is contained in:
Maximilian Bosch 2019-11-10 18:24:57 +01:00
parent 04d63387a4
commit d75c296dc2
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
3 changed files with 4 additions and 4 deletions

View file

@ -25,6 +25,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
roundcube.wait_for_unit("postgresql.service")
roundcube.wait_for_unit("phpfpm-roundcube.service")
roundcube.wait_for_unit("nginx.service")
roundcube.succeed("curl -sSfL http://roundcube/ | grep 'Keep me logged in'")
roundcube.succeed("curl -sSL http://roundcube/ | grep 'Keep me logged in'")
'';
})

View file

@ -18,7 +18,7 @@ index 08e3bb5..b2ad498 100755
*/
-define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
+define('INSTALL_PATH', __DIR__ . '/../' );
+define('INSTALL_PATH', dirname(dirname($argv[0])).'/');
require_once INSTALL_PATH . 'program/include/clisetup.php';

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "roundcube";
version = "1.3.10";
version = "1.4.0";
src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "1gx8dgrr3p6fksv3pm381a080i9r6snwcmfd1q112mqg19ai3zk9";
sha256 = "0b7gc342z0smn7q6cnznj9ncal0515ki4kkq1hlmqmyn0nna5lkb";
};
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];