Add license/rule modifications from SPDX 3.23

Reference: aboutcode-org/scancode-licensedb#49
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

src/licensedcode/data/licenses/bison-exception-2.0.LICENSE

@@ -5,8 +5,12 @@ name: Bison exception to GPL 2.0 or later
 category: Copyleft Limited
 owner: Free Software Foundation (FSF)
 is_exception: yes
-spdx_license_key: LicenseRef-scancode-bison-exception-2.0
+spdx_license_key: Bison-exception-1.24
+other_spdx_license_keys:
+    - LicenseRef-scancode-bison-exception-2.0
 faq_url: http://www.gnu.org/software/bison/manual/bison.html#Conditions
+other_urls:
+    - https://github.com/arineng/rwhoisd/blob/master/rwhoisd/mkdb/y.tab.c#L180
 standard_notice: |
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the Free

src/licensedcode/data/licenses/brian-gladman.LICENSE

@@ -5,9 +5,14 @@ name: Brian Gladman License
 category: Permissive
 owner: Brian Gladman
 homepage_url: http://www.gladman.me.uk/AES
-spdx_license_key: LicenseRef-scancode-brian-gladman
+spdx_license_key: Brian-Gladman-2-Clause
+other_spdx_license_keys:
+    - LicenseRef-scancode-brian-gladman
 text_urls:
     - http://gladman.plushost.co.uk/oldsite/AES/aes-src-12-09-11.zip
+other_urls:
+    - https://web.mit.edu/kerberos/krb5-1.21/doc/mitK5license.html
+    - https://github.com/krb5/krb5/blob/krb5-1.21.2-final/NOTICE#L140-L156
 ---
 
 The redistribution and use of this software (with or without changes)

src/licensedcode/data/licenses/bsd-simplified-darwin.LICENSE

@@ -4,7 +4,11 @@ short_name: BSD Simplified Darwin
 name: BSD Simplified Darwin
 category: Permissive
 owner: Ian Darwin
-spdx_license_key: LicenseRef-scancode-bsd-simplified-darwin
+spdx_license_key: BSD-2-Clause-Darwin
+other_spdx_license_keys:
+    - LicenseRef-scancode-bsd-simplified-darwin
+other_urls:
+    - https://github.com/file/file/blob/master/COPYING
 ---
 
 This software is not subject to any export provision of the United States

src/licensedcode/data/licenses/bsd-top.LICENSE

@@ -7,7 +7,11 @@ owner: nexB
 notes: |
     This is a variant composed of clause 1 and 3 of a BSD-Modified and some
     additional conditions on position and content of the notice
-spdx_license_key: LicenseRef-scancode-bsd-top
+spdx_license_key: BSD-Source-beginning-file
+other_spdx_license_keys:
+    - LicenseRef-scancode-bsd-top
+other_urls:
+    - https://github.com/lattera/freebsd/blob/master/sys/cam/cam.c#L4
 minimum_coverage: 70
 ---
 

src/licensedcode/data/licenses/caldera-no-preamble.LICENSE

@@ -0,0 +1,47 @@
+---
+key: caldera-no-preamble
+short_name: Caldera License (without preamble)
+name: Caldera License (without preamble)
+category: Permissive
+owner: Caldera International Inc.
+notes: |
+    Added in SPDX license list 3.23
+    This was previously the license rule: bsd-original_46.RULE
+spdx_license_key: Caldera-no-preamble
+other_urls:
+    - https://github.com/apache/apr/blob/trunk/LICENSE#L298C6-L298C29
+---
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+Redistributions of source code and documentation must retain the above
+copyright notice, this list of conditions and the following disclaimer.
+
+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.
+
+All advertising materials mentioning features or use of this software
+must display the following acknowledgement:
+
+   This product includes software developed or owned by  Caldera
+   International, Inc.
+
+Neither the name of Caldera International, Inc. nor the names of other
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
+INTERNATIONAL, INC. 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 CALDERA INTERNATIONAL, INC. 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.

src/licensedcode/data/licenses/drl-1.1.LICENSE

@@ -5,44 +5,27 @@ name: Detection Rule License (DRL) 1.1
 category: Permissive
 owner: Florian Roth
 homepage_url: https://github.com/Neo23x0/signature-base/blob/master/LICENSE
-spdx_license_key: LicenseRef-scancode-drl-1.1
+spdx_license_key: DRL-1.1
+other_spdx_license_keys:
+    - LicenseRef-scancode-drl-1.1
+other_urls:
+    - https://github.com/SigmaHQ/Detection-Rule-License/blob/6ec7fbde6101d101b5b5d1fcb8f9b69fbc76c04a/LICENSE.Detection.Rules.md
 ---
 
 Detection Rule License (DRL) 1.1
 
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this rule set and associated documentation files (the "Rules"), to deal 
-in the Rules without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Rules, and to permit persons to whom the Rules are furnished to do so, 
-subject to the following conditions:
-
-If you share the Rules (including in modified form), you must retain the 
-following if it is supplied within the Rules:
-
-1. identification of the authors(s) ("author" field) of the Rule and any 
-   others designated to receive attribution, in any reasonable manner 
-   requested by the Rule author (including by pseudonym if designated).
-
-2. a URI or hyperlink to the Rule set or explicit Rule to the extent 
-   reasonably practicable
-
-3. indicate the Rules are licensed under this Detection Rule License, and 
-   include the text of, or the URI or hyperlink to, this Detection Rule 
-   License to the extent reasonably practicable
-
-If you use the Rules (including in modified form) on data, messages based on 
-matches with the Rules must retain the following if it is supplied within the 
-Rules:
-
-1. identification of the authors(s) ("author" field) of the Rule and any 
-   others designated to receive attribution, in any reasonable manner 
-   requested by the Rule author (including by pseudonym if designated).
-
-THE RULES ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE RULES OR THE USE OR OTHER DEALINGS IN THE 
-RULES.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this rule set and associated documentation files (the "Rules"), to deal in the Rules without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Rules, and to permit persons to whom the Rules are furnished to do so, subject to the following conditions:
+
+If you share the Rules (including in modified form), you must retain the following if it is supplied within the Rules:
+
+identification of the authors(s) ("author" field) of the Rule and any others designated to receive attribution, in any reasonable manner requested by the Rule author (including by pseudonym if designated).
+
+a URI or hyperlink to the Rule set or explicit Rule to the extent reasonably practicable
+
+indicate the Rules are licensed under this Detection Rule License, and include the text of, or the URI or hyperlink to, this Detection Rule License to the extent reasonably practicable
+
+If you use the Rules (including in modified form) on data, messages based on matches with the Rules must retain the following if it is supplied within the Rules:
+
+identification of the authors(s) ("author" field) of the Rule and any others designated to receive attribution, in any reasonable manner requested by the Rule author (including by pseudonym if designated).
+
+THE RULES ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE RULES OR THE USE OR OTHER DEALINGS IN THE RULES.

src/licensedcode/data/licenses/fsfap-no-warranty-disclaimer.LICENSE

@@ -0,0 +1,17 @@
+---
+key: fsfap-no-warranty-disclaimer
+short_name: FSF All Permissive License (without Warranty)
+name: FSF All Permissive License (without Warranty)
+category: Permissive
+owner: Free Software Foundation (FSF)
+notes: |
+    Added in SPDX license list 3.23
+    This was previously the license rule: fsf-ap_3.RULE
+spdx_license_key: FSFAP-no-warranty-disclaimer
+other_urls:
+    - https://git.savannah.gnu.org/cgit/wget.git/tree/util/trunc.c?h=v1.21.3&id=40747a11e44ced5a8ac628a41f879ced3e2ebce9#n6
+---
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.

src/licensedcode/data/licenses/gtkbook.LICENSE

@@ -0,0 +1,21 @@
+---
+key: gtkbook
+short_name: gtkbook License
+name: gtkbook License
+category: Permissive
+owner: Syd Logan
+notes: |
+    Added in SPDX license list 3.23
+    This was previously the license rule: other-permissive_102.RULE
+spdx_license_key: gtkbook
+other_urls:
+    - https://github.com/slogan621/gtkbook
+    - https://github.com/oetiker/rrdtool-1.x/blob/master/src/plbasename.c#L8-L11
+---
+
+Copyright 2005 Syd Logan, All Rights Reserved
+
+This code is distributed without warranty. You are free to use
+this code for any purpose, however, if this code is republished or
+redistributed in its original form, as hardcopy or electronically,
+then you must include this copyright notice along with the code.

src/licensedcode/data/licenses/hdparm.LICENSE

@@ -4,16 +4,22 @@ short_name: HDPARM License
 name: HDPARM License
 category: Permissive
 owner: Unspecified
-spdx_license_key: LicenseRef-scancode-hdparm
+spdx_license_key: hdparm
+other_spdx_license_keys:
+    - LicenseRef-scancode-hdparm
+other_urls:
+    - https://github.com/Distrotech/hdparm/blob/4517550db29a91420fb2b020349523b1b4512df2/LICENSE.TXT
 minimum_coverage: 90
 ignorable_emails:
     - mlord@pobox.com
 ---
 
-You may freely use, modify, and redistribute the hdparm program, as either
-binary or source, or both.
+BSD-Style Open Source License:
 
-The only condition is that my name and copyright notice remain in the source
-code as-is.
+You may freely use, modify, and redistribute the hdparm program,
+as either binary or source, or both.
+
+The only condition is that my name and copyright notice
+remain in the source code as-is.
 
 Mark Lord (mlord@pobox.com)

src/licensedcode/data/licenses/hpnd-inria-imag.LICENSE

@@ -0,0 +1,23 @@
+---
+key: hpnd-inria-imag
+short_name: Historical - INRIA-IMAG variant
+name: Historical Permission Notice and Disclaimer - INRIA-IMAG variant
+category: Permissive
+owner: INRIA
+notes: |
+    Added in SPDX license list 3.23
+    This was previously the license rule: other-permissive_44.RULE
+spdx_license_key: HPND-INRIA-IMAG
+other_urls:
+    - https://github.com/ppp-project/ppp/blob/master/pppd/ipv6cp.c#L75-L83
+---
+
+This software is available with usual "research" terms with
+the aim of retain credits of the software. Permission to use,
+copy, modify and distribute this software for any purpose and
+without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies, and
+the name of INRIA, IMAG, or any contributor not be used in
+advertising or publicity pertaining to this material without
+the prior explicit permission. The software is provided "as
+is" without any warranties, support or liabilities of any kind.

src/licensedcode/data/licenses/hpnd-sell-mit-disclaimer-xserver.LICENSE

@@ -0,0 +1,26 @@
+---
+key: hpnd-sell-mit-disclaimer-xserver
+short_name: Historical sell xserver variant
+name: Historical Permission Notice and Disclaimer - sell xserver variant with MIT disclaimer
+category: Permissive
+owner: X.Org
+notes: |
+    Added in SPDX license list 3.23
+    This was previously the license rule: other-permissive_426.RULE
+spdx_license_key: HPND-sell-MIT-disclaimer-xserver
+other_urls:
+    - https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/COPYING?ref_type=heads#L1781
+---
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  This permission
+notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/licensedcode/data/licenses/intel-bsd.LICENSE

@@ -7,10 +7,14 @@ owner: Intel Corporation
 notes: |
     this license is often used in conjunction with a choice of gpl-2.0 such
     as in the Linux Kernel
-spdx_license_key: LicenseRef-scancode-intel-bsd
+spdx_license_key: BSD-3-Clause-acpica
+other_spdx_license_keys:
+    - LicenseRef-scancode-intel-bsd
 text_urls:
     - https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/tree/include/acpi/acoutput.h?h=v2.6.24&id=f9f4601f331aa1226d7a798a01950efbb388f07f
     - https://github.com/rwatson/mbufs/blob/748b87203d7219fd9fe2f73894359a6301ce5be1/sys/xen/xenstore/xenstore_internal.h
+other_urls:
+    - https://github.com/acpica/acpica/blob/master/source/common/acfileio.c#L119
 ---
 
 Redistribution and use in source and binary forms, with or without

src/licensedcode/data/licenses/kevlin-henney.LICENSE

@@ -4,7 +4,11 @@ short_name: Kevlin Henney License
 name: Kevlin Henney License
 category: Permissive
 owner: Kevlin Henney
-spdx_license_key: LicenseRef-scancode-kevlin-henney
+spdx_license_key: HPND-Kevlin-Henney
+other_spdx_license_keys:
+    - LicenseRef-scancode-kevlin-henney
+other_urls:
+    - https://github.com/mruby/mruby/blob/83d12f8d52522cdb7c8cc46fad34821359f453e6/mrbgems/mruby-dir/src/Win/dirent.c#L127-L140
 ---
 
 Permission to use, copy, modify, and distribute this software and its

src/licensedcode/data/licenses/mailprio.LICENSE

@@ -0,0 +1,21 @@
+---
+key: mailprio
+short_name: mailprio License
+name: mailprio License
+category: Permissive
+owner: Unspecified
+notes: |
+    Added in SPDX license list 3.23
+    This was previously the license rule: other-permissive_242.RULE
+spdx_license_key: mailprio
+other_urls:
+    - https://fossies.org/linux/sendmail/contrib/mailprio
+---
+
+Rights are hereby granted to download, use, modify, sell, copy, and
+redistribute this software so long as the original copyright notice
+and this list of conditions remain intact and modified versions are
+noted as such.
+
+I would also very much appreciate it if you could send me a copy of
+any changes you make so I can possibly integrate them into my version.

src/licensedcode/data/licenses/nrl-permission.LICENSE

@@ -5,7 +5,12 @@ name: NRL permission
 category: Permissive
 owner: NRL
 homepage_url: https://web.mit.edu/kerberos/krb5-1.14/doc/mitK5license.html
-spdx_license_key: LicenseRef-scancode-nrl-permission
+spdx_license_key: CMU-Mach-nodoc
+other_spdx_license_keys:
+    - LicenseRef-scancode-nrl-permission
+other_urls:
+    - https://github.com/krb5/krb5/blob/krb5-1.21.2-final/NOTICE#L718-L728
+    - https://web.mit.edu/kerberos/krb5-1.21/doc/mitK5license.html
 ---
 
 Permission to use, copy, modify and distribute this software and its

src/licensedcode/data/licenses/nvidia-2002.LICENSE

@@ -4,7 +4,12 @@ short_name: NVIDIA 2002 License
 name: NVIDIA 2002 License
 category: Permissive
 owner: NVIDIA
-spdx_license_key: LicenseRef-scancode-nvidia-2002
+spdx_license_key: AML-glslang
+other_spdx_license_keys:
+    - LicenseRef-scancode-nvidia-2002
+other_urls:
+    - https://github.com/KhronosGroup/glslang/blob/main/LICENSE.txt#L949
+    - https://docs.omniverse.nvidia.com/install-guide/latest/common/licenses.html
 ---
 
 NVIDIA Corporation("NVIDIA") supplies this software to you in

src/licensedcode/data/licenses/object-form-exception-to-mit.LICENSE

@@ -6,7 +6,12 @@ category: Permissive
 owner: Android Open Source Project
 homepage_url: https://android.googlesource.com/platform/external/fmtlib/+/refs/heads/master/LICENSE.rst
 is_exception: yes
-spdx_license_key: LicenseRef-scancode-object-form-exception-to-mit
+spdx_license_key: fmt-exception
+other_spdx_license_keys:
+    - LicenseRef-scancode-object-form-exception-to-mit
+other_urls:
+    - https://github.com/fmtlib/fmt/blob/2eb363297b24cd71a68ccfb20ff755430f17e60f/LICENSE#L22C1-L27C62
+    - https://github.com/fmtlib/fmt/blob/master/LICENSE
 ---
 
 Optional exception to the license