ports/187806: [patch] net/samba4 update old readline Function typedef in libcli/smbreadline/smbreadline.c

[Sascha Willuweit]

>Number:         187806
>Category:       ports
>Synopsis:       [patch] net/samba4 update old readline Function typedef in libcli/smbreadline/smbreadline.c
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 21 09:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Sascha Willuweit
>Release:        9.2-RELEASE
>Organization:
>Environment:
9.2-RELEASE amd64
>Description:
(This a replacement for PR 187785. not beeing very specific about the affected port.)

In /libcli/smbreadline/smbreadline.c the old function pointer type "Function" of readline is used but readline 6.3 has removed support for that. So changed it to "rl_hook_func_t"  if _RL_FUNCTION_TYPEDEF is defined.
>How-To-Repeat:
Compile net/samba4 with readline >= 6.3
>Fix:
Apply patch attached.

Patch attached with submission follows:

--- ./libcli/smbreadline/smbreadline.c	2012-10-02 10:24:41.000000000 +0200
+++ ./libcli/smbreadline/smbreadline.c	2014-03-21 09:35:12.000000000 +0100
@@ -141,7 +141,11 @@
 
 #if HAVE_DECL_RL_EVENT_HOOK
 	if (callback)
-		rl_event_hook = (Function *)callback;
+#if defined(_RL_FUNCTION_TYPEDEF)
+		rl_event_hook = (rl_hook_func_t *)callback;
+#else
+		rl_event_hook = (Function *)callback;
+#endif
 #endif
 	ret = readline(prompt);
 	if (ret && *ret)


>Release-Note:
>Audit-Trail:
>Unformatted: