BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

e2fsprogs: 1.46.5 -> 1.46.6

Browse source 
Changelog: https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.6
This commit is contained in:
Robert Schütz 2023-02-04 20:32:25 -08:00
parent 19ad2a2b84
commit fdca54f1a1
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/tools/filesystems/e2fsprogs/default.nix
View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "e2fsprogs"; pname = "e2fsprogs";
version = "1.46.5"; version = "1.46.6";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1fgvwbj9ihz5svzrd2l0s18k16r4qg3wimrniv71fn3vdcg0shxp"; hash = "sha256-vy/MfuUXj+c6MFf34qo/5S6Yt7tGFQnGewIboA+Uxvc=";
}; };
# fuse2fs adds 14mb of dependencies # fuse2fs adds 14mb of dependencies
@ -23,11 +23,6 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isLinux [ fuse ]; ++ lib.optionals stdenv.isLinux [ fuse ];
patches = [ 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) (fetchpatch { # avoid using missing __GNUC_PREREQ(X,Y)
url = "https://raw.githubusercontent.com/void-linux/void-packages/9583597eb3e6e6b33f61dbc615d511ce030bc443/srcpkgs/e2fsprogs/patches/fix-glibcism.patch"; url = "https://raw.githubusercontent.com/void-linux/void-packages/9583597eb3e6e6b33f61dbc615d511ce030bc443/srcpkgs/e2fsprogs/patches/fix-glibcism.patch";
sha256 = "1gfcsr0i3q8q2f0lqza8na0iy4l4p3cbii51ds6zmj0y4hz2dwhb"; 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 = configureFlags =
if stdenv.isLinux then [ if stdenv.isLinux then [
# It seems that the e2fsprogs is one of the few packages that cannot be # It seems that the e2fsprogs is one of the few packages that cannot be