diff --git a/0001-fix-kiran-authentication-service-Add-the-enable-zlog-de85f51c.patch b/0001-fix-kiran-authentication-service-Add-the-enable-zlog-de85f51c.patch deleted file mode 100644 index 9f4e97635fc1c8616360114ebf866a36d80e788a..0000000000000000000000000000000000000000 --- a/0001-fix-kiran-authentication-service-Add-the-enable-zlog-de85f51c.patch +++ /dev/null @@ -1,100 +0,0 @@ -From de85f51ca1127a06ed200fe6c7670ebb73a3587f Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -Date: Tue, 25 Jan 2022 16:46:27 +0800 -Subject: [PATCH] fix(kiran-authentication-service): Add the enable zlog ex - macro for zlog -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 添加ENABLE_ZLOG_EX宏来兼容不同版本的zlog - -Signed-off-by: wangxiaoqing ---- - src/CMakeLists.txt | 13 ++++++++++++- - src/kiran-auth-service.c | 4 ++++ - src/main.c | 16 ++++++++++++---- - 3 files changed, 28 insertions(+), 5 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index bfee007..b9bb3dc 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -4,10 +4,21 @@ find_package (OpenSSL REQUIRED) - pkg_check_modules (GLIB2 REQUIRED glib-2.0) - pkg_check_modules (GIO REQUIRED gio-2.0) - pkg_check_modules (GIO_UNIX REQUIRED gio-unix-2.0) --pkg_check_modules (ZLOG REQUIRED zlog) - pkg_check_modules (GLIB_JSON REQUIRED json-glib-1.0) - pkg_check_modules (KIRAN_CC_DAEMON REQUIRED kiran-cc-daemon) - -+if (ENABLE_ZLOG_EX) -+ pkg_search_module(ZLOG REQUIRED zlog) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_ZLOG_EX") -+else() -+ find_library(ZLOG_LIBRARY zlog) -+ set (ZLOG_INCLUDE_DIRS "") -+ set (ZLOG_LIBRARIES "${ZLOG_LIBRARY}") -+endif() -+ -+message("found zlog dirs: ${ZLOG_INCLUDE_DIRS}") -+message("found zlog libs: ${ZLOG_LIBRARIES}") -+ - find_library(PAM_LIBRARY pam) - find_program(GDBUS_CODEGEN "gdbus-codegen") - -diff --git a/src/kiran-auth-service.c b/src/kiran-auth-service.c -index a41c89a..3a4408d 100644 ---- a/src/kiran-auth-service.c -+++ b/src/kiran-auth-service.c -@@ -22,7 +22,11 @@ - #include - #include - #include -+#ifdef ENABLE_ZLOG_EX - #include -+#else -+#include -+#endif - #include "authentication_i.h" - #include "kiran-accounts-gen.h" - #include "kiran-biometrics-gen.h" -diff --git a/src/main.c b/src/main.c -index d35501e..d64b571 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -14,7 +14,11 @@ - - #include - #include -+#ifdef ENABLE_ZLOG_EX - #include -+#else -+#include -+#endif - #include "kiran-auth-service.h" - - int main(int argc, char *argv[]) -@@ -25,11 +29,15 @@ int main(int argc, char *argv[]) - setlocale(LC_CTYPE, ""); - setlocale(LC_MESSAGES, ""); - -- if (dzlog_init_ex(NULL, -- "kylinsec-system-app", -- "kiran-authentication", -- "kiran_authentication_manager") < 0) -+#ifdef ENABLE_ZLOG_EX -+ if (dzlog_init_ex (NULL, "kylinsec-system", "kiran-biometrics", "kiran_biometrics_manager") < 0) -+#else -+ if (dzlog_init("/etc/zlog.conf", "kylinsec-system") < 0) -+#endif -+ { -+ g_error ("zlog init failed!"); - return -1; -+ } - - #if !GLIB_CHECK_VERSION(2, 36, 0) - g_type_init(); --- -2.27.0 - diff --git a/kiran-authentication-service-0.0.1.tar.gz b/kiran-authentication-service-0.0.1.tar.gz deleted file mode 100644 index 8ea22f1af135ee523b61dd16d8ffd8509eef9dcd..0000000000000000000000000000000000000000 Binary files a/kiran-authentication-service-0.0.1.tar.gz and /dev/null differ diff --git a/kiran-authentication-service-0.0.2.tar.gz b/kiran-authentication-service-0.0.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9b183b8074cf5b15069c5b5fe4bfa7f00ac5db58 Binary files /dev/null and b/kiran-authentication-service-0.0.2.tar.gz differ diff --git a/kiran-authentication-service.spec b/kiran-authentication-service.spec index 4d62ad1c7a653d8803d345aa43b297c71fc02e66..e2ac3c7ab10b5858dc8dce512517de95373f9eae 100644 --- a/kiran-authentication-service.spec +++ b/kiran-authentication-service.spec @@ -1,14 +1,13 @@ %global on_openeuler 1 Name: kiran-authentication-service -Version: 0.0.1 -Release: 2.kb3 +Version: 0.0.2 +Release: 1 Summary: Kiran Desktop kiran authentication service -License: Mulan PSL v2 +License: MulanPSL-2.0 URL: http://www.kylinsec.com.cn Source0: %{name}-%{version}.tar.gz -Patch1: 0001-fix-kiran-authentication-service-Add-the-enable-zlog-de85f51c.patch BuildRequires: glib2-devel %if 0%{?on_openeuler} @@ -56,6 +55,7 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_libdir}/libkiran-authentication-service.so.0.0.1 %{_libdir}/libkiran-authentication-service.so.0.1 %{_libdir}/security/pam_kiran_authentication.so +%{_datadir}/locale/zh_CN/LC_MESSAGES/kiran-authentication-service.mo %files devel @@ -64,6 +64,12 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_libdir}/libkiran-authentication-service.so %changelog +* Thu Oct 27 2022 wangxiaoqing - 0.0.2-1 +- KYOS-B: Do not exit when zlog init failed. + +* Wed Aug 10 2022 luoqing - 0.0.1-2.kb4 +- KYOS-F: Modify license and add yaml file. + * Tue Jan 25 2022 wxq - 0.0.1-2.kb3 - KYOS-B: Add the enable zlog ex macro for zlog. diff --git a/kiran-authentication-service.yaml b/kiran-authentication-service.yaml new file mode 100644 index 0000000000000000000000000000000000000000..316ff0b4836200a555a435b215919da35fdb1828 --- /dev/null +++ b/kiran-authentication-service.yaml @@ -0,0 +1,4 @@ +version_control: gitee +src_repo: https://gitee.com/openeuler/kiran-authentication-service.git +tag_prefix: "v" +seperator: "."