1 |
commit: 1e05b873e36bea6650e78d2be3f026ab42be3f6e |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 26 13:32:33 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 26 13:35:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e05b873 |
7 |
|
8 |
sys-apps/util-linux: Bump to version 2.33_rc1 |
9 |
|
10 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
11 |
|
12 |
sys-apps/util-linux/Manifest | 1 + |
13 |
sys-apps/util-linux/util-linux-2.33_rc1.ebuild | 234 +++++++++++++++++++++++++ |
14 |
2 files changed, 235 insertions(+) |
15 |
|
16 |
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest |
17 |
index e586eccb6dc..18bd746f782 100644 |
18 |
--- a/sys-apps/util-linux/Manifest |
19 |
+++ b/sys-apps/util-linux/Manifest |
20 |
@@ -1,3 +1,4 @@ |
21 |
DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d |
22 |
DIST util-linux-2.32.1.tar.xz 4561088 BLAKE2B 9e89b7fa2eacd51ad8c5cf90cc78df73de5d414c1039bb38784a376841806c1e0d38b702d29c6a8e91a2c3464fec1edcf68caaaa655400db2e5be483eb5efbcf SHA512 267fedae24a874ee4dc558081f6b8d07b33b955b0635f3348f021c111c17f2e95c01b2cbf909fe13c6ca448cbcf23c658c75f72f25749aa65e99f68fabb94698 |
23 |
DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482 |
24 |
+DIST util-linux-2.33-rc1.tar.xz 4619236 BLAKE2B cee133c9d17fd86c5750d3a53e86d0beae2a53db7cf56b7602a7d497d5d615a85ed21ec8349b4a30b5d5dce3e29b3ac421e969b2a9230efca89ed8260f120352 SHA512 7a9de1a60854892f8b3215964a1a934d1fbcce92e159e542977094cbf12e156f37954764cf955e911f28411b8996ac1496c471d560d534204f9b6970dd605684 |
25 |
|
26 |
diff --git a/sys-apps/util-linux/util-linux-2.33_rc1.ebuild b/sys-apps/util-linux/util-linux-2.33_rc1.ebuild |
27 |
new file mode 100644 |
28 |
index 00000000000..7060ef533f6 |
29 |
--- /dev/null |
30 |
+++ b/sys-apps/util-linux/util-linux-2.33_rc1.ebuild |
31 |
@@ -0,0 +1,234 @@ |
32 |
+# Copyright 1999-2018 Gentoo Authors |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI=6 |
36 |
+ |
37 |
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) |
38 |
+ |
39 |
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ |
40 |
+ pam python-single-r1 multilib-minimal multiprocessing systemd |
41 |
+ |
42 |
+MY_PV="${PV/_/-}" |
43 |
+MY_P="${PN}-${MY_PV}" |
44 |
+ |
45 |
+if [[ ${PV} == 9999 ]] ; then |
46 |
+ inherit git-r3 autotools |
47 |
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" |
48 |
+else |
49 |
+ [[ "${PV}" = *_rc* ]] || \ |
50 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" |
51 |
+ SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" |
52 |
+fi |
53 |
+ |
54 |
+DESCRIPTION="Various useful Linux utilities" |
55 |
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" |
56 |
+ |
57 |
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" |
58 |
+SLOT="0" |
59 |
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU" |
60 |
+ |
61 |
+# Most lib deps here are related to programs rather than our libs, |
62 |
+# so we rarely need to specify ${MULTILIB_USEDEP}. |
63 |
+RDEPEND="caps? ( sys-libs/libcap-ng ) |
64 |
+ cramfs? ( sys-libs/zlib:= ) |
65 |
+ ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) |
66 |
+ nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) |
67 |
+ pam? ( sys-libs/pam ) |
68 |
+ python? ( ${PYTHON_DEPS} ) |
69 |
+ readline? ( sys-libs/readline:0= ) |
70 |
+ selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) |
71 |
+ slang? ( sys-libs/slang ) |
72 |
+ !build? ( systemd? ( sys-apps/systemd ) ) |
73 |
+ udev? ( virtual/libudev:= )" |
74 |
+DEPEND="${RDEPEND} |
75 |
+ virtual/pkgconfig |
76 |
+ nls? ( sys-devel/gettext ) |
77 |
+ test? ( sys-devel/bc ) |
78 |
+ virtual/os-headers" |
79 |
+RDEPEND+=" |
80 |
+ kill? ( |
81 |
+ !sys-apps/coreutils[kill] |
82 |
+ !sys-process/procps[kill] |
83 |
+ ) |
84 |
+ !net-wireless/rfkill |
85 |
+ !sys-process/schedutils |
86 |
+ !sys-apps/setarch |
87 |
+ !<sys-apps/sysvinit-2.88-r7 |
88 |
+ !<sys-libs/e2fsprogs-libs-1.41.8 |
89 |
+ !<sys-fs/e2fsprogs-1.41.8 |
90 |
+ !<app-shells/bash-completion-2.7-r1" |
91 |
+ |
92 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
93 |
+ |
94 |
+S="${WORKDIR}/${MY_P}" |
95 |
+ |
96 |
+pkg_setup() { |
97 |
+ use python && python-single-r1_pkg_setup |
98 |
+} |
99 |
+ |
100 |
+src_prepare() { |
101 |
+ default |
102 |
+ |
103 |
+ # Prevent uuidd test failure due to socket path limit. #593304 |
104 |
+ sed -i \ |
105 |
+ -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ |
106 |
+ tests/ts/uuid/uuidd || die "Failed to fix uuidd test" |
107 |
+ |
108 |
+ if ! use userland_GNU; then |
109 |
+ # test runner is using GNU-specific xargs call |
110 |
+ sed -i -e 's:xargs:gxargs:' tests/run.sh || die |
111 |
+ # test requires util-linux uuidgen (which we don't build) |
112 |
+ rm tests/ts/uuid/oids || die |
113 |
+ fi |
114 |
+ |
115 |
+ if [[ ${PV} == 9999 ]] ; then |
116 |
+ po/update-potfiles |
117 |
+ eautoreconf |
118 |
+ fi |
119 |
+ |
120 |
+ # Undo bad ncurses handling by upstream. #601530 |
121 |
+ sed -i -E \ |
122 |
+ -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \ |
123 |
+ -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \ |
124 |
+ configure || die |
125 |
+ |
126 |
+ elibtoolize |
127 |
+} |
128 |
+ |
129 |
+lfs_fallocate_test() { |
130 |
+ # Make sure we can use fallocate with LFS #300307 |
131 |
+ cat <<-EOF > "${T}"/fallocate.${ABI}.c |
132 |
+ #define _GNU_SOURCE |
133 |
+ #include <fcntl.h> |
134 |
+ main() { return fallocate(0, 0, 0, 0); } |
135 |
+ EOF |
136 |
+ append-lfs-flags |
137 |
+ $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ |
138 |
+ || export ac_cv_func_fallocate=no |
139 |
+ rm -f "${T}"/fallocate.${ABI}.c |
140 |
+} |
141 |
+ |
142 |
+multilib_src_configure() { |
143 |
+ lfs_fallocate_test |
144 |
+ # The scanf test in a run-time test which fails while cross-compiling. |
145 |
+ # Blindly assume a POSIX setup since we require libmount, and libmount |
146 |
+ # itself fails when the scanf test fails. #531856 |
147 |
+ tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms |
148 |
+ export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 |
149 |
+ export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 |
150 |
+ |
151 |
+ local myeconfargs=( |
152 |
+ --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" |
153 |
+ --with-bashcompletiondir="$(get_bashcompdir)" |
154 |
+ $(multilib_native_use_enable suid makeinstall-chown) |
155 |
+ $(multilib_native_use_enable suid makeinstall-setuid) |
156 |
+ $(multilib_native_use_with python) |
157 |
+ $(multilib_native_use_with readline) |
158 |
+ $(multilib_native_use_with slang) |
159 |
+ $(multilib_native_use_with systemd) |
160 |
+ $(multilib_native_use_with udev) |
161 |
+ $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') |
162 |
+ $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') |
163 |
+ $(tc-has-tls || echo --disable-tls) |
164 |
+ $(use_enable nls) |
165 |
+ $(use_enable unicode widechar) |
166 |
+ $(use_enable static-libs static) |
167 |
+ $(use_with selinux) |
168 |
+ $(usex ncurses '' '--without-tinfo') |
169 |
+ ) |
170 |
+ # build programs only on GNU, on *BSD we want libraries only |
171 |
+ if multilib_is_native_abi && use userland_GNU; then |
172 |
+ myeconfargs+=( |
173 |
+ --disable-chfn-chsh |
174 |
+ --disable-login |
175 |
+ --disable-nologin |
176 |
+ --disable-su |
177 |
+ --enable-agetty |
178 |
+ --enable-bash-completion |
179 |
+ --enable-line |
180 |
+ --enable-partx |
181 |
+ --enable-raw |
182 |
+ --enable-rename |
183 |
+ --enable-rfkill |
184 |
+ --enable-schedutils |
185 |
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
186 |
+ $(use_enable caps setpriv) |
187 |
+ $(use_enable cramfs) |
188 |
+ $(use_enable fdformat) |
189 |
+ $(use_enable tty-helpers mesg) |
190 |
+ $(use_enable tty-helpers wall) |
191 |
+ $(use_enable tty-helpers write) |
192 |
+ $(use_enable kill) |
193 |
+ ) |
194 |
+ else |
195 |
+ myeconfargs+=( |
196 |
+ --disable-all-programs |
197 |
+ --disable-bash-completion |
198 |
+ --without-systemdsystemunitdir |
199 |
+ # build libraries |
200 |
+ --enable-libuuid |
201 |
+ --enable-libblkid |
202 |
+ --enable-libsmartcols |
203 |
+ --enable-libfdisk |
204 |
+ ) |
205 |
+ if use userland_GNU; then |
206 |
+ # those libraries don't work on *BSD |
207 |
+ myeconfargs+=( |
208 |
+ --enable-libmount |
209 |
+ ) |
210 |
+ fi |
211 |
+ fi |
212 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
213 |
+} |
214 |
+ |
215 |
+multilib_src_test() { |
216 |
+ emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" |
217 |
+} |
218 |
+ |
219 |
+multilib_src_install() { |
220 |
+ emake DESTDIR="${D}" install |
221 |
+ |
222 |
+ if multilib_is_native_abi && use userland_GNU; then |
223 |
+ # need the libs in / |
224 |
+ gen_usr_ldscript -a blkid fdisk mount smartcols uuid |
225 |
+ |
226 |
+ use python && python_optimize |
227 |
+ fi |
228 |
+} |
229 |
+ |
230 |
+multilib_src_install_all() { |
231 |
+ dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} |
232 |
+ |
233 |
+ # e2fsprogs-libs didnt install .la files, and .pc work fine |
234 |
+ find "${ED}" -name "*.la" -delete || die |
235 |
+ |
236 |
+ if ! use userland_GNU; then |
237 |
+ # manpage collisions |
238 |
+ # TODO: figure out a good way to keep them |
239 |
+ rm "${ED%/}"/usr/share/man/man3/uuid* || die |
240 |
+ fi |
241 |
+ |
242 |
+ if use pam; then |
243 |
+ newpamd "${FILESDIR}/runuser.pamd" runuser |
244 |
+ newpamd "${FILESDIR}/runuser-l.pamd" runuser-l |
245 |
+ fi |
246 |
+ |
247 |
+ # Note: |
248 |
+ # Bash completion for "runuser" command is provided by same file which |
249 |
+ # would also provide bash completion for "su" command. However, we don't |
250 |
+ # use "su" command from this package. |
251 |
+ # This triggers a known QA warning which we ignore for now to magically |
252 |
+ # keep bash completion for "su" command which shadow package does not |
253 |
+ # provide. |
254 |
+} |
255 |
+ |
256 |
+pkg_postinst() { |
257 |
+ if ! use tty-helpers; then |
258 |
+ elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." |
259 |
+ fi |
260 |
+ |
261 |
+ if [[ -z ${REPLACING_VERSIONS} ]]; then |
262 |
+ elog "The agetty util now clears the terminal by default. You" |
263 |
+ elog "might want to add --noclear to your /etc/inittab lines." |
264 |
+ fi |
265 |
+} |