From 2faec8ef6375e71a3598dee9e5a161641f3629c4 Mon Sep 17 00:00:00 2001 From: Lukas Czerner Date: Tue, 9 Jan 2018 15:59:22 +0100 Subject: [PATCH] New upstream release 1.43.8 Fix build failure swapfs.c on big-endian Signed-off-by: Lukas Czerner --- .gitignore | 1 + ...ild-failure-in-swapfs.c-on-big-endia.patch | 38 +++++++++++++++++++ e2fsprogs.spec | 10 ++++- sources | 2 +- 4 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 e2fsprogs-1.43.8-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch diff --git a/.gitignore b/.gitignore index 8702250..d667dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ e2fsprogs-1.41.12.tar.gz /e2fsprogs-1.43.5.tar.xz /e2fsprogs-1.43.6.tar.xz /e2fsprogs-1.43.7.tar.xz +/e2fsprogs-1.43.8.tar.xz diff --git a/e2fsprogs-1.43.8-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch b/e2fsprogs-1.43.8-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch new file mode 100644 index 0000000..826e80a --- /dev/null +++ b/e2fsprogs-1.43.8-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch @@ -0,0 +1,38 @@ +From 876d9b0c8eac2fd80dd62bfa1b09adea62aa08f3 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Wed, 3 Jan 2018 01:32:02 -0500 +Subject: [PATCH] libext2fs: fix build failure in swapfs.c on big-endian + systems + +Addresses-Debian-Bug: #886119 + +Reported-by: James Clarke +Signed-off-by: Theodore Ts'o +--- + lib/ext2fs/swapfs.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c +index 6e5cff9..b13dc42 100644 +--- a/lib/ext2fs/swapfs.c ++++ b/lib/ext2fs/swapfs.c +@@ -19,6 +19,7 @@ + + #include "ext2_fs.h" + #include "ext2fs.h" ++#include "ext2fsP.h" + #include + + #ifdef WORDS_BIGENDIAN +@@ -358,7 +359,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t, + if (inode_includes(inode_size, i_projid)) + t->i_projid = ext2fs_swab16(f->i_projid); + /* catch new static fields added after i_projid */ +- EXT2FS_BUILD_BUG_ON(sizeof(ext2_inode_large) != 160); ++ EXT2FS_BUILD_BUG_ON(sizeof(struct ext2_inode_large) != 160); + + i = sizeof(struct ext2_inode) + extra_isize + sizeof(__u32); + if (bufsize < (int) i) +-- +2.7.5 + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index b3c4239..362fec1 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,6 +1,6 @@ Summary: Utilities for managing ext2, ext3, and ext4 filesystems Name: e2fsprogs -Version: 1.43.7 +Version: 1.43.8 Release: 1%{?dist} # License tags based on COPYING file distinctions for various components @@ -11,6 +11,7 @@ Source1: ext2_types-wrapper.h Source2: e2fsck.conf Patch1: e2fsprogs-1.40.4-sb_feature_check_ignore.patch +Patch2: e2fsprogs-1.43.8-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -151,6 +152,9 @@ It was originally inspired by the Multics SubSystem library. # mildly unsafe but 'til I get something better, avoid full fsck # after an selinux install... %patch1 -p1 -b .featurecheck +# Fix build failure swapfs.c on big-endian +%patch2 -p1 + %build %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -332,6 +336,10 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog +* Tue Jan 9 2018 Lukas Czerner 1.43.8-1 +- New upstream release +- Fix build failure swapfs.c on big-endian + * Wed Oct 18 2017 Eric Sandeen 1.43.7-1 - New upstream release diff --git a/sources b/sources index 0d53db3..3c49d75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (e2fsprogs-1.43.7.tar.xz) = 2ef270364d3cea620db3c3b9932849d0ff5b49d4a9a9b24f0d1ac36888199bd67432edc5f939d9f697ee0342b71a063e1ad4ce8119528a7adab7a777c1de57ba +SHA512 (e2fsprogs-1.43.8.tar.xz) = 539f310909aafcd40062da067c94d3b355bdecee122ecb5ea53e137f57e8699bd4d549a7f161c796d9a3d7a7b5822e8c01b47e4babdeb7243eb64a022dda2f74