From 81504b07787278039d26d8f4eddd813d7f238513 Mon Sep 17 00:00:00 2001 From: wzx Date: Wed, 26 Oct 2022 11:35:28 +0800 Subject: [PATCH 1/2] Add sw64 architecture Signed-off-by: wzx (cherry picked from commit bc6aafdafc80218c39d5d545f47ff8cc8d988c0e) --- xinetd-2.3.15-sw.patch | 12 ++++++++++++ xinetd.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100755 xinetd-2.3.15-sw.patch diff --git a/xinetd-2.3.15-sw.patch b/xinetd-2.3.15-sw.patch new file mode 100755 index 0000000..ba31ee9 --- /dev/null +++ b/xinetd-2.3.15-sw.patch @@ -0,0 +1,12 @@ +diff -Naur xinetd-2.3.15.org/xinetd/connection.c xinetd-2.3.15.sw/xinetd/connection.c +--- xinetd-2.3.15.org/xinetd/connection.c 2022-02-25 22:19:06.110000000 +0000 ++++ xinetd-2.3.15.sw/xinetd/connection.c 2022-02-25 22:19:55.660000000 +0000 +@@ -220,7 +220,7 @@ + + tabprint( fd, 1, "service = %s\n", SVC_ID( cp->co_sp ) ) ; + tabprint( fd, 1, "descriptor = %d\n", cp->co_descriptor ) ; +-#if defined(__GNUC__) && !defined(__arch64__) && !defined(__alpha__) ++#if defined(__GNUC__) && !defined(__arch64__) && !defined(__alpha__) && !defined(__sw_64__) + tabprint( fd, 1, "flags = %#llx\n", cp->co_flags ) ; + #else + tabprint( fd, 1, "flags = %#lx\n", cp->co_flags ) ; diff --git a/xinetd.spec b/xinetd.spec index f3cb1fb..0dacb8e 100644 --- a/xinetd.spec +++ b/xinetd.spec @@ -1,7 +1,7 @@ Name: xinetd Epoch: 2 Version: 2.3.15 -Release: 34 +Release: 35 Summary: A super-server daemon that manages Internet-based connectivity License: xinetd URL: https://github.com/openSUSE/xinetd @@ -43,6 +43,7 @@ Patch0029: inet.c-avoid-using-pointer-after-free.patch Patch0030: service.c-avoid-dereferencing-NULL-pointer.patch Patch0031: sconf.c-fix-possible-memleak.patch Patch0032: xinetd-remove-deprecation-warning-about-flask.h-usage.patch +Patch0033: xinetd-2.3.15-sw.patch BuildRequires: autoconf automake libtirpc-devel libselinux-devel >= 1.30 systemd-units BuildRequires: gcc @@ -116,6 +117,12 @@ install -m600 contrib/xinetd.d/* %{buildroot}%{_sysconfdir}/xinetd.d %exclude %{_mandir}/man8/xconv.pl* %changelog +* Wed Oct 26 2022 wuzx - 2:2.3.15-35 +- Type:feature +- CVE:NA +- SUG:NA +- DESC:Add sw64 architecture + * Fri Jun 10 2022 gaihuiying - 2:2.3.15-34 - Type:bugfix - CVE:NA From c10508475ee7e6dd4cca448207892eda47d922bc Mon Sep 17 00:00:00 2001 From: wuzx <471319475@qq.com> Date: Mon, 21 Nov 2022 14:12:28 +0000 Subject: [PATCH 2/2] update xinetd-2.3.15-sw.patch. Signed-off-by: wuzx <471319475@qq.com> --- xinetd-2.3.15-sw.patch | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/xinetd-2.3.15-sw.patch b/xinetd-2.3.15-sw.patch index ba31ee9..71edd2f 100755 --- a/xinetd-2.3.15-sw.patch +++ b/xinetd-2.3.15-sw.patch @@ -1,8 +1,21 @@ -diff -Naur xinetd-2.3.15.org/xinetd/connection.c xinetd-2.3.15.sw/xinetd/connection.c ---- xinetd-2.3.15.org/xinetd/connection.c 2022-02-25 22:19:06.110000000 +0000 -+++ xinetd-2.3.15.sw/xinetd/connection.c 2022-02-25 22:19:55.660000000 +0000 -@@ -220,7 +220,7 @@ - +From 9f9d21dbb75876a42c25d2dccb748ab8c0ecf368 Mon Sep 17 00:00:00 2001 +From: wuzx +Date: Fri, 18 Nov 2022 17:01:54 +0800 +Subject: [PATCH] Add sw64 architecture + +Add sw64 architecture in file xinetd/connection.c to support sw64 architecture. + +Signed-off-by: wuzx +--- + xinetd/connection.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xinetd/connection.c b/xinetd/connection.c +index 7ba6261..3793bc9 100644 +--- a/xinetd/connection.c ++++ b/xinetd/connection.c +@@ -220,7 +220,7 @@ void conn_dump( const connection_s *cp, int fd ) + tabprint( fd, 1, "service = %s\n", SVC_ID( cp->co_sp ) ) ; tabprint( fd, 1, "descriptor = %d\n", cp->co_descriptor ) ; -#if defined(__GNUC__) && !defined(__arch64__) && !defined(__alpha__) @@ -10,3 +23,5 @@ diff -Naur xinetd-2.3.15.org/xinetd/connection.c xinetd-2.3.15.sw/xinetd/connect tabprint( fd, 1, "flags = %#llx\n", cp->co_flags ) ; #else tabprint( fd, 1, "flags = %#lx\n", cp->co_flags ) ; +-- +2.33.0