Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
5a84302422
!48 添加龙芯架构支持
From: @reganhe_xx 
Reviewed-by: @gebidelidaye 
Signed-off-by: @gebidelidaye
2023-08-12 06:26:27 +00:00
herengui
4c7aba0448 add loongarch64 support
Signed-off-by: herengui <herengui@kylinsec.com.cn>
2023-08-10 15:40:54 +08:00
openeuler-ci-bot
5b30c5d741
!45 enable NTS
From: @chengyechun 
Reviewed-by: @kircher 
Signed-off-by: @kircher
2023-05-09 06:15:15 +00:00
chengyechun
34b8c344f7 enable NTS 2023-05-08 14:34:07 +08:00
openeuler-ci-bot
346f95f0b7
!37 【轻量级 PR】:fix bogus date in %changelog
From: @k4b00m 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
2023-01-30 08:40:05 +00:00
ckji
82cf792213 fix bogus date in %changelog 2023-01-29 15:52:55 +08:00
openeuler-ci-bot
fc6ab2ebcc
!36 [sync] PR-30: update patching mode
From: @openeuler-sync-bot 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
2023-01-05 09:15:32 +00:00
chengyechun
cc0a90e5a7 update the patching momde
(cherry picked from commit f722f55830f965457f3cf226fc3f37ff451acdf3)
2023-01-05 17:06:06 +08:00
openeuler-ci-bot
9a216705c8
!35 [sync] PR-28: Fix chrony to synchronize system clock
From: @openeuler-sync-bot 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
2023-01-05 09:05:46 +00:00
yaoguangzhong
96e49a80de chrony:Fix chrony to synchronize system clock
category: bugfix
bugzilla: https://gitee.com/src-openeuler/chrony/issues/I676PL#note_15319746
Reference: bbbd80bf03.patch

Signed-off-by: Guangzhong Yao <yaoguangzhong@xfusion.com>
(cherry picked from commit 8429a04bc2745ce247da6abce8578305a809e15b)
2023-01-05 16:55:08 +08:00
3 changed files with 95 additions and 5 deletions

View File

@ -0,0 +1,37 @@
From fbe60da9eba8f5968aeefce65fd6df3a3963587c Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar mlichvar@redhat.com
Date: Mon Aug 9 11:48:21 2021 +0200
Subject: [PATCH] sys_linux: allow clone3 and pread64 in seccomp filter
These seem to be needed with the latest glibc.
Reference: https://github.com/mlichvar/chrony/commit/bbbd80bf03223f181d4abf5c8e5fe6136ab6129a.patch
---
sys_linux.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys_linux.c b/sys_linux.c
index 50c0843..2b53f72 100644
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -503,6 +503,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
/* Process */
SCMP_SYS(clone),
+#ifdef __NR_clone3
+ SCMP_SYS(clone3),
+#endif
SCMP_SYS(exit),
SCMP_SYS(exit_group),
SCMP_SYS(getpid),
@@ -595,6 +598,7 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
#ifdef __NR_ppoll_time64
SCMP_SYS(ppoll_time64),
#endif
+ SCMP_SYS(pread64),
SCMP_SYS(pselect6),
#ifdef __NR_pselect6_time64
SCMP_SYS(pselect6_time64),
--
2.27.0

View File

@ -2,7 +2,7 @@
Name: chrony
Version: 4.1
Release: 2
Release: 6
Summary: An NTP client/server
License: GPLv2
URL: https://chrony.tuxfamily.org
@ -12,10 +12,13 @@ Source1: chrony.dhclient
Source6: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz
Patch1: chrony-nm-dispatcher-dhcp.patch
Patch2: feat-loongarch64-do-not-support-fstat.patch
Patch6000: backport-rework-command-and-limit-the-length-of-command.patch
BuildRequires: gcc gcc-c++ bison systemd libcap-devel libedit-devel nettle-devel pps-tools-devel libseccomp-devel
Patch6001: backport-sys_linux-allow-clone3-and-pread64-in-secco.patch
BuildRequires: gcc gcc-c++ bison systemd libcap-devel libedit-devel nettle-devel pps-tools-devel libseccomp-devel gnutls-devel gnutls-utils
Requires: shadow-utils systemd timedatex
@ -30,9 +33,7 @@ service to other computers in the network.
%prep
%setup -q -n %{name}-%{version} -a 6
%patch1 -p1
%patch6000 -p1
%autosetup -p1 -n %{name}-%{version} -a 6
mv clknetsim-%{clknetsim_ver}* test/simulation/clknetsim
%build
@ -139,6 +140,30 @@ fi
%{_mandir}/man[158]/%{name}*.[158]*
%changelog
* Thu Aug 10 2023 herengui <herengui@kylinsec.com.cn> - 4.1-6
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add loongarch64 support
* Mon May 8 2023 chengyechun <chengyechun1@huawei.com> - 4.1-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add BuildRequire for enable NTS
* Wed Dec 28 2022 chengyechun <chengyechun1@huawei.com> - 4.1-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:update the patching mode
* Fri Dec 23 2022 yaoguangzhong <yaoguangzhong@xfusion.com> - 4.1-3
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:fix chrony to synchronize system clock
* Tue Oct 18 2022 chengyechun <chengyechun1@huawei.com> - 4.1-2
- Type:bugfix
- Id:NA

View File

@ -0,0 +1,28 @@
From 8e2ee1c4d87fbcfa29d5d7baa9845907e6a77c96 Mon Sep 17 00:00:00 2001
From: yangchenguang <yangchenguang@kylinsec.com.cn>
Date: Wed, 10 May 2023 17:36:24 +0800
Subject: [PATCH] loongarch64 do not support fstat
Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
---
sys_linux.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys_linux.c b/sys_linux.c
index 2b53f72..68d0ba3 100644
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -539,7 +539,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
SCMP_SYS(faccessat),
SCMP_SYS(fchmodat),
SCMP_SYS(fchownat),
- SCMP_SYS(fstat),
+#ifndef __loongarch64
+ SCMP_SYS(fstat),
+#endif
SCMP_SYS(fstat64),
SCMP_SYS(fstatat64),
SCMP_SYS(getdents),
--
2.33.0