New upstream release 1.45.2

Notable change: added e2scrub unit files and udev rules.
Remove unused Makefile

Signed-off-by: Lukas Czerner <lczerner@redhat.com>

.gitignore

@@ -38,3 +38,5 @@ e2fsprogs-1.41.12.tar.gz
 /e2fsprogs-1.44.5.tar.xz
 /e2fsprogs-1.44.6.tar.xz
 /e2fsprogs-1.45.0.tar.xz
+/e2fsprogs-1.45.1.tar.xz
+/e2fsprogs-1.45.2.tar.xz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: e2fsprogs
-# $Id$
-NAME := e2fsprogs
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

e2fsprogs.spec

@@ -1,6 +1,6 @@
 Summary: Utilities for managing ext2, ext3, and ext4 file systems
 Name: e2fsprogs
-Version: 1.45.0
+Version: 1.45.2
 Release: 1%{?dist}
 
 # License tags based on COPYING file distinctions for various components
@@ -25,6 +25,7 @@ BuildRequires: libblkid-devel
 BuildRequires: libuuid-devel
 BuildRequires: gettext
 BuildRequires: multilib-rpm-config
+BuildRequires: systemd
 
 %description
 The e2fsprogs package contains a number of utilities for creating,
@@ -131,14 +132,35 @@ parses a command table to generate a simple command-line interface parser.
 
 It was originally inspired by the Multics SubSystem library.
 
+%package -n e2scrub
+Summary: Online Ext4 metadata consistency checking tool and service
+License: GPLv2 and LGPLv2
+Recommends: sendmail
+Requires: systemd
+Requires: util-linux
+Requires: lvm2
+Requires: e2fsprogs%{?_isa} = %{version}-%{release}
+
+%description -n e2scrub
+This package includes e2scrub script that can check ext[234] file system
+metadata consistency while the file system is online. It also containes a
+systemd service that can be enabled to do consistency check periodically.
+
+The file system consistency check can be performed online and does not
+require the file system to be unmounted. It uses lvm snapshots to do this
+which means that it can only be done on file systems that are on a lvm
+managed device with some free space available in respective volume group.
+
 %prep
 %setup -q
 
+%global _udevdir %{_prefix}/lib/udev/rules.d
+
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
 	   --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
 	   --disable-e2initrd-helper --disable-libblkid --disable-libuuid \
-	   --enable-quota --with-root-prefix=/usr
+	   --enable-quota --with-root-prefix=/usr --with-crond-dir=no
 make V=1 %{?_smp_mflags}
 
 %install
@@ -165,11 +187,11 @@ make fullcheck
 %ldconfig_scriptlets -n libss
 
 %files -f %{name}.lang
-%doc README RELEASE-NOTES
+%doc README
 %{!?_licensedir:%global license %%doc}
 
-%config(noreplace) /etc/mke2fs.conf
+%config(noreplace) %{_sysconfdir}/mke2fs.conf
-%config(noreplace) /etc/e2scrub.conf
+
 %{_sbindir}/badblocks
 %{_sbindir}/debugfs
 %{_sbindir}/dumpe2fs
@@ -194,8 +216,6 @@ make fullcheck
 %{_sbindir}/e2freefrag
 %{_sbindir}/e4defrag
 %{_sbindir}/mklost+found
-%{_sbindir}/e2scrub
-%{_sbindir}/e2scrub_all
 
 %{_bindir}/chattr
 %{_bindir}/lsattr
@@ -232,10 +252,9 @@ make fullcheck
 %{_mandir}/man8/mklost+found.8*
 %{_mandir}/man8/resize2fs.8*
 %{_mandir}/man8/tune2fs.8*
-%{_mandir}/man8/e2scrub.8*
-%{_mandir}/man8/e2scrub_all.8*
 
-%{_libdir}/e2fsprogs/e2scrub_all_cron
+# We do not install e2scrub cron job so just exclude it
+%exclude %{_libdir}/e2fsprogs/e2scrub_all_cron
 
 %files libs
 %{!?_licensedir:%global license %%doc}
@@ -286,7 +305,24 @@ make fullcheck
 %{_mandir}/man1/mk_cmds.1*
 %{_libdir}/pkgconfig/ss.pc
 
+%files -n e2scrub
+%config(noreplace) %{_sysconfdir}/e2scrub.conf
+%{_sbindir}/e2scrub
+%{_sbindir}/e2scrub_all
+%{_mandir}/man8/e2scrub.8*
+%{_mandir}/man8/e2scrub_all.8*
+%{_libdir}/e2fsprogs/e2scrub_fail
+%{_unitdir}/e2scrub@.service
+%{_unitdir}/e2scrub_all.service
+%{_unitdir}/e2scrub_all.timer
+%{_unitdir}/e2scrub_fail@.service
+%{_unitdir}/e2scrub_reap.service
+%{_udevdir}/96-e2scrub.rules
+
 %changelog
+* Wed May 29 2019 Lukas Czerner <lczerner@redhat.com> - 1.45.2-1
+- New upstream release
+
 * Tue Mar 12 2019 Lukas Czerner <lczerner@redhat.com> - 1.45.0-1
 - New upstream release
 
@@ -311,7 +347,7 @@ make fullcheck
 * Tue Jul 10 2018 Lukas Czerner <lczerner@redhat.com> 1.44.3-0
 - New upstream release
 - Remove multiarch wrappers
-- Remove needless use of %defattr
+- Remove needless use of %%defattr marco
 
 * Wed Apr 04 2018 Lukas Czerner <lczerner@redhat.com> 1.44.1-1
 - New upstream release
@@ -323,7 +359,7 @@ make fullcheck
 
 * Mon Mar 12 2018 Lukas Czerner <lczerner@redhat.com> 1.44.0-2
 - e2fsck: fix endianness problem when reading htree nodes
-- use make fullcheck in %check section to run all the tests
+- use make fullcheck in %%check section to run all the tests
 
 * Thu Mar 08 2018 Lukas Czerner <lczerner@redhat.com> 1.44.0-1
 - New upstream release

sources

@@ -1 +1 @@
-SHA512 (e2fsprogs-1.45.0.tar.xz) = 208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014
+SHA512 (e2fsprogs-1.45.2.tar.xz) = 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e