From c9e51669e665890d6ab7f7df788a4867e6adf1e8 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Fri, 29 Mar 2019 17:27:56 +0000 Subject: [PATCH 1/2] Accepting request 689917 from home:jankara:branches:filesystems - configure-Fix-autoheader-failure.patch: Fix autoheader failure - Update to 1.45.0 * Add support to force check at the next fsck run to tune2fs * Add e2scrub script to run e2fsck on LVM backed filesystem * Mke2fs will attempt to use ZERO_RANGE before PUNCH_HOLE so that we don't lose allocated blocks in preallocated files * Initial support for setting character set encoding * Add support for setting inode checksum to debugfs * Add support for specifying superblock location to e2image * Fix e4defrag to handle situation when files are created while it is running * Fix e2fsck to handle dirs > 2 GiB when largedir feature is enabled * Fix mke2fs huge file creation * Fix libext2fs to be more robust against invalid group descriptors * Fix mke2fs and debugfs to correctly copy files > 2 GiB * Fix memory leaks in debugfs, mke2fs, and e2freefrag OBS-URL: https://build.opensuse.org/request/show/689917 OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=105 --- e2fsprogs-1.44.5.tar.xz | 3 --- e2fsprogs-1.45.0.tar.xz | 3 +++ e2fsprogs.changes | 18 ++++++++++++++++++ e2fsprogs.spec | 5 ++++- 4 files changed, 25 insertions(+), 4 deletions(-) delete mode 100644 e2fsprogs-1.44.5.tar.xz create mode 100644 e2fsprogs-1.45.0.tar.xz diff --git a/e2fsprogs-1.44.5.tar.xz b/e2fsprogs-1.44.5.tar.xz deleted file mode 100644 index 00319d1..0000000 --- a/e2fsprogs-1.44.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba5eb3069d69160d96818bb9700de9ab5a8458d9add1fd85d427c0000d34c5b9 -size 5375996 diff --git a/e2fsprogs-1.45.0.tar.xz b/e2fsprogs-1.45.0.tar.xz new file mode 100644 index 0000000..f66df11 --- /dev/null +++ b/e2fsprogs-1.45.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fa9d0e13f30f1cae9035fe74ed8ad01bfaae99c2c0b9b970318bdb5d738fcd4 +size 5520532 diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 9099bcd..16a42f6 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Mar 29 15:01:02 UTC 2019 - Jan Kara + +- Update to 1.45.0 + * Add support to force check at the next fsck run to tune2fs + * Add e2scrub script to run e2fsck on LVM backed filesystem + * Mke2fs will attempt to use ZERO_RANGE before PUNCH_HOLE so that we don't + lose allocated blocks in preallocated files + * Initial support for setting character set encoding + * Add support for setting inode checksum to debugfs + * Add support for specifying superblock location to e2image + * Fix e4defrag to handle situation when files are created while it is running + * Fix e2fsck to handle dirs > 2 GiB when largedir feature is enabled + * Fix mke2fs huge file creation + * Fix libext2fs to be more robust against invalid group descriptors + * Fix mke2fs and debugfs to correctly copy files > 2 GiB + * Fix memory leaks in debugfs, mke2fs, and e2freefrag + ------------------------------------------------------------------- Tue Jan 8 09:34:17 UTC 2019 - jack@suse.cz diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 8b7744f..75802d1 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -62,7 +62,7 @@ Conflicts: libcom_err2-mini Conflicts: libcom_err-mini-devel %endif # -Version: 1.44.5 +Version: 1.45.0 Release: 0 Summary: Utilities for the Second Extended File System License: GPL-2.0-only @@ -329,6 +329,7 @@ done %license NOTICE %endif %config /etc/mke2fs.conf +%config /etc/e2scrub.conf #UsrMerge /sbin/badblocks /sbin/debugfs @@ -374,6 +375,8 @@ done %{_sbindir}/e2freefrag %{_sbindir}/e4defrag %{_sbindir}/e4crypt +%{_sbindir}/e2scrub +%{_sbindir}/e2scrub_all %if ! %{build_mini} %{_infodir}/libext2fs.info.gz %endif From 26966220f3fcfb7d4c712f3550b52bd642b50ef6 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 1 Apr 2019 08:49:22 +0000 Subject: [PATCH 2/2] Accepting request 690287 from home:jankara:branches:filesystems - configure-Fix-autoheader-failure.patch: Fix autoheader failure OBS-URL: https://build.opensuse.org/request/show/690287 OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=106 --- configure-Fix-autoheader-failure.patch | 37 ++++++++++++++++++++++++++ e2fsprogs.changes | 5 ++++ e2fsprogs.spec | 3 +++ 3 files changed, 45 insertions(+) create mode 100644 configure-Fix-autoheader-failure.patch diff --git a/configure-Fix-autoheader-failure.patch b/configure-Fix-autoheader-failure.patch new file mode 100644 index 0000000..f9b1a02 --- /dev/null +++ b/configure-Fix-autoheader-failure.patch @@ -0,0 +1,37 @@ +From 55c4bbfe8f1e9f2f76811775c77e99bf3dde3534 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Fri, 29 Mar 2019 17:32:52 +0100 +Subject: [PATCH] configure: Fix autoheader failure + +Autoheader reports: + +autoheader: warning: missing template: HAVE_BLKID_PROBE_ENABLE_PARTITIONS +autoheader: Use AC_DEFINE([HAVE_BLKID_PROBE_ENABLE_PARTITIONS], [], [Description]) +autoheader: warning: missing template: HAVE_BLKID_PROBE_GET_TOPOLOGY + +so provide appropriate descriptions for the defines. + +Signed-off-by: Jan Kara +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 248b291dd0d2..290f93ebdf2f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1119,9 +1119,9 @@ dnl the functions added after migrating that library to util-linux + dnl + if test -n "$BLKID_CMT"; then + AC_CHECK_LIB(blkid, blkid_probe_get_topology, +- AC_DEFINE(HAVE_BLKID_PROBE_GET_TOPOLOGY, 1)) ++ AC_DEFINE(HAVE_BLKID_PROBE_GET_TOPOLOGY, 1, [Define to 1 if blkid library provides blkid_probe_get_topology])) + AC_CHECK_LIB(blkid, blkid_probe_enable_partitions, +- AC_DEFINE(HAVE_BLKID_PROBE_ENABLE_PARTITIONS, 1)) ++ AC_DEFINE(HAVE_BLKID_PROBE_ENABLE_PARTITIONS, 1, [Define to 1 if blkid library provides blkid_probe_enable_partitions])) + fi + dnl + if test -n "$DLOPEN_LIB" ; then +-- +2.16.4 + diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 16a42f6..0b593b9 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 29 16:56:07 UTC 2019 - Jan Kara + +- configure-Fix-autoheader-failure.patch: Fix autoheader failure + ------------------------------------------------------------------- Fri Mar 29 15:01:02 UTC 2019 - Jan Kara diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 75802d1..d1353d8 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -81,6 +81,7 @@ Source3: baselibs.conf Patch3: libcom_err-compile_et_permissions.patch Patch4: e2fsprogs-1.42-implicit_fortify_decl.patch Patch5: e2fsprogs-1.42-ext2fsh_implicit.patch +Patch6: configure-Fix-autoheader-failure.patch # Do not suppress make commands BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -223,6 +224,7 @@ Development files for the com_err error message display library. Static librarie %patch3 -p1 %patch4 %patch5 +%patch6 -p1 cp %{SOURCE2} . %build @@ -236,6 +238,7 @@ autoreconf --force --install --disable-uuidd \ --disable-fsck \ --enable-static \ + --without-crond-dir \ CFLAGS="$RPM_OPT_FLAGS" %if %{build_mini} rm -rf doc