Hello community, here is the log from the commit of package setools for openSUSE:Factory checked in at 2012-08-31 10:01:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/setools (Old) and /work/SRC/openSUSE:Factory/.setools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "setools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/setools/setools.changes 2012-07-03 14:26:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.setools.new/setools.changes 2012-08-31 10:01:40.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Aug 28 15:35:33 UTC 2012 - [email protected] + +- Add setools-3.3.6-libsepol.patch to fix compilation with new + libsepol + +------------------------------------------------------------------- +Sun Aug 5 15:44:47 UTC 2012 - [email protected] + +- updated to version 3.3.7 +- removed 2 upstream patches + +------------------------------------------------------------------- Old: ---- setools-3.3.6.tar.bz2 setools-qpol.patch setools-seaudit-headers.patch New: ---- setools-3.3.6-libsepol.patch setools-3.3.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ setools.spec ++++++ --- /var/tmp/diff_new_pack.1gUNb5/_old 2012-08-31 10:01:43.000000000 +0200 +++ /var/tmp/diff_new_pack.1gUNb5/_new 2012-08-31 10:01:43.000000000 +0200 @@ -19,7 +19,7 @@ %define dataversion 3.3 Name: setools -Version: 3.3.6 +Version: 3.3.7 Release: 0 Url: http://oss.tresys.com/projects/setools/ Summary: Policy analysis tools for SELinux @@ -33,13 +33,12 @@ 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 Patch9: %{name}-am121.patch +Patch10: %{name}-3.3.6-libsepol.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -221,13 +220,12 @@ %patch0 %patch1 %patch2 -%patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 %patch7 %patch8 %patch9 -p1 +%patch10 -p1 %build autoreconf -fi ++++++ setools-3.3.5-javacflags.patch ++++++ --- /var/tmp/diff_new_pack.1gUNb5/_old 2012-08-31 10:01:43.000000000 +0200 +++ /var/tmp/diff_new_pack.1gUNb5/_new 2012-08-31 10:01:43.000000000 +0200 @@ -11,19 +11,6 @@ $(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 @@ $(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 @@ $(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 @@ $(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 @@ -110,19 +58,6 @@ # 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.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 . $^ ++++++ setools-3.3.5-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.1gUNb5/_old 2012-08-31 10:01:43.000000000 +0200 +++ /var/tmp/diff_new_pack.1gUNb5/_new 2012-08-31 10:01:43.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- 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 @@ } 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) -@@ -419,6 +421,7 @@ user_datum_t *declare_user(void) + static int user_implicit_bounds(hashtab_t users_tab, char *user_id, user_datum_t * user) +@@ -482,6 +484,7 @@ user_datum_t *declare_user(void) assert(0); /* should never get here */ } } @@ -26,7 +26,7 @@ } /* 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 @@ } 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 @@ } 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 @@ } 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 @@ } 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 @@ } 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 @@ =================================================================== --- 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-3.3.6-libsepol.patch ++++++ >From 2b58d92add64b53b16cbb438e7b69e85d046afd1 Mon Sep 17 00:00:00 2001 From: Dan Walsh <[email protected]> Date: Tue, 20 Sep 2011 15:46:38 -0400 Subject: [PATCH 5/6] Fix sepol calls to work with latest libsepol --- configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: setools-3.3.6/configure.ac =================================================================== --- setools-3.3.6.orig/configure.ac +++ setools-3.3.6/configure.ac @@ -503,7 +503,7 @@ AC_COMPILE_IFELSE( [AC_LANG_SOURCE([ #include <sepol/policydb/expand.h> int main () { - return role_set_expand(NULL, NULL, NULL, NULL); + return role_set_expand(NULL, NULL, NULL, NULL, NULL); }])], sepol_new_user_role_mapping="yes", sepol_new_user_role_mapping="no") @@ -539,7 +539,7 @@ if test ${sepol_check_boolmap} = "yes"; [AC_LANG_SOURCE([ #include <sepol/policydb/expand.h> int main () { - return expand_module_avrules(NULL, NULL, NULL, NULL, NULL, 0, 0); + return expand_module_avrules(NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0); }])], AC_MSG_RESULT([yes]), AC_MSG_ERROR([this version of libsepol is incompatible with SETools])) Index: setools-3.3.6/libqpol/src/policy_define.c =================================================================== --- setools-3.3.6.orig/libqpol/src/policy_define.c +++ setools-3.3.6/libqpol/src/policy_define.c @@ -2031,7 +2031,7 @@ int define_role_trans(void) /* This ebitmap business is just to ensure that there are not conflicting role_trans rules */ #ifdef HAVE_SEPOL_USER_ROLE_MAPPING - if (role_set_expand(&roles, &e_roles, policydbp, NULL)) + if (role_set_expand(&roles, &e_roles, policydbp, NULL, NULL)) #else if (role_set_expand(&roles, &e_roles, policydbp)) #endif ++++++ setools-3.3.6.tar.bz2 -> setools-3.3.7.tar.bz2 ++++++ ++++ 96012 lines of diff (skipped) ++++++ setools-python.patch ++++++ ++++ 1318 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/setools/setools-python.patch ++++ and /work/SRC/openSUSE:Factory/.setools.new/setools-python.patch ++++++ setools-setup_py-prefix.patch ++++++ --- /var/tmp/diff_new_pack.1gUNb5/_old 2012-08-31 10:01:44.000000000 +0200 +++ /var/tmp/diff_new_pack.1gUNb5/_new 2012-08-31 10:01:44.000000000 +0200 @@ -15,20 +15,3 @@ 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
