rpms/e2fsprogs
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Rebase to new upstream

Browse Source 
Resolves: RHEL-44938

Remove stale patch from the package

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
This commit is contained in:
Carlos Maiolino 2024-06-25 14:21:17 +02:00
parent 19b3b6b2ee
commit 70d99e203b
4 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -53,3 +53,5 @@ e2fsprogs-1.41.12.tar.gz
/e2fsprogs-1.46.5.tar.sign
/e2fsprogs-1.47.0.tar.sign
/e2fsprogs-1.47.0.tar.xz
/e2fsprogs-1.47.1.tar.xz
/e2fsprogs-1.47.1.tar.sign

26
0001-remove-local-PATH.patch
View File

@ -1,26 +0,0 @@
Index: e2fsprogs-1.45.6/scrub/e2scrub.in
===================================================================
--- e2fsprogs-1.45.6.orig/scrub/e2scrub.in
+++ e2fsprogs-1.45.6/scrub/e2scrub.in
@@ -23,7 +23,7 @@
# check filesystems in VGs that have at least 256MB (or so) of
# free space.
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
if (( $EUID != 0 )); then
echo "e2scrub must be run as root"
Index: e2fsprogs-1.45.6/scrub/e2scrub_all.in
===================================================================
--- e2fsprogs-1.45.6.orig/scrub/e2scrub_all.in
+++ e2fsprogs-1.45.6/scrub/e2scrub_all.in
@@ -18,7 +18,7 @@
# along with this program; if not, write the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
if (( $EUID != 0 )); then
echo "e2scrub_all must be run as root"

20
e2fsprogs.spec
View File

@ -1,7 +1,7 @@
Summary: Utilities for managing ext2, ext3, and ext4 file systems
Name: e2fsprogs
Version: 1.47.0
Release: 6%{?dist}
Version: 1.47.1
Release: 1%{?dist}
# License tags based on COPYING file distinctions for various components
License: GPLv2
@ -26,7 +26,7 @@ Provides: e4fsprogs = %{version}-%{release}
%endif
BuildRequires: pkgconfig, texinfo, libselinux-devel, gcc
BuildRequires: fuse-devel
BuildRequires: fuse3-devel
BuildRequires: libsepol-devel
BuildRequires: libblkid-devel
BuildRequires: libuuid-devel
@ -38,8 +38,6 @@ BuildRequires: make
# For gpg verifying the source tarball
BuildRequires: gnupg2 xz
Patch0: 0001-remove-local-PATH.patch
%description
The e2fsprogs package contains a number of utilities for creating,
checking, modifying, and correcting any inconsistencies in second,
@ -168,7 +166,6 @@ managed device with some free space available in respective volume group.
xzcat '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=-
%setup -q
%patch0 -p1
# Remove flawed tests
rm -rf tests/m_rootdir_acl
@ -271,8 +268,7 @@ make PRINT_FAILED=yes fullcheck
%{_mandir}/man8/resize2fs.8*
%{_mandir}/man8/tune2fs.8*
# We do not install e2scrub cron job so just exclude it
%exclude %{_libdir}/e2fsprogs/e2scrub_all_cron
%{_udevrulesdir}/64-ext4.rules
%files libs
%{!?_licensedir:%global license %%doc}
@ -329,7 +325,7 @@ make PRINT_FAILED=yes fullcheck
%{_sbindir}/e2scrub_all
%{_mandir}/man8/e2scrub.8*
%{_mandir}/man8/e2scrub_all.8*
%{_libdir}/e2fsprogs/e2scrub_fail
%{_libexecdir}/e2fsprogs/e2scrub_fail
%{_unitdir}/e2scrub@.service
%{_unitdir}/e2scrub_all.service
%{_unitdir}/e2scrub_all.timer
@ -338,10 +334,14 @@ make PRINT_FAILED=yes fullcheck
%{_udevdir}/96-e2scrub.rules
%changelog
* Tue Jun 25 2024 Carlos Maiolino <cmaiolino@redhat.com> - 1.47.1-1
- Rebase to new upstream
- Remove stale patch from the package
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.47.0-6
- Bump release for June 2024 mass rebuild
* Fri Feb 09 2023 Brian J. Murrell <brian@interlinx.bc.ca> - 1.47.0-5
* Fri Feb 09 2024 Brian J. Murrell <brian@interlinx.bc.ca> - 1.47.0-5
- Recommends: /usr/sbin/sendmail rather than sendmail as many packages
can provide a /usr/sbin/sendmail command

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (e2fsprogs-1.47.0.tar.sign) = 435de7fcb422c4c18ad552fd3bc2e3a46e77197dddc10f295bd3de652df29e593d6dae1f9e72306b20a9491bcb5e2decc539af63a307f67a5488e4ec3be9c770
SHA512 (e2fsprogs-1.47.0.tar.xz) = 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec
SHA512 (e2fsprogs-1.47.1.tar.xz) = 2ac51f7654a44adf3ee5a5e32cecd7f129e423bdf3074c60b22a7acdba131e7dd0bb2964c107a06ae133f51836272be166f5da1f996f67ceb6c22e2636117beb
SHA512 (e2fsprogs-1.47.1.tar.sign) = 35461f3e3a024cff7ad9b26cd7b76f9b061c48b335bb005d1e86cc3834950779750db901ce0c84e608f0cb74744e4052205dd3c5e06a57f52c17f3784bc00bf8