From 7fc116fa2a5f9ed96efec115395bf930fc4701fb Mon Sep 17 00:00:00 2001 From: Joshua Root Date: Mon, 19 Sep 2022 00:16:17 +1000 Subject: [PATCH] Revert "distributable_lib: consolidate cc-by conflicts" This reverts commit d6e9913a8ba1fbe47c8c322425def3f4b66f0800. CC-BY-4 is GPL-compatible. --- jobs/distributable_lib.tcl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jobs/distributable_lib.tcl b/jobs/distributable_lib.tcl index 6f5555a..9211584 100644 --- a/jobs/distributable_lib.tcl +++ b/jobs/distributable_lib.tcl @@ -41,7 +41,10 @@ array set license_conflicts \ apsl [list agpl cecill gpl] \ beopen [list agpl cecill gpl] \ bsd-old [list agpl cecill gpl] \ - cc-by [list agpl cecill gpl] \ + cc-by-1 [list agpl cecill gpl] \ + cc-by-2 [list agpl cecill gpl] \ + cc-by-2.5 [list agpl cecill gpl] \ + cc-by-3 [list agpl cecill gpl] \ cc-by-sa [list agpl cecill gpl] \ cddl [list agpl cecill gpl] \ cecill [list afl agpl apache apsl beopen bsd-old cc-by-1 cc-by-2 cc-by-2.5 cc-by-3 cc-by-sa cddl cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1] \