From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Mar 21 09:00:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5C219DE for ; Fri, 21 Mar 2014 09:00:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 792C0CBF for ; Fri, 21 Mar 2014 09:00:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2L901Qi060401 for ; Fri, 21 Mar 2014 09:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2L901a4060400; Fri, 21 Mar 2014 09:00:01 GMT (envelope-from gnats) Resent-Date: Fri, 21 Mar 2014 09:00:01 GMT Resent-Message-Id: <201403210900.s2L901a4060400@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sascha Willuweit Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E0CE998 for ; Fri, 21 Mar 2014 08:54:29 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5AB0BC94 for ; Fri, 21 Mar 2014 08:54:29 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s2L8sSYI055082 for ; Fri, 21 Mar 2014 08:54:28 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s2L8sSnD055079; Fri, 21 Mar 2014 08:54:28 GMT (envelope-from nobody) Message-Id: <201403210854.s2L8sSnD055079@cgiserv.freebsd.org> Date: Fri, 21 Mar 2014 08:54:28 GMT From: Sascha Willuweit To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/187806: [patch] net/samba4 update old readline Function typedef in libcli/smbreadline/smbreadline.c X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Mar 2014 09:00:01 -0000 >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: