Skip to content

Commit

Permalink
Added uncompress requirement
Browse files Browse the repository at this point in the history
Having an old enough version of "file" and no "uncompress" program
installed can cause rpmbuild as root to crash and mangle rpmdb.

So let's add a build dependency for RPM-based systems.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes: #12071
Closes: #12168
  • Loading branch information
rincebrain authored and behlendorf committed Jun 15, 2021
1 parent af4b6f7 commit a416b29
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 0 deletions.
7 changes: 7 additions & 0 deletions rpm/generic/zfs-dkms.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ Obsoletes: spl-dkms
Provides: %{module}-kmod = %{version}
AutoReqProv: no

%if 0%{?rhel}%{?fedora}%{?suse_version}
# We don't directly use it, but if this isn't installed, rpmbuild as root can
# crash+corrupt rpmdb
# See issue #12071
BuildRequires: ncompress
%endif

%description
This package contains the dkms ZFS kernel modules.

Expand Down
7 changes: 7 additions & 0 deletions rpm/generic/zfs-kmod.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ BuildRequires: gcc, make
BuildRequires: elfutils-libelf-devel
%endif

%if 0%{?rhel}%{?fedora}%{?suse_version}
# We don't directly use it, but if this isn't installed, rpmbuild as root can
# crash+corrupt rpmdb
# See issue #12071
BuildRequires: ncompress
%endif

# The developments headers will conflict with the dkms packages.
Conflicts: %{module}-dkms

Expand Down
5 changes: 5 additions & 0 deletions rpm/generic/zfs.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,14 @@ BuildRequires: libblkid-devel
BuildRequires: libudev-devel
BuildRequires: libattr-devel
BuildRequires: openssl-devel
# We don't directly use it, but if this isn't installed, rpmbuild as root can
# crash+corrupt rpmdb
# See issue #12071
BuildRequires: ncompress
%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 || 0%{?centos} >= 8
BuildRequires: libtirpc-devel
%endif

Requires: openssl
%if 0%{?_systemd}
BuildRequires: systemd
Expand Down

0 comments on commit a416b29

Please sign in to comment.