diff --git a/Cargo.toml b/Cargo.toml index 2febf448b..e64899848 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "fuser" +name = "mountpoint-s3-fuser" description = "Filesystem in Userspace (FUSE) for Rust" license = "MIT" -repository = "https://github.com/cberner/fuser" +repository = "https://github.com/awslabs/mountpoint-s3/tree/fuser/fork" documentation = "https://docs.rs/fuser" -homepage = "https://github.com/cberner/fuser" +homepage = "https://github.com/awslabs/mountpoint-s3/tree/fuser/fork" version = "0.15.1" edition = "2021" readme = "README.md" diff --git a/README.md b/README.md index 3807c7201..b9b7c1578 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This is a fork of the excellent [`fuser`](https://github.com/cberner/fuser) Rust This fork should be maintained in the `fuser/fork` branch of the [awslabs/mountpoint-s3 repository on GitHub](https://github.com/awslabs/mountpoint-s3/tree/main/vendor/fuser). -To pull in new changes from upstream, you should fetch and rebase the changes locally and then force push to the `fuser/fork` branch (- not ideal!). +To pull in new changes from upstream, you should fetch the original and rebase the changes locally onto the latest [tag](https://github.com/cberner/fuser/tags) and then force push to the `fuser/fork` branch (- not ideal!). Once the `fuser/fork` branch is as desired, create a new branch from Mountpoint's `main` branch. Run the [`vendor-fuser.sh` script](https://github.com/awslabs/mountpoint-s3/blob/main/vendor-fuser.sh). You should open a pull request with the new commit created by the script. diff --git a/mountpoint-s3-crt-sys/crt/aws-c-auth b/mountpoint-s3-crt-sys/crt/aws-c-auth new file mode 160000 index 000000000..b513db4bf --- /dev/null +++ b/mountpoint-s3-crt-sys/crt/aws-c-auth @@ -0,0 +1 @@ +Subproject commit b513db4bf82429a1134fecbd6d12e5fda45255a6 diff --git a/mountpoint-s3-crt-sys/crt/aws-c-cal b/mountpoint-s3-crt-sys/crt/aws-c-cal new file mode 160000 index 000000000..7299c6ab9 --- /dev/null +++ b/mountpoint-s3-crt-sys/crt/aws-c-cal @@ -0,0 +1 @@ +Subproject commit 7299c6ab9244595b140d604475cdd6c6921be8ae diff --git a/mountpoint-s3-crt-sys/crt/aws-c-common b/mountpoint-s3-crt-sys/crt/aws-c-common new file mode 160000 index 000000000..0e7637fa8 --- /dev/null +++ b/mountpoint-s3-crt-sys/crt/aws-c-common @@ -0,0 +1 @@ +Subproject commit 0e7637fa852a472bd4c37fc07a325a09c942a5fc diff --git a/mountpoint-s3-crt-sys/crt/aws-c-compression b/mountpoint-s3-crt-sys/crt/aws-c-compression new file mode 160000 index 000000000..f951ab2b8 --- /dev/null +++ b/mountpoint-s3-crt-sys/crt/aws-c-compression @@ -0,0 +1 @@ +Subproject commit f951ab2b819fc6993b6e5e6cfef64b1a1554bfc8 diff --git a/mountpoint-s3-crt-sys/crt/aws-c-http b/mountpoint-s3-crt-sys/crt/aws-c-http new file mode 160000 index 000000000..590c7b597 --- /dev/null +++ b/mountpoint-s3-crt-sys/crt/aws-c-http @@ -0,0 +1 @@ +Subproject commit 590c7b597f87e5edc080b8b77418690c30319832 diff --git a/mountpoint-s3-crt-sys/crt/aws-c-io b/mountpoint-s3-crt-sys/crt/aws-c-io new file mode 160000 index 000000000..3041dabfc --- /dev/null +++ b/mountpoint-s3-crt-sys/crt/aws-c-io @@ -0,0 +1 @@ +Subproject commit 3041dabfc13fe9bc9a0467e15aa1d5a09c7fc06f diff --git a/mountpoint-s3-crt-sys/crt/aws-c-s3 b/mountpoint-s3-crt-sys/crt/aws-c-s3 new file mode 160000 index 000000000..6eb8be530 --- /dev/null +++ b/mountpoint-s3-crt-sys/crt/aws-c-s3 @@ -0,0 +1 @@ +Subproject commit 6eb8be530b100fed5c6d24ca48a57ee2e6098fbf diff --git a/mountpoint-s3-crt-sys/crt/aws-c-sdkutils b/mountpoint-s3-crt-sys/crt/aws-c-sdkutils new file mode 160000 index 000000000..ba6a28fab --- /dev/null +++ b/mountpoint-s3-crt-sys/crt/aws-c-sdkutils @@ -0,0 +1 @@ +Subproject commit ba6a28fab7ed5d7f1b3b1d12eb672088be093824 diff --git a/mountpoint-s3-crt-sys/crt/aws-checksums b/mountpoint-s3-crt-sys/crt/aws-checksums new file mode 160000 index 000000000..fb8bd0b8c --- /dev/null +++ b/mountpoint-s3-crt-sys/crt/aws-checksums @@ -0,0 +1 @@ +Subproject commit fb8bd0b8cff00c8c24a35d601fce1b4c611df6da diff --git a/mountpoint-s3-crt-sys/crt/aws-lc b/mountpoint-s3-crt-sys/crt/aws-lc new file mode 160000 index 000000000..138a6ad35 --- /dev/null +++ b/mountpoint-s3-crt-sys/crt/aws-lc @@ -0,0 +1 @@ +Subproject commit 138a6ad356adc933fad0f1c65b85da18982ee351 diff --git a/mountpoint-s3-crt-sys/crt/s2n-tls b/mountpoint-s3-crt-sys/crt/s2n-tls new file mode 160000 index 000000000..6cc9f53d7 --- /dev/null +++ b/mountpoint-s3-crt-sys/crt/s2n-tls @@ -0,0 +1 @@ +Subproject commit 6cc9f53d7ab5f0427ae5f838891fff57844a9e3f diff --git a/mountpoint-s3-fuser b/mountpoint-s3-fuser new file mode 160000 index 000000000..df283c15b --- /dev/null +++ b/mountpoint-s3-fuser @@ -0,0 +1 @@ +Subproject commit df283c15b57084cc4e3cfcecb03e63a099a20626