Skip to content

fix(ext): pin supautils's stat() to its legacy-host glibc floor #2523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brainrake wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

fix(ext): pin supautils's stat() to its legacy-host glibc floor #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cf1fc5f
fix(nix): pin glibc-versioned symbols for 2.31 floor compliance
brainrake Oct 5, 2026
1306a91
Merge branch 'develop' into martonboros/mpg-1326-remediate-glibc-floor
brainrake Oct 5, 2026
1f70b40
Revert unnecessary glibc remediation, repurpose for supautils/gatekeeper
brainrake Oct 6, 2026
cb40f36
fix(ext): pin supautils's stat() to GLIBC_2.2.5/2.17
brainrake Oct 6, 2026
927d991
Merge remote-tracking branch 'origin/develop' into martonboros/mpg-13…
brainrake Oct 8, 2026
82c97d6
Merge branch 'develop' into martonboros/mpg-1326-remediate-glibc-floor
brainrake Oct 8, 2026
98d9f2d
docs(ext): note removal condition for supautils glibc compat patch
brainrake Oct 9, 2026
f95572a
Merge remote-tracking branch 'origin/martonboros/mpg-1326-remediate-g…
brainrake Oct 9, 2026
d3dee2b
Merge branch 'develop' into martonboros/mpg-1326-remediate-glibc-floor
brainrake Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions nix/ext/patches/supautils-strtol-glibc-compat.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,31 @@ index 18e5aee..cdfb63f 100644
+
static JSON_ACTION_RETURN_TYPE json_array_start(void *state) {
json_constrained_extension_parse_state *parse = state;

diff --git a/src/extension_custom_scripts.c b/src/extension_custom_scripts.c
index 337bd69..3f285cc 100644
--- a/src/extension_custom_scripts.c
+++ b/src/extension_custom_scripts.c
@@ -2,6 +2,22 @@
#include <errno.h>
#include <sys/stat.h>

+#if defined(__linux__) && defined(__GLIBC__) && (defined(__x86_64__) || defined(__aarch64__))
+# if defined(__x86_64__)
+# define SUPAUTILS_STAT_COMPAT_VER "GLIBC_2.2.5"
+# define SUPAUTILS_STAT_VER 1
+# else
+# define SUPAUTILS_STAT_COMPAT_VER "GLIBC_2.17"
+# define SUPAUTILS_STAT_VER 0
+# endif
+extern int __xstat(int ver, const char *path, struct stat *buf);
+__asm__(".symver __xstat,__xstat@" SUPAUTILS_STAT_COMPAT_VER);
+#undef stat
+#define stat(path, buf) __xstat(SUPAUTILS_STAT_VER, path, buf)
+#undef stat64
+#define stat64(path, buf) __xstat(SUPAUTILS_STAT_VER, path, buf)
+#endif
+
// Prevent recursively running custom scripts
static bool running_custom_script = false;

1 change: 1 addition & 0 deletions nix/ext/supautils.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
hash = "sha256-Wsou5U7/Tuwj2E6aPEmlHg7uz7kGyBOGrb7UkjfEo9U=";
};

# remove once all Ubuntu 20.04 (glibc 2.31) hosts are decommissioned
patches = [ ./patches/supautils-strtol-glibc-compat.patch ];

installPhase = ''
Expand Down
Loading