commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2024-02-23 16:41:11
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.1770 (New)
Package is "e2fsprogs"
Fri Feb 23 16:41:11 2024 rev:131 rq:1149276 version:1.47.0
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2024-01-15
22:16:50.745599715 +0100
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.1770/e2fsprogs.changes
2024-02-23 16:41:23.670778749 +0100
@@ -1,0 +2,5 @@
+Thu Feb 22 11:26:27 UTC 2024 - Dominique Leuenberger
+
+- Use %patch -P N instead of deprecated %patchN.
+
+---
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.qPbJzn/_old 2024-02-23 16:41:24.478808040 +0100
+++ /var/tmp/diff_new_pack.qPbJzn/_new 2024-02-23 16:41:24.478808040 +0100
@@ -216,15 +216,15 @@
%prep
%setup -q -n e2fsprogs-%{version}
# libcom_err patches
-%patch3 -p1
-%patch4
-%patch5
+%patch -P 3 -p1
+%patch -P 4
+%patch -P 5
cp %{SOURCE2} .
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%patch -P 6 -p1
+%patch -P 7 -p1
+%patch -P 8 -p1
+%patch -P 9 -p1
+%patch -P 10 -p1
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2024-01-15 22:15:23
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.21961 (New)
Package is "e2fsprogs"
Mon Jan 15 22:15:23 2024 rev:130 rq:1138797 version:1.47.0
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2023-10-05
20:03:42.627921129 +0200
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.21961/e2fsprogs.changes
2024-01-15 22:16:50.745599715 +0100
@@ -1,0 +2,6 @@
+Fri Jan 12 14:43:48 UTC 2024 - Luis Henriques
+
+- e2fsck-Suppress-orphan-file-is-clean-message-in-preen.patch: e2fsck:
+ Suppress "orphan file is clean" message in preen mode (bsc#1218747)
+
+---
New:
e2fsck-Suppress-orphan-file-is-clean-message-in-preen.patch
BETA DEBUG BEGIN:
New:
- e2fsck-Suppress-orphan-file-is-clean-message-in-preen.patch: e2fsck:
Suppress "orphan file is clean" message in preen mode (bsc#1218747)
BETA DEBUG END:
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.mt7lhq/_old 2024-01-15 22:16:51.385623097 +0100
+++ /var/tmp/diff_new_pack.mt7lhq/_new 2024-01-15 22:16:51.389623244 +0100
@@ -52,6 +52,7 @@
Patch7: harden_e2scrub_all.service.patch
Patch8: harden_e2scrub_fail@.service.patch
Patch9: harden_e2scrub_reap.service.patch
+Patch10:e2fsck-Suppress-orphan-file-is-clean-message-in-preen.patch
BuildRequires: libblkid-devel
BuildRequires: libuuid-devel
BuildRequires: pkg-config
@@ -223,6 +224,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
++ e2fsck-Suppress-orphan-file-is-clean-message-in-preen.patch ++
From: Theodore Ts'o
Date: Tue, 30 May 2023 13:50:52 -0400
Subject: e2fsck: Suppress "orphan file is clean" message in preen mode
Git-repo: git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
Git-commit: 24a11cc371a46ca9e68aed8f2cf4aabd22ea81eb
Patch-mainline: Queued in subsystem maintainer repo
References: bsc#1218747
The e2fsck report, "Feature orphan_present is set but orphan file is
clean" is intended to request permission before removing the r/o
compat feature, orphan_present. However, it is normal if the orphan
file is empty, and removing the r/o compat feature is a good thing so
that the file system can be mounted on older kernels.
When a file system with an orphan_file feature is mounted, the
orphan_present feature is set, and it is cleared when the file system
is cleanly unmounted. IF the sytstem crashes when there are no inodes
in the orphan file, e2fsck should just silently clear the flag in
preen mode.
Signed-off-by: Theodore Ts'o
Acked-by: LuÃs Henriques
---
e2fsck/problem.c | 2 +-
e2fsck/super.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 6ad6fb849022..013ace24965b 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -2327,7 +2327,7 @@ static struct e2fsck_problem problem_table[] = {
/* orphan_present set but orphan file is empty */
{ PR_6_ORPHAN_PRESENT_CLEAN_FILE,
N_("Feature orphan_present is set but orphan file is clean.\n"),
- PROMPT_CLEAR, PR_PREEN_OK },
+ PROMPT_CLEAR, PR_PREEN_OK | PR_NO_OK | PR_PREEN_NOMSG },
/* orphan_present set but orphan_file is not */
{ PR_6_ORPHAN_PRESENT_NO_FILE,
diff --git a/e2fsck/super.c b/e2fsck/super.c
index 9495e029e087..be40dd8fb64d 100644
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -1388,7 +1388,8 @@ void check_super_block(e2fsck_t ctx)
* away.
*/
#define FEATURE_RO_COMPAT_IGNORE (EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
-EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
+EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
+EXT4_FEATURE_RO_COMPAT_ORPHAN_PRESENT)
#define FEATURE_INCOMPAT_IGNORE(EXT3_FEATURE_INCOMPAT_EXTENTS|
\
EXT3_FEATURE_INCOMPAT_RECOVER)
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2023-10-05 20:03:08
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.28202 (New)
Package is "e2fsprogs"
Thu Oct 5 20:03:08 2023 rev:129 rq:1115670 version:1.47.0
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2023-05-30
22:02:00.682857874 +0200
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.28202/e2fsprogs.changes
2023-10-05 20:03:42.627921129 +0200
@@ -1,0 +2,5 @@
+Wed Oct 4 16:34:10 UTC 2023 - Jan Kara
+
+- Update specfile to make sure regenerate_initrd_post macro is defined
+
+---
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.rRlel2/_old 2023-10-05 20:03:45.624029369 +0200
+++ /var/tmp/diff_new_pack.rRlel2/_new 2023-10-05 20:03:45.648030236 +0200
@@ -79,6 +79,11 @@
%endif
#
# For regenerate_initrd_post macro
+%if 0%{?suse_version} < 1550
+BuildRequires: suse-module-tools
+%else
+BuildRequires: rpm-config-SUSE
+%endif
Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires: libcom_err2 >= %{version}
Requires: libext2fs2 >= %{version}
@@ -282,7 +287,7 @@
%if 0%{?suse_version} <= 1530
%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
%endif
-%{?regenerate_initrd_post}
+%{regenerate_initrd_post}
%if %{with systemd}
%post -n e2fsprogs-scrub
@@ -301,7 +306,7 @@
%postun
/sbin/ldconfig
-%{?regenerate_initrd_post}
+%{regenerate_initrd_post}
%if %{with systemd}
%postun -n e2fsprogs-scrub
@@ -309,7 +314,7 @@
%endif
%posttrans
-%{?regenerate_initrd_posttrans}
+%{regenerate_initrd_posttrans}
%post -n libext2fs2 -p /sbin/ldconfig
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2023-05-30 22:01:56
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.1533 (New)
Package is "e2fsprogs"
Tue May 30 22:01:56 2023 rev:128 rq:1063810 version:1.47.0
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2023-01-07
17:15:45.376739158 +0100
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.1533/e2fsprogs.changes
2023-05-30 22:02:00.682857874 +0200
@@ -1,0 +2,24 @@
+Wed Feb 8 10:14:18 UTC 2023 - Paolo Stivanin
+
+- Update to 1.47.0:
+ * Add support for the orphan_file feature, which speeds up workloads
+that are deleting or truncating a large number files in parallel.
+This compat feature was first supported in the v5.15 Linux kernel.
+ * The mke2fs program (via the mke2fs.conf file) now enables the
+metadata_csum_seed and orphan_file features by default.
+The metadata_csum_seed feature is an incompat feature which is
+first supported in the Linux kernel starting in the 4.4 kernel.
+ * Mke2fs now supports the extended option "assume_storage_prezeroed"
+which causes mke2fs to skip zeroing the journal and inode tables
+and to mark the inode tables as zeroed.
+ * Add support to tune2fs and e2label to set the label and UUID for
+a mounted file system using a ioctl, which is more reliable than
+modifying the superblock via writing to the block device.
+The kernel support for setting the label landed in v5.17, while
+the support for adding the UUID landed in v6.0. If the ioctls
+are not supported, tune2fs and e2label will fall back old
+strategy of directly modifying the superblock.
+ * Allow tune2fs to disable the casefold feature after scanning all
+of the directories do not have the Casefold flag set.
+
+---
Old:
e2fsprogs-1.46.5.tar.sign
e2fsprogs-1.46.5.tar.xz
New:
e2fsprogs-1.47.0.tar.sign
e2fsprogs-1.47.0.tar.xz
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.X4ma6r/_old 2023-05-30 22:02:01.614863368 +0200
+++ /var/tmp/diff_new_pack.X4ma6r/_new 2023-05-30 22:02:01.618863391 +0200
@@ -32,7 +32,7 @@
License:MIT
BuildRequires: fuse-devel
%endif
-Version:1.46.5
+Version:1.47.0
Release:0
Group: System/Filesystems
URL:http://e2fsprogs.sourceforge.net
++ e2fsprogs-1.42-ext2fsh_implicit.patch ++
--- /var/tmp/diff_new_pack.X4ma6r/_old 2023-05-30 22:02:01.682863768 +0200
+++ /var/tmp/diff_new_pack.X4ma6r/_new 2023-05-30 22:02:01.702863886 +0200
@@ -2,7 +2,7 @@
===
--- lib/ext2fs/ext2fs.h.orig
+++ lib/ext2fs/ext2fs.h
-@@ -62,6 +62,7 @@ extern "C" {
+@@ -74,6 +74,7 @@ extern "C" {
#include
#include
#include
++ e2fsprogs-1.42-implicit_fortify_decl.patch ++
--- /var/tmp/diff_new_pack.X4ma6r/_old 2023-05-30 22:02:01.714863957 +0200
+++ /var/tmp/diff_new_pack.X4ma6r/_new 2023-05-30 22:02:01.718863980 +0200
@@ -2,7 +2,7 @@
===
--- lib/ext2fs/mmp.c.orig
+++ lib/ext2fs/mmp.c
-@@ -27,6 +27,13 @@
+@@ -30,6 +30,13 @@
#include "ext2fs/ext2_fs.h"
#include "ext2fs/ext2fs.h"
++ e2fsprogs-1.46.5.tar.xz -> e2fsprogs-1.47.0.tar.xz ++
/work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs-1.46.5.tar.xz
/work/SRC/openSUSE:Factory/.e2fsprogs.new.1533/e2fsprogs-1.47.0.tar.xz differ:
char 13, line 1
++ harden_e2scrub_all.service.patch ++
--- /var/tmp/diff_new_pack.X4ma6r/_old 2023-05-30 22:02:01.770864287 +0200
+++ /var/tmp/diff_new_pack.X4ma6r/_new 2023-05-30 22:02:01.778864334 +0200
@@ -1,7 +1,7 @@
-Index: e2fsprogs-1.46.3/scrub/e2scrub_all.service.in
+Index: e2fsprogs-1.47.0/scrub/e2scrub_all.service.in
===
e2fsprogs-1.46.3.orig/scrub/e2scrub_all.service.in
-+++ e2fsprogs-1.46.3/scrub/e2scrub_all.service.in
+--- e2fsprogs-1.47.0.orig/scrub/e2scrub_all.service.in
e2fsprogs-1.47.0/scrub/e2scrub_all.service.in
@@ -6,6 +6,17 @@ ConditionCapability=CAP_SYS_RAWIO
Documentation=man:e2scrub_all(8)
++ harden_e2scrub_fail@.service.patch ++
--- /var/tmp/diff_new_pack.X4ma6r/_old 2023-05-30 22:02:01.794864429 +0200
+++ /var/tmp/diff_new_pack.X4ma6r/_new 2023-05-30 22:02:01.798864452 +0200
@@ -1,7 +1,7 @@
-Index: e2fsprogs-1.46.3/scrub/e2scrub_f...@.service.in
+Index: e2fsprogs-1.47.0/scrub/e2scrub_f...@.service.in
==
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2023-01-07 17:15:41
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.1563 (New)
Package is "e2fsprogs"
Sat Jan 7 17:15:41 2023 rev:127 rq:1055823 version:1.46.5
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2022-09-17
20:08:35.796855120 +0200
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.1563/e2fsprogs.changes
2023-01-07 17:15:45.376739158 +0100
@@ -1,0 +2,5 @@
+Tue Dec 27 10:34:50 UTC 2022 - Ludwig Nussel
+
+- Replace transitional %usrmerged macro with regular version check
(boo#1206798)
+
+---
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.oL9aEC/_old 2023-01-07 17:15:46.264744456 +0100
+++ /var/tmp/diff_new_pack.oL9aEC/_new 2023-01-07 17:15:46.268744479 +0100
@@ -1,7 +1,7 @@
#
# spec file for package e2fsprogs
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -243,7 +243,7 @@
rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
mkdir %{buildroot}/sbin
ln -s %{_sbindir}/badblocks %{buildroot}/sbin/badblocks
ln -s %{_sbindir}/debugfs %{buildroot}/sbin/debugfs
@@ -326,7 +326,7 @@
%license NOTICE
%endif
%config /etc/mke2fs.conf
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
/sbin/badblocks
/sbin/debugfs
/sbin/dumpe2fs
@@ -400,7 +400,7 @@
%files -n libext2fs2
%defattr(-, root, root)
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
/%{_lib}/libext2fs.so.*
/%{_lib}/libe2p.so.*
%endif
@@ -418,7 +418,7 @@
%files -n libcom_err2
%defattr(-, root, root)
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
/%{_lib}/libcom_err.so.*
/%{_lib}/libss.so.*
%endif
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2022-09-17 20:08:29
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.2083 (New)
Package is "e2fsprogs"
Sat Sep 17 20:08:29 2022 rev:126 rq:1003776 version:1.46.5
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2022-04-23
19:45:00.206914639 +0200
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.2083/e2fsprogs.changes
2022-09-17 20:08:35.796855120 +0200
@@ -1,0 +2,19 @@
+Thu Sep 15 10:23:25 UTC 2022 - Dominique Leuenberger
+
+- Refresh e2fsprogs.keyring based on currently provided keys.
+
+---
+Wed Sep 14 14:47:43 UTC 2022 - Dominique Leuenberger
+
+- Spec file cleanup:
+ + Drop remainders regarding -mini packages, which was not a thing
+since Jan 2014.
+ + Split build of fuse2fs out into a sep build (_multibuild
+enabled).
+
+---
+Tue Sep 13 13:47:21 UTC 2022 - Christian Goll
+
+- enabled fuse2fs build which enable to mount ext2/3/4 via FUSE
+
+---
New:
_multibuild
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.6DsXx3/_old 2022-09-17 20:08:37.120858940 +0200
+++ /var/tmp/diff_new_pack.6DsXx3/_new 2022-09-17 20:08:37.124858951 +0200
@@ -16,23 +16,52 @@
#
-%define build_mini 0
+%define flavor @BUILD_FLAVOR@%nil
+%if "%{flavor}" == ""
Name: e2fsprogs
+Summary:Utilities for the Second Extended File System
+License:GPL-2.0-only
%if 0%{?suse_version} >= 1010
# Hint for ZYPP
Supplements:filesystem(ext2) filesystem(ext3) filesystem(ext4)
%endif
-%if 0%{?suse_version} >= 1210
-%bcond_without systemd
%else
-%bcond_with systemd
+Name: fuse2fs
+Summary:FUSE file system client for ext2/ext3/ext4 file systems
+License:MIT
+BuildRequires: fuse-devel
%endif
+Version:1.46.5
+Release:0
+Group: System/Filesystems
+URL:http://e2fsprogs.sourceforge.net
+Source:
http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.xz
+Source2:README.SUSE
+Source3:baselibs.conf
+Source4:
http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.sign
+Source5:https://thunk.org/tytso/tytso-key.asc#/e2fsprogs.keyring
+#
+# e2fsprogs patches
+#
+# libcom_err patches
+Patch3: libcom_err-compile_et_permissions.patch
+Patch4: e2fsprogs-1.42-implicit_fortify_decl.patch
+Patch5: e2fsprogs-1.42-ext2fsh_implicit.patch
+Patch6: harden_e2scrub@.service.patch
+Patch7: harden_e2scrub_all.service.patch
+Patch8: harden_e2scrub_fail@.service.patch
+Patch9: harden_e2scrub_reap.service.patch
BuildRequires: libblkid-devel
BuildRequires: libuuid-devel
BuildRequires: pkg-config
BuildRequires: xz
-%if ! %{build_mini}
+%if "%{flavor}" == ""
+%if 0%{?suse_version} >= 1210
+%bcond_without systemd
+%else
+%bcond_with systemd
+%endif
%if 0%{?suse_version} > 1220
BuildRequires: makeinfo
%endif
@@ -44,55 +73,16 @@
Requires(post): %install_info_prereq
Requires(preun):%install_info_prereq
%endif
-%endif
# bug437293
%ifarch ppc64
Obsoletes: e2fsprogs-64bit
%endif
-
-%if %{build_mini}
-Conflicts: e2fsprogs
-Conflicts: e2fsprogs-devel
-Conflicts: libcom_err-devel
-Conflicts: libcom_err2
-Conflicts: libext2fs-devel
-Conflicts: libext2fs2
-%else
-Conflicts: e2fsprogs-mini
-Conflicts: e2fsprogs-mini-devel
-Conflicts: libcom_err-mini-devel
-Conflicts: libcom_err2-mini
-Conflicts: libext2fs-mini-devel
-Conflicts: libext2fs2-mini
-%endif
#
-Version:1.46.5
-Release:0
-Summary:Utilities for the Second Extended File System
-License:GPL-2.0-only
-Group: System/Filesystems
-URL:http://e2fsprogs.sourceforge.net
# For regenerate_initrd_post macro
Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires: libcom_err2 >= %{version}
Requires: libext2fs2 >= %{version}
Suggests: e2fsprogs-scrub
-Source:
http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.xz
-Source2:README.SUSE
-Source3:baselibs.conf
-Source4:
http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.sign
-Source5:https://thunk.org/tytso/tytso-key.asc#/%{n
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2022-04-23 19:44:54
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.1538 (New)
Package is "e2fsprogs"
Sat Apr 23 19:44:54 2022 rev:125 rq:971034 version:1.46.5
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2022-02-05
23:23:05.695960917 +0100
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.1538/e2fsprogs.changes
2022-04-23 19:45:00.206914639 +0200
@@ -1,0 +2,5 @@
+Tue Apr 19 20:51:15 UTC 2022 - Dirk M??ller
+
+- avoid empty preuninstall script
+
+---
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.KaV2Fl/_old 2022-04-23 19:45:00.866915424 +0200
+++ /var/tmp/diff_new_pack.KaV2Fl/_new 2022-04-23 19:45:00.870915429 +0200
@@ -42,7 +42,7 @@
%define install_info sbin/install-info
%define install_info_delete sbin/install-info --delete
Requires(post): %install_info_prereq
-Requires(preun): %install_info_prereq
+Requires(preun):%install_info_prereq
%endif
%endif
# bug437293
@@ -53,17 +53,17 @@
%if %{build_mini}
Conflicts: e2fsprogs
Conflicts: e2fsprogs-devel
-Conflicts: libext2fs2
-Conflicts: libext2fs-devel
-Conflicts: libcom_err2
Conflicts: libcom_err-devel
+Conflicts: libcom_err2
+Conflicts: libext2fs-devel
+Conflicts: libext2fs2
%else
Conflicts: e2fsprogs-mini
Conflicts: e2fsprogs-mini-devel
-Conflicts: libext2fs2-mini
-Conflicts: libext2fs-mini-devel
-Conflicts: libcom_err2-mini
Conflicts: libcom_err-mini-devel
+Conflicts: libcom_err2-mini
+Conflicts: libext2fs-mini-devel
+Conflicts: libext2fs2-mini
%endif
#
Version:1.46.5
@@ -120,6 +120,7 @@
%if %{build_mini}
%package -n e2fsprogs-scrub-mini
%else
+
%package -n e2fsprogs-scrub
%endif
Summary:Ext2fs scrubbing scripts and service files
@@ -141,6 +142,7 @@
%if %{build_mini}
%package -n libext2fs2-mini
%else
+
%package -n libext2fs2
%endif
Summary:Ext2fs library
@@ -150,6 +152,7 @@
%if %{build_mini}
%description -n libext2fs2-mini
%else
+
%description -n libext2fs2
%endif
The basic Ext2fs shared library.
@@ -157,6 +160,7 @@
%if %{build_mini}
%package -n libext2fs-mini-devel
%else
+
%package -n libext2fs-devel
%endif
Summary:Development files for libext2fs
@@ -168,6 +172,7 @@
%if %{build_mini}
%description -n libext2fs-mini-devel
%else
+
%description -n libext2fs-devel
%endif
Development files for libext2fs.
@@ -188,6 +193,7 @@
%if %{build_mini}
%package -n libcom_err2-mini
%else
+
%package -n libcom_err2
%endif
Summary:E2fsprogs error reporting library
@@ -205,6 +211,7 @@
%if %{build_mini}
%description -n libcom_err2-mini
%else
+
%description -n libcom_err2
%endif
com_err is an error message display library.
@@ -212,6 +219,7 @@
%if %{build_mini}
%package -n libcom_err-mini-devel
%else
+
%package -n libcom_err-devel
%endif
Summary:Development files for libcom_err
@@ -228,6 +236,7 @@
%if %{build_mini}
%description -n libcom_err-mini-devel
%else
+
%description -n libcom_err-devel
%endif
Development files for the com_err error message display library.
@@ -321,6 +330,7 @@
%if %{build_mini}
%pre -n e2fsprogs-scrub-mini
%else
+
%pre -n e2fsprogs-scrub
%endif
%service_add_pre e2scrub@.service e2scrub_all.service e2scrub_all.timer
e2scrub_fail@.service e2scrub_reap.service
@@ -339,6 +349,7 @@
%if %{build_mini}
%post -n e2fsprogs-scrub-mini
%else
+
%post -n e2fsprogs-scrub
%endif
%service_add_post e2scrub@.service e2scrub_all.service e2scrub_all.timer
e2scrub_fail@.service e2scrub_reap.service
@@ -348,10 +359,11 @@
%if %{build_mini}
%preun -n e2fsprogs-scrub-mini
%else
-%preun
%if 0%{?suse_version} <= 1530
+%preun
%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
@@ -367,6 +379,7 @@
%if %{build_mini}
%postun -n e2fsprogs-scrub-mini
%else
+
%postun -n e2fsprogs-scrub
%endif
%service_del_postun e2scrub@.service e2scrub_all.service e2scrub_all.timer
e2scrub_fail@.service e2scrub_reap.service
@@ -470,6 +483,7 @@
%if %{build_mini}
%files -n e2fsprogs-scrub-mini
%else
+
%files -n e2fsprogs-scrub
%endif
%defattr(-,root,root)
@@ -489,6 +503,7 @@
%if %{build_mini}
%files -n libext2fs2-mini
%else
+
%files -n libext2fs2
%endif
%defattr(-, root, root)
@@ -502,6 +517,7 @@
%if %{build_mini}
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2022-02-05 23:22:57
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.1898 (New)
Package is "e2fsprogs"
Sat Feb 5 23:22:57 2022 rev:124 rq:949729 version:1.46.5
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2021-10-20
20:22:46.733322319 +0200
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.1898/e2fsprogs.changes
2022-02-05 23:23:05.695960917 +0100
@@ -1,0 +2,22 @@
+Fri Jan 28 15:40:35 UTC 2022 - Jan Kara
+
+- Update to 1.46.5:
+ * better handling for resizing to fs sizes which would exceed inode limits
+ * fix crash in e2fsck fastcommit handling
+ * fix possibly lost quota limits when e2fsck corrects quota files
+ * fix tune2fs to properly transfer quota limits when convertion quota files
+ * add support for handling of version 0 quota files in tune2fs
+ * teach libss to use libreadline.so.8
+ * optimize resize2fs cpu usage for large filesystems
+ * teach libuuid to use getrandom() or getentropy() if available
+- libss-add-newer-libreadline.so.8-to-dlopen-path.patch: Remove, merged
upstream
+- quota-Add-support-to-version-0-quota-format.patch: Remove, merged upstream
+- quota-Fold-quota_read_all_dquots-into-quota_update_l.patch: Remove, merged
upstream
+- quota-Rename-quota_update_limits-to-quota_read_all_d.patch: Remove, merged
upstream
+- tune2fs-Fix-conversion-of-quota-files.patch: Remove, merged upstream
+- e2fsck-Do-not-trash-user-limits-when-processing-orph.patch: Remove, merged
upstream
+- debugfs-Fix-headers-for-quota-commands.patch: Remove, merged upstream
+- quota-Drop-dead-code.patch: Remove, merged upstream
+
+
+---
Old:
debugfs-Fix-headers-for-quota-commands.patch
e2fsck-Do-not-trash-user-limits-when-processing-orph.patch
e2fsprogs-1.46.4.tar.sign
e2fsprogs-1.46.4.tar.xz
libss-add-newer-libreadline.so.8-to-dlopen-path.patch
quota-Add-support-to-version-0-quota-format.patch
quota-Drop-dead-code.patch
quota-Fold-quota_read_all_dquots-into-quota_update_l.patch
quota-Rename-quota_update_limits-to-quota_read_all_d.patch
tune2fs-Fix-conversion-of-quota-files.patch
New:
e2fsprogs-1.46.5.tar.sign
e2fsprogs-1.46.5.tar.xz
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.Hg5KwJ/_old 2022-02-05 23:23:06.475955582 +0100
+++ /var/tmp/diff_new_pack.Hg5KwJ/_new 2022-02-05 23:23:06.47994 +0100
@@ -1,7 +1,7 @@
#
# spec file for package e2fsprogs
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@
Conflicts: libcom_err-mini-devel
%endif
#
-Version:1.46.4
+Version:1.46.5
Release:0
Summary:Utilities for the Second Extended File System
License:GPL-2.0-only
@@ -93,14 +93,6 @@
Patch7: harden_e2scrub_all.service.patch
Patch8: harden_e2scrub_fail@.service.patch
Patch9: harden_e2scrub_reap.service.patch
-Patch10:libss-add-newer-libreadline.so.8-to-dlopen-path.patch
-Patch11:quota-Add-support-to-version-0-quota-format.patch
-Patch12:quota-Fold-quota_read_all_dquots-into-quota_update_l.patch
-Patch13:quota-Rename-quota_update_limits-to-quota_read_all_d.patch
-Patch14:tune2fs-Fix-conversion-of-quota-files.patch
-Patch15:e2fsck-Do-not-trash-user-limits-when-processing-orph.patch
-Patch16:debugfs-Fix-headers-for-quota-commands.patch
-Patch17:quota-Drop-dead-code.patch
# Do not suppress make commands
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -269,14 +261,6 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
++ e2fsprogs-1.46.4.tar.xz -> e2fsprogs-1.46.5.tar.xz ++
/work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs-1.46.4.tar.xz
/work/SRC/openSUSE:Factory/.e2fsprogs.new.1898/e2fsprogs-1.46.5.tar.xz differ:
char 27, line 1
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package e2fsprogs for openSUSE:Factory checked in at 2021-10-20 20:22:41 Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old) and /work/SRC/openSUSE:Factory/.e2fsprogs.new.1890 (New) Package is "e2fsprogs" Wed Oct 20 20:22:41 2021 rev:123 rq:925637 version:1.46.4 Changes: --- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2021-10-08 22:04:34.408513262 +0200 +++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.1890/e2fsprogs.changes 2021-10-20 20:22:46.733322319 +0200 @@ -1,0 +2,5 @@ +Fri Oct 15 12:11:41 UTC 2021 - Johannes Segitz + +- Drop ProtectClock hardening, can cause issues if other device acceess is needed + +--- Other differences: -- ++ harden_e2scrub@.service.patch ++ --- /var/tmp/diff_new_pack.4OBcJ9/_old 2021-10-20 20:22:47.673322898 +0200 +++ /var/tmp/diff_new_pack.4OBcJ9/_new 2021-10-20 20:22:47.673322898 +0200 @@ -2,14 +2,13 @@ === --- e2fsprogs-1.46.4.orig/scrub/e2sc...@.service.in +++ e2fsprogs-1.46.4/scrub/e2sc...@.service.in -@@ -10,6 +10,15 @@ PrivateNetwork=true +@@ -10,6 +10,14 @@ PrivateNetwork=true ProtectSystem=true ProtectHome=read-only PrivateTmp=yes +# added automatically, for details please see +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort +ProtectHostname=true -+ProtectClock=true +ProtectKernelTunables=true +ProtectKernelLogs=true +ProtectControlGroups=true ++ harden_e2scrub_all.service.patch ++ --- /var/tmp/diff_new_pack.4OBcJ9/_old 2021-10-20 20:22:47.681322904 +0200 +++ /var/tmp/diff_new_pack.4OBcJ9/_new 2021-10-20 20:22:47.681322904 +0200 @@ -2,7 +2,7 @@ === --- e2fsprogs-1.46.3.orig/scrub/e2scrub_all.service.in +++ e2fsprogs-1.46.3/scrub/e2scrub_all.service.in -@@ -6,6 +6,18 @@ ConditionCapability=CAP_SYS_RAWIO +@@ -6,6 +6,17 @@ ConditionCapability=CAP_SYS_RAWIO Documentation=man:e2scrub_all(8) [Service] @@ -11,7 +11,6 @@ +ProtectSystem=full +ProtectHome=true +ProtectHostname=true -+ProtectClock=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true ++ harden_e2scrub_fail@.service.patch ++ --- /var/tmp/diff_new_pack.4OBcJ9/_old 2021-10-20 20:22:47.689322909 +0200 +++ /var/tmp/diff_new_pack.4OBcJ9/_new 2021-10-20 20:22:47.689322909 +0200 @@ -2,7 +2,7 @@ === --- e2fsprogs-1.46.3.orig/scrub/e2scrub_f...@.service.in +++ e2fsprogs-1.46.3/scrub/e2scrub_f...@.service.in -@@ -3,6 +3,18 @@ Description=Online ext4 Metadata Check F +@@ -3,6 +3,17 @@ Description=Online ext4 Metadata Check F Documentation=man:e2scrub(8) [Service] @@ -11,7 +11,6 @@ +ProtectSystem=full +ProtectHome=true +ProtectHostname=true -+ProtectClock=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true ++ harden_e2scrub_reap.service.patch ++ --- /var/tmp/diff_new_pack.4OBcJ9/_old 2021-10-20 20:22:47.697322914 +0200 +++ /var/tmp/diff_new_pack.4OBcJ9/_new 2021-10-20 20:22:47.697322914 +0200 @@ -2,14 +2,13 @@ === --- e2fsprogs-1.46.3.orig/scrub/e2scrub_reap.service.in +++ e2fsprogs-1.46.3/scrub/e2scrub_reap.service.in -@@ -11,6 +11,16 @@ PrivateNetwork=true +@@ -11,6 +11,15 @@ PrivateNetwork=true ProtectSystem=true ProtectHome=read-only PrivateTmp=yes +# added automatically, for details please see +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort +ProtectHostname=true -+ProtectClock=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2021-10-08 22:04:32
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.2443 (New)
Package is "e2fsprogs"
Fri Oct 8 22:04:32 2021 rev:122 rq:922404 version:1.46.4
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2021-09-21
21:12:20.546584338 +0200
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.2443/e2fsprogs.changes
2021-10-08 22:04:34.408513262 +0200
@@ -1,0 +2,19 @@
+Thu Sep 30 14:13:06 UTC 2021 - Jan Kara
+
+- quota-Add-support-to-version-0-quota-format.patch: quota: Add support to
+version 0 quota format (jsc#SLE-17360)
+ quota-Fold-quota_read_all_dquots-into-quota_update_l.patch: quota: Fold
+quota_read_all_dquots() into quota_update_limits() (jsc#SLE-17360)
+ quota-Rename-quota_update_limits-to-quota_read_all_d.patch: quota: Rename
+quota_update_limits() to quota_read_all_dquots() (jsc#SLE-17360)
+ tune2fs-Fix-conversion-of-quota-files.patch: tune2fs: Fix conversion of quota
+files (jsc#SLE-17360)
+ e2fsck-Do-not-trash-user-limits-when-processing-orph.patch: e2fsck: Do not
+trash user limits when processing orphan list (jsc#SLE-17360)
+ debugfs-Fix-headers-for-quota-commands.patch: debugfs: Fix headers for quota
+commands (jsc#SLE-17360)
+ quota-Drop-dead-code.patch: quota: Drop dead code (jsc#SLE-17360)
+- add these not yet released fixes to e2fsprogs package so that SLE15-SP4 ships
+ with them
+
+---
New:
debugfs-Fix-headers-for-quota-commands.patch
e2fsck-Do-not-trash-user-limits-when-processing-orph.patch
quota-Add-support-to-version-0-quota-format.patch
quota-Drop-dead-code.patch
quota-Fold-quota_read_all_dquots-into-quota_update_l.patch
quota-Rename-quota_update_limits-to-quota_read_all_d.patch
tune2fs-Fix-conversion-of-quota-files.patch
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.KSCxWq/_old 2021-10-08 22:04:35.104514407 +0200
+++ /var/tmp/diff_new_pack.KSCxWq/_new 2021-10-08 22:04:35.108514414 +0200
@@ -94,6 +94,13 @@
Patch8: harden_e2scrub_fail@.service.patch
Patch9: harden_e2scrub_reap.service.patch
Patch10:libss-add-newer-libreadline.so.8-to-dlopen-path.patch
+Patch11:quota-Add-support-to-version-0-quota-format.patch
+Patch12:quota-Fold-quota_read_all_dquots-into-quota_update_l.patch
+Patch13:quota-Rename-quota_update_limits-to-quota_read_all_d.patch
+Patch14:tune2fs-Fix-conversion-of-quota-files.patch
+Patch15:e2fsck-Do-not-trash-user-limits-when-processing-orph.patch
+Patch16:debugfs-Fix-headers-for-quota-commands.patch
+Patch17:quota-Drop-dead-code.patch
# Do not suppress make commands
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -263,6 +270,13 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
++ debugfs-Fix-headers-for-quota-commands.patch ++
>From bdcd8e7bbc374e28fa699031ad2dd83ed4bc70b4 Mon Sep 17 00:00:00 2001
From: Jan Kara
Date: Mon, 23 Aug 2021 16:44:25 +0200
Subject: [PATCH 7/8] debugfs: Fix headers for quota commands
X-Developer-Signature: v=1; a=openpgp-sha256; l=4088; h=from:subject;
bh=DMtVDsyxwY63aIschGhsYoFtaRzgKdcoj+H6ag3wBwA=;
b=owEBbQGS/pANAwAIAZydqgc/ZEDZAcsmYgBhI8GmjMKrGf+RnVrgOxdjhO+t478ULkN2q+GNTt0j
Guy1xK+JATMEAAEIAB0WIQSrWdEr1p4yirVVKBycnaoHP2RA2QUCYSPBpgAKCRCcnaoHP2RA2QAlB/
9TcSu83oYIMfsnjdrDQJRJLdaWiCSP5A5IET00b2JGlqWkSjTLUhcJUHPWq5ZB9q2hLp8z4V4DoTBT
dsDPDPqSS6PmG5jdbjU29Gz/iOmUSnNl1IDCHhO/HJwg5DA+fbwpIC1tbNfw6XpvvqpTi6yYJ6B1LP
byj3D2PLrvqQDtoxc+V90n59U/irl9HqVh6BJOBlhyYvOdbAkvunt6LIsQZvuVmjcpL+TYhcI+S6Ey
fkyC3hebYfeKTg/ZQunW3bJkhso+XRQqUPGDTU393G3SFn5lywV2pMhhupdW7Rek0BjymcqDEqyhDS
VRa3oN+/KSiVWg1qy2JAM+ErlZu5fU
X-Developer-Key: i=j...@suse.cz; a=openpgp;
fpr=93C6099A142276A28BBE35D815BC833443038D8C
list_quota and get_quota commands have 'blocks' header while what they
actually show is a used space in bytes. Fix the header to state 'space'
instead.
Signed-off-by: Jan Kara
---
debugfs/quota.c | 4 ++--
tests/f_orphquot/expect | 4 ++--
tests/f_quota/expect.0 | 12 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
Index: e2fsprogs-1.46.4/debugfs/quota.c
===
--- e2fsprogs-1.46.4.orig/debugfs/quota.c
+++ e2fsprogs-1.46.4/debugfs/quota.c
@@ -123,7 +123,7 @@ void do_list_quota(int argc, char
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2021-09-21 21:12:15
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.1899 (New)
Package is "e2fsprogs"
Tue Sep 21 21:12:15 2021 rev:121 rq:919835 version:1.46.4
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2021-08-07
17:57:18.450797898 +0200
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.1899/e2fsprogs.changes
2021-09-21 21:12:20.546584338 +0200
@@ -1,0 +2,20 @@
+Wed Sep 15 09:16:54 UTC 2021 - Jan Kara
+
+- Update to 1.46.4:
+ * Default to 256-byte inodes for all filesystems, not only larger ones
+ * Bigalloc is considered supported now for small cluster sizes
+ * E2fsck and e2image fixes for quota feature
+ * Fix mke2fs creation of filesystem into non-existent file
+- libss-add-newer-libreadline.so.8-to-dlopen-path.patch: libss: add newer
+ libreadline.so.8 to dlopen path (bsc#1189453)
+
+---
+Tue Sep 14 07:03:07 UTC 2021 - Johannes Segitz
+
+- Added hardening to systemd service(s) (bsc#1181400). Added patch(es):
+ * harden_e2scrub@.service.patch
+ * harden_e2scrub_all.service.patch
+ * harden_e2scrub_fail@.service.patch
+ * harden_e2scrub_reap.service.patch
+
+---
Old:
e2fsprogs-1.46.3.tar.sign
e2fsprogs-1.46.3.tar.xz
New:
e2fsprogs-1.46.4.tar.sign
e2fsprogs-1.46.4.tar.xz
harden_e2scrub@.service.patch
harden_e2scrub_all.service.patch
harden_e2scrub_fail@.service.patch
harden_e2scrub_reap.service.patch
libss-add-newer-libreadline.so.8-to-dlopen-path.patch
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.O9GhhB/_old 2021-09-21 21:12:21.422585328 +0200
+++ /var/tmp/diff_new_pack.O9GhhB/_new 2021-09-21 21:12:21.426585333 +0200
@@ -66,7 +66,7 @@
Conflicts: libcom_err-mini-devel
%endif
#
-Version:1.46.3
+Version:1.46.4
Release:0
Summary:Utilities for the Second Extended File System
License:GPL-2.0-only
@@ -89,6 +89,11 @@
Patch3: libcom_err-compile_et_permissions.patch
Patch4: e2fsprogs-1.42-implicit_fortify_decl.patch
Patch5: e2fsprogs-1.42-ext2fsh_implicit.patch
+Patch6: harden_e2scrub@.service.patch
+Patch7: harden_e2scrub_all.service.patch
+Patch8: harden_e2scrub_fail@.service.patch
+Patch9: harden_e2scrub_reap.service.patch
+Patch10:libss-add-newer-libreadline.so.8-to-dlopen-path.patch
# Do not suppress make commands
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -253,6 +258,11 @@
%patch4
%patch5
cp %{SOURCE2} .
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
++ e2fsprogs-1.46.3.tar.xz -> e2fsprogs-1.46.4.tar.xz ++
/work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs-1.46.3.tar.xz
/work/SRC/openSUSE:Factory/.e2fsprogs.new.1899/e2fsprogs-1.46.4.tar.xz differ:
char 27, line 1
++ harden_e2scrub@.service.patch ++
Index: e2fsprogs-1.46.4/scrub/e2sc...@.service.in
===
--- e2fsprogs-1.46.4.orig/scrub/e2sc...@.service.in
+++ e2fsprogs-1.46.4/scrub/e2sc...@.service.in
@@ -10,6 +10,15 @@ PrivateNetwork=true
ProtectSystem=true
ProtectHome=read-only
PrivateTmp=yes
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+ProtectHostname=true
+ProtectClock=true
+ProtectKernelTunables=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+# end of automatic additions
AmbientCapabilities=CAP_SYS_ADMIN CAP_SYS_RAWIO
NoNewPrivileges=yes
User=root
++ harden_e2scrub_all.service.patch ++
Index: e2fsprogs-1.46.3/scrub/e2scrub_all.service.in
===
--- e2fsprogs-1.46.3.orig/scrub/e2scrub_all.service.in
+++ e2fsprogs-1.46.3/scrub/e2scrub_all.service.in
@@ -6,6 +6,18 @@ ConditionCapability=CAP_SYS_RAWIO
Documentation=man:e2scrub_all(8)
[Service]
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectClock=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+# end of automatic additions
Type=oneshot
Environment=SERVICE_MODE=1
ExecStart=@root_sbindir@/e2scrub_all
++ harden_e2scr
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package e2fsprogs for openSUSE:Factory checked in at 2021-08-07 17:57:08 Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old) and /work/SRC/openSUSE:Factory/.e2fsprogs.new.1899 (New) Package is "e2fsprogs" Sat Aug 7 17:57:08 2021 rev:120 rq:909835 version:1.46.3 Changes: --- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2021-06-29 22:42:48.446837822 +0200 +++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.1899/e2fsprogs.changes 2021-08-07 17:57:18.450797898 +0200 @@ -1,0 +2,14 @@ +Mon Aug 2 20:47:09 UTC 2021 - Jan Kara + +- Update to 1.46.3: + * Add -V and -VV options to filefrag + * Fix fs corruption cause by resize2fs on filesystems with MMP blocks + * Fast commit portability fixes + * Fix direct IO support in Unix IO manager + * Avoid calling EXT2_IOC_[GS]ETFLAGS for block devices + * Fix mke2fs to not discard blocks beyond end of filesystem + * Make e2fsck set filetype of '.' and '..' entries + * Fix QCOW image generation in e2image for very large filesystems + * Update translations + +--- Old: e2fsprogs-1.46.2.tar.sign e2fsprogs-1.46.2.tar.xz New: e2fsprogs-1.46.3.tar.sign e2fsprogs-1.46.3.tar.xz Other differences: -- ++ e2fsprogs.spec ++ --- /var/tmp/diff_new_pack.cn6GB4/_old 2021-08-07 17:57:18.970797489 +0200 +++ /var/tmp/diff_new_pack.cn6GB4/_new 2021-08-07 17:57:18.974797485 +0200 @@ -66,7 +66,7 @@ Conflicts: libcom_err-mini-devel %endif # -Version:1.46.2 +Version:1.46.3 Release:0 Summary:Utilities for the Second Extended File System License:GPL-2.0-only ++ e2fsprogs-1.46.2.tar.xz -> e2fsprogs-1.46.3.tar.xz ++ /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs-1.46.2.tar.xz /work/SRC/openSUSE:Factory/.e2fsprogs.new.1899/e2fsprogs-1.46.3.tar.xz differ: char 26, line 1
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2021-06-29 22:42:47
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.2625 (New)
Package is "e2fsprogs"
Tue Jun 29 22:42:47 2021 rev:119 rq:902396 version:1.46.2
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2021-05-16
11:38:36.051360994 +0200
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.2625/e2fsprogs.changes
2021-06-29 22:42:48.446837822 +0200
@@ -1,0 +2,6 @@
+Wed Jun 2 08:31:22 UTC 2021 - Christophe Giboudeaux
+
+- Fix the %doc files. RELEASE-NOTES is a symlink to
+ doc/RelNotes/v%version.
+
+---
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.b44dNy/_old 2021-06-29 22:42:49.042838608 +0200
+++ /var/tmp/diff_new_pack.b44dNy/_new 2021-06-29 22:42:49.046838614 +0200
@@ -395,7 +395,7 @@
%files -f e2fsprogs.lang
%defattr(-, root, root)
-%doc RELEASE-NOTES README
+%doc doc/RelNotes/v%{version}.txt README
%if 0%{?sle_version} > 120200
%license NOTICE
%endif
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2021-05-16 11:38:34
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.2988 (New)
Package is "e2fsprogs"
Sun May 16 11:38:34 2021 rev:118 rq: version:1.46.2
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2021-05-15
23:14:52.909394893 +0200
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.2988/e2fsprogs.changes
2021-05-16 11:38:36.051360994 +0200
@@ -2,5 +1,0 @@
-Mon May 10 18:15:55 UTC 2021 - Scott Young
-
-- Added fuse2fs as a subpackage
-
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.0pIBgZ/_old 2021-05-16 11:38:36.683358258 +0200
+++ /var/tmp/diff_new_pack.0pIBgZ/_new 2021-05-16 11:38:36.687358241 +0200
@@ -246,17 +246,6 @@
Development files for the com_err error message display library. Static
libraries.
%endif
-%if ! %{build_mini}
-%package -n fuse2fs
-Summary: A FUSE file system client that supports reading and writing
ext4/3/2 filesystems.
-License: MIT
-Group: System/Filesystems
-BuildRequires: fuse-devel
-
-%description -n fuse2fs
-fuse2fs is a FUSE file system client that supports reading and writing from
devices or image files containing ext2, ext3, and ext4 file systems.
-%endif
-
%prep
%setup -q -n e2fsprogs-%{version}
# libcom_err patches
@@ -466,7 +455,6 @@
%{_mandir}/man5/mke2fs.conf.5.gz
%{_mandir}/man8/*.8.gz
-
%files devel
%defattr(-,root,root)
%doc README.SUSE
@@ -562,9 +550,4 @@
%{_libdir}/libe2p.a
%endif
-%files -n fuse2fs
-%defattr(-, root, root)
-%{_bindir}/fuse2fs
-%{_mandir}/man1/fuse2fs.1.gz
-
%changelog
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2021-05-15 23:14:51
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.2988 (New)
Package is "e2fsprogs"
Sat May 15 23:14:51 2021 rev:117 rq:892170 version:1.46.2
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2021-03-24
16:09:39.891732015 +0100
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.2988/e2fsprogs.changes
2021-05-15 23:14:52.909394893 +0200
@@ -1,0 +2,5 @@
+Mon May 10 18:15:55 UTC 2021 - Scott Young
+
+- Added fuse2fs as a subpackage
+
+---
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.tPFppQ/_old 2021-05-15 23:14:53.465392668 +0200
+++ /var/tmp/diff_new_pack.tPFppQ/_new 2021-05-15 23:14:53.465392668 +0200
@@ -246,6 +246,17 @@
Development files for the com_err error message display library. Static
libraries.
%endif
+%if ! %{build_mini}
+%package -n fuse2fs
+Summary: A FUSE file system client that supports reading and writing
ext4/3/2 filesystems.
+License: MIT
+Group: System/Filesystems
+BuildRequires: fuse-devel
+
+%description -n fuse2fs
+fuse2fs is a FUSE file system client that supports reading and writing from
devices or image files containing ext2, ext3, and ext4 file systems.
+%endif
+
%prep
%setup -q -n e2fsprogs-%{version}
# libcom_err patches
@@ -455,6 +466,7 @@
%{_mandir}/man5/mke2fs.conf.5.gz
%{_mandir}/man8/*.8.gz
+
%files devel
%defattr(-,root,root)
%doc README.SUSE
@@ -550,4 +562,9 @@
%{_libdir}/libe2p.a
%endif
+%files -n fuse2fs
+%defattr(-, root, root)
+%{_bindir}/fuse2fs
+%{_mandir}/man1/fuse2fs.1.gz
+
%changelog
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package e2fsprogs for openSUSE:Factory checked in at 2021-03-24 16:09:34 Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old) and /work/SRC/openSUSE:Factory/.e2fsprogs.new.2401 (New) Package is "e2fsprogs" Wed Mar 24 16:09:34 2021 rev:116 rq:879951 version:1.46.2 Changes: --- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2021-02-23 20:22:02.163742231 +0100 +++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.2401/e2fsprogs.changes 2021-03-24 16:09:39.891732015 +0100 @@ -1,0 +2,22 @@ +Sun Mar 14 15:25:20 UTC 2021 - Andreas Stieger + +- e2fsprogs 1.46.2: + * tune2fs -c now takes "random" argument + * Add support for the FS_NOCOMP_FL flag to chattr and lsattr + * Fix warnings when resizing small file systems to a super-large + * Fix the debugfs rdump and ls commands so they will work correctly +for uid's and gid's => 65536 + * Fix the debugfs write and symlink commands so they support +targets which contain a pathname + * Fix Direct I/O support on block devices where the logical block +size is greater 1k + * Fix debugfs's logdump so it works on file systems whose block +size is greater than 8k + * Fix a crash when there is error while e2fsck is trying to open +the file system, and e2fsck calls ext2fs_mmp_stop() before MMP +has been initialized + * Improved error checking in the fast commit replay code in e2fsck + * Fix various compiler and Coverity warnings + * Update the Spanish translation from the translation project + +--- Old: e2fsprogs-1.46.1.tar.sign e2fsprogs-1.46.1.tar.xz New: e2fsprogs-1.46.2.tar.sign e2fsprogs-1.46.2.tar.xz Other differences: -- ++ e2fsprogs.spec ++ --- /var/tmp/diff_new_pack.FfKZ0d/_old 2021-03-24 16:09:40.663732825 +0100 +++ /var/tmp/diff_new_pack.FfKZ0d/_new 2021-03-24 16:09:40.667732829 +0100 @@ -66,7 +66,7 @@ Conflicts: libcom_err-mini-devel %endif # -Version:1.46.1 +Version:1.46.2 Release:0 Summary:Utilities for the Second Extended File System License:GPL-2.0-only ++ e2fsprogs-1.46.1.tar.xz -> e2fsprogs-1.46.2.tar.xz ++ /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs-1.46.1.tar.xz /work/SRC/openSUSE:Factory/.e2fsprogs.new.2401/e2fsprogs-1.46.2.tar.xz differ: char 26, line 1
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2021-02-23 20:20:05
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.2378 (New)
Package is "e2fsprogs"
Tue Feb 23 20:20:05 2021 rev:115 rq:873456 version:1.46.1
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2021-02-04
20:21:30.154591342 +0100
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.2378/e2fsprogs.changes
2021-02-23 20:22:02.163742231 +0100
@@ -1,0 +2,33 @@
+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:
+ * 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
+
+---
Old:
e2fsprogs-1.45.2-gettext.patch
e2fsprogs-1.45.6.tar.sign
e2fsprogs-1.45.6.tar.xz
New:
e2fsprogs-1.46.1.tar.sign
e2fsprogs-1.46.1.tar.xz
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.lGDzXB/_old 2021-02-23 20:22:03.179743128 +0100
+++ /var/tmp/diff_new_pack.lGDzXB/_new 2021-02-23 20:22:03.179743128 +0100
@@ -28,8 +28,6 @@
%else
%bcond_with systemd
%endif
-BuildRequires: autoconf
-BuildRequires: automake
BuildRequires: libblkid-devel
BuildRequires: libuuid-devel
BuildRequires: pkg-config
@@ -68,7 +66,7 @@
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 +89,6 @@
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,14 +252,10 @@
%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
-autoreconf --force --install
%configure \
--with-root-prefix='' \
--enable-elf-shlibs \
@@ -329,7 +321,9 @@
%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 +341,9 @@
%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
++ e2fsprogs-1.45.6.tar.xz -> e2fsprogs-1.46.1.tar.xz ++
/work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs-1.45.6.tar.xz
/work/SRC/openSUSE:Factory/.e2fsprogs.new.2378/e2fsprogs-1.46.1.tar.xz differ:
char 8, line 1
commit e2fsprogs for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2021-02-04 20:21:29
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.28504 (New)
Package is "e2fsprogs"
Thu Feb 4 20:21:29 2021 rev:114 rq:868690 version:1.45.6
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2020-11-26
23:08:54.344800517 +0100
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.28504/e2fsprogs.changes
2021-02-04 20:21:30.154591342 +0100
@@ -1,0 +2,6 @@
+Thu Jan 28 15:02:08 UTC 2021 - Thorsten Kukuk
+
+- Fix usage of info macros on openSUSE, we use file triggers today
+- Use file requires for post section
+
+---
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.LIt1j0/_old 2021-02-04 20:21:30.986592608 +0100
+++ /var/tmp/diff_new_pack.LIt1j0/_new 2021-02-04 20:21:30.990592615 +0100
@@ -1,7 +1,7 @@
#
# spec file for package e2fsprogs
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -39,14 +39,14 @@
BuildRequires: makeinfo
%endif
# Define info macros if missing (for Fedora builds)
-%if 0%{!?%install_info_prereq:1}
+%if ! 0%{?suse_version}
%define install_info_prereq info
%define install_info sbin/install-info
%define install_info_delete sbin/install-info --delete
-%endif
Requires(post): %install_info_prereq
Requires(preun): %install_info_prereq
%endif
+%endif
# bug437293
%ifarch ppc64
Obsoletes: e2fsprogs-64bit
@@ -74,7 +74,8 @@
License:GPL-2.0-only
Group: System/Filesystems
URL:http://e2fsprogs.sourceforge.net
-Requires(post): coreutils
+# For regenerate_initrd_post macro
+Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires: libcom_err2 >= %{version}
Requires: libext2fs2 >= %{version}
Suggests: e2fsprogs-scrub
[opensuse-commit] commit e2fsprogs for openSUSE:Factory
Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at 2020-11-26 23:08:51
Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old)
and /work/SRC/openSUSE:Factory/.e2fsprogs.new.5913 (New)
Package is "e2fsprogs"
Thu Nov 26 23:08:51 2020 rev:113 rq:849645 version:1.45.6
Changes:
--- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2020-05-11
13:25:39.655143809 +0200
+++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.5913/e2fsprogs.changes
2020-11-26 23:08:54.344800517 +0100
@@ -1,0 +2,5 @@
+Thu Oct 29 10:31:32 UTC 2020 - Ludwig Nussel
+
+- prepare usrmerge (boo#1029961)
+
+---
Other differences:
--
++ e2fsprogs.spec ++
--- /var/tmp/diff_new_pack.PViZav/_old 2020-11-26 23:08:55.232801391 +0100
+++ /var/tmp/diff_new_pack.PViZav/_new 2020-11-26 23:08:55.232801391 +0100
@@ -287,7 +287,7 @@
rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
-#UsrMerge
+%if !0%{?usrmerged}
mkdir %{buildroot}/sbin
ln -s %{_sbindir}/badblocks %{buildroot}/sbin/badblocks
ln -s %{_sbindir}/debugfs %{buildroot}/sbin/debugfs
@@ -314,7 +314,7 @@
for libName in $LIBNAMES;
do ln -s %{_libdir}/$libName %{buildroot}/%{_lib};
done
-#EndUsrMerge
+%endif
%if %{with systemd}
%if %{build_mini}
@@ -403,7 +403,7 @@
%license NOTICE
%endif
%config /etc/mke2fs.conf
-#UsrMerge
+%if !0%{?usrmerged}
/sbin/badblocks
/sbin/debugfs
/sbin/dumpe2fs
@@ -422,7 +422,7 @@
/sbin/tune2fs
/sbin/e2image
/sbin/logsave
-#EndUsrMerge
+%endif
%{_sbindir}/badblocks
%{_sbindir}/debugfs
%{_sbindir}/dumpe2fs
@@ -487,10 +487,10 @@
%files -n libext2fs2
%endif
%defattr(-, root, root)
-#UsrMerge
+%if !0%{?usrmerged}
/%{_lib}/libext2fs.so.*
/%{_lib}/libe2p.so.*
-#EndUsrMerge
+%endif
%{_libdir}/libext2fs.so.*
%{_libdir}/libe2p.so.*
@@ -513,10 +513,10 @@
%files -n libcom_err2
%endif
%defattr(-, root, root)
-#UsrMerge
+%if !0%{?usrmerged}
/%{_lib}/libcom_err.so.*
/%{_lib}/libss.so.*
-#EndUsrMerge
+%endif
%{_libdir}/libcom_err.so.*
%{_libdir}/libss.so.*
___
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
