diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix index 7a96ba52479a..07f2c3d67e26 100644 --- a/pkgs/by-name/in/inetutils/package.nix +++ b/pkgs/by-name/in/inetutils/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch - ./tests-libls.sh.patch + (if stdenv.isDarwin then ./tests-libls-2.sh.patch else ./tests-libls.sh.patch) (fetchpatch { name = "CVE-2026-24061_1.patch"; @@ -77,7 +77,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-servers"; - hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "format"; + ${if stdenv.isDarwin then "hardeningDisable" else null} = [ "format" ]; + doCheck = true; installFlags = [ "SUIDMODE=" ]; diff --git a/pkgs/by-name/in/inetutils/tests-libls-2.sh.patch b/pkgs/by-name/in/inetutils/tests-libls-2.sh.patch new file mode 100644 index 000000000000..41c566811cac --- /dev/null +++ b/pkgs/by-name/in/inetutils/tests-libls-2.sh.patch @@ -0,0 +1,18 @@ +tests: Remove bogus test for unsorted file listing and tests for -u and -c, which fail on apfs. + +Minimized from what Debian applies: +https://git.hadrons.org/cgit/debian/pkgs/inetutils.git/tree/debian/patches/local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch?id=8ab7f49fe5cf194e989ae6ae6a78eb65397c5778 +--- a/tests/libls.sh ++++ b/tests/libls.sh +@@ -94 +93,0 @@ REPLY_C=`$LS -C $LSDIR` +-REPLY_Cf=`$LS -Cf $LSDIR` +@@ -108,2 +106,0 @@ REPLY_n=`$LS -n $LSDIR` +-REPLY_Ccts=`$LS -Ccts $LSDIR` +-REPLY_Cuts=`$LS -Cuts $LSDIR` +@@ -133,2 +129,0 @@ test `echo "$diff" | $GREP -c -v '^[.]\{1,2\}$'` -eq 0 || +-test x"$REPLY_C" != x"$REPLY_Cf" || +- { errno=1; echo >&2 'Failed to disable sorting with "-f".'; } +@@ -153,3 +146,0 @@ test x"$REPLY_l" != x"$REPLY_n" || +-test x"$REPLY_Ccts" != x"$REPLY_Cuts" || +- { errno=1; echo >&2 'Failed to distinguish "-u" from "-c".'; } +- diff --git a/pkgs/by-name/in/inetutils/tests-libls.sh.patch b/pkgs/by-name/in/inetutils/tests-libls.sh.patch index 41c566811cac..d3fc7c68fae5 100644 --- a/pkgs/by-name/in/inetutils/tests-libls.sh.patch +++ b/pkgs/by-name/in/inetutils/tests-libls.sh.patch @@ -1,18 +1,12 @@ -tests: Remove bogus test for unsorted file listing and tests for -u and -c, which fail on apfs. +tests: Remove bogus test for unsorted file listing Minimized from what Debian applies: https://git.hadrons.org/cgit/debian/pkgs/inetutils.git/tree/debian/patches/local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch?id=8ab7f49fe5cf194e989ae6ae6a78eb65397c5778 --- a/tests/libls.sh +++ b/tests/libls.sh -@@ -94 +93,0 @@ REPLY_C=`$LS -C $LSDIR` +@@ -91,1 +91,0 @@ -REPLY_Cf=`$LS -Cf $LSDIR` -@@ -108,2 +106,0 @@ REPLY_n=`$LS -n $LSDIR` --REPLY_Ccts=`$LS -Ccts $LSDIR` --REPLY_Cuts=`$LS -Cuts $LSDIR` -@@ -133,2 +129,0 @@ test `echo "$diff" | $GREP -c -v '^[.]\{1,2\}$'` -eq 0 || +@@ -130,3 +129,0 @@ -test x"$REPLY_C" != x"$REPLY_Cf" || - { errno=1; echo >&2 'Failed to disable sorting with "-f".'; } -@@ -153,3 +146,0 @@ test x"$REPLY_l" != x"$REPLY_n" || --test x"$REPLY_Ccts" != x"$REPLY_Cuts" || -- { errno=1; echo >&2 'Failed to distinguish "-u" from "-c".'; } -