[gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Jason Zaman" <perfinion@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/
Date: Thu, 26 Apr 2018 11:22:48 +0000 (UTC)	[thread overview]
Message-ID: <1524741707.ec1f300f10259792f46ad6e9084541d38e26323f.perfinion@gentoo> (raw)

commit:     ec1f300f10259792f46ad6e9084541d38e26323f
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 12:19:05 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 11:21:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec1f300f

sys-libs/libsemanage: update live ebuild

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-libs/libsemanage/libsemanage-9999.ebuild | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 90f98fe5933..c2a6ce67e3e 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20170804"
+MY_RELEASEDATE="20180419"
 
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
@@ -48,6 +48,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 src_prepare() {
+	eapply_user
+
+	echo >> "${S}/src/semanage.conf"
 	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"
@@ -71,8 +74,6 @@ src_prepare() {
 	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
 	echo "bzip-small=true" >> "${S}/src/semanage.conf"
 
-	eapply_user
-
 	multilib_copy_sources
 }
 
@@ -98,16 +99,13 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		SHLIBDIR="${ED}/usr/$(get_libdir)" \
+		LIBDIR="${EPREFIX}/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)" \
-				LIBSEPOLA="${EPREFIX%/}/usr/$(get_libdir)/libsepol.a" \
+				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 				install-pywrap
 			python_optimize # bug 531638
 		}
@@ -131,7 +129,7 @@ pkg_postinst() {
 	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)."
-			/usr/libexec/selinux/semanage_migrate_store -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
+			"${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
 		fi
 	done
 }

next             reply	other threads:[~2018-04-26 11:22 UTC|newest]

Thread overview: 96+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-26 11:22 Jason Zaman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-11-01 13:58 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/ Sam James
2025-05-06 12:37 Sam James
2025-05-06 12:37 Sam James
2025-05-06 12:37 Sam James
2025-03-09 22:01 Jason Zaman
2025-03-09 22:01 Jason Zaman
2025-02-14 13:33 Arthur Zamarin
2025-02-14 13:31 Arthur Zamarin
2025-02-14 13:31 Arthur Zamarin
2025-02-09 22:45 Jason Zaman
2025-02-09 22:45 Jason Zaman
2025-02-08 22:19 Jason Zaman
2024-08-12  1:23 Jason Zaman
2024-06-30  0:49 Jason Zaman
2024-06-30  0:36 Jason Zaman
2024-06-06 13:49 Kenton Groombridge
2024-02-09 14:41 Kenton Groombridge
2024-01-17  1:33 Kenton Groombridge
2024-01-17  1:33 Kenton Groombridge
2024-01-08 12:28 Sam James
2024-01-08 12:03 Sam James
2023-04-09 15:14 Kenton Groombridge
2023-03-30  0:09 Kenton Groombridge
2023-03-30  0:09 Kenton Groombridge
2022-09-23  0:42 Sam James
2022-07-18 12:49 Sam James
2022-07-18 12:49 Sam James
2022-07-02 17:03 Kenton Groombridge
2022-06-04  1:03 Kenton Groombridge
2022-06-04  1:03 Kenton Groombridge
2022-06-04  1:03 Kenton Groombridge
2022-04-11  4:59 Jason Zaman
2022-04-11  3:44 Jason Zaman
2022-04-09  2:55 Jason Zaman
2022-03-27  4:40 Sam James
2022-03-27  4:40 Sam James
2022-03-27  4:39 Sam James
2022-03-27  4:39 Sam James
2021-12-28  1:14 Jason Zaman
2021-11-20 23:20 Sam James
2021-11-20 23:20 Sam James
2021-10-31  2:55 Sam James
2021-07-28 20:08 Sam James
2021-07-04 22:19 Sam James
2021-04-03  4:19 Jason Zaman
2021-04-03  4:19 Jason Zaman
2021-01-03  8:20 Jason Zaman
2020-12-18  3:31 Jason Zaman
2020-12-03  3:12 Jason Zaman
2020-11-21 20:14 Jason Zaman
2020-11-16  5:38 Jason Zaman
2020-09-15  3:41 Jason Zaman
2020-07-02 12:26 Ben Kohler
2020-07-02 12:26 Ben Kohler
2020-02-11 19:50 Agostino Sarubbo
2020-02-11 19:43 Agostino Sarubbo
2020-02-10 21:25 Michał Górny
2019-12-08 18:39 Jason Zaman
2019-12-08 17:26 Jason Zaman
2019-12-08 17:26 Jason Zaman
2019-12-02 14:50 Jason Zaman
2019-08-17 10:09 Jason Zaman
2019-08-17 10:09 Jason Zaman
2019-03-31 13:46 Jason Zaman
2019-03-31 13:46 Jason Zaman
2019-02-09 11:49 Jason Zaman
2019-02-09 11:49 Jason Zaman
2018-06-26  2:07 Jason Zaman
2018-05-27 11:08 Jason Zaman
2018-05-25  7:29 Jason Zaman
2018-05-25  7:29 Jason Zaman
2018-05-13 17:28 Jason Zaman
2018-05-13 17:28 Jason Zaman
2018-04-27  4:45 Jason Zaman
2018-04-27  4:45 Jason Zaman
2018-04-26 11:22 Jason Zaman
2018-03-02  6:27 Jason Zaman
2017-09-23  2:15 Jason Zaman
2017-09-23  2:15 Jason Zaman
2017-08-07 16:48 Jason Zaman
2017-08-07 16:48 Jason Zaman
2017-07-22 11:08 Jason Zaman
2017-07-22 11:08 Jason Zaman
2017-07-09 10:03 Jason Zaman
2017-07-09 10:03 Jason Zaman
2017-06-13 15:20 Jason Zaman
2017-06-13 15:20 Jason Zaman
2017-05-26 22:54 David Seifert
2016-12-12 14:01 Jason Zaman
2016-10-03  7:30 Jason Zaman
2016-06-01 14:15 Jason Zaman
2016-03-13 19:47 Sven Vermeulen
2016-02-17 20:11 Mike Frysinger
2015-12-21  8:57 Jason Zaman
2015-10-10 15:25 Jason Zaman

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:90f98fe593 dfblob:c2a6ce67e3 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1524741707.ec1f300f10259792f46ad6e9084541d38e26323f.perfinion@gentoo \
    --to=perfinion@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox