From badbc440be6f2795e09f2ee75763707baa26fe31 Mon Sep 17 00:00:00 2001 From: Jason Zaman Date: Thu, 4 Dec 2014 11:00:46 +0000 Subject: [PATCH] Call python_optimize, bug 531638 Package-Manager: portage-2.2.12/cvs/Linux x86_64 Manifest-Sign-Key: 0x7EF137EC935B0EAF --- sys-libs/libsemanage/ChangeLog | 10 +- sys-libs/libsemanage/Manifest | 33 +++--- .../libsemanage/libsemanage-2.3-r4.ebuild | 104 ++++++++++++++++++ .../libsemanage/libsemanage-2.4_rc6-r2.ebuild | 3 +- 4 files changed, 132 insertions(+), 18 deletions(-) create mode 100644 sys-libs/libsemanage/libsemanage-2.3-r4.ebuild diff --git a/sys-libs/libsemanage/ChangeLog b/sys-libs/libsemanage/ChangeLog index 4da41616fdb8..6ead9a167433 100644 --- a/sys-libs/libsemanage/ChangeLog +++ b/sys-libs/libsemanage/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/libsemanage # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.83 2014/11/27 14:14:04 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.84 2014/12/04 11:00:43 perfinion Exp $ + +*libsemanage-2.3-r4 (04 Dec 2014) + + 04 Dec 2014; Jason Zaman +libsemanage-2.3-r4.ebuild, + libsemanage-2.4_rc6-r2.ebuild: + Call python_optimize, bug 531638 *libsemanage-2.4_rc6-r2 (27 Nov 2014) @@ -9,7 +15,7 @@ *libsemanage-2.4_rc6-r1 (22 Nov 2014) - 22 Nov 2014; Jason Zaman + 22 Nov 2014; Jason Zaman +files/0002-semanage_migrate_store-Python3-support.patch, +libsemanage-2.4_rc6-r1.ebuild: python3 support for semanage_migrate_store. bug 529252 diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest index 13b4217d103d..e654ada66ab3 100644 --- a/sys-libs/libsemanage/Manifest +++ b/sys-libs/libsemanage/Manifest @@ -10,27 +10,30 @@ DIST libsemanage-2.4-rc6.tar.gz 151087 SHA256 92fc0fa14dbc297de41941cb90c02225b7 EBUILD libsemanage-2.2-r2.ebuild 3210 SHA256 97027d0ced1e3aa603feb38cd4974d43e9d559519b9ff83bdb52d831080d01b2 SHA512 4f543459d29f85c42ef0370e51bb5055342e04382f4b13ca018d47da3af4acf0073bfbe0d8c340dfa00a4f2d69f7acf64df3471da543e46ed7888323b00236f8 WHIRLPOOL c8963d06b370e61c8313c0c6cd4b67ad9a28c994887266817aaa1af7a6d8761c51d9383ebd202560cdf17699d765bbcab70ed7adaa85aacf7645d8d5f656de9c EBUILD libsemanage-2.3-r2.ebuild 3451 SHA256 c7a81769d7838df565c99ee28fad062dbdf02311ff41579d060bae7ee878d994 SHA512 3c13ea458d3e803d6ef27c1abb13e5262674291a16a5681007a8f82e32660b907a129403bf20f131e2b2eaf27ecce8b007e7ee032c0e588a43c7f0158ceb1be1 WHIRLPOOL 15a2968969ad36f4213d81c15151a6ea620eec5f21af5ec8de2a6f3357ff9b1446d23e8f2cc17beecd8a75ba593e1ff67fd7f947af703a58851e225882e5e22f EBUILD libsemanage-2.3-r3.ebuild 3537 SHA256 00c6826ae6646ec7ddcf6c176035a7058962d8ba25ba2cd9febbcd4d290b3a88 SHA512 86401b345346d23e7a874bf1fd68636bd79c33e2937f9885a2a1c0c1d043c7a7bbc73b183b0687882164a6d50f70b8c5c04c38dd60dd2d6f060e764cb607fef5 WHIRLPOOL ccada4c09dfd01dc7d85f1e551438a8e8c7f7cb65a2908fb6d128c0dde447b4bf9c9ae53fc273b8466d117b7b9a170fa442977e15ebcf255f6e941239f3ac731 +EBUILD libsemanage-2.3-r4.ebuild 3575 SHA256 18d64ebc4ad9a01b934dfffcdee1bfa873cc8c08b2b96516463908ab14ac427b SHA512 c369842a3509e57ec18fec98fd6c6ef1e9033d3c47c1dc8be8c6d84b3fddf7ba927beefaf2702bcdd6ed083b3eedaf64cfae6a75e5c0819163961dcdd01abbdf WHIRLPOOL 85f1438736e4368fc17ca6319f3fded376ebee2ecd80e1d5766bddc3f9451915b6e4687e16ae3a6ccf6dc8ac24a981d31e71f9ddbc1dd293fe2917415740ef0e EBUILD libsemanage-2.4_rc2.ebuild 3549 SHA256 282783f8df0962d5035954cedaed996c119ae8806fdb40d6e9656543e0b3943c SHA512 dc265873655347c4aed4da4072df9ae047a781b1d0aff042d0fc750f58211c7163081d8a3df12ee28e9e45925fa2de5f43957ad17c0a8f76e4bc819902a4b61b WHIRLPOOL 84058341789f3fe9bec16c2f18d8f67f4cf0a983244da199737d04dc4af1750b8dc5d50e9b1a7a5b2ed08255dae0961df722a45103b576c1a396c1233f9647d8 EBUILD libsemanage-2.4_rc5.ebuild 3549 SHA256 6a473e9697e607c3b03cc40c1ee1562716128daf099dcec82444af64a250e0ad SHA512 c57689f340b6174ac41edb75517197827cdb6cc0511e0968f6431355c6dc43b412c0628ea63a58fe084433c184e343312af9dc92a0435d5ca34ed2aeeba3a465 WHIRLPOOL 1464e71d68a32f854515d211f141f070e8a84f7d309823e3b9f84869fdc293f8d9b0198c6a3741afcdab56152799969a5437c7736bc594d448a668e4ff954fcb EBUILD libsemanage-2.4_rc6-r1.ebuild 3652 SHA256 8d0804838976890c6ae68c73ec221eb831ee03d9e5330bfe9dc303ab39948348 SHA512 66ef53255ff51cec3d6ab1e7e34a432d24e9d72777a2020de96f8ff0c31a4e99c728deaee664f3c306ad1e0fdc42c6baa6656986902572b537efa248597817ce WHIRLPOOL b98d3494a644324a264074427ba2ecd37c0898ad89d3b16146ae515d777dcc7178aed73c7ff091a1f50738bbb5cf49ab8e7e6a38bd28912ed20e3dbbf8026a64 -EBUILD libsemanage-2.4_rc6-r2.ebuild 4019 SHA256 b99b52c81fec829eba2b1a90c844ed5d3f2a5deda0c13c4780b31e231f23e98c SHA512 4f7752c6fc2953d8f0f98bff5f27e33875bbc56747646fb130b9f28bc97c4243a86cfb382f0e23032e9602f989fd4b0e29bc956e9f109edbe9d61ef79a1dddd9 WHIRLPOOL 6a995c3c51420c2480dfddb4f9b46674fdd01f657d496e4b6b71bdabb864c4d7dd6a19235e885d1fc23ba2ec5f45cfd3cc3528550010a7f58b5abc183216cd74 +EBUILD libsemanage-2.4_rc6-r2.ebuild 4055 SHA256 0c4694bdf0e905ea308c252a98766c59053956d8c5a7892826c4841abf9a039a SHA512 de9a42e759891bc1ab04d70839bdaa959129455aa7510706888b40acec7f1d4b8ad187403af1b9355b6fc5986a7b890e7898cc5ff76c75dfa39fd42e33c09c67 WHIRLPOOL 735dae66a7f6a977d9331b82b988f81eda67f203cdc264e7d5a651f048e3e23c8fb6240b0f2b2d2b5ad3b5d41cac9cdbd6aecbcf9a8da85d9c8af0a2cffcc400 EBUILD libsemanage-2.4_rc6.ebuild 3559 SHA256 74bfae2b3a00d2f8867aa8b01418ab66192a6f0e95154a39c5be276a8e07e28b SHA512 b5f9ba1d57a13d2fe91ce5f6a027bfbe29dd07a205c303e8a1c35cd97dadff22fc81f81c02e160133f5ee65ae1fe8eb5c697a48d9328fdfb6a2d73de6f3a8f84 WHIRLPOOL 514e7fe1d288525f0a13ac71c98823a26ae9580de4ecf8725a18a3a97cce351c44d0828acd061d475d03d02843c01bb9d7bd18e43b7a9c23df8a984c48b3aac6 -MISC ChangeLog 12023 SHA256 cdb814e932de01e46d66a25fe817dcf9c38cf151ce2143a35e4398aa824e1646 SHA512 4f45e4403470f364b936803d60cd4a6d702c937a63c5507bf3e1e284d2c16e14630ba6e9410888ac535f0e53c84f8ec8a03432eab0f9059b60c3b2a0f148323a WHIRLPOOL e3971673f349439790773910ab78c08f99feb09c65bc398bccb84a2c28f7f712dfd61d4de9349a44e4f3ffe0f3ce107825ed0f777d1c2cd68812323ab3239f35 +MISC ChangeLog 12210 SHA256 10b95ac4326de5040aba852c69c9025402c8d9742a5527cf72d93ab25fc14573 SHA512 c9adeada361e9a831827271bc26cc07cf84efcf14d922f1717272d9f4abd55b163579d4fb65cfc306be2f5eee9de32006e3f33b7045f38e2a09f023fe3c6dddf WHIRLPOOL bcbfe8e93a7f53356a43ffd8c60daf62d90732790c54df795884849f10570f608cbb7ee36daaaeb0ae4539712fda57be031cc34ab3940be0afb0c07d8d23714f MISC metadata.xml 233 SHA256 c5a240155da9b7588e31ff668d3656486a16868654c076f7e1aea823a6b85ae9 SHA512 96a2805dfeebf2e9458e4b602da2cff381f9a3a2e05feb0b36d22b25cac15417e54c8f0572f14f3f944ca7d20377f20ef217ad51105e273a40525b1174df714a WHIRLPOOL 1e68c6d8f1f0446a8be9a001f4c89d641a2055fc9d440be286f753fbf8a216f9d0ed530694f1ff5859a1604eff125316fdcf9593cb91113e4735cc3fa8e8b9a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQIcBAEBCAAGBQJUdzF0AAoJEC7dUkA7aK9HoKgP/iGbx/Bdr722VgLEyxLoPA+w -xIuQXl1enBDujsCXQ3Fsnm6Z08xUQ3IYgdJSJ0Z+5a6jijOxHu4NCDALPtLt+bYn -33BnULYUTZDf44M44U8WtVWRFhHsyHICvHqggoeajE9c31zF3XNrMPjKxJlnAgLm -VIWyOffeO5g/eRzeRuj0hRC8Gkt1vkyIvLjLxizHNvGn5HLAevJMp1iy5WN/qRgZ -R3CNjjT0suLyHBp1/lwK4kyPZI3Q5DOheHT29unUYM99B27j0nsBZAqvHgcHh2Bj -Ovu1PCB0hV1aTgKJ5LgM42DU8g3l3yTT09sYzGz5irJUnsZyzPg2izVH1PIAvUN0 -I+cLPLNzP2ZZg/UR602Tnp16dd86AFsMu6hyd+GM+ZIGjC5AocUL3kaCt5y1iMYK -QoOSaGTWYXiaVlMj5c7uD67w495gBmNYT/dx4lypy/Md+XjDddlN+JN/qpAWWxGv -dkRKq9wAR/ypH3Ubm4Omis7G7AXKSPMr/jSnbURMHCGKjCdLSY5BAbD1pNpmeVaF -WPjpBKiKCb0ffNt+UCy+miRYwZtDPTq6dpWbDOulMdcZm39BrCqGDBwh2F6gFQqt -IgWR/ukg1xXXL7mn71GBB2sGsQ/Z8usF0StIG6+uCZwfxCikIOHwWI4fDops406P -3quUUqOt82bQzl0ac5vd -=5RWY +iQJ8BAEBCABmBQJUgD7dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky +QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vt/EQAKSu5+0Hw5tQ+i0v0AJSH2BW +qjXtH6umGZQ4I/p91pvLc+NaZPLyy369uKY6CxK5OLJnN2xg94kt8pk75lN7EjED +QARZJgX2c1QvJ0Y5C9QTLfL5aAnoUKGOMly3T3Yqk0YDw1v3XsgpGlgj3KbG5iRV +oFs9E4wqUmlzttmr9hdI7UqZU4pGG0ChgUnneSqGgwGBX3sYzB6YcghsUOB8YaPa +d2e2E36Hap7gWVNGVbdpv6fYw1JHvOKrZRA/DJT3DJI9PVuhPG5n1zZw40VWcPbu +2ThqI9YHYn/aGMfmoirDJnCp7OfctvnHjFMKoJKjG1EDX5PhRD8tPRrMiDscNk24 +aZ/23YAER8zQ9ezrueF4h32xyK54uufRVlMFbvF308jjUH/h9t9mOcbBqMnmeDKY +Qk34efimRphDOY4vRgeKBEIMweLFrYktp0/49tBz98hCREUMf3kvaxrHt+vbRnf0 +DIIEkg3KbOc2D1rC9OLqKU8pViY56nfNqNoVXJ7/46Gioq/LUOZCZs4Bu4DoGsuG +Qh0rZZNyO3OZmg3uC7fruxAzglSj9cLTb9QD/meKYdPKbC4uSBub5I1CR1grHs3z +tcqopdIeFpr1YgrrEolF2oRXdHRLngQkJA4564RBea2VHAJmnD0snNzqrqxCen9I +TKR2ElUakqS51CchfL6A +=iHBi -----END PGP SIGNATURE----- diff --git a/sys-libs/libsemanage/libsemanage-2.3-r4.ebuild b/sys-libs/libsemanage/libsemanage-2.3-r4.ebuild new file mode 100644 index 000000000000..dd2320122116 --- /dev/null +++ b/sys-libs/libsemanage/libsemanage-2.3-r4.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.3-r4.ebuild,v 1.1 2014/12/04 11:00:43 perfinion Exp $ + +EAPI="5" +PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 ) + +inherit multilib python-r1 toolchain-funcs eutils multilib-minimal + +MY_P="${P//_/-}" + +SEPOL_VER="2.3" +SELNX_VER="2.3" + +DESCRIPTION="SELinux kernel and policy management library" +HOMEPAGE="http://userspace.selinuxproject.org" +SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="python" + +RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}] + >=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}] + >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] + >=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}] + " +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex + python? ( + >=dev-lang/swig-2.0.4-r1 + virtual/pkgconfig + ${PYTHON_DEPS} + )" + +# tests are not meant to be run outside of the +# full SELinux userland repo +RESTRICT="test" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf" + echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf" + echo "# or debugging of policy." >> "${S}/src/semanage.conf" + echo "save-linked=false" >> "${S}/src/semanage.conf" + echo >> "${S}/src/semanage.conf" + echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf" + echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf" + echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf" + echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf" + echo "# would catch." >> "${S}/src/semanage.conf" + echo "expand-check=1" >> "${S}/src/semanage.conf" + echo >> "${S}/src/semanage.conf" + echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf" + echo "# with bzip2. Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf" + echo "# 1-9 when compressing. The higher the number," >> "${S}/src/semanage.conf" + echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf" + echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf" + echo "bzip-blocksize=0" >> "${S}/src/semanage.conf" + echo >> "${S}/src/semanage.conf" + echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf" + echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf" + echo "bzip-small=true" >> "${S}/src/semanage.conf" + + epatch_user + + multilib_copy_sources +} + +multilib_src_compile() { + emake \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + all + + if multilib_is_native_abi && use python; then + building_py() { + python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH + emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@" + python_optimize # bug 531638 + } + python_foreach_impl building_py swigify + python_foreach_impl building_py pywrap + fi +} + +multilib_src_install() { + emake \ + LIBDIR="${ED}/usr/$(get_libdir)" \ + SHLIBDIR="${ED}/usr/$(get_libdir)" \ + DESTDIR="${ED}" install + + if multilib_is_native_abi && use python; then + installation_py() { + emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" \ + SHLIBDIR="${ED}/usr/$(get_libdir)" install-pywrap + } + python_foreach_impl installation_py + fi +} diff --git a/sys-libs/libsemanage/libsemanage-2.4_rc6-r2.ebuild b/sys-libs/libsemanage/libsemanage-2.4_rc6-r2.ebuild index 1a06cb000f87..477772df3869 100644 --- a/sys-libs/libsemanage/libsemanage-2.4_rc6-r2.ebuild +++ b/sys-libs/libsemanage/libsemanage-2.4_rc6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.4_rc6-r2.ebuild,v 1.1 2014/11/27 14:14:04 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.4_rc6-r2.ebuild,v 1.2 2014/12/04 11:00:43 perfinion Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 ) @@ -99,6 +99,7 @@ multilib_src_install() { installation_py() { emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" \ SHLIBDIR="${ED}/usr/$(get_libdir)" install-pywrap + python_optimize # bug 531638 } python_foreach_impl installation_py fi -- 2.26.2