Merged patch from Todd Miller to remove sscanf in matchpathcon.c because of
the use of the non-standard format %as. (original patch changed for
style).
Merged patch from Todd Miller to fix memory leak in matchpathcon.c.
Fri Jan 19 2007 Dan Walsh <dwalsh@redhat.com> - 1.34.0-2
- Add context function to python to split context into 4 parts
This commit is contained in:
Daniel J Walsh
parent
ad1a6889cc
commit
29ad08b8d0
|
|
@ -104,3 +104,5 @@ libselinux-1.33.4.tgz
|
|||
libselinux-1.33.5.tgz
|
||||
libselinux-1.33.6.tgz
|
||||
libselinux-1.34.0.tgz
|
||||
libselinux-1.34.1.tgz
|
||||
libselinux-2.0.0.tgz
|
||||
|
|
|
|||
|
|
@ -1,160 +1,188 @@
|
|||
Binary files nsalibselinux/src/selinux.pyc and libselinux-1.34.0/src/selinux.pyc differ
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.34.0/src/selinuxswig.i
|
||||
--- nsalibselinux/src/selinuxswig.i 2006-11-16 17:15:25.000000000 -0500
|
||||
+++ libselinux-1.34.0/src/selinuxswig.i 2007-01-24 12:16:39.000000000 -0500
|
||||
@@ -25,7 +25,7 @@
|
||||
%apply int *OUTPUT { int * };
|
||||
%apply int *OUTPUT { size_t * };
|
||||
|
||||
-%typemap(in, numinputs=0) security_context_t *(security_context_t temp) {
|
||||
+%typemap(in, numinputs=0) security_context_t *(security_context_t temp=NULL) {
|
||||
--- nsalibselinux/src/selinuxswig.i 2007-01-26 16:19:52.000000000 -0500
|
||||
+++ libselinux-1.34.0/src/selinuxswig.i 2007-01-24 13:37:27.000000000 -0500
|
||||
@@ -28,7 +28,7 @@
|
||||
%typemap(in, numinputs=0) security_context_t *(security_context_t temp=NULL) {
|
||||
$1 = &temp;
|
||||
}
|
||||
%typemap(argout) security_context_t * (char *temp) {
|
||||
-%typemap(argout) security_context_t * (char *temp) {
|
||||
+%typemap(argout) security_context_t * (char *temp=NULL) {
|
||||
if (*$1)
|
||||
temp = *$1;
|
||||
else
|
||||
@@ -126,7 +126,7 @@
|
||||
extern int selinux_raw_to_trans_context(char *raw,
|
||||
security_context_t *transp);
|
||||
|
||||
-%typemap(in, numinputs=0) char **(char *temp) {
|
||||
+%typemap(in, numinputs=0) char **(char *temp=NULL) {
|
||||
$1 = &temp;
|
||||
}
|
||||
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-1.34.0/src/selinuxswig_wrap.c
|
||||
--- nsalibselinux/src/selinuxswig_wrap.c 2006-11-16 17:15:25.000000000 -0500
|
||||
+++ libselinux-1.34.0/src/selinuxswig_wrap.c 2007-01-24 12:16:58.000000000 -0500
|
||||
@@ -2831,7 +2831,7 @@
|
||||
PyObject *resultobj = 0;
|
||||
--- nsalibselinux/src/selinuxswig_wrap.c 2007-01-26 16:19:52.000000000 -0500
|
||||
+++ libselinux-1.34.0/src/selinuxswig_wrap.c 2007-01-24 13:38:47.000000000 -0500
|
||||
@@ -2832,7 +2832,7 @@
|
||||
security_context_t *arg1 = (security_context_t *) 0 ;
|
||||
int result;
|
||||
- security_context_t temp1 ;
|
||||
+ security_context_t temp1 = NULL ;
|
||||
char *temp10 ;
|
||||
security_context_t temp1 = NULL ;
|
||||
- char *temp10 ;
|
||||
+ char *temp10 = NULL ;
|
||||
|
||||
{
|
||||
@@ -2878,7 +2878,7 @@
|
||||
int result;
|
||||
arg1 = &temp1;
|
||||
@@ -2879,7 +2879,7 @@
|
||||
int val1 ;
|
||||
int ecode1 = 0 ;
|
||||
- security_context_t temp2 ;
|
||||
+ security_context_t temp2 = NULL ;
|
||||
char *temp20 ;
|
||||
security_context_t temp2 = NULL ;
|
||||
- char *temp20 ;
|
||||
+ char *temp20 = NULL ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
@@ -2910,7 +2910,7 @@
|
||||
PyObject *resultobj = 0;
|
||||
{
|
||||
@@ -2911,7 +2911,7 @@
|
||||
security_context_t *arg1 = (security_context_t *) 0 ;
|
||||
int result;
|
||||
- security_context_t temp1 ;
|
||||
+ security_context_t temp1 = NULL ;
|
||||
char *temp10 ;
|
||||
security_context_t temp1 = NULL ;
|
||||
- char *temp10 ;
|
||||
+ char *temp10 = NULL ;
|
||||
|
||||
{
|
||||
@@ -2936,7 +2936,7 @@
|
||||
PyObject *resultobj = 0;
|
||||
arg1 = &temp1;
|
||||
@@ -2937,7 +2937,7 @@
|
||||
security_context_t *arg1 = (security_context_t *) 0 ;
|
||||
int result;
|
||||
- security_context_t temp1 ;
|
||||
+ security_context_t temp1 = NULL ;
|
||||
char *temp10 ;
|
||||
security_context_t temp1 = NULL ;
|
||||
- char *temp10 ;
|
||||
+ char *temp10 = NULL ;
|
||||
|
||||
{
|
||||
@@ -2980,7 +2980,7 @@
|
||||
PyObject *resultobj = 0;
|
||||
arg1 = &temp1;
|
||||
@@ -2981,7 +2981,7 @@
|
||||
security_context_t *arg1 = (security_context_t *) 0 ;
|
||||
int result;
|
||||
- security_context_t temp1 ;
|
||||
+ security_context_t temp1 = NULL ;
|
||||
char *temp10 ;
|
||||
security_context_t temp1 = NULL ;
|
||||
- char *temp10 ;
|
||||
+ char *temp10 = NULL ;
|
||||
|
||||
{
|
||||
@@ -3024,7 +3024,7 @@
|
||||
PyObject *resultobj = 0;
|
||||
arg1 = &temp1;
|
||||
@@ -3025,7 +3025,7 @@
|
||||
security_context_t *arg1 = (security_context_t *) 0 ;
|
||||
int result;
|
||||
- security_context_t temp1 ;
|
||||
+ security_context_t temp1 = NULL ;
|
||||
char *temp10 ;
|
||||
security_context_t temp1 = NULL ;
|
||||
- char *temp10 ;
|
||||
+ char *temp10 = NULL ;
|
||||
|
||||
{
|
||||
@@ -3068,7 +3068,7 @@
|
||||
PyObject *resultobj = 0;
|
||||
arg1 = &temp1;
|
||||
@@ -3069,7 +3069,7 @@
|
||||
security_context_t *arg1 = (security_context_t *) 0 ;
|
||||
int result;
|
||||
- security_context_t temp1 ;
|
||||
+ security_context_t temp1 = NULL ;
|
||||
char *temp10 ;
|
||||
security_context_t temp1 = NULL ;
|
||||
- char *temp10 ;
|
||||
+ char *temp10 = NULL ;
|
||||
|
||||
{
|
||||
@@ -3116,7 +3116,7 @@
|
||||
int res1 ;
|
||||
arg1 = &temp1;
|
||||
@@ -3117,7 +3117,7 @@
|
||||
char *buf1 = 0 ;
|
||||
int alloc1 = 0 ;
|
||||
- security_context_t temp2 ;
|
||||
+ security_context_t temp2 = NULL ;
|
||||
char *temp20 ;
|
||||
security_context_t temp2 = NULL ;
|
||||
- char *temp20 ;
|
||||
+ char *temp20 = NULL ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
@@ -3154,7 +3154,7 @@
|
||||
int res1 ;
|
||||
{
|
||||
@@ -3155,7 +3155,7 @@
|
||||
char *buf1 = 0 ;
|
||||
int alloc1 = 0 ;
|
||||
- security_context_t temp2 ;
|
||||
+ security_context_t temp2 = NULL ;
|
||||
char *temp20 ;
|
||||
security_context_t temp2 = NULL ;
|
||||
- char *temp20 ;
|
||||
+ char *temp20 = NULL ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
@@ -3191,7 +3191,7 @@
|
||||
int result;
|
||||
{
|
||||
@@ -3192,7 +3192,7 @@
|
||||
int val1 ;
|
||||
int ecode1 = 0 ;
|
||||
- security_context_t temp2 ;
|
||||
+ security_context_t temp2 = NULL ;
|
||||
char *temp20 ;
|
||||
security_context_t temp2 = NULL ;
|
||||
- char *temp20 ;
|
||||
+ char *temp20 = NULL ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
@@ -3313,7 +3313,7 @@
|
||||
int result;
|
||||
{
|
||||
@@ -3314,7 +3314,7 @@
|
||||
int val1 ;
|
||||
int ecode1 = 0 ;
|
||||
- security_context_t temp2 ;
|
||||
+ security_context_t temp2 = NULL ;
|
||||
char *temp20 ;
|
||||
security_context_t temp2 = NULL ;
|
||||
- char *temp20 ;
|
||||
+ char *temp20 = NULL ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
@@ -3474,7 +3474,7 @@
|
||||
security_context_t arg1 ;
|
||||
{
|
||||
@@ -3475,7 +3475,7 @@
|
||||
security_context_t *arg2 = (security_context_t *) 0 ;
|
||||
int result;
|
||||
- security_context_t temp2 ;
|
||||
+ security_context_t temp2 = NULL ;
|
||||
char *temp20 ;
|
||||
security_context_t temp2 = NULL ;
|
||||
- char *temp20 ;
|
||||
+ char *temp20 = NULL ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
@@ -3734,7 +3734,7 @@
|
||||
int alloc1 = 0 ;
|
||||
{
|
||||
@@ -3735,7 +3735,7 @@
|
||||
unsigned int val2 ;
|
||||
int ecode2 = 0 ;
|
||||
- security_context_t temp3 ;
|
||||
+ security_context_t temp3 = NULL ;
|
||||
char *temp30 ;
|
||||
security_context_t temp3 = NULL ;
|
||||
- char *temp30 ;
|
||||
+ char *temp30 = NULL ;
|
||||
PyObject * obj0 = 0 ;
|
||||
PyObject * obj1 = 0 ;
|
||||
@@ -3778,7 +3778,7 @@
|
||||
|
||||
@@ -3779,7 +3779,7 @@
|
||||
char *buf1 = 0 ;
|
||||
int alloc1 = 0 ;
|
||||
security_context_t temp2 = NULL ;
|
||||
- char *temp20 ;
|
||||
+ char *temp20 = NULL ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
{
|
||||
@@ -4213,7 +4213,7 @@
|
||||
char *buf1 = 0 ;
|
||||
int alloc1 = 0 ;
|
||||
security_context_t temp2 = NULL ;
|
||||
- char *temp20 ;
|
||||
+ char *temp20 = NULL ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
{
|
||||
@@ -4251,7 +4251,7 @@
|
||||
char *buf1 = 0 ;
|
||||
int alloc1 = 0 ;
|
||||
security_context_t temp2 = NULL ;
|
||||
- char *temp20 ;
|
||||
+ char *temp20 = NULL ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
{
|
||||
@@ -4284,7 +4284,7 @@
|
||||
PyObject *resultobj = 0;
|
||||
char **arg1 = (char **) 0 ;
|
||||
int result;
|
||||
- char *temp1 ;
|
||||
+ char *temp1 = NULL ;
|
||||
|
||||
{
|
||||
arg1 = &temp1;
|
||||
@@ -4310,8 +4310,8 @@
|
||||
int res1 ;
|
||||
char *buf1 = 0 ;
|
||||
int alloc1 = 0 ;
|
||||
- security_context_t temp2 ;
|
||||
+ security_context_t temp2 = NULL ;
|
||||
char *temp20 ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
@@ -4212,7 +4212,7 @@
|
||||
int res1 ;
|
||||
char *buf1 = 0 ;
|
||||
int alloc1 = 0 ;
|
||||
- security_context_t temp2 ;
|
||||
+ security_context_t temp2 = NULL ;
|
||||
char *temp20 ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
@@ -4250,7 +4250,7 @@
|
||||
int res1 ;
|
||||
char *buf1 = 0 ;
|
||||
int alloc1 = 0 ;
|
||||
- security_context_t temp2 ;
|
||||
+ security_context_t temp2 = NULL ;
|
||||
char *temp20 ;
|
||||
- char *temp2 ;
|
||||
- char *temp3 ;
|
||||
+ char *temp2 = NULL ;
|
||||
+ char *temp3 = NULL ;
|
||||
PyObject * obj0 = 0 ;
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
%define libsepolver 1.16.0-1
|
||||
%define libsepolver 2.0.1-1
|
||||
Summary: SELinux library and simple utilities
|
||||
Name: libselinux
|
||||
Version: 1.34.0
|
||||
Release: 3%{?dist}
|
||||
Version: 2.0.0
|
||||
Release: 1%{?dist}
|
||||
License: Public domain (uncopyrighted)
|
||||
Group: System Environment/Libraries
|
||||
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
|
||||
|
|
@ -121,6 +121,12 @@ exit 0
|
|||
%{_libdir}/python*/site-packages/selinux.py*
|
||||
|
||||
%changelog
|
||||
* Wed Feb 7 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.0-1
|
||||
* Merged patch from Todd Miller to remove sscanf in matchpathcon.c because
|
||||
of the use of the non-standard format %as. (original patch changed
|
||||
for style).
|
||||
* Merged patch from Todd Miller to fix memory leak in matchpathcon.c.
|
||||
|
||||
* Fri Jan 19 2007 Dan Walsh <dwalsh@redhat.com> - 1.34.0-2
|
||||
- Add context function to python to split context into 4 parts
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue