From fdca54f1a1b2db72f4e8730be95ed1ffcfb0b489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 4 Feb 2023 20:32:25 -0800 Subject: [PATCH] e2fsprogs: 1.46.5 -> 1.46.6 Changelog: https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.6 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 22872214526e..a1a2b812a866 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -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 @@ -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"; @@ -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