guix_mirror_bot pushed a commit to branch sysadmin-team in repository guix.
commit d340a42f1149b60a1993ba19bed6b45ea96796b7 Author: Dariqq <[email protected]> AuthorDate: Mon Jun 15 13:52:57 2026 +0000 gnu: inetutils: Update to 2.8. * gnu/packages/patches/inetutils-drop-test.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Deregister it. * gnu/packages/admin.scm (inetutils): Update to 2.8. [source]<patches>: Remove the deleted patch. Merges: https://codeberg.org/guix/guix/pulls/9318 Signed-off-by: Nguyễn Gia Phong <[email protected]> --- gnu/local.mk | 1 - gnu/packages/admin.scm | 5 ++--- gnu/packages/patches/inetutils-drop-test.patch | 26 -------------------------- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 903bcdcf0b..0cad5fe39c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1670,7 +1670,6 @@ dist_patch_DATA = \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ - %D%/packages/patches/inetutils-drop-test.patch \ %D%/packages/patches/inferno-fix-crash.patch \ %D%/packages/patches/iniparser-remove-fetchcontent-usage.patch \ %D%/packages/patches/inkscape-libxml2.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 75bf214cb3..c19c1ab958 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1283,15 +1283,14 @@ re-executing them as necessary.") (define-public inetutils (package (name "inetutils") - (version "2.7") + (version "2.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/inetutils/inetutils-" version ".tar.gz")) (sha256 (base32 - "11n01vsd51r7qraaaylhhx04hq4s6vcq0896zkz0yp1wvqfbwmm1")) - (patches (search-patches "inetutils-drop-test.patch")))) + "1dchhf9lapsv63a0x9j2cg2s4nmhcfda18jv3s494namfx7wzcsp")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/patches/inetutils-drop-test.patch b/gnu/packages/patches/inetutils-drop-test.patch deleted file mode 100644 index 3e1c79fe35..0000000000 --- a/gnu/packages/patches/inetutils-drop-test.patch +++ /dev/null @@ -1,26 +0,0 @@ -To be remove when updating inetutils. -See -https://cgit.git.savannah.gnu.org/cgit/inetutils.git/commit/?id=556621adc3dcb62dbb28c54905cef15837947115 -https://codeberg.org/guix/guix/issues/7995 - -diff --git a/tests/libls.sh b/tests/libls.sh -index 827020f2..9fdef8be 100755 ---- a/tests/libls.sh -+++ b/tests/libls.sh -@@ -91,7 +91,6 @@ REPLY_a1=`$LS -a1 $LSDIR` - REPLY_A1=`$LS -A1 $LSDIR` - - REPLY_C=`$LS -C $LSDIR` --REPLY_Cf=`$LS -Cf $LSDIR` - REPLY_Cr=`$LS -Cr $LSDIR` - REPLY_Ct=`$LS -Ct $LSDIR` - REPLY_x=`$LS -x $LSDIR` -@@ -130,9 +129,6 @@ test `echo "$diff" | $GREP -c -v '^[.]\{1,2\}$'` -eq 0 || - fi - } - --test x"$REPLY_C" != x"$REPLY_Cf" || -- { errno=1; echo >&2 'Failed to disable sorting with "-f".'; } -- - test x"$REPLY_C" != x"$REPLY_Cr" || - { errno=1; echo >&2 'Failed to reverse sorting with "-r".'; }
