commit: 0040f873d46367c8d16c8effc6ebd14474d9c829 Author: Jonathan Davies <jpds <AT> protonmail <DOT> com> AuthorDate: Tue Sep 1 19:44:57 2020 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Tue Sep 15 03:40:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0040f873
sys-libs/libsemanage: Version bump to 3.1. Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com> Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> sys-libs/libsemanage/Manifest | 1 + ...semanage-9999.ebuild => libsemanage-3.1.ebuild} | 33 +++++++++------------- sys-libs/libsemanage/libsemanage-9999.ebuild | 33 +++++++++------------- 3 files changed, 29 insertions(+), 38 deletions(-) diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest index 6c9813422e3..1231fb64b80 100644 --- a/sys-libs/libsemanage/Manifest +++ b/sys-libs/libsemanage/Manifest @@ -1,2 +1,3 @@ DIST libsemanage-2.9.tar.gz 157690 BLAKE2B 98a7800a4f4a5b6eeaad8be9870a49bc697cec6cd053cb44bcd618d22146ed1adc32b432667f8fd245ac073a458e048894cbaf68903b79577bc8596b1c255f56 SHA512 ea2924e8ce97d376519d40d499145b3db413cf9cc1eb995ed338b95c131e043d8c43b87b2012cee2bb6354a6e3161ebf5ce4a1200278d3ecd4294b43d177a5c2 DIST libsemanage-3.0.tar.gz 180745 BLAKE2B a7e7f0c98e365fcc132e2e66de736db29b46599be2da227dbf1384110a607120f141975b859e55073f734e3ff533bdf90b7bbefd79f7bc5857bbb0722a75ad4e SHA512 f960e1bd6815d3c9f000efa7ae717bc7937e742af5a7fea4aa865cf1aee49486e34897d83dbdb9cf77975a09a5ad77e5512d47690a74512a468a89432b72a42c +DIST libsemanage-3.1.tar.gz 179601 BLAKE2B 69450a4eda1f3728d339f65db1eec9940995fcea5208d17dca531ebc998aefbfec48fe91beffa3490e1502953aa550405fb696635d01b0eb8050c8f00f11106a SHA512 8609ca7d13b5c603677740f2b14558fea3922624af182d20d618237ba11fcf2559fab82fc68d1efa6ff118f064d426f005138521652c761de92cd66150102197 diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-3.1.ebuild similarity index 86% copy from sys-libs/libsemanage/libsemanage-9999.ebuild copy to sys-libs/libsemanage/libsemanage-3.1.ebuild index 767ab9d45e1..f41d7dffde0 100644 --- a/sys-libs/libsemanage/libsemanage-9999.ebuild +++ b/sys-libs/libsemanage/libsemanage-3.1.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" PYTHON_COMPAT=( python{3_6,3_7,3_8} ) inherit multilib python-r1 toolchain-funcs multilib-minimal MY_P="${P//_/-}" -MY_RELEASEDATE="20191204" +MY_RELEASEDATE="20200710" SEPOL_VER="${PV}" SELNX_VER="${PV}" @@ -27,21 +27,19 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" 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}] - python? ( ${PYTHON_DEPS} )" + ${PYTHON_DEPS}" DEPEND="${RDEPEND} + >=dev-lang/swig-2.0.4-r1 sys-devel/bison sys-devel/flex - python? ( - >=dev-lang/swig-2.0.4-r1 - virtual/pkgconfig - )" + virtual/pkgconfig" # tests are not meant to be run outside of the # full SELinux userland repo @@ -84,7 +82,7 @@ multilib_src_compile() { LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ all - if multilib_is_native_abi && use python; then + if multilib_is_native_abi; then building_py() { emake \ AR="$(tc-getAR)" \ @@ -102,7 +100,7 @@ multilib_src_install() { LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ DESTDIR="${ED}" install - if multilib_is_native_abi && use python; then + if multilib_is_native_abi; then installation_py() { emake DESTDIR="${ED}" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ @@ -113,6 +111,11 @@ multilib_src_install() { fi } +multiib_src_install_all() { + python_setup + python_fix_shebang "${ED}"/usr/libexec/selinux/semanage_migrate_store +} + pkg_postinst() { # Migrate the SELinux semanage configuration store if not done already local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null) @@ -124,12 +127,4 @@ pkg_postinst() { ewarn "For more information, please see" ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration" fi - - # Run the store migration without rebuilds - for POLICY_TYPE in ${POLICY_TYPES} ; do - if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then - einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)." - "${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}" - fi - done } diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild index 767ab9d45e1..f41d7dffde0 100644 --- a/sys-libs/libsemanage/libsemanage-9999.ebuild +++ b/sys-libs/libsemanage/libsemanage-9999.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" PYTHON_COMPAT=( python{3_6,3_7,3_8} ) inherit multilib python-r1 toolchain-funcs multilib-minimal MY_P="${P//_/-}" -MY_RELEASEDATE="20191204" +MY_RELEASEDATE="20200710" SEPOL_VER="${PV}" SELNX_VER="${PV}" @@ -27,21 +27,19 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" 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}] - python? ( ${PYTHON_DEPS} )" + ${PYTHON_DEPS}" DEPEND="${RDEPEND} + >=dev-lang/swig-2.0.4-r1 sys-devel/bison sys-devel/flex - python? ( - >=dev-lang/swig-2.0.4-r1 - virtual/pkgconfig - )" + virtual/pkgconfig" # tests are not meant to be run outside of the # full SELinux userland repo @@ -84,7 +82,7 @@ multilib_src_compile() { LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ all - if multilib_is_native_abi && use python; then + if multilib_is_native_abi; then building_py() { emake \ AR="$(tc-getAR)" \ @@ -102,7 +100,7 @@ multilib_src_install() { LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ DESTDIR="${ED}" install - if multilib_is_native_abi && use python; then + if multilib_is_native_abi; then installation_py() { emake DESTDIR="${ED}" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ @@ -113,6 +111,11 @@ multilib_src_install() { fi } +multiib_src_install_all() { + python_setup + python_fix_shebang "${ED}"/usr/libexec/selinux/semanage_migrate_store +} + pkg_postinst() { # Migrate the SELinux semanage configuration store if not done already local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null) @@ -124,12 +127,4 @@ pkg_postinst() { ewarn "For more information, please see" ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration" fi - - # Run the store migration without rebuilds - for POLICY_TYPE in ${POLICY_TYPES} ; do - if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then - einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)." - "${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}" - fi - done }