From 546e36dd498f203b7beb77c2b40c2b1e54429091 Mon Sep 17 00:00:00 2001 From: suwei Date: Tue, 19 Sep 2023 11:08:50 +0800 Subject: [PATCH] fix loongarch patch compile error Signed-off-by: suwei --- 3000-Add-loongarch64-support.patch | 28 ++++++++++++++-------------- libreswan.spec | 5 ++++- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/3000-Add-loongarch64-support.patch b/3000-Add-loongarch64-support.patch index b5469e2..642d35a 100644 --- a/3000-Add-loongarch64-support.patch +++ b/3000-Add-loongarch64-support.patch @@ -1,19 +1,19 @@ -From 1b992bf557e4e22ba8d2ec237c8f62ce774cc3b2 Mon Sep 17 00:00:00 2001 -From: yangchenguang -Date: Fri, 12 May 2023 14:38:23 +0800 -Subject: [PATCH] Add loongarch64 support +From f813de28e2cea1dccbd3e3a3d629b08f54b9e409 Mon Sep 17 00:00:00 2001 +From: suwei +Date: Tue, 19 Sep 2023 10:41:01 +0800 +Subject: [PATCH] [PATCH] Add loongarch64 support -Signed-off-by: yangchenguang +Signed-off-by: suwei --- programs/addconn/addconn.c | 2 ++ programs/pluto/pluto_seccomp.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/programs/addconn/addconn.c b/programs/addconn/addconn.c -index 408e868..e3fc0f1 100644 +index 527d5cf..900a6c7 100644 --- a/programs/addconn/addconn.c +++ b/programs/addconn/addconn.c -@@ -122,7 +122,9 @@ static void init_seccomp_addconn(uint32_t def_action, struct logger *logger) +@@ -99,7 +99,9 @@ static void init_seccomp_addconn(uint32_t def_action, struct logger *logger) LSW_SECCOMP_ADD(epoll_pwait); LSW_SECCOMP_ADD(exit_group); LSW_SECCOMP_ADD(fcntl); @@ -24,19 +24,19 @@ index 408e868..e3fc0f1 100644 LSW_SECCOMP_ADD(getdents); LSW_SECCOMP_ADD(getegid); diff --git a/programs/pluto/pluto_seccomp.c b/programs/pluto/pluto_seccomp.c -index 4e4f7ff..5404951 100644 +index 27b1560..775033f 100644 --- a/programs/pluto/pluto_seccomp.c +++ b/programs/pluto/pluto_seccomp.c -@@ -130,7 +130,9 @@ static void init_seccomp(uint32_t def_action, bool main, struct logger *logger) - LSW_SECCOMP_ADD(gettid); - LSW_SECCOMP_ADD(gettimeofday); +@@ -138,7 +138,9 @@ static void init_seccomp(uint32_t def_action, bool main, struct logger *logger) + LSW_SECCOMP_ADD(exit); + LSW_SECCOMP_ADD(exit_group); LSW_SECCOMP_ADD(fcntl); +#ifndef __loongarch64 LSW_SECCOMP_ADD(fstat); +#endif LSW_SECCOMP_ADD(futex); - LSW_SECCOMP_ADD(lseek); - LSW_SECCOMP_ADD(madvise); + LSW_SECCOMP_ADD(getpid); + LSW_SECCOMP_ADD(gettid); -- -2.33.0 +2.27.0 diff --git a/libreswan.spec b/libreswan.spec index e78dffa..1011cfb 100644 --- a/libreswan.spec +++ b/libreswan.spec @@ -26,7 +26,7 @@ Name: libreswan Summary: IKE implementation for IPsec with IKEv1 and IKEv2 support Version: 4.12 -Release: 2 +Release: 3 License: GPLv2 Url: https://libreswan.org/ Source0: https://download.libreswan.org/%{name}-%{version}.tar.gz @@ -192,6 +192,9 @@ certutil -N -d sql:$tmpdir --empty-password %attr(0644,root,root) %doc %{_mandir}/*/* %changelog +* Mon Sep 19 2023 suwei - 4.12-3 +- Fix loongarch64 patch complie error + * Mon Aug 14 2023 suwei - 4.12-2 - Add loongarch64 support -- Gitee