Date: Wed, 24 Oct 2012 02:51:44 +0000 (UTC) From: Paul Schmehl <pauls@utdallas.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/173009: net-mgmt/argus3-clients, update port Message-ID: <20121024025144.51584DCA82A@buttercup4.utdallas.edu> Resent-Message-ID: <201210240300.q9O3006U061298@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173009
>Category: ports
>Synopsis: net-mgmt/argus3-clients, update port
>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: Wed Oct 24 03:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Paul Schmehl
>Release: FreeBSD 8.3-PRERELEASE amd64
>Organization:
The University of Texas at Dallas
>Environment:
System: FreeBSD hostname.utdallas.edu 8.3-PRERELEASE FreeBSD 8.3-PRERELEASE #1: Wed Mar 7 18:01:57 UTC 2012 root@hostname.utdallas.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
net-mgmt/argus3-clients, update port, add patches to
fix problems creating mysql tables, edit Makefile to
use new OPTIONS format and other recent changes, bump
PORTREVISION, correct errors in portlint
>How-To-Repeat:
>Fix:
--- argus3-clients.diff begins here ---
Index: files/patch-include-argus__event.h
===================================================================
--- files/patch-include-argus__event.h (revision 0)
+++ files/patch-include-argus__event.h (working copy)
@@ -0,0 +1,14 @@
+--- include/argus_event.h.orig 2012-10-24 01:52:34.000000000 +0000
++++ include/argus_event.h 2012-10-24 01:53:32.000000000 +0000
+@@ -203,9 +203,9 @@
+ */
+
+ char *ArgusEventTableCreationString[RA_MAXTABLES * 2] = {
+- "CREATE TABLE %s (id int not null auto_increment, aisid varchar(255) not null, uid int(11) not null, project int(11) not null, start datetime, end datetime, type int(8), cause int(8), facility int(11), severity int(8), access timestamp(14), timestamp datetime not null, hostname varchar(255), sender varchar(255), instance varchar(255), version int(2) not null, message text, metadata text, status int (4), record blob, primary key (id)) TYPE=MyISAM",
++ "CREATE TABLE %s (id int not null auto_increment, aisid varchar(255) not null, uid int(11) not null, project int(11) not null, start datetime, end datetime, type int(8), cause int(8), facility int(11), severity int(8), access timestamp(14), timestamp datetime not null, hostname varchar(255), sender varchar(255), instance varchar(255), version int(2) not null, message text, metadata text, status int (4), record blob, primary key (id)) ENGINE=MyISAM",
+
+- "CREATE TABLE %s (id int not null auto_increment, %s , aisid varchar(255) not null, uid int(11) not null, project int(11) not null, start datetime, end datetime, type int(8), cause int(8), facility int(11), severity int(8), access timestamp(14), timestamp datetime not null, hostname varchar(255), sender varchar(255), instance varchar(255), version int(2) not null, message text, metadata text, status int (4), record blob, primary key (id)) TYPE=MyISAM",
++ "CREATE TABLE %s (id int not null auto_increment, %s , aisid varchar(255) not null, uid int(11) not null, project int(11) not null, start datetime, end datetime, type int(8), cause int(8), facility int(11), severity int(8), access timestamp(14), timestamp datetime not null, hostname varchar(255), sender varchar(255), instance varchar(255), version int(2) not null, message text, metadata text, status int (4), record blob, primary key (id)) ENGINE=MyISAM",
+ };
+
+
Index: files/patch-ramysql-rasql.c
===================================================================
--- files/patch-ramysql-rasql.c (revision 0)
+++ files/patch-ramysql-rasql.c (working copy)
@@ -0,0 +1,11 @@
+--- ramysql/rasql.c.orig 2012-10-24 01:55:19.000000000 +0000
++++ ramysql/rasql.c 2012-10-24 01:55:56.000000000 +0000
+@@ -1840,7 +1840,7 @@
+ if (ArgusSOptionRecord)
+ sprintf (&sbuf[strlen(sbuf)], ", record blob");
+
+- sprintf (&sbuf[strlen(sbuf)], ") TYPE=MyISAM");
++ sprintf (&sbuf[strlen(sbuf)], ") ENGINE=MyISAM");
+ RaTableCreateString[cindex] = strdup(sbuf);
+
+ cindex++;
Index: files/patch-ramysql-rasqltimeindex.h
===================================================================
--- files/patch-ramysql-rasqltimeindex.h (revision 0)
+++ files/patch-ramysql-rasqltimeindex.h (working copy)
@@ -0,0 +1,15 @@
+--- ramysql/rasqltimeindex.h.orig 2012-10-24 02:38:32.000000000 +0000
++++ ramysql/rasqltimeindex.h 2012-10-24 02:39:37.000000000 +0000
+@@ -126,9 +126,9 @@
+ };
+
+ char *RaTableCreationString[RA_NUMTABLES] = {
+- "CREATE TABLE Filename (id int not null auto_increment, filename varchar(255) not null, size int unsigned, creation int unsigned , hmac varchar(64), start int unsigned, stop int unsigned, indexed int unsigned, primary key (id)) TYPE=MyISAM",
+- "CREATE TABLE Seconds (probe int unsigned not null, second int unsigned not null, fileindex int not null, ostart int unsigned not null, ostop int unsigned not null, KEY secondprobeKey(second, probe)) TYPE=MyISAM",
+- "CREATE TABLE Probes (id int not null auto_increment, name varchar(32) not null, url varchar(255) not null, type varchar(255), filter varchar(255), authname varchar(255), authpass varchar(255), description varchar(255), access timestamp(14), created timestamp(14), start timestamp(14), stop timestamp(14), status int unsigned, primary key (id)) TYPE=MyISAM",
++ "CREATE TABLE Filename (id int not null auto_increment, filename varchar(255) not null, size int unsigned, creation int unsigned , hmac varchar(64), start int unsigned, stop int unsigned, indexed int unsigned, primary key (id)) ENGINE=MyISAM",
++ "CREATE TABLE Seconds (probe int unsigned not null, second int unsigned not null, fileindex int not null, ostart int unsigned not null, ostop int unsigned not null, KEY secondprobeKey(second, probe)) ENGINE=MyISAM",
++ "CREATE TABLE Probes (id int not null auto_increment, name varchar(32) not null, url varchar(255) not null, type varchar(255), filter varchar(255), authname varchar(255), authpass varchar(255), description varchar(255), access timestamp(14), created timestamp(14), start timestamp(14), stop timestamp(14), status int unsigned, primary key (id)) ENGINE=MyISAM",
+ };
+
+ #define RA_MAXSQLQUERY 8
Index: files/patch-ramysql-rasqlinsert.c
===================================================================
--- files/patch-ramysql-rasqlinsert.c (revision 0)
+++ files/patch-ramysql-rasqlinsert.c (working copy)
@@ -0,0 +1,11 @@
+--- ramysql/rasqlinsert.c.orig 2012-10-24 01:57:27.000000000 +0000
++++ ramysql/rasqlinsert.c 2012-10-24 01:57:49.000000000 +0000
+@@ -8316,7 +8316,7 @@
+ if (ArgusSOptionRecord)
+ sprintf (&sbuf[strlen(sbuf)], ", record blob");
+
+- sprintf (&sbuf[strlen(sbuf)], ") TYPE=MyISAM");
++ sprintf (&sbuf[strlen(sbuf)], ") ENGINE=MyISAM");
+ RaTableCreateString[cindex] = strdup(sbuf);
+
+ cindex++;
Index: Makefile
===================================================================
--- Makefile (revision 306334)
+++ Makefile (working copy)
@@ -7,6 +7,7 @@
PORTNAME= argus-clients
PORTVERSION= 3.0.4.1
+PORTREVISION= 1
CATEGORIES= net-mgmt security
MASTER_SITES= http://qosient.com/argus/src/ \
ftp://qosient.com/pub/argus/src/
@@ -16,9 +17,10 @@
CONFLICTS= argus-clients-2* argus-clients-sasl-2*
-OPTIONS+= SASL "SASL authentication support" on \
- MYSQL "MySQL database support" on \
- GEOIP "GeoIP library support" off
+OPTIONS_DEFINE= SASL MySQL GeoIP
+SASL_DESC= SASL authentication support
+MySQL_DESC= MySQL database support
+GeoIP_DESC= GeoIP library support
.include <bsd.port.options.mk>
@@ -26,22 +28,22 @@
GNU_CONFIGURE= true
USE_NCURSES= yes
-.if defined(WITH_SASL)
-PKGNAMESUFFIX= -sasl
+.if ${PORT_OPTIONS:MSASL}
+PKGNAMESUFFIX+= -sasl
LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
.endif
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMySQL}
USE_MYSQL= yes
PLIST_SUB+= MYSQL=""
.else
PLIST_SUB+= MYSQL="@comment "
.endif
-.if defined(WITH_GEOIP)
+.if ${PORT_OPTIONS:MGeoIP}
LIB_DEPENDS+= GeoIP:${PORTSDIR}/net/GeoIP
-CONFIGURE_ARGS+= --with-GeoIP=${LOCALBASE}
+CONFIGURE_ARGS+= --with-GeoIP=${LOCALBASE}
.endif
MAN1= ra.1 rabins.1 racluster.1 racount.1 ragraph.1 rahisto.1 \
@@ -49,8 +51,6 @@
MAN5= racluster.5 radium.conf.5 rarc.5
MAN8= radium.8
-.include <bsd.port.pre.mk>
-
do-install:
.for i in ra rabins racluster racount radump rafilteraddr \
rahisto ralabel ranonymize rapath rapolicy \
@@ -89,4 +89,4 @@
${INSTALL_DATA} ${WRKSRC}/support/$i/* ${EXAMPLESDIR}/$i
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- argus3-clients.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121024025144.51584DCA82A>