Skip to content

Commit ef5cb9e

Browse files
committed
Add CLA.txt and update agreements
1 parent a1d00bf commit ef5cb9e

File tree

4 files changed

+142
-19
lines changed

4 files changed

+142
-19
lines changed

.clabot

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@
5858
"ProtocolSpecChecker",
5959
"raenray",
6060
"hbrodin",
61-
"PGZXB"
61+
"PGZXB",
62+
"philj56",
63+
"diplfranzhoepfinger"
6264
],
6365
"message": "We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please fill https://forms.gle/5635zjphDo5JEJQSA to get added. Your document will be manually checked by the maintainer. Be patient..."
6466
}

CLA.txt

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
libmodbus Contributor License Agreement
2+
3+
Thank you for your interest in contributing to libmodbus (the "Project") created
4+
by Stéphane Raimbault.
5+
6+
In order to clarify the intellectual property license granted with Contributions
7+
from any person or entity, the Project must have a Contributor License Agreement
8+
(CLA) on file that has been signed by each Contributor, indicating agreement to
9+
the license terms below. This license is for your protection as a Contributor as
10+
well as the protection of the Project and its users; it does not change your
11+
rights to use your own Contributions for any other purpose.
12+
13+
This Agreement allows an entity (the "Corporation") to submit Contributions to
14+
The Project, to authorize Contributions submitted by its designated employees to
15+
The Project, and to grant copyright and patent licenses thereto.
16+
17+
If you have not already done so, please complete and sign this Agreement using
18+
the electronic signature portal made available to you by the Project or its
19+
third-party service providers, or email a PDF of the signed agreement to
20+
[email protected]. Please read this document carefully before signing
21+
and keep a copy for your records.
22+
23+
You accept and agree to the following terms and conditions for Your present and
24+
future Contributions submitted to the Project. Except for the license granted
25+
herein to The Project and recipients of software distributed by The Project, You
26+
reserve all right, title, and interest in and to Your Contributions.
27+
28+
1. Definitions
29+
30+
"You" (or "Your") shall mean the copyright owner or legal entity authorized by
31+
the copyright owner that is making this Agreement with The Project. For legal
32+
entities, the entity making a Contribution and all other entities that control,
33+
are controlled by, or are under common control with that entity are considered
34+
to be a single Contributor. For the purposes of this definition, "control" means
35+
(i) the power, direct or indirect, to cause the direction or management of such
36+
entity, whether by contract or otherwise, or (ii) ownership of fifty percent
37+
(50%) or more of the outstanding shares, or (iii) beneficial ownership of such
38+
entity.
39+
40+
"Contribution" shall mean the code, documentation or other original works of
41+
authorship expressly identified in Schedule B, as well as any original work of
42+
authorship, including any modifications or additions to an existing work, that
43+
is intentionally submitted by You to The Project for inclusion in, or
44+
documentation of, any of the products owned or managed by the Foundation (the
45+
"Work"). For the purposes of this definition, "submitted" means any form of
46+
electronic, verbal, or written communication sent to The Project or its
47+
representatives, including but not limited to communication on electronic
48+
mailing lists, source code control systems, and issue tracking systems that are
49+
managed by, or on behalf of, The Project for the purpose of discussing and
50+
improving the Work, but excluding communication that is conspicuously marked or
51+
otherwise designated in writing by You as "Not a Contribution."
52+
53+
2. Grant of Copyright License. Subject to the terms and conditions of this
54+
Agreement, You hereby grant to The Project and to recipients of software
55+
distributed by The Project a perpetual, worldwide, non-exclusive, no-charge,
56+
royalty-free, irrevocable copyright license to reproduce, prepare derivative
57+
works of, publicly display, publicly perform, sublicense, and distribute Your
58+
Contributions and such derivative works.
59+
60+
3. Grant of Patent License. Subject to the terms and conditions of this
61+
Agreement, You hereby grant to The Project and to recipients of software
62+
distributed by The Project a perpetual, worldwide, non-exclusive, no-charge,
63+
royalty-free, irrevocable (except as stated in this section) patent license
64+
to make, have made, use, offer to sell, sell, import, and otherwise transfer
65+
the Work, where such license applies only to those patent claims licensable
66+
by You that are necessarily infringed by Your Contribution(s) alone or by
67+
combination of Your Contribution(s) with the Work to which such
68+
Contribution(s) were submitted. If any entity institutes patent litigation
69+
against You or any other entity (including a cross-claim or counterclaim in a
70+
lawsuit) alleging that Your Contribution, or the Work to which You have
71+
contributed, constitutes direct or contributory patent infringement, then any
72+
patent licenses granted to that entity under this Agreement for that
73+
Contribution or Work shall terminate as of the date such litigation is filed.
74+
75+
4. You represent that You are legally entitled to grant the above license. If
76+
You are an individual, if Your employer(s) has rights to intellectual
77+
property that You create that includes Your Contributions, You represent that
78+
You have received permission to make Contributions on behalf of that
79+
employer, that Your employer has waived such rights for Your Contributions to
80+
The Project, or that Your employer has executed a separate CLA with The
81+
Project. If You are a legal entity, You represent further that each employee
82+
of the Corporation designated on Schedule A below (or in a subsequent written
83+
modification to that Schedule) is authorized to submit Contributions on
84+
behalf of the Corporation.
85+
86+
5. You represent that each of Your Contributions is Your original creation (see
87+
section 7 for submissions on behalf of others).
88+
89+
6. You are not expected to provide support for Your Contributions, except to the
90+
extent You desire to provide support. You may provide support for free, for a
91+
fee, or not at all. Unless required by applicable law or agreed to in
92+
writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT
93+
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
94+
without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
95+
MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
96+
97+
7. Should You wish to submit work that is not Your original creation, You may
98+
submit it to the Foundation separately from any Contribution, identifying the
99+
complete details of its source and of any license or other restriction
100+
(including, but not limited to, related patents, trademarks, and license
101+
agreements) of which You are personally aware, and conspicuously marking the
102+
work as "Submitted on behalf of a third-party: [named here]".
103+
104+
8. You agree to notify The Project of any facts or circumstances of which You
105+
become aware that would make these representations inaccurate in any respect.
106+
If You are a legal entity, it is Your responsibility to notify The Project
107+
when any change is required to the list of designated employees authorized to
108+
submit Contributions on behalf of the Corporation, or to the Corporation's
109+
Point of Contact with The Project.
110+
111+
9. Should You wish to submit work that is not Your original creation, You may submit it to the Project separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as “Submitted on behalf of a third-party: [named here]”.
112+
113+
10. You agree to notify the Project of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.

CONTRIBUTING.md

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,30 @@ commercial support.
55

66
Take care to read the documentation at http://libmodbus.org/.
77

8-
- *Be sure it's a bug before creating an issue*, in doubt, post a message on
8+
- _Be sure it's a bug before creating an issue_, in doubt, post a message on
99
<https://groups.google.com/forum/#!forum/libmodbus> or send an email to
1010
1111

12-
- *Use a clear and descriptive title* for the issue to identify
12+
- _Use a clear and descriptive title_ for the issue to identify
1313

14-
- *Which version of libmodbus are you using?* you can obtain this information
15-
from your package manager or by running `pkg-config --modversion libmodbus`.
16-
You can provide the sha1 of the commit if you have fetched the code with `git`.
14+
- _Which version of libmodbus are you using?_ you can obtain this information
15+
from your package manager or by running `pkg-config --modversion libmodbus`.
16+
You can provide the sha1 of the commit if you have fetched the code with `git`.
1717

18-
- *Which operating system are you using?*
18+
- _Which operating system are you using?_
1919

20-
- *Describe the exact steps which reproduce the problem* in as many details as
21-
possible. For example, the software/equipment which runs the Modbus server, how
22-
the clients are connected (TCP, RTU, ASCII) and the source code you are using.
20+
- _Describe the exact steps which reproduce the problem_ in as many details as
21+
possible. For example, the software/equipment which runs the Modbus server, how
22+
the clients are connected (TCP, RTU, ASCII) and the source code you are using.
2323

24-
- *Enable the debug mode*, libmodbus provides a function to display the content
25-
of the Modbus messages and it's very convenient to analyze issues
26-
(http://libmodbus.org/docs/modbus_set_debug/).
24+
- _Enable the debug mode_, libmodbus provides a function to display the content
25+
of the Modbus messages and it's very convenient to analyze issues
26+
(http://libmodbus.org/docs/modbus_set_debug/).
2727

2828
Good bug reports provide right and quick fixes!
29+
30+
## Contributor License Agreement
31+
32+
By submitting a contribution to libmodbus, you agree to the terms of the
33+
[Contributor License Agreement](CLA.txt). Please read it before submitting a
34+
pull request.

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ connection.
1212
The functions included in the library have been derived from the Modicon Modbus
1313
Protocol Reference Guide which can be obtained from [www.modbus.org](http://www.modbus.org).
1414

15-
The license of libmodbus is *LGPL v2.1 or later*.
15+
The license of libmodbus is _LGPL v2.1 or later_.
1616

1717
The official website is [www.libmodbus.org](http://www.libmodbus.org). The
1818
website contains the latest version of the documentation.
@@ -33,18 +33,18 @@ To install, just run the usual dance, `./configure && make install`. Run
3333

3434
You can change installation directory with prefix option, eg. `./configure
3535
--prefix=/usr/local/`. You have to check that the installation library path is
36-
properly set up on your system (*/etc/ld.so.conf.d*) and library cache is up to
36+
properly set up on your system (_/etc/ld.so.conf.d_) and library cache is up to
3737
date (run `ldconfig` as root if required).
3838

39-
The library provides a *libmodbus.pc* file to use with `pkg-config` to ease your
39+
The library provides a _libmodbus.pc_ file to use with `pkg-config` to ease your
4040
program compilation and linking.
4141

4242
If you want to compile with Microsoft Visual Studio, you should follow the
4343
instructions in `./src/win32/README.md`.
4444

4545
To compile under Windows, install [MinGW](http://www.mingw.org/) and MSYS then
4646
select the common packages (gcc, automake, libtool, etc). The directory
47-
*./src/win32/* contains a Visual C project.
47+
_./src/win32/_ contains a Visual C project.
4848

4949
To compile under OS X with [homebrew](http://mxcl.github.com/homebrew/), you
5050
will need to install the following dependencies first: `brew install autoconf
@@ -54,10 +54,10 @@ To build under Embox, you have to use its build system.
5454

5555
## Testing
5656

57-
Some tests are provided in *tests* directory, you can freely edit the source
57+
Some tests are provided in _tests_ directory, you can freely edit the source
5858
code to fit your needs (it's Free Software :).
5959

60-
See *tests/README* for a description of each program.
60+
See _tests/README_ for a description of each program.
6161

6262
For a quick test of libmodbus, you can run the following programs in two shells:
6363

@@ -72,6 +72,8 @@ It's also possible to run the unit tests with `make check`.
7272

7373
See [CONTRIBUTING](CONTRIBUTING.md) document.
7474

75+
By contributing to libmodbus, you agree to the [Contributor License Agreement](CLA.txt).
76+
7577
## Documentation
7678

7779
You can serve the local documentation with:

0 commit comments

Comments
 (0)