From f82c1dcca87a1a6c5af5ca77be45a251aa359690 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 16 Oct 2014 17:47:38 +0000 Subject: Add fix from upstream for libblkid probing. Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- sys-apps/util-linux/ChangeLog | 8 +- sys-apps/util-linux/Manifest | 30 ++-- .../files/util-linux-2.25.1-blkid-probe-fix.patch | 43 +++++ sys-apps/util-linux/util-linux-2.25.1-r1.ebuild | 174 +++++++++++++++++++++ 4 files changed, 240 insertions(+), 15 deletions(-) create mode 100644 sys-apps/util-linux/files/util-linux-2.25.1-blkid-probe-fix.patch create mode 100644 sys-apps/util-linux/util-linux-2.25.1-r1.ebuild (limited to 'sys-apps/util-linux') diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index a7028bf14fc4..86efd9fc47f9 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/util-linux # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.484 2014/09/05 13:20:22 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.485 2014/10/16 17:47:37 vapier Exp $ + +*util-linux-2.25.1-r1 (16 Oct 2014) + + 16 Oct 2014; Mike Frysinger + +files/util-linux-2.25.1-blkid-probe-fix.patch, +util-linux-2.25.1-r1.ebuild: + Add fix from upstream for libblkid probing. *util-linux-2.25.1 (05 Sep 2014) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 9ab40ce81cb0..f2b4c744cc2a 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -6,30 +6,32 @@ AUX crypto-loop.initd 1729 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7c AUX util-linux-2.24-fix-fdisk-on-alpha.patch 416 SHA256 9979cc2136d5d321c4dec08b8c42c419bc8e8a63299fa83a1174e9aaac5a3fb7 SHA512 69f77774dfe58ae56d21c20cb45ae494a8948426d33275cd790de1e290a3592f5bf0645c3ceaf64f344422de7259e6edf6ca5ff744ce9a9030b59c30d9637126 WHIRLPOOL f1b02433071c32aa815c9e6daa19c25d543126fe8a794024efbdf6732ec7b1963310d792174a630f7acd0583ca9e18df8ef86a40d495104023aca2fe14e9e41e AUX util-linux-2.24-last-tests.patch 4513 SHA256 61be31970f0aced6a8423e1f0ab35751f0dcd9e24265eb3221a8e0e14cae731f SHA512 f9be688b0a074ca3e93139fcd78c4a28b892b9cafedc70d92b08f695131631349044d1eb42b4534db9c09f656e503d400dc59b220234668cba206888ad43cd1a WHIRLPOOL fa1057d0b9d99a92f53975c468e7488d47b2a801d42141233c88b01a9bde66ae489cf862505f3eadfb6c7e99172d202e37ec4bc5cd7d97e2fdc6e043df3335f9 AUX util-linux-2.24-skip-last-tests.patch 1003 SHA256 5ccbab17e26cc9b592b534b9b3e72b6a23dbdd04718f6360cb7d8886221ffa4d SHA512 9d89530f203c8a50e1def8164669b93ce1c1509d4da112c9db56cea9e29288c32964978e06ababa8e6c00222813d7a99bc35e0a7cfc17d8cd63804b629c9165c WHIRLPOOL 0e7c1cd6a4bdc94fdad3582f1855992d375238438d165627d60cddda8d1314c759b6e34171c5d00890956acdf9641ad5bf955f980fd142545b1ef468caa90be6 +AUX util-linux-2.25.1-blkid-probe-fix.patch 1277 SHA256 8f93b1309244b1793ad72c3942e71b09c7df711476144356bcc6fa03cbce5ad8 SHA512 73c1ce24a45a11962c847bf8e7448e57752ac078a6e898fd7458b1a7c55f13aabb7510a633b0d2a78916419bdbaa97c0b0bb771f3a2c92ee197868e9a8925c14 WHIRLPOOL f5f6b23311a4574899e586f2d67bb2b315d40dd7d04933d4b5e3e2d7ac87545c89dd36446b41aa7d8617ffbaa915db65eaafcc891d32ec3aef26ab436368da5a DIST util-linux-2.24.1.tar.xz 3543692 SHA256 835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410 SHA512 5636e1c57bd57954518e90ff0f079810cc2927f52bb925dde556ce2744a088577f8adbc19c19b2bd079efd253406767faa44d1de5f557e024762522e647f044b WHIRLPOOL 25862a85788eb1c275c7e06f3d2be8e6a9605811665e06a4b21d1e274fc4a5e19dd03e5c52061ee5d98ce8c86ba757a7f8076683edb603ad0c43c05ab5e52a51 DIST util-linux-2.24.2.tar.xz 3586580 SHA256 1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 SHA512 a0c03876ef19fa09e434e3e5362fb3f3e0a254b3b39a623ac7a9a207d06afce00366792244ed0fac86931f8340c046620660f33c3444a07a12037182fc191240 WHIRLPOOL 4b8185e1832145c050a8aa0761ae017d846ed58cd7e07710e4c32bf92a8f6e530bddb56dab70c8025eddb4cafafed79e658b0aced3a190b61b508078a438a9ed DIST util-linux-2.25.1.tar.xz 3695172 SHA256 4701305ae22790c3a92ce48e50794fa05b7ee01f4227f419a171c100d08986e8 SHA512 a670cb4318beed0a455efb339ebea6ec7c5d672e15877e7e25cae2ec9c0795fbe4275b6c85a590467c3de92ab2f64cdcd0427c9a2a6e4c6b76f563592fb7be8d WHIRLPOOL 44c17bd3ad0b05c47bb955b934011b460c3992ea5d5b43977d2001b245820b775e16bedbaa10ff9c223d59b0809674884c76f0dc34d707864d17b49b4deaab9d EBUILD util-linux-2.24.1-r2.ebuild 4130 SHA256 a2bc50f994ff17185a3680841110ab1a320f51b3ff96291ac28b4d0440761895 SHA512 1253cb5bb86ad131ae32817bc45924804a8e48819a45314f75117fb1035f24100edd2b61a9241cb9bea0855c2877fd6fa51d56ae8dd8014ccac711efe9d04172 WHIRLPOOL 7b98c36037379421ed154c0e86f5fe308c0dc8458df01b9d87dc0110f4053292b16ce6d96949e2f5f3f315dea1a5d538b8e713ac52e2eca40cffabe75f3b7976 EBUILD util-linux-2.24.1-r3.ebuild 5146 SHA256 b267e31c6af27737f9296dba6891324dc615d1865f6793f9b993bcb6bd5cb0a7 SHA512 14c1e66758666a3b9080f750267d23fd27d2fd7b8975af2dd1c94231d908f62c7de4466a222e496b95c2cee3a53617b84fd77f1b363e205d7515719438a17d1d WHIRLPOOL 43c7b5baecd9f7fba2821de43aeeadefec6a5c11084a8acb6d13c37c21d683d148801a39c36af597809791f4be696130ad51c512ad6ad6efd7230b817bcf1fc1 EBUILD util-linux-2.24.2.ebuild 5375 SHA256 5af9c1b4a3640be7b95a2f1887ba1a91adedca40640fb48d59e6811f5175675d SHA512 da6bc520af433922219a1c3f99a0b7cff7c41bbee9f798ecbeec687440605115fc52bc2a2ae95a718bd6cc300c6ece6b9ba37b011beda86c8dd6279ff308a27e WHIRLPOOL c167ea926c6f1abba491dafd5a5e1445b5f90a312bc24c5a4bc34ac872924bba23d71269e79927347c005deb9edd9b4ff8599d82d63d42a80fa48cd772d03fe7 +EBUILD util-linux-2.25.1-r1.ebuild 5180 SHA256 069440697216f05545dc8ee0d368a1c2902a32a9d0c32fe68b699dcc4cb822ef SHA512 874e950ee71142d56e09dfbc773982626d04902fb99f7273118784c63ab9d71c20a6cbc51efe8fc45ef434ba461ee38bd4a3359413f5a5cce88baaef915d261c WHIRLPOOL 0e682cc5e2d54c2d83c11e2bb253cb0830d31b5480d12cb583c37906c1129fefc48eb84ce3ce180896a756a40a056bc80aa45e8fbd03e7d2f3c756e203b324f8 EBUILD util-linux-2.25.1.ebuild 5134 SHA256 93cfb99c65d2b23dfd6fb62a3c85436b5a619d66785772c4fccc0e55e00c701c SHA512 31c3ba27d508c6af1e98707d7d947b061e284f2bde6e66100eed7f784550b63f0a7382fa1cc3c5e8d8588f1d1520c2f207c003eb4ce1d10ec422b86b8fdab5ef WHIRLPOOL f9f31106611ae0d6150a215e169619d0f066551802a4a78a0a9e283acc7ab6b770e4bd932089277b91d795d196e3efa8d1b292f4ba48a914fc5ed3a3248182e8 EBUILD util-linux-9999.ebuild 4817 SHA256 1dfdff0873657ec613df499fe166d0ea59bf7d91a5ee546f8f771fd7ccbbbb93 SHA512 2fb77a7414e89b578e9b546da06642ce6d1202a03b16dc169f2389b2df57fc909fc17edc30cb15882e2b2a46fbaae5045603464f9a32160a113229a6f7339360 WHIRLPOOL 64c4629ec7bb1788e8a4ae4bbc796d2026889441cee15e4673636b0e58cda5a3ece1390b1bbdd68171bbcece65d217e230ffd7103bd1778cbf45b21a352d60d4 -MISC ChangeLog 75268 SHA256 e1985a5b70d7e0816b0288f8e06bbdd4e87a92c58cef00929ff72e2e3f7a93ee SHA512 0a17eac06e87e04dc04450094d581bad2ad4844868abb2216e732a097a77395f29a6741c0baef3321d6c4ab87fc14385b71a886cebe83bc216a52ff936ef8f0d WHIRLPOOL d3af212b17b6778ee6decd43b89233811b1e64ca536a7d2183f98792deb27f792599a9669bd5478901a3e040f273ae57e26e00fb13ee656156febf086f9cd5e1 +MISC ChangeLog 75476 SHA256 d494fb9cf8a07c553e47a73325bc6491c845f08f236a1f489faa499f6d31e248 SHA512 748faec8ac1e96e6019f9200d8d82c1e724f79acbb01a2de0ae1b7aaf428d6317a32db750d5830bbc207a0d9a877464f5ce7931684cde3cb2f0bb0496d679197 WHIRLPOOL a4c40b21a0fc527f992cd4696ab6538ad31fe0603333b6198dd433ea6849e029e76cc38f23239e7b998d82bb1795eade5548a00fe35ce2602d8ae1a883373629 MISC metadata.xml 892 SHA256 c7f34ab09b97ea7896c5923c219b1431f9488cf15b27c245d4be880ccce87d65 SHA512 33ad8d44583605e115fd9866ff71324c70b71f1937273cc64c89221d8499b9ad620e272dbe37cd28098ffe2d19c9b414448d8979fd7b216ac5c9bba7a1a4d5f6 WHIRLPOOL cb6496cf00c218a0581a8114d82df6e5fdf90293d634d6c1eb12513d25cb9652d1c55bb035d5c48d58901fdcd67b3e23ece8681cefbe5a8015ab4c91bf299b4b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUCbiYAAoJEPiazRVxLXTFqvUP/R9TePgA+CdtBikYphENZREV -bZ56Bb9CXuBQp+/gNLoJ/qWWeaPvs2bTedS+LisarG0nuvOVVPaimch1q4XCdDG1 -hTvBkfX0eRqYUxBG5pn8lPOsg25Ilb60cX1rKV9QD8Xs4pVrst439lcyXnUm+LO4 -l376ew4yOGWPYtjVOuzrvWgi+JvhNWbk8wvwMOnImVuVsooUFLWnn7SdjAdgEhjd -GYsJ5/OBrre866YGKHkkCJbwUrc2NkZqYSKsgR6YZ17Xafu+DVlv87IZnV5dcZ+c -aDE8CuIZuMLeZqFEfCT1ppRzYIoZ9ttfNwSnjba5nLemBROuUfvDKPCZjN040Oyq -5nVTtXGMrftbkxHGJLriTkJ4bZ15oZ+AZvsJdlGMq8mb60o0xwiJyU4FM14OHdoX -MUUPWhuzwrofXMY5Ds+zAtQt+smvvv1xbqirDr9+Dv4Ir2001wP4hUdKdiOO2mNO -IzH17Yow6xFC7E8sV++kqm/2wJAZRM3UB2vt3qiD6LnCUl/twdXuANp+sV5peteT -G1Ppa1P1jHV054xjAys7kziaosCiX3ziOGC2g/W0mzmiX5kKNm67bV7SnswdpTKv -qXLHkl5kt5J2UGZs2IT22qosfYF+85mf/lp92VZfSHkD7bEHA6rfa1pkd2O08Tkl -evZVhxkr0vjdahBFDN5e -=6cHL +iQIcBAEBCAAGBQJUQAS6AAoJEPGu1DbS6WIAxaMP/Ax2coHm2oGtaSoI5iU9Fgo0 +0xsWLX4rvmfb1n8bGXBiAoea0O+YNHx/zTupFgOhWUXLKfXWWwyFOYmmw4mrdQrJ +Enew3kX7/A3lAKlpw9q/3q4DfKYetkRVtD6iNmoT83Gxj1TiJqtwQIRqVsPJ8Rk8 +hR9RMREI2DHUEUR+/z292lAHhmvA/kJyPPNMQUFdOm7NBHoQH0r9bqqLawOINU2Q +xwWlDnGTk+7PMlywjiFilPjpxNoav9khVTgjlB8/Zo0Fdp/2Si47pEtzpQq4g+0T +TGaNnSqrXbMIh+O6ENG/NSPF1Irrj65VyDrbYRHjgqsB5KReVXjhsPv30LbzFTfb +QAdiIOzGtttHumO4CQCkAS3RgQFtJk2uOsF0BsGbBWmNdB/LniHS7ig+RzjRPFsQ +cTYBtPvOz3cji5hbxqhGwslLodpMyRFexCpVRk7+PAHzRSwV7Ovo8GxXYzXMm+lu +hZZS9zB8+iWIzd5TUBHpyWOen2YHOfsyNr8oy9+Q5pvJSZqFu1s7+MM5W13lHJd5 +3bIOlA9FRPZTIzlHYnOEvMYmJlOGQ1oeHy8fEwqC3EmQabb26UDttYd/36rOBSMw +2dbGrFxfxuWoQO/E42tpujEvyWVZLMmHeODuMZ0JE8zqzDeLFBfdJDkK4ZYbRScO +d8SxxsL12Eca1QppDXRe +=2AaA -----END PGP SIGNATURE----- diff --git a/sys-apps/util-linux/files/util-linux-2.25.1-blkid-probe-fix.patch b/sys-apps/util-linux/files/util-linux-2.25.1-blkid-probe-fix.patch new file mode 100644 index 000000000000..f994a74a6696 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.25.1-blkid-probe-fix.patch @@ -0,0 +1,43 @@ +From 00749bc366fe6106df918660a92a388cfff4f35f Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 7 Oct 2014 12:44:34 +0200 +Subject: [PATCH] libblkid: zeroize errno on blkid_probe_get_buffer() success + +Since 37f4060225df0591ab8e1dd676dbc8115d900d4f prober functions are +sensitive to errno, it seems more robust to set errno=0 with in +blkid_probe_get_buffer() on success than set the zero on all places +where we call blkid_probe_get_buffer(). + +Addresses: https://github.com/karelzak/util-linux/issues/119 +Signed-off-by: Karel Zak +--- + libblkid/src/probe.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c +index 4fea3cc..3f7e43b 100644 +--- a/libblkid/src/probe.c ++++ b/libblkid/src/probe.c +@@ -539,8 +539,10 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr, + struct list_head *p; + struct blkid_bufinfo *bf = NULL; + +- if (pr->size <= 0) ++ if (pr->size <= 0) { ++ errno = EINVAL; + return NULL; ++ } + + if (pr->parent && + pr->parent->devno == pr->devno && +@@ -602,6 +604,7 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr, + list_add_tail(&bf->bufs, &pr->buffers); + } + ++ errno = 0; + return off ? bf->data + (off - bf->off) : bf->data; + } + +-- +2.1.2 + diff --git a/sys-apps/util-linux/util-linux-2.25.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.25.1-r1.ebuild new file mode 100644 index 000000000000..368c30a98a9f --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.25.1-r1.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.1-r1.ebuild,v 1.1 2014/10/16 17:47:37 vapier Exp $ + +EAPI="4" + +PYTHON_COMPAT=( python2_7 python3_{2,3,4} ) + +inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + python-single-r1 multilib-minimal + +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} + +if [[ ${PV} == 9999 ]] ; then + inherit git-2 autotools + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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="http://www.kernel.org/pub/linux/utils/util-linux/" + +LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode" + +RDEPEND="!sys-process/schedutils + !sys-apps/setarch + !=sys-libs/ncurses-5.2-r2 ) + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + udev? ( virtual/udev ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) + virtual/os-headers" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-blkid-probe-fix.patch + 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 + 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 + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 + # We manually set --libdir to the default since on prefix, econf will set it to + # a value which the configure script does not recognize. This makes it set the + # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25 + ECONF_SOURCE=${S} \ + econf \ + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ + --libdir='${prefix}/'"$(get_libdir)" \ + $(multilib_native_use_enable nls) \ + --enable-agetty \ + --with-bashcompletiondir="$(get_bashcompdir)" \ + --enable-bash-completion \ + $(multilib_native_use_enable caps setpriv) \ + --disable-chfn-chsh \ + $(multilib_native_use_enable cramfs) \ + $(multilib_native_use_enable fdformat) \ + --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ + --disable-kill \ + --disable-login \ + $(multilib_native_use_enable tty-helpers mesg) \ + --disable-nologin \ + --enable-partx \ + $(multilib_native_use_with python) \ + --enable-raw \ + --enable-rename \ + --disable-reset \ + --enable-schedutils \ + --disable-su \ + $(multilib_native_use_enable tty-helpers wall) \ + $(multilib_native_use_enable tty-helpers write) \ + $(multilib_native_use_enable suid makeinstall-chown) \ + $(multilib_native_use_enable suid makeinstall-setuid) \ + $(use_with selinux) \ + $(multilib_native_use_with slang) \ + $(use_enable static-libs static) \ + $(multilib_native_use_with udev) \ + $(tc-has-tls || echo --disable-tls) +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + # build libraries only + emake -f Makefile -f - mylibs \ + <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' + fi +} + +multilib_src_test() { + multilib_is_native_abi && emake check +} + +multilib_src_install() { + if multilib_is_native_abi; then + default + else + emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ + install-pkgconfigDATA install-uuidincHEADERS \ + install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ + install-nodist_smartcolsincHEADERS + fi + + if multilib_is_native_abi; then + # need the libs in / + gen_usr_ldscript -a blkid 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 + prune_libtool_files +} + +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 +} -- cgit v1.2.3-65-gdbad