Skip to content

Commit

Permalink
license: Update project name and refresh GPLv2 text with the latest
Browse files Browse the repository at this point in the history
  • Loading branch information
Xiche committed Jun 22, 2019
1 parent 6e0bb20 commit 46e8722
Showing 1 changed file with 29 additions and 30 deletions.
59 changes: 29 additions & 30 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
*****************************************************************************
The text that follows is the GNU General Public License, Version 2 (GPL V2)
and governs your use, modification and/or distribution of SNORT.
and governs your use, modification and/or distribution of LibDAQ.

Section 9 of the GPL V2 acknowledges that the Free Software Foundation may
publish revised and/or new versions of the GPL V2 from time to time. Section 9
Expand All @@ -12,9 +12,9 @@ program governed by an unspecified version of the General Public License to
choose any version of the General Public License ever published by the Free
Software Foundation to govern his or her use of such program.

This provision is not applicable to your use of SNORT because we have
This provision is not applicable to your use of LibDAQ because we have
expressly stated in a number of instances that any third party's use,
modification or distribution of SNORT is governed by GPL V2.
modification or distribution of LibDAQ is governed by GPL V2.

2. "Any Later Version." At the end of the terms and condition of the GPL V2 is
a section called "How to Apply these Terms to Your New Program," which
Expand All @@ -33,14 +33,14 @@ Software Foundation, Section 9 of the GPL V2 provides the licensee the option
to either use, modify or distribute the program under GPL V2 or under any
later version published by the Free Software Foundation.

SNORT is an open source project that is governed exclusively by the GPL V2
and any third party desiring to use, modify or distribute SNORT must do so by
LibDAQ is an open source project that is governed exclusively by the GPL V2
and any third party desiring to use, modify or distribute LibDAQ must do so by
strictly following the terms and conditions of GPL V2. Anyone using, modifying
or distributing SNORT does not have the option to chose to use, modify or
distribute SNORT under any revised or new version of the GPL, including
or distributing LibDAQ does not have the option to chose to use, modify or
distribute LibDAQ under any revised or new version of the GPL, including
without limitation, the GNU General Public License Version 3.

For ease of reference, the comparable notice that is used with SNORT
For ease of reference, the comparable notice that is used with LibDAQ
(contained in the 'README' file) is as follows:

"This program is free software; you can redistribute it and/or modify it under
Expand All @@ -52,15 +52,15 @@ If you have any questions about this statement, please feel free to email
snort-info@snort.org.
*****************************************************************************

GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Preamble
Preamble

The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Expand All @@ -69,7 +69,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.

When we speak of free software, we are referring to freedom, not
Expand Down Expand Up @@ -109,8 +109,8 @@ patent must be licensed for everyone's free use or not licensed at all.

The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE

GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License applies to any program or other work which contains
Expand Down Expand Up @@ -164,7 +164,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
Expand Down Expand Up @@ -222,7 +222,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
Expand Down Expand Up @@ -279,7 +279,7 @@ impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
Expand Down Expand Up @@ -309,7 +309,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

NO WARRANTY
NO WARRANTY

11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
Expand All @@ -331,9 +331,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
END OF TERMS AND CONDITIONS

How to Apply These Terms to Your New Programs

If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
Expand All @@ -345,7 +345,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) <year> <name of author>

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -357,17 +357,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA

You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand All @@ -390,5 +389,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

0 comments on commit 46e8722

Please sign in to comment.