From da646bff435ae512a8d5b842952b1d4b22508855 Mon Sep 17 00:00:00 2001 From: eaglegai Date: Mon, 21 Sep 2020 17:27:46 +0800 Subject: [PATCH] fix build error --- ...recation-warning-about-flask.h-usage.patch | 31 ++++++++ xinetd.spec | 76 ++++++++++--------- 2 files changed, 71 insertions(+), 36 deletions(-) create mode 100644 xinetd-remove-deprecation-warning-about-flask.h-usage.patch diff --git a/xinetd-remove-deprecation-warning-about-flask.h-usage.patch b/xinetd-remove-deprecation-warning-about-flask.h-usage.patch new file mode 100644 index 0000000..ceb2342 --- /dev/null +++ b/xinetd-remove-deprecation-warning-about-flask.h-usage.patch @@ -0,0 +1,31 @@ +From a192cc0244da275615edd18118afcc249dd4e53d Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach +Date: Tue, 7 Apr 2020 11:56:52 +0200 +Subject: [PATCH] Remove deprecation warning about flask.h usage + +flask.h has been deprecated for a long time and will be dropped completely from +the next SELinux userspace release. +--- +diff -up xinetd-2.3.15/xinetd/child.c.remove-flaskh xinetd-2.3.15/xinetd/child.c +--- xinetd-2.3.15/xinetd/child.c.remove-flaskh 2020-04-07 12:28:52.538123162 +0200 ++++ xinetd-2.3.15/xinetd/child.c 2020-04-07 12:28:58.980980069 +0200 +@@ -33,7 +33,6 @@ + #endif + #ifdef LABELED_NET + #include +-#include + #include + #endif + +@@ -551,7 +550,7 @@ static int set_context_from_socket( cons + if (!(new_context = context_str(bcon))) + goto fail; + +- if (security_compute_create(new_context, exec_context, SECCLASS_PROCESS, ++ if (security_compute_create(new_context, exec_context, string_to_security_class("process"), + &new_exec_context) < 0) + goto fail; + +-- +1.8.3.1 + diff --git a/xinetd.spec b/xinetd.spec index 0c27c92..0f96e5c 100644 --- a/xinetd.spec +++ b/xinetd.spec @@ -1,47 +1,45 @@ Name: xinetd Epoch: 2 Version: 2.3.15 -Release: 29 +Release: 30 Summary: A super-server daemon that manages Internet-based connectivity License: xinetd URL: https://github.com/xinetd-org/xinetd -Source0: %{name}-%{version}.tar.gz +Source0: https://ftp.osuosl.org/pub/blfs/conglomeration/xinetd/%{name}-%{version}.tar.gz Source1: xinetd.service -#patches from the opensource fedora/redhat repository -Patch0001: xinetd-2.3.15-add-pie.patch -Patch0002: xinetd-2.3.14-bind-ipv6.patch -Patch0003: xinetd-2.3.14-man-section.patch -Patch0004: xinetd-2.3.14-ident-bind.patch -Patch0005: xinetd-2.3.14-readable-debuginfo.patch -Patch0006: xinetd-2.3.14-autoconf.patch -Patch0007: xinetd-2.3.14-poll.patch -Patch0008: xinetd-2.3.14-file-limit.patch -Patch0009: xinetd-2.3.14-tcpmux.patch -Patch0010: xinetd-2.3.14-clean-pfd.patch -Patch0011: xinetd-2.3.14-ipv6confusion.patch -Patch0012: xinetd-2.3.14-udp-reconfig.patch -Patch0013: xinetd-2.3.14-rpc-specific-port.patch -Patch0014: xinetd-2.3.14-signal-log-hang.patch -Patch0015: xinetd-2.3.14-fix-type-punned-ptr.patch -Patch0016: xinetd-2.3.14-leaking-fds.patch -Patch0017: xinetd-2.3.14-many-services.patch -Patch0018: xinetd-2.3.14-realloc-remove.patch -Patch0019: xinetd-2.3.14-leaking-fds-2a.patch -Patch0020: xinetd-2.3.14-instances.patch -Patch0021: xinetd-2.3.14-retry-svc-activate-in-cps-restart.patch -Patch0022: xinetd-2.3.15-bad-port-check.patch -Patch0023: xinetd-2.3.15-context-exepath.patch -Patch0024: xinetd-2.3.15-creds.patch -Patch0025: xinetd-2.3.15-tcpmux-nameinargs-disable-service.patch -Patch0026: xinetd-2.3.15-udp-wait.patch - -#backport patches -Patch6001: connection.c-fix-pointer-dereference-before-NULL-che.patch -Patch6002: tcpint.c-fix-memleak.patch -Patch6003: inet.c-avoid-using-pointer-after-free.patch -Patch6004: service.c-avoid-dereferencing-NULL-pointer.patch -Patch6005: sconf.c-fix-possible-memleak.patch +Patch0: xinetd-2.3.15-add-pie.patch +Patch1: xinetd-2.3.14-bind-ipv6.patch +Patch2: xinetd-2.3.14-man-section.patch +Patch3: xinetd-2.3.14-ident-bind.patch +Patch4: xinetd-2.3.14-readable-debuginfo.patch +Patch5: xinetd-2.3.14-autoconf.patch +Patch6: xinetd-2.3.14-poll.patch +Patch7: xinetd-2.3.14-file-limit.patch +Patch8: xinetd-2.3.14-tcpmux.patch +Patch9: xinetd-2.3.14-clean-pfd.patch +Patch10: xinetd-2.3.14-ipv6confusion.patch +Patch11: xinetd-2.3.14-udp-reconfig.patch +Patch12: xinetd-2.3.14-rpc-specific-port.patch +Patch13: xinetd-2.3.14-signal-log-hang.patch +Patch14: xinetd-2.3.14-fix-type-punned-ptr.patch +Patch15: xinetd-2.3.14-leaking-fds.patch +Patch16: xinetd-2.3.14-many-services.patch +Patch17: xinetd-2.3.14-realloc-remove.patch +Patch18: xinetd-2.3.14-leaking-fds-2a.patch +Patch19: xinetd-2.3.14-instances.patch +Patch20: xinetd-2.3.14-retry-svc-activate-in-cps-restart.patch +Patch21: xinetd-2.3.15-bad-port-check.patch +Patch22: xinetd-2.3.15-context-exepath.patch +Patch23: xinetd-2.3.15-creds.patch +Patch24: xinetd-2.3.15-tcpmux-nameinargs-disable-service.patch +Patch25: xinetd-2.3.15-udp-wait.patch +Patch26: connection.c-fix-pointer-dereference-before-NULL-che.patch +Patch27: tcpint.c-fix-memleak.patch +Patch28: inet.c-avoid-using-pointer-after-free.patch +Patch29: service.c-avoid-dereferencing-NULL-pointer.patch +Patch30: sconf.c-fix-possible-memleak.patch +Patch31: xinetd-remove-deprecation-warning-about-flask.h-usage.patch BuildRequires: autoconf automake libtirpc-devel libselinux-devel >= 1.30 systemd-units Requires: filesystem >= 2.0.1 setup @@ -114,6 +112,12 @@ install -m600 contrib/xinetd.d/* %{buildroot}%{_sysconfdir}/xinetd.d %exclude %{_mandir}/man8/xconv.pl* %changelog +* Mon Sep 21 2020 gaihuiying - 2:2.3.15-30 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix build error + * Tue Dec 24 2019 openEuler Buildteam - 2:2.3.15-29 - Type:bugfix - ID:NA