Merge PERMISSIVE license property into REQUIRE_CITATION

Division of licenses into these two groups has poor quality and (alas!) there is no time to proofread hundred of permissive licenses.

When CREDITS.txt are generated, we place all the licenses there disregarding their properties.

1 files changed, 24 insertions, 28 deletions

diff --git a/build/conf/license.conf b/build/conf/license.conf
index 8f045151fd7..6ead9a5f220 100644
--- a/build/conf/license.conf
+++ b/build/conf/license.conf
@@ -20,7 +20,11 @@ EXPLICIT_LICENSE_EXCEPTIONS=
 #                         one of them. Putting some license into this list is equivalent to putting it into both
 #                         LICENSES_<PROP_NAME>_STATIC and LICENSES_<PROP_NAME>_DYNAMIC lists.
 LICENSE_PROPERTIES= \
-    FORBIDDEN NDA REQUIRE_DISCLOSURE PERMISSIVE REQUIRE_CITATION SERVICE
+    FORBIDDEN \
+    NDA \
+    REQUIRE_CITATION \
+    REQUIRE_DISCLOSURE \
+    SERVICE \
 
 
 # NB: Licenses lists below are sorted case-insensitively. Please, keep the list sorted.
@@ -235,7 +239,7 @@ LICENSES_REQUIRE_DISCLOSURE_STATIC= \
     LGPL-3.0-or-later
 
 # These licenses allows any kind of linkage with proprietary code
-LICENSES_PERMISSIVE= \
+LICENSES_REQUIRE_CITATION= \
     0BSD \
     Apache-1.0 \
     Apache-1.1 \
@@ -244,6 +248,7 @@ LICENSES_PERMISSIVE= \
     APSL-2.0 \
     Beerware \
     blessing \
+    Brian-Gladman-3-Clause \
     BSD \
     BSD-1-Clause \
     BSD-2-Clause \
@@ -261,8 +266,14 @@ LICENSES_PERMISSIVE= \
     Bsd-Unchanged \
     Bsd-Unmodified \
     BSL-1.0 \
+    BSLA \
     bzip2-1.0.6 \
     CC-PDDC \
+    CC-BY-1.0 \
+    CC-BY-2.0 \
+    CC-BY-2.5 \
+    CC-BY-3.0 \
+    CC-BY-4.0 \
     CC0-1.0 \
     Cmu-Computing-Services \
     CUP-Parser \
@@ -270,9 +281,11 @@ LICENSES_PERMISSIVE= \
     Custom-eigen \
     Custom-fft2d \
     Custom-fft4g \
+    Custom-Oasis-Pkcs11 \
     Custom-openldap \
     Custom-punycode \
     Custom-punycode-libpsl \
+    Custom-swig \
     Custom-wcwidth \
     DOC \
     EDL-1.0 \
@@ -285,10 +298,12 @@ LICENSES_PERMISSIVE= \
     GPL-3.0-only WITH Bison-exception-2.2 \
     GPL-3.0-or-later WITH Bison-exception-2.2 \
     H2 \
+    HPND \
     IBM-pibs \
     ICU \
     Ietf \
     IJG \
+    Info-Zip \
     Intel-LLVM-SGA \
     Intel-Simplified \
     ISC \
@@ -297,8 +312,10 @@ LICENSES_PERMISSIVE= \
     Libpbm \
     Libpng \
     libpng-2.0 \
+    libtiff \
     LicenseRef-scancode-ams-fonts \
     LicenseRef-scancode-bitstream \
+    LicenseRef-scancode-paul-mackerras-binary \
     LicenseRef-scancode-swig \
     Linux-OpenIB \
     Martin-Birgmeier \
@@ -316,6 +333,7 @@ LICENSES_PERMISSIVE= \
     MPL-1.1 \
     MPL-2.0 \
     NCSA \
+    NetCDF \
     Not-Applicable \
     NTP \
     Nvidia \
@@ -349,6 +367,7 @@ LICENSES_PERMISSIVE= \
     Sleepycat \
     Snprintf \
     Softsurfer \
+    Spencer-94 \
     Sunpro \
     Unicode-DFS-2016 \
     Unicode-Icu-58 \
@@ -368,9 +387,10 @@ LICENSES_PERMISSIVE= \
     ZPL-2.1 \
     ${CUSTOM_LICENSE_LINUX_SYSCALL_NOTE} \
     ${CUSTOM_LICENSE_MUSL_EXCEPTION} \
-    ${LICENSES_PATCHES_FORBIDDEN}
+    ${CUSTOM_LICENSE_LIBSSH2_AGENT_WIN} \
+    ${LICENSES_PATCHES_FORBIDDEN} \
 
-LICENSES_PERMISSIVE_DYNAMIC= \
+LICENSES_REQUIRE_CITATION_DYNAMIC= \
     LGPL \
     LGPL-2.0-only \
     LGPL-2.0-or-later \
@@ -386,30 +406,6 @@ CUSTOM_LICENSE_LINUX_SYSCALL_NOTE=Linux-syscall-note-in-syscall-glue
 # Permissive only in musllib
 CUSTOM_LICENSE_MUSL_EXCEPTION=Musl-Exception-in-Musllib
 
-# TODO: this list is almost empty. needed for DEVRULES-151
-LICENSES_REQUIRE_CITATION= \
-    Apache-2.0 \
-    Brian-Gladman-3-Clause \
-    BSLA \
-    CC-BY-1.0 \
-    CC-BY-2.0 \
-    CC-BY-2.5 \
-    CC-BY-3.0 \
-    CC-BY-4.0 \
-    Cmu-Computing-Services \
-    Custom-Oasis-Pkcs11 \
-    Custom-swig \
-    EDL-1.0 \
-    HPND \
-    Info-Zip \
-    OpenSSL \
-    Qhull \
-    Spencer-94 \
-    LicenseRef-scancode-paul-mackerras-binary \
-    NetCDF \
-    libtiff \
-    ${CUSTOM_LICENSE_LIBSSH2_AGENT_WIN}
-
 LICENSES_SERVICE= \
     Service-Default-License \
     Service-Dll-Harness \