Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

e2fsprogs: 1.46.5 -> 1.46.6 #214676

Merged
merged 1 commit into from
Mar 4, 2023
Merged

e2fsprogs: 1.46.5 -> 1.46.6 #214676

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions pkgs/tools/filesystems/e2fsprogs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

stdenv.mkDerivation rec {
pname = "e2fsprogs";
version = "1.46.5";
version = "1.46.6";

src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1fgvwbj9ihz5svzrd2l0s18k16r4qg3wimrniv71fn3vdcg0shxp";
hash = "sha256-vy/MfuUXj+c6MFf34qo/5S6Yt7tGFQnGewIboA+Uxvc=";
};

# fuse2fs adds 14mb of dependencies
Expand All @@ -23,11 +23,6 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isLinux [ fuse ];

patches = [
(fetchpatch {
name = "CVE-2022-1304.patch";
url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/patch/?id=ab51d587bb9b229b1fade1afd02e1574c1ba5c76";
sha256 = "sha256-YEEow34/81NBOc6F6FS6i505FCQ7GHeIz0a0qWNs7Fg=";
})
(fetchpatch { # avoid using missing __GNUC_PREREQ(X,Y)
url = "https://raw.githubusercontent.com/void-linux/void-packages/9583597eb3e6e6b33f61dbc615d511ce030bc443/srcpkgs/e2fsprogs/patches/fix-glibcism.patch";
sha256 = "1gfcsr0i3q8q2f0lqza8na0iy4l4p3cbii51ds6zmj0y4hz2dwhb";
Expand All @@ -36,14 +31,6 @@ stdenv.mkDerivation rec {
})
];

postPatch = ''
# Remove six failing tests
# https://github.com/NixOS/nixpkgs/issues/65471
for test in m_image_mmp m_mmp m_mmp_bad_csum m_mmp_bad_magic t_mmp_1on t_mmp_2off; do
rm -r "tests/$test"
done
'';

configureFlags =
if stdenv.isLinux then [
# It seems that the e2fsprogs is one of the few packages that cannot be
Expand Down