Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Nov 2012 03:44:10 +0000 (UTC)
From:      Tom Judge <tj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r307471 - in head/security/razorback-dispatcher: . files
Message-ID:  <201211160344.qAG3iArZ010785@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tj
Date: Fri Nov 16 03:44:09 2012
New Revision: 307471
URL: http://svnweb.freebsd.org/changeset/ports/307471

Log:
  * Fix build against libcli 0.9.6
  * Make dependance on ActiveMQ off by default.
  
  Feature safe:	yes
  Approved by:	eadler (mentor)

Added:
  head/security/razorback-dispatcher/files/patch-src-console_cli.c   (contents, props changed)
Modified:
  head/security/razorback-dispatcher/Makefile   (contents, props changed)

Modified: head/security/razorback-dispatcher/Makefile
==============================================================================
--- head/security/razorback-dispatcher/Makefile	Thu Nov 15 23:33:59 2012	(r307470)
+++ head/security/razorback-dispatcher/Makefile	Fri Nov 16 03:44:09 2012	(r307471)
@@ -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
 

Added: head/security/razorback-dispatcher/files/patch-src-console_cli.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/razorback-dispatcher/files/patch-src-console_cli.c	Fri Nov 16 03:44:09 2012	(r307471)
@@ -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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211160344.qAG3iArZ010785>