From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Jan 2018 15:48:02 +0000 Subject: gentoo resync : 25.01.2018 --- sys-fs/Manifest.gz | Bin 22012 -> 22034 bytes sys-fs/cryptsetup/Manifest | 2 + sys-fs/cryptsetup/cryptsetup-2.0.1.ebuild | 126 ++++++++++++++ sys-fs/encfs/Manifest | 2 +- sys-fs/encfs/encfs-1.9.2.ebuild | 2 +- sys-fs/udev/Manifest | 2 +- sys-fs/udev/udev-236.ebuild | 4 +- sys-fs/udisks/Manifest | 4 +- sys-fs/udisks/udisks-1.0.5-r1.ebuild | 105 ------------ sys-fs/udisks/udisks-1.0.5-r2.ebuild | 105 ++++++++++++ sys-fs/udisks/udisks-2.7.4-r1.ebuild | 2 +- sys-fs/xfsprogs/Manifest | 12 +- .../xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch | 117 ------------- .../files/xfsprogs-4.3.0-cross-compile.patch | 181 --------------------- .../xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch | 80 --------- sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch | 32 ---- sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild | 95 ----------- sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild | 94 ----------- sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild | 102 ------------ sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild | 2 +- 20 files changed, 243 insertions(+), 826 deletions(-) create mode 100644 sys-fs/cryptsetup/cryptsetup-2.0.1.ebuild delete mode 100644 sys-fs/udisks/udisks-1.0.5-r1.ebuild create mode 100644 sys-fs/udisks/udisks-1.0.5-r2.ebuild delete mode 100644 sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch delete mode 100644 sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch delete mode 100644 sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch delete mode 100644 sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch delete mode 100644 sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild delete mode 100644 sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild delete mode 100644 sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index f0462e297aa8..b5a4d00454a6 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index 59ad2f63123c..e8a30d664ae6 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -5,7 +5,9 @@ AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab DIST cryptsetup-1.7.4.tar.xz 1232068 BLAKE2B a65295d023f611ac57abf25fe21b4b6b6f64d8cfdcc01f2e008eea8141423e9d364af42fa3b58f9f8a76f898a01b3918a2a3ff98bc62ab105fa85feb3c1d55cd SHA512 c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 DIST cryptsetup-2.0.0.tar.xz 10079936 BLAKE2B 6e5f1bb20571cf7a66f988e50b2cc88d152a2cd414a9b760ad845cafac3d0aa5b5a1fbd871117b91a78b7cbf1d8a849608221f8a35d1faf26f901518c2d00c6e SHA512 195e9c0b6429d21ec0cc7c5faddfde85cb71eee09d348fa50df6779693a2dc05fce04bada4c835150964e08b2e8af30e4194155e0f6366b24c7812f48477a249 +DIST cryptsetup-2.0.1.tar.xz 10110424 BLAKE2B b3becffcb7000e40e1f47da4013998de557259f64dfdb24def953a375ed89dd8b4f1f3b95d7f1150638f29bc018ecb282db9f06ef7ba63b77a68ddfdfccd0c1a SHA512 b0c16de67169aefe861e0d6692dfa7ff1d7cf34990611c71edb82606ebf39a529511b36f7c452da591bdc39c4125a4355b7444d268680458219f2cad63e0f74b EBUILD cryptsetup-1.7.4.ebuild 4025 BLAKE2B ba5aec9f19bc046e4269baa7d4b73f0e1e0da13253a5ee700fb62cdfaf05de0cb71b86229379d7ce3176e9075e1d063d0f9f488df97da6a8c77e098ef4754f4f SHA512 9b46af09764085af0f6de8e99629839f45b9567110dde94db040e875805ad753f111136da06ffc0a65f3ebd8fa705e0a7509961a24c08032e501967e081f8928 EBUILD cryptsetup-1.7.5.ebuild 4037 BLAKE2B 1f4087211e970a85168dfa430529e16f4a4a2d6685a139a146f1c295d5c24cb66812409b9b54025884a7ac7dfde2c583aad81f5d23e75285b67443cf90843866 SHA512 d066730d351a2d01714c57fe5f430382276167a0b7e914d17c90760c2adc4442a71e2537e85b97ce71cb0f6d44e6ea399a0624e4ffd8fb4a43b81f5c3318d177 EBUILD cryptsetup-2.0.0-r1.ebuild 4098 BLAKE2B 26ec10dfc4d31c972dc655a7ab4dbecfdf63dc587df5cb1c772604c8cd61cf9a7f6d05cee9c2c7f20d46876ff6749c469ca78840152b843d8a31c08ad54954e3 SHA512 f1f7a6bc99c865687e6fe58822feb19165e5de8bd132b681ab38a2ce5e658a83cf448c7b6e9bdec7bd9d059465efb681ffeb68f155db8f2cfc4d6fc0cdcf246c +EBUILD cryptsetup-2.0.1.ebuild 4034 BLAKE2B 77ef011fd8005a29e27fb480137b9f36e2a160122a6917b532d2645f04360f7c042f9444819b6d1e6b59c7bfb4b981a7f7585e9cbd2ca22a6a44a957e6a0d25a SHA512 59315e58bafd417c781b38378ccd6ad8342ba89d6347ef0b40e399411c408eea370f295a6ce3fca2ea82bb06e4cb99aa278b883d62afeb928cd576a3488c2521 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41 diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.1.ebuild new file mode 100644 index 000000000000..8a3cab745499 --- /dev/null +++ b/sys-fs/cryptsetup/cryptsetup-2.0.1.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit autotools python-single-r1 linux-info libtool ltprune versionator + +DESCRIPTION="Tool to setup encrypted devices with dm-crypt" +HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md" +SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P/_/-}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/12" # libcryptsetup.so version +[[ ${PV} != *_rc* ]] && \ +KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86" +CRYPTO_BACKENDS="+gcrypt kernel nettle openssl" +# we don't support nss since it doesn't allow cryptsetup to be built statically +# and it's missing ripemd160 support so it can't provide full backward compatibility +IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs udev urandom" +REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) + python? ( ${PYTHON_REQUIRED_USE} ) + static? ( !gcrypt )" #496612 + +LIB_DEPEND=" + dev-libs/json-c:=[static-libs(+)] + dev-libs/libgpg-error[static-libs(+)] + dev-libs/popt[static-libs(+)] + >=sys-apps/util-linux-2.31-r1[static-libs(+)] + argon2? ( app-crypt/argon2:=[static-libs(+)] ) + gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) + nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) + openssl? ( + !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) + libressl? ( dev-libs/libressl:=[static-libs(+)] ) + ) + pwquality? ( dev-libs/libpwquality[static-libs(+)] ) + sys-fs/lvm2[static-libs(+)] + udev? ( virtual/libudev[static-libs(+)] )" +# We have to always depend on ${LIB_DEPEND} rather than put behind +# !static? () because we provide a shared library which links against +# these other packages. #414665 +RDEPEND="static-libs? ( ${LIB_DEPEND} ) + ${LIB_DEPEND//\[static-libs\(+\)\]} + python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND} + virtual/pkgconfig + static? ( ${LIB_DEPEND} )" + +S="${WORKDIR}/${P/_/-}" + +pkg_setup() { + local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256" + local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" + local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n" + local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n" + local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n" + check_extra_config +} + +src_prepare() { + sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die + default + eautoreconf +} + +src_configure() { + if use kernel ; then + ewarn "Note that kernel backend is very slow for this type of operation" + ewarn "and is provided mainly for embedded systems wanting to avoid" + ewarn "userspace crypto libraries." + fi + + use python && python_setup + + # We disable autotool python integration so we can use eclasses + # for proper integration with multiple python versions. + local myeconfargs=( + --disable-internal-argon2 + --enable-shared + --sbindir=/sbin + --with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d" + --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) + $(use_enable argon2 libargon2) + $(use_enable nls) + $(use_enable pwquality) + $(use_enable python) + $(use_enable reencrypt cryptsetup-reencrypt) + $(use_enable static static-cryptsetup) + $(use_enable static-libs static) + $(use_enable udev) + $(use_enable !urandom dev-random) + ) + econf "${myeconfargs[@]}" +} + +src_test() { + if [[ ! -e /dev/mapper/control ]] ; then + ewarn "No /dev/mapper/control found -- skipping tests" + return 0 + fi + + local p + for p in /dev/mapper /dev/loop* ; do + addwrite ${p} + done + + default +} + +src_install() { + default + + if use static ; then + mv "${ED%}"/sbin/cryptsetup{.static,} || die + mv "${ED%}"/sbin/veritysetup{.static,} || die + use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; } + fi + prune_libtool_files --modules + + dodoc docs/v*ReleaseNotes + + newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt + newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt +} diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest index 6278a6d76675..a373d76840d9 100644 --- a/sys-fs/encfs/Manifest +++ b/sys-fs/encfs/Manifest @@ -4,5 +4,5 @@ DIST encfs-1.8.1.tar.gz 316534 BLAKE2B 318b4ec8e17a7187c299e1287ad1927db2da64c96 DIST encfs-1.9.2.tar.gz 11043181 BLAKE2B 5e1ada5b85166312010dade2537b83d44b67dcfa0cdbdc1cf4076e4a92ed593aed6129457c241492ea8afe7049ab12889dbe292c4d427710ff16c11a67085819 SHA512 7664a2f48dddde77cae005aba70962704b002f60afb2da35c4661f7e4e22ce5c003d3b674ce125fcc72e9f0588164c1f7dbf22f2b9061d0736b8c164c1ec70a5 EBUILD encfs-1.7.5.ebuild 944 BLAKE2B 15eddfdf2608b1a7bc9790759024ff989ac7af61f7cb3dbf83cb030c51a0db54ee403dd451f285ed08203e4aa05e15ab339f1d108cbbc39e1eab56acc5dfc27e SHA512 7cc33ba27c23b1220cdd59a494fe92c219041c3dcff2189301ac8ba1d635ea117e41c6d5658fa3ad00d883df0961ac9ba56e44c7b09149670f95d3b7d6cc4848 EBUILD encfs-1.8.1.ebuild 1186 BLAKE2B e1e6f0bc4fba1fe1d9f2eb7b4896a5011ee519bb9af631881dbf747f632b2fec0d8cdb128d441c0be56efcc7806afd8299dea81c392822608ed09a29cc5b45dc SHA512 d9133dbcf045e0a9fdef6c7fe8f7e8aa67b82d776f0f05388c93a891a54c3f9f48ab4d2ec232e358c54e2d713248a45a66ef950825e4e2677157f7fde154a1a9 -EBUILD encfs-1.9.2.ebuild 908 BLAKE2B 72e6c9ade188977f93348d45e830e18f015f189d9577789c75ca356ec21816cb35cba247df64c58a385909518d7fa665e720e4a883c5ef50ed586c98b0046dfa SHA512 b23c7ed3054f808feca0425b30532136cbeb46690bf8175ba9e4a31bf8af43e1661d4e738fe5ebb5ea0bf15dbf4a7a982fe2ff0e4156be82e5cd807e09e3ea30 +EBUILD encfs-1.9.2.ebuild 913 BLAKE2B b55fa2df2488784bb268f110889b4837639cca2cad158833ac6b2ce14ca232c6f220b5cdc26e97bdfd8be29b8c6a8186744e9a6e0626f7c69c90a7f7f14d1351 SHA512 113d8cfdb07d579edb53f4c58db10433cf653e4fe2890b3893eb610ff061d7323e28894474977bb933238d2ed42afbd0a8ddf95c1e1364e8c12e785c6e346ce5 MISC metadata.xml 379 BLAKE2B 87ea00a89eb0bc59a7bd2df418d8ac3b04bd3560f1a47365235bd72dbb3cb342f8039cbade3524109bdba5139b1fd3adb5c6b6dd1ea1da45811cbacdd37ad803 SHA512 f94de3e423b8666aafc57201813f1b4e7a1be7da71736957aa70c4aa2d92d2b64a240e58c82bec472d97df0afefe5ba95e863243fda973804555e1625118b59f diff --git a/sys-fs/encfs/encfs-1.9.2.ebuild b/sys-fs/encfs/encfs-1.9.2.ebuild index 01426e04c93a..b2180d316cd9 100644 --- a/sys-fs/encfs/encfs-1.9.2.ebuild +++ b/sys-fs/encfs/encfs-1.9.2.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~x86" IUSE="libressl nls" RDEPEND=" diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 159f00c2385e..9e7537122730 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -14,6 +14,6 @@ EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb EBUILD udev-233.ebuild 13034 BLAKE2B ab219baa2baa309e5b0598bbc1fc9a11d8dfb110e100dc8bf9e63c894df62c217a4ebaf9c2a28d67ce0f61d90c64fe476c3c5c4ba25b52decef9d47d4d72001a SHA512 6382221804b758022770ef3643720bd6780722790d408506fc4357132dc052e2061180ccef904da59302c464d9383de305b01f47835fef33dea5869f75a54d8a EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c36b5125f8bf342af00133c70c5ecf88bf10bd1edfecddbc3c5075c7149903d5211c956277d7920191275688 SHA512 347f2941145237bc9732ad94074e5a6be432b15466ef2af4f82110a9314dbd9c6d69d391d8181ca66e9b13998466d9a609d03886e5afb5e250ad0323aaa65ec9 EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f -EBUILD udev-236.ebuild 9988 BLAKE2B 1e5bd0e56d880773cf8737a7fb10601daaa49b32d22d4471d135e3048231d976dffb6e8eeb2e6a50ce26c7f5888b3f22e20b388168845e115226a766f57a7852 SHA512 0e2378f4f690be31c6091ec74b015269b32a42191d06a28d4b664bc08686e057089dc786a6bee5bd0779374cb0caf326527bcd5f95bfd951df72c3c3296ebb32 +EBUILD udev-236.ebuild 9986 BLAKE2B 70f0639d812d5b80e11ac39e39b0f3df525111d043107bbfeb9dd31a97d0fe0253c23e8a109b2794a41bd61093b3d21dcb0a94e7c340a461777e3ec51c3f561f SHA512 e3e5f17d0dbc479b52b64a4abad8dca63a4670399759ae2da50bda52edf84b3abee2d265a890d5869d0a67201f1db0da8083f57cb3b33135444d53a600440641 EBUILD udev-9999.ebuild 9988 BLAKE2B 1e5bd0e56d880773cf8737a7fb10601daaa49b32d22d4471d135e3048231d976dffb6e8eeb2e6a50ce26c7f5888b3f22e20b388168845e115226a766f57a7852 SHA512 0e2378f4f690be31c6091ec74b015269b32a42191d06a28d4b664bc08686e057089dc786a6bee5bd0779374cb0caf326527bcd5f95bfd951df72c3c3296ebb32 MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e diff --git a/sys-fs/udev/udev-236.ebuild b/sys-fs/udev/udev-236.ebuild index ec6201a5a68d..0bc6698ce506 100644 --- a/sys-fs/udev/udev-236.ebuild +++ b/sys-fs/udev/udev-236.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index 6028c91377be..5e748e834ed2 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -7,9 +7,9 @@ DIST udisks-2.1.8.tar.bz2 931110 BLAKE2B f4aae539f3e4cd9548558eaeb417bf9c5ffd83d DIST udisks-2.6.5.tar.gz 1251008 BLAKE2B 0d94b35ba7bb4cf6f07951d46679da52f6510a5ddf8c070a9da67915637ab4fa13a898b561670fecda37fcf3db540faa85df3b611467d455b9cfe5d8b746a984 SHA512 57ac878c981af1b91a2e93af154c81471853969a1c951ce11c83f39e4450354da58d447c7644f477e39b602e673d76ecafe34fc7ba1346abf1f71707bcc324a7 DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849 DIST udisks-2.7.5.tar.bz2 1270965 BLAKE2B 42044f00b09764bb15c665e5a301c39fb9d14e2b28e825c55e8da2263f1f7f09845403a2f3434a060ff2d7fefe7d0277c22eaa25650c71393016a620edc0d041 SHA512 3af72b87acb8e540b229e58e2176ac87de831ef402f4825b6e9ee163a8d34e921a38909f45e685cd2a9931d08aaa22285ba2f6a811cb8265237201f0b5e36310 -EBUILD udisks-1.0.5-r1.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee +EBUILD udisks-1.0.5-r2.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee EBUILD udisks-2.1.8.ebuild 2997 BLAKE2B 3339216fdb9ab778f5601ab798be81ffe76ecf9c50d4e493cd86c80a2a6e150fb174d5ba0127e6b8cde3f81e9bf114ad6529bc1d45876dc02555d36e5f61b90e SHA512 b035b304e9585c5cfced81a4700eede5de731f850e06eb76bd391ba7ab333c3acba8775c493ca83bde42679877e9ad8ce436fc202486c04db2a34cfca7485c25 EBUILD udisks-2.6.5.ebuild 3348 BLAKE2B f227e1c664937ff73880f50d4847f61a7f42d681d7320d580863578abf4d2d6b41b5c38513cfdfb76311b6baf107b7b32ecbe9826213828c3936454d27d57736 SHA512 ed5146d860532c61b6cda0f4dcffd8ad3ce4907b671369f4032b58070a3252f65959f5fe33bc44914b3f872d0f40d5bc1f7b9fe2e1345fb7ef04019fb3554cbc -EBUILD udisks-2.7.4-r1.ebuild 3434 BLAKE2B bf1a9ede6b6faef5c1ed6ee2fa935b2abf46479035dba551f1f57f0cfc43627615820e3335c7ba62ea3bd6dc2c467b1192762f95f919c49c4ba19079228e3247 SHA512 109d5a2052b632ebcce964770703f4e5f25d6b1d0a5981d87c66742a932d6202ae11ece57e22e9ecb15b8c04c394886b16820022a47c6b7c8af8e8b31c0d0242 +EBUILD udisks-2.7.4-r1.ebuild 3450 BLAKE2B 5c8e19e8780ce2a13fec5a5f4d8a3d73bc271818d62ed7cc3a9b399378710ec9ffe29373fa8660a132772b6b6c19684e6c6828a66930695d77e5ba09ce8a82a2 SHA512 e725a238dff25f397a4ad444c73dd9dd6745f246b49e2977cacf3107ecc07a60c3a6667fc744567b2c9fc4fc17e75c3c237df90c7a81de4a72ac2904c06549ad EBUILD udisks-2.7.5-r1.ebuild 3503 BLAKE2B 5aa11ad64789c01674579d8de9486f8b56a71fe84a33ca30f6279e478d42e68cae0a929b2720f863e9479348e255b6444e9a6884fec2eb46a183d9a1b70e447b SHA512 cf390eef1066db7dfb5aaeaadbe6d8ca57afd172b901eef5f25bb7aedf52c6758f83731642cc1fe8ec412582cc4ea47f095686c35ae10eedbe718e992f2d1f4f MISC metadata.xml 803 BLAKE2B d703b430613a9e0527eb00c5b8b78ebcd04a76d28c5029980e818624aa2acbb486d9076ccb7636ce1df285d98ad64ffe45aa06989ff6d9df4a313b7d8b365c3f SHA512 c371035f733d2537c445d2fdd25e8754a6e92dc66e30e8610ec1112569799bce3101f98c5965df69c0fed25cc376a69e3f93d84c0c540e09b839cca44ad9585e diff --git a/sys-fs/udisks/udisks-1.0.5-r1.ebuild b/sys-fs/udisks/udisks-1.0.5-r1.ebuild deleted file mode 100644 index 513b9e8dcb5a..000000000000 --- a/sys-fs/udisks/udisks-1.0.5-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils bash-completion-r1 linux-info udev systemd - -DESCRIPTION="Daemon providing interfaces to work with storage devices" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" -SRC_URI="https://hal.freedesktop.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86" -IUSE="debug nls remote-access selinux" - -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 - >=dev-libs/glib-2.30 - >=dev-libs/libatasmart-0.19 - >=sys-auth/polkit-0.110 - >=sys-apps/dbus-1.6 - >=sys-apps/sg3_utils-1.27.20090411 - >=sys-block/parted-3 - >=sys-fs/lvm2-2.02.66 - virtual/libgudev:= - virtual/libudev:= - virtual/udev - selinux? ( sec-policy/selinux-devicekit )" -# util-linux -> mount, umount, swapon, swapoff (see also #403073) -RDEPEND="${COMMON_DEPEND} - >=sys-apps/util-linux-2.20.1-r2 - virtual/eject - remote-access? ( net-dns/avahi )" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/intltool - virtual/pkgconfig" - -QA_MULTILIB_PATHS="usr/lib/${PN}/.*" - -pkg_setup() { - # Listing only major arch's here to avoid tracking kernel's defconfig - if use amd64 || use arm || use ppc || use ppc64 || use x86; then - CONFIG_CHECK="~!IDE" #319829 - CONFIG_CHECK+=" ~NLS_UTF8" #425562 - kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278 - linux-info_pkg_setup - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \ - "${FILESDIR}"/${PN}-1.0.4-revert-floppy.patch \ - "${FILESDIR}"/${PN}-1.0.5-stat-includes.patch \ - "${FILESDIR}"/${PN}-1.0.5-sysmacros.patch - - sed -i -e "s:/lib/udev:$(get_udevdir):" data/80-udisks.rules || die - - epatch_user -} - -src_configure() { - # device-mapper -> lvm2 -> mandatory depend -> force enabled - econf \ - --libexecdir=/usr/lib/${PN} \ - --localstatedir="${EPREFIX}"/var \ - --disable-static \ - $(use_enable debug verbose-mode) \ - --enable-man-pages \ - --disable-gtk-doc \ - --enable-lvm2 \ - --enable-dmmp \ - $(use_enable remote-access) \ - $(use_enable nls) \ - --with-html-dir="${EPREFIX}"/deprecated \ - "$(systemd_with_unitdir)" -} - -src_test() { - ewarn "Skipping testsuite because sys-fs/udisks:0 is deprecated" - ewarn "in favour of sys-fs/udisks:2." -} - -src_install() { - emake \ - DESTDIR="${D}" \ - slashsbindir=/usr/sbin \ - slashlibdir=/usr/lib \ - udevhelperdir="$(get_udevdir)" \ - udevrulesdir="$(get_udevdir)"/rules.d \ - install #398081 - - dodoc AUTHORS HACKING NEWS README - - rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh - newbashcomp tools/udisks-bash-completion.sh ${PN} - - prune_libtool_files --all - - keepdir /media - keepdir /var/lib/udisks #383091 - - rm -rf "${ED}"/deprecated -} diff --git a/sys-fs/udisks/udisks-1.0.5-r2.ebuild b/sys-fs/udisks/udisks-1.0.5-r2.ebuild new file mode 100644 index 000000000000..513b9e8dcb5a --- /dev/null +++ b/sys-fs/udisks/udisks-1.0.5-r2.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils bash-completion-r1 linux-info udev systemd + +DESCRIPTION="Daemon providing interfaces to work with storage devices" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" +SRC_URI="https://hal.freedesktop.org/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86" +IUSE="debug nls remote-access selinux" + +COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 + >=dev-libs/glib-2.30 + >=dev-libs/libatasmart-0.19 + >=sys-auth/polkit-0.110 + >=sys-apps/dbus-1.6 + >=sys-apps/sg3_utils-1.27.20090411 + >=sys-block/parted-3 + >=sys-fs/lvm2-2.02.66 + virtual/libgudev:= + virtual/libudev:= + virtual/udev + selinux? ( sec-policy/selinux-devicekit )" +# util-linux -> mount, umount, swapon, swapoff (see also #403073) +RDEPEND="${COMMON_DEPEND} + >=sys-apps/util-linux-2.20.1-r2 + virtual/eject + remote-access? ( net-dns/avahi )" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/intltool + virtual/pkgconfig" + +QA_MULTILIB_PATHS="usr/lib/${PN}/.*" + +pkg_setup() { + # Listing only major arch's here to avoid tracking kernel's defconfig + if use amd64 || use arm || use ppc || use ppc64 || use x86; then + CONFIG_CHECK="~!IDE" #319829 + CONFIG_CHECK+=" ~NLS_UTF8" #425562 + kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278 + linux-info_pkg_setup + fi +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \ + "${FILESDIR}"/${PN}-1.0.4-revert-floppy.patch \ + "${FILESDIR}"/${PN}-1.0.5-stat-includes.patch \ + "${FILESDIR}"/${PN}-1.0.5-sysmacros.patch + + sed -i -e "s:/lib/udev:$(get_udevdir):" data/80-udisks.rules || die + + epatch_user +} + +src_configure() { + # device-mapper -> lvm2 -> mandatory depend -> force enabled + econf \ + --libexecdir=/usr/lib/${PN} \ + --localstatedir="${EPREFIX}"/var \ + --disable-static \ + $(use_enable debug verbose-mode) \ + --enable-man-pages \ + --disable-gtk-doc \ + --enable-lvm2 \ + --enable-dmmp \ + $(use_enable remote-access) \ + $(use_enable nls) \ + --with-html-dir="${EPREFIX}"/deprecated \ + "$(systemd_with_unitdir)" +} + +src_test() { + ewarn "Skipping testsuite because sys-fs/udisks:0 is deprecated" + ewarn "in favour of sys-fs/udisks:2." +} + +src_install() { + emake \ + DESTDIR="${D}" \ + slashsbindir=/usr/sbin \ + slashlibdir=/usr/lib \ + udevhelperdir="$(get_udevdir)" \ + udevrulesdir="$(get_udevdir)"/rules.d \ + install #398081 + + dodoc AUTHORS HACKING NEWS README + + rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh + newbashcomp tools/udisks-bash-completion.sh ${PN} + + prune_libtool_files --all + + keepdir /media + keepdir /var/lib/udisks #383091 + + rm -rf "${ED}"/deprecated +} diff --git a/sys-fs/udisks/udisks-2.7.4-r1.ebuild b/sys-fs/udisks/udisks-2.7.4-r1.ebuild index 833fa85161b7..e3adc9ad0cda 100644 --- a/sys-fs/udisks/udisks-2.7.4-r1.ebuild +++ b/sys-fs/udisks/udisks-2.7.4-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/${PN}/archive/${P}.tar.gz" LICENSE="GPL-2" SLOT="2" -KEYWORDS="amd64 arm ~arm64 ia64 x86" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 x86" IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd" REQUIRED_USE="?? ( elogind systemd )" diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 2187d825bbc9..8def4c1f21f4 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,20 +1,10 @@ -AUX xfsprogs-4.12.0-fix_musl.patch 3133 BLAKE2B 172940d6fd57f0ab165dc29cdccb9f4e509fb5ba0c39e47480608a6be0388c157ea1e0a4bf62f33dda0f2bd7b5f65b308f2f4fada4b108348e6e190d420f1cf8 SHA512 882de116f5cfe71fb5d3ac81db50eca6a1b666ea40041ab1e922507bc17906055ac02335bce94c64dcb3ad8938a48064f5b364e8867a72ac19077cc92a93a249 AUX xfsprogs-4.12.0-sharedlibs.patch 2361 BLAKE2B 3e487d35a858aa4adfdd41a853dab75ca62042710a82432e2dc1a0d23bd6121c2056d201a0e28e3ce538baf5eb1dcf2f72f38086c52955abeb7cc3709c903a62 SHA512 bbf802c54d2c8a2a524a9d4ae0ca66a18bf6b099a00fcc248abee04f84371bd35fc07a2dcc0c1d99c297b474c1f98d92927aa5ca16df5e6caef3abe386f31eba -AUX xfsprogs-4.3.0-cross-compile.patch 5112 BLAKE2B a2afc10b26aa42838999a1b2c8ca90dc54040f033f56f0a84ada02605342b204a03201b9fae03ee5adf4fbdda1d0c58f76d6ae153232d0b2619c1a4cfd33959c SHA512 2d6303b7c89b3e1ca2ba1d95a4477d0d1c2360ed68bf9c9d3630f990081be98ace9b9c164729635fa582cc5c8bd418e1824e35f613512d43cc6116fcda379582 -AUX xfsprogs-4.3.0-sharedlibs.patch 2310 BLAKE2B 6c9438a1ccfc4916ee4198b08e6b462f2a53d24afed86f3f316c59c5ae5381118b1789141dda56d2afb878059262b7e0227768dc8a05a3a7476a9dea38d0a832 SHA512 6d7ad2bc8b74390f81ecfa3774c837d083dc7e3332bd2e5450c4d67805d54f9727afeace39755e5d1185a230abcc9644bf2eb1544708d81b4f93a419aad8fdf4 -AUX xfsprogs-4.5.0-linguas.patch 967 BLAKE2B 7cd2051e135f33c7268eb68acc05f7a368cecda6868a55d03a0b1d94e5aafde5d12184c205d11eb0750f44a9a51edd5e38a7cb11a257f6ed05adf99db59f4cb8 SHA512 6d812dce622a3d38fe2b23e47c8f188012522dee3eaa6f002080f2b2ba8e50dc31ed8fc56d9e10b13d4f0dc54d6377b77d8a3823494176e843480e5226e79679 AUX xfsprogs-4.7.0-libxcmd-link.patch 880 BLAKE2B 5c9911aed7bd1579d17aac75f74ff41221e9e7c1d1c2139af4785d570ac612bb338cdcfa246ba690a60a2244ad14d7aa4885bf3d1306cecbf9326c2ff048604f SHA512 4484570c4bb387b6dfde5f31d8527f2222d33e120c365e3cbc6f488403b9e9d969d3f2a883ffcb145a11d57ace70c76fb1ba4a8ed75533f2089a197d463c8dd9 AUX xfsprogs-4.7.0-sharedlibs.patch 2355 BLAKE2B 03d1dfd738b973d9f904cec83528e6c61f9ebc8090c05ed8e51dc709185196f22b6db416d548fd0fd35296934177660a9d864881d07511f43287d647c392e4ae SHA512 f0006ec0a987e44a1e60d642f9938d35c14ccb765c6a040c80e483a0e073e54608571b53793b7d4c2b9eb1f5c4e2f077fb713dfab9abaa99022d24d8a17443fe AUX xfsprogs-4.9.0-cross-compile.patch 3663 BLAKE2B 1fdbc4307c0b177428e5b016321c791736c4cf0dfdfe19a413f0bb20d4f866b5bebe165c58b30132fadef078f5de7cbded1e310bc6871fb65559d00b2ae107fe SHA512 150ebcc26b21eb3e52575dd6b4bf2f451abb4906071b66e79df3697a56345e178f6b9bb11a7bd19283adb47a6b5e9c1dd807775ac2c814f0e2db795788fd1159 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7 -DIST xfsprogs-4.12.0.tar.xz 1128400 BLAKE2B 9e9c172bbe377106213e10d574857639c2ea49f5cac3d4c6c9480c6d8ef5d33cf3640ad12e0c3a83471b85f03bba4d48e582cbfe34c98d4b56229ce85750f615 SHA512 1dc4a0a5f40baf1d6398c8f07b4cb3ab796cf052c34b811d60b08c60a4700c2ced8d4d1adb878f8b85ba58cf3e1276db1477109de538fd427d3e359a52f59d4a -DIST xfsprogs-4.13.1.tar.xz 1133556 BLAKE2B 9a829a0656d6d69d25094b8177957dd9ac3aecb5f50fd6997e13b7131a15cea4ccb52c0ff7d977a5284df5fa0d63fd8f0db6315e14ead883c92143fda71575a5 SHA512 6c234a6c22aa3cabe0ea698c11175dca6c19d803989127ccb13b526ff6d34dcef9dd6e19ff0c4fb3903078f24210a8cfcd0508dac29d52fbee4dfed37d5888f3 DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506 -DIST xfsprogs-4.5.0.tar.gz 1524382 BLAKE2B 7ff26e6c61081db37c4fb4a15abdeb3ece2c6cea4980f3c43e488a8c5c4b54f6369ab191635d40031161456380e347a2a3f807e1992806499f3cab1ebbefc88d SHA512 19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314 DIST xfsprogs-4.9.0.tar.xz 1087940 BLAKE2B f896a1248e978b4d7c879c91e73f16fd5894cb95c22143e2f805ab2f54b75cafef63cd574fbf3ccbaebb59914b3759a1f8b3a49790c8c05df145d01416723c62 SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7 -EBUILD xfsprogs-4.12.0.ebuild 2733 BLAKE2B 91254ce021009746a40486f0e2d4697b4b5ee8440b25cb9b0f4ee7166acc9a6a110211268b7485cbfa77bcf8e9f214eb2dad26bb5bd51294ff2ae324109068d2 SHA512 b163f664b954fd6ace1e3ce1ad352deab0a10050c8b0b96dba8446cd4d9cbddb31c6c043ce7bffe86975606682e6e268f0efedda544c107284c92e7b4014d63d -EBUILD xfsprogs-4.13.1.ebuild 2670 BLAKE2B 12442b0cc0c254617ab5870ff5b4079fdca4b9510a2c43e1bace5128766f983e1a4a3183ffafffc348739f04d2156afe58888718ed8ac7c646c5796857cba129 SHA512 ab45b35a6805c8b55437ae5606f99dcae5edae90c2957c15653095d5efe16a13350d99b9117e13e55df9ea95b94119adb6d24b35e6f12635f2a17189f402f35c EBUILD xfsprogs-4.14.0.ebuild 2662 BLAKE2B e798156785443f5a6b5e283670b3300c84a5189b0204e79cddda32a80e0ee2b0b56e1b591136d5dd2c95240453b9c10f6ff07f970c6d847fc7086597124b8da9 SHA512 7d464a2c5446917aabe9d8f50a60dc43ff6e92bde11999dbd24cbb87f8d90140b60a21a24f26b40fbe6d59c1c1d628591fc7840fc4b903e57bb4e4fdcb0e08a6 -EBUILD xfsprogs-4.5.0.ebuild 2876 BLAKE2B dc897627ade02ec497d20fd761c102737b1fce4cbd62b252ca1a4fd06ae393b87d67c78584c4af8d4c5f3f958e84ee69e808bf46fa7ac29fbe08db0cd03b6af5 SHA512 2b40573bc0cb60c3b2d6e77c1b1b064856cee0e394b371622da66e12c11792b1b48e6ab8615679b18afef3f17a7264680c9787d1fbb243c012ea837c3463a946 -EBUILD xfsprogs-4.9.0.ebuild 2715 BLAKE2B 11f3355289c0801b61a914527182d3488d5d5eb9aef53ce1433db3f3ea7c379b960d1fe7ffea06694dc18bc68ee1b87905b34a3efaf79d41432a7a590818bc2a SHA512 ca6f97b41217d7d1e238d366811c77b2fbf5a43e99c79805999ba25f955e6a76290dedd95a93242777e44410ed07d0ebc1810f40771a43fdffbe90f283e90bf2 +EBUILD xfsprogs-4.9.0.ebuild 2717 BLAKE2B f24db0e5c16988192a849e6d42a143e103adb7569dba8a96cb5c6ac08d97663f9259c5b31073f2940b9a2e971c850b7ca200945f1bbd86f879a7a26d2e11f30b SHA512 b604adb4f3e3cbdf8e35d44d53e1c24d6be61552e0f4c14762d2f9f706d33a29226cbd30b11079faa2ecbea35ed85b45fe7908c2f0c9886dd698e2e607ddfe6a MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch deleted file mode 100644 index efc57e4f693d..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 21253610f9ef87db8e2a75b863b7fcfbd0cdb421 Mon Sep 17 00:00:00 2001 -From: "Darrick J. Wong" -Date: Tue, 25 Jul 2017 13:45:01 -0500 -Subject: [PATCH] In patch 4944defad4 ("xfs_db: redirect printfs when - metadumping to stdout"), we solved the problem of xfs_db printfs ending up in - the metadump stream by reassigning stdout for the duration of a stdout - metadump. Unfortunately, musl doesn't allow stdout to be reassigned (in - their view "extern FILE *stdout" means "extern FILE * const stdout"), so we - abandon the old approach in favor of playing games with dup() to switch the - raw file descriptors. - -While we're at it, fix a regression where an unconverted outf test -allows progress info to end up in the metadump stream. - -Signed-off-by: Darrick J. Wong ---- - db/metadump.c | 47 ++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 36 insertions(+), 11 deletions(-) - -diff --git a/db/metadump.c b/db/metadump.c -index 96641e0..4e2f648 100644 ---- a/db/metadump.c -+++ b/db/metadump.c -@@ -78,6 +78,7 @@ static int obfuscate = 1; - static int zero_stale_data = 1; - static int show_warnings = 0; - static int progress_since_warning = 0; -+static bool stdout_metadump; - - void - metadump_init(void) -@@ -137,7 +138,7 @@ print_progress(const char *fmt, ...) - va_end(ap); - buf[sizeof(buf)-1] = '\0'; - -- f = (outf == stdout) ? stderr : stdout; -+ f = stdout_metadump ? stderr : stdout; - fprintf(f, "\r%-59s", buf); - fflush(f); - progress_since_warning = 1; -@@ -2750,7 +2751,8 @@ metadump_f( - xfs_agnumber_t agno; - int c; - int start_iocur_sp; -- bool stdout_metadump = false; -+ int outfd = -1; -+ int ret; - char *p; - - exitcode = 1; -@@ -2870,16 +2872,35 @@ metadump_f( - * metadump operation so that dbprintf and other messages - * are sent to the console instead of polluting the - * metadump stream. -+ * -+ * We get to do this the hard way because musl doesn't -+ * allow reassignment of stdout. - */ -- outf = stdout; -- stdout = stderr; -+ fflush(stdout); -+ outfd = dup(STDOUT_FILENO); -+ if (outfd < 0) { -+ perror("opening dump stream"); -+ goto out; -+ } -+ ret = dup2(STDERR_FILENO, STDOUT_FILENO); -+ if (ret < 0) { -+ perror("redirecting stdout"); -+ close(outfd); -+ goto out; -+ } -+ outf = fdopen(outfd, "a"); -+ if (outf == NULL) { -+ fprintf(stderr, "cannot create dump stream\n"); -+ dup2(outfd, 1); -+ close(outfd); -+ goto out; -+ } - stdout_metadump = true; - } else { - outf = fopen(argv[optind], "wb"); - if (outf == NULL) { - print_warning("cannot create dump file"); -- free(metablock); -- return 0; -+ goto out; - } - } - -@@ -2907,15 +2928,19 @@ metadump_f( - if (progress_since_warning) - fputc('\n', stdout_metadump ? stderr : stdout); - -- if (stdout_metadump) -- stdout = outf; -- else -- fclose(outf); -+ if (stdout_metadump) { -+ fflush(outf); -+ fflush(stdout); -+ ret = dup2(outfd, STDOUT_FILENO); -+ if (ret < 0) -+ perror("un-redirecting stdout"); -+ } -+ fclose(outf); - - /* cleanup iocur stack */ - while (iocur_sp > start_iocur_sp) - pop_cur(); -- -+out: - free(metablock); - - return 0; --- -2.13.3 diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch b/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch deleted file mode 100644 index c54566451a9e..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 1a366eedc0eb4da46da48e9f6e2da27c7b5d2076 Mon Sep 17 00:00:00 2001 -From: Gwendal Grignou -Date: Fri, 3 Jun 2016 09:17:28 -0700 -Subject: [PATCH] Allow compiling xfsprogs in a cross compile environment. - -Without this patch, we are using the same compiler and options for the host -compiler (BUILD_CC) and the target compiler (CC), and we would get error -messages at compilation: -x86_64-pc-linux-gnu-gcc -O2 -O2 -pipe -march=armv7-a -mtune=cortex-a15 ... -x86_64-pc-linux-gnu-gcc.real: error: unrecognized command line option -'-mfpu=neon' -'-mfloat-abi=hard' -'-clang-syntax' -'-mfpu=neon' -'-mfloat-abi=hard' -'-clang-syntax' - -Add BUILD_CC and BUILD_CFLAGS as precious variables to allow setting it up -from the ebuild. - -Signed-off-by: Gwendal Grignou ---- - configure | 26 +++++++++++++++++++++----- - configure.ac | 20 +++++++++++++++----- - include/builddefs.in | 6 ++++-- - libxfs/Makefile | 4 ++-- - 4 files changed, 42 insertions(+), 14 deletions(-) - -diff --git a/configure b/configure -index 325081f..863a447 100755 ---- a/configure -+++ b/configure -@@ -700,6 +700,7 @@ libreadline - enable_blkid - enable_gettext - enable_shared -+BUILD_CFLAGS - BUILD_CC - CPP - LT_SYS_LIBRARY_PATH -@@ -806,7 +807,9 @@ LDFLAGS - LIBS - CPPFLAGS - LT_SYS_LIBRARY_PATH --CPP' -+CPP -+BUILD_CC -+BUILD_CFLAGS' - - - # Initialize some variables set by options. -@@ -1456,6 +1459,9 @@ Some influential environment variables: - LT_SYS_LIBRARY_PATH - User-defined run-time library search path. - CPP C preprocessor -+ BUILD_CC C compiler for build tools -+ BUILD_CFLAGS -+ C compiler flags for build tools - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -11957,11 +11963,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --if test $cross_compiling = no; then -- BUILD_CC="$CC" - --else -- for ac_prog in gcc cc -+if test "${BUILD_CC+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CC="$CC" -+ else -+ for ac_prog in gcc cc - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -12003,6 +12010,15 @@ fi - test -n "$BUILD_CC" && break - done - -+ fi -+fi -+ -+if test "${BUILD_CFLAGS+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CFLAGS="$CFLAGS" -+ else -+ BUILD_CFLAGS="-g -O2" -+ fi - fi - - # Check whether --enable-shared was given. -diff --git a/configure.ac b/configure.ac -index d44438f..fc286b3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,11 +9,21 @@ AC_PREFIX_DEFAULT(/usr) - AC_PROG_LIBTOOL - - AC_PROG_CC --if test $cross_compiling = no; then -- BUILD_CC="$CC" -- AC_SUBST(BUILD_CC) --else -- AC_CHECK_PROGS(BUILD_CC, gcc cc) -+AC_ARG_VAR(BUILD_CC, [C compiler for build tools]) -+if test "${BUILD_CC+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CC="$CC" -+ else -+ AC_CHECK_PROGS(BUILD_CC, gcc cc) -+ fi -+fi -+AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools]) -+if test "${BUILD_CFLAGS+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CFLAGS="$CFLAGS" -+ else -+ BUILD_CFLAGS="-g -O2" -+ fi - fi - - AC_ARG_ENABLE(shared, -diff --git a/include/builddefs.in b/include/builddefs.in -index c2ca4cb..9ca57a6 100644 ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -27,6 +27,7 @@ MALLOCLIB = @malloc_lib@ - LOADERFLAGS = @LDFLAGS@ - LTLDFLAGS = @LDFLAGS@ - CFLAGS = @CFLAGS@ -+BUILD_CFLAGS = @BUILD_CFLAGS@ - - LIBRT = @librt@ - LIBUUID = @libuuid@ -@@ -150,7 +151,7 @@ PCFLAGS+= -DENABLE_BLKID - endif - - --GCFLAGS = $(OPTIMIZER) $(DEBUG) \ -+GCFLAGS = $(DEBUG) \ - -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \ - -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs - -@@ -158,8 +159,9 @@ ifeq ($(ENABLE_GETTEXT),yes) - GCFLAGS += -DENABLE_GETTEXT - endif - -+BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS) - # First, Global, Platform, Local CFLAGS --CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) -+CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) - - include $(TOPDIR)/include/buildmacros - -diff --git a/libxfs/Makefile b/libxfs/Makefile -index 873d4ec..8d728c0 100644 ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -111,7 +111,7 @@ default: crc32selftest ltdepend $(LTLIBRARY) - - crc32table.h: gen_crc32table.c - @echo " [CC] gen_crc32table" -- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $< -+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $< - @echo " [GENERATE] $@" - $(Q) ./gen_crc32table > crc32table.h - -@@ -122,7 +122,7 @@ crc32table.h: gen_crc32table.c - # disk. - crc32selftest: gen_crc32table.c crc32table.h crc32.c - @echo " [TEST] CRC32" -- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ -+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ - $(Q) ./$@ - - # set up include/xfs header directory --- -2.8.0.rc3.226.g39d4020 diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch deleted file mode 100644 index a39af0d8cb43..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- xfsprogs-4.3.0/include/buildmacros -+++ xfsprogs-4.3.0/include/buildmacros -@@ -70,18 +70,9 @@ - # /usr/lib. - ifeq ($(ENABLE_SHARED),yes) - INSTALL_LTLIB_DEV = \ -- cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ -- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ -- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ -- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \ -- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ -- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ -- fi -+ set -e; cd $(TOPDIR)/$(LIBNAME); \ -+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la - else - INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) - endif ---- xfsprogs-4.3.0/libxcmd/Makefile -+++ xfsprogs-4.3.0/libxcmd/Makefile -@@ -34,6 +34,9 @@ - - include $(BUILDRULES) - --install install-dev: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) - - -include .ltdep ---- xfsprogs-4.3.0/libxfs/Makefile -+++ xfsprogs-4.3.0/libxfs/Makefile -@@ -138,6 +138,7 @@ - - install-dev: install - $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR) -+ $(INSTALL_LTLIB_DEV) - - # We need to install the headers before building the dependencies. If we - # include the .ltdep file, the makefile decides that it needs to build the ---- xfsprogs-4.3.0/libxlog/Makefile -+++ xfsprogs-4.3.0/libxlog/Makefile -@@ -12,6 +12,8 @@ - - CFILES = xfs_log_recover.c util.c - -+LTLIBS = $(LIBUUID) $(LIBXFS) -+ - # don't want to link xfs_repair with a debug libxlog. - DEBUG = -DNDEBUG - -@@ -19,6 +21,9 @@ - - include $(BUILDRULES) - --install install-dev: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) - - -include .ltdep ---- xfsprogs-4.3.0/Makefile -+++ xfsprogs-4.3.0/Makefile -@@ -82,6 +82,8 @@ - quota: libxcmd - repair: libxlog - copy: libxlog -+libxlog: libxfs -+libxlog-install-dev: libxfs-install-dev - - ifeq ($(HAVE_BUILDDEFS), yes) - include $(BUILDRULES) diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch b/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch deleted file mode 100644 index 9912e49ebf84..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2212e8bb59e7c3930d49da2ec5f4f0a9ceb086c7 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 8 Apr 2016 16:41:31 -0400 -Subject: [PATCH] po: respect LINGUAS build setting - -It is common gettext practice to limit the translations a particular -package will include by setting the LINGUAS environment variable. - -Signed-off-by: Mike Frysinger ---- - po/Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/po/Makefile b/po/Makefile -index edf92ad..a5250b3 100644 ---- a/po/Makefile -+++ b/po/Makefile -@@ -6,7 +6,10 @@ TOPDIR = .. - include $(TOPDIR)/include/builddefs - - POTHEAD = $(PKG_NAME).pot --LINGUAS = de pl -+# If the user has requested a specific set of translations, only build those. -+SUPPORTED_LINGUAS = $(patsubst %.po,%,$(wildcard *.po)) -+LINGUAS ?= $(SUPPORTED_LINGUAS) -+LINGUAS := $(filter $(SUPPORTED_LINGUAS),$(LINGUAS)) - LSRCFILES = $(LINGUAS:%=%.po) - LDIRT = $(POTHEAD) - --- -2.7.4 - diff --git a/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild deleted file mode 100644 index 4736e0b82b64..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="libedit nls readline static static-libs" -REQUIRED_USE="static? ( static-libs )" - -LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] - readline? ( sys-libs/readline:0=[static-libs(+)] ) - !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - !=xfsprogs-3.2.0 - emake -j1 DIST_ROOT="${ED}" install-dev - - # handle is for xfsdump, the rest for xfsprogs - gen_usr_ldscript -a handle xcmd xfs xlog - # removing unnecessary .la files if not needed - use static-libs || find "${ED}" -name '*.la' -delete -} diff --git a/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild deleted file mode 100644 index a77ca48cb15d..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multilib - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="libedit nls readline static static-libs" -REQUIRED_USE="static? ( static-libs )" - -LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] - readline? ( sys-libs/readline:0=[static-libs(+)] ) - !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - !=xfsprogs-3.2.0 - emake -j1 DIST_ROOT="${ED}" install-dev - - # handle is for xfsdump, the rest for xfsprogs - gen_usr_ldscript -a handle xcmd xfs xlog - # removing unnecessary .la files if not needed - use static-libs || find "${ED}" -name '*.la' -delete -} diff --git a/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild deleted file mode 100644 index 3f9a00c49a14..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz - ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -IUSE="libedit nls readline static static-libs" -REQUIRED_USE="static? ( static-libs )" - -LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] - readline? ( sys-libs/readline:0=[static-libs(+)] ) - !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - !=xfsprogs-3.2.0 - emake -j1 DIST_ROOT="${ED}" install-dev - - # handle is for xfsdump, the rest for xfsprogs - gen_usr_ldscript -a xfs xlog - # removing unnecessary .la files if not needed - use static-libs || find "${ED}" -name '*.la' -delete -} diff --git a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild index 0d581fec662b..4dca309b8b99 100644 --- a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild @@ -7,7 +7,7 @@ inherit eutils toolchain-funcs multilib DESCRIPTION="xfs filesystem utilities" HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" +SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -- cgit v1.2.3