Accepting request 235491 from security:SELinux

- add patch: setools-3.3.7-libselinux-2.3.patch
  fix build with libselinux-2.3 (forwarded request 235465 from oertel)

OBS-URL: https://build.opensuse.org/request/show/235491
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/setools?expand=0&rev=24
This commit is contained in:
Stephan Kulow 2014-05-27 16:30:21 +00:00 committed by Git OBS Bridge
commit 4fde73c1fe
3 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,20 @@
--- a/secmds/replcon.cc
+++ b/secmds/replcon.cc
@@ -60,7 +60,7 @@
{NULL, 0, NULL, 0}
};
-extern int lsetfilecon_raw(const char *, security_context_t) __attribute__ ((weak));
+extern int lsetfilecon_raw(const char *, const char *) __attribute__ ((weak));
/**
* As that setools must work with older libselinux versions that may
@@ -68,7 +68,7 @@
* does indeed have the new functions then use them; otherwise
* fallback to the originals.
*/
-static int replcon_lsetfilecon(const char *path, security_context_t context)
+static int replcon_lsetfilecon(const char *path, const char *context)
{
if (lsetfilecon_raw != NULL)
{

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon May 26 20:47:23 CEST 2014 - ro@suse.de
- add patch: setools-3.3.7-libselinux-2.3.patch
fix build with libselinux-2.3
-------------------------------------------------------------------
Fri Oct 11 15:36:20 UTC 2013 - vcizek@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package setools
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -43,6 +43,7 @@ Patch11: 0003-Since-we-do-not-ship-neverallow-rules-all-always-fai.patch
Patch15: 0006-Changes-to-support-named-file_trans-rules.patch
Patch16: 0007-Remove-unused-variables.patch
Patch23: add-to-header-define_cond_filename_trans.patch
Patch24: setools-3.3.7-libselinux-2.3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
@ -237,6 +238,7 @@ This package includes the following graphical tools:
%patch15 -p1
%patch16 -p1
%patch23 -p1
%patch24 -p1
%build
autoreconf -fi