- Rebuilt for gcc bug 634757

Conflicts:

	libselinux.spec

Signed-off-by: Adam Tkac <atkac@redhat.com>

.gitignore

@@ -1,3 +1,4 @@
+*.rpm
 libselinux-1.17.9.tgz
 libselinux-1.17.10.tgz
 libselinux-1.17.11.tgz

libselinux-rhat.patch

@@ -1,6 +1,12 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.96/man/man8/selinuxconlist.8
---- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.96/man/man8/selinuxconlist.8	2010-06-16 09:20:34.000000000 -0400
+diff -up libselinux-2.0.96/man/man3/security_setenforce.3.rhat libselinux-2.0.96/man/man3/security_setenforce.3
+--- libselinux-2.0.96/man/man3/security_setenforce.3.rhat	2010-09-22 17:14:11.000000000 -0400
++++ libselinux-2.0.96/man/man3/security_setenforce.3	2010-09-22 17:11:58.000000000 -0400
+@@ -1 +1 @@
+-.so security_getenforce.3
++.so man3/security_getenforce.3
+diff -up libselinux-2.0.96/man/man8/selinuxconlist.8.rhat libselinux-2.0.96/man/man8/selinuxconlist.8
+--- libselinux-2.0.96/man/man8/selinuxconlist.8.rhat	2010-08-04 15:21:39.000000000 -0400
++++ libselinux-2.0.96/man/man8/selinuxconlist.8	2010-08-04 15:21:39.000000000 -0400
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -20,9 +26,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 lib
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxdefcon(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.96/man/man8/selinuxdefcon.8
---- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.96/man/man8/selinuxdefcon.8	2010-06-16 09:20:34.000000000 -0400
+diff -up libselinux-2.0.96/man/man8/selinuxdefcon.8.rhat libselinux-2.0.96/man/man8/selinuxdefcon.8
+--- libselinux-2.0.96/man/man8/selinuxdefcon.8.rhat	2010-08-04 15:21:39.000000000 -0400
++++ libselinux-2.0.96/man/man8/selinuxdefcon.8	2010-08-04 15:21:39.000000000 -0400
 @@ -0,0 +1,24 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -48,9 +54,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libs
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxconlist(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.0.96/src/audit2why.c
---- nsalibselinux/src/audit2why.c	2010-05-19 14:45:51.000000000 -0400
-+++ libselinux-2.0.96/src/audit2why.c	2010-06-25 17:03:37.000000000 -0400
+diff -up libselinux-2.0.96/src/audit2why.c.rhat libselinux-2.0.96/src/audit2why.c
+--- libselinux-2.0.96/src/audit2why.c.rhat	2010-06-16 08:03:39.000000000 -0400
++++ libselinux-2.0.96/src/audit2why.c	2010-08-04 15:21:39.000000000 -0400
 @@ -1,3 +1,6 @@
 +/* Workaround for http://bugs.python.org/issue4835 */
 +#define SIZEOF_SOCKET_T SIZEOF_INT
@@ -58,7 +64,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.
  #include <Python.h>
  #include <unistd.h>
  #include <stdlib.h>
-@@ -255,6 +258,8 @@
+@@ -255,6 +258,8 @@ static int __policy_init(const char *ini
  	fclose(fp);
  	sepol_set_policydb(&avc->policydb->p);
  	avc->handle = sepol_handle_create();
@@ -67,7 +73,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.
  
  	rc = sepol_bool_count(avc->handle,
  			      avc->policydb, &cnt);
-@@ -287,8 +292,10 @@
+@@ -287,8 +292,10 @@ static int __policy_init(const char *ini
  static PyObject *init(PyObject *self __attribute__((unused)), PyObject *args) {
    int result;
    char *init_path=NULL;
@@ -80,7 +86,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.
    return Py_BuildValue("i", result);
  }
  
-@@ -353,7 +360,11 @@
+@@ -353,7 +360,11 @@ static PyObject *analyze(PyObject *self 
  		strObj = PyList_GetItem(listObj, i); /* Can't fail */
  		
  		/* make it a string */
@@ -92,7 +98,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.
  		
  		perm = string_to_av_perm(tclass, permstr);
  		if (!perm) {
-@@ -423,10 +434,39 @@
+@@ -423,10 +434,39 @@ static PyMethodDef audit2whyMethods[] = 
      {NULL, NULL, 0, NULL}        /* Sentinel */
  };
  
@@ -133,7 +139,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.
  	PyModule_AddIntConstant(m,"UNKNOWN", UNKNOWN);
  	PyModule_AddIntConstant(m,"BADSCON", BADSCON);
  	PyModule_AddIntConstant(m,"BADTCON", BADTCON);
-@@ -440,4 +480,8 @@
+@@ -440,4 +480,8 @@ initaudit2why(void)
  	PyModule_AddIntConstant(m,"BOOLEAN", BOOLEAN);
  	PyModule_AddIntConstant(m,"CONSTRAINT", CONSTRAINT);
  	PyModule_AddIntConstant(m,"RBAC", RBAC);
@@ -142,10 +148,10 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.
 +	return m;
 +#endif
  }
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.96/src/callbacks.c
---- nsalibselinux/src/callbacks.c	2010-05-19 14:45:51.000000000 -0400
-+++ libselinux-2.0.96/src/callbacks.c	2010-06-16 09:20:34.000000000 -0400
-@@ -16,6 +16,7 @@
+diff -up libselinux-2.0.96/src/callbacks.c.rhat libselinux-2.0.96/src/callbacks.c
+--- libselinux-2.0.96/src/callbacks.c.rhat	2010-06-16 08:03:39.000000000 -0400
++++ libselinux-2.0.96/src/callbacks.c	2010-08-04 15:21:39.000000000 -0400
+@@ -16,6 +16,7 @@ default_selinux_log(int type __attribute
  {
  	int rc;
  	va_list ap;
@@ -153,10 +159,10 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.
  	va_start(ap, fmt);
  	rc = vfprintf(stderr, fmt, ap);
  	va_end(ap);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/get_context_list.c libselinux-2.0.96/src/get_context_list.c
---- nsalibselinux/src/get_context_list.c	2010-05-19 14:45:51.000000000 -0400
-+++ libselinux-2.0.96/src/get_context_list.c	2010-07-27 13:09:08.000000000 -0400
-@@ -286,7 +286,6 @@
+diff -up libselinux-2.0.96/src/get_context_list.c.rhat libselinux-2.0.96/src/get_context_list.c
+--- libselinux-2.0.96/src/get_context_list.c.rhat	2010-06-16 08:03:39.000000000 -0400
++++ libselinux-2.0.96/src/get_context_list.c	2010-08-04 15:21:39.000000000 -0400
+@@ -286,7 +286,6 @@ static int get_failsafe_context(const ch
  	if (buf[plen - 1] == '\n')
  		buf[plen - 1] = 0;
  
@@ -164,7 +170,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/get_context_list.c libsel
  	nlen = strlen(user) + 1 + plen + 1;
  	*newcon = malloc(nlen);
  	if (!(*newcon))
-@@ -306,10 +305,6 @@
+@@ -306,10 +305,6 @@ static int get_failsafe_context(const ch
  	if (security_check_context(*newcon) && errno != ENOENT) {
  		free(*newcon);
  		*newcon = 0;
@@ -175,7 +181,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/get_context_list.c libsel
  		return -1;
  	}
  
-@@ -418,13 +413,8 @@
+@@ -418,13 +413,8 @@ int get_ordered_context_list(const char 
  
  	/* Determine the set of reachable contexts for the user. */
  	rc = security_compute_user(fromcon, user, &reachable);
@@ -191,9 +197,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/get_context_list.c libsel
  	nreach = 0;
  	for (ptr = reachable; *ptr; ptr++)
  		nreach++;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.96/src/Makefile
---- nsalibselinux/src/Makefile	2010-05-19 14:45:51.000000000 -0400
-+++ libselinux-2.0.96/src/Makefile	2010-06-16 09:20:39.000000000 -0400
+diff -up libselinux-2.0.96/src/Makefile.rhat libselinux-2.0.96/src/Makefile
+--- libselinux-2.0.96/src/Makefile.rhat	2010-06-16 08:03:39.000000000 -0400
++++ libselinux-2.0.96/src/Makefile	2010-08-04 15:21:39.000000000 -0400
 @@ -1,9 +1,10 @@
  # Installation directories.
 +PYTHON ?= python
@@ -206,7 +212,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.9
  PYINC ?= /usr/include/$(PYLIBVER)
  PYLIB ?= /usr/lib/$(PYLIBVER)
  PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
-@@ -23,13 +24,13 @@
+@@ -23,13 +24,13 @@ SWIGIF= selinuxswig_python.i selinuxswig
  SWIGRUBYIF= selinuxswig_ruby.i
  SWIGCOUT= selinuxswig_wrap.c
  SWIGRUBYCOUT= selinuxswig_ruby_wrap.c
@@ -223,7 +229,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.9
  
  ifeq ($(DISABLE_AVC),y)
  	UNUSED_SRCS+=avc.c avc_internal.c avc_sidtab.c mapping.c stringrep.c checkAccess.c
-@@ -91,10 +92,10 @@
+@@ -91,10 +92,10 @@ $(LIBPC): $(LIBPC).in
  selinuxswig_python_exception.i: ../include/selinux/selinux.h
  	bash exception.sh > $@ 
  
@@ -236,7 +242,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.9
  	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux ${LIBDIR}/libsepol.a -L$(LIBDIR) -Wl,-soname,$@
  
  %.o:  %.c policy.h
-@@ -123,8 +124,8 @@
+@@ -123,8 +124,8 @@ install: all 
  
  install-pywrap: pywrap
  	test -d $(PYTHONLIBDIR)/site-packages/selinux || install -m 755 -d $(PYTHONLIBDIR)/site-packages/selinux
@@ -247,9 +253,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.9
  	install -m 644  selinux.py $(PYTHONLIBDIR)/site-packages/selinux/__init__.py
  
  install-rubywrap: rubywrap
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.96/src/matchpathcon.c
---- nsalibselinux/src/matchpathcon.c	2010-05-19 14:45:51.000000000 -0400
-+++ libselinux-2.0.96/src/matchpathcon.c	2010-07-26 14:55:18.000000000 -0400
+diff -up libselinux-2.0.96/src/matchpathcon.c.rhat libselinux-2.0.96/src/matchpathcon.c
+--- libselinux-2.0.96/src/matchpathcon.c.rhat	2010-06-16 08:03:39.000000000 -0400
++++ libselinux-2.0.96/src/matchpathcon.c	2010-08-04 15:21:39.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -258,7 +264,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux
  #include "selinux_internal.h"
  #include "label_internal.h"
  #include "callbacks.h"
-@@ -57,7 +58,7 @@
+@@ -57,7 +58,7 @@ static void
  {
  	va_list ap;
  	va_start(ap, fmt);
@@ -267,10 +273,10 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux
  	va_end(ap);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.96/src/selinuxswig_python.i
---- nsalibselinux/src/selinuxswig_python.i	2010-06-16 08:03:38.000000000 -0400
-+++ libselinux-2.0.96/src/selinuxswig_python.i	2010-06-16 09:20:34.000000000 -0400
-@@ -45,7 +45,7 @@
+diff -up libselinux-2.0.96/src/selinuxswig_python.i.rhat libselinux-2.0.96/src/selinuxswig_python.i
+--- libselinux-2.0.96/src/selinuxswig_python.i.rhat	2010-06-16 08:03:39.000000000 -0400
++++ libselinux-2.0.96/src/selinuxswig_python.i	2010-08-23 10:27:44.000000000 -0400
+@@ -45,7 +45,7 @@ def install(src, dest):
  	PyObject* list = PyList_New(*$2);
  	int i;
  	for (i = 0; i < *$2; i++) {
@@ -279,7 +285,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libs
  	}
  	$result = SWIG_Python_AppendOutput($result, list);
  }
-@@ -74,7 +74,9 @@
+@@ -74,7 +74,9 @@ def install(src, dest):
  			len++;
  		plist = PyList_New(len);
  		for (i = 0; i < len; i++) {
@@ -290,7 +296,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libs
  		}
  	} else {
  		plist = PyList_New(0);
-@@ -91,7 +93,9 @@
+@@ -91,7 +93,9 @@ def install(src, dest):
  	if (*$1) {
  		plist = PyList_New(result);
  		for (i = 0; i < result; i++) {
@@ -301,7 +307,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libs
  		}
  	} else {
  		plist = PyList_New(0);
-@@ -144,16 +148,20 @@
+@@ -144,16 +148,20 @@ def install(src, dest):
  	$1 = (char**) malloc(size + 1);
  
  	for(i = 0; i < size; i++) {

libselinux.spec

@@ -7,7 +7,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.96
-Release: 4%{?dist}
+Release: 6%{?dist}.1
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -230,6 +230,15 @@ exit 0
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Wed Sep 29 2010 jkeating - 2.0.96-6.1
+- Rebuilt for gcc bug 634757
+
+* Wed Sep 22 2010 Dan Walsh <dwalsh@redhat.com> - 2.0.96-6
+- Fix security_setenforce man page
+
+* Thu Sep 16 2010 Adam Tkac <atkac redhat com> - 2.0.96-5
+- rebuild via updated swig (#624674)
+
 * Tue Jul 27 2010 Dan Walsh <dwalsh@redhat.com> - 2.0.96-4
 - Turn off fallback in to SELINUX_DEFAULTUSER in get_context_list