- removed 2 upstream patches

OBS-URL: https://build.opensuse.org/package/show/security:SELinux/setools?expand=0&rev=37

setools-3.3.5-javacflags.patch

@@ -11,19 +11,6 @@ Index: libapol/swig/java/Makefile.am
  
  $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
  
-Index: libapol/swig/java/Makefile.in
-===================================================================
---- libapol/swig/java/Makefile.in.orig
-+++ libapol/swig/java/Makefile.in
-@@ -687,7 +687,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT
- # just depend upon the first class file, and let the Java compiler
- # create the rest of them.
- $(firstword $(classes)): $(java_files)
--	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
-+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
- 
- $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
- 
 Index: libpoldiff/swig/java/Makefile.am
 ===================================================================
 --- libpoldiff/swig/java/Makefile.am.orig
@@ -37,19 +24,6 @@ Index: libpoldiff/swig/java/Makefile.am
  
  $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
  
-Index: libpoldiff/swig/java/Makefile.in
-===================================================================
---- libpoldiff/swig/java/Makefile.in.orig
-+++ libpoldiff/swig/java/Makefile.in
-@@ -662,7 +662,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT
- # just depend upon the first class file, and let the Java compiler
- # create the rest of them.
- $(firstword $(classes)): $(java_files)
--	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
-+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
- 
- $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
- 
 Index: libqpol/swig/java/Makefile.am
 ===================================================================
 --- libqpol/swig/java/Makefile.am.orig
@@ -63,19 +37,6 @@ Index: libqpol/swig/java/Makefile.am
  
  $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
  
-Index: libqpol/swig/java/Makefile.in
-===================================================================
---- libqpol/swig/java/Makefile.in.orig
-+++ libqpol/swig/java/Makefile.in
-@@ -664,7 +664,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT
- # just depend upon the first class file, and let the Java compiler
- # create the rest of them.
- $(firstword $(classes)): $(filter %.java, $(BUILT_SOURCES))
--	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
-+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
- 
- $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
- 
 Index: libseaudit/swig/java/Makefile.am
 ===================================================================
 --- libseaudit/swig/java/Makefile.am.orig
@@ -89,19 +50,6 @@ Index: libseaudit/swig/java/Makefile.am
  
  $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
  
-Index: libseaudit/swig/java/Makefile.in
-===================================================================
---- libseaudit/swig/java/Makefile.in.orig
-+++ libseaudit/swig/java/Makefile.in
-@@ -659,7 +659,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT
- # just depend upon the first class file, and let the Java compiler
- # create the rest of them.
- $(firstword $(classes)): $(java_files)
--	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
-+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
- 
- $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
- 
 Index: libsefs/swig/java/Makefile.am
 ===================================================================
 --- libsefs/swig/java/Makefile.am.orig
@@ -115,16 +63,3 @@ Index: libsefs/swig/java/Makefile.am
  
  $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
  
-Index: libsefs/swig/java/Makefile.in
-===================================================================
---- libsefs/swig/java/Makefile.in.orig
-+++ libsefs/swig/java/Makefile.in
-@@ -654,7 +654,7 @@ $(wrappedso_DATA): $(filter %.cc, $(BUIL
- # just depend upon the first class file, and let the Java compiler
- # create the rest of them.
- $(firstword $(classes)): $(java_files)
--	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
-+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
- 
- $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
- 

setools-3.3.5-nonvoid.patch

@@ -2,7 +2,7 @@ Index: libqpol/src/module_compiler.c
 ===================================================================
 --- libqpol/src/module_compiler.c.orig
 +++ libqpol/src/module_compiler.c
-@@ -257,6 +257,7 @@ role_datum_t *declare_role(void)
+@@ -291,6 +291,7 @@ role_datum_t *declare_role(void)
  		assert(0);	       /* should never get here */
  	}
  	}
@@ -10,15 +10,15 @@ Index: libqpol/src/module_compiler.c
  }
  
  type_datum_t *declare_type(unsigned char primary, unsigned char isattr)
-@@ -324,6 +325,7 @@ type_datum_t *declare_type(unsigned char
+@@ -353,6 +354,7 @@ type_datum_t *declare_type(unsigned char
  		assert(0);	       /* should never get here */
  	}
  	}
 +	return 0;
  }
  
- user_datum_t *declare_user(void)
+ static int user_implicit_bounds(hashtab_t users_tab, char *user_id, user_datum_t * user)
-@@ -419,6 +421,7 @@ user_datum_t *declare_user(void)
+@@ -482,6 +484,7 @@ user_datum_t *declare_user(void)
  		assert(0);	       /* should never get here */
  	}
  	}
@@ -26,7 +26,7 @@ Index: libqpol/src/module_compiler.c
  }
  
  /* Return a type_datum_t for the local avrule_decl with the given ID.
-@@ -771,6 +774,7 @@ int require_role(int pass)
+@@ -822,6 +825,7 @@ int require_role(int pass)
  		assert(0);	       /* should never get here */
  	}
  	}
@@ -34,7 +34,7 @@ Index: libqpol/src/module_compiler.c
  }
  
  static int require_type_or_attribute(int pass, unsigned char isattr)
-@@ -828,6 +832,7 @@ static int require_type_or_attribute(int
+@@ -873,6 +877,7 @@ static int require_type_or_attribute(int
  		assert(0);	       /* should never get here */
  	}
  	}
@@ -42,7 +42,7 @@ Index: libqpol/src/module_compiler.c
  }
  
  int require_type(int pass)
-@@ -893,6 +898,7 @@ int require_user(int pass)
+@@ -932,6 +937,7 @@ int require_user(int pass)
  		assert(0);	       /* should never get here */
  	}
  	}
@@ -50,7 +50,7 @@ Index: libqpol/src/module_compiler.c
  }
  
  int require_bool(int pass)
-@@ -946,6 +952,7 @@ int require_bool(int pass)
+@@ -979,6 +985,7 @@ int require_bool(int pass)
  		assert(0);	       /* should never get here */
  	}
  	}
@@ -58,7 +58,7 @@ Index: libqpol/src/module_compiler.c
  }
  
  int require_sens(int pass)
-@@ -1014,6 +1021,7 @@ int require_sens(int pass)
+@@ -1041,6 +1048,7 @@ int require_sens(int pass)
  		assert(0);	       /* should never get here */
  	}
  	}
@@ -66,7 +66,7 @@ Index: libqpol/src/module_compiler.c
  }
  
  int require_cat(int pass)
-@@ -1072,6 +1080,7 @@ int require_cat(int pass)
+@@ -1093,6 +1101,7 @@ int require_cat(int pass)
  		assert(0);	       /* should never get here */
  	}
  	}
@@ -78,7 +78,7 @@ Index: libqpol/src/policy_define.c
 ===================================================================
 --- libqpol/src/policy_define.c.orig
 +++ libqpol/src/policy_define.c
-@@ -1410,6 +1410,7 @@ int define_compute_type(int which)
+@@ -1512,6 +1512,7 @@ int define_compute_type(int which)
  		assert(0);	       /* should never get here */
  	}
  	}

setools-qpol.patch

@@ -1,26 +0,0 @@
-Index: setools-3.3.6/libqpol/include/qpol/Makefile.am
-===================================================================
---- setools-3.3.6.orig/libqpol/include/qpol/Makefile.am
-+++ setools-3.3.6/libqpol/include/qpol/Makefile.am
-@@ -17,7 +17,7 @@ qpol_HEADERS = \
- 	netifcon_query.h \
- 	nodecon_query.h \
- 	permissive_query.h \
--	polcap_query.h
-+	polcap_query.h \
- 	policy.h \
- 	policy_extend.h \
- 	portcon_query.h \
-Index: setools-3.3.6/libseaudit/swig/python/Makefile.am
-===================================================================
---- setools-3.3.6.orig/libseaudit/swig/python/Makefile.am
-+++ setools-3.3.6/libseaudit/swig/python/Makefile.am
-@@ -10,7 +10,7 @@ BUILT_SOURCES = seaudit_wrap.c
- 
- AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
- 	@QPOL_CFLAGS@ @APOL_CFLAGS@ -I$(top_builddir) -fpic \
--	-I$(top_srcdir)/libseaudit/include -D__attribute__\(x\)=''
-+	-I$(top_srcdir)/libseaudit/include
- AM_LDFLAGS = @DEBUGLDFLAGS@ @WARNLDFLAGS@ @PROFILELDFLAGS@ \
- 	@APOL_LIB_FLAG@ @QPOL_LIB_FLAG@ @SEAUDIT_LIB_FLAG@ @XML_LIBS@
- DEPENDENCIES = $(top_builddir)/libqpol/src/libqpol.so \

setools-seaudit-headers.patch

@@ -1,44 +0,0 @@
-Index: setools-3.3.6/libseaudit/include/seaudit/avc_message.h
-===================================================================
---- setools-3.3.6.orig/libseaudit/include/seaudit/avc_message.h
-+++ setools-3.3.6/libseaudit/include/seaudit/avc_message.h
-@@ -104,7 +104,7 @@ extern "C"
-  * @return Source target, or NULL upon error or if unknown.  Do not
-  * free() this string.
-  */
--	extern const char *seaudit_avc_message_get_source__mls_lvl(const seaudit_avc_message_t * avc);
-+	extern const char *seaudit_avc_message_get_source_mls_lvl(const seaudit_avc_message_t * avc);
- 	
- /**
-  * Return the source context's mls clearance of an avc message.
-@@ -114,7 +114,7 @@ extern "C"
-  * @return Source target, or NULL upon error or if unknown.  Do not
-  * free() this string.
-  */
--	extern const char *seaudit_avc_message_get_source__mls_clr(const seaudit_avc_message_t * avc);	
-+	extern const char *seaudit_avc_message_get_source_mls_clr(const seaudit_avc_message_t * avc);	
- 
- /**
-  * Return the target context's user of an avc message.
-Index: setools-3.3.6/seaudit/toplevel.h
-===================================================================
---- setools-3.3.6.orig/seaudit/toplevel.h
-+++ setools-3.3.6/seaudit/toplevel.h
-@@ -164,7 +164,7 @@ apol_vector_t *toplevel_get_log_types(to
-  * @return Vector of sorted types, or NULL if no log is loaded.  The
-  * caller must call apol_vector_destroy() upon the return value.
-  */
--apol_vector_t *toplevel_get_log_clr(toplevel_t * top);
-+apol_vector_t *toplevel_get_log_mls_lvl(toplevel_t * top);
- 
- /**
-  * Return a vector of strings corresponding to all mls
-@@ -176,7 +176,7 @@ apol_vector_t *toplevel_get_log_clr(topl
-  * @return Vector of sorted types, or NULL if no log is loaded.  The
-  * caller must call apol_vector_destroy() upon the return value.
-  */
--apol_vector_t *toplevel_get_log_clr(toplevel_t * top);
-+apol_vector_t *toplevel_get_log_mls_clr(toplevel_t * top);
- 
- /**
-  * Return a vector of strings corresponding to all object classes

setools-setup_py-prefix.patch

@@ -15,20 +15,3 @@ Index: setools-3.3.6/python/setools/Makefile.am
  
  clean-local:
  	$(PYTHON) setup.py clean -a 
-Index: setools-3.3.6/python/setools/Makefile.in
-===================================================================
---- setools-3.3.6.orig/python/setools/Makefile.in
-+++ setools-3.3.6/python/setools/Makefile.in
-@@ -535,10 +535,10 @@ python-build: sesearch.c seinfo.c
- 	LIBS="$(QPOL_LIB_FLAG) $(APOL_LIB_FLAG)" INCLUDES="$(QPOL_CFLAGS) $(APOL_CFLAGS)" $(PYTHON) setup.py build
- 
- install-exec-hook:
--	$(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
-+	$(PYTHON) setup.py install --prefix=/usr `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
- 
- uninstall-hook: 
--	$(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
-+	$(PYTHON) setup.py uninstall --prefix=/usr `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
- 
- clean-local:
- 	$(PYTHON) setup.py clean -a 

setools.changes

@@ -2,6 +2,7 @@
 Sun Aug  5 15:44:47 UTC 2012 - meissner@suse.com
 
 - updated to version 3.3.7
+- removed 2 upstream patches
 
 -------------------------------------------------------------------
 Tue Jul  3 09:13:03 UTC 2012 - coolo@suse.com

setools.spec

@@ -33,9 +33,7 @@ Source4:        sediffx.desktop
 Patch0:         %{name}-3.3.5-javacflags.patch
 Patch1:         %{name}-3.3.5-nonvoid.patch
 Patch2:         %{name}-3.3.5-strcmp.patch
-Patch3:         %{name}-qpol.patch
 Patch4:         %{name}-python.patch
-Patch5:         %{name}-seaudit-headers.patch
 Patch6:         %{name}-setup_py-prefix.patch
 Patch7:         %{name}-swig-2x.patch
 Patch8:         %{name}-swig-2.0.7.patch
@@ -221,9 +219,7 @@ This package includes the following graphical tools:
 %patch0
 %patch1
 %patch2
-%patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7
 %patch8