From 7ea28ba7d37aa785a9813d5a9d0ef0c045e4f9bb Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Wed, 17 Feb 2021 14:24:37 +0000 Subject: [PATCH 1/2] Accepting request 873155 from home:jankara:branches:filesystems - Update to 1.46.1: * Fix setting extended attributes in libext2fs and debugfs * Fix e2fsck to accept large_dir directories greater than 4G * Fix fast commit support on big endian architectures * Fix mke2fs -d to correctly import a small file stored using inline_data feature and which has ACL or extended attribute * Various compilation fixes * Speedup bitmap loading for large filesystems using multiple threads * Speedup mke2fs for bigalloc filesystems * E2fsck fixes when rehashing directories * Fix e2fsck crashes on maliciously corrupted filesystems * Fix e2fsck handling of duplicated case-folded file names * Implement hashed directory support in libext2fs * Support for fast commit feature * Support for combination of casefolding and encryption * Support for stable inodes feature * Add support for per-inode DAX flag * Fix tune2fs to unlock MMP on failure * Fix e2fsck buffer overflow when scanning directory blocks * Fix resize2fs overflowing block group descriptors with 1k block size - delete e2fsprogs-1.45.2-gettext.patch - it was merged upstream - Add autoconf-archive to build requirements - Fix installation of info files for older distros OBS-URL: https://build.opensuse.org/request/show/873155 OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=133 --- e2fsprogs-1.45.2-gettext.patch | 20 -------------------- e2fsprogs-1.45.6.tar.sign | Bin 310 -> 0 bytes e2fsprogs-1.45.6.tar.xz | 3 --- e2fsprogs-1.46.1.tar.sign | Bin 0 -> 310 bytes e2fsprogs-1.46.1.tar.xz | 3 +++ e2fsprogs.changes | 26 ++++++++++++++++++++++++++ e2fsprogs.spec | 16 ++++++++-------- 7 files changed, 37 insertions(+), 31 deletions(-) delete mode 100644 e2fsprogs-1.45.2-gettext.patch delete mode 100644 e2fsprogs-1.45.6.tar.sign delete mode 100644 e2fsprogs-1.45.6.tar.xz create mode 100644 e2fsprogs-1.46.1.tar.sign create mode 100644 e2fsprogs-1.46.1.tar.xz diff --git a/e2fsprogs-1.45.2-gettext.patch b/e2fsprogs-1.45.2-gettext.patch deleted file mode 100644 index fb7b739..0000000 --- a/e2fsprogs-1.45.2-gettext.patch +++ /dev/null @@ -1,20 +0,0 @@ -Support gettext >= 0.20, which now forbids AM_GNU_GETTEXT without -intlsymbol argument. - -[no-libtool] was the default choice (use of intl/ in-package -directory). - -Now only [external] is supported (use libintl library). --- -diff -up e2fsprogs-1.45.2/configure.ac.orig e2fsprogs-1.45.2/configure.ac ---- e2fsprogs-1.45.2/configure.ac.orig -+++ e2fsprogs-1.45.2/configure.ac -@@ -873,7 +873,7 @@ AC_SUBST(GETTEXT_PACKAGE) - AC_SUBST(PACKAGE) - AC_SUBST(VERSION) - --AM_GNU_GETTEXT -+AM_GNU_GETTEXT([external]) - dnl - dnl End of configuration options - dnl diff --git a/e2fsprogs-1.45.6.tar.sign b/e2fsprogs-1.45.6.tar.sign deleted file mode 100644 index 8ac210e2e2fe4775f457af04e7b81f994b2124cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j*HX}MI}{s?&}fj7zW`B_$#4S}Nt0$z9-x&R6Z5c2t1 zR+SBbqj=2+|5luyb1MWOJpKJjF0;BG!~r_)1`i3IZax9z zcGBTV2LEDj4$Z6neoW3g%_{$4Qk$(rq7jK?%vNA*OU|q?*z3yxb}lGu>w2N9wl0f% zl9oa27(Tu@NFZLP?OSqoVuwuSZgp3PoxGd%uTr6uZLU&RPjbZ1qEXU@$@StL_T*$g z#_>FfFycNe`A7fDK7?+>@2&6{C{hv-8QHlg+19cuKR~JK0O_AVQ17v8te+=7eRL$y IUoAHlcT}pCdjJ3c diff --git a/e2fsprogs-1.45.6.tar.xz b/e2fsprogs-1.45.6.tar.xz deleted file mode 100644 index eee6710..0000000 --- a/e2fsprogs-1.45.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffa7ae6954395abdc50d0f8605d8be84736465afc53b8938ef473fcf7ff44256 -size 5572144 diff --git a/e2fsprogs-1.46.1.tar.sign b/e2fsprogs-1.46.1.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000..b9accad8a11e7d152d15afa4fe5249d650f856c3 GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j*HX}MI}{s?&}fj7zW`B_$#4S}Nt0$?LfSO5wM5c2t1 zR+SBbqdPVS|55=y1|#IoWJ&V%jYI+kM-GHC#?2@1pj6^<*!YSaNcpmoi9^e~(gkin z#d-R5bo1DVP%JFpIlI*dHpIyrNVr$!<`QUsz!?^VS7g$khquHVjkzik2%g>`{L4mM zp7XhPd$VAQfUr{MoFL*mU*h>p(u`*bO==chgEu~n zArr`Ohq0lT%)Cx4(qC52%I71mt(ycI=74I$oG*%(oU85x Ixoi#eXra}WX#fBK literal 0 HcmV?d00001 diff --git a/e2fsprogs-1.46.1.tar.xz b/e2fsprogs-1.46.1.tar.xz new file mode 100644 index 0000000..ba5e98e --- /dev/null +++ b/e2fsprogs-1.46.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbe6af3b7bb7119556b6f57a78d41b330007738bca8530b2ba95d2ba35430151 +size 7019700 diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 6d5aecc..1d229eb 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,29 @@ +Tue Feb 16 17:31:25 UTC 2021 - Jan Kara + +- Update to 1.46.1: + * Fix setting extended attributes in libext2fs and debugfs + * Fix e2fsck to accept large_dir directories greater than 4G + * Fix fast commit support on big endian architectures + * Fix mke2fs -d to correctly import a small file stored using inline_data + feature and which has ACL or extended attribute + * Various compilation fixes + * Speedup bitmap loading for large filesystems using multiple threads + * Speedup mke2fs for bigalloc filesystems + * E2fsck fixes when rehashing directories + * Fix e2fsck crashes on maliciously corrupted filesystems + * Fix e2fsck handling of duplicated case-folded file names + * Implement hashed directory support in libext2fs + * Support for fast commit feature + * Support for combination of casefolding and encryption + * Support for stable inodes feature + * Add support for per-inode DAX flag + * Fix tune2fs to unlock MMP on failure + * Fix e2fsck buffer overflow when scanning directory blocks + * Fix resize2fs overflowing block group descriptors with 1k block size +- delete e2fsprogs-1.45.2-gettext.patch - it was merged upstream +- Add autoconf-archive to build requirements +- Fix installation of info files for older distros + ------------------------------------------------------------------- Thu Jan 28 15:02:08 UTC 2021 - Thorsten Kukuk diff --git a/e2fsprogs.spec b/e2fsprogs.spec index e100591..1b0aa16 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -29,6 +29,7 @@ Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4) %bcond_with systemd %endif BuildRequires: autoconf +BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: libblkid-devel BuildRequires: libuuid-devel @@ -68,7 +69,7 @@ Conflicts: libcom_err2-mini Conflicts: libcom_err-mini-devel %endif # -Version: 1.45.6 +Version: 1.46.1 Release: 0 Summary: Utilities for the Second Extended File System License: GPL-2.0-only @@ -91,8 +92,6 @@ Source5: https://thunk.org/tytso/tytso-key.asc#/%{name}.keyring Patch3: libcom_err-compile_et_permissions.patch Patch4: e2fsprogs-1.42-implicit_fortify_decl.patch Patch5: e2fsprogs-1.42-ext2fsh_implicit.patch -# PATCH-FIX-UPSTREAM e2fsprogs-1.45.2-gettext.patch -- Support gettext 0.20 -Patch6: e2fsprogs-1.45.2-gettext.patch # Do not suppress make commands BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -256,10 +255,7 @@ Development files for the com_err error message display library. Static librarie %patch3 -p1 %patch4 %patch5 -%patch6 -p1 cp %{SOURCE2} . -# Don't use intl/ subdirectory as it's deprecated since gettext 0.20 -rm -r intl %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects @@ -329,7 +325,9 @@ done %post /sbin/ldconfig %if ! %{build_mini} -%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz || : +%if 0%{?suse_version} <= 1530 +%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz +%endif %{?regenerate_initrd_post} %endif @@ -347,7 +345,9 @@ done %preun -n e2fsprogs-scrub-mini %else %preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz || : +%if 0%{?suse_version} <= 1530 +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz +%endif %preun -n e2fsprogs-scrub %endif %service_del_preun e2scrub@.service e2scrub_all.service e2scrub_all.timer e2scrub_fail@.service e2scrub_reap.service From fc39ebae42d2257a2533022c94006ce27f0ce1fc Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Thu, 18 Feb 2021 15:27:01 +0000 Subject: [PATCH 2/2] Accepting request 873455 from home:jankara:branches:filesystems - Remove autoreconf (and resulting dependencies) from the spec file. The upstream configure script should be fine. OBS-URL: https://build.opensuse.org/request/show/873455 OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=134 --- e2fsprogs.changes | 7 +++++++ e2fsprogs.spec | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 1d229eb..4539049 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 18 14:44:00 UTC 2021 - Jan Kara + +- Remove autoreconf (and resulting dependencies) from the spec file. The + upstream configure script should be fine. + +------------------------------------------------------------------- Tue Feb 16 17:31:25 UTC 2021 - Jan Kara - Update to 1.46.1: diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 1b0aa16..882d9d8 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -28,9 +28,6 @@ Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4) %else %bcond_with systemd %endif -BuildRequires: autoconf -BuildRequires: autoconf-archive -BuildRequires: automake BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: pkg-config @@ -259,7 +256,6 @@ cp %{SOURCE2} . %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects -autoreconf --force --install %configure \ --with-root-prefix='' \ --enable-elf-shlibs \