Skip to content

Commit 532a19b

Browse files
committed
Merge branch 'release/5.0.5'
2 parents c5994f3 + fe3b837 commit 532a19b

File tree

3 files changed

+33
-17
lines changed

3 files changed

+33
-17
lines changed

CHANGELOG.md

+14-4
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
The changelog starts with version 5.0.4.
99
Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/fuse-nio-adapter/releases).
1010

11-
## [5.0.4] - 24-03-2025
11+
## [5.0.5] - 2025-04-09
12+
13+
### Changed
14+
15+
* Extend list of known libfuse locations in LinuxFuseMountProvider
16+
17+
### Fixed
18+
19+
* MountFailedException thrown when using with libfuse 3.17.1 (aka ABI version 4) ([#176](https://github.com/cryptomator/fuse-nio-adapter/issues/176))
20+
21+
## [5.0.4] - 2025-03-24
1222

1323
### Added
1424

15-
* changelog file
16-
* support libfuse3-4 on Linux (#174)
25+
* Changelog file
26+
* Support libfuse3-4 on Linux (#174)
1727

1828
### Changed
1929

20-
* switch build to JDK 23 (fe75b0a0e627ddb7196806cc7c56ece1ef268cc7)
30+
* Switch build to JDK 23 (fe75b0a0e627ddb7196806cc7c56ece1ef268cc7)
2131

pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>org.cryptomator</groupId>
66
<artifactId>fuse-nio-adapter</artifactId>
7-
<version>5.0.4</version>
7+
<version>5.0.5</version>
88
<name>FUSE-NIO-Adapter</name>
99
<description>Access resources at a given NIO path via FUSE.</description>
1010
<url>https://github.com/cryptomator/fuse-nio-adapter</url>
@@ -21,20 +21,20 @@
2121

2222
<!-- dependencies -->
2323
<integrations-api.version>1.5.1</integrations-api.version>
24-
<jfuse.version>0.7.1</jfuse.version>
24+
<jfuse.version>0.7.3</jfuse.version>
2525
<slf4j.version>2.0.17</slf4j.version>
2626
<caffeine.version>3.2.0</caffeine.version>
2727

2828
<!-- test dependencies -->
29-
<junit.jupiter.version>5.12.0</junit.jupiter.version>
30-
<mockito.version>5.16.0</mockito.version>
29+
<junit.jupiter.version>5.12.1</junit.jupiter.version>
30+
<mockito.version>5.17.0</mockito.version>
3131
<cryptofs.version>2.8.0</cryptofs.version>
3232

3333
<!-- build dependencies -->
3434
<mvn-sign.version>3.2.7</mvn-sign.version>
35-
<dependency-check.version>12.1.0</dependency-check.version>
35+
<dependency-check.version>12.1.1</dependency-check.version>
3636
<maven.deploy.version>3.1.4</maven.deploy.version>
37-
<jacoco.version>0.8.12</jacoco.version>
37+
<jacoco.version>0.8.13</jacoco.version>
3838
</properties>
3939

4040
<licenses>
@@ -190,7 +190,7 @@
190190
</plugin>
191191
<plugin>
192192
<artifactId>maven-surefire-plugin</artifactId>
193-
<version>3.5.2</version>
193+
<version>3.5.3</version>
194194
<configuration>
195195
<argLine>@{surefire.jacoco.args} -javaagent:"${org.mockito:mockito-core:jar}"</argLine>
196196
</configuration>

src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java

+12-6
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,18 @@ public class LinuxFuseMountProvider implements MountService {
4040
private static final Logger LOG = LoggerFactory.getLogger(LinuxFuseMountProvider.class);
4141
private static final Path USER_HOME = Paths.get(System.getProperty("user.home"));
4242
private static final String[] LIB_PATHS = {
43-
"/lib/x86_64-linux-gnu/libfuse3.so.3", // debian amd64
44-
"/lib/x86_64-linux-gnu/libfuse3.so.4", // debian amd64
45-
"/lib/aarch64-linux-gnu/libfuse3.so.3", // debian aarch64
46-
"/lib/aarch64-linux-gnu/libfuse3.so.4", // debian aarch64
47-
"/usr/lib64/libfuse3.so.3", // fedora
48-
"/usr/lib64/libfuse3.so.4", // fedora
43+
"/usr/lib/x86_64-linux-gnu/libfuse3.so.3", // ABI 3, ubuntu 24.10+, amd64
44+
"/usr/lib/x86_64-linux-gnu/libfuse3.so.4", // ABI 4, ubuntu 24.10+, amd64
45+
"/usr/lib/aarch64-linux-gnu/libfuse3.so.3", // ABI 3, ubuntu 24.10+, aarch64
46+
"/usr/lib/aarch64-linux-gnu/libfuse3.so.4", // ABI 4, ubuntu 24.10+, aarch64
47+
"/lib/x86_64-linux-gnu/libfuse3.so.3", // ABI 3, debian amd64
48+
"/lib/x86_64-linux-gnu/libfuse3.so.4", // ABI 4, debian amd64
49+
"/lib/aarch64-linux-gnu/libfuse3.so.3", // ABI 3, debian aarch64
50+
"/lib/aarch64-linux-gnu/libfuse3.so.4", // ABI 4, debian aarch64
51+
"/usr/lib64/libfuse3.so.3", // ABI 3, fedora
52+
"/usr/lib64/libfuse3.so.4", // ABI 4, fedora
53+
"/usr/lib/libfuse3.so.3", // ABI 3, ArchLinux
54+
"/usr/lib/libfuse3.so.4", // ABI 4, ArchLinux
4955
"/app/lib/libfuse3.so" // flatpak
5056
};
5157
private static final String UNMOUNT_CMD_NAME = "fusermount3";

0 commit comments

Comments
 (0)