gnu: nmap: Update license.

* guix/licenses.scm (nmap): Rename to ...
(npsl): ... this.  Adjust name and URL, and remove outdated Fedora wiki
entry in favor of nmap's own annotated version.
* gnu/packages/admin.scm (nmap)[license]: Adjust accordingly.
This commit is contained in:
Marius Bakke 2020-10-13 22:16:57 +02:00
parent 17032767da
commit 2323a7120a
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 6 additions and 6 deletions

@ -2670,7 +2670,7 @@ advanced netcat implementation (ncat), a utility for comparing scan
results (ndiff), and a packet generation and response analysis tool (nping).")
;; This package uses nmap's bundled versions of libdnet and liblinear, which
;; both use a 3-clause BSD license.
(license (list license:nmap license:bsd-3))))
(license (list license:npsl license:bsd-3))))
(define-public dstat
(package

@ -76,7 +76,7 @@
mpl1.0 mpl1.1 mpl2.0
ms-pl
ncsa
nmap
npsl
ogl-psi1.0
openldap2.8 openssl
perl-license
@ -521,10 +521,10 @@ at URI, which may be a file:// URI pointing the package's tree."
"http://directory.fsf.org/wiki/License:IllinoisNCSA"
"https://www.gnu.org/licenses/license-list#NCSA"))
(define nmap
(license "Nmap license"
"https://svn.nmap.org/nmap/COPYING"
"https://fedoraproject.org/wiki/Licensing/Nmap"))
(define npsl
(license "Nmap Public Source License"
"https://svn.nmap.org/nmap/LICENSE"
"https://nmap.org/npsl/"))
(define ogl-psi1.0
(license "Open Government Licence for Public Sector Information"