colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Colin
2024-08-21 10:20:09 +00:00
parent 04c41f6045
commit e78907b88b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

12
pkgs/additional/curlftpfs-sane/default.nix
View File

@@ -1,9 +1,21 @@
{ {
curl,
curlftpfs, curlftpfs,
fetchpatch,
fetchFromGitea, fetchFromGitea,
fuse3, fuse3,
}: }:
(curlftpfs.override { (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; fuse = fuse3;
}).overrideAttrs (upstream: { }).overrideAttrs (upstream: {
# my (master branch) fork includes: # my (master branch) fork includes: