From 8311ffa10df909619560b9831d08d8e5dc83bb54 Mon Sep 17 00:00:00 2001 From: zramsay Date: Sat, 6 Aug 2016 23:28:16 +0100 Subject: [PATCH 1/5] boot2docker-cli is deprecated, removed from README - Docker for Mac/Windows is out of beta - docker-machine is recommended for unsupported machines License: MIT Signed-off-by: Zach Ramsay --- README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/README.md b/README.md index 666ad785b74..4c69609aa53 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,6 @@ Please put all issues regarding the Go IPFS _implementation_ in [this repo](http - [Getting Started](#getting-started) - [Some things to try](#some-things-to-try) - [Docker usage](#docker-usage) - - [Docker usage with VirtualBox/boot2docker (OSX and Windows)](#docker-usage-with-virtualboxboot2docker-osx-and-windows) - [Troubleshooting](#troubleshooting-1) - [Todo](#todo) - [Contributing](#contributing) @@ -246,14 +245,6 @@ Stop the running container: docker stop ipfs_host -#### Docker usage with VirtualBox/boot2docker (OSX and Windows) - -Since docker is running in the boot2docker VM, you need to forward -relevant ports from the VM to your host for IPFS to act normally. This is -accomplished with the following command: - - boot2docker ssh -L 5001:localhost:5001 -L 4001:localhost:4001 -L 8080:localhost:8080 -fN - ### Troubleshooting If you have previously installed IPFS before and you are running into problems getting a newer version to work, try deleting (or backing up somewhere From c5d4369ad5078e5459a576b1cba19ba7dc14dc99 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sun, 7 Aug 2016 09:24:17 -0700 Subject: [PATCH 2/5] commands: fix panic when stdin is empty for string args License: MIT Signed-off-by: Jeromy --- commands/request.go | 6 ++++++ test/sharness/t0050-block.sh | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/commands/request.go b/commands/request.go index 05b90b965c4..8b5088b824d 100644 --- a/commands/request.go +++ b/commands/request.go @@ -240,13 +240,19 @@ func (r *request) VarArgs(f func(string) error) error { return err } + var any bool scan := bufio.NewScanner(fi) for scan.Scan() { + any = true err := f(scan.Text()) if err != nil { return err } } + if !any { + return f("") + } + return nil } diff --git a/test/sharness/t0050-block.sh b/test/sharness/t0050-block.sh index 8753322e0e7..c4f00e04888 100755 --- a/test/sharness/t0050-block.sh +++ b/test/sharness/t0050-block.sh @@ -39,4 +39,12 @@ test_expect_success "'ipfs block get' output looks good" ' test_cmp expected_stat actual_stat ' +test_expect_success "'ipfs block stat' with nothing from stdin doesnt crash" ' + test_expect_code 1 ipfs block stat < /dev/null 2> stat_out +' + +test_expect_success "no panic in output" ' + test_expect_code 1 grep "panic" stat_out +' + test_done From 5efacaa3dd892d1be5b84219bbbaa768913735c2 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Tue, 9 Aug 2016 16:25:36 -0700 Subject: [PATCH 3/5] update changelog License: MIT Signed-off-by: Jeromy --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d75115d015..1b63083c341 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # go-ipfs changelog +### 0.4.3-rc3 - 2016-08-09 + +This release candidate fixes a panic that occurs when input from stdin was +expected, but none was given: [ipfs/go-ipfs#3050](https://github.com/ipfs/go-ipfs/pull/3050) + ### 0.4.3-rc2 - 2016-07-23 This release includes bugfixes and fixes for regressions that were introduced From 0911c6e74c1b6442f7b9001dad0d0d1555b25959 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Tue, 9 Aug 2016 19:22:46 -0700 Subject: [PATCH 4/5] ipfs version 0.4.3-rc3 License: MIT Signed-off-by: Jeromy --- package.json | 2 +- repo/config/version.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index aae2ba59ac5..557d0e7aa4b 100644 --- a/package.json +++ b/package.json @@ -195,5 +195,5 @@ "language": "go", "license": "MIT", "name": "go-ipfs", - "version": "0.4.3-rc2" + "version": "0.4.3-rc3" } diff --git a/repo/config/version.go b/repo/config/version.go index 325b58b1084..476ec448a00 100644 --- a/repo/config/version.go +++ b/repo/config/version.go @@ -4,6 +4,6 @@ package config var CurrentCommit string // CurrentVersionNumber is the current application's version literal -const CurrentVersionNumber = "0.4.3-rc2" +const CurrentVersionNumber = "0.4.3-rc3" const ApiVersion = "/go-ipfs/" + CurrentVersionNumber + "/" From 5325e2e3092698f6b27a2715af02189f0d3b6a26 Mon Sep 17 00:00:00 2001 From: MrSparc Date: Fri, 12 Aug 2016 16:53:04 +0100 Subject: [PATCH 5/5] bin: dist_get script: prevents get_go_vars() returns same values twice License: MIT Signed-off-by: MrSparc --- bin/dist_get | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/dist_get b/bin/dist_get index 0f0cdb206be..e70754a8580 100755 --- a/bin/dist_get +++ b/bin/dist_get @@ -75,9 +75,7 @@ unarchive() { get_go_vars() { if [ ! -z "$GOOS" ] && [ ! -z "$GOARCH" ]; then printf "%s-%s" "$GOOS" "$GOARCH" - fi - - if have_binary go; then + elif have_binary go; then printf "%s-%s" "$(go env GOOS)" "$(go env GOARCH)" else die "no way of determining system GOOS and GOARCH\nPlease manually set GOOS and GOARCH then retry."