fix build error
This commit is contained in:
parent
2db8f12ea1
commit
ee12ee0b05
31
xinetd-remove-deprecation-warning-about-flask.h-usage.patch
Normal file
31
xinetd-remove-deprecation-warning-about-flask.h-usage.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From a192cc0244da275615edd18118afcc249dd4e53d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Petr Lautrbach <plautrba@redhat.com>
|
||||||
|
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 <selinux/selinux.h>
|
||||||
|
-#include <selinux/flask.h>
|
||||||
|
#include <selinux/context.h>
|
||||||
|
#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
|
||||||
|
|
||||||
19
xinetd.spec
19
xinetd.spec
@ -1,7 +1,7 @@
|
|||||||
Name: xinetd
|
Name: xinetd
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
Version: 2.3.15
|
Version: 2.3.15
|
||||||
Release: 29
|
Release: 30
|
||||||
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/xinetd-org/xinetd
|
||||||
@ -37,11 +37,12 @@ Patch0025: xinetd-2.3.15-tcpmux-nameinargs-disable-service.patch
|
|||||||
Patch0026: xinetd-2.3.15-udp-wait.patch
|
Patch0026: xinetd-2.3.15-udp-wait.patch
|
||||||
|
|
||||||
#backport patches
|
#backport patches
|
||||||
Patch6001: connection.c-fix-pointer-dereference-before-NULL-che.patch
|
Patch0027: connection.c-fix-pointer-dereference-before-NULL-che.patch
|
||||||
Patch6002: tcpint.c-fix-memleak.patch
|
Patch0028: tcpint.c-fix-memleak.patch
|
||||||
Patch6003: inet.c-avoid-using-pointer-after-free.patch
|
Patch0029: inet.c-avoid-using-pointer-after-free.patch
|
||||||
Patch6004: service.c-avoid-dereferencing-NULL-pointer.patch
|
Patch0030: service.c-avoid-dereferencing-NULL-pointer.patch
|
||||||
Patch6005: sconf.c-fix-possible-memleak.patch
|
Patch0031: sconf.c-fix-possible-memleak.patch
|
||||||
|
Patch0032: xinetd-remove-deprecation-warning-about-flask.h-usage.patch
|
||||||
|
|
||||||
BuildRequires: autoconf automake libtirpc-devel libselinux-devel >= 1.30 systemd-units
|
BuildRequires: autoconf automake libtirpc-devel libselinux-devel >= 1.30 systemd-units
|
||||||
Requires: filesystem >= 2.0.1 setup
|
Requires: filesystem >= 2.0.1 setup
|
||||||
@ -114,6 +115,12 @@ install -m600 contrib/xinetd.d/* %{buildroot}%{_sysconfdir}/xinetd.d
|
|||||||
%exclude %{_mandir}/man8/xconv.pl*
|
%exclude %{_mandir}/man8/xconv.pl*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 03 2020 gaihuiying <gaihuiying1@huawei.com> - 2:2.3.15-30
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix build error
|
||||||
|
|
||||||
* Tue Dec 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 2:2.3.15-29
|
* Tue Dec 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 2:2.3.15-29
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user