1 |
commit: 7b2d9ffee65dae931d86d546acc5b03754b1644c |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 9 17:30:13 2021 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 9 17:31:23 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2d9ffe |
7 |
|
8 |
sys-apps/util-linux: stabilize 2.37.2-r1 |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
sys-apps/util-linux/util-linux-2.37.2-r1.ebuild | 2 +- |
13 |
sys-apps/util-linux/util-linux-2.37.2.ebuild | 336 ------------------------ |
14 |
2 files changed, 1 insertion(+), 337 deletions(-) |
15 |
|
16 |
diff --git a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild |
17 |
index 1cfac588089..9c414db3dfb 100644 |
18 |
--- a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild |
19 |
+++ b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild |
20 |
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then |
21 |
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" |
22 |
else |
23 |
[[ "${PV}" = *_rc* ]] || \ |
24 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
25 |
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" |
26 |
SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" |
27 |
fi |
28 |
|
29 |
|
30 |
diff --git a/sys-apps/util-linux/util-linux-2.37.2.ebuild b/sys-apps/util-linux/util-linux-2.37.2.ebuild |
31 |
deleted file mode 100644 |
32 |
index be32fef6018..00000000000 |
33 |
--- a/sys-apps/util-linux/util-linux-2.37.2.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,336 +0,0 @@ |
36 |
-# Copyright 1999-2021 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
- |
41 |
-PYTHON_COMPAT=( python3_{8,9} ) |
42 |
- |
43 |
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ |
44 |
- pam python-r1 multilib-minimal multiprocessing systemd |
45 |
- |
46 |
-MY_PV="${PV/_/-}" |
47 |
-MY_P="${PN}-${MY_PV}" |
48 |
- |
49 |
-if [[ ${PV} == 9999 ]] ; then |
50 |
- inherit git-r3 autotools |
51 |
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" |
52 |
-else |
53 |
- [[ "${PV}" = *_rc* ]] || \ |
54 |
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" |
55 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" |
56 |
-fi |
57 |
- |
58 |
-DESCRIPTION="Various useful Linux utilities" |
59 |
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" |
60 |
- |
61 |
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" |
62 |
-SLOT="0" |
63 |
-IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" |
64 |
- |
65 |
-# Most lib deps here are related to programs rather than our libs, |
66 |
-# so we rarely need to specify ${MULTILIB_USEDEP}. |
67 |
-RDEPEND=" |
68 |
- virtual/libcrypt:= |
69 |
- audit? ( >=sys-process/audit-2.6:= ) |
70 |
- caps? ( sys-libs/libcap-ng ) |
71 |
- cramfs? ( sys-libs/zlib:= ) |
72 |
- cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) |
73 |
- hardlink? ( dev-libs/libpcre2:= ) |
74 |
- ncurses? ( |
75 |
- sys-libs/ncurses:=[unicode(+)?] |
76 |
- magic? ( sys-apps/file:0= ) |
77 |
- ) |
78 |
- nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) |
79 |
- pam? ( sys-libs/pam ) |
80 |
- ppc? ( sys-libs/librtas ) |
81 |
- ppc64? ( sys-libs/librtas ) |
82 |
- python? ( ${PYTHON_DEPS} ) |
83 |
- readline? ( sys-libs/readline:0= ) |
84 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) |
85 |
- slang? ( sys-libs/slang ) |
86 |
- !build? ( systemd? ( sys-apps/systemd ) ) |
87 |
- udev? ( virtual/libudev:= )" |
88 |
-BDEPEND=" |
89 |
- virtual/pkgconfig |
90 |
- nls? ( sys-devel/gettext ) |
91 |
- test? ( sys-devel/bc ) |
92 |
-" |
93 |
-DEPEND=" |
94 |
- ${RDEPEND} |
95 |
- virtual/os-headers |
96 |
-" |
97 |
-RDEPEND+=" |
98 |
- hardlink? ( !app-arch/hardlink ) |
99 |
- logger? ( !>=app-admin/sysklogd-2.0[logger] ) |
100 |
- kill? ( |
101 |
- !sys-apps/coreutils[kill] |
102 |
- !sys-process/procps[kill] |
103 |
- ) |
104 |
- su? ( |
105 |
- !<sys-apps/shadow-4.7-r2 |
106 |
- !>=sys-apps/shadow-4.7-r2[su] |
107 |
- ) |
108 |
- !net-wireless/rfkill |
109 |
- !<app-shells/bash-completion-2.7-r1 |
110 |
-" |
111 |
- |
112 |
-# Required for man-page generation |
113 |
-if [[ "${PV}" == 9999 ]] ; then |
114 |
- BDEPEND+=" |
115 |
- dev-ruby/asciidoctor |
116 |
- " |
117 |
-fi |
118 |
- |
119 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
120 |
-RESTRICT="!test? ( test )" |
121 |
- |
122 |
-S="${WORKDIR}/${MY_P}" |
123 |
- |
124 |
-PATCHES=( |
125 |
- "${FILESDIR}"/${PN}-2.37.1-agetty_ctrl-c_erase.patch #804972 |
126 |
- "${FILESDIR}"/${P}-ioctl_ns-test-hang.patch # upstream test hang patch |
127 |
-) |
128 |
- |
129 |
-src_prepare() { |
130 |
- default |
131 |
- |
132 |
- # Prevent uuidd test failure due to socket path limit. #593304 |
133 |
- sed -i \ |
134 |
- -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ |
135 |
- tests/ts/uuid/uuidd || die "Failed to fix uuidd test" |
136 |
- |
137 |
- if ! use userland_GNU ; then |
138 |
- # test runner is using GNU-specific xargs call |
139 |
- sed -i -e 's:xargs:gxargs:' tests/run.sh || die |
140 |
- # test requires util-linux uuidgen (which we don't build) |
141 |
- rm tests/ts/uuid/oids || die |
142 |
- fi |
143 |
- |
144 |
- if [[ ${PV} == 9999 ]] ; then |
145 |
- po/update-potfiles |
146 |
- eautoreconf |
147 |
- fi |
148 |
- |
149 |
- elibtoolize |
150 |
-} |
151 |
- |
152 |
-lfs_fallocate_test() { |
153 |
- # Make sure we can use fallocate with LFS #300307 |
154 |
- cat <<-EOF > "${T}"/fallocate.${ABI}.c |
155 |
- #define _GNU_SOURCE |
156 |
- #include <fcntl.h> |
157 |
- main() { return fallocate(0, 0, 0, 0); } |
158 |
- EOF |
159 |
- append-lfs-flags |
160 |
- $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ |
161 |
- || export ac_cv_func_fallocate=no |
162 |
- rm -f "${T}"/fallocate.${ABI}.c |
163 |
-} |
164 |
- |
165 |
-python_configure() { |
166 |
- local myeconfargs=( |
167 |
- "${commonargs[@]}" |
168 |
- --disable-all-programs |
169 |
- --disable-bash-completion |
170 |
- --without-systemdsystemunitdir |
171 |
- --with-python |
172 |
- ) |
173 |
- if use userland_GNU ; then |
174 |
- myeconfargs+=( |
175 |
- --enable-libblkid |
176 |
- --enable-libmount |
177 |
- --enable-pylibmount |
178 |
- ) |
179 |
- fi |
180 |
- mkdir "${BUILD_DIR}" || die |
181 |
- pushd "${BUILD_DIR}" >/dev/null || die |
182 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
183 |
- popd >/dev/null || die |
184 |
-} |
185 |
- |
186 |
-multilib_src_configure() { |
187 |
- lfs_fallocate_test |
188 |
- # The scanf test in a run-time test which fails while cross-compiling. |
189 |
- # Blindly assume a POSIX setup since we require libmount, and libmount |
190 |
- # itself fails when the scanf test fails. #531856 |
191 |
- tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms |
192 |
- export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 |
193 |
- export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 |
194 |
- |
195 |
- # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 |
196 |
- export NCURSES6_CONFIG=false NCURSES5_CONFIG=false |
197 |
- export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false |
198 |
- |
199 |
- # configure args shared by python and non-python builds |
200 |
- local commonargs=( |
201 |
- --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" |
202 |
- ) |
203 |
- |
204 |
- local myeconfargs=( |
205 |
- "${commonargs[@]}" |
206 |
- --with-bashcompletiondir="$(get_bashcompdir)" |
207 |
- --without-python |
208 |
- $(multilib_native_use_enable suid makeinstall-chown) |
209 |
- $(multilib_native_use_enable suid makeinstall-setuid) |
210 |
- $(multilib_native_use_with readline) |
211 |
- $(multilib_native_use_with slang) |
212 |
- $(multilib_native_use_with systemd) |
213 |
- $(multilib_native_use_with udev) |
214 |
- $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') |
215 |
- $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') |
216 |
- $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') |
217 |
- $(multilib_native_use_with audit) |
218 |
- $(tc-has-tls || echo --disable-tls) |
219 |
- $(use_enable nls) |
220 |
- $(use_enable unicode widechar) |
221 |
- $(use_enable static-libs static) |
222 |
- $(use_with ncurses tinfo) |
223 |
- $(use_with selinux) |
224 |
- ) |
225 |
- # build programs only on GNU, on *BSD we want libraries only |
226 |
- if multilib_is_native_abi && use userland_GNU ; then |
227 |
- myeconfargs+=( |
228 |
- --disable-chfn-chsh |
229 |
- --disable-login |
230 |
- --disable-newgrp |
231 |
- --disable-nologin |
232 |
- --disable-pylibmount |
233 |
- --disable-vipw |
234 |
- --enable-agetty |
235 |
- --enable-bash-completion |
236 |
- --enable-line |
237 |
- --enable-partx |
238 |
- --enable-raw |
239 |
- --enable-rename |
240 |
- --enable-rfkill |
241 |
- --enable-schedutils |
242 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
243 |
- $(use_enable caps setpriv) |
244 |
- $(use_enable cramfs) |
245 |
- $(use_enable fdformat) |
246 |
- $(use_enable hardlink) |
247 |
- $(use_enable kill) |
248 |
- $(use_enable logger) |
249 |
- $(use_enable ncurses pg) |
250 |
- $(use_enable su) |
251 |
- $(use_enable tty-helpers mesg) |
252 |
- $(use_enable tty-helpers wall) |
253 |
- $(use_enable tty-helpers write) |
254 |
- $(use_with cryptsetup) |
255 |
- ) |
256 |
- if [[ ${PV} == *9999 ]] ; then |
257 |
- myeconfargs+=( --enable-asciidoc ) |
258 |
- else |
259 |
- # Upstream is shipping pre-generated man-pages for releases |
260 |
- myeconfargs+=( --disable-asciidoc ) |
261 |
- fi |
262 |
- else |
263 |
- myeconfargs+=( |
264 |
- --disable-all-programs |
265 |
- --disable-asciidoc |
266 |
- --disable-bash-completion |
267 |
- --without-systemdsystemunitdir |
268 |
- # build libraries |
269 |
- --enable-libuuid |
270 |
- --enable-libblkid |
271 |
- --enable-libsmartcols |
272 |
- --enable-libfdisk |
273 |
- ) |
274 |
- if use userland_GNU ; then |
275 |
- # those libraries don't work on *BSD |
276 |
- myeconfargs+=( |
277 |
- --enable-libmount |
278 |
- ) |
279 |
- fi |
280 |
- fi |
281 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
282 |
- |
283 |
- if multilib_is_native_abi && use python ; then |
284 |
- python_foreach_impl python_configure |
285 |
- fi |
286 |
-} |
287 |
- |
288 |
-python_compile() { |
289 |
- pushd "${BUILD_DIR}" >/dev/null || die |
290 |
- emake all |
291 |
- popd >/dev/null || die |
292 |
-} |
293 |
- |
294 |
-multilib_src_compile() { |
295 |
- emake all |
296 |
- |
297 |
- if multilib_is_native_abi && use python ; then |
298 |
- python_foreach_impl python_compile |
299 |
- fi |
300 |
-} |
301 |
- |
302 |
-python_test() { |
303 |
- pushd "${BUILD_DIR}" >/dev/null || die |
304 |
- emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" |
305 |
- popd >/dev/null || die |
306 |
-} |
307 |
- |
308 |
-multilib_src_test() { |
309 |
- emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" |
310 |
- if multilib_is_native_abi && use python ; then |
311 |
- python_foreach_impl python_test |
312 |
- fi |
313 |
-} |
314 |
- |
315 |
-python_install() { |
316 |
- pushd "${BUILD_DIR}" >/dev/null || die |
317 |
- emake DESTDIR="${D}" install |
318 |
- python_optimize |
319 |
- popd >/dev/null || die |
320 |
-} |
321 |
- |
322 |
-multilib_src_install() { |
323 |
- if multilib_is_native_abi && use python ; then |
324 |
- python_foreach_impl python_install |
325 |
- fi |
326 |
- |
327 |
- # This needs to be called AFTER python_install call (#689190) |
328 |
- emake DESTDIR="${D}" install |
329 |
- |
330 |
- if multilib_is_native_abi && use userland_GNU ; then |
331 |
- # need the libs in / |
332 |
- gen_usr_ldscript -a blkid fdisk mount smartcols uuid |
333 |
- fi |
334 |
-} |
335 |
- |
336 |
-multilib_src_install_all() { |
337 |
- dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} |
338 |
- |
339 |
- # e2fsprogs-libs didnt install .la files, and .pc work fine |
340 |
- find "${ED}" -name "*.la" -delete || die |
341 |
- |
342 |
- if ! use userland_GNU ; then |
343 |
- # manpage collisions |
344 |
- # TODO: figure out a good way to keep them |
345 |
- rm "${ED}"/usr/share/man/man3/uuid* || die |
346 |
- fi |
347 |
- |
348 |
- if use pam ; then |
349 |
- newpamd "${FILESDIR}/runuser.pamd" runuser |
350 |
- newpamd "${FILESDIR}/runuser-l.pamd" runuser-l |
351 |
- fi |
352 |
- |
353 |
- # Note: |
354 |
- # Bash completion for "runuser" command is provided by same file which |
355 |
- # would also provide bash completion for "su" command. However, we don't |
356 |
- # use "su" command from this package. |
357 |
- # This triggers a known QA warning which we ignore for now to magically |
358 |
- # keep bash completion for "su" command which shadow package does not |
359 |
- # provide. |
360 |
-} |
361 |
- |
362 |
-pkg_postinst() { |
363 |
- if ! use tty-helpers ; then |
364 |
- elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." |
365 |
- fi |
366 |
- |
367 |
- if [[ -z ${REPLACING_VERSIONS} ]] ; then |
368 |
- elog "The agetty util now clears the terminal by default. You" |
369 |
- elog "might want to add --noclear to your /etc/inittab lines." |
370 |
- fi |
371 |
-} |