rpms/libselinux/devel .cvsignore, 1.129, 1.130 libselinux-rhat.patch, 1.106, 1.107 libselinux.spec, 1.248, 1.249 sources, 1.131, 1.132
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Feb 20 14:31:09 UTC 2007
Author: dwalsh
Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12585
Modified Files:
.cvsignore libselinux-rhat.patch libselinux.spec sources
Log Message:
* Tue Feb 20 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.1-1
- Upgrade to upstream
* Merged patch from Todd Miller to convert int types over to C99 style.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- .cvsignore 7 Feb 2007 19:39:11 -0000 1.129
+++ .cvsignore 20 Feb 2007 14:31:07 -0000 1.130
@@ -106,3 +106,4 @@
libselinux-1.34.0.tgz
libselinux-1.34.1.tgz
libselinux-2.0.0.tgz
+libselinux-2.0.1.tgz
libselinux-rhat.patch:
enabled.c | 53 +++++++++++++++++++++++++++++++++++++++--------------
selinuxswig.i | 4 ++--
selinuxswig_wrap.c | 38 +++++++++++++++++++-------------------
3 files changed, 60 insertions(+), 35 deletions(-)
Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- libselinux-rhat.patch 7 Feb 2007 19:39:11 -0000 1.106
+++ libselinux-rhat.patch 20 Feb 2007 14:31:07 -0000 1.107
@@ -1,27 +1,5 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.34.0/src/selinuxswig.i
---- 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=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 2007-01-26 16:19:52.000000000 -0500
-+++ libselinux-1.34.0/src/selinuxswig_wrap.c 2007-01-24 13:38:47.000000000 -0500
+--- libselinux-2.0.1/src/selinuxswig_wrap.c.rhat 2007-02-20 09:25:03.000000000 -0500
++++ libselinux-2.0.1/src/selinuxswig_wrap.c 2007-02-20 09:25:14.000000000 -0500
@@ -2832,7 +2832,7 @@
security_context_t *arg1 = (security_context_t *) 0 ;
int result;
@@ -186,3 +164,103 @@
PyObject * obj0 = 0 ;
{
+--- libselinux-2.0.1/src/enabled.c.rhat 2007-02-20 09:25:03.000000000 -0500
++++ libselinux-2.0.1/src/enabled.c 2007-02-20 09:27:53.000000000 -0500
+@@ -8,10 +8,44 @@
+ #include <stdio.h>
+ #include "policy.h"
+
++static int readFD (int fd, char **buf)
++{
++ char *p;
++ size_t size = 16384;
++ int s, filesize;
++
++ *buf = calloc (16384, sizeof (char));
++ if (*buf == 0)
++ return -1;
++
++ filesize = 0;
++ do {
++ p = &(*buf) [filesize];
++ do {
++ s = read (fd, p, 16384);
++ } while (s < 0 && errno == EINTR);
++ if (s < 0)
++ break;
++ filesize += s;
++ /* only exit for empty reads */
++ if (s == 0)
++ break;
++ size += s;
++ *buf = realloc (*buf, size);
++ } while (1);
++
++ if (filesize == 0 && s < 0) {
++ free (*buf);
++ *buf = NULL;
++ return -1;
++ }
++
++ return filesize;
++}
++
+ int is_selinux_enabled(void)
+ {
+- char *buf;
+- size_t size;
++ char *buf = NULL;
+ int fd;
+ ssize_t ret;
+ int enabled = 0;
+@@ -21,19 +55,11 @@
+ if (fd < 0)
+ return -1;
+
+- size = selinux_page_size;
+- buf = malloc(size);
+- if (!buf) {
+- enabled = -1;
+- goto out;
+- }
+-
+- memset(buf, 0, size);
+-
+- ret = read(fd, buf, size - 1);
++ ret = readFD(fd, &buf);
++ close(fd);
+ if (ret < 0) {
+ enabled = -1;
+- goto out2;
++ goto out;
+ }
+
+ if (!strstr(buf, "selinuxfs"))
+@@ -49,7 +75,6 @@
+ out2:
+ free(buf);
+ out:
+- close(fd);
+ return enabled;
+ }
+
+--- libselinux-2.0.1/src/selinuxswig.i.rhat 2007-02-20 09:25:03.000000000 -0500
++++ libselinux-2.0.1/src/selinuxswig.i 2007-02-20 09:25:14.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=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;
+ }
+
Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- libselinux.spec 7 Feb 2007 19:39:11 -0000 1.248
+++ libselinux.spec 20 Feb 2007 14:31:07 -0000 1.249
@@ -1,7 +1,7 @@
%define libsepolver 2.0.1-1
Summary: SELinux library and simple utilities
Name: libselinux
-Version: 2.0.0
+Version: 2.0.1
Release: 1%{?dist}
License: Public domain (uncopyrighted)
Group: System Environment/Libraries
@@ -121,6 +121,10 @@
%{_libdir}/python*/site-packages/selinux.py*
%changelog
+* Tue Feb 20 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.1-1
+- Upgrade to upstream
+ * Merged patch from Todd Miller to convert int types over to C99 style.
+
* Wed Feb 7 2007 Dan Walsh <dwalsh at 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
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- sources 7 Feb 2007 19:39:11 -0000 1.131
+++ sources 20 Feb 2007 14:31:07 -0000 1.132
@@ -1 +1 @@
-29400f2400f108c88e1051a62a139d48 libselinux-2.0.0.tgz
+d8b478690440a9012c629a65158823f2 libselinux-2.0.1.tgz
More information about the fedora-cvs-commits
mailing list