]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
socat: Fix build against glibc >= 2.43
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 27 Jan 2026 16:19:44 +0000 (16:19 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2026 11:29:23 +0000 (11:29 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/socat
src/patches/socat-1.8.1.0-printtime.patch [new file with mode: 0644]

index 66dc2472b38765387f431ca081d90f5b6e173ed5..89a315e380e7e2d854a3ce310145537a7d80ba29 100644 (file)
--- a/lfs/socat
+++ b/lfs/socat
@@ -82,6 +82,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/socat-1.8.1.0-printtime.patch
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
diff --git a/src/patches/socat-1.8.1.0-printtime.patch b/src/patches/socat-1.8.1.0-printtime.patch
new file mode 100644 (file)
index 0000000..f1e2a43
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/filan.c b/filan.c
+index 101940a..85db9b4 100644
+--- a/filan.c
++++ b/filan.c
+@@ -1105,7 +1105,7 @@ const char *getfiletypestring(int st_mode) {
+ }
+ static int printtime(FILE *outfile, time_t time) {
+-   const char *s;
++   char *s;
+    if (filan_rawoutput) {
+       fprintf(outfile, "\t"F_time, time);