Skip to content

Commit 0b6eb7a

Browse files
ronfronf
committed
Update license to EPL 2.0
This commit updates the AsyncSSH license to EPL 2.0, with an optional secondary license of GPL 2.0 or laster.
1 parent 2d9f110 commit 0b6eb7a

File tree

137 files changed

+1939
-791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+1939
-791
lines changed

‎CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ a few lines I strongly recommend coordinating up front.
6060

6161
Any code you submit will need to be provided with a compatible license.
6262
AsyncSSH code is currently released under the `Eclipse Public License
63-
v1.0 <http://www.eclipse.org/legal/epl-v10.html>`_. Before submitting
63+
v2.0 <http://www.eclipse.org/legal/epl-2.0/>`_. Before submitting
6464
a pull request, make sure to indicate that you are ok with releasing
6565
your code under this license and how you'd like to be listed in the
6666
contributors list.

‎COPYRIGHT

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
Copyright (c) 2013-2017 by Ron Frederick <[email protected]>.
2-
All rights reserved.
1+
Copyright (c) 2013-2018 by Ron Frederick <[email protected]> and others.
32

43
This program and the accompanying materials are made available under
5-
the terms of the Eclipse Public License v1.0 which accompanies this
4+
the terms of the Eclipse Public License v2.0 which accompanies this
65
distribution and is available at:
76

8-
http://www.eclipse.org/legal/epl-v10.html
7+
http://www.eclipse.org/legal/epl-2.0/
98

10-
Contributors:
11-
Ron Frederick - initial implementation, API, and documentation
9+
This program may also be made available under the following secondary
10+
licenses when the conditions for such availability set forth in the
11+
Eclipse Public License v2.0 are satisfied:
12+
13+
GNU General Public License, Version 2.0, or any later versions of
14+
that license
15+
16+
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later

‎LICENSE

Lines changed: 248 additions & 169 deletions
Large diffs are not rendered by default.

‎README.rst

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,25 +81,33 @@ License
8181

8282
This package is released under the following terms:
8383

84-
Copyright (c) 2013-2018 by Ron Frederick <[email protected]>.
85-
All rights reserved.
84+
Copyright (c) 2013-2018 by Ron Frederick <[email protected]> and others.
8685

8786
This program and the accompanying materials are made available under
88-
the terms of the **Eclipse Public License v1.0** which accompanies
89-
this distribution and is available at:
87+
the terms of the Eclipse Public License v2.0 which accompanies this
88+
distribution and is available at:
9089

91-
http://www.eclipse.org/legal/epl-v10.html
90+
http://www.eclipse.org/legal/epl-2.0/
91+
92+
This program may also be made available under the following secondary
93+
licenses when the conditions for such availability set forth in the
94+
Eclipse Public License v2.0 are satisfied:
95+
96+
GNU General Public License, Version 2.0, or any later versions of
97+
that license
98+
99+
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
92100

93101
For more information about this license, please see the `Eclipse
94-
Public License FAQ <https://eclipse.org/legal/eplfaq.php>`_.
102+
Public License FAQ <https://www.eclipse.org/legal/epl-2.0/faq.php>`_.
95103

96104
Prerequisites
97105
-------------
98106

99107
To use ``asyncssh``, you need the following:
100108

101109
* Python 3.4 or later
102-
* cryptography (PyCA) 1.1 or later
110+
* cryptography (PyCA) 1.5 or later
103111

104112
Installation
105113
------------

‎asyncssh/__init__.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2013-2017 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2013-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/agent.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2016-2018 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2016-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/agent_unix.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2016 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2016-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/agent_win32.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2016 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2016-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/asn1.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2013-2015 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2013-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/auth.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2013-2018 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2013-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/auth_keys.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2015-2017 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2015-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/channel.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2013-2018 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2013-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/client.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2013-2017 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2013-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/compression.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2013-2015 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2013-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/connection.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2013-2018 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2013-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/constants.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2013-2015 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2013-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

‎asyncssh/crypto/__init__.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
# Copyright (c) 2014-2018 by Ron Frederick <[email protected]>.
2-
# All rights reserved.
1+
# Copyright (c) 2014-2018 by Ron Frederick <[email protected]> and others.
32
#
43
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License v1.0 which accompanies this
4+
# the terms of the Eclipse Public License v2.0 which accompanies this
65
# distribution and is available at:
76
#
8-
# http://www.eclipse.org/legal/epl-v10.html
7+
# http://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# This program may also be made available under the following secondary
10+
# licenses when the conditions for such availability set forth in the
11+
# Eclipse Public License v2.0 are satisfied:
12+
#
13+
# GNU General Public License, Version 2.0, or any later versions of
14+
# that license
15+
#
16+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
917
#
1018
# Contributors:
1119
# Ron Frederick - initial implementation, API, and documentation

0 commit comments

Comments
 (0)