From 0c6a3882a27483f0fd9f5196be7cf3e2836f6654 Mon Sep 17 00:00:00 2001 From: Takeshi Nakatani Date: Sun, 28 May 2017 10:04:25 +0000 Subject: [PATCH 1/4] Fixed clock_gettime build failure on macOS 10.12 Sierra - #600 --- src/cache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cache.cpp b/src/cache.cpp index 4856d23..e6d3a81 100644 --- a/src/cache.cpp +++ b/src/cache.cpp @@ -59,7 +59,7 @@ using namespace std; #ifdef HAVE_CLOCK_GETTIME static int s3fs_clock_gettime(int clk_id, struct timespec* ts) { - return clock_gettime(clk_id, ts); + return clock_gettime(static_cast(clk_id), ts); } #else static int s3fs_clock_gettime(int clk_id, struct timespec* ts) From 98b724391fe00716af4764be17b857c31d2f14a5 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sun, 9 Jul 2017 22:41:39 -0700 Subject: [PATCH 2/4] Upgrade to S3Proxy 1.5.3 Release notes: https://github.com/andrewgaul/s3proxy/releases/tag/s3proxy-1.5.3 --- test/integration-test-common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration-test-common.sh b/test/integration-test-common.sh index 2a66f00..b5d339c 100644 --- a/test/integration-test-common.sh +++ b/test/integration-test-common.sh @@ -50,7 +50,7 @@ export S3_URL export TEST_SCRIPT_DIR=`pwd` export TEST_BUCKET_MOUNT_POINT_1=${TEST_BUCKET_1} -S3PROXY_VERSION="1.5.2" +S3PROXY_VERSION="1.5.3" S3PROXY_BINARY=${S3PROXY_BINARY-"s3proxy-${S3PROXY_VERSION}"} if [ ! -f "$S3FS_CREDENTIALS_FILE" ] From cd94f638e26f9d9be4c2da37d93e673cfdbadf94 Mon Sep 17 00:00:00 2001 From: swordsreversed Date: Mon, 31 Jul 2017 21:23:08 +1000 Subject: [PATCH 3/4] Update README.md Add fuse as a dependency! --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 061ebe3..4b2cc79 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Installation On Ubuntu 14.04: ``` -sudo apt-get install automake autotools-dev g++ git libcurl4-gnutls-dev libfuse-dev libssl-dev libxml2-dev make pkg-config +sudo apt-get install automake fuse autotools-dev g++ git libcurl4-gnutls-dev libfuse-dev libssl-dev libxml2-dev make pkg-config ``` On CentOS 7: From bc09129ec574c7f6fc86003bbecf7ecc9ec53418 Mon Sep 17 00:00:00 2001 From: swordsreversed Date: Tue, 1 Aug 2017 10:20:46 +1000 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b2cc79..823aef5 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Installation On Ubuntu 14.04: ``` -sudo apt-get install automake fuse autotools-dev g++ git libcurl4-gnutls-dev libfuse-dev libssl-dev libxml2-dev make pkg-config +sudo apt-get install automake autotools-dev fuse g++ git libcurl4-gnutls-dev libfuse-dev libssl-dev libxml2-dev make pkg-config ``` On CentOS 7: