kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

Revert "gnu: nmap: Update license."

Browse Source 
This reverts commit 2323a7120a0f3ed96fedfff42e86c0aee97995c0.
The new license has been deemed non-free by Fedora [1] and there has not yet
been a statement by the FSF claiming otherwise.  See also [2].

[1] https://github.com/nmap/nmap/issues/2199
[2] https://lists.gnu.org/archive/html/guix-devel/2020-10/msg00227.html
This commit is contained in:
Leo Prikler 2021-01-10 17:43:31 +01:00
parent 86fec62f09
commit 2dba37e27a
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/admin.scm
View File

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

10
guix/licenses.scm
View File

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