Unverified Commit c7c2cce1 authored by Pascal Bach's avatar Pascal Bach Committed by GitHub
Browse files

cryptomator: 1.18.1 -> 1.19.2, fix 2 CVEs (#499542)

parents f2471f58 62423feb

pkgs/by-name/cr/cryptomator/downgrade-fuse.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/pom.xml b/pom.xml

index fdaf9b328..2dbc69fb8 100644

--- a/pom.xml

+++ b/pom.xml

@@ -39,7 +39,7 @@

 		<cryptomator.integrations.win.version>1.6.0</cryptomator.integrations.win.version>

 		<cryptomator.integrations.mac.version>1.5.0</cryptomator.integrations.mac.version>

 		<cryptomator.integrations.linux.version>1.7.0</cryptomator.integrations.linux.version>

-		<cryptomator.fuse.version>6.0.1</cryptomator.fuse.version>

+		<cryptomator.fuse.version>5.1.0</cryptomator.fuse.version>

 		<cryptomator.webdav.version>3.0.1</cryptomator.webdav.version>

 		<cryptomator.webdav-servlet.version>1.2.12</cryptomator.webdav-servlet.version>

pkgs/by-name/cr/cryptomator/package.nix

+15 −3
Original line number Diff line number Diff line
@@ -17,18 +17,30 @@ let 
in

maven.buildMavenPackage rec {

  pname = "cryptomator";

  version = "1.18.1";

  version = "1.19.2";



  src = fetchFromGitHub {

    owner = "cryptomator";

    repo = "cryptomator";

    tag = version;

    hash = "sha256-C2pvToxIK8gPzmqcRKYCu4B2FBrOGcH2Uzpjdt3nZZs=";

    hash = "sha256-9JWZaTsL2sfnGQAZI56T2iQnTNhERsFNFFCeLMB7WC0=";

  };



  patches = [

    # fix for "java.lang.IllegalStateException: No fuse library found at expected path"

    ./downgrade-fuse.patch

  ];



  mvnJdk = jdk;

  mvnParameters = "-Dmaven.test.skip=true -Plinux";

  mvnHash = "sha256-dOpvojr6gVtDFE52eghOVZWGspRLQrTDotOMkVGaG9k=";

  mvnHash = "sha256-IVOcDFW5YKgUHJKX3ZXYVnOevwmOwN5yEU8jfPtCY1I=";

  mvnFetchExtraArgs.env = {

    inherit SOURCE_DATE_EPOCH;

  };



  # fix for "date 1980-01-01T00:00:00Z is not within the valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z"

  # this should be in env, but looks like buildMavenPackage doesn't support that

  SOURCE_DATE_EPOCH = 315532802; # 1980-01-01T00:00:02Z



  preBuild = ''

    VERSION=${version}