diff options
| -rw-r--r-- | net/samba416/Makefile | 1 | ||||
| -rw-r--r-- | net/samba416/files/0029-Fix-rl_completion_func_t.patch | 31 |
2 files changed, 32 insertions, 0 deletions
diff --git a/net/samba416/Makefile b/net/samba416/Makefile index 0c8eefad192c..cef2643c35fa 100644 --- a/net/samba416/Makefile +++ b/net/samba416/Makefile @@ -45,6 +45,7 @@ EXTRA_PATCHES= \ ${PATCHDIR}/0026-vfs-add-a-compatibility-option-to-the-vfs_streams_xa.patch:-p1 \ ${PATCHDIR}/0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch:-p1 \ ${PATCHDIR}/0028-s3-lib-system-add-FreeBSD-proc_fd_pattern.patch:-p1 \ + ${PATCHDIR}/0029-Fix-rl_completion_func_t.patch:-p1 \ ${PATCHDIR}/0099-s3-modules-zfsacl-fix-get-set-ACL-on-FreeBSD-13.patch:-p1 \ ${PATCHDIR}/0099-s4-mitkdc-Add-support-for-MIT-Kerberos-1.20.patch:-p1 diff --git a/net/samba416/files/0029-Fix-rl_completion_func_t.patch b/net/samba416/files/0029-Fix-rl_completion_func_t.patch new file mode 100644 index 000000000000..67cba786e3f5 --- /dev/null +++ b/net/samba416/files/0029-Fix-rl_completion_func_t.patch @@ -0,0 +1,31 @@ +--- a/lib/replace/system/readline.h 2022-01-24 11:26:58.905306300 +0100 ++++ b/lib/replace/system/readline.h 2024-10-02 12:48:20.110740000 +0200 +@@ -46,10 +46,10 @@ + #endif + + #ifdef HAVE_NEW_LIBREADLINE +-#ifdef HAVE_CPPFUNCTION ++#if defined(HAVE_RL_COMPLETION_FUNC_T) ++# define RL_COMPLETION_CAST (rl_completion_func_t *) ++#elif defined(HAVE_CPPFUNCTION) + # define RL_COMPLETION_CAST (CPPFunction *) +-#elif defined(HAVE_RL_COMPLETION_T) +-# define RL_COMPLETION_CAST (rl_completion_t *) + #else + # define RL_COMPLETION_CAST + #endif +--- a/libcli/smbreadline/wscript_configure 2022-01-24 11:26:58.973306700 +0100 ++++ b/libcli/smbreadline/wscript_configure 2024-10-02 12:48:20.110969000 +0200 +@@ -51,10 +51,10 @@ conf.CHECK_CODE(''' + # endif + # endif + #endif +-int main(void) {rl_completion_t f; return 0;} ++int main(void) {rl_completion_func_t f; return 0;} + ''', + 'HAVE_RL_COMPLETION_FUNC_T', execute=False, addmain=False, +-msg='Checking for rl_completion_t') ++msg='Checking for rl_completion_func_t') + + conf.CHECK_CODE(''' + #ifdef HAVE_READLINE_READLINE_H |