Skip to content

Commit

Permalink
Added GPLv2 as alternate license terms, and specified that the software
Browse files Browse the repository at this point in the history
is licensed under LGPLv3 *or above* or GPLv2 *or above* (user's choice).
  • Loading branch information
bji committed Oct 4, 2018
1 parent a4d873f commit 537bb7b
Show file tree
Hide file tree
Showing 34 changed files with 600 additions and 71 deletions.
339 changes: 339 additions & 0 deletions COPYING-GPLv2

Large diffs are not rendered by default.

File renamed without changes.
8 changes: 7 additions & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
#
# libs3 is free software: you can redistribute it and/or modify it under the
# terms of the GNU Lesser General Public License as published by the Free
# Software Foundation, version 3 of the License.
# Software Foundation, version 3 or above of the License. You can also
# redistribute and/or modify it under the terms of the GNU General Public
# License, version 2 or above of the License.
#
# In addition, as a special exception, the copyright holders give
# permission to link the code of this library and its programs with the
Expand All @@ -20,6 +22,10 @@
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with libs3, in a file named COPYING. If not, see
# <http://www.gnu.org/licenses/>.
#
# You should also have received a copy of the GNU General Public License
# version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
# <http://www.gnu.org/licenses/>.

# I tried to use the autoconf/automake/autolocal/etc (i.e. autohell) tools
# but I just couldn't stomach them. Since this is a Makefile for POSIX
Expand Down
10 changes: 7 additions & 3 deletions GNUmakefile.mingw
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# GNUmakefile.mingw
#
# Copyright 2008 Bryan Ischo <[email protected]>
#
# This file is part of libs3.
#
# libs3 is free software: you can redistribute it and/or modify it under the
# terms of the GNU Lesser General Public License as published by the Free
# Software Foundation, version 3 of the License.
# Software Foundation, version 3 or above of the License. You can also
# redistribute and/or modify it under the terms of the GNU General Public
# License, version 2 or above of the License.
#
# In addition, as a special exception, the copyright holders give
# permission to link the code of this library and its programs with the
Expand All @@ -20,6 +20,10 @@
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with libs3, in a file named COPYING. If not, see
# <http://www.gnu.org/licenses/>.
#
# You should also have received a copy of the GNU General Public License
# version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
# <http://www.gnu.org/licenses/>.

# I tried to use the autoconf/automake/autolocal/etc (i.e. autohell) tools
# but I just couldn't stomach them. Since this is a Makefile for POSIX
Expand Down
10 changes: 7 additions & 3 deletions GNUmakefile.osx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# GNUmakefile.osx
#
# Copyright 2008 Bryan Ischo <[email protected]>
#
# This file is part of libs3.
#
# libs3 is free software: you can redistribute it and/or modify it under the
# terms of the GNU Lesser General Public License as published by the Free
# Software Foundation, version 3 of the License.
# Software Foundation, version 3 or above of the License. You can also
# redistribute and/or modify it under the terms of the GNU General Public
# License, version 2 or above of the License.
#
# In addition, as a special exception, the copyright holders give
# permission to link the code of this library and its programs with the
Expand All @@ -20,6 +20,10 @@
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with libs3, in a file named COPYING. If not, see
# <http://www.gnu.org/licenses/>.
#
# You should also have received a copy of the GNU General Public License
# version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
# <http://www.gnu.org/licenses/>.

# I tried to use the autoconf/automake/autolocal/etc (i.e. autohell) tools
# but I just couldn't stomach them. Since this is a Makefile for POSIX
Expand Down
12 changes: 10 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ Copyright 2008 Bryan Ischo <[email protected]>

libs3 is free software: you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free
Software Foundation, version 3 of the License.
Software Foundation, version 3 or above of the License.

You can also redistribute it and/or modify it under the terms of the
GNU General Public License as published by the Free Software Foundation,
version 2 or above of the License.

In addition, as a special exception, the copyright holders give
permission to link the code of this library and its programs with the
Expand All @@ -14,5 +18,9 @@ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.

You should have received a copy of the GNU Lesser General Public License
version 3 along with libs3, in a file named COPYING. If not, see
version 3 along with libs3, in a file named COPYING-LGPLv3. If not, see
<http://www.gnu.org/licenses/>.

You should also have received a copy of the GNU General Public License
version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
<http://www.gnu.org/licenses/>.
12 changes: 9 additions & 3 deletions inc/error_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
* error_parser.h
*
* Copyright 2008 Bryan Ischo <[email protected]>
*
*
* This file is part of libs3.
*
*
* libs3 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, version 3 of the License.
* Software Foundation, version 3 or above of the License. You can also
* redistribute and/or modify it under the terms of the GNU General Public
* License, version 2 or above of the License.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this library and its programs with the
Expand All @@ -22,6 +24,10 @@
* version 3 along with libs3, in a file named COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
* You should also have received a copy of the GNU General Public License
* version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
* <http://www.gnu.org/licenses/>.
*
************************************************************************** **/

#ifndef ERROR_PARSER_H
Expand Down
8 changes: 7 additions & 1 deletion inc/libs3.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
*
* libs3 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, version 3 of the License.
* Software Foundation, version 3 or above of the License. You can also
* redistribute and/or modify it under the terms of the GNU General Public
* License, version 2 or above of the License.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this library and its programs with the
Expand All @@ -22,6 +24,10 @@
* version 3 along with libs3, in a file named COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
* You should also have received a copy of the GNU General Public License
* version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
* <http://www.gnu.org/licenses/>.
*
************************************************************************** **/

#ifndef LIBS3_H
Expand Down
12 changes: 9 additions & 3 deletions inc/mingw/pthread.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
* pthread.h
*
* Copyright 2008 Bryan Ischo <[email protected]>
*
*
* This file is part of libs3.
*
*
* libs3 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, version 3 of the License.
* Software Foundation, version 3 or above of the License. You can also
* redistribute and/or modify it under the terms of the GNU General Public
* License, version 2 or above of the License.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this library and its programs with the
Expand All @@ -22,6 +24,10 @@
* version 3 along with libs3, in a file named COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
* You should also have received a copy of the GNU General Public License
* version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
* <http://www.gnu.org/licenses/>.
*
************************************************************************** **/

#ifndef PTHREAD_H
Expand Down
12 changes: 9 additions & 3 deletions inc/mingw/sys/select.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
* select.h
*
* Copyright 2008 Bryan Ischo <[email protected]>
*
*
* This file is part of libs3.
*
*
* libs3 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, version 3 of the License.
* Software Foundation, version 3 or above of the License. You can also
* redistribute and/or modify it under the terms of the GNU General Public
* License, version 2 or above of the License.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this library and its programs with the
Expand All @@ -22,6 +24,10 @@
* version 3 along with libs3, in a file named COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
* You should also have received a copy of the GNU General Public License
* version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
* <http://www.gnu.org/licenses/>.
*
************************************************************************** **/

// This file is used only on a MingW build, and converts an include of
Expand Down
12 changes: 9 additions & 3 deletions inc/mingw/sys/utsname.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
* utsname.h
*
* Copyright 2008 Bryan Ischo <[email protected]>
*
*
* This file is part of libs3.
*
*
* libs3 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, version 3 of the License.
* Software Foundation, version 3 or above of the License. You can also
* redistribute and/or modify it under the terms of the GNU General Public
* License, version 2 or above of the License.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this library and its programs with the
Expand All @@ -22,6 +24,10 @@
* version 3 along with libs3, in a file named COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
* You should also have received a copy of the GNU General Public License
* version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
* <http://www.gnu.org/licenses/>.
*
************************************************************************** **/

// This file is used only on a MingW build, and provides an implementation
Expand Down
8 changes: 7 additions & 1 deletion inc/request.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
*
* libs3 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, version 3 of the License.
* Software Foundation, version 3 or above of the License. You can also
* redistribute and/or modify it under the terms of the GNU General Public
* License, version 2 or above of the License.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this library and its programs with the
Expand All @@ -22,6 +24,10 @@
* version 3 along with libs3, in a file named COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
* You should also have received a copy of the GNU General Public License
* version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
* <http://www.gnu.org/licenses/>.
*
************************************************************************** **/

#ifndef REQUEST_H
Expand Down
12 changes: 9 additions & 3 deletions inc/request_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
* request_context.h
*
* Copyright 2008 Bryan Ischo <[email protected]>
*
*
* This file is part of libs3.
*
*
* libs3 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, version 3 of the License.
* Software Foundation, version 3 or above of the License. You can also
* redistribute and/or modify it under the terms of the GNU General Public
* License, version 2 or above of the License.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this library and its programs with the
Expand All @@ -22,6 +24,10 @@
* version 3 along with libs3, in a file named COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
* You should also have received a copy of the GNU General Public License
* version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
* <http://www.gnu.org/licenses/>.
*
************************************************************************** **/

#ifndef REQUEST_CONTEXT_H
Expand Down
12 changes: 9 additions & 3 deletions inc/response_headers_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
* response_headers_handler.h
*
* Copyright 2008 Bryan Ischo <[email protected]>
*
*
* This file is part of libs3.
*
*
* libs3 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, version 3 of the License.
* Software Foundation, version 3 or above of the License. You can also
* redistribute and/or modify it under the terms of the GNU General Public
* License, version 2 or above of the License.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this library and its programs with the
Expand All @@ -22,6 +24,10 @@
* version 3 along with libs3, in a file named COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
* You should also have received a copy of the GNU General Public License
* version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
* <http://www.gnu.org/licenses/>.
*
************************************************************************** **/

#ifndef RESPONSE_HEADERS_HANDLER_H
Expand Down
12 changes: 9 additions & 3 deletions inc/simplexml.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
* simplexml.h
*
* Copyright 2008 Bryan Ischo <[email protected]>
*
*
* This file is part of libs3.
*
*
* libs3 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, version 3 of the License.
* Software Foundation, version 3 or above of the License. You can also
* redistribute and/or modify it under the terms of the GNU General Public
* License, version 2 or above of the License.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this library and its programs with the
Expand All @@ -22,6 +24,10 @@
* version 3 along with libs3, in a file named COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
* You should also have received a copy of the GNU General Public License
* version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
* <http://www.gnu.org/licenses/>.
*
************************************************************************** **/

#ifndef SIMPLEXML_H
Expand Down
12 changes: 9 additions & 3 deletions inc/string_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
* string_buffer.h
*
* Copyright 2008 Bryan Ischo <[email protected]>
*
*
* This file is part of libs3.
*
*
* libs3 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, version 3 of the License.
* Software Foundation, version 3 or above of the License. You can also
* redistribute and/or modify it under the terms of the GNU General Public
* License, version 2 or above of the License.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this library and its programs with the
Expand All @@ -22,6 +24,10 @@
* version 3 along with libs3, in a file named COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
* You should also have received a copy of the GNU General Public License
* version 2 along with libs3, in a file named COPYING-GPLv2. If not, see
* <http://www.gnu.org/licenses/>.
*
************************************************************************** **/

#ifndef STRING_BUFFER_H
Expand Down
Loading

0 comments on commit 537bb7b

Please sign in to comment.