Release 0.1.33

[platform/core/security/key-manager.git] / packaging / key-manager.spec

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index 5788848..883f60d 100644 (file)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -1,11 +1,11 @@
 %global watchdog_enabled 1
 %global watchdog_timeout_sec 60
 %global watchdog_notify_sec  20
-%global tz_backend_enabled 0
+%global tz_backend_enabled %{?tz_backend:%tz_backend}%{!?tz_backend:OFF}
 
 Name:       key-manager
 Summary:    Central Key Manager and utilities
-Version:    0.1.26
+Version:    0.1.33
 Release:    1
 Group:      Security/Secure Storage
 License:    Apache-2.0 and BSD-3-Clause
@@ -17,7 +17,7 @@ Source1004: libkey-manager-common.manifest
 BuildRequires: cmake
 BuildRequires: zip
 BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(openssl1.1)
 BuildRequires: libattr-devel
 BuildRequires: pkgconfig(libsmack)
 BuildRequires: pkgconfig(libsystemd-daemon)
@@ -36,7 +36,7 @@ BuildRequires: pkgconfig(argos_watchdog)
 %endif
 BuildRequires: boost-devel
 BuildRequires: ca-certificates-devel
-%if %{tz_backend_enabled} == 1
+%if %{tz_backend_enabled} == ON
 BuildRequires: key-manager-ta-devel
 BuildRequires: key-manager-ta-serialization-devel
 BuildRequires: pkgconfig(tef-libteec)
@@ -129,9 +129,9 @@ and password change events from PAM
 %package -n key-manager-initial-values
 Summary:    CKM initial values tool
 Group:      Security/Libraries
-License:    Apache-2.0 and BSD-2-Clause
+License:    Apache-2.0
 BuildRequires: cmake
-BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(openssl1.1)
 BuildRequires: pkgconfig(libxml-2.0)
 Requires(post): %{sbin_dir}/ldconfig
 Requires(postun): %{sbin_dir}/ldconfig
@@ -176,7 +176,7 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir},-Bsymbolic-functions "
         -DWATCHDOG_TIMEOUT_SEC=%{watchdog_timeout_sec} \
         -DWATCHDOG_NOTIFY_SEC=%{watchdog_notify_sec} \
 %endif
-%if %{tz_backend_enabled} == 1
+%if %{tz_backend_enabled} == ON
         -DTZ_BACKEND_ENABLED=ON \
 %else
         -DTZ_BACKEND_ENABLED=OFF \
@@ -271,7 +271,6 @@ fi
 %{bin_dir}/key-manager
 %{_unitdir}/multi-user.target.wants/central-key-manager.service
 %{_unitdir}/central-key-manager.service
-%{_unitdir}/central-key-manager.target
 %{_unitdir}/sockets.target.wants/central-key-manager-api-control.socket
 %{_unitdir}/central-key-manager-api-control.socket
 %{_unitdir}/sockets.target.wants/central-key-manager-api-storage.socket
@@ -285,6 +284,7 @@ fi
 %dir %attr(770, %{user_name}, %{group_name}) %{rw_data_dir}
 %dir %attr(550, %{user_name}, %{group_name}) %{initial_values_dir_ro}
 %dir %attr(770, %{user_name}, %{group_name}) %{initial_values_dir_rw}
+%attr(755,root,root) /usr/share/upgrade/scripts/295.key-manager_upgrade.sh
 
 %{ro_etc_dir}/gumd/userdel.d/10_key-manager.post
 %{bin_dir}/ckm_tool
@@ -321,6 +321,7 @@ fi
 %{_includedir}/ckm/ckm/ckm-pkcs12.h
 %{_includedir}/ckm/ckm/ckm-raw-buffer.h
 %{_includedir}/ckm/ckm/ckm-type.h
+%{_includedir}/ckm/ckm/ckm-zero-memory.h
 %{_includedir}/ckm/ckmc/ckmc-manager.h
 %{_includedir}/ckm/ckmc/ckmc-control.h
 %{_includedir}/ckm/ckmc/ckmc-error.h
@@ -340,5 +341,4 @@ fi
 
 %files -n key-manager-initial-values
 %license LICENSE
-%license LICENSE.BSD-2-Clause
 %{bin_dir}/ckm_initial_values