Backport openSUSE patches

libapol/swig/java/Makefile.am

@@ -97,7 +97,7 @@ classes = $(patsubst %.java, $(package_dir)/%.class, $(java_files))
 # 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))
 

libpoldiff/swig/java/Makefile.am

@@ -72,7 +72,7 @@ classes = $(patsubst %.java, $(package_dir)/%.class, $(java_files))
 # 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))
 

libqpol/src/module_compiler.c

@@ -310,6 +310,7 @@ role_datum_t *declare_role(unsigned char isattr)
 			assert(0);	/* should never get here */
 		}
 	}
+	return 0;
 }
 
 type_datum_t *declare_type(unsigned char primary, unsigned char isattr)
@@ -373,6 +374,7 @@ type_datum_t *declare_type(unsigned char primary, unsigned char isattr)
 			assert(0);	/* should never get here */
 		}
 	}
+	return 0;
 }
 
 static int user_implicit_bounds(hashtab_t users_tab,
@@ -509,6 +511,7 @@ user_datum_t *declare_user(void)
 			assert(0);	/* should never get here */
 		}
 	}
+	return 0;
 }
 
 /* Return a type_datum_t for the local avrule_decl with the given ID.
@@ -927,6 +930,7 @@ static int require_role_or_attribute(int pass, unsigned char isattr)
 			assert(0);	/* should never get here */
 		}
 	}
+	return 0;
 }
 
 int require_role(int pass)
@@ -990,6 +994,7 @@ static int require_type_or_attribute(int pass, unsigned char isattr)
 			assert(0);	/* should never get here */
 		}
 	}
+	return 0;
 }
 
 int require_type(int pass)
@@ -1051,6 +1056,7 @@ int require_user(int pass)
 			assert(0);	/* should never get here */
 		}
 	}
+	return 0;
 }
 
 static int require_bool_tunable(int pass, int is_tunable)
@@ -1102,6 +1108,7 @@ static int require_bool_tunable(int pass, int is_tunable)
 			assert(0);	/* should never get here */
 		}
 	}
+	return 0;
 }
 
 int require_bool(int pass)
@@ -1175,6 +1182,7 @@ int require_sens(int pass)
 			assert(0);	/* should never get here */
 		}
 	}
+	return 0;
 }
 
 int require_cat(int pass)
@@ -1228,6 +1236,7 @@ int require_cat(int pass)
 			assert(0);	/* should never get here */
 		}
 	}
+	return 0;
 }
 
 static int is_scope_in_stack(scope_datum_t * scope, scope_stack_t * stack)

libqpol/src/policy_define.c

@@ -1058,6 +1058,7 @@ int define_category(void)
 				assert(0);	/* should never get here */
 			}
 		}
+        return 0;
 	}
 
 	return 0;

libqpol/src/policy_define.h

@@ -26,6 +26,7 @@
 /* Used by SETools to determine if source MLS or not */
 int define_mls(void);
 
+avrule_t *define_cond_filename_trans();
 avrule_t *define_cond_compute_type(int which);
 avrule_t *define_cond_pol_list(avrule_t *avlist, avrule_t *stmt);
 avrule_t *define_cond_te_avtab(int which);

libqpol/swig/java/Makefile.am

@@ -76,7 +76,7 @@ classes = $(patsubst %.java,$(package_dir)/%.class,$(filter %.java, $(BUILT_SOUR
 # 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))
 

libseaudit/swig/java/Makefile.am

@@ -69,7 +69,7 @@ classes = $(patsubst %.java, $(package_dir)/%.class, $(java_files))
 # 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))
 

libsefs/swig/java/Makefile.am

@@ -64,7 +64,7 @@ classes = $(patsubst %.java, $(package_dir)/%.class, $(java_files))
 # 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))
 

sediff/result_item_render.c

@@ -27,6 +27,7 @@
 #include "result_item_render.h"
 
 #include <assert.h>
+#include <string.h>
 
 static const char *form_name_map[] = {
 	"Added", "Added New Type", "Removed", "Removed Missing Type", "Modified"
@@ -139,7 +140,7 @@ void result_item_print_string_inline(GtkTextBuffer * tb, GtkTextIter * iter, con
 		}
 		case ' ':
 		{
-			if (current_tag != "modified") {
+			if ( strcmp( current_tag, "modified") != 0 ) {
 				gtk_text_buffer_insert_with_tags_by_name(tb, iter, s + start, end - start + 1, current_tag, NULL);
 				start = end + 1;
 				current_tag = "modified";