From a5576ac8368584441dbbaf98fbaec38dd142fae4 Mon Sep 17 00:00:00 2001 From: Kyungwook Tak Date: Mon, 28 Dec 2015 14:31:32 +0900 Subject: [PATCH] Add boost license Change-Id: I08f4157f1653afb7afcc17741ca90892831b39fd Signed-off-by: Kyungwook Tak --- LICENSE.BSL-1.0 | 23 +++++++++++++++++++++++ packaging/key-manager.spec | 10 ++++------ 2 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 LICENSE.BSL-1.0 diff --git a/LICENSE.BSL-1.0 b/LICENSE.BSL-1.0 new file mode 100644 index 0000000..36b7cd9 --- /dev/null +++ b/LICENSE.BSL-1.0 @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +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, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec index 5172a8e..fe34919 100644 --- a/packaging/key-manager.spec +++ b/packaging/key-manager.spec @@ -3,7 +3,7 @@ Summary: Central Key Manager and utilities Version: 0.1.18 Release: 1 Group: System/Security -License: Apache-2.0 +License: Apache-2.0 and BSL-1.0 Source0: %{name}-%{version}.tar.gz Source1001: key-manager.manifest Source1002: key-manager-pam-plugin.manifest @@ -127,9 +127,6 @@ make %{?jobs:-j%jobs} %install rm -rf %{buildroot} -mkdir -p %{buildroot}/usr/share/license -cp LICENSE %{buildroot}/usr/share/license/%{name} -cp LICENSE %{buildroot}/usr/share/license/libkey-manager-client mkdir -p %{buildroot}/opt/data/ckm/initial_values mkdir -p %{buildroot}/etc/security/ mkdir -p %{buildroot}/usr/share/ckm/scripts @@ -223,6 +220,8 @@ fi %files -n key-manager %manifest key-manager.manifest +%license LICENSE +%license LICENSE.BSL-1.0 %{_bindir}/key-manager %{_unitdir}/multi-user.target.wants/central-key-manager.service %{_unitdir}/central-key-manager.service @@ -235,7 +234,6 @@ fi %{_unitdir}/central-key-manager-api-ocsp.socket %{_unitdir}/sockets.target.wants/central-key-manager-api-encryption.socket %{_unitdir}/central-key-manager-api-encryption.socket -%{_datadir}/license/%{name} %{_datadir}/ckm/initial_values.xsd %{_datadir}/ckm/sw_key.xsd /opt/data/ckm/initial_values/ @@ -260,9 +258,9 @@ fi %files -n libkey-manager-client %manifest libkey-manager-client.manifest +%license LICENSE %{_libdir}/libkey-manager-client.so.* %{_libdir}/libkey-manager-control-client.so.* -%{_datadir}/license/libkey-manager-client %files -n libkey-manager-client-devel %{_libdir}/libkey-manager-client.so -- 2.7.4