From owner-svn-ports-all@FreeBSD.ORG Mon Nov 19 23:11:32 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CF093FEB; Mon, 19 Nov 2012 23:11:32 +0000 (UTC) (envelope-from tj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B31268FC13; Mon, 19 Nov 2012 23:11:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJNBWmv060877; Mon, 19 Nov 2012 23:11:32 GMT (envelope-from tj@svn.freebsd.org) Received: (from tj@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJNBWOe060875; Mon, 19 Nov 2012 23:11:32 GMT (envelope-from tj@svn.freebsd.org) Message-Id: <201211192311.qAJNBWOe060875@svn.freebsd.org> From: Tom Judge Date: Mon, 19 Nov 2012 23:11:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r307574 - in branches/RELENG_9_1_0/security/razorback-dispatcher: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2012 23:11:32 -0000 Author: tj Date: Mon Nov 19 23:11:32 2012 New Revision: 307574 URL: http://svnweb.freebsd.org/changeset/ports/307574 Log: MFH r307471: * Fix build against libcli 0.9.6 * Make dependance on ActiveMQ off by default. Feature safe: yes Approved by: portmgr (beat) Approved by: eadler, db (mentors, implicit) Added: branches/RELENG_9_1_0/security/razorback-dispatcher/files/patch-src-console_cli.c - copied unchanged from r307471, head/security/razorback-dispatcher/files/patch-src-console_cli.c Modified: branches/RELENG_9_1_0/security/razorback-dispatcher/Makefile (contents, props changed) Directory Properties: branches/RELENG_9_1_0/ (props changed) Modified: branches/RELENG_9_1_0/security/razorback-dispatcher/Makefile ============================================================================== --- branches/RELENG_9_1_0/security/razorback-dispatcher/Makefile Mon Nov 19 23:06:42 2012 (r307573) +++ branches/RELENG_9_1_0/security/razorback-dispatcher/Makefile Mon Nov 19 23:11:32 2012 (r307574) @@ -7,6 +7,7 @@ PORTNAME= dispatcher PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Dispatcher PKGNAMEPREFIX= razorback- @@ -23,7 +24,6 @@ LIB_DEPENDS= razorback_api:${PORTSDIR}/s cli:${PORTSDIR}/devel/libcli OPTIONS_DEFINE= DEBUG ASSERT ACTIVEMQ -OPTIONS_DEFAULT=ACTIVEMQ ASSERT_DESC= Enable Asserts ACTIVEMQ_DESC= ActiveMQ runs locally Copied: branches/RELENG_9_1_0/security/razorback-dispatcher/files/patch-src-console_cli.c (from r307471, head/security/razorback-dispatcher/files/patch-src-console_cli.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/RELENG_9_1_0/security/razorback-dispatcher/files/patch-src-console_cli.c Mon Nov 19 23:11:32 2012 (r307574, copy of r307471, head/security/razorback-dispatcher/files/patch-src-console_cli.c) @@ -0,0 +1,26 @@ +Index: src/console_cli.c +=================================================================== +--- src/console_cli.c (revision 3997) ++++ src/console_cli.c (working copy) +@@ -24,10 +24,10 @@ + + #define MODE_CONFIG_NUGGET 10 + #define MODE_CONFIG_APP_TYPE 11 +-#define DECL_COMMAND(x) static int x(struct cli_def *cli, char *command, char *argv[], int argc) ++#define DECL_COMMAND(x) static int x(struct cli_def *cli, const char *command, char **argv, int argc) + + int +-check_auth (char *username, char *password) ++check_auth (const char *username, const char *password) + { + // TODO: Add support for other auth backends + if (strcasecmp (username, g_sConsoleUser) != 0) +@@ -38,7 +38,7 @@ + } + + int +-check_enable (char *password) ++check_enable (const char *password) + { + // TODO: Add support for other auth backends + return !strcasecmp (password, g_sConsoleEnablePassword);