Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
Date: Sun, 09 Jul 2017 17:31:44
Message-Id: 1499621451.774ecf6a452a0a7a1f6d5b9005b51fea15b27618.lluixhi@gentoo
1 commit: 774ecf6a452a0a7a1f6d5b9005b51fea15b27618
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Sun Jul 9 17:30:51 2017 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Sun Jul 9 17:30:51 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=774ecf6a
7
8 sys-libs/libselinux: version bump to 2.7_rc4
9
10 libsepol no longer needs patching.
11
12 sys-libs/libselinux/Manifest | 2 +
13 sys-libs/libselinux/libselinux-2.7_rc4.ebuild | 160 ++++++++++++++++++++++++++
14 2 files changed, 162 insertions(+)
15
16 diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
17 index 3892acf..dda67a1 100644
18 --- a/sys-libs/libselinux/Manifest
19 +++ b/sys-libs/libselinux/Manifest
20 @@ -2,6 +2,8 @@ AUX libselinux-2.6-0007-build-related-fixes-bug-500674.patch 3580 SHA256 a9803f0
21 AUX libselinux-2.7-fts_ldlibs.patch 536 SHA256 8baac2b87e3f50b071a70651d965d564ad86344f9205a91029f9d34e0987d308 SHA512 71452e5f110af7f9e86c567e765a7fb069151cc174a179f7dcb7862af589a8a01df899a54c25ccec18b047e3e57cd35308c46d26b9d5241741829f42a655fae6 WHIRLPOOL eaa7d9e92aa50da4102f3f08de6ea089bd839eb7c842aa62c7ef37c8ac7d0749cf97231f572ac713ad2c2087457702d504bf769cfcfb88a4529355faad7945b8
22 DIST libselinux-2.6.tar.gz 203119 SHA256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a SHA512 906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b WHIRLPOOL bf60ce907b7057ada5d19e3a0cd1f092a7dfc2de774e504762424c325c657a4f144fbe252e7d908f7c6d902d80388517e15134a289f4358e564c8720ea6534d9
23 DIST libselinux-2.7-rc1.tar.gz 186897 SHA256 213e1ca473855a61e8147e027b6ee5edf4162c9fbfc00749643f0ecc0a08371c SHA512 fe7fe67f14e5483fbb237eeb33f6eca48f1d3f6a3ab7fa1cfa99e5143ce4d6a03c9033a03a82bb3954d07c4d1a2c211cf5dea80030c727f9adcb3cc6bd72e641 WHIRLPOOL dfee20eaf3ea9e3cb7caa21ac10e710799ed324eee833650fc0bdf17c3fbcd3426bea7d915f6d6b79ca4440b99c57805a018bbd6a6103d97cb590f52d58f0e40
24 +DIST libselinux-2.7-rc4.tar.gz 186904 SHA256 27c1780d6c623ab70ccf6923b8c8f386f8984ec99b7b4734f7b23d3d25809970 SHA512 788beb44ca2d2b6d84b57193538ed6f9c25f536c129903d58a852a64fc2c46a4e4249c4acd6234a6242a6ac0ea828a553f42a0e80fd9405ff5225c8a722c395f WHIRLPOOL 709ba4c3021d8b9e260ec8dbb0ff0ecd2a06a32cb44ce2c6fc486004e4c7f8cc28728150df40967472d00b97a26194dc36702dc990f5dd7055b2571714ccd37a
25 EBUILD libselinux-2.6.ebuild 4484 SHA256 ce11a2196a960e75df6ff4eafd8ab670687c7ead2cca6f51c15d5c9688d34e26 SHA512 6bf726dc5594ffba0aa36e4f97fc4131c4c4b78ad498c0c36dffdd335ca9772d1f3d6c57dc8de87e431b06bbb2e190f220932dc166e8220d68cf6293bca518f4 WHIRLPOOL 5a7df89e0c1f21f3bc3f0a6e3f590520c51879b9a62a78c42435fd0a7ee9e876d47a7d3d5c48a659aedc18fa0835fd59164773073ed30ed1167648771b98f540
26 EBUILD libselinux-2.7_rc1.ebuild 4508 SHA256 8273a5a82155cdc299135f00250410047e81a4941c900d96802f6107718a81c5 SHA512 c5afe914323f99c45cdd5058c45754231c8d1d29a17a4ac4046d99c6697fac6366ea4fac854f64c849edc15a74525ef2d8c34826957048a35eb455253ab5caa5 WHIRLPOOL 2ed67afde472c91f9397a3a21ff19652c32e03e746619c542202afe99e51e5ab17833b6e7b62d0020f7a3249c27c1e667126510217578ec9a97c6995a6cdc0e6
27 +EBUILD libselinux-2.7_rc4.ebuild 4508 SHA256 0dbd2576be8d3e485d0fd5c312fa786e673258c06eaee5cf3b1d1a1544feb394 SHA512 ea38b6042023e2993958e3634733549a58f935cc77853a7443b5d5d948f8becbbd3d5aabfedad12bc9c3f51bbc80be9462a276397371cbb91137c96ed40ab82a WHIRLPOOL 706f99fb0c39dee6785009208a44e2d9409f267021cabf1393604a4f3f165c23a312f7dc83dc2646e97a9442a6925667de8664a12515ede3c5044eff29f0d30e
28 MISC metadata.xml 676 SHA256 288211da34dc4cabaeaa85c52462c3ad2792347abbf88f78eae812a4e3dc8c8c SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7 WHIRLPOOL bd4938862e3ec119c1da448d5bc8c99a6063704a65c8a906514f5160adf65851af64c6a1c4626e97438e9f4a7288ef002b06a876b9d73e67d70e38ca31cc1319
29
30 diff --git a/sys-libs/libselinux/libselinux-2.7_rc4.ebuild b/sys-libs/libselinux/libselinux-2.7_rc4.ebuild
31 new file mode 100644
32 index 0000000..217cfe9
33 --- /dev/null
34 +++ b/sys-libs/libselinux/libselinux-2.7_rc4.ebuild
35 @@ -0,0 +1,160 @@
36 +# Copyright 1999-2017 Gentoo Foundation
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI="6"
40 +PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
41 +USE_RUBY="ruby21 ruby22 ruby23"
42 +
43 +# No, I am not calling ruby-ng
44 +inherit multilib python-r1 toolchain-funcs multilib-minimal
45 +
46 +MY_P="${P//_/-}"
47 +SEPOL_VER="${PV}"
48 +MY_RELEASEDATE="20170630"
49 +
50 +DESCRIPTION="SELinux userland library"
51 +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
52 +
53 +if [[ ${PV} == 9999 ]] ; then
54 + inherit git-r3
55 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
56 + S="${WORKDIR}/${MY_P}/${PN}"
57 +else
58 + SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
59 + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
60 + S="${WORKDIR}/${MY_P}"
61 +fi
62 +
63 +LICENSE="public-domain"
64 +SLOT="0"
65 +IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
66 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
67 +
68 +RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
69 + !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
70 + pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
71 + python? ( ${PYTHON_DEPS} )
72 + ruby? (
73 + ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
74 + ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
75 + ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
76 + )
77 + elibc_musl? ( sys-libs/fts-standalone )"
78 +DEPEND="${RDEPEND}
79 + virtual/pkgconfig
80 + python? ( >=dev-lang/swig-2.0.9 )"
81 +
82 +src_prepare() {
83 + if [[ ${PV} != 9999 ]] ; then
84 + # If needed for live builds, place them in /etc/portage/patches
85 + eapply "${FILESDIR}/libselinux-2.7-fts_ldlibs.patch"
86 + fi
87 +
88 + eapply_user
89 +
90 + multilib_copy_sources
91 +}
92 +
93 +multilib_src_compile() {
94 + tc-export AR CC PKG_CONFIG RANLIB
95 +
96 + emake \
97 + LIBDIR="\$(PREFIX)/$(get_libdir)" \
98 + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
99 + LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
100 + USE_PCRE2="$(usex pcre2 y n)" \
101 + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
102 + all
103 +
104 + if multilib_is_native_abi && use python; then
105 + building() {
106 + emake \
107 + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
108 + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
109 + LIBDIR="\$(PREFIX)/$(get_libdir)" \
110 + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
111 + USE_PCRE2="$(usex pcre2 y n)" \
112 + pywrap
113 + }
114 + python_foreach_impl building
115 + fi
116 +
117 + if multilib_is_native_abi && use ruby; then
118 + building() {
119 + einfo "Calling rubywrap for ${1}"
120 + # Clean up .lo file to force rebuild
121 + rm -f src/selinuxswig_ruby_wrap.lo || die
122 + emake \
123 + RUBY=${1} \
124 + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
125 + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
126 + LIBDIR="\$(PREFIX)/$(get_libdir)" \
127 + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
128 + USE_PCRE2="$(usex pcre2 y n)" \
129 + rubywrap
130 + }
131 + for RUBYTARGET in ${USE_RUBY}; do
132 + use ruby_targets_${RUBYTARGET} || continue
133 +
134 + building ${RUBYTARGET}
135 + done
136 + fi
137 +}
138 +
139 +multilib_src_install() {
140 + emake DESTDIR="${D}" \
141 + LIBDIR="\$(PREFIX)/$(get_libdir)" \
142 + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
143 + LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
144 + USE_PCRE2="$(usex pcre2 y n)" \
145 + install
146 +
147 + if multilib_is_native_abi && use python; then
148 + installation() {
149 + emake DESTDIR="${D}" \
150 + LIBDIR="\$(PREFIX)/$(get_libdir)" \
151 + LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
152 + USE_PCRE2="$(usex pcre2 y n)" \
153 + install-pywrap
154 + python_optimize # bug 531638
155 + }
156 + python_foreach_impl installation
157 + fi
158 +
159 + if multilib_is_native_abi && use ruby; then
160 + installation() {
161 + einfo "Calling install-rubywrap for ${1}"
162 + # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
163 + rm src/selinuxswig_ruby_wrap.lo
164 + emake DESTDIR="${D}" \
165 + LIBDIR="\$(PREFIX)/$(get_libdir)" \
166 + LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
167 + RUBY=${1} \
168 + USE_PCRE2="$(usex pcre2 y n)" \
169 + install-rubywrap
170 + }
171 + for RUBYTARGET in ${USE_RUBY}; do
172 + use ruby_targets_${RUBYTARGET} || continue
173 +
174 + installation ${RUBYTARGET}
175 + done
176 + fi
177 +
178 + use static-libs || rm "${D}"/usr/lib*/*.a || die
179 +}
180 +
181 +pkg_postinst() {
182 + # Fix bug 473502
183 + for POLTYPE in ${POLICY_TYPES};
184 + do
185 + mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
186 + touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
187 + # Fix bug 516608
188 + for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
189 + if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
190 + sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
191 + || die "Failed to recompile contexts"
192 + fi
193 + done
194 + done
195 +}