curlftpfs: remove -o interface... option and patch curl instead

This commit is contained in:
2024-08-21 10:20:09 +00:00
parent 04c41f6045
commit e78907b88b
2 changed files with 12 additions and 2 deletions

View File

@@ -183,7 +183,6 @@ let
# drop_privileges: after `mount.fuse3` opens /dev/fuse, it will drop all capabilities before invoking sshfs
"drop_privileges"
"auto_unmount" #< ensures that when the fs exits, it releases its mountpoint. then systemd can recognize it as failed.
"interface=0.0.0.0" #< see: <https://github.com/curl/curl/discussions/14299>
];
# fsType = "nfs";
# options = fsOpts.nfs ++ fsOpts.lazyMount;
@@ -243,7 +242,6 @@ let
"-o"
(lib.concatStringsSep "," ([
"exit_after_connect"
"interface=0.0.0.0" #< see: <https://github.com/curl/curl/discussions/14299>
] ++ config.fileSystems."${localPath}".options))
];
serviceConfig.RemainAfterExit = true;

View File

@@ -1,9 +1,21 @@
{
curl,
curlftpfs,
fetchpatch,
fetchFromGitea,
fuse3,
}:
(curlftpfs.override {
curl = curl.overrideAttrs (base: {
patches = (base.patches or []) ++ [
(fetchpatch {
# fix regression in curl 8.8.0 -> 8.9.0 which broke curlftpfs
url = "https://github.com/curl/curl/pull/14629.diff";
name = "setopt: allow CURLOPT_INTERFACE to be set to NULL";
hash = "sha256-cpiw0izhFY74y8xa7KEoQOtD79GBIfrm1hU3sLrObJg=";
})
];
});
fuse = fuse3;
}).overrideAttrs (upstream: {
# my (master branch) fork includes: