!8 新增Ukey管理工具;新增iristar设备,支持虹膜、人脸的录入和验证;修复一些缺陷

From: @luoqing_kylinsec 
Reviewed-by: @liubuguiii 
Signed-off-by: @liubuguiii
This commit is contained in:
openeuler-ci-bot 2023-05-24 07:37:03 +00:00 committed by Gitee
commit b69f56680c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 8 additions and 3190 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,54 +0,0 @@
From ef9a87e0379051c1c89b7d8b7955fba8c1d70f28 Mon Sep 17 00:00:00 2001
From: wangyucheng <wangyucheng@kylinsec.com.cn>
Date: Fri, 21 Apr 2023 10:25:10 +0800
Subject: [PATCH] fix(cmake): qt5 cmake command compatible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 兼容qt5 cmake命令的兼容修改
---
src/CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cac6cb4..041f0dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,7 +18,7 @@ file(GLOB_RECURSE SRC_CPP_FILES ./*.cpp)
ADD_DEFINITIONS(-DQT_NO_KEYWORDS)
-qt_add_dbus_adaptor(
+qt5_add_dbus_adaptor(
AUTH_DEVICE_MANAGER_ADAPTOR_SRCS
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.xml
${CMAKE_SOURCE_DIR}/src/auth-device-manager.h
@@ -26,7 +26,7 @@ qt_add_dbus_adaptor(
auth_device_manager_adaptor
AuthDeviceManagerAdaptor)
- qt_add_dbus_adaptor(
+ qt5_add_dbus_adaptor(
AUTH_DEVICE_ADAPTOR_SRCS
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.Device.xml
${CMAKE_SOURCE_DIR}/src/device/auth-device.h
@@ -41,7 +41,7 @@ set(CMAKE_INSTALL_RPATH ${DEVICE_SDK}/finger-vein/sd:${DEVICE_SDK}/fingerprint/z
set(TS_FILES "${PROJECT_SOURCE_DIR}/translations/${PROJECT_NAME}.zh_CN.ts")
-qt_create_translation(QM_FILES
+qt5_create_translation(QM_FILES
${CMAKE_CURRENT_SOURCE_DIR}
${TS_FILES}
)
@@ -80,4 +80,4 @@ install(TARGETS ${PROJECT_NAME}
set(TRANSLATION_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/translations)
configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-install(FILES ${QM_FILES} DESTINATION ${TRANSLATION_INSTALL_DIR})
\ No newline at end of file
+install(FILES ${QM_FILES} DESTINATION ${TRANSLATION_INSTALL_DIR})
--
2.33.0

View File

@ -1,29 +0,0 @@
From 1e33c89f9aabdc5362b8fbd1720cf45d117d888c Mon Sep 17 00:00:00 2001
From: wangyucheng <wangyucheng@kylinsec.com.cn>
Date: Fri, 21 Apr 2023 13:51:30 +0800
Subject: [PATCH] fix(compile): fix ld error: undefined reference to symbol
'dlclose@@GLIBC_2.2.5'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修复在低于2.34版本的glibc环境中出现的链接错误从glibc2.34开始将dl的实现放在了glibc中所以在glibc2.34的环境中不需要链接dl但是在低于2.34的环境还是需要链接)
---
src/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 041f0dc..c6c2001 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -69,6 +69,7 @@ target_link_libraries(${PROJECT_NAME}
Qt5::DBus
Qt5::Sql
Qt5::Concurrent
+ ${CMAKE_DL_LIBS}
)
target_link_directories(${PROJECT_NAME} PRIVATE
--
2.33.0

Binary file not shown.

View File

@ -1,16 +1,12 @@
Name: kiran-authentication-devices
Version: 2.5.0
Release: 5
Version: 2.5.1
Release: 1
Summary: Kiran Authentication Devices
License: MulanPSL-2.0
Source0: %{name}-%{version}.tar.gz
Patch0001: 0001-feature-ukey-The-UKey-device-is-adapted.patch
Patch0002: 0002-fix-cmake-qt5-cmake-command-compatible.patch
Patch0003: 0003-fix-compile-fix-ld-error-undefined-reference-to-symb.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: qt5-qtbase-devel
@ -51,6 +47,7 @@ systemctl enable kiran-authentication-devices.service
%files
%{_bindir}/kiran-authentication-devices
%{_bindir}/kiran-ukey-manager
%{_datadir}/kiran-authentication-devices/translations/*.qm
%{_datadir}/dbus-1/system-services/com.kylinsec.Kiran.AuthDevice.service
%{_sysconfdir}/dbus-1/system.d/com.kylinsec.Kiran.AuthDevice.Device.conf
@ -66,6 +63,11 @@ systemctl enable kiran-authentication-devices.service
rm -rf ${buildroot}
%changelog
* Wed May 24 2023 luoqing <luoqing@kylinsec.com.cn> - 2.5.1-1
- KYOS-F: add Ukey management tool.
- KYOS-F: added iristar device , supporting iris and facial enroll and identify.
- KYOS-F: fix some defects.
* Fri Apr 21 2023 wangyucheng <wangyucheng@kylinsec.com.cn> - 2.5.0-5
- KYOS-F: fix ld error: undefined reference to symbol 'dlclose@@GLIBC_2.2.5'.