Skip to content

Commit db17b31

Browse files
authored
Merge pull request libgit2#4789 from pks-t/pks/licensing
docs: clarify and include licenses of dependencies
2 parents 0bcb1d5 + 2e0f926 commit db17b31

File tree

6 files changed

+2036
-3
lines changed

6 files changed

+2036
-3
lines changed

deps/regex/COPYING

Lines changed: 502 additions & 0 deletions
Large diffs are not rendered by default.

deps/winhttp/COPYING.GPL

Lines changed: 993 additions & 0 deletions
Large diffs are not rendered by default.

deps/winhttp/COPYING.LGPL

Lines changed: 502 additions & 0 deletions
Large diffs are not rendered by default.

deps/zlib/COPYING

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
2+
3+
This software is provided 'as-is', without any express or implied
4+
warranty. In no event will the authors be held liable for any
5+
damages arising from the use of this software.
6+
7+
Permission is granted to anyone to use this software for any
8+
purpose, including commercial applications, and to alter it and
9+
redistribute it freely, subject to the following restrictions:
10+
11+
1. The origin of this software must not be misrepresented; you
12+
must not claim that you wrote the original software. If you
13+
use this software in a product, an acknowledgment in the
14+
product documentation would be appreciated but is not
15+
required.
16+
17+
2. Altered source versions must be plainly marked as such, and
18+
must not be misrepresented as being the original software.
19+
20+
3. This notice may not be removed or altered from any source
21+
distribution.
22+
23+
Jean-loup Gailly Mark Adler
24+
25+
The data format used by the zlib library is described by RFCs
26+
(Request for Comments) 1950 to 1952 in the files rfc1950 (zlib
27+
format), rfc1951 (deflate format) and rfc1952 (gzip format).

docs/contributing.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,22 @@ your help.
66
## Licensing
77

88
By contributing to libgit2, you agree to release your contribution under
9-
the terms of the license. Except for the `examples` directory, all code
10-
is released under the [GPL v2 with linking exception](COPYING).
9+
the terms of the license. Except for the `examples` and the
10+
`deps` directories, all code is released under the [GPL v2 with
11+
linking exception](../COPYING).
1112

1213
The `examples` code is governed by the
13-
[CC0 Public Domain Dedication](examples/COPYING), so that you may copy
14+
[CC0 Public Domain Dedication](../examples/COPYING), so that you may copy
1415
from them into your own application.
1516

17+
The bundled dependencies in the `deps` directories are governed
18+
by the following licenses:
19+
20+
- http-parser is licensed under [MIT license](../deps/http-parser/COPYING)
21+
- regex is governed by [LGPL v2.1+ license](../deps/regex/COPYING)
22+
- winhttp is governed by [LGPL v2.1+](../deps/winhttp/COPYING.LGPL) and [GPL v2 with linking exception](../deps/winhttp/COPYING.GPL)
23+
- zlib is governed by [zlib license](../deps/zlib/COPYING)
24+
1625
## Discussion & Chat
1726

1827
We hang out in the

0 commit comments

Comments
 (0)