rpms/libselinux/devel libselinux-rhat.patch, 1.197, 1.198 libselinux.spec, 1.376, 1.377
Daniel J Walsh
dwalsh at fedoraproject.org
Tue Sep 15 19:24:23 UTC 2009
Author: dwalsh
Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25241
Modified Files:
libselinux-rhat.patch libselinux.spec
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.86-2
- Eliminate -pthread switch in Makefile
libselinux-rhat.patch:
man/man8/selinuxconlist.8 | 18
man/man8/selinuxdefcon.8 | 19
src/Makefile | 9
src/callbacks.c | 1
src/exception.sh | 12
src/matchpathcon.c | 3
src/selinux.py | 1997 +++++++-
src/selinuxswig.i | 18
src/selinuxswig_python.i | 10
src/selinuxswig_wrap.c |10943 ++++++++++++++++++++++++----------------------
utils/matchpathcon.c | 10
11 files changed, 7558 insertions(+), 5482 deletions(-)
Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- libselinux-rhat.patch 14 Jul 2009 15:29:54 -0000 1.197
+++ libselinux-rhat.patch 15 Sep 2009 19:24:21 -0000 1.198
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.82/man/man8/selinuxconlist.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.86/man/man8/selinuxconlist.8
--- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.82/man/man8/selinuxconlist.8 2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/man/man8/selinuxconlist.8 2009-09-15 15:20:59.000000000 -0400
@@ -0,0 +1,18 @@
+.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
+.SH "NAME"
@@ -20,9 +20,9 @@ diff --exclude-from=exclude -N -u -r nsa
+
+.SH "SEE ALSO"
+secon(8), selinuxdefcon(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.82/man/man8/selinuxdefcon.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.86/man/man8/selinuxdefcon.8
--- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.82/man/man8/selinuxdefcon.8 2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/man/man8/selinuxdefcon.8 2009-09-15 15:20:59.000000000 -0400
@@ -0,0 +1,19 @@
+.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
+.SH "NAME"
@@ -43,9 +43,9 @@ diff --exclude-from=exclude -N -u -r nsa
+
+.SH "SEE ALSO"
+secon(8), selinuxconlist(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.82/src/callbacks.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.86/src/callbacks.c
--- nsalibselinux/src/callbacks.c 2009-04-08 09:06:23.000000000 -0400
-+++ libselinux-2.0.82/src/callbacks.c 2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/callbacks.c 2009-09-15 15:20:59.000000000 -0400
@@ -16,6 +16,7 @@
{
int rc;
@@ -54,9 +54,9 @@ diff --exclude-from=exclude -N -u -r nsa
va_start(ap, fmt);
rc = vfprintf(stderr, fmt, ap);
va_end(ap);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/exception.sh libselinux-2.0.82/src/exception.sh
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/exception.sh libselinux-2.0.86/src/exception.sh
--- nsalibselinux/src/exception.sh 1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.82/src/exception.sh 2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/exception.sh 2009-09-15 15:20:59.000000000 -0400
@@ -0,0 +1,12 @@
+function except() {
+echo "
@@ -70,15 +70,11 @@ diff --exclude-from=exclude -N -u -r nsa
+"
+}
+for i in `grep "extern *int" ../include/selinux/selinux.h | awk '{ print $3 }' | cut -d '(' -f 1`; do except $i ; done
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.82/src/Makefile
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.86/src/Makefile
--- nsalibselinux/src/Makefile 2009-07-14 11:16:03.000000000 -0400
-+++ libselinux-2.0.82/src/Makefile 2009-06-23 15:50:58.000000000 -0400
-@@ -79,9 +79,12 @@
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
-
- $(LIBSO): $(LOBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -lpthread -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
++++ libselinux-2.0.86/src/Makefile 2009-09-15 15:21:17.000000000 -0400
+@@ -82,6 +82,9 @@
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
ln -sf $@ $(TARGET)
+selinuxswig_exception.i: ../include/selinux/selinux.h
@@ -107,9 +103,9 @@ diff --exclude-from=exclude -N -u -r nsa
distclean: clean
rm -f $(GENERATED) $(SWIGFILES)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.82/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.86/src/matchpathcon.c
--- nsalibselinux/src/matchpathcon.c 2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.82/src/matchpathcon.c 2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/matchpathcon.c 2009-09-15 15:20:59.000000000 -0400
@@ -2,6 +2,7 @@
#include <string.h>
#include <errno.h>
@@ -127,9 +123,9 @@ diff --exclude-from=exclude -N -u -r nsa
va_end(ap);
}
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.82/src/selinux.py
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.86/src/selinux.py
--- nsalibselinux/src/selinux.py 2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.82/src/selinux.py 2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/selinux.py 2009-09-15 15:20:59.000000000 -0400
@@ -1,12 +1,26 @@
# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
@@ -2341,9 +2337,9 @@ diff --exclude-from=exclude -N -u -r nsa
+selinux_lsetfilecon_default = _selinux.selinux_lsetfilecon_default
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.82/src/selinuxswig.i
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.86/src/selinuxswig.i
--- nsalibselinux/src/selinuxswig.i 2009-03-12 08:48:48.000000000 -0400
-+++ libselinux-2.0.82/src/selinuxswig.i 2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/selinuxswig.i 2009-09-15 15:20:59.000000000 -0400
@@ -4,11 +4,14 @@
%module selinux
@@ -2377,9 +2373,9 @@ diff --exclude-from=exclude -N -u -r nsa
+%include "../include/selinux/get_default_type.h"
+%include "../include/selinux/label.h"
+%include "../include/selinux/selinux.h"
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.82/src/selinuxswig_python.i
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.86/src/selinuxswig_python.i
--- nsalibselinux/src/selinuxswig_python.i 2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.82/src/selinuxswig_python.i 2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/selinuxswig_python.i 2009-09-15 15:20:59.000000000 -0400
@@ -21,6 +21,15 @@
map(restorecon, [os.path.join(dirname, fname)
for fname in fnames]), None)
@@ -2402,9 +2398,9 @@ diff --exclude-from=exclude -N -u -r nsa
+%include "selinuxswig_exception.i"
%include "selinuxswig.i"
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.82/src/selinuxswig_wrap.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.86/src/selinuxswig_wrap.c
--- nsalibselinux/src/selinuxswig_wrap.c 2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.82/src/selinuxswig_wrap.c 2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/src/selinuxswig_wrap.c 2009-09-15 15:20:59.000000000 -0400
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
@@ -16790,9 +16786,9 @@ diff --exclude-from=exclude -N -u -r nsa
+#endif
}
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.82/utils/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.86/utils/matchpathcon.c
--- nsalibselinux/utils/matchpathcon.c 2009-05-18 13:53:14.000000000 -0400
-+++ libselinux-2.0.82/utils/matchpathcon.c 2009-06-23 15:49:12.000000000 -0400
++++ libselinux-2.0.86/utils/matchpathcon.c 2009-09-15 15:20:59.000000000 -0400
@@ -22,9 +22,13 @@
char *buf;
int rc = matchpathcon(path, mode, &buf);
Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -p -r1.376 -r1.377
--- libselinux.spec 8 Sep 2009 13:09:19 -0000 1.376
+++ libselinux.spec 15 Sep 2009 19:24:22 -0000 1.377
@@ -5,7 +5,7 @@
Summary: SELinux library and simple utilities
Name: libselinux
Version: 2.0.86
-Release: 1%{?dist}
+Release: 2%{?dist}
License: Public Domain
Group: System Environment/Libraries
Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -165,6 +165,9 @@ exit 0
%{ruby_sitearch}/selinux.so
%changelog
+* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.86-2
+- Eliminate -pthread switch in Makefile
+
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.86-1
- Update to upstream
* Removal of reference counting on userspace AVC SID's.
More information about the fedora-extras-commits
mailing list