From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B8491138C8E for ; Mon, 24 Oct 2016 15:39:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6F41E0A61; Mon, 24 Oct 2016 15:39:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADBA2E0A61 for ; Mon, 24 Oct 2016 15:39:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F30E341660 for ; Mon, 24 Oct 2016 15:39:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 415F924A2 for ; Mon, 24 Oct 2016 15:39:49 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1477323494.ca6d84ff0bfc15606079d88358f5cf924bcdb3a1.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/files/, sys-libs/libsemanage/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libsemanage/Manifest sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch sys-libs/libsemanage/libsemanage-2.6.ebuild sys-libs/libsemanage/libsemanage-2.6_rc2.ebuild sys-libs/libsemanage/libsemanage-9999.ebuild X-VCS-Directories: sys-libs/libsemanage/ sys-libs/libsemanage/files/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: ca6d84ff0bfc15606079d88358f5cf924bcdb3a1 X-VCS-Branch: master Date: Mon, 24 Oct 2016 15:39:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 959a0547-6e2b-4856-977f-92641d73a4c6 X-Archives-Hash: 85e9a87d23538782b8b8e6288eec54bb commit: ca6d84ff0bfc15606079d88358f5cf924bcdb3a1 Author: Jason Zaman gentoo org> AuthorDate: Sun Oct 23 10:24:19 2016 +0000 Commit: Jason Zaman gentoo org> CommitDate: Mon Oct 24 15:38:14 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6d84ff sys-libs/libsemanage: bump to 2.6 final release Also include patch for genhomedircon non-MLS issue Package-Manager: portage-2.3.0 sys-libs/libsemanage/Manifest | 2 +- ...-genhomedircon-only-set-MLS-level-if-MLS-.patch | 38 ++++++++++++++++++++++ ...anage-2.6_rc2.ebuild => libsemanage-2.6.ebuild} | 3 +- sys-libs/libsemanage/libsemanage-9999.ebuild | 2 +- 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest index 90e4450..6f2acf6 100644 --- a/sys-libs/libsemanage/Manifest +++ b/sys-libs/libsemanage/Manifest @@ -1,2 +1,2 @@ DIST libsemanage-2.5.tar.gz 152884 SHA256 46e2f36254369b6e91d1eea0460c262b139361b055a3a67d3ceea2d8ef72e006 SHA512 cf644b77d8a24f76c630ece582df1b49a0c5f48f1c9f79b1caee0df10372008954406974472a072360dbe6de5ebc19b1b21bb247084d75b7186f61b32f33b8ec WHIRLPOOL 397b7fd2e9b2c00dbc2f58bdc023501dcd7ecf1212fef9ad7993b4763a041068416ef06552c0abf0beef8c69f4704933feca36951866c43d867181332971f6be -DIST libsemanage-2.6-rc2.tar.gz 155934 SHA256 672bd1c3c6faeca483d90515a03ac9b65b6596064f49cd4cfbbb53c186d08a47 SHA512 fb794738d7497709441248b1ba3abe35aac7bbfaf7dc875d0c50733f871e5e90b209aefe912584f1e08d3aba596dd569caad749c236440662ba16b1c64727511 WHIRLPOOL afd746fca0b4d2a616996ca7346242f50ab35591df050ede9805a9e8aa958a4c8b474a62fd10aea99971f0bf7507a1d0d9d6e4e7b79b8095eea32feeaba1a2d6 +DIST libsemanage-2.6.tar.gz 155897 SHA256 4f81541047290b751f2ffb926fcd381c186f22db18d9fe671b0b4a6a54e8cfce SHA512 38741d6e6f7a2669bfeee362e42d6bfd720cceeaf61331e329b2210fdc070444e529656ce86dd82e94aa248eafcfaea4c5d013d9cce76c1039be6fc6a6b2c790 WHIRLPOOL 9fb781c637c4725dd48fa07898fd5db4b2f1e47264e80468e3c9b48fd8afc6bcb6494a44ccbfb0e48dec10dc5db461ab8e1941251d625854ebbebdbfdacb971c diff --git a/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch b/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch new file mode 100644 index 00000000..e3123ed --- /dev/null +++ b/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch @@ -0,0 +1,38 @@ +From 4cf9b9ce2df06fd5a29e5264a6552c9b02ec0b5b Mon Sep 17 00:00:00 2001 +From: Stephen Smalley +Date: Fri, 14 Oct 2016 13:36:37 -0400 +Subject: [PATCH] libsemanage: genhomedircon: only set MLS level if MLS is + enabled + +When a non-MLS policy was used with genhomedircon context_from_record() +in sepol would report an error because an MLS level was present when MLS +is disabled. Based on a patch by Gary Tierney, amended to use +sepol_policydb_mls_enabled rather than semanage_mls_enabled because +we are testing the temporary working policy, not the active policy. + +Reported-by: Jason Zaman +Signed-off-by: Stephen Smalley +--- + libsemanage/src/genhomedircon.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libsemanage/src/genhomedircon.c b/libsemanage/src/genhomedircon.c +index 6991fff..5e9d722 100644 +--- libsemanage/src/genhomedircon.c ++++ libsemanage/src/genhomedircon.c +@@ -638,7 +638,11 @@ static int write_contexts(genhomedircon_settings_t *s, FILE *out, + goto fail; + } + +- if (sepol_context_set_user(sepolh, context, user->sename) < 0 || ++ if (sepol_context_set_user(sepolh, context, user->sename) < 0) { ++ goto fail; ++ } ++ ++ if (sepol_policydb_mls_enabled(s->policydb) && + sepol_context_set_mls(sepolh, context, user->level) < 0) { + goto fail; + } +-- +2.7.3 + diff --git a/sys-libs/libsemanage/libsemanage-2.6_rc2.ebuild b/sys-libs/libsemanage/libsemanage-2.6.ebuild similarity index 97% rename from sys-libs/libsemanage/libsemanage-2.6_rc2.ebuild rename to sys-libs/libsemanage/libsemanage-2.6.ebuild index 2b625f5..9094e96 100644 --- a/sys-libs/libsemanage/libsemanage-2.6_rc2.ebuild +++ b/sys-libs/libsemanage/libsemanage-2.6.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} ) inherit multilib python-r1 toolchain-funcs multilib-minimal MY_P="${P//_/-}" -MY_RELEASEDATE="20161006" +MY_RELEASEDATE="20161014" SEPOL_VER="${PV}" SELNX_VER="${PV}" @@ -73,6 +73,7 @@ src_prepare() { echo "bzip-small=true" >> "${S}/src/semanage.conf" eapply "${FILESDIR}"/${PN}-2.6-build-paths.patch + eapply "${FILESDIR}"/${PN}-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch eapply_user diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild index 2b625f5..ae21297 100644 --- a/sys-libs/libsemanage/libsemanage-9999.ebuild +++ b/sys-libs/libsemanage/libsemanage-9999.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} ) inherit multilib python-r1 toolchain-funcs multilib-minimal MY_P="${P//_/-}" -MY_RELEASEDATE="20161006" +MY_RELEASEDATE="20161014" SEPOL_VER="${PV}" SELNX_VER="${PV}"