Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
915317d463
!25 [sync] PR-20: [Lightweight PR]: update xinetd-2.3.15-sw.patch.
From: @openeuler-sync-bot 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
2022-12-12 08:16:47 +00:00
wuzx
45eedc326d update xinetd-2.3.15-sw.patch.
Signed-off-by: wuzx <471319475@qq.com>
(cherry picked from commit c10508475ee7e6dd4cca448207892eda47d922bc)
2022-12-12 15:20:47 +08:00
openeuler-ci-bot
fa63d9dbba
!22 [sync] PR-18: 添加sw架构
From: @openeuler-sync-bot 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
2022-12-12 07:01:33 +00:00
wzx
3b972ec783 Add sw64 architecture
Signed-off-by: wzx <wuzx1226@qq.com>
(cherry picked from commit bc6aafdafc80218c39d5d545f47ff8cc8d988c0e)
2022-12-12 10:03:36 +08:00
openeuler-ci-bot
cc16d7e707
!15 add Restart=on-failure in xinetd.service
From: @eaglegai 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
2022-06-15 09:15:19 +00:00
eaglegai
e900104a94 add Restart=on-failure in xinetd.service 2022-06-10 14:21:43 +08:00
openeuler-ci-bot
88001d4b46 !10 change URL
From: @eaglegai
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng
2021-06-02 10:38:50 +08:00
eaglegai
5908238291 change URL 2021-06-01 15:41:28 +08:00
openeuler-ci-bot
960938fef7 !9 Add the compilation dependency of gcc.
From: @lijingyuan007
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng
2021-05-27 21:25:01 +08:00
lijingyuan007
7d680aa136 Add the compilation dependency of gcc. 2021-05-27 10:56:38 +08:00
3 changed files with 56 additions and 2 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

@ -10,6 +10,7 @@ Type=forking
PIDFile=/var/run/xinetd.pid PIDFile=/var/run/xinetd.pid
ExecStart=/usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid ExecStart=/usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid
ExecReload=/usr/bin/kill -HUP $MAINPID ExecReload=/usr/bin/kill -HUP $MAINPID
Restart=on-failure
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -1,10 +1,10 @@
Name: xinetd Name: xinetd
Epoch: 2 Epoch: 2
Version: 2.3.15 Version: 2.3.15
Release: 31 Release: 35
Summary: A super-server daemon that manages Internet-based connectivity Summary: A super-server daemon that manages Internet-based connectivity
License: xinetd License: xinetd
URL: https://github.com/xinetd-org/xinetd URL: https://github.com/openSUSE/xinetd
Source0: https://ftp.osuosl.org/pub/blfs/conglomeration/xinetd/%{name}-%{version}.tar.gz Source0: https://ftp.osuosl.org/pub/blfs/conglomeration/xinetd/%{name}-%{version}.tar.gz
Source1: xinetd.service Source1: xinetd.service
@ -43,8 +43,10 @@ Patch0029: inet.c-avoid-using-pointer-after-free.patch
Patch0030: service.c-avoid-dereferencing-NULL-pointer.patch Patch0030: service.c-avoid-dereferencing-NULL-pointer.patch
Patch0031: sconf.c-fix-possible-memleak.patch Patch0031: sconf.c-fix-possible-memleak.patch
Patch0032: xinetd-remove-deprecation-warning-about-flask.h-usage.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: autoconf automake libtirpc-devel libselinux-devel >= 1.30 systemd-units
BuildRequires: gcc
Requires: filesystem >= 2.0.1 setup Requires: filesystem >= 2.0.1 setup
Requires(post): systemd-sysv systemd-units Requires(post): systemd-sysv systemd-units
Requires(preun): systemd-units Requires(preun): systemd-units
@ -115,6 +117,30 @@ install -m600 contrib/xinetd.d/* %{buildroot}%{_sysconfdir}/xinetd.d
%exclude %{_mandir}/man8/xconv.pl* %exclude %{_mandir}/man8/xconv.pl*
%changelog %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
- SUG:NA
- DESC:add Restart=on-failure in xinetd.service
* Tue Jun 1 2021 gaihuiying <gaihuiying1@huawei.com> - 2:2.3.15-33
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:change URL
* Thu May 27 2021 lijingyuan <lijingyuan3@huawei.com> - 2:2.3.15-32
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Add the compilation dependency of gcc.
* Thu Sep 10 2020 hanzhijun<hanzhijun11@huawei.com> - 2:2.3.15-31 * Thu Sep 10 2020 hanzhijun<hanzhijun11@huawei.com> - 2:2.3.15-31
- solve source url problem - solve source url problem