Merge #256880: indent: 2.2.12 -> 2.2.13, patch CVE-2023-40305

...into staging-next

pkgs/development/tools/misc/indent/darwin.patch

@@ -1,15 +0,0 @@
-diff --git a/config.h.in b/config.h.in
-index 07e6fce..0c57e2a 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -432,8 +432,8 @@
- # endif
- # define _GL_EXTERN_INLINE extern
- #else
--# define _GL_INLINE static _GL_UNUSED
--# define _GL_EXTERN_INLINE static _GL_UNUSED
-+# define _GL_INLINE static
-+# define _GL_EXTERN_INLINE static
- #endif
- 
- #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)

pkgs/development/tools/misc/indent/default.nix

@@ -1,19 +1,40 @@
-{ lib, stdenv, fetchurl, texinfo, buildPackages, pkgsStatic }:
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, libintl
+, texinfo
+, buildPackages
+, pkgsStatic
+}:
 
 stdenv.mkDerivation rec {
   pname = "indent";
-  version = "2.2.12";
+  version = "2.2.13";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7";
+    hash = "sha256-nmRjT8TOZ5eyBLy4iXzhT90KtIyldpb3h2fFnK5XgJU=";
   };
 
-  patches = [ ./darwin.patch ];
+  patches = [
+    (fetchpatch {
+      name = "CVE-2023-40305.part-1.patch";
+      url = "https://git.savannah.gnu.org/cgit/indent.git/patch/?id=df4ab2d19e247d059e0025789ba513418073ab6f";
+      hash = "sha256-OLXBlYTdEuFK8SIsyC5Xr/hHWlvXiRqY2h79w+H5pGk=";
+    })
+    (fetchpatch {
+      name = "CVE-2023-40305.part-2.patch";
+      url = "https://git.savannah.gnu.org/cgit/indent.git/patch/?id=2685cc0bef0200733b634932ea7399b6cf91b6d7";
+      hash = "sha256-t+QF7N1aqQ28J2O8esZ2bc5K042cUuZR4MeMeuWIgPw=";
+    })
+  ];
+
   makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ];
 
   strictDeps = true;
   nativeBuildInputs = [ texinfo ];
+  buildInputs = [ libintl ];
   pkgsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling
 
   env.NIX_CFLAGS_COMPILE = toString (
@@ -23,6 +44,8 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  doCheck = true;
+
   passthru.tests.static = pkgsStatic.indent;
   meta = {
     homepage = "https://www.gnu.org/software/indent/";