update to 1.20

(cherry picked from commit 06f0336662c70efdebc4bd152d405252527b7b65)
This commit is contained in:
zouzhimin 2022-03-28 15:24:37 +08:00 committed by openeuler-sync-bot
parent 5da1a76407
commit 631e3029a0
4 changed files with 7 additions and 36 deletions

View File

@ -1,31 +0,0 @@
diff -urN a/libknet/host.c b/libknet/host.c
--- a/libknet/host.c 2021-08-04 10:17:01.912099056 +0800
+++ b/libknet/host.c 2021-08-04 10:17:55.708739020 +0800
@@ -77,7 +77,7 @@
/*
* set default host->name to host_id for logging
*/
- snprintf(host->name, KNET_MAX_HOST_LEN - 1, "%u", host_id);
+ snprintf(host->name, KNET_MAX_HOST_LEN, "%u", host_id);
/*
* initialize links internal data
@@ -226,7 +226,7 @@
}
for (host = knet_h->host_head; host != NULL; host = host->next) {
- if (!strncmp(host->name, name, KNET_MAX_HOST_LEN - 1)) {
+ if (!strncmp(host->name, name, KNET_MAX_HOST_LEN)) {
err = -1;
savederrno = EEXIST;
log_err(knet_h, KNET_SUB_HOST, "Duplicated name found on host_id %u",
@@ -235,7 +235,7 @@
}
}
- snprintf(knet_h->host_index[host_id]->name, KNET_MAX_HOST_LEN - 1, "%s", name);
+ snprintf(knet_h->host_index[host_id]->name, KNET_MAX_HOST_LEN, "%s", name);
exit_unlock:
pthread_rwlock_unlock(&knet_h->global_rwlock);

Binary file not shown.

BIN
kronosnet-1.20.tar.gz Normal file

Binary file not shown.

View File

@ -19,11 +19,11 @@
%endif
Name: kronosnet
Summary: Multipoint-to-Multipoint VPN daemon
Version: 1.13
Release: 3
Version: 1.20
Release: 1
License: GPLv2+ and LGPLv2+
URL: https://kronosnet.org
Source0: https://kronosnet.org/releases/%{name}-%{version}.tar.xz
Source0: https://kronosnet.org/releases/%{name}-%{version}.tar.gz
BuildRequires: gcc
%if %{with buildman}
BuildRequires: libqb-devel libxml2-devel doxygen
@ -65,8 +65,6 @@ BuildRequires: libnl3-devel
BuildRequires: autoconf automake libtool
%endif
Patch0001: backport-kronosnet-fix-format-truncation.patch
%prep
%autosetup -n kronosnet-%{version} -p1
@ -436,8 +434,12 @@ Requires: libknet1%{_isa} = %{version}-%{release}
%endif
%changelog
* Mon Jul 25 2022 zouzhimin <zouzhimin@kylinos.cn> - 1.20-1
- update to 1.20-1
* Wed Aug 04 2021 Liu Yinsi <liuyinsi@163.com> - 1.13-3
- fix format-truncation to support gcc 10
* Sat Jul 18 2020 yanan li <liyanan032@huawei.com> - 1.13-2
- Package init