From 198f04b27818aa509c1ffc4db5b144609ca9a037 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Sun, 20 Sep 2009 22:35:03 +0000 Subject: fix setools QA issues. (Portage version: 2.2_rc40/cvs/Linux x86_64) --- app-admin/setools/ChangeLog | 6 +- app-admin/setools/files/setools-3.3.6-headers.diff | 73 ++++++++++++++++++++++ app-admin/setools/setools-3.3.6.ebuild | 9 ++- 3 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 app-admin/setools/files/setools-3.3.6-headers.diff (limited to 'app-admin/setools') diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog index ba93f4ae3487..d835d064bfa5 100644 --- a/app-admin/setools/ChangeLog +++ b/app-admin/setools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/setools # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.60 2009/08/08 00:31:11 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.61 2009/09/20 22:35:02 pebenito Exp $ + + 20 Sep 2009; Chris PeBenito setools-3.3.6.ebuild, + +files/setools-3.3.6-headers.diff: + Fix QA issues. *setools-3.3.6 (08 Aug 2009) diff --git a/app-admin/setools/files/setools-3.3.6-headers.diff b/app-admin/setools/files/setools-3.3.6-headers.diff new file mode 100644 index 000000000000..eae76e191915 --- /dev/null +++ b/app-admin/setools/files/setools-3.3.6-headers.diff @@ -0,0 +1,73 @@ +diff -purN setools-3.3.6.orig/libqpol/include/qpol/Makefile.am setools-3.3.6/libqpol/include/qpol/Makefile.am +--- setools-3.3.6.orig/libqpol/include/qpol/Makefile.am 2009-07-14 11:03:27.000000000 -0700 ++++ setools-3.3.6/libqpol/include/qpol/Makefile.am 2009-09-20 15:15:00.362508234 -0700 +@@ -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 \ +diff -purN setools-3.3.6.orig/libseaudit/include/seaudit/avc_message.h setools-3.3.6/libseaudit/include/seaudit/avc_message.h +--- setools-3.3.6.orig/libseaudit/include/seaudit/avc_message.h 2009-07-16 07:41:36.000000000 -0700 ++++ setools-3.3.6/libseaudit/include/seaudit/avc_message.h 2009-09-20 14:57:57.294509062 -0700 +@@ -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. +diff -purN setools-3.3.6.orig/seaudit/toplevel.h setools-3.3.6/seaudit/toplevel.h +--- setools-3.3.6.orig/seaudit/toplevel.h 2009-07-16 07:41:36.000000000 -0700 ++++ setools-3.3.6/seaudit/toplevel.h 2009-09-20 15:04:48.770508867 -0700 +@@ -155,28 +155,28 @@ apol_vector_t *toplevel_get_log_roles(to + apol_vector_t *toplevel_get_log_types(toplevel_t * top); + + /** +- * Return a vector of strings corresponding to all mls +- * levels found within the current log file. +- * The vector will be sorted alphabetically. ++ * Return a vector of strings corresponding to all mls levels ++ * found within currently opened log files. The vector will be sorted ++ * alphabetically. + * + * @param top Toplevel containing seaudit log object. + * + * @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 +- * clearance found within the current log file. +- * The vector will be sorted alphabetically. ++ * Return a vector of strings corresponding to all mls clearance ++ * found within currently opened log files. The vector will be sorted ++ * alphabetically. + * + * @param top Toplevel containing seaudit log object. + * + * @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 diff --git a/app-admin/setools/setools-3.3.6.ebuild b/app-admin/setools/setools-3.3.6.ebuild index ddef9a2d7632..8256e2e9bda3 100644 --- a/app-admin/setools/setools-3.3.6.ebuild +++ b/app-admin/setools/setools-3.3.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.6.ebuild,v 1.1 2009/08/08 00:31:11 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.6.ebuild,v 1.2 2009/09/20 22:35:02 pebenito Exp $ inherit java-pkg-opt-2 autotools @@ -50,8 +50,7 @@ RDEPEND=">=sys-libs/libsepol-2.0.37 src_unpack() { unpack ${A} - # fix libqpol include Makefile - sed -i -r -e '/polcap_query\.h/s/$/ \\/' "${S}/libqpol/include/qpol/Makefile.am" + epatch "${FILESDIR}/setools-3.3.6-headers.diff" eautomake } @@ -66,6 +65,10 @@ src_compile() { $(use_enable X gui) \ $(use_enable debug) + # work around swig c99 issues. it does not require + # c99 anyway. + sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile" + emake || die } -- cgit v1.2.3-65-gdbad