Add reviewed updates for SPDX licenses from 3.24.0

Reference: #3787
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Author: AyanSinhaMahapatra

src/licensedcode/data/licenses/any-osi.LICENSE

@@ -2,47 +2,11 @@
 key: any-osi
 short_name: Any OSI License
 name: Any OSI License
-notes: |
-    WARNING: Other detection type
-    license_expression: free-unknown
-    license_expression_spdx: LicenseRef-scancode-free-unknown
-    matches:
-      - license_expression: free-unknown
-        spdx_license_expression: LicenseRef-scancode-free-unknown
-        from_file:
-        start_line: 1
-        end_line: 1
-        matcher: 2-aho
-        score: '100.0'
-        matched_length: 3
-        match_coverage: '100.0'
-        rule_relevance: 100
-        rule_identifier: free-unknown_112.RULE
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_112.RULE
-        matched_text: Pick your favourite OSI approved license :)
-        matched_text_diagnostics: OSI approved license :)
-      - license_expression: free-unknown
-        spdx_license_expression: LicenseRef-scancode-free-unknown
-        from_file:
-        start_line: 3
-        end_line: 3
-        matcher: 2-aho
-        score: '100.0'
-        matched_length: 5
-        match_coverage: '100.0'
-        rule_relevance: 100
-        rule_identifier: free-unknown_94.RULE
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_94.RULE
-        matched_text: http://www.opensource.org/licenses/alphabetical
-        matched_text_diagnostics: http://www.opensource.org/licenses/
-    detection_log:
-      - unknown-match
-    identifier: free_unknown-0a0a450d-da5f-6cd8-1fdd-f45fc44ce2f5
 spdx_license_key: any-OSI
 other_urls:
     - https://metacpan.org/pod/Exporter::Tidy#LICENSE
 ---
 
-Pick your favourite OSI approved license :)
+{{Pick your favourite OSI approved license}} :)
 
 http://www.opensource.org/licenses/alphabetical

src/licensedcode/data/licenses/asterisk-linking-protocols-exception.LICENSE

@@ -2,76 +2,6 @@
 key: asterisk-linking-protocols-exception
 short_name: Asterisk linking protocols exception
 name: Asterisk linking protocols exception
-notes: |
-    Multiple licenses detected by scancode on this text
-    license_expression: gpl-1.0-plus
-    license_expression_spdx: GPL-1.0-or-later
-    matches:
-      - license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        from_file:
-        start_line: 8
-        end_line: 8
-        matcher: 2-aho
-        score: '100.0'
-        matched_length: 4
-        match_coverage: '100.0'
-        rule_relevance: 100
-        rule_identifier: gpl_85.RULE
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_85.RULE
-        matched_text: instance do not have to be licensed under the GPL or a compatible license,
-        matched_text_diagnostics: licensed under the GPL
-      - license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        from_file:
-        start_line: 10
-        end_line: 10
-        matcher: 2-aho
-        score: '85.0'
-        matched_length: 2
-        match_coverage: '100.0'
-        rule_relevance: 85
-        rule_identifier: gpl-1.0-plus_351.RULE
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE
-        matched_text: to in the GPL. However, should any court or other judiciary body find that
-        matched_text_diagnostics: the GPL.
-      - license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        from_file:
-        start_line: 11
-        end_line: 11
-        matcher: 2-aho
-        score: '100.0'
-        matched_length: 6
-        match_coverage: '100.0'
-        rule_relevance: 100
-        rule_identifier: gpl_95.RULE
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_95.RULE
-        matched_text: these protocols do fall under the terms of the GPL, then we hereby grant you
-          a
-        matched_text_diagnostics: under the terms of the GPL,
-    detection_log: []
-    identifier: gpl_1_0_plus-1ca7d498-ab27-c5a4-a3b5-e4e59ab9a3eb
-    license_expression: unknown-license-reference
-    license_expression_spdx: LicenseRef-scancode-unknown-license-reference
-    matches:
-      - license_expression: unknown-license-reference
-        spdx_license_expression: LicenseRef-scancode-unknown-license-reference
-        from_file:
-        start_line: 13
-        end_line: 13
-        matcher: 2-aho
-        score: '50.0'
-        matched_length: 2
-        match_coverage: '100.0'
-        rule_relevance: 50
-        rule_identifier: license-intro_2.RULE
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE
-        matched_text: applications licensed under any license you wish.
-        matched_text_diagnostics: licensed under
-    detection_log:
-      - unknown-match
-    identifier: unknown_license_reference-04ce48fc-79ab-c41c-e881-396e3eb5e589
 is_exception: yes
 spdx_license_key: Asterisk-linking-protocols-exception
 other_urls:

src/licensedcode/data/licenses/fftpack-2004.LICENSE

@@ -5,11 +5,14 @@ name: FFTPACK License 2004
 category: Permissive
 owner: NCAR
 homepage_url: https://github.com/marton78/pffft/blob/master/pffft.c
-spdx_license_key: LicenseRef-scancode-fftpack-2004
+spdx_license_key: NCL
+other_spdx_license_keys:
+    - LicenseRef-scancode-fftpack-2004
 text_urls:
     - https://bitbucket.org/jpommier/pffft/src/master/pffft.c
 other_urls:
     - https://github.com/nexB/scancode-toolkit/issues/1978
+    - https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/modules/module-filter-chain/pffft.c?ref_type=heads#L1-52
 standard_notice: |
     http://www.cisl.ucar.edu/css/software/fftpack5/ftpk.html
     Copyright (c) 2004 the University Corporation for Atmospheric

src/licensedcode/data/licenses/hpnd-export-us-acknowledgement.LICENSE

@@ -3,66 +3,8 @@ key: hpnd-export-us-acknowledgement
 short_name: HPND with US Government export control warning and acknowledgment
 name: HPND with US Government export control warning and acknowledgment
 notes: |
-    WARNING: perfect detections to more than 1 license/rules
-    license_expression: mit-no-advert-export-control AND proprietary-license
-    license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license
-    matches:
-      - license_expression: mit-no-advert-export-control AND proprietary-license
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license
-        from_file:
-        start_line: 3
-        end_line: 22
-        matcher: 2-aho
-        score: '100.0'
-        matched_length: 165
-        match_coverage: '100.0'
-        rule_relevance: 100
-        rule_identifier: mit-no-advert-export-control_and_proprietary-license_1.RULE
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_and_proprietary-license_1.RULE
-        matched_text: |
-             EXPORT OF THIS SOFTWARE from the United States of America may
-             require a specific license from the United States Government. It
-             is the responsibility of any person or organization
-             contemplating export to obtain such a license before exporting.
-
-          WITHIN THAT CONSTRAINT, permission to copy, modify, and distribute
-          this software and its documentation in source and binary forms is
-          hereby granted, provided that any documentation or other materials
-          related to such distribution or use acknowledge that the software
-          was developed by the University of Southern California.
-
-          DISCLAIMER OF WARRANTY.  THIS SOFTWARE IS PROVIDED "AS IS".  The
-          University of Southern California MAKES NO REPRESENTATIONS OR
-          WARRANTIES, EXPRESS OR IMPLIED.  By way of example, but not
-          limitation, the University of Southern California MAKES NO
-          REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
-          PARTICULAR PURPOSE. The University of Southern California shall not
-          be held liable for any liability nor for any direct, indirect, or
-          consequential damages with respect to any claim by the user or
-          distributor of the ksu software.
-        matched_text_diagnostics: |
-          EXPORT OF THIS SOFTWARE from the United States of America may
-             require a specific license from the United States Government. It
-             is the responsibility of any person or organization
-             contemplating export to obtain such a license before exporting.
-
-          WITHIN THAT CONSTRAINT, permission to copy, modify, and distribute
-          this software and its documentation in source and binary forms is
-          hereby granted, provided that any documentation or other materials
-          related to such distribution or use acknowledge that the software
-          was developed by the University of Southern California.
-
-          DISCLAIMER OF WARRANTY.  THIS SOFTWARE IS PROVIDED "AS IS".  The
-          University of Southern California MAKES NO REPRESENTATIONS OR
-          WARRANTIES, EXPRESS OR IMPLIED.  By way of example, but not
-          limitation, the University of Southern California MAKES NO
-          REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
-          PARTICULAR PURPOSE. The University of Southern California shall not
-          be held liable for any liability nor for any direct, indirect, or
-          consequential damages with respect to any claim by the user or
-          distributor of the ksu software.
-    detection_log: []
-    identifier: mit_no_advert_export_control_and_proprietary_license-92c85811-efb5-eeda-fef3-b9a24cd26cf5
+    Added in SPDX license list 3.24
+    This was previously mit-no-advert-export-control_and_proprietary-license_1.RULE
 spdx_license_key: HPND-export-US-acknowledgement
 other_urls:
     - https://github.com/krb5/krb5/blob/krb5-1.21.2-final/NOTICE#L831-L852

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

@@ -2,68 +2,7 @@
 key: hpnd-sell-variant-mit-disclaimer-rev
 short_name: HPND sell variant with MIT disclaimer - reverse
 name: HPND sell variant with MIT disclaimer - reverse
-notes: |
-    license_expression: hpnd-sell-variant-mit-disclaimer AND mit-old-style
-    license_expression_spdx: HPND-sell-variant-MIT-disclaimer AND LicenseRef-scancode-mit-old-style
-    matches:
-      - license_expression: hpnd-sell-variant-mit-disclaimer
-        spdx_license_expression: HPND-sell-variant-MIT-disclaimer
-        from_file:
-        start_line: 1
-        end_line: 9
-        matcher: 3-seq
-        score: '62.18'
-        matched_length: 74
-        match_coverage: '62.18'
-        rule_relevance: 100
-        rule_identifier: hpnd-sell-variant-mit-disclaimer.LICENSE
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-sell-variant-mit-disclaimer.LICENSE
-        matched_text: |
-          Disclaimer:
-
-          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(s) 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.
-        matched_text_diagnostics: |
-          Disclaimer:
-
-          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(s) 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.
-      - license_expression: mit-old-style
-        spdx_license_expression: LicenseRef-scancode-mit-old-style
-        from_file:
-        start_line: 11
-        end_line: 15
-        matcher: 2-aho
-        score: '100.0'
-        matched_length: 45
-        match_coverage: '100.0'
-        rule_relevance: 100
-        rule_identifier: mit-old-style_mit-open-group_1.RULE
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_mit-open-group_1.RULE
-        matched_text: |
-          Permission to use, copy, modify, distribute, and sell this
-          software and its documentation for any purpose is hereby
-          granted without fee, provided that the above copyright notice
-          appear in all copies and that both that copyright notice and
-          this permission notice appear in supporting documentation.
-        matched_text_diagnostics: |
-          Permission to use, copy, modify, distribute, and sell this
-          software and its documentation for any purpose is hereby
-          granted without fee, provided that the above copyright notice
-          appear in all copies and that both that copyright notice and
-          this permission notice appear in supporting documentation.
-    detection_log: []
-    identifier: hpnd_sell_variant_mit_disclaimer_and_mit_old_style-1e531aaf-2010-a1a0-b8ff-0459dbfde4ee
+notes: Added in SPDX license list 3.24
 spdx_license_key: HPND-sell-variant-MIT-disclaimer-rev
 other_urls:
     - https://github.com/sigmavirus24/x11-ssh-askpass/blob/master/dynlist.c

src/licensedcode/data/licenses/hpnd-uc-export-us.LICENSE

@@ -1,51 +1,13 @@
 ---
 key: hpnd-uc-export-us
-short_name: Historical Permission Notice and Disclaimer - University of California, US export
-    warning
+short_name: HPND UC US export warning
 name: Historical Permission Notice and Disclaimer - University of California, US export warning
-notes: |
-    license_expression: hpnd-uc
-    license_expression_spdx: HPND-UC
-    matches:
-      - license_expression: hpnd-uc
-        spdx_license_expression: HPND-UC
-        from_file:
-        start_line: 3
-        end_line: 9
-        matcher: 2-aho
-        score: '100.0'
-        matched_length: 57
-        match_coverage: '100.0'
-        rule_relevance: 100
-        rule_identifier: hpnd-uc.LICENSE
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-uc.LICENSE
-        matched_text: |
-          Permission to use, copy, modify, and distribute this
-          software and its documentation for any purpose and without
-          fee is hereby granted, provided that the above copyright
-          notice appear in all copies.  The University of California
-          makes no representations about the suitability of this
-          software for any purpose.  It is provided "as is" without
-          express or implied warranty.  Export of this software outside
-        matched_text_diagnostics: |
-          Permission to use, copy, modify, and distribute this
-          software and its documentation for any purpose and without
-          fee is hereby granted, provided that the above copyright
-          notice appear in all copies.  The University of California
-          makes no representations about the suitability of this
-          software for any purpose.  It is provided "as is" without
-          express or implied warranty.
-    detection_log: []
-    identifier: hpnd_uc-23aeac8e-08e0-e7cc-2f78-255af8f00336
-
-    Exact match to license: HPND-UC
 spdx_license_key: HPND-UC-export-US
+notes: Added in SPDX license list 3.24
 other_urls:
     - https://github.com/RTimothyEdwards/magic/blob/master/LICENSE
 ---
 
-Copyright (C) 1985, 1990 Regents of the University of California.
-
 Permission to use, copy, modify, and distribute this
 software and its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright