03/10: gnu: nmap: Update license.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 2323a7120a0f3ed96fedfff42e86c0aee97995c0
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Oct 13 22:16:57 2020 +0200

    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.
---
 gnu/packages/admin.scm |  2 +-
 guix/licenses.scm      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 27caa19..1b80eb8 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -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
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 5038f75..cd43386 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -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"