Commit Graph

10355 Commits

Author SHA1 Message Date
MollyM
6bd310decf
License update to dual MIT and Apache 2
This series of commits aims to update go-ipfs to follow a dual-licensing best practice based on research into open-source licensing by @ianjdarrow. He recommends a dual MIT and Apache 2.0 license -

> This has two major benefits:

> - There are concerns in the open source community about whether the MIT license leaves users vulnerable to patent infringement claims. We think the pure legal risk is small, but the way the open source community interacts with our project is really important. It makes sense to pick the license that makes the largest number of people comfortable.
- There's now no reason to adopt a separate DCO, since the Apache-2 license grant addresses the same issue.

> Why use a dual license, instead of just Apache-2? The Apache-2 license is incompatible with the GPLv2 license, which includes things like the Linux kernel. With a dual license, GPLv2 projects can just use the MIT license instead. Our goal is to make our software available to as many projects as possible, so we'd rather adopt a licensing scheme that doesn't exclude anyone.

In addition to these commits, we also need to get an explicit OK from current and past contributors to give their consent to relicensing - which will happen in an issue thread.
2019-05-06 10:56:15 -07:00
Steven Allen
7e9eb72bfc
Merge pull request #6293 from cbuesser/go-test-fix
Go test fix
2019-05-02 17:03:06 -07:00
Christopher Buesser
5ce2deb5fc Test Fix: Nil error handling
In TestExternalUnmount, the Mount function is called which returns an
error which can be nil. The error type is then used in a comparison
where Error() is called on it. If the error is nil, this results in a
panic.

Added a if err != nil {} guard to make sure that Error() is not called
if the value is nil
 On branch go-test-fix
 Changes to be committed:
	modified:   fuse/node/mount_test.go
License: MIT
Signed-off-by: Chris Buesser <christopher.buesser@gmail.com>
2019-05-02 19:43:46 -04:00
Christopher Buesser
93806601d1 Test Fix: nil pointer error for core.NewNode
This commit fixes the errors resulting from passing a nil pointer to the
core.NewNode function in TestExternalUnmmount and setupIpnsTest.

In the previous nil's place a &core.BuildCfg{} is now passed.

Both changes follow the same pattern:

```diff
-  node, err = core.NewNode(context.Background(), nil)
+  node, err = core.NewNode(context.Background(), &core.BuildCfg{})
```

 On branch go-test-fix
 Changes to be committed:
	modified:   fuse/ipns/ipns_test.go
	modified:   fuse/node/mount_test.go
License: MIT
Signed-off-by: Chris Buesser <christopher.buesser@gmail.com>
2019-05-02 19:30:36 -04:00
Steven Allen
5fd5d44479
Merge pull request #6275 from ipfs/fix/6269-a
commands(pin update): return resolved CIDs instead of paths
2019-05-02 09:35:02 -07:00
Steven Allen
af8edb064a
Merge pull request #6289 from ipfs/fix/auto-nat-service
core: fix autonat construction
2019-05-01 19:22:29 -07:00
Steven Allen
b57956c5fb core: fix autonat construction
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-05-01 15:21:29 -07:00
Steven Allen
648fa3aac7
Merge pull request #6288 from ipfs/fix/6252
Test and fix GC/pin bug
2019-05-01 14:35:53 -07:00
Erik Ingenito
4427d7e8e3 Test and fix GC/pin bug #6252
License: MIT
Signed-off-by: Erik Ingenito <erik.ingenito@protocol.ai>
2019-05-01 14:25:31 -07:00
Steven Allen
a59b93b078
Merge pull request #6285 from ipfs/dep/update-go-ipfs-config
dep: update go-ipfs-config
2019-05-01 13:53:16 -07:00
Steven Allen
59370f890b dep: import goprocess into go modules
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-05-01 12:43:26 -07:00
Steven Allen
0defe54899 dep: update go-ipfs-config
fixes #6284

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-05-01 12:43:04 -07:00
Steven Allen
0f53ad0971
Merge pull request #6282 from cbuesser/go-version-check
GOCC implementation & fix in make & build scripts
2019-04-30 20:03:11 -07:00
Christopher Buesser
f31dd2aae6 GOCC implementation & fix in make & build scripts
The usage of a native 'go' command has been replaced with a make &
environment variable $GOCC. This enables building with multiple go
versions on a single machine as documented:
  * https://golang.org/doc/install#extra_versions

This enables the usage of:
```bash
$ make install
$ # OR
$ GOCC=go1.12.3 make install
$ # OR
$ GOCC=go1.12.4 make install
```
And the build and test tools now pick up on this change

 On branch go-version-check
 Changes to be committed:
	modified:   Rules.mk
	modified:   bin/check_go_version
	modified:   bin/dist_get
	modified:   bin/maketarball.sh
	modified:   coverage/Rules.mk
	modified:   mk/golang.mk
	modified:   mk/tarball.mk
License: MIT
Signed-off-by: Chris Buesser <christopher.buesser@gmail.com>
2019-04-30 21:22:43 -04:00
Steven Allen
64744521cb
Merge pull request #6281 from ipfs/fix/6279
gc: cancel context
2019-04-30 12:35:56 -07:00
Steven Allen
223cae0f9c gc: cancel context
We were canceling the context in `GarbageCollect` but some functions call `GC`
directly. Move the context cancelation down to where we actually _need_ it.

fixes #6279

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-30 12:09:08 -07:00
Steven Allen
832077b0e8
Merge pull request #6280 from ipfs/dep/update-multistream
dep: update multistream
2019-04-30 11:10:14 -07:00
Steven Allen
aea5b9ffd7 dep: update multistream
Reduce lock contention

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-30 10:56:45 -07:00
Steven Allen
807f45eb11
Merge pull request #6278 from ipfs/windows-friendly-deamon-help
fix: windows friendly daemon help
2019-04-30 09:07:58 -07:00
Oli Evans
be5d5fdca6
fix: windows friendly daemon help
tweak the daemon --help output to use escaped double quotes instead
of single quotes so the same command can be used on windows.

fixes: #2034

License: MIT
Signed-off-by: Oli Evans <oli@tableflip.io>
2019-04-30 09:26:09 +01:00
Steven Allen
dd16b3ca1c
Merge pull request #6276 from ipfs/feat/core-cfg-handling
Invert constructor config handling
2019-04-29 16:09:16 -07:00
Łukasz Magiera
e133058487 constructor: break down libp2p logic
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
2019-04-30 00:09:42 +02:00
Łukasz Magiera
3a12454c95 constructor: libp2p simpleOpts
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
2019-04-29 23:45:00 +02:00
Łukasz Magiera
ed514b9177 Invert constructor config handling
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
2019-04-29 23:37:37 +02:00
Steven Allen
2713490304 commands(pin update): return resolved CIDs instead of paths
fixes #6269

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-29 13:38:08 -07:00
Steven Allen
92c88b0a7d
Merge pull request #6268 from ipfs/doc/environment
docs: document environment variables
2019-04-29 09:32:59 -07:00
Łukasz Magiera
9bcf072ccb WIP cleanup config handling in core
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
2019-04-29 17:43:26 +02:00
Steven Allen
6b72593bc0
Merge pull request #6273 from ipfs/dep/update-libp2p
dep: update go-libp2p
2019-04-28 13:05:03 -07:00
Steven Allen
88e96ec321 dep: update go-libp2p
1. Reduces lock contention in the peerstore.
2. Fixes an ancient secio bug.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-28 12:50:16 -07:00
Steven Allen
0189ff820f
Merge pull request #6270 from ipfs/dep/update-multihash
dep: drop leb.io/hashland
2019-04-27 12:55:38 -07:00
Steven Allen
5e28d489ab
Merge pull request #6272 from ipfs/fix/add/fileerr
add: Return error from iterator
2019-04-27 12:55:17 -07:00
Łukasz Magiera
6ffdce8abf add: return error from iterator
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
2019-04-27 18:10:38 +02:00
Steven Allen
dc4c76d9cf dep: drop leb.io/hashland
Instead, golang's keccak and spaolacci's murmur3 (both of which are maintained).

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-26 15:58:09 -07:00
Steven Allen
4aa7076e64 docs: document environment variables
fixes #5828

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-26 13:59:57 -07:00
Steven Allen
c79245a458 doc: mplex is now stabl
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-26 13:59:42 -07:00
Steven Allen
fc1832f982
Merge pull request #6267 from ipfs/dep/update
dep: update many
2019-04-26 12:57:38 -07:00
Steven Allen
2881809047 dep: update many
* go-ipfs-files: fixes some bugs with WebFile.
* go-unixfs: update murmur3.
* go-libp2p-connmgr: update for peer protection feature.
* base58: reduce allocations from 3 to 2.
* golang.org/x/...: upstream updates.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-26 12:33:43 -07:00
Steven Allen
3ffbdfd942
Merge pull request #6259 from ipfs/feat/urlstore-coreapi
commands(feat): use the coreapi in the urlstore command
2019-04-26 12:23:05 -07:00
Steven Allen
39513c6e72 commands(feat): log when invoking deprecated urlstore command
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-26 10:45:08 -07:00
Steven Allen
d140a68982 commands(feat): remove redundant urlstore check
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-26 09:59:42 -07:00
Steven Allen
6e5c2515b4
Merge pull request #6258 from myself659/bitswap-stat-human
humanize for ipfs bitswap stat
2019-04-26 02:55:47 -07:00
myself659
63e18dac8d humanize for ipfs bitswap stat
License: MIT
Signed-off-by: Eric Wu <myself659@163.com>
2019-04-26 02:54:48 -07:00
Steven Allen
9e973e52bc
Merge pull request #6263 from ipfs/fix/6197
attempt to fix concurrent websocket write
2019-04-26 02:53:18 -07:00
Steven Allen
4bd5ba3273
Merge pull request #6265 from ipfs/revert-6261-fix/fd-limit
Revert "raise default fd limit to 8192"
2019-04-26 02:50:51 -07:00
Steven Allen
a0fe27816a
Revert "raise default fd limit to 8192" 2019-04-26 02:50:36 -07:00
Steven Allen
8952a0d763
Merge pull request #6261 from ipfs/fix/fd-limit
raise default fd limit to 8192
2019-04-26 02:50:20 -07:00
Steven Allen
f3c6b5c57c attempt to fix concurrent websocket write
Unfortunately, I can't reproduce the bug locally and I'm not sure if my fix is
correct. But it shouldn't hurt.

might fix #6197

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-26 02:36:31 -07:00
Steven Allen
8ec386117b raise default fd limit to 8192
fixes #6247

Really, we need a global _resource_ manager service that can sum requests from
the datastore, libp2p, etc. for more file descriptors. However, we don't have
that.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-25 23:16:55 -07:00
Steven Allen
8beaee63b3 commands(chore): deprecate urlstore command
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-25 17:18:51 -07:00
Steven Allen
467beea940 commands(feat): use the coreapi in the urlstore command
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2019-04-25 17:15:07 -07:00