commit 31abb1aea1e53b2b0066cbf3a53ff5e24569222d
parent 2a9603bc67dface9606a658da45e1f5c65170444
Author: Stephen Gregoratto <dev@sgregoratto.me>
Date: Sun, 14 Jun 2020 17:46:31 +1000
Update license so future changes are under the ISC
Also reflow the existing licenses to 72 chars.
Diffstat:
4 files changed, 78 insertions(+), 58 deletions(-)
diff --git a/LICENSE b/LICENSE
@@ -1,69 +1,86 @@
-Copyright (c) 2017 Jordan Ritter. All rights reserved.
+Copyright (c) 2020 Stephen Gregoratto <dev@sgregoratto.me>
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it, subject
-to the following restrictions:
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
-1. The origin of this software must not be misrepresented, either by
- explicit claim or by omission.
-
-2. Altered versions must be plainly marked as such, and must not be
- misrepresented as being the original software. Any altered version
- must clearly and properly represent the origin of this software in
- any accompanying documentation.
-
-3. All advertising materials which relate specifically to derivate
- works of this software must display the following acknowledgement:
- This product includes software developed by Jordan Ritter.
-
-4. The name of the Author may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-5. This notice, and any references to this notice, in any original or
- derived source distribution of or documentation for this software,
- may not be removed or altered.
-
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ongrep is forked from the original ngrep, which has the following
+license:
+ Copyright (c) 2017 Jordan Ritter. All rights reserved.
+
+ Permission is granted to anyone to use this software for any purpose on
+ any computer system, and to alter it and redistribute it, subject to
+ the following restrictions:
+
+ 1. The origin of this software must not be misrepresented, either by
+ explicit claim or by omission.
+
+ 2. Altered versions must be plainly marked as such, and must not be
+ misrepresented as being the original software. Any altered version
+ must clearly and properly represent the origin of this software in
+ any accompanying documentation.
+
+ 3. All advertising materials which relate specifically to derivate
+ works of this software must display the following acknowledgement:
+ This product includes software developed by Jordan Ritter.
+
+ 4. The name of the Author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ 5. This notice, and any references to this notice, in any original or
+ derived source distribution of or documentation for this software,
+ may not be removed or altered.
+
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Portions were copied from tcpkill (part of dsniff), which has the
following copyright:
- Copyright (c) 1999, 2000 Dug Song <dugsong@monkey.org>
- All rights reserved, all wrongs reversed.
+ Copyright (c) 1999, 2000 Dug Song <dugsong@monkey.org>
+ All rights reserved, all wrongs reversed.
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of author may not be used to endorse or promote products
+ derived from this software without specific prior written
+ permission.
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
diff --git a/ngrep.8 b/ngrep.8
@@ -1,6 +1,7 @@
.\" All content, except portions of the bpf filter explanation, are:
.\"
.\" Copyright (c) 2017 Jordan Ritter <jpr5@darkridge.com>
+.\" Copyright (c) 2020 Stephen Gregoratto <dev@sgregoratto.me>
.\"
.\" Please refer to the LICENSE file for more information.
diff --git a/ngrep.c b/ngrep.c
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2017 Jordan Ritter <jpr5@darkridge.com>
+ * Copyright (c) 2020 Stephen Gregoratto <dev@sgregoratto.me>
*
* Please refer to the LICENSE file for more information.
*
diff --git a/ngrep.h b/ngrep.h
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2017 Jordan Ritter <jpr5@darkridge.com>
+ * Copyright (c) 2020 Stephen Gregoratto <dev@sgregoratto.me>
*
* Please refer to the LICENSE file for more information.
*