diff --git a/libkysdk-system-2.0.0.tar.gz b/libkysdk-system-2.0.0.0.tar.gz similarity index 61% rename from libkysdk-system-2.0.0.tar.gz rename to libkysdk-system-2.0.0.0.tar.gz index 009312dd995fdc2d123ec7a8ef90c75f7e24d2b0..362c051ca077a23f3e4ebce9acdbd5cbdb11e3ac 100644 Binary files a/libkysdk-system-2.0.0.tar.gz and b/libkysdk-system-2.0.0.0.tar.gz differ diff --git a/libkysdk-system.spec b/libkysdk-system.spec index 4f97bf8d137856c371efb5f13ba537711d81509d..b9f593c3619fd7abd13589e27cf510f6b9984035 100644 --- a/libkysdk-system.spec +++ b/libkysdk-system.spec @@ -1,12 +1,12 @@ Name: libkysdk-system -Version: 2.0.0 -Release: 4 +Version: 2.0.0.0 +Release: 2 Summary: Kylin Software Development Kit - System Layer Kit License: GPL-2+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz Patch01: 0001-fix-compile-error-of-libkysdk-system.patch - +Patch02: mv-strlcpy-to-libkysdk_strlcpy.patch BuildRequires: cmake BuildRequires: glibc-devel BuildRequires: systemd-devel @@ -244,6 +244,7 @@ Requires: libkysdk-realtime %prep %setup -q %patch01 -p1 +%patch02 -p1 %build mkdir build && pushd build @@ -385,6 +386,12 @@ fi %changelog +* Fri Aug 18 2023 peijiankang - 2.0.0.0-2 +- add mv-strlcpy-to-libkysdk_strlcpy.patch + +* Fri May 26 2023 peijiankang - 2.0.0.0-1 +- update version to 2.0.0.0 + * Tue Mar 28 2023 peijiankang - 2.0.0-4 - mv Requires libopencv-devel to opencv diff --git a/mv-strlcpy-to-libkysdk_strlcpy.patch b/mv-strlcpy-to-libkysdk_strlcpy.patch new file mode 100644 index 0000000000000000000000000000000000000000..4e8466a973a7d980f24da8249c260281dfe71ceb --- /dev/null +++ b/mv-strlcpy-to-libkysdk_strlcpy.patch @@ -0,0 +1,41 @@ +From 98c2be623143c777e8a6a0222377d448e9bb1960 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Fri, 18 Aug 2023 13:26:11 +0800 +Subject: [PATCH] mv strlcpy to libkysdk_strlcpy + +--- + src/proc/libkyprocess.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/proc/libkyprocess.c b/src/proc/libkyprocess.c +index 4d8553d..6c7482d 100644 +--- a/src/proc/libkyprocess.c ++++ b/src/proc/libkyprocess.c +@@ -154,7 +154,7 @@ static int isnumber(char *c) + return 1; + } + +-static size_t strlcpy(char *dst, const char *src, size_t siz) ++static size_t libkysdk_strlcpy(char *dst, const char *src, size_t siz) + { + char *d = dst; + const char *s = src; +@@ -811,7 +811,7 @@ static int get_proc_name(pid_t pid, char *name) + start = strchr(line, '(') + 1; + end = strrchr(start, ')'); + num = end - start; +- strlcpy(name, start, num + 1); ++ libkysdk_strlcpy(name, start, num + 1); + fclose(fpprocstat); + + return 0; +@@ -1387,4 +1387,4 @@ inline void kdk_proc_freeall(char **list) + index ++; + } + free(list); +-} +\ No newline at end of file ++} +-- +2.33.0 +