!19 [sync] PR-18: 添加sw架构

From: @openeuler-sync-bot 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2022-11-25 09:27:46 +00:00 committed by Gitee
commit eb215e1d4e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 35 additions and 1 deletions

27
xinetd-2.3.15-sw.patch Executable file
View File

@ -0,0 +1,27 @@
From 9f9d21dbb75876a42c25d2dccb748ab8c0ecf368 Mon Sep 17 00:00:00 2001
From: wuzx <wuzx1226@qq.com>
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 <wuzx1226@qq.com>
---
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__)
+#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 ) ;
--
2.33.0

View File

@ -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<wuzx1226@qq.com> - 2:2.3.15-35
- Type:feature
- CVE:NA
- SUG:NA
- DESC:Add sw64 architecture
* Fri Jun 10 2022 gaihuiying <eaglegai@163.com> - 2:2.3.15-34
- Type:bugfix
- CVE:NA