From 509eb9747d369586a032a90ae669627295bd7f9d Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Tue, 6 Mar 2018 12:48:03 +0000 Subject: [PATCH 1/2] Accepting request 583383 from home:jankara:branches:filesystems - libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch: Removed as it is included in the new release - switched to .xz archive as kernel.org is going to deprecate them - Update to 1.43.9 * fix build failure on bigf endian systems * inode flag cleanup in libe2p OBS-URL: https://build.opensuse.org/request/show/583383 OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=95 --- e2fsprogs-1.43.8.tar.gz | 3 -- e2fsprogs-1.43.9.tar.xz | 3 ++ e2fsprogs.changes | 10 +++++ e2fsprogs.spec | 7 +--- ...ild-failure-in-swapfs.c-on-big-endia.patch | 40 ------------------- 5 files changed, 15 insertions(+), 48 deletions(-) delete mode 100644 e2fsprogs-1.43.8.tar.gz create mode 100644 e2fsprogs-1.43.9.tar.xz delete mode 100644 libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch diff --git a/e2fsprogs-1.43.8.tar.gz b/e2fsprogs-1.43.8.tar.gz deleted file mode 100644 index f5f3618..0000000 --- a/e2fsprogs-1.43.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f831e372afeabc188d3e87dba9d8ff48f9f24cf3c5e354dcfa525ae9381dc27 -size 7474876 diff --git a/e2fsprogs-1.43.9.tar.xz b/e2fsprogs-1.43.9.tar.xz new file mode 100644 index 0000000..5850812 --- /dev/null +++ b/e2fsprogs-1.43.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:926f8e8de1ffba55d791f21b71334e8a32b5227257ad370f2bf7e4396629e97f +size 5282240 diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 2b273e5..3f19f51 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Mar 6 10:32:58 UTC 2018 - jack@suse.cz + +- libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch: Removed as it is + included in the new release +- switched to .xz archive as kernel.org is going to deprecate them +- Update to 1.43.9 + * fix build failure on bigf endian systems + * inode flag cleanup in libe2p + ------------------------------------------------------------------- Wed Jan 24 14:41:11 UTC 2018 - jack@suse.cz diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 01ed1ff..dacd16d 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -61,7 +61,7 @@ Conflicts: libcom_err2-mini Conflicts: libcom_err-mini-devel %endif # -Version: 1.43.8 +Version: 1.43.9 Release: 0 Summary: Utilities for the Second Extended File System License: GPL-2.0 @@ -70,13 +70,12 @@ Url: http://e2fsprogs.sourceforge.net Requires(post): coreutils Requires: libcom_err2 >= %{version} Requires: libext2fs2 >= %{version} -Source: http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.gz +Source: http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.xz Source2: README.SUSE Source3: baselibs.conf # # e2fsprogs patches # -Patch1: libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch # libcom_err patches Patch3: libcom_err-compile_et_permissions.patch Patch4: e2fsprogs-1.42-implicit_fortify_decl.patch @@ -219,8 +218,6 @@ Development files for the com_err error message display library. Static librarie %prep %setup -q -n e2fsprogs-%{version} -# e2fsprogs patches -%patch1 -p1 # libcom_err patches %patch3 -p1 %patch4 diff --git a/libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch b/libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch deleted file mode 100644 index 5157402..0000000 --- a/libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 -References: bsc#1077420 - -Addresses-Debian-Bug: #886119 - -Reported-by: James Clarke -Signed-off-by: Theodore Ts'o -Acked-by: Jan Kara ---- - 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 6e5cff97e505..b13dc4229225 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.13.6 - From 37d4cccb7bd0791d2d4f758559528e84632dd3e4 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Thu, 8 Mar 2018 10:07:55 +0000 Subject: [PATCH 2/2] Accepting request 584246 from home:jankara:branches:filesystems - libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch: Removed as it is included in the new release - switched to .xz archive as kernel.org is going to deprecate gzip archives - Update to 1.43.9 * fix build failure on big endian systems * inode flag cleanup in libe2p OBS-URL: https://build.opensuse.org/request/show/584246 OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=96 --- e2fsprogs.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 3f19f51..2cdd785 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -3,9 +3,9 @@ Tue Mar 6 10:32:58 UTC 2018 - jack@suse.cz - libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch: Removed as it is included in the new release -- switched to .xz archive as kernel.org is going to deprecate them +- switched to .xz archive as kernel.org is going to deprecate gzip archives - Update to 1.43.9 - * fix build failure on bigf endian systems + * fix build failure on big endian systems * inode flag cleanup in libe2p -------------------------------------------------------------------