From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- sys-fs/f2fs-tools/Manifest | 10 +--- sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild | 34 ------------- sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild | 38 --------------- sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild | 39 --------------- sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild | 4 +- ...f2fs-tools-1.10.0-fibmap-include-config_h.patch | 15 ------ .../f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch | 56 ---------------------- 7 files changed, 3 insertions(+), 193 deletions(-) delete mode 100644 sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild delete mode 100644 sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild delete mode 100644 sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild delete mode 100644 sys-fs/f2fs-tools/files/f2fs-tools-1.10.0-fibmap-include-config_h.patch delete mode 100644 sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch (limited to 'sys-fs/f2fs-tools') diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest index 1f1d8cc79ee9..c3be16c8729e 100644 --- a/sys-fs/f2fs-tools/Manifest +++ b/sys-fs/f2fs-tools/Manifest @@ -1,11 +1,3 @@ -AUX f2fs-tools-1.10.0-fibmap-include-config_h.patch 401 BLAKE2B 83b0888b5892111165134b858e79bd7b68d3f1f2f66e67745b75e2ab5510f003969a60e8e8d148aba23c2e1b2167d184e20f8acdbbf5dd40cfacc773e9a4f1fc SHA512 d1ccb17c15267a42e64b1760410f1ff5ffeca8bc1545afacd7723e0a86ef7172df63dfbe85c9395f6c2d1b0651dc40bea991b9c30445badde4a1256fa58e6627 -AUX f2fs-tools-1.12.0-fsck.patch 1504 BLAKE2B 8e8cdda64e093faa17a1b9c8757c1013a49222b6d48306f5088f217c9e252b2bbca098bb77d34eeb9bb36fa37d7751c26c274625bc034506ed7b66d9ee353869 SHA512 ff4304561e03086094116e67d8e71d6f1388b89b203b7a852f3b02f31f892735ee96551e8fa3577babb1062eb3e50bff4b957085879ac59e94efaa0f2e4d4a95 -DIST f2fs-tools-1.10.0.tar.xz 342904 BLAKE2B ba4dec55e11959b2dd9461b1b02d173c7766908bfdbca9f6da7aa134b4a3b5cf2bda3c2e380b3fab46afdda0be9181ae5fe85ed9d085f816a1ff96e847e2a836 SHA512 e6e9fc10bd8051db86880c415ceb50900bf0cc919f1d9fe39026b5320de7c93cbcc1d817fab73130817042ed551fc5fd55ef9b589caeca9fca63fd3098f7a853 -DIST f2fs-tools-1.11.0.tar.gz 278795 BLAKE2B 8faefb1554283291ad2dc2b66800b88bbdcf07dcb1896a206fd56d52eaa19761c6b008a4961bcec12843a96d2df1744bb5394b4f7bf3830315f4bd3180850e8d SHA512 a69fbd01826909576634f40343293addae3a9c3be09bf8210e2abc1ae12f385fe24dd71c623d14a0a15a81d12f404f193981caaadacbd663bc1502de9a8f7fb7 -DIST f2fs-tools-1.12.0.tar.gz 286528 BLAKE2B ca2e17fa6c48905fc1905fdec865143a003260bd60f659cd9f6c427b371c39f4c869f7265dc198888adf7ef7d4d8ba7ed2a3733c52aab18277f5371cb2cb3be3 SHA512 3f1a914540f57f94bbdc33ad66ee0b02b26fe380b05f9209f226cb3df8e84e29aa4e8e91d77f52bf737915b2785d4b9723becf5a95d75e8821b2e107e991cbad DIST f2fs-tools-1.13.0.tar.gz 356028 BLAKE2B 170ddd5825b4f0f6a42a623f01d332092172a385e07dffccca46eb2545c12db23799fdeca7458c0cef17c95989e35db5e617a1458f0c7b41eeccd93eae807167 SHA512 fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f -EBUILD f2fs-tools-1.10.0.ebuild 829 BLAKE2B 33cb5076ad952162afc2b53506aa09370b28fd6c7942d7d800fc2f48506cb4fcf2db44f9e68ae58f70d95178a53c73b27cfe70aed1c5dc954d3e31e512aab70b SHA512 3319a0480393572701b4728268437cbc6490e84ee8f215425d663d2c314c42588b594869b6bf6ba87eb3a44947ef5d10ae9e0605942f1ed4f46d797769140a9f -EBUILD f2fs-tools-1.11.0-r1.ebuild 824 BLAKE2B 888b9092f9f8b402ce3d549cc6c896877dd1b7b0c6fdea785092d3160929175bb26aee5e05def9c07a3edf3c39ce0b6670a08f7d2a50cd7dc87e71d7f73ea5c6 SHA512 0771171e56491746fb9703ac2c0d454d7bb35bf62fc4b7f031c2d7ed7c2fa207227950cd35741bd1967531f2dbb08d64bc00535441c67cb11decb875b5784912 -EBUILD f2fs-tools-1.12.0-r1.ebuild 862 BLAKE2B 02c0087976e8c385776decfae140346c857a6c7e071057eb3680cff615e66787f9416cba4e3a611166451971589fadf4fef9abfc43cc4d95535714d45abe351d SHA512 51aabee7f1d91b09426511be0c33967181109be7ea7d4ace44072879bfa8d31baf0c328452ccdffa9d4e0675750e27a2e6f7417bc7dc67e713125e07acc7b7e9 -EBUILD f2fs-tools-1.13.0.ebuild 829 BLAKE2B 6e2c985a06c5973a118e998b101dce476cc4812384673d89d236c92259d39dd29c5460abfc665fe767cdbfb01b4dd1108e3862cc4e6769e7e18d65ebc339867d SHA512 69668767557a8f64c056475257fe3cb1636f8336afc5e67ecebfc4bb57484467a82dbb06342e7b547f72462cdc9bde497bf2d277a5bf647ec0b490f2c59ab6d8 +EBUILD f2fs-tools-1.13.0.ebuild 824 BLAKE2B 38f5fb1ddb65a2a22664eecae2825f226a9cab587604f7f4f9a9e43cf66b4f0131434ff3d50f347b939243943b87d3b5b9875f5704e60c567e50aeb74a72c4a7 SHA512 669a684b1a799b1509b37d86963b0e0d59f00b78e32b6e80d6bc37e7643fa3dd69b6b087f078f5b86fc92d2a649c18bb2b878773c27df416ed010f78427b3a37 MISC metadata.xml 438 BLAKE2B a3bb4e3293bcde65dc3b01fdf363738fc65f63f50756a390f5c0211ed7d252c305e386a913cfc9b016c198238ae0017c82d52d2ff20f79957de19d8db9f30b0a SHA512 d662e42e0da62d264cad5df63fd8f407798f8d396f74b17a2d5cdb20793753b450bb232b4320f9491126b71752a44a69ed11a22b0433786f9825e3941ab24578 diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild deleted file mode 100644 index ce7d7f0fa630..000000000000 --- a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Tools for Flash-Friendly File System (F2FS)" -HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/" -SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/4" -KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86" -IUSE="selinux" - -RDEPEND=" - sys-apps/util-linux - selinux? ( sys-libs/libselinux ) - elibc_musl? ( sys-libs/queue-standalone )" -DEPEND="$RDEPEND" - -PATCHES=( "${FILESDIR}"/${P}-fibmap-include-config_h.patch ) - -src_configure() { - #This is required to install to /sbin, bug #481110 - econf \ - --bindir="${EPREFIX}"/sbin \ - --disable-static \ - $(use_with selinux) -} - -src_install() { - default - find "${D}" -name "*.la" -delete || die -} diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild deleted file mode 100644 index 8bbde577cad3..000000000000 --- a/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Tools for Flash-Friendly File System (F2FS)" -HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/" -SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/5" -KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86" -IUSE="selinux" - -RDEPEND=" - selinux? ( sys-libs/libselinux ) - elibc_musl? ( sys-libs/queue-standalone )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - #This is required to install to /sbin, bug #481110 - econf \ - --bindir="${EPREFIX}"/sbin \ - --disable-static \ - $(use_with selinux) -} - -src_install() { - default - find "${D}" -name "*.la" -delete || die -} diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild deleted file mode 100644 index 3717d20a3636..000000000000 --- a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Tools for Flash-Friendly File System (F2FS)" -HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/" -SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/6" -KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86" -IUSE="selinux" - -RDEPEND=" - selinux? ( sys-libs/libselinux ) - elibc_musl? ( sys-libs/queue-standalone )" -DEPEND="${RDEPEND}" - -src_prepare() { - eapply "${FILESDIR}"/${P}-fsck.patch - default - eautoreconf -} - -src_configure() { - #This is required to install to /sbin, bug #481110 - econf \ - --bindir="${EPREFIX}"/sbin \ - --disable-static \ - $(use_with selinux) -} - -src_install() { - default - find "${D}" -name "*.la" -delete || die -} diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild index 9b271b07467b..84cf365f110a 100644 --- a/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild +++ b/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz LICENSE="GPL-2" SLOT="0/6" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86" IUSE="selinux" RDEPEND=" diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.10.0-fibmap-include-config_h.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.10.0-fibmap-include-config_h.patch deleted file mode 100644 index df57412b74cf..000000000000 --- a/sys-fs/f2fs-tools/files/f2fs-tools-1.10.0-fibmap-include-config_h.patch +++ /dev/null @@ -1,15 +0,0 @@ -See https://bugs.gentoo.org/649168 - -Patch by: Matt Whitlock - -diff -Naur a/tools/fibmap.c b/tools/fibmap.c ---- a/tools/fibmap.c 2018-03-01 00:09:24.861919778 +0000 -+++ b/tools/fibmap.c 2018-03-01 17:31:48.854604556 +0000 -@@ -15,6 +15,7 @@ - #ifndef O_LARGEFILE - #define O_LARGEFILE 0 - #endif -+#include "config.h" - #include - #include - #include diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch deleted file mode 100644 index 72d86fec465c..000000000000 --- a/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch +++ /dev/null @@ -1,56 +0,0 @@ -From a6160c3e21f43b89b49802cc4a956d1c4b65ae44 Mon Sep 17 00:00:00 2001 -From: Chao Yu -Date: Mon, 26 Nov 2018 18:53:37 +0800 -Subject: fsck.f2fs: allow to fsck readonly image w/ -f option - -To keep line with e2fsprogs, let's allow to fsck mounted image as -readonly w/ -f option. - -Reported-by: Perfect Gentleman -Signed-off-by: Chao Yu ---- - fsck/main.c | 1 + - include/f2fs_fs.h | 1 + - lib/libf2fs.c | 2 +- - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/fsck/main.c b/fsck/main.c -index 675c603..bb79f6e 100644 ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -249,6 +249,7 @@ void f2fs_parse_options(int argc, char *argv[]) - case 'f': - case 'y': - c.fix_on = 1; -+ c.force = 1; - MSG(0, "Info: Force to fix corruption\n"); - break; - case 'q': -diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h -index 65cc8fd..6eebb3a 100644 ---- a/include/f2fs_fs.h -+++ b/include/f2fs_fs.h -@@ -369,6 +369,7 @@ struct f2fs_configuration { - void *private; - int dry_run; - int fix_on; -+ int force; - int defset; - int bug_on; - int alloc_failed; -diff --git a/lib/libf2fs.c b/lib/libf2fs.c -index cc335db..498f6c0 100644 ---- a/lib/libf2fs.c -+++ b/lib/libf2fs.c -@@ -821,7 +821,7 @@ int get_device_info(int i) - return -1; - } - -- if (S_ISBLK(stat_buf->st_mode)) -+ if (S_ISBLK(stat_buf->st_mode) && !c.force) - fd = open(dev->path, O_RDWR | O_EXCL); - else - fd = open(dev->path, O_RDWR); --- -cgit 1.2-0.3.lf.el7 - -- cgit v1.2.3