From 3e930e6c24105fcc75838e7b0ed9e1d3550dc8c3 Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Thu, 16 Sep 2021 13:31:39 +0200 Subject: [PATCH] packaging: Update license specifications after relicensing parts of codebase Additionally, rename LICENSE to LICENSE.Apache-2.0 for clarity. Change-Id: If2eb9621ad0808970521d64a5dfe8099913ec2b3 --- LICENSE => LICENSE.Apache-2.0 | 0 packaging/crash-worker.spec | 30 ++++++++++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) rename LICENSE => LICENSE.Apache-2.0 (100%) diff --git a/LICENSE b/LICENSE.Apache-2.0 similarity index 100% rename from LICENSE rename to LICENSE.Apache-2.0 diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index 432bda1..caffbca 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -19,7 +19,7 @@ Summary: Coredump handler and report generator for Tizen Version: 6.5.21 Release: 1 Group: Framework/system -License: Apache-2.0 and BSD-2-Clause and MIT +License: MIT Source0: %{name}-%{version}.tar.gz Source1001: crash-worker.manifest BuildRequires: pkgconfig(dlog) @@ -65,10 +65,12 @@ Requires: %{name}-support-regdump = %{version}-%{release} %package dumpsystemstate-config Summary: common configuration for dump_systemstate utility and bugreport-service +License: MIT %description dumpsystemstate-config %package dumpsystemstate-util Summary: dump_systemstate utility used for dumping basic system information +License: Apache-2.0 and MIT Requires: %{name}-dumpsystemstate-config = %{version}-%{release} Requires: %{_bindir}/buxton2ctl # Ensure crash_worker user is available (created by security-config, package provides crash_worker-owned files) @@ -78,6 +80,7 @@ Requires: security-config %if %{with dumpsystemstateservice} %package dumpsystemstate-service Summary: service provides dumpsys provider to system state information +License: Apache-2.0 and MIT Requires: %{name}-dumpsystemstate-config = %{version}-%{release} %description dumpsystemstate-service %endif @@ -85,6 +88,7 @@ Requires: %{name}-dumpsystemstate-config = %{version}-%{release} %if %{with regdumper} %package support-regdump Summary: package provides components needed to support kernel-invoked coredump handling +License: MIT Requires: %{name}-support-common = %{version}-%{release} Requires: minicoredumper >= 2.1.0 # Ensure crash_worker user is available (created by security-config, package provides crash_worker-owned files) @@ -95,6 +99,7 @@ Requires: security-config %if %{with livedumper} %package support-livecoredump Summary: package provides components needed to support livecoredumps +License: Apache-2.0 and MIT Requires: %{name}-support-common = %{version}-%{release} Provides: %{name}-livedumper = %{version}-%{release} %description support-livecoredump @@ -102,6 +107,7 @@ Provides: %{name}-livedumper = %{version}-%{release} %package support-common Summary: package provides common components needed to support both kernel-invoked coredump and livedump +License: Apache-2.0 and BSD-2-Clause and MIT Requires: %{name}-dumpsystemstate-util = %{version}-%{release} Requires: zip # Ensure crash_worker user is available (created by security-config, package provides crash_worker-owned files) @@ -110,10 +116,12 @@ Requires: security-config %package -n libcrash-manager-devel Summary: package provides headers needed to develop programs using libcrash-manager +License: MIT %description -n libcrash-manager-devel %package -n bugreport-service Summary: bugreport provides dumpsys provider for diagnostics data +License: Apache-2.0 and MIT BuildRequires: pkgconfig(diagnostics) Requires: %{name}-dumpsystemstate-util = %{version}-%{release} %if %{with livedumper} @@ -278,18 +286,18 @@ chsmack -a "System" -t %{crash_root_path} chsmack -a "System" -t %{crash_path} %files -%license LICENSE +%license LICENSE.MIT %manifest crash-worker.manifest %files dumpsystemstate-util %manifest crash-worker.manifest -%license LICENSE +%license LICENSE.Apache-2.0 LICENSE.MIT # attr() needed because: dump_systemstate has Smack exec_label(=System) set and we don't want to allow everyone to abuse it %attr(0750,root,crash_worker) %{_bindir}/dump_systemstate %if %{with dumpsystemstateservice} %files dumpsystemstate-service -%license LICENSE +%license LICENSE.Apache-2.0 LICENSE.MIT %manifest crash-worker.manifest %{_bindir}/dump_systemstate-service %{_unitdir}/dump_systemstate.service @@ -298,13 +306,13 @@ chsmack -a "System" -t %{crash_path} %files dumpsystemstate-config %manifest crash-worker.manifest -%license LICENSE +%license LICENSE.MIT %{_sysconfdir}/dump_systemstate.conf.d/files/*.conf* %{_sysconfdir}/dump_systemstate.conf.d/programs/*.conf* %if %{with regdumper} %files support-regdump -%license LICENSE +%license LICENSE.MIT %manifest crash-worker.manifest %{_prefix}/lib/sysctl.d/70-crash-manager.conf # attr() needed because: crash-worker has Smack exec_label(=System::Privileged) set and we don't want to allow everyone to abuse it @@ -315,7 +323,7 @@ chsmack -a "System" -t %{crash_path} %if %{with livedumper} %files support-livecoredump -%license LICENSE +%license LICENSE.Apache-2.0 LICENSE.MIT %manifest crash-worker.manifest %manifest %{name}.manifest %{_bindir}/livedumper @@ -323,7 +331,7 @@ chsmack -a "System" -t %{crash_path} %if %{with livedumper} || %{with regdumper} %files support-common -%license LICENSE LICENSE.BSD LICENSE.MIT +%license LICENSE.Apache-2.0 LICENSE.BSD LICENSE.MIT %manifest crash-worker.manifest # attr() needed because: crash-worker running as crash_worker:crash_worker (user:group) creates files/dir under this path %attr(0775,crash_worker,crash_worker) %{crash_root_path} @@ -336,7 +344,7 @@ chsmack -a "System" -t %{crash_path} %{upgrade_script_path}/500.crash-manager-upgrade.sh %files -n libcrash-manager-devel -%license LICENSE +%license LICENSE.MIT %manifest crash-worker.manifest %{_includedir}/crash-manager.h %{_libdir}/libcrash-manager.so @@ -344,7 +352,7 @@ chsmack -a "System" -t %{crash_path} %endif %files -n bugreport-service -%license LICENSE +%license LICENSE.Apache-2.0 LICENSE.MIT %manifest crash-worker.manifest # attr() needed because: crash-worker running as crash_worker:crash_worker (user:group) creates files/dir under this path %attr(0775,crash_worker,crash_worker) %{crash_root_path} @@ -364,6 +372,7 @@ chsmack -a "System" -t %{crash_path} %if %{with tests} %files tests %manifest %{name}.manifest +%license LICENSE.MIT %{_libexecdir}/crash-worker/tests/test1-default-crash %{_libexecdir}/crash-worker/tests/test1-default-sleep %{_libexecdir}/crash-worker/tests/test1-default-ill @@ -376,6 +385,7 @@ chsmack -a "System" -t %{crash_path} %files system-tests %manifest %{name}.manifest +%license LICENSE.MIT %{_bindir}/crash-worker-system-tests-run %{_libexecdir}/crash-worker/system-tests/bugreport_crash_info_json/bugreport_crash_info_json.sh -- 2.7.4