gentoo resync : 22.01.2019

2 files changed, 0 insertions, 98 deletions

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch
deleted file mode 100644
index 8aa05a54ed62..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 33e9f2bd47a17bd0798a664718b6bfcfc4d044a1 Mon Sep 17 00:00:00 2001
-From: Qu Wenruo <wqu@suse.com>
-Date: Wed, 14 Mar 2018 08:56:57 +0800
-Subject: [PATCH] btrfs-progs: convert/ext2: Remove check for
- ext2_ext_attr_entry->e_value_block
-
-In latest e2fsprogs (1.44.0) definition of ext2_ext_attr_entry has
-removed member e_value_block, as currently ext* doesn't support it set
-anyway.
-
-So remove such check so that we can pass compile.
-
-Issue: #110
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199071
-Signed-off-by: Qu Wenruo <wqu@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- convert/source-ext2.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/convert/source-ext2.c b/convert/source-ext2.c
-index b1492c786..070126ec3 100644
---- a/convert/source-ext2.c
-+++ b/convert/source-ext2.c
-@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry,
- {
- 	size_t value_size = entry->e_value_size;
- 
--	if (entry->e_value_block != 0 || value_size > size ||
--	    entry->e_value_offs + value_size > size)
-+	if (value_size > size || entry->e_value_offs + value_size > size)
- 		return -EIO;
- 	return 0;
- }
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch b/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
deleted file mode 100644
index aeb187baaf41..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0a319cad0f002c2dfd44cffc1de0a26cf270560f Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 6 Aug 2018 11:26:54 -0400
-Subject: [PATCH] Install uncompressed man pages
-
-Bug: https://bugs.gentoo.org/662920
----
- Documentation/Makefile.in | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in
-index 184647c4..c4c843cb 100644
---- a/Documentation/Makefile.in
-+++ b/Documentation/Makefile.in
-@@ -37,9 +37,9 @@ MAN3_TXT += btrfs-ioctl.asciidoc
- MAN_TXT = $(MAN3_TXT) $(MAN8_TXT) $(MAN5_TXT)
- MAN_XML = $(patsubst %.asciidoc,%.xml,$(MAN_TXT))
- MAN_HTML = $(patsubst %.asciidoc,%.html,$(MAN_TXT))
--GZ_MAN3 = $(patsubst %.asciidoc,%.3.gz,$(MAN3_TXT))
--GZ_MAN5 = $(patsubst %.asciidoc,%.5.gz,$(MAN5_TXT))
--GZ_MAN8 = $(patsubst %.asciidoc,%.8.gz,$(MAN8_TXT))
-+MAN3 = $(patsubst %.asciidoc,%.3,$(MAN3_TXT))
-+MAN5 = $(patsubst %.asciidoc,%.5,$(MAN5_TXT))
-+MAN8 = $(patsubst %.asciidoc,%.8,$(MAN8_TXT))
- 
- mandir ?= $(prefix)/share/man
- man3dir = $(mandir)/man3
-@@ -86,9 +86,9 @@ endif
- 
- all: man
- man: man3 man5 man8
--man3: $(GZ_MAN3)
--man5: $(GZ_MAN5)
--man8: $(GZ_MAN8)
-+man3: $(MAN3)
-+man5: $(MAN5)
-+man8: $(MAN8)
- html: $(MAN_HTML)
- 
- install: install-man
-@@ -96,15 +96,15 @@ install: install-man
- install-man: man
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
--	$(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir)
-+	$(INSTALL) -m 644 $(MAN5) $(DESTDIR)$(man5dir)
- 	# the source file name of btrfs.5 clashes with section 8 page, but we
- 	# want to keep the code generic
--	$(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz
--	$(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
--	$(LN_S) -f btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
-+	$(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5 $(DESTDIR)$(man5dir)/btrfs.5
-+	$(INSTALL) -m 644 $(MAN8) $(DESTDIR)$(man8dir)
-+	$(LN_S) -f btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8
- 
- uninstall:
--	cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8)
-+	cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8 $(MAN8)
- 	$(RMDIR) -p --ignore-fail-on-non-empty $(DESTDIR)$(man8dir)
- 
- clean:
--- 
-2.18.0
-