mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-apps/util-linux: Revbump to 2.32-r5, fix tests with py3 #624132
Revert back to unstable since we are adding a patch from upstream git. Patch is from here: https://github.com/karelzak/util-linux/pull/664 Bug: https://bugs.gentoo.org/624132 Package-Manager: Portage-2.3.42, Repoman-2.3.9
This commit is contained in:
Patrick McLean
105
sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
Normal file
105
sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
Normal file
@@ -0,0 +1,105 @@
|
||||
From 8a12ab57755afc36546834f175ef0b9e9376ba59 Mon Sep 17 00:00:00 2001
|
||||
From: Frank Schaefer <kelledin@gmail.com>
|
||||
Date: Tue, 10 Jul 2018 20:21:02 -0500
|
||||
Subject: [PATCH] * break up large strings for PySys_WriteStdout()
|
||||
|
||||
---
|
||||
libmount/python/fs.c | 56 ++++++++++++++++++++++++++++++++++++++++------------
|
||||
1 file changed, 43 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/libmount/python/fs.c b/libmount/python/fs.c
|
||||
index d6490d248..634a914ef 100644
|
||||
--- a/libmount/python/fs.c
|
||||
+++ b/libmount/python/fs.c
|
||||
@@ -63,32 +63,62 @@ static PyObject *Fs_get_devno(FsObject *self)
|
||||
return PyObjectResultInt(mnt_fs_get_devno(self->fs));
|
||||
}
|
||||
|
||||
+static void _dump_debug_string(const char *lead, const char *s, char quote)
|
||||
+{
|
||||
+ /* PySys_WriteStdout() will automatically truncate any '%s' token
|
||||
+ * longer than a certain length (documented as 1000 bytes, but we
|
||||
+ * give ourselves some margin here just in case). The only way I
|
||||
+ * know to get around this is to print such strings in bite-sized
|
||||
+ * chunks.
|
||||
+ */
|
||||
+ static const unsigned int _PY_MAX_LEN = 900;
|
||||
+ static const char *_PY_MAX_LEN_FMT = "%.900s";
|
||||
+ unsigned int len;
|
||||
+
|
||||
+ if (lead != NULL)
|
||||
+ PySys_WriteStdout("%s", lead);
|
||||
+
|
||||
+ if (quote != 0)
|
||||
+ PySys_WriteStdout("%c", quote);
|
||||
+
|
||||
+ for (len = strlen(s); len > _PY_MAX_LEN; len -= _PY_MAX_LEN, s += _PY_MAX_LEN)
|
||||
+ PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
|
||||
+
|
||||
+ if (len > 0)
|
||||
+ PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
|
||||
+
|
||||
+ if (quote != 0)
|
||||
+ PySys_WriteStdout("%c\n", quote);
|
||||
+ else
|
||||
+ PySys_WriteStdout("\n");
|
||||
+}
|
||||
+
|
||||
#define Fs_print_debug_HELP "print_debug()\n\n"
|
||||
static PyObject *Fs_print_debug(FsObject *self)
|
||||
{
|
||||
PySys_WriteStdout("------ fs: %p\n", self->fs);
|
||||
- PySys_WriteStdout("source: %s\n", mnt_fs_get_source(self->fs));
|
||||
- PySys_WriteStdout("target: %s\n", mnt_fs_get_target(self->fs));
|
||||
- PySys_WriteStdout("fstype: %s\n", mnt_fs_get_fstype(self->fs));
|
||||
+ _dump_debug_string("source: ", mnt_fs_get_source(self->fs), 0);
|
||||
+ _dump_debug_string("target: ", mnt_fs_get_target(self->fs), 0);
|
||||
+ _dump_debug_string("fstype: ", mnt_fs_get_fstype(self->fs), 0);
|
||||
|
||||
if (mnt_fs_get_options(self->fs))
|
||||
- PySys_WriteStdout("optstr: %s\n", mnt_fs_get_options(self->fs));
|
||||
+ _dump_debug_string("optstr: ", mnt_fs_get_options(self->fs), 0);
|
||||
if (mnt_fs_get_vfs_options(self->fs))
|
||||
- PySys_WriteStdout("VFS-optstr: %s\n", mnt_fs_get_vfs_options(self->fs));
|
||||
+ _dump_debug_string("VFS-optstr: ", mnt_fs_get_vfs_options(self->fs), 0);
|
||||
if (mnt_fs_get_fs_options(self->fs))
|
||||
- PySys_WriteStdout("FS-opstr: %s\n", mnt_fs_get_fs_options(self->fs));
|
||||
+ _dump_debug_string("FS-opstr: ", mnt_fs_get_fs_options(self->fs), 0);
|
||||
if (mnt_fs_get_user_options(self->fs))
|
||||
- PySys_WriteStdout("user-optstr: %s\n", mnt_fs_get_user_options(self->fs));
|
||||
+ _dump_debug_string("user-optstr: ", mnt_fs_get_user_options(self->fs), 0);
|
||||
if (mnt_fs_get_optional_fields(self->fs))
|
||||
- PySys_WriteStdout("optional-fields: '%s'\n", mnt_fs_get_optional_fields(self->fs));
|
||||
+ _dump_debug_string("optional-fields: ", mnt_fs_get_optional_fields(self->fs), '\'');
|
||||
if (mnt_fs_get_attributes(self->fs))
|
||||
- PySys_WriteStdout("attributes: %s\n", mnt_fs_get_attributes(self->fs));
|
||||
+ _dump_debug_string("attributes: ", mnt_fs_get_attributes(self->fs), 0);
|
||||
|
||||
if (mnt_fs_get_root(self->fs))
|
||||
- PySys_WriteStdout("root: %s\n", mnt_fs_get_root(self->fs));
|
||||
+ _dump_debug_string("root: ", mnt_fs_get_root(self->fs), 0);
|
||||
|
||||
if (mnt_fs_get_swaptype(self->fs))
|
||||
- PySys_WriteStdout("swaptype: %s\n", mnt_fs_get_swaptype(self->fs));
|
||||
+ _dump_debug_string("swaptype: ", mnt_fs_get_swaptype(self->fs), 0);
|
||||
if (mnt_fs_get_size(self->fs))
|
||||
PySys_WriteStdout("size: %jd\n", mnt_fs_get_size(self->fs));
|
||||
if (mnt_fs_get_usedsize(self->fs))
|
||||
@@ -97,7 +127,7 @@ static PyObject *Fs_print_debug(FsObject *self)
|
||||
PySys_WriteStdout("priority: %d\n", mnt_fs_get_priority(self->fs));
|
||||
|
||||
if (mnt_fs_get_bindsrc(self->fs))
|
||||
- PySys_WriteStdout("bindsrc: %s\n", mnt_fs_get_bindsrc(self->fs));
|
||||
+ _dump_debug_string("bindsrc: ", mnt_fs_get_bindsrc(self->fs), 0);
|
||||
if (mnt_fs_get_freq(self->fs))
|
||||
PySys_WriteStdout("freq: %d\n", mnt_fs_get_freq(self->fs));
|
||||
if (mnt_fs_get_passno(self->fs))
|
||||
@@ -112,7 +142,7 @@ static PyObject *Fs_print_debug(FsObject *self)
|
||||
if (mnt_fs_get_tid(self->fs))
|
||||
PySys_WriteStdout("tid: %d\n", mnt_fs_get_tid(self->fs));
|
||||
if (mnt_fs_get_comment(self->fs))
|
||||
- PySys_WriteStdout("comment: '%s'\n", mnt_fs_get_comment(self->fs));
|
||||
+ _dump_debug_string("comment: ", mnt_fs_get_comment(self->fs), '\'');
|
||||
return UL_IncRef(self);
|
||||
}
|
||||
/*
|
||||
242
sys-apps/util-linux/util-linux-2.32-r5.ebuild
Normal file
242
sys-apps/util-linux/util-linux-2.32-r5.ebuild
Normal file
@@ -0,0 +1,242 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
|
||||
|
||||
inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
|
||||
pam python-single-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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
|
||||
SRC_URI="mirror://kernel/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 LGPL-2.1 BSD-4 MIT public-domain"
|
||||
SLOT="0"
|
||||
IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +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="caps? ( sys-libs/libcap-ng )
|
||||
cramfs? ( sys-libs/zlib:= )
|
||||
ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
|
||||
nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
|
||||
pam? ( sys-libs/pam )
|
||||
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:= )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( sys-devel/bc )
|
||||
virtual/os-headers"
|
||||
RDEPEND+="
|
||||
kill? (
|
||||
!sys-apps/coreutils[kill]
|
||||
!sys-process/procps[kill]
|
||||
)
|
||||
!net-wireless/rfkill
|
||||
!sys-process/schedutils
|
||||
!sys-apps/setarch
|
||||
!<sys-apps/sysvinit-2.88-r7
|
||||
!<sys-libs/e2fsprogs-libs-1.41.8
|
||||
!<sys-fs/e2fsprogs-1.41.8
|
||||
!<app-shells/bash-completion-2.7-r1"
|
||||
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/util-linux-2.32-python3-tests.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
eapply "${FILESDIR}"/${P}-add-missing-lintl.patch
|
||||
touch -r "${S}"/configure "${S}"/libsmartcols/src/Makemodule.am || die
|
||||
touch -r "${S}"/configure "${S}"/libuuid/src/Makemodule.am || die
|
||||
|
||||
# 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
|
||||
|
||||
# Undo bad ncurses handling by upstream. #601530
|
||||
sed -i -E \
|
||||
-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
|
||||
-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
|
||||
configure || die
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
local myeconfargs=(
|
||||
--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
|
||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
||||
$(multilib_native_use_enable suid makeinstall-chown)
|
||||
$(multilib_native_use_enable suid makeinstall-setuid)
|
||||
$(multilib_native_use_with python)
|
||||
$(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 unicode ncursesw)" '--without-ncursesw')
|
||||
$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
|
||||
$(tc-has-tls || echo --disable-tls)
|
||||
$(use_enable nls)
|
||||
$(use_enable unicode widechar)
|
||||
$(use_enable static-libs static)
|
||||
$(use_with selinux)
|
||||
$(usex ncurses '' '--without-tinfo')
|
||||
)
|
||||
# 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-nologin
|
||||
--disable-su
|
||||
--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 tty-helpers mesg)
|
||||
$(use_enable tty-helpers wall)
|
||||
$(use_enable tty-helpers write)
|
||||
$(use_enable kill)
|
||||
)
|
||||
else
|
||||
myeconfargs+=(
|
||||
--disable-all-programs
|
||||
--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[@]}"
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
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
|
||||
|
||||
use python && python_optimize
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user