rpms/libselinux/devel .cvsignore, 1.185, 1.186 libselinux-rhat.patch, 1.196, 1.197 libselinux.spec, 1.373, 1.374 sources, 1.188, 1.189 libselinux-2.0.77-nlfd.patch, 1.1, NONE

Tue Jul 14 15:30:25 UTC 2009

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23874

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Removed Files:
	libselinux-2.0.77-nlfd.patch 
Log Message:
* Tue Jul 7 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.85-1
- Update to upstream 
	* Reverted Tomas Mraz's fix for freeing thread local storage to avoid
	pthread dependency.
	* Removed fini_context_translations() altogether.
	* Merged lazy init patch from Stephen Smalley based on original patch
	by Steve Grubb.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186

--- .cvsignore	7 Jul 2009 16:26:10 -0000	1.185
+++ .cvsignore	14 Jul 2009 15:29:54 -0000	1.186
@@ -168,3 +168,4 @@ libselinux-2.0.81.tgz
 libselinux-2.0.82.tgz
 libselinux-2.0.83.tgz
 libselinux-2.0.84.tgz
+libselinux-2.0.85.tgz

libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- libselinux-rhat.patch	7 Jul 2009 16:26:10 -0000	1.196
+++ libselinux-rhat.patch	14 Jul 2009 15:29:54 -0000	1.197
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.83/man/man8/selinuxconlist.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.82/man/man8/selinuxconlist.8
 --- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.83/man/man8/selinuxconlist.8	2009-07-07 12:22:39.298209000 -0400
++++ libselinux-2.0.82/man/man8/selinuxconlist.8	2009-06-23 15:49:12.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.83/man/man8/selinuxdefcon.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.82/man/man8/selinuxdefcon.8
 --- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.83/man/man8/selinuxdefcon.8	2009-07-07 12:22:39.309211000 -0400
++++ libselinux-2.0.82/man/man8/selinuxdefcon.8	2009-06-23 15:49:12.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.83/src/callbacks.c
---- nsalibselinux/src/callbacks.c	2009-07-07 11:10:42.003951000 -0400
-+++ libselinux-2.0.83/src/callbacks.c	2009-07-07 12:22:39.312210000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.82/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
 @@ -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.83/src/exception.sh
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/exception.sh libselinux-2.0.82/src/exception.sh
 --- nsalibselinux/src/exception.sh	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.83/src/exception.sh	2009-07-07 12:22:39.318209000 -0400
++++ libselinux-2.0.82/src/exception.sh	2009-06-23 15:49:12.000000000 -0400
 @@ -0,0 +1,12 @@
 +function except() {
 +echo "
@@ -70,11 +70,15 @@ 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.83/src/Makefile
---- nsalibselinux/src/Makefile	2009-07-07 11:10:41.995958000 -0400
-+++ libselinux-2.0.83/src/Makefile	2009-07-07 12:22:39.322212000 -0400
-@@ -82,6 +82,9 @@
- 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -lpthread -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.82/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
  	ln -sf $@ $(TARGET) 
  
 +selinuxswig_exception.i: ../include/selinux/selinux.h
@@ -103,9 +107,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.83/src/matchpathcon.c
---- nsalibselinux/src/matchpathcon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.83/src/matchpathcon.c	2009-07-07 12:22:39.328209000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.82/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
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -123,9 +127,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.83/src/selinux.py
---- nsalibselinux/src/selinux.py	2009-01-13 08:09:54.000000000 -0500
-+++ libselinux-2.0.83/src/selinux.py	2009-07-07 12:22:39.337212000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.82/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
 @@ -1,12 +1,26 @@
  # This file was automatically generated by SWIG (http://www.swig.org).
 -# Version 1.3.35
@@ -2337,9 +2341,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.83/src/selinuxswig.i
---- nsalibselinux/src/selinuxswig.i	2009-07-07 11:10:42.024956000 -0400
-+++ libselinux-2.0.83/src/selinuxswig.i	2009-07-07 12:22:39.343210000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.82/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
 @@ -4,11 +4,14 @@
  
  %module selinux
@@ -2373,9 +2377,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.83/src/selinuxswig_python.i
---- nsalibselinux/src/selinuxswig_python.i	2009-01-13 08:09:54.000000000 -0500
-+++ libselinux-2.0.83/src/selinuxswig_python.i	2009-07-07 12:22:39.355211000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.82/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
 @@ -21,6 +21,15 @@
                               map(restorecon, [os.path.join(dirname, fname)
                                                for fname in fnames]), None)
@@ -2398,9 +2402,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.83/src/selinuxswig_wrap.c
---- nsalibselinux/src/selinuxswig_wrap.c	2009-01-13 08:09:54.000000000 -0500
-+++ libselinux-2.0.83/src/selinuxswig_wrap.c	2009-07-07 12:22:39.385216000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.82/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
 @@ -1,6 +1,6 @@
  /* ----------------------------------------------------------------------------
   * This file was automatically generated by SWIG (http://www.swig.org).
@@ -16786,9 +16790,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#endif
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.83/utils/matchpathcon.c
---- nsalibselinux/utils/matchpathcon.c	2009-07-07 11:10:42.033956000 -0400
-+++ libselinux-2.0.83/utils/matchpathcon.c	2009-07-07 12:22:39.395209000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.82/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
 @@ -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.373
retrieving revision 1.374
diff -u -p -r1.373 -r1.374
--- libselinux.spec	7 Jul 2009 16:26:11 -0000	1.373
+++ libselinux.spec	14 Jul 2009 15:29:55 -0000	1.374
@@ -4,7 +4,7 @@
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.84
+Version: 2.0.85
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
@@ -165,6 +165,14 @@ exit 0
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Jul 7 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.85-1
+- Update to upstream 
+	* Reverted Tomas Mraz's fix for freeing thread local storage to avoid
+	pthread dependency.
+	* Removed fini_context_translations() altogether.
+	* Merged lazy init patch from Stephen Smalley based on original patch
+	by Steve Grubb.
+
 * Tue Jul 7 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.84-1
 - Update to upstream 
 	* Add per-service seuser support from Dan Walsh.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- sources	7 Jul 2009 16:26:11 -0000	1.188
+++ sources	14 Jul 2009 15:29:55 -0000	1.189
@@ -1 +1 @@
-952674efe604477d00b787c262da17e2  libselinux-2.0.84.tgz
+c014e9527a14fbd38c784b01124cee7d  libselinux-2.0.85.tgz


--- libselinux-2.0.77-nlfd.patch DELETED ---


