From 51e7c45c7891113d23f74bc46fe286811f662d20 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Sun, 20 Sep 2009 22:35:03 +0000 Subject: fix setools QA issues. Package-Manager: portage-2.2_rc40/cvs/Linux x86_64 --- app-admin/setools/ChangeLog | 6 +- app-admin/setools/Manifest | 11 ++-- app-admin/setools/files/setools-3.3.6-headers.diff | 73 ++++++++++++++++++++++ app-admin/setools/setools-3.3.6.ebuild | 9 ++- 4 files changed, 90 insertions(+), 9 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/Manifest b/app-admin/setools/Manifest index 49d5a8f52ba9..a8df007a251d 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -2,6 +2,7 @@ Hash: SHA1 AUX apol_tcl_fc.c.diff 1077 RMD160 1db09fde3eb402aa9fe92c0740568bdef7b7586d SHA1 350110b8beb653b6c7b5052530de3d34ae88fc1e SHA256 3457cbba134699babd6882655cfc1957fb0768591690736c4a67c71310ac09b9 +AUX setools-3.3.6-headers.diff 3278 RMD160 d42b64452e61e584bf6e391058fd06d0c74d4051 SHA1 516f50ee1a8a5084ec64fccb918b190e6efc1fa1 SHA256 97a3c02386cc77800e7fe8c69e84824802782db3c5f2903d2e4057a3fd5a552d DIST setools-2.4.tar.bz2 1181584 RMD160 67c77950a4138300a3da4f17ab0d51b2d482bc18 SHA1 3dd26552388180087b11884857c3f5e5c8058acf SHA256 fcd0bc7390275cce8b4c0dbf8cc3471c3ab73724b1b373d40625cc477794fc2e DIST setools-3.3.4.tar.bz2 1333898 RMD160 ec7020db9aff4888895020390046e18cec4e83ef SHA1 eda6b68de50bf06b302bc3ed32249e0dfa52652d SHA256 266e150fd62bf6cf01da9de8dd09c93a0ebfa5f2adac354b2d3c4c6f0509f748 DIST setools-3.3.5.tar.bz2 1328629 RMD160 a7f3470170f3f52acaeca48c85dfe951db9fa4d2 SHA1 3c0c5d275bc76a60ef90e122c3716cbbae993df0 SHA256 61c64129032458e8f5e1d35b8b5fe7a62fd85ba4ada31132efc5b0610d29d69b @@ -9,13 +10,13 @@ DIST setools-3.3.6.tar.bz2 1308992 RMD160 dd73b2e91f09aac71972cf1d2361a73fa78117 EBUILD setools-2.4.ebuild 1811 RMD160 fbb9be57e3712d12d6c4c032aa810bce6ec025f8 SHA1 3a281f31d3c3487902a869c8aed6bc553cc7a1a4 SHA256 1b72c6dc3e414828858a16b83605dee7420d0c66544ad17679167d2254a20cd6 EBUILD setools-3.3.4.ebuild 1491 RMD160 295c5f51b4ef1ebf3289c139462a049ba049d4ba SHA1 288540aaf519a3b7eb351a3378b5b1e089b6d196 SHA256 6f9815e9c57abe2c5cfde0e6025cfed6a86fc7c7c5913d7093b119c9a534eeb0 EBUILD setools-3.3.5.ebuild 1492 RMD160 35825d3e6760a20b2d436d82d385496e23912d83 SHA1 da5a36b9e4a0518f24851cf57d1daa9cf386572a SHA256 58424c71c16a723554673eab34d46ba6af6f69bc87a77cd6642a80c8876ab89a -EBUILD setools-3.3.6.ebuild 1659 RMD160 f9e7b19e51190d9b86512d18b68bf09cbb1a2067 SHA1 82f88bf1cffba51c39e93d2959c1de2929da1efd SHA256 bc0f3dfa1e1f218535009664a72908b77359a23b31425581a8f20ad62d324a3d -MISC ChangeLog 8179 RMD160 5c2b1fd0c47dd2299da58f809dd8ab06d8127ae4 SHA1 44d5e6d029cecdffb2de718fb60f143d78108c41 SHA256 4f1e514072fa9a49d69199da0ff7b365cb855bb9b37459ecae5f109753ec0792 +EBUILD setools-3.3.6.ebuild 1730 RMD160 4a1f8457412aadb79348e9e8be68fb90bd1810dc SHA1 9e15510cd01f09426e7d918d3bfe2f2a67ecb60e SHA256 12cd55794ed03565c151948b41590390d1ba198dbc0b1f95f5de842b6697b98c +MISC ChangeLog 8308 RMD160 d8d9d16e43d62531a5aec06b336ec2115548a098 SHA1 215f79350b5dac79af612a924771e8c7847f44d2 SHA256 e9810c7cf2bb1535c97d51d29215e1be2fde315e1f216d330a431ac6d865df3e MISC metadata.xml 369 RMD160 c37d0796a65a30cccd5d520514223758d68cff47 SHA1 47f913e33c294a7287f04669b9c5279009be7fdf SHA256 58f5b1ba9b602226f7a76b1ebd8edc824e3488f5c9bce9cc53fc2b9dcf2ef84f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkp8x1gACgkQWczwbOluxW/zNgCgoWBzF6HgwckAFFo7/I9io15V -6dMAnirF0Q7A1nBO6pV1/NfIaPX7stMl -=La6q +iEYEARECAAYFAkq2riAACgkQWczwbOluxW9LfACgyMru1x3aqMPTaVBOLtNM8TbF +GtEAoOEPWESi21UE/flOyKZYGvynrZQL +=HrWX -----END PGP SIGNATURE----- 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