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 33474139694 for ; Sun, 9 Jul 2017 17:31:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D133234056; Sun, 9 Jul 2017 17:31:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6DE31234056 for ; Sun, 9 Jul 2017 17:31:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC430341902 for ; Sun, 9 Jul 2017 17:31:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E4DE7489 for ; Sun, 9 Jul 2017 17:31:39 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1499621451.774ecf6a452a0a7a1f6d5b9005b51fea15b27618.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/ X-VCS-Repository: proj/musl X-VCS-Files: sys-libs/libselinux/Manifest sys-libs/libselinux/libselinux-2.7_rc4.ebuild X-VCS-Directories: sys-libs/libselinux/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: 774ecf6a452a0a7a1f6d5b9005b51fea15b27618 X-VCS-Branch: master Date: Sun, 9 Jul 2017 17:31:39 +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: dec10e30-db80-4af7-a9ed-131d9b6136ee X-Archives-Hash: 21e49447e6a8f257f243c573ecdd222a commit: 774ecf6a452a0a7a1f6d5b9005b51fea15b27618 Author: Aric Belsito gmail com> AuthorDate: Sun Jul 9 17:30:51 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Sun Jul 9 17:30:51 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=774ecf6a sys-libs/libselinux: version bump to 2.7_rc4 libsepol no longer needs patching. sys-libs/libselinux/Manifest | 2 + sys-libs/libselinux/libselinux-2.7_rc4.ebuild | 160 ++++++++++++++++++++++++++ 2 files changed, 162 insertions(+) diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest index 3892acf..dda67a1 100644 --- a/sys-libs/libselinux/Manifest +++ b/sys-libs/libselinux/Manifest @@ -2,6 +2,8 @@ AUX libselinux-2.6-0007-build-related-fixes-bug-500674.patch 3580 SHA256 a9803f0 AUX libselinux-2.7-fts_ldlibs.patch 536 SHA256 8baac2b87e3f50b071a70651d965d564ad86344f9205a91029f9d34e0987d308 SHA512 71452e5f110af7f9e86c567e765a7fb069151cc174a179f7dcb7862af589a8a01df899a54c25ccec18b047e3e57cd35308c46d26b9d5241741829f42a655fae6 WHIRLPOOL eaa7d9e92aa50da4102f3f08de6ea089bd839eb7c842aa62c7ef37c8ac7d0749cf97231f572ac713ad2c2087457702d504bf769cfcfb88a4529355faad7945b8 DIST libselinux-2.6.tar.gz 203119 SHA256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a SHA512 906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b WHIRLPOOL bf60ce907b7057ada5d19e3a0cd1f092a7dfc2de774e504762424c325c657a4f144fbe252e7d908f7c6d902d80388517e15134a289f4358e564c8720ea6534d9 DIST libselinux-2.7-rc1.tar.gz 186897 SHA256 213e1ca473855a61e8147e027b6ee5edf4162c9fbfc00749643f0ecc0a08371c SHA512 fe7fe67f14e5483fbb237eeb33f6eca48f1d3f6a3ab7fa1cfa99e5143ce4d6a03c9033a03a82bb3954d07c4d1a2c211cf5dea80030c727f9adcb3cc6bd72e641 WHIRLPOOL dfee20eaf3ea9e3cb7caa21ac10e710799ed324eee833650fc0bdf17c3fbcd3426bea7d915f6d6b79ca4440b99c57805a018bbd6a6103d97cb590f52d58f0e40 +DIST libselinux-2.7-rc4.tar.gz 186904 SHA256 27c1780d6c623ab70ccf6923b8c8f386f8984ec99b7b4734f7b23d3d25809970 SHA512 788beb44ca2d2b6d84b57193538ed6f9c25f536c129903d58a852a64fc2c46a4e4249c4acd6234a6242a6ac0ea828a553f42a0e80fd9405ff5225c8a722c395f WHIRLPOOL 709ba4c3021d8b9e260ec8dbb0ff0ecd2a06a32cb44ce2c6fc486004e4c7f8cc28728150df40967472d00b97a26194dc36702dc990f5dd7055b2571714ccd37a EBUILD libselinux-2.6.ebuild 4484 SHA256 ce11a2196a960e75df6ff4eafd8ab670687c7ead2cca6f51c15d5c9688d34e26 SHA512 6bf726dc5594ffba0aa36e4f97fc4131c4c4b78ad498c0c36dffdd335ca9772d1f3d6c57dc8de87e431b06bbb2e190f220932dc166e8220d68cf6293bca518f4 WHIRLPOOL 5a7df89e0c1f21f3bc3f0a6e3f590520c51879b9a62a78c42435fd0a7ee9e876d47a7d3d5c48a659aedc18fa0835fd59164773073ed30ed1167648771b98f540 EBUILD libselinux-2.7_rc1.ebuild 4508 SHA256 8273a5a82155cdc299135f00250410047e81a4941c900d96802f6107718a81c5 SHA512 c5afe914323f99c45cdd5058c45754231c8d1d29a17a4ac4046d99c6697fac6366ea4fac854f64c849edc15a74525ef2d8c34826957048a35eb455253ab5caa5 WHIRLPOOL 2ed67afde472c91f9397a3a21ff19652c32e03e746619c542202afe99e51e5ab17833b6e7b62d0020f7a3249c27c1e667126510217578ec9a97c6995a6cdc0e6 +EBUILD libselinux-2.7_rc4.ebuild 4508 SHA256 0dbd2576be8d3e485d0fd5c312fa786e673258c06eaee5cf3b1d1a1544feb394 SHA512 ea38b6042023e2993958e3634733549a58f935cc77853a7443b5d5d948f8becbbd3d5aabfedad12bc9c3f51bbc80be9462a276397371cbb91137c96ed40ab82a WHIRLPOOL 706f99fb0c39dee6785009208a44e2d9409f267021cabf1393604a4f3f165c23a312f7dc83dc2646e97a9442a6925667de8664a12515ede3c5044eff29f0d30e MISC metadata.xml 676 SHA256 288211da34dc4cabaeaa85c52462c3ad2792347abbf88f78eae812a4e3dc8c8c SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7 WHIRLPOOL bd4938862e3ec119c1da448d5bc8c99a6063704a65c8a906514f5160adf65851af64c6a1c4626e97438e9f4a7288ef002b06a876b9d73e67d70e38ca31cc1319 diff --git a/sys-libs/libselinux/libselinux-2.7_rc4.ebuild b/sys-libs/libselinux/libselinux-2.7_rc4.ebuild new file mode 100644 index 0000000..217cfe9 --- /dev/null +++ b/sys-libs/libselinux/libselinux-2.7_rc4.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 ) +USE_RUBY="ruby21 ruby22 ruby23" + +# No, I am not calling ruby-ng +inherit multilib python-r1 toolchain-funcs multilib-minimal + +MY_P="${P//_/-}" +SEPOL_VER="${PV}" +MY_RELEASEDATE="20170630" + +DESCRIPTION="SELinux userland library" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${MY_P}/${PN}" +else + SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="public-domain" +SLOT="0" +IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] + !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] ) + pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + ruby? ( + ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) + ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) + ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) + ) + elibc_musl? ( sys-libs/fts-standalone )" +DEPEND="${RDEPEND} + virtual/pkgconfig + python? ( >=dev-lang/swig-2.0.9 )" + +src_prepare() { + if [[ ${PV} != 9999 ]] ; then + # If needed for live builds, place them in /etc/portage/patches + eapply "${FILESDIR}/libselinux-2.7-fts_ldlibs.patch" + fi + + eapply_user + + multilib_copy_sources +} + +multilib_src_compile() { + tc-export AR CC PKG_CONFIG RANLIB + + emake \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ + USE_PCRE2="$(usex pcre2 y n)" \ + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ + all + + if multilib_is_native_abi && use python; then + building() { + emake \ + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ + pywrap + } + python_foreach_impl building + fi + + if multilib_is_native_abi && use ruby; then + building() { + einfo "Calling rubywrap for ${1}" + # Clean up .lo file to force rebuild + rm -f src/selinuxswig_ruby_wrap.lo || die + emake \ + RUBY=${1} \ + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ + rubywrap + } + for RUBYTARGET in ${USE_RUBY}; do + use ruby_targets_${RUBYTARGET} || continue + + building ${RUBYTARGET} + done + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \ + USE_PCRE2="$(usex pcre2 y n)" \ + install + + if multilib_is_native_abi && use python; then + installation() { + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \ + USE_PCRE2="$(usex pcre2 y n)" \ + install-pywrap + python_optimize # bug 531638 + } + python_foreach_impl installation + fi + + if multilib_is_native_abi && use ruby; then + installation() { + einfo "Calling install-rubywrap for ${1}" + # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions + rm src/selinuxswig_ruby_wrap.lo + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \ + RUBY=${1} \ + USE_PCRE2="$(usex pcre2 y n)" \ + install-rubywrap + } + for RUBYTARGET in ${USE_RUBY}; do + use ruby_targets_${RUBYTARGET} || continue + + installation ${RUBYTARGET} + done + fi + + use static-libs || rm "${D}"/usr/lib*/*.a || die +} + +pkg_postinst() { + # Fix bug 473502 + for POLTYPE in ${POLICY_TYPES}; + do + mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die + touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die + # Fix bug 516608 + for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do + if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then + sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \ + || die "Failed to recompile contexts" + fi + done + done +}