rpms/libselinux/devel libselinux-rhat.patch, 1.125, 1.126 libselinux.spec, 1.282, 1.283
Daniel J Walsh (dwalsh)
fedora-extras-commits at redhat.com
Thu Sep 6 12:37:33 UTC 2007
Author: dwalsh
Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8354
Modified Files:
libselinux-rhat.patch libselinux.spec
Log Message:
libselinux-rhat.patch:
Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- libselinux-rhat.patch 3 Aug 2007 20:06:53 -0000 1.125
+++ libselinux-rhat.patch 6 Sep 2007 12:37:00 -0000 1.126
@@ -1,12 +1,46 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.24/src/matchpathcon.c
---- nsalibselinux/src/matchpathcon.c 2007-07-16 14:20:46.000000000 -0400
-+++ libselinux-2.0.24/src/matchpathcon.c 2007-07-23 10:21:34.000000000 -0400
-@@ -65,7 +65,7 @@
- #ifdef __GNUC__
- __attribute__ ((format(printf, 1, 2)))
- #endif
-- (*myprintf) (const char *fmt,...);
-+ (*myprintf) (const char *fmt,...) = &default_printf;
-
- void set_matchpathcon_printf(void (*f) (const char *fmt, ...))
- {
+Index: libselinux/src/selinuxswig_python.i
+===================================================================
+--- libselinux/src/selinuxswig_python.i (revision 2549)
++++ libselinux/src/selinuxswig_python.i (working copy)
+@@ -98,4 +98,41 @@
+ }
+ }
+
++%typemap(in) char * const [] {
++ int i, size;
++ PyObject * s;
++
++ if (!PySequence_Check($input)) {
++ PyErr_SetString(PyExc_ValueError, "Expected a sequence");
++ return NULL;
++ }
++
++ size = PySequence_Size($input);
++
++ $1 = (char**) malloc(size + 1);
++
++ for(i = 0; i < size; i++) {
++ if (!PyString_Check(PySequence_GetItem($input, i))) {
++ PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");
++ return NULL;
++ }
++ }
++
++ for(i = 0; i < size; i++) {
++ s = PySequence_GetItem($input, i);
++ $1[i] = (char*) malloc(PyString_Size(s) + 1);
++ strcpy($1[i], PyString_AsString(s));
++ }
++ $1[size] = NULL;
++}
++
++%typemap(freearg,match="in") char * const [] {
++ int i = 0;
++ while($1[i]) {
++ free($1[i]);
++ i++;
++ }
++ free($1);
++}
++
+ %include "selinuxswig.i"
Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- libselinux.spec 28 Aug 2007 15:27:49 -0000 1.282
+++ libselinux.spec 6 Sep 2007 12:37:00 -0000 1.283
@@ -2,10 +2,11 @@
Summary: SELinux library and simple utilities
Name: libselinux
Version: 2.0.31
-Release: 3%{?dist}
+Release: 4%{?dist}
License: Public domain (uncopyrighted)
Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
BuildRequires: libsepol-devel >= %{libsepolver} swig
Requires: libsepol >= %{libsepolver}
@@ -48,6 +49,7 @@
%prep
%setup -q
+%patch -p1 -b .rhat
%build
make clean
@@ -122,6 +124,9 @@
%changelog
+* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.31-4
+- Apply James Athway patch to fix rpm_execcon python binding
+
* Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.31-3
- Move libselinux.so back into main package, breaks procps
More information about the fedora-extras-commits
mailing list