- Update to Upstream
Allow shell-style wildcards in x_contexts file.
This commit is contained in:
Daniel J Walsh
parent
f53982306d
commit
4d61602917
|
|
@ -1,6 +1,6 @@
|
|||
diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.75/man/man8/selinuxconlist.8
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.76/man/man8/selinuxconlist.8
|
||||
--- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ libselinux-2.0.75/man/man8/selinuxconlist.8 2008-11-14 12:05:38.000000000 -0500
|
||||
+++ libselinux-2.0.76/man/man8/selinuxconlist.8 2008-11-22 15:57:58.000000000 -0500
|
||||
@@ -0,0 +1,18 @@
|
||||
+.TH "selinuxconlist" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation"
|
||||
+.SH "NAME"
|
||||
|
|
@ -20,9 +20,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 lib
|
|||
+
|
||||
+.SH "SEE ALSO"
|
||||
+secon(8), selinuxdefcon(8)
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.75/man/man8/selinuxdefcon.8
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.76/man/man8/selinuxdefcon.8
|
||||
--- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ libselinux-2.0.75/man/man8/selinuxdefcon.8 2008-11-14 12:05:38.000000000 -0500
|
||||
+++ libselinux-2.0.76/man/man8/selinuxdefcon.8 2008-11-22 15:57:58.000000000 -0500
|
||||
@@ -0,0 +1,19 @@
|
||||
+.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation"
|
||||
+.SH "NAME"
|
||||
|
|
@ -43,9 +43,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libs
|
|||
+
|
||||
+.SH "SEE ALSO"
|
||||
+secon(8), selinuxconlist(8)
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.75/src/callbacks.c
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.76/src/callbacks.c
|
||||
--- nsalibselinux/src/callbacks.c 2008-08-28 09:34:24.000000000 -0400
|
||||
+++ libselinux-2.0.75/src/callbacks.c 2008-11-14 12:05:38.000000000 -0500
|
||||
+++ libselinux-2.0.76/src/callbacks.c 2008-11-22 15:57:58.000000000 -0500
|
||||
@@ -16,6 +16,7 @@
|
||||
{
|
||||
int rc;
|
||||
|
|
@ -54,31 +54,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.
|
|||
va_start(ap, fmt);
|
||||
rc = vfprintf(stderr, fmt, ap);
|
||||
va_end(ap);
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/label_x.c libselinux-2.0.75/src/label_x.c
|
||||
--- nsalibselinux/src/label_x.c 2008-08-28 09:34:24.000000000 -0400
|
||||
+++ libselinux-2.0.75/src/label_x.c 2008-11-17 10:25:12.000000000 -0500
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
+#include <fnmatch.h>
|
||||
#include "callbacks.h"
|
||||
#include "label_internal.h"
|
||||
|
||||
@@ -199,9 +200,7 @@
|
||||
for (i = 0; i < data->nspec; i++) {
|
||||
if (spec_arr[i].type != type)
|
||||
continue;
|
||||
- if (!strncmp(spec_arr[i].key, "*", 2))
|
||||
- break;
|
||||
- if (!strncmp(spec_arr[i].key, key, strlen(key) + 1))
|
||||
+ if (!fnmatch(spec_arr[i].key, key, 0))
|
||||
break;
|
||||
}
|
||||
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.75/src/matchpathcon.c
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.76/src/matchpathcon.c
|
||||
--- nsalibselinux/src/matchpathcon.c 2008-08-28 09:34:24.000000000 -0400
|
||||
+++ libselinux-2.0.75/src/matchpathcon.c 2008-11-14 12:05:38.000000000 -0500
|
||||
+++ libselinux-2.0.76/src/matchpathcon.c 2008-11-22 15:58:02.000000000 -0500
|
||||
@@ -2,6 +2,7 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
|
@ -96,9 +74,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux
|
|||
va_end(ap);
|
||||
}
|
||||
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.75/src/selinux.py
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.76/src/selinux.py
|
||||
--- nsalibselinux/src/selinux.py 2008-08-28 09:34:24.000000000 -0400
|
||||
+++ libselinux-2.0.75/src/selinux.py 2008-11-14 17:09:54.000000000 -0500
|
||||
+++ libselinux-2.0.76/src/selinux.py 2008-11-22 15:58:02.000000000 -0500
|
||||
@@ -1,5 +1,5 @@
|
||||
# This file was automatically generated by SWIG (http://www.swig.org).
|
||||
-# Version 1.3.33
|
||||
|
|
@ -136,28 +114,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0
|
|||
is_selinux_enabled = _selinux.is_selinux_enabled
|
||||
is_selinux_mls_enabled = _selinux.is_selinux_mls_enabled
|
||||
getcon = _selinux.getcon
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.75/src/selinuxswig.i
|
||||
--- nsalibselinux/src/selinuxswig.i 2008-08-28 09:34:24.000000000 -0400
|
||||
+++ libselinux-2.0.75/src/selinuxswig.i 2008-11-14 16:55:43.000000000 -0500
|
||||
@@ -2,6 +2,7 @@
|
||||
* James Athey
|
||||
*/
|
||||
|
||||
+
|
||||
%module selinux
|
||||
%{
|
||||
#include "selinux/selinux.h"
|
||||
@@ -10,6 +11,7 @@
|
||||
#include "../include/selinux/get_default_type.h"
|
||||
#include "../include/selinux/get_context_list.h"
|
||||
%}
|
||||
+
|
||||
%apply int *OUTPUT { int *enforce };
|
||||
%apply int *OUTPUT { size_t * };
|
||||
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.75/src/selinuxswig_python.i
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.76/src/selinuxswig_python.i
|
||||
--- nsalibselinux/src/selinuxswig_python.i 2008-08-28 09:34:24.000000000 -0400
|
||||
+++ libselinux-2.0.75/src/selinuxswig_python.i 2008-11-14 17:09:50.000000000 -0500
|
||||
+++ libselinux-2.0.76/src/selinuxswig_python.i 2008-11-22 15:58:02.000000000 -0500
|
||||
@@ -6,6 +6,32 @@
|
||||
#include "selinux/selinux.h"
|
||||
%}
|
||||
|
|
@ -191,9 +150,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libs
|
|||
/* security_get_boolean_names() typemap */
|
||||
%typemap(argout) (char ***names, int *len) {
|
||||
PyObject* list = PyList_New(*$2);
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.75/src/selinuxswig_wrap.c
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.76/src/selinuxswig_wrap.c
|
||||
--- nsalibselinux/src/selinuxswig_wrap.c 2008-08-28 09:34:24.000000000 -0400
|
||||
+++ libselinux-2.0.75/src/selinuxswig_wrap.c 2008-11-14 17:09:54.000000000 -0500
|
||||
+++ libselinux-2.0.76/src/selinuxswig_wrap.c 2008-11-22 15:58:02.000000000 -0500
|
||||
@@ -1,6 +1,6 @@
|
||||
/* ----------------------------------------------------------------------------
|
||||
* This file was automatically generated by SWIG (http://www.swig.org).
|
||||
|
|
|
|||
Loading…
Reference in New Issue