diff options
Diffstat (limited to 'sys-apps/util-linux')
6 files changed, 506 insertions, 0 deletions
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 22b3ba91f7b1..3ef88f94caa1 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -4,6 +4,10 @@ AUX util-linux-2.37-avoid_autoreconf.patch 3661 BLAKE2B 5098c11338238c944b69a4f4 AUX util-linux-2.37-lcrypt_link_fix.patch 1545 BLAKE2B 85b9259ae3f8f4d39b94387212cd3db743194c7f8e645deb9b626792e78084f0d786f37d7c6fca0051ea161f020d72a89b3359d9dd9f624e0e009285d9cc937d SHA512 8f0f6ecbbab84b7f0f64111d9fd27852f6a8d9bac69598ae292b2978c0d7a9bc6beaad509ebe7d3bbaf239c9c04a592db13da6642b0029a485c2ad354b0a13ce AUX util-linux-2.37-lcrypt_use_LIBS.patch 2486 BLAKE2B bc1e73604932f6dc65c3ed262af37a6a180dd89d9196c531678f713ec3c3d979cef3f0f0627652a891079b71952463250e4edf29e9aaa898eefb9f25b99a0adc SHA512 cb2c37c8f5d668430eef15d87af0dcf237102d5b196ee674e2a4d5fe14482b323f2e915a1cb4f538f07330869dcf04af93281a955ddaa796db283971b1921723 AUX util-linux-2.37-ppc-nortas.patch 1038 BLAKE2B 0e1ea63056a78476a86cb1fadc5a46e39d2d91af5a4de703857cd3720bc328c931f0ca10383930c414ab98aa7d85c16388da6d91c1192d68cca91365619423c1 SHA512 d8253a3c81cf703533a577e0efed7f1508ee5e979a3ec319e42eedd1e9b8883e0defcdca37852088557d2a027eac6e9008ad95355b7f925b98b165327a017da4 +AUX util-linux-2.37.1-agetty_ctrl-c_erase.patch 1900 BLAKE2B 570c03cc5059198efdec4bfe367c560bcc863de61e8b0e1055535d4731525613ee20eaee5efeac6f96b399df1a60865c29e554df6684e3525f71dac821c8205c SHA512 e970c7b3c6e50bffc2e57f90f3284ba55906d71d286e8d23f06fd9905f66273796712cbd8cf3fa1a12bbb2dc404c72b790caba11ec63c8ff84ed9e4e041f64ca +AUX util-linux-2.37.1-ipcutils_calloc_check.patch 845 BLAKE2B 44e92d33ccf3bd56c86f5d9d0e4acc9e31fdc7c5e7f9e19c76eace88dbe1488140d57eb73a00e7e15f0b11bcdc676032f5b58597a5a369c4a24b9975a0b1a993 SHA512 d2f9ca3180867d23eeddf2dea89bcf7ec1294b24fec8a5116208ba187b816bc29f3456f6daef3f5a55560e1a06da4f6f08113214d8040ea824a79c00480ac4f7 +AUX util-linux-2.37.1-libmount_setgroups_fix.patch 1039 BLAKE2B a04ece245e5f27b48d585795c2bda419a710382801e518cfdbd9c304eb9329d5e6c41deae6c23f13885f20ec60e8dad403c1b5f51e04961b279d363b8bc3055b SHA512 cfa5b399509740109e034401984d75245ec6f84ea57ac01945fe3580f317967a462cced4f002ad34639c37c37dbe22471043ccee8814587cf36e02532a428027 +AUX util-linux-2.37.1-lscpu_NULL_dereference_fix.patch 1796 BLAKE2B 58034cae22d589640010bbeccc5d13dfb1d5ed6f51bbc17c6977732ddefb346a0bf46ea472e5dfddfd7f21b62dbc8b92212f18ca4e976ab67f9c6da1b21aa07d SHA512 da7114d008c52f27662aecb9aecfea05f54c5d8ce4a5948a43ce6fac3b12a61c86f8f943848f05f04d65eeff6595a0fab65e0df36436aabd25a8aff9baa8e80f AUX util-linux-2.37.1-lscpu_nullptr.patch 828 BLAKE2B 1847450e9b3580964d54184718f3e8971d42c00a4ba51f320a969058ace35a00bac9eae4e188dd6be6ce4c120aca53429011f4e3a2d9affea03000bdcfa6362c SHA512 29228cd5024eb94394f665656cd033ac52560e023a4575ce311393dd0922b80a753508dc9b23f16ba92fe0f00a171dada8b4789660225f571823614dfe439f9e DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b DIST util-linux-2.37-manpages.tar.xz 160156 BLAKE2B 39572332cfe4cac2313941ae922a01f5f4fe34cceb2ca3c806e87ec55187053dfce044790ad497d04adafc2abc513ae1429a1686e71b3b4e0e7907d17c9b6548 SHA512 2f3f1da3eae10b90daa672690ec90de303d87e9b0390f795daf80927a7c42f6aac9d3516b63051a6237a5609b5fda1dec92a1b8adc172115f3478b7edfa04918 @@ -11,6 +15,7 @@ DIST util-linux-2.37.1.tar.xz 5628360 BLAKE2B 309ea7202f32c0ec750cb01486cf32c3e9 DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615 EBUILD util-linux-2.36.2-r1.ebuild 8943 BLAKE2B 02deedf4a71d2acc2cd15fce983471237f84bf131debc2f161ec9afa7102b70dcdbd0aa70062ca4208d0e2fa444f5a9effe4650d07e4d9ec027fa7c1004b0e85 SHA512 4ac8f481c02d804078a16c3d92ffaf9320028630ca4bd9233ca5461a1ed373cb8c5aaee7a08be49b38ed103698f089cb5db0e87f119911423154b4754e39d23f EBUILD util-linux-2.37-r1.ebuild 9999 BLAKE2B fc8118a93be6b7c434d86773da8e3b5dd78e18153cce7eb6b806a9e6e0741cc2a30e2cce4cf9f0637fb2fab73b1db27396abb06023e722642350779135ed775a SHA512 5588ac089b27a20df5f813a15164ba282d3321cc288b4c0fcbffc7fba36db57eed496af7f8cb05d372bc87e1466195bc3a31035ea2de03b74bf65784035ece9c +EBUILD util-linux-2.37.1-r1.ebuild 9500 BLAKE2B bc24b39aef44405c5a2043fad701fec7ed115378e18c309322aa2543b12b1d3747c76259cb28f5bdccead828f46fbdbbee08a73a7f642f5d00ce1f035f5d8cd9 SHA512 bdfde984bace6c53f186be04eeafa1491e052c3e6c4d5b13fb23241bd4611fa4c758bdd8bb1b47fec592eee4196025654e699161572789c8fc36ae633b6ca210 EBUILD util-linux-2.37.1.ebuild 9288 BLAKE2B 3be449936783f0da3269d4e45f8c39881cb28c96a6844a14f498991a697286e168700bafe092df750e941bbe099e503c2782ca098027733dee8f46aa2f12ec50 SHA512 d6accd9769ec8dfc23bd6602e195d1b62a8776fec5754418cf2f8fd06caca48d4bc90c5fe12c86f53782fe5d334d528c517f5ef558e52958d460fd297a843161 EBUILD util-linux-9999.ebuild 9227 BLAKE2B 2b797ee2166256daa32f4d04593d28663746937fa81a07821b7204b07b31b92874c8266e0ffa3d9b1eeb7191f0329d6d7d13e228360f47e0e94a2e4921a74db8 SHA512 9a430472ec02d0e3c76927f9479ee4b5bdab9231e249991c8c6ff48f4922a099bc15d6533a2502ddd455f18def6530ad21c7d166fb39790614348db6eed3aef7 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4 diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch b/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch new file mode 100644 index 000000000000..4828fd449f95 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch @@ -0,0 +1,50 @@ +From 6eb1c01e9dd25a73100f06db37190c63fd57d4d9 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Fri, 30 Jul 2021 11:50:46 +0200 +Subject: [PATCH] agetty: use CTRL+C to erase username + +aggety(8) from the beginning ignores ^C (the small exception was +between 2.32 and 2.34 when this char has been misinterpreted). + +This patch forces agetty to interpret ^C like ^U, it means to +erase the user's input and wait for a completely new username. +The small difference is that for ^C it does not set 'kill character'. + +This change does not affect serial lines where ^C is still ignored like +in previous decades. I'd like to avoid any regression as I have +no clue if any serial lines do not send this control char in some +context ... + +Fixes: https://github.com/karelzak/util-linux/issues/1399 +References: https://github.com/karelzak/util-linux/issues/1046 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + term-utils/agetty.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/term-utils/agetty.c b/term-utils/agetty.c +index 3b3d5101a..d072d64d3 100644 +--- a/term-utils/agetty.c ++++ b/term-utils/agetty.c +@@ -2267,6 +2267,11 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t + break; + case CTL('U'): + cp->kill = ascval; /* set kill character */ ++ /* fallthrough */ ++ case CTL('C'): ++ if (key == CTL('C') && !(op->flags & F_VCONSOLE)) ++ /* Ignore CTRL+C on serial line */ ++ break; + while (bp > logname) { + if ((tp->c_lflag & ECHO) == 0) + write_all(1, erase[cp->parity], 3); +@@ -2275,9 +2280,6 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t + break; + case CTL('D'): + exit(EXIT_SUCCESS); +- case CTL('C'): +- /* Ignore */ +- break; + default: + if ((size_t)(bp - logname) >= sizeof(logname) - 1) + log_err(_("%s: input overrun"), op->tty); diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-ipcutils_calloc_check.patch b/sys-apps/util-linux/files/util-linux-2.37.1-ipcutils_calloc_check.patch new file mode 100644 index 000000000000..44490ce1bd06 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.37.1-ipcutils_calloc_check.patch @@ -0,0 +1,25 @@ +From 86d5de52d43501711586054e7b601fbc57403085 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Tue, 27 Jul 2021 11:58:31 +0200 +Subject: [PATCH] sys-utils/ipcutils: be careful when call calloc() for uint64 + nmembs + +Fix: https://github.com/karelzak/util-linux/issues/1395 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/ipcutils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sys-utils/ipcutils.c b/sys-utils/ipcutils.c +index e784c4dcb9..18868cfd38 100644 +--- a/sys-utils/ipcutils.c ++++ b/sys-utils/ipcutils.c +@@ -218,7 +218,7 @@ static void get_sem_elements(struct sem_data *p) + { + size_t i; + +- if (!p || !p->sem_nsems || p->sem_perm.id < 0) ++ if (!p || !p->sem_nsems || p->sem_nsems > SIZE_MAX || p->sem_perm.id < 0) + return; + + p->elements = xcalloc(p->sem_nsems, sizeof(struct sem_elem)); diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-libmount_setgroups_fix.patch b/sys-apps/util-linux/files/util-linux-2.37.1-libmount_setgroups_fix.patch new file mode 100644 index 000000000000..ebde207986b9 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.37.1-libmount_setgroups_fix.patch @@ -0,0 +1,38 @@ +From 420e914c4cc4c2ba34fd75790ea194d7f4a47d2c Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Thu, 29 Jul 2021 11:50:48 +0200 +Subject: [PATCH] libmount: fix setgroups() use + +* keep process in single supplementary group, which is the real group ID for the process + +* make sure we have rights to call setgroups(), requires group permissions + +Fixes: https://github.com/karelzak/util-linux/issues/1398 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + include/c.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/c.h b/include/c.h +index c1e4c5ffc..a4504e3ba 100644 +--- a/include/c.h ++++ b/include/c.h +@@ -340,14 +340,16 @@ static inline size_t get_hostname_max(void) + + static inline int drop_permissions(void) + { ++ gid_t newgid = getgid(); ++ + errno = 0; + + /* drop supplementary groups */ +- if (setgroups(0, NULL) != 0) ++ if (geteuid() == 0 && setgroups(1, &newgid) != 0) + goto fail; + + /* drop GID */ +- if (setgid(getgid()) < 0) ++ if (setgid(newgid) < 0) + goto fail; + + /* drop UID */ diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_NULL_dereference_fix.patch b/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_NULL_dereference_fix.patch new file mode 100644 index 000000000000..50322e63a8ec --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_NULL_dereference_fix.patch @@ -0,0 +1,50 @@ +From 0d7cef3ddbd2aacbea8c11e8524a3de68dfb8ff6 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Fri, 30 Jul 2021 14:35:25 +0200 +Subject: [PATCH] lscpu: fix NULL dereference + +Fixes: https://github.com/karelzak/util-linux/issues/1401 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/lscpu-cputype.c | 2 +- + sys-utils/lscpu.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c +index 795a4acf5..be16199e0 100644 +--- a/sys-utils/lscpu-cputype.c ++++ b/sys-utils/lscpu-cputype.c +@@ -569,7 +569,7 @@ int lscpu_read_cpuinfo(struct lscpu_cxt *cxt) + /* Set the default type to CPUs which are missing (or not parsed) + * in cpuinfo */ + ct = lscpu_cputype_get_default(cxt); +- for (i = 0; i < cxt->npossibles; i++) { ++ for (i = 0; ct && i < cxt->npossibles; i++) { + struct lscpu_cpu *cpu = cxt->cpus[i]; + + if (cpu && !cpu->type) +diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c +index 827e84a6d..e11b2f42f 100644 +--- a/sys-utils/lscpu.c ++++ b/sys-utils/lscpu.c +@@ -991,7 +991,7 @@ static void print_summary(struct lscpu_cxt *cxt) + *(p - 2) = '\0'; + add_summary_s(tb, sec, _("CPU op-mode(s):"), buf); + } +- if (ct->addrsz) ++ if (ct && ct->addrsz) + add_summary_s(tb, sec, _("Address sizes:"), ct->addrsz); + #if !defined(WORDS_BIGENDIAN) + add_summary_s(tb, sec, _("Byte Order:"), "Little Endian"); +@@ -1033,9 +1033,9 @@ static void print_summary(struct lscpu_cxt *cxt) + sec = NULL; + + /* Section: cpu type description */ +- if (ct->vendor) ++ if (ct && ct->vendor) + sec = add_summary_s(tb, NULL, _("Vendor ID:"), ct->vendor); +- if (ct->bios_vendor) ++ if (ct && ct->bios_vendor) + add_summary_s(tb, sec, _("BIOS Vendor ID:"), ct->bios_vendor); + + for (i = 0; i < cxt->ncputypes; i++) diff --git a/sys-apps/util-linux/util-linux-2.37.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.37.1-r1.ebuild new file mode 100644 index 000000000000..74d874455d9c --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.37.1-r1.ebuild @@ -0,0 +1,338 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ + pam python-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 autotools + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" +fi + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" + +LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +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" + +# Most lib deps here are related to programs rather than our libs, +# so we rarely need to specify ${MULTILIB_USEDEP}. +RDEPEND=" + virtual/libcrypt:= + audit? ( >=sys-process/audit-2.6:= ) + caps? ( sys-libs/libcap-ng ) + cramfs? ( sys-libs/zlib:= ) + cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) + hardlink? ( dev-libs/libpcre2:= ) + ncurses? ( + sys-libs/ncurses:=[unicode(+)?] + magic? ( sys-apps/file:0= ) + ) + nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + ppc? ( sys-libs/librtas ) + ppc64? ( sys-libs/librtas ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + !build? ( systemd? ( sys-apps/systemd ) ) + udev? ( virtual/libudev:= )" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers +" +RDEPEND+=" + hardlink? ( !app-arch/hardlink ) + logger? ( !>=app-admin/sysklogd-2.0[logger] ) + kill? ( + !sys-apps/coreutils[kill] + !sys-process/procps[kill] + ) + su? ( + !<sys-apps/shadow-4.7-r2 + !>=sys-apps/shadow-4.7-r2[su] + ) + !net-wireless/rfkill + !<app-shells/bash-completion-2.7-r1 +" + +# Required for man-page generation +if [[ "${PV}" == 9999 ]] ; then + BDEPEND+=" + dev-ruby/asciidoctor + " +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.37.1-ipcutils_calloc_check.patch #806070 + "${FILESDIR}"/${PN}-2.37.1-libmount_setgroups_fix.patch #805218 + "${FILESDIR}"/${PN}-2.37.1-agetty_ctrl-c_erase.patch #804972 + "${FILESDIR}"/${PN}-2.37.1-lscpu_NULL_dereference_fix.patch #802606 +) + +src_prepare() { + default + + # Prevent uuidd test failure due to socket path limit. #593304 + sed -i \ + -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ + tests/ts/uuid/uuidd || die "Failed to fix uuidd test" + + if ! use userland_GNU ; then + # test runner is using GNU-specific xargs call + sed -i -e 's:xargs:gxargs:' tests/run.sh || die + # test requires util-linux uuidgen (which we don't build) + rm tests/ts/uuid/oids || die + fi + + if [[ ${PV} == 9999 ]] ; then + po/update-potfiles + eautoreconf + fi + + elibtoolize +} + +lfs_fallocate_test() { + # Make sure we can use fallocate with LFS #300307 + cat <<-EOF > "${T}"/fallocate.${ABI}.c + #define _GNU_SOURCE + #include <fcntl.h> + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.${ABI}.c +} + +python_configure() { + local myeconfargs=( + "${commonargs[@]}" + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + --with-python + ) + if use userland_GNU ; then + myeconfargs+=( + --enable-libblkid + --enable-libmount + --enable-pylibmount + ) + fi + mkdir "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + popd >/dev/null || die +} + +multilib_src_configure() { + lfs_fallocate_test + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 + + # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 + export NCURSES6_CONFIG=false NCURSES5_CONFIG=false + export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false + + # configure args shared by python and non-python builds + local commonargs=( + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + ) + + local myeconfargs=( + "${commonargs[@]}" + --with-bashcompletiondir="$(get_bashcompdir)" + --without-python + $(multilib_native_use_enable suid makeinstall-chown) + $(multilib_native_use_enable suid makeinstall-setuid) + $(multilib_native_use_with readline) + $(multilib_native_use_with slang) + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') + $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') + $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') + $(multilib_native_use_with audit) + $(tc-has-tls || echo --disable-tls) + $(use_enable nls) + $(use_enable unicode widechar) + $(use_enable static-libs static) + $(use_with ncurses tinfo) + $(use_with selinux) + ) + # build programs only on GNU, on *BSD we want libraries only + if multilib_is_native_abi && use userland_GNU ; then + myeconfargs+=( + --disable-chfn-chsh + --disable-login + --disable-newgrp + --disable-nologin + --disable-pylibmount + --disable-vipw + --enable-agetty + --enable-bash-completion + --enable-line + --enable-partx + --enable-raw + --enable-rename + --enable-rfkill + --enable-schedutils + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable caps setpriv) + $(use_enable cramfs) + $(use_enable fdformat) + $(use_enable hardlink) + $(use_enable kill) + $(use_enable logger) + $(use_enable ncurses pg) + $(use_enable su) + $(use_enable tty-helpers mesg) + $(use_enable tty-helpers wall) + $(use_enable tty-helpers write) + $(use_with cryptsetup) + ) + if [[ ${PV} == *9999 ]] ; then + myeconfargs+=( --enable-asciidoc ) + else + # We ship pre-generated man-pages for releases + myeconfargs+=( --disable-asciidoc ) + fi + else + myeconfargs+=( + --disable-all-programs + --disable-asciidoc + --disable-bash-completion + --without-systemdsystemunitdir + # build libraries + --enable-libuuid + --enable-libblkid + --enable-libsmartcols + --enable-libfdisk + ) + if use userland_GNU ; then + # those libraries don't work on *BSD + myeconfargs+=( + --enable-libmount + ) + fi + fi + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if multilib_is_native_abi && use python ; then + python_foreach_impl python_configure + fi +} + +python_compile() { + pushd "${BUILD_DIR}" >/dev/null || die + emake all + popd >/dev/null || die +} + +multilib_src_compile() { + emake all + + if multilib_is_native_abi && use python ; then + python_foreach_impl python_compile + fi +} + +python_test() { + pushd "${BUILD_DIR}" >/dev/null || die + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + popd >/dev/null || die +} + +multilib_src_test() { + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + if multilib_is_native_abi && use python ; then + python_foreach_impl python_test + fi +} + +python_install() { + pushd "${BUILD_DIR}" >/dev/null || die + emake DESTDIR="${D}" install + python_optimize + popd >/dev/null || die +} + +multilib_src_install() { + if multilib_is_native_abi && use python ; then + python_foreach_impl python_install + fi + + # This needs to be called AFTER python_install call (#689190) + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use userland_GNU ; then + # need the libs in / + gen_usr_ldscript -a blkid fdisk mount smartcols uuid + fi +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + + # e2fsprogs-libs didnt install .la files, and .pc work fine + find "${ED}" -name "*.la" -delete || die + + if ! use userland_GNU ; then + # manpage collisions + # TODO: figure out a good way to keep them + rm "${ED}"/usr/share/man/man3/uuid* || die + fi + + if use pam ; then + newpamd "${FILESDIR}/runuser.pamd" runuser + newpamd "${FILESDIR}/runuser-l.pamd" runuser-l + fi + + # Note: + # Bash completion for "runuser" command is provided by same file which + # would also provide bash completion for "su" command. However, we don't + # use "su" command from this package. + # This triggers a known QA warning which we ignore for now to magically + # keep bash completion for "su" command which shadow package does not + # provide. +} + +pkg_postinst() { + if ! use tty-helpers ; then + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." + fi + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "The agetty util now clears the terminal by default. You" + elog "might want to add --noclear to your /etc/inittab lines." + fi +} |