/[gentoo-x86]/app-admin/setools/files/fix-check-role_set_expand-libsepol-2.1.0.patch
Gentoo

Contents of /app-admin/setools/files/fix-check-role_set_expand-libsepol-2.1.0.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Fri Aug 19 17:16:46 2011 UTC (3 years, 2 months ago) by swift
Branch: MAIN
CVS Tags: HEAD
Fix bug #378943 - setools-3.3.7 fails to build with new selinux userspace utilities (libsepol-2.1.0)

(Portage version: 2.1.10.3/cvs/Linux x86_64)

1 diff -ur setools-3.3.7.orig/configure.ac setools-3.3.7/configure.ac
2 --- setools-3.3.7.orig/configure.ac 2011-08-12 19:20:32.651000078 +0200
3 +++ setools-3.3.7/configure.ac 2011-08-12 19:20:42.224000036 +0200
4 @@ -503,7 +503,7 @@
5 [AC_LANG_SOURCE([
6 #include <sepol/policydb/expand.h>
7 int main () {
8 - return role_set_expand(NULL, NULL, NULL, NULL);
9 + return role_set_expand(NULL, NULL, NULL, NULL, NULL);
10 }])],
11 sepol_new_user_role_mapping="yes",
12 sepol_new_user_role_mapping="no")
13 diff -ur setools-3.3.7.orig/libqpol/src/policy_define.c setools-3.3.7/libqpol/src/policy_define.c
14 --- setools-3.3.7.orig/libqpol/src/policy_define.c 2011-08-12 19:20:32.657000013 +0200
15 +++ setools-3.3.7/libqpol/src/policy_define.c 2011-08-12 19:20:53.907005864 +0200
16 @@ -2133,7 +2133,7 @@
17
18 /* This ebitmap business is just to ensure that there are not conflicting role_trans rules */
19 #ifdef HAVE_SEPOL_USER_ROLE_MAPPING
20 - if (role_set_expand(&roles, &e_roles, policydbp, NULL))
21 + if (role_set_expand(&roles, &e_roles, policydbp, NULL, NULL))
22 #else
23 if (role_set_expand(&roles, &e_roles, policydbp))
24 #endif

  ViewVC Help
Powered by ViewVC 1.1.20