diff --git a/docs/legal-notices.xml b/docs/legal-notices.xml index 6254f02b1..342800970 100644 --- a/docs/legal-notices.xml +++ b/docs/legal-notices.xml @@ -6,60 +6,106 @@ GNU General Public License -The Nmap Security Scanner is (C) 1996–2012 Insecure.Com LLC. Nmap is also a registered trademark of Insecure.Com LLC. This program is free software; you may redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; Version 2 with the clarifications and exceptions described below. This guarantees your right to use, modify, and redistribute this software under certain conditions. If you wish to embed Nmap technology into proprietary software, we sell alternative licenses (contact sales@insecure.com). Dozens of software vendors already license Nmap technology such as host discovery, port scanning, OS detection, and version detection. +The Nmap Security Scanner is (C) 1996–2013 Insecure.Com +LLC. Nmap is also a registered trademark of Insecure.Com LLC. This +program is free software; you may redistribute and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; Version 2 (GPL), BUT ONLY WITH ALL OF THE +CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. This guarantees your +right to use, modify, and redistribute this software under certain +conditions. If you wish to embed Nmap technology into proprietary +software, we sell alternative licenses (contact +sales@nmap.com). Dozens of software vendors already +license Nmap technology such as host discovery, port scanning, OS +detection, version detection, and the Nmap Scripting Engine. -Note that the GPL places important restrictions on -derived works, yet it does not provide a detailed -definition of that term. To avoid misunderstandings, we consider an -application to constitute a derivative work for the -purpose of this license if it does any of the following: +Note that the GPL places important restrictions on derivative works, +yet it does not provide a detailed definition of that term. To avoid +misunderstandings, we interpret that term as broadly as copyright law +allows. For example, we consider an application to constitute a +derivative work for the purpose of this license if it does any of the +following with any software or content covered by this license +(Covered Software): -Integrates source code from Nmap -Reads or includes Nmap copyrighted data files, such as - nmap-os-db or - nmap-service-probes. -Executes Nmap and parses the results (as opposed to - typical shell or execution-menu apps, which simply display raw - Nmap output and so are not derivative works.) -Integrates/includes/aggregates Nmap into a proprietary - executable installer, such as those produced by - InstallShield. -Links to a library or executes a program that does any - of the above. +Integrates source code from Covered Software. + +Reads or includes copyrighted data files, such as +Nmap's nmap-os-db or +nmap-service-probes. + +Is designed specifically to execute Covered Software and parse the results (as opposed to typical shell or execution-menu apps, which will execute anything you tell them to). + +Includes Covered Software in a proprietary executable +installer. The installers produced by InstallShield are an example of +this. Including Nmap with other software in compressed or archival +form does not trigger this provision, provided appropriate open source +decompression or de-archiving software is widely available for no +charge. For the purposes of this license, an installer is considered +to include Covered Software even if it actually retrieves a copy of +Covered Software from another source during runtime (such as by +downloading it from the Internet). + +Links (statically or dynamically) to a library which does any of the above. +Executes a helper program, module, or script to do any of the above. -The term Nmap should be taken to also include any -portions or derived works of Nmap. This list is not exclusive, but is -meant to clarify our interpretation of derived works with some common -examples. Our interpretation applies only to Nmap—we don't -speak for other people's GPL works. + +This list is not exclusive, but is meant to clarify our interpretation +of derived works with some common examples. Other people may +interpret the plain GPL differently, so we consider this a special +exception to the GPL that we apply to Covered Software. Works which +meet any of these conditions must conform to all of the terms of this +license, particularly including the GPL Section 3 requirements of +providing source code and allowing free redistribution of the work as +a whole. + -If you have any questions about the GPL licensing restrictions -on using Nmap in non-GPL works, we would be happy to help. As -mentioned above, we also offer alternative license to integrate Nmap -into proprietary applications and appliances. These contracts have -been sold to many security vendors, and generally include a perpetual -license as well as providing for priority support and updates as well -as helping to fund the continued development of Nmap -technology. Please email sales@insecure.com for further -information. - -As a special exception to the GPL terms, Insecure.Com LLC grants + +As another special exception to the GPL terms, Insecure.Com LLC grants permission to link the code of this program with any version of the OpenSSL library which is distributed under a license identical to that -listed in the included COPYING.OpenSSL file, and distribute linked -combinations including -the two.OpenSSLlinking exception -You must obey the GNU GPL in all -respects for all of the code used other than OpenSSL. If you modify -this file, you may extend this exception to your version of the file, -but you are not obligated to do so. +listed in the included docs/licenses/OpenSSL.txt +file, and distribute linked combinations including the two.OpenSSLlinking exception + -If you received these files with a written license agreement or -contract stating terms other than the terms above, then that -alternative license agreement takes precedence over these -comments. + +Any redistribution of Covered Software, including any derived works, +must obey and carry forward all of the terms of this license, including +obeying all GPL rules and restrictions. For example, source code of +the whole work must be provided and free redistribution must be +allowed. All GPL references to "this License", are to be treated as +including the terms and conditions of this license text as well. + + + +Because this license imposes special exceptions to the GPL, Covered +Work may not be combined (even as part of a larger work) with plain +GPL software. The terms, conditions, and exceptions of this license +must be included as well. This license is incompatible with some +other open source licenses as well. In some cases we can relicense +portions of Nmap or grant special permissions to use it in other open +source software. Please contact fyodor@nmap.org with any such +requests. Similarly, we don't incorporate incompatible open source +software into Covered Software without special permission from the +copyright holders. + + + +If you have any questions about the licensing restrictions on using +Nmap in other works, are happy to help. As mentioned above, we also +offer alternative license to integrate Nmap into proprietary +applications and appliances. These contracts have been sold to dozens +of software vendors, and generally include a perpetual license as well +as providing for priority support and updates. They also fund the +continued development of Nmap. Please email +sales@nmap.com for further information. + + +If you have received a written license agreement or +contract for Covered Software stating terms other than these, you may +choose to use and redistribute Covered Software under those terms +instead of these. diff --git a/docs/nmap-update.1 b/docs/nmap-update.1 index 71e7ac2e4..fe5a6f37e 100644 --- a/docs/nmap-update.1 +++ b/docs/nmap-update.1 @@ -2,12 +2,12 @@ .\" Title: nmap-update .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 07/28/2013 +.\" Date: 07/29/2013 .\" Manual: nmap-update Reference Guide .\" Source: nmap-update .\" Language: English .\" -.TH "NMAP\-UPDATE" "1" "07/28/2013" "nmap\-update" "nmap\-update Reference Guide" +.TH "NMAP\-UPDATE" "1" "07/29/2013" "nmap\-update" "nmap\-update Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/nmap.1 b/docs/nmap.1 index e90d70668..299481efd 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 07/28/2013 +.\" Date: 07/29/2013 .\" Manual: Nmap Reference Guide .\" Source: Nmap .\" Language: English .\" -.TH "NMAP" "1" "07/28/2013" "Nmap" "Nmap Reference Guide" +.TH "NMAP" "1" "07/29/2013" "Nmap" "Nmap Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -2426,13 +2426,11 @@ file which is distributed with Nmap and also available from .\" copyright .\" GNU General Public License .PP -The Nmap Security Scanner is (C) 1996\(en2012 Insecure\&.Com LLC\&. Nmap is also a registered trademark of Insecure\&.Com LLC\&. This program is free software; you may redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; Version 2 with the clarifications and exceptions described below\&. This guarantees your right to use, modify, and redistribute this software under certain conditions\&. If you wish to embed Nmap technology into proprietary software, we sell alternative licenses (contact -)\&. Dozens of software vendors already license Nmap technology such as host discovery, port scanning, OS detection, and version detection\&. +The Nmap Security Scanner is (C) 1996\(en2013 Insecure\&.Com LLC\&. Nmap is also a registered trademark of Insecure\&.Com LLC\&. This program is free software; you may redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; Version 2 (\(lqGPL\(rq), BUT ONLY WITH ALL OF THE CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN\&. This guarantees your right to use, modify, and redistribute this software under certain conditions\&. If you wish to embed Nmap technology into proprietary software, we sell alternative licenses (contact +)\&. Dozens of software vendors already license Nmap technology such as host discovery, port scanning, OS detection, version detection, and the Nmap Scripting Engine\&. .PP Note that the GPL places important restrictions on -\(lqderived works\(rq, yet it does not provide a detailed definition of that term\&. To avoid misunderstandings, we consider an application to constitute a -\(lqderivative work\(rq -for the purpose of this license if it does any of the following: +\(lqderivative works\(rq, yet it does not provide a detailed definition of that term\&. To avoid misunderstandings, we interpret that term as broadly as copyright law allows\&. For example, we consider an application to constitute a derivative work for the purpose of this license if it does any of the following with any software or content covered by this license (\(lqCovered Software\(rq): .sp .RS 4 .ie n \{\ @@ -2442,7 +2440,7 @@ for the purpose of this license if it does any of the following: .sp -1 .IP \(bu 2.3 .\} -Integrates source code from Nmap +Integrates source code from Covered Software\&. .RE .sp .RS 4 @@ -2453,7 +2451,7 @@ Integrates source code from Nmap .sp -1 .IP \(bu 2.3 .\} -Reads or includes Nmap copyrighted data files, such as +Reads or includes copyrighted data files, such as Nmap\*(Aqs nmap\-os\-db or nmap\-service\-probes\&. @@ -2467,7 +2465,7 @@ nmap\-service\-probes\&. .sp -1 .IP \(bu 2.3 .\} -Executes Nmap and parses the results (as opposed to typical shell or execution\-menu apps, which simply display raw Nmap output and so are not derivative works\&.) +Is designed specifically to execute Covered Software and parse the results (as opposed to typical shell or execution\-menu apps, which will execute anything you tell them to)\&. .RE .sp .RS 4 @@ -2478,7 +2476,7 @@ Executes Nmap and parses the results (as opposed to typical shell or execution\- .sp -1 .IP \(bu 2.3 .\} -Integrates/includes/aggregates Nmap into a proprietary executable installer, such as those produced by InstallShield\&. +Includes Covered Software in a proprietary executable installer\&. The installers produced by InstallShield are an example of this\&. Including Nmap with other software in compressed or archival form does not trigger this provision, provided appropriate open source decompression or de\-archiving software is widely available for no charge\&. For the purposes of this license, an installer is considered to include Covered Software even if it actually retrieves a copy of Covered Software from another source during runtime (such as by downloading it from the Internet)\&. .RE .sp .RS 4 @@ -2489,23 +2487,35 @@ Integrates/includes/aggregates Nmap into a proprietary executable installer, suc .sp -1 .IP \(bu 2.3 .\} -Links to a library or executes a program that does any of the above\&. +Links (statically or dynamically) to a library which does any of the above\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Executes a helper program, module, or script to do any of the above\&. .RE .PP -The term -\(lqNmap\(rq -should be taken to also include any portions or derived works of Nmap\&. This list is not exclusive, but is meant to clarify our interpretation of derived works with some common examples\&. Our interpretation applies only to Nmap\(emwe don\*(Aqt speak for other people\*(Aqs GPL works\&. +This list is not exclusive, but is meant to clarify our interpretation of derived works with some common examples\&. Other people may interpret the plain GPL differently, so we consider this a special exception to the GPL that we apply to Covered Software\&. Works which meet any of these conditions must conform to all of the terms of this license, particularly including the GPL Section 3 requirements of providing source code and allowing free redistribution of the work as a whole\&. .PP -If you have any questions about the GPL licensing restrictions on using Nmap in non\-GPL works, we would be happy to help\&. As mentioned above, we also offer alternative license to integrate Nmap into proprietary applications and appliances\&. These contracts have been sold to many security vendors, and generally include a perpetual license as well as providing for priority support and updates as well as helping to fund the continued development of Nmap technology\&. Please email - +As another special exception to the GPL terms, Insecure\&.Com LLC grants permission to link the code of this program with any version of the OpenSSL library which is distributed under a license identical to that listed in the included +docs/licenses/OpenSSL\&.txt +file, and distribute linked combinations including the two\&..\" OpenSSL: linking exception +.PP +Any redistribution of Covered Software, including any derived works, must obey and carry forward all of the terms of this license, including obeying all GPL rules and restrictions\&. For example, source code of the whole work must be provided and free redistribution must be allowed\&. All GPL references to "this License", are to be treated as including the terms and conditions of this license text as well\&. +.PP +Because this license imposes special exceptions to the GPL, Covered Work may not be combined (even as part of a larger work) with plain GPL software\&. The terms, conditions, and exceptions of this license must be included as well\&. This license is incompatible with some other open source licenses as well\&. In some cases we can relicense portions of Nmap or grant special permissions to use it in other open source software\&. Please contact fyodor@nmap\&.org with any such requests\&. Similarly, we don\*(Aqt incorporate incompatible open source software into Covered Software without special permission from the copyright holders\&. +.PP +If you have any questions about the licensing restrictions on using Nmap in other works, are happy to help\&. As mentioned above, we also offer alternative license to integrate Nmap into proprietary applications and appliances\&. These contracts have been sold to dozens of software vendors, and generally include a perpetual license as well as providing for priority support and updates\&. They also fund the continued development of Nmap\&. Please email + for further information\&. .PP -As a special exception to the GPL terms, Insecure\&.Com LLC grants permission to link the code of this program with any version of the OpenSSL library which is distributed under a license identical to that listed in the included -COPYING\&.OpenSSL -file, and distribute linked combinations including the two\&..\" OpenSSL: linking exception -You must obey the GNU GPL in all respects for all of the code used other than OpenSSL\&. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so\&. -.PP -If you received these files with a written license agreement or contract stating terms other than the terms above, then that alternative license agreement takes precedence over these comments\&. +If you have received a written license agreement or contract for Covered Software stating terms other than these, you may choose to use and redistribute Covered Software under those terms instead of these\&. .SS "Creative Commons License for this Nmap Guide" .PP This diff --git a/docs/zenmap.1 b/docs/zenmap.1 index 7a735104e..4fba43a0b 100644 --- a/docs/zenmap.1 +++ b/docs/zenmap.1 @@ -2,12 +2,12 @@ .\" Title: zenmap .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 07/28/2013 +.\" Date: 07/29/2013 .\" Manual: Zenmap Reference Guide .\" Source: Zenmap .\" Language: English .\" -.TH "ZENMAP" "1" "07/28/2013" "Zenmap" "Zenmap Reference Guide" +.TH "ZENMAP" "1" "07/29/2013" "Zenmap" "Zenmap Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1 index ff75894e2..c75b37ed6 100644 --- a/ncat/docs/ncat.1 +++ b/ncat/docs/ncat.1 @@ -2,12 +2,12 @@ .\" Title: Ncat .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 07/28/2013 +.\" Date: 07/29/2013 .\" Manual: Ncat Reference Guide .\" Source: Ncat .\" Language: English .\" -.TH "NCAT" "1" "07/28/2013" "Ncat" "Ncat Reference Guide" +.TH "NCAT" "1" "07/29/2013" "Ncat" "Ncat Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1 index 707cc0c25..917e2a434 100644 --- a/ndiff/docs/ndiff.1 +++ b/ndiff/docs/ndiff.1 @@ -2,12 +2,12 @@ .\" Title: ndiff .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 07/28/2013 +.\" Date: 07/29/2013 .\" Manual: User Commands .\" Source: Ndiff .\" Language: English .\" -.TH "NDIFF" "1" "07/28/2013" "Ndiff" "User Commands" +.TH "NDIFF" "1" "07/29/2013" "Ndiff" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/nping/docs/nping.1 b/nping/docs/nping.1 index 042f7882d..897ec7a84 100644 --- a/nping/docs/nping.1 +++ b/nping/docs/nping.1 @@ -2,12 +2,12 @@ .\" Title: nping .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 07/28/2013 +.\" Date: 07/29/2013 .\" Manual: Nping Reference Guide .\" Source: Nping .\" Language: English .\" -.TH "NPING" "1" "07/28/2013" "Nping" "Nping Reference Guide" +.TH "NPING" "1" "07/29/2013" "Nping" "Nping Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" -----------------------------------------------------------------