From 66ec46c6c32d32ef20d745b04779a3b12797a478 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 18 May 2024 19:22:19 -0700 Subject: [PATCH] klish: fix compilation with GCC14 Proper types are now needed. Signed-off-by: Rosen Penev --- utils/klish/Makefile | 2 +- .../klish/patches/010-shell_execute_fix.patch | 21 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/utils/klish/Makefile b/utils/klish/Makefile index 018af96bb6..a14a4025d9 100644 --- a/utils/klish/Makefile +++ b/utils/klish/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=klish PKG_VERSION:=2.2.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://libcode.org/attachments/download/82 diff --git a/utils/klish/patches/010-shell_execute_fix.patch b/utils/klish/patches/010-shell_execute_fix.patch index 822736259d..e62cb22526 100644 --- a/utils/klish/patches/010-shell_execute_fix.patch +++ b/utils/klish/patches/010-shell_execute_fix.patch @@ -1,17 +1,20 @@ --- a/clish/shell/shell_execute.c +++ b/clish/shell/shell_execute.c -@@ -19,12 +19,14 @@ - #include +@@ -20,7 +20,7 @@ #include -+#if 0 /* Empty signal handler to ignore signal but don't use SIG_IGN. */ - static void sigignore(int signo) +-static void sigignore(int signo) ++static void sigignore2(int signo) { signo = signo; /* Happy compiler */ return; - } -+#endif - - /*-------------------------------------------------------- */ - static int clish_shell_lock(const char *lock_path) +@@ -361,7 +361,7 @@ int clish_shell_exec_action(clish_contex + */ + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); +- sa.sa_handler = sigignore; /* Empty signal handler */ ++ sa.sa_handler = sigignore2; /* Empty signal handler */ + sigaction(SIGINT, &sa, &old_sigint); + sigaction(SIGQUIT, &sa, &old_sigquit); + sigaction(SIGHUP, &sa, &old_sighup);