From b00dee30aa9095463e409b142d1b983b845733ad Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 25 Sep 2023 12:31:49 +0200 Subject: [PATCH 1/5] bump test dependency cryptofs to 2.6.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2000768..161e83f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 5.10.0 5.4.0 - 2.6.6 + 2.6.7 8.3.1 From ebc3102e56b64c0e312308b0dbf646f8586e429f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20M=C3=A9meint?= Date: Wed, 27 Sep 2023 11:20:58 +0200 Subject: [PATCH 2/5] Do not set lib path if not found in the verified paths --- .../frontend/fuse/mount/LinuxFuseMountProvider.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java b/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java index c62c204..8c5fffa 100644 --- a/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java +++ b/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java @@ -55,7 +55,7 @@ public String displayName() { @Override public boolean isSupported() { - return Arrays.stream(LIB_PATHS).map(Path::of).anyMatch(Files::exists) && isFusermount3Installed(); + return isFusermount3Installed(); } private boolean isFusermount3Installed() { @@ -115,9 +115,8 @@ public Mount mount() throws MountFailedException { Objects.requireNonNull(mountPoint); Objects.requireNonNull(mountFlags); - var libPath = Arrays.stream(LIB_PATHS).map(Path::of).filter(Files::exists).map(Path::toString).findAny().orElseThrow(); var builder = Fuse.builder(); - builder.setLibraryPath(libPath); + Arrays.stream(LIB_PATHS).map(Path::of).filter(Files::exists).map(Path::toString).findAny().ifPresent(builder::setLibraryPath); if (mountFlags.contains("-oallow_other") || mountFlags.contains("-oallow_root")) { LOG.warn("Mounting with flag -oallow_other or -oallow_root. Ensure that in /etc/fuse.conf option user_allow_other is enabled."); } From 2d9c9c9880848ea8bceaeebc23e123254d107905 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 28 Sep 2023 10:46:48 +0200 Subject: [PATCH 3/5] build using JDK 21 GA --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/publish-central.yml | 2 +- .github/workflows/publish-github.yml | 2 +- .idea/misc.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e79b25..b25a64c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - java-version: 21-ea + java-version: 21 distribution: 'zulu' cache: 'maven' - name: Ensure to use tagged version diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 893923f..943a345 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -20,7 +20,7 @@ jobs: fetch-depth: 2 - uses: actions/setup-java@v3 with: - java-version: 20 + java-version: 21 distribution: 'zulu' cache: 'maven' - name: Initialize CodeQL diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml index 1ebe0c4..84c6075 100644 --- a/.github/workflows/publish-central.yml +++ b/.github/workflows/publish-central.yml @@ -15,7 +15,7 @@ jobs: ref: "refs/tags/${{ github.event.inputs.tag }}" - uses: actions/setup-java@v3 with: - java-version: 21-ea + java-version: 21 distribution: 'zulu' cache: 'maven' server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml index d28dbb3..93cd14b 100644 --- a/.github/workflows/publish-github.yml +++ b/.github/workflows/publish-github.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - java-version: 21-ea + java-version: 21 distribution: 'zulu' cache: 'maven' gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import diff --git a/.idea/misc.xml b/.idea/misc.xml index d0cb5cf..7fb4876 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file From 4c40fbe0cd871045bd8d029b55abbde44ca25942 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 28 Sep 2023 11:32:52 +0200 Subject: [PATCH 4/5] bump jfuse to 0.6.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c73de60..91d72e7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 1.3.0 - 0.6.0 + 0.6.2 2.0.7 3.1.7 From b9b85c5c5ba0a86389cc23dca1267681409c20ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20M=C3=A9meint?= Date: Thu, 28 Sep 2023 13:40:18 +0200 Subject: [PATCH 5/5] Remove `/usr/lib/libfuse3.so` from hardcoded list --- .../cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java b/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java index 8c5fffa..158052e 100644 --- a/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java +++ b/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java @@ -40,7 +40,6 @@ public class LinuxFuseMountProvider implements MountService { private static final Logger LOG = LoggerFactory.getLogger(LinuxFuseMountProvider.class); private static final Path USER_HOME = Paths.get(System.getProperty("user.home")); private static final String[] LIB_PATHS = { - "/usr/lib/libfuse3.so", // default "/lib/x86_64-linux-gnu/libfuse3.so.3", // debian amd64 "/lib/aarch64-linux-gnu/libfuse3.so.3", // debian aarch64 "/usr/lib64/libfuse3.so.3", // fedora