diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | packaging/cert-checker-tests.manifest.in | 9 | ||||
| -rw-r--r-- | packaging/cert-checker.manifest.in | 3 | ||||
| -rw-r--r-- | packaging/cert-checker.spec | 11 |
4 files changed, 19 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9310f94..8a2e264 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,6 +107,9 @@ CONFIGURE_FILE( CONFIGURE_FILE( packaging/${SERVICE_NAME}-client.manifest.in ${SERVICE_NAME}-client.manifest @ONLY) +CONFIGURE_FILE( + packaging/${SERVICE_NAME}-tests.manifest.in + ${SERVICE_NAME}-tests.manifest @ONLY) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(db) diff --git a/packaging/cert-checker-tests.manifest.in b/packaging/cert-checker-tests.manifest.in new file mode 100644 index 0000000..88fd3bf --- /dev/null +++ b/packaging/cert-checker-tests.manifest.in @@ -0,0 +1,9 @@ +<manifest> + <request> + <domain name="_" /> + </request> + <assign> + <filesystem path="@BIN_DIR@/@SERVICE_NAME@-test" exec_label="System" /> + <filesystem path="@DB_INSTALL_DIR@/.@SERVICE_NAME@-test.db" label="System" /> + </assign> +</manifest> diff --git a/packaging/cert-checker.manifest.in b/packaging/cert-checker.manifest.in index 75b0fa5..bf536f4 100644 --- a/packaging/cert-checker.manifest.in +++ b/packaging/cert-checker.manifest.in @@ -2,4 +2,7 @@ <request> <domain name="_"/> </request> + <assign> + <filesystem path="@DB_INSTALL_DIR@/.@SERVICE_NAME@.db" label="System" /> + </assign> </manifest> diff --git a/packaging/cert-checker.spec b/packaging/cert-checker.spec index a5565a2..5b42097 100644 --- a/packaging/cert-checker.spec +++ b/packaging/cert-checker.spec @@ -32,7 +32,7 @@ Check OCSP validation at app install/uninstall time. %global bin_dir %{?TZ_SYS_BIN:%TZ_SYS_BIN}%{!?TZ_SYS_BIN:%_bindir} %global root_dir %{?TZ_SYS_ROOT:%TZ_SYS_ROOT}%{!?TZ_SYS_ROOT:/root} %global ro_data_dir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:%_datadir} -%global db_dir %{?TZ_SYS_DB:%TZ_SYS_DB/%name}%{!?TZ_SYS_DB:/opt/dbspace/%name} +%global db_dir %{?TZ_SYS_DB:%TZ_SYS_DB}%{!?TZ_SYS_DB:/opt/dbspace} # service macro %global service_name %{name} @@ -137,9 +137,6 @@ if [ $1 = 2 ]; then systemctl restart %{name}.socket fi -chsmack -a System %{db_dir} -chsmack -a System %{db_dir}/.%{name}.db - %preun # uninstall if [ $1 = 0 ]; then @@ -160,8 +157,7 @@ fi %files -f %{name}.lang %manifest %{name}.manifest %license LICENSE -%dir %attr(0700,%{service_user},%{service_group}) %{db_dir} -%config(noreplace) %attr(0600,%{service_user},%{service_group}) %{db_dir}/.%{name}.db +%attr(0600,%{service_user},%{service_group}) %{db_dir}/.%{name}.db %{bin_dir}/%{name} %{bin_dir}/%{name}-popup %{_unitdir}/%{name}.service @@ -188,8 +184,9 @@ fi %{_includedir}/cchecker/ocsp.h %files -n %{name}-tests -%defattr(-,%{service_user},%{service_group},-) +%manifest %{name}-tests.manifest %license LICENSE LICENSE.BSL-1.0 +%defattr(-,%{service_user},%{service_group},-) %{bin_dir}/%{name}-tests %{bin_dir}/%{name}-tests-logic %{bin_dir}/%{name}-tests-client |