Attachment #130617 for bug #174591

View | Details | Raw Unified | Return to bug 174591
Collapse All | Expand All

Lines 6-13 Link Here

(-)Makefile (-47 / +36 lines)
6	#	6	#
7		7
8	PORTNAME= sguil-server	8	PORTNAME= sguil-server
9	PORTVERSION= 0.7.0	9	PORTVERSION= 0.8.0
10	PORTREVISION= 4
11	CATEGORIES= security	10	CATEGORIES= security
12	MASTER_SITES= SF/sguil/sguil/sguil-${PORTVERSION}	11	MASTER_SITES= SF/sguil/sguil/sguil-${PORTVERSION}
13		12
Lines 20-67 Link Here
20	${LOCALBASE}/lib/tclx8.4/tclx.tcl:${PORTSDIR}/lang/tclX	19	${LOCALBASE}/lib/tclx8.4/tclx.tcl:${PORTSDIR}/lang/tclX
21	LIB_DEPENDS= tls:${PORTSDIR}/devel/tcltls	20	LIB_DEPENDS= tls:${PORTSDIR}/devel/tcltls
22		21
		22	OPTIONS_DEFINE= MYSQL
		23	MYSQL_DESC= Depend on databases/mysqltcl
		24
		25	LICENSE_NAME= QPLv1.0
		26	LICENSE_FILE= ${WRKSRC}/doc/LICENSE.QPL
		27	LICENSE_PERMS= auto-accept
		28
		29	IS_INTERACTIVE= yes
23	NO_BUILD= yes	30	NO_BUILD= yes
24	USE_RC_SUBR= sguild	31	USE_RC_SUBR= sguild
25	TCLSH_CMD?= ${PREFIX}/bin/tclsh8.4	32	TCL_VER= 8.5
26	SGUILDIR?= sguil-server	33	TCLSH= tclsh${TCL_VER}
		34	MYSQLTCL_CMDS= cd ${PORTSDIR}/databases/mysqltcl && ${MAKE} -V PORTVERSION
		35	SGUILDIR?= sguild
27	WRKSRC= ${WRKDIR}/sguil-${PORTVERSION}	36	WRKSRC= ${WRKDIR}/sguil-${PORTVERSION}
28	PATCH_WRKSRC= ${WRKSRC}/server	37	PATCH_WRKSRC= ${WRKSRC}/server
29	PLIST_SUB= SGUILDIR=${SGUILDIR}	38	PLIST_SUB= SGUILDIR=${SGUILDIR}
30	SUB_FILES= pkg-message pkg-install pkg-deinstall	39	SUB_FILES= pkg-message pkg-install pkg-deinstall
31	SUB_LIST= SGUILDIR=${SGUILDIR} TCLSH=${TCLSH_CMD} CURDIR=${.CURDIR} \	40	SUB_LIST= SGUILDIR=${SGUILDIR} TCLSH=${TCLSH}
32	WRKSRC=${WRKSRC} DOCSDIR=${DOCSDIR}	41	CONFS= autocat.conf sguild.access sguild.email sguild.reports sguild.conf sguild.queries sguild.users
33	LIBRARIES= SguildAccess.tcl SguildGenericDB.tcl SguildReportBuilder.tcl \
34	SguildAutoCat.tcl SguildGenericEvent.tcl SguildSendComms.tcl \
35	SguildClientCmdRcvd.tcl SguildHealthChecks.tcl SguildSensorAgentComms.tcl \
36	SguildConnect.tcl SguildLoaderd.tcl SguildSensorCmdRcvd.tcl \
37	SguildCreateDB.tcl SguildMysqlMerge.tcl SguildTranscript.tcl \
38	SguildEmailEvent.tcl SguildPadsLib.tcl SguildUtils.tcl \
39	SguildEvent.tcl SguildQueryd.tcl
40	SCRIPTS= create_ruledb.sql update_0.7.tcl update_sguildb_v7-v8.sql \
41	create_sguildb.sql update_sguildb_v10-v11.sql update_sguildb_v8-v9.sql \
42	migrate_event.tcl update_sguildb_v11-v12.sql update_sguildb_v9-v10.sql \
43	migrate_sancp.tcl update_sguildb_v5-v6.sql sancp_cleanup.tcl update_sguildb_v6-v7.sql
44	CONFS= autocat.conf sguild.access sguild.conf sguild.email sguild.queries sguild.reports sguild.users
45		42
46	PORTDOCS= CHANGES FAQ INSTALL INSTALL.openbsd LICENSE.QPL \	43	PORTDOCS1= README
47	OPENSSL.README TODO UPGRADE USAGE sguildb.dia	44	PORTDOCS2= CHANGES FAQ INSTALL INSTALL.openbsd OPENSSL.README TODO UPGRADE USAGE sguildb.dia
48		45
49	OPTIONS= MYSQL50 "Install mysql50 server" off	46	.include <bsd.port.options.mk>
50		47
51	.include <bsd.port.pre.mk>	48	.if ${PORT_OPTIONS:MWITH_MYSQL}
52		49	@${ECHO_CMD} $$(${MYSQLTCL_CMDS})
53	.if defined(WITH_MYSQL50)	50	RUN_DEPENDS+= ${LOCALBASE}/lib/mysqltcl-${MYSQLTCL_VER}:${PORTSDIR}/databases/mysqltcl
54	RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql50-server
55	.endif	51	.endif
56		52
57	MYSQLTCL_VER!= cd ${PORTSDIR}/databases/mysqltcl && ${MAKE} -V PORTVERSION
58
59	RUN_DEPENDS+= ${LOCALBASE}/lib/mysqltcl-${MYSQLTCL_VER}:${PORTSDIR}/databases/mysqltcl
60
61	post-patch:	53	post-patch:
62	.for f in archive_sguildb.tcl sguild contrib/incident_report.tcl	54	@${REINPLACE_CMD} 's\|/bin/sh\|/usr/local/bin/${TCLSH}\|' \
63	@${REINPLACE_CMD} -e 's:exec tclsh:exec ${TCLSH_CMD}:g' ${WRKSRC}/server/${f}	55	${PATCH_WRKSRC}/sguild
64	.endfor
65		56
66	pre-install:	57	pre-install:
67	.if !defined(BATCH) && !defined(PACKAGE_BUILDING)	58	.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
Lines 71-103 Link Here
71	@${MKDIR} ${PREFIX}/etc/${SGUILDIR}	62	@${MKDIR} ${PREFIX}/etc/${SGUILDIR}
72	@${MKDIR} ${PREFIX}/lib/${SGUILDIR}	63	@${MKDIR} ${PREFIX}/lib/${SGUILDIR}
73	@${MKDIR} ${PREFIX}/share/${SGUILDIR}	64	@${MKDIR} ${PREFIX}/share/${SGUILDIR}
		65	@${MKDIR} ${PREFIX}/share/${SGUILDIR}/contrib
74	@${MKDIR} /var/run/${SGUILDIR}	66	@${MKDIR} /var/run/${SGUILDIR}
75	do-install:	67	do-install:
76	.for f in archive_sguildb.tcl sguild	68	(cd ${WRKSRC}/server/lib && ${COPYTREE_BIN} \* ${PREFIX}/lib/${SGUILDIR})
77	${INSTALL_SCRIPT} -m 751 ${WRKSRC}/server/${f} ${PREFIX}/bin/${f}	69	(cd ${WRKSRC}/server/sql_scripts && ${COPYTREE_SHARE} \* ${PREFIX}/share/${SGUILDIR})
		70	(cd ${WRKSRC}/server/contrib && ${COPYTREE_SHARE} \* ${PREFIX}/share/${SGUILDIR}/contrib)
		71	.for f in sguild
		72	${INSTALL_SCRIPT} -m 555 ${WRKSRC}/server/${f} ${PREFIX}/bin/${f}
78	.endfor	73	.endfor
79	.for f in incident_report.tcl
80	${INSTALL_SCRIPT} -m 751 ${WRKSRC}/server/contrib/${f} ${PREFIX}/bin/${f}
81	.endfor
82	.for f in ${CONFS}	74	.for f in ${CONFS}
83	${INSTALL_DATA} ${WRKSRC}/server/${f} ${PREFIX}/etc/${SGUILDIR}/${f}-sample	75	${INSTALL_DATA} -m 441 ${PATCH_WRKSRC}/${f} ${PREFIX}/etc/${SGUILDIR}/${f}-sample
84	.endfor	76	.endfor
85	.for f in ${LIBRARIES}	77
86	${INSTALL_DATA} ${WRKSRC}/server/lib/${f} ${PREFIX}/lib/${SGUILDIR}/${f}
87	.endfor
88	.for f in ${SCRIPTS}
89	${INSTALL_DATA} ${WRKSRC}/server/sql_scripts/${f} ${PREFIX}/share/${SGUILDIR}/${f}
90	.endfor
91	post-install:	78	post-install:
92	.if !defined(BATCH) && !defined(PACKAGE_BUILDING)	79	.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
93	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \	80	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
94	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	81	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
95	.endif	82	.endif
96	.if !defined(NOPORTDOCS)	83
		84	.if ${PORT_OPTIONS:MDOCS}
97	@${MKDIR} ${DOCSDIR}	85	@${MKDIR} ${DOCSDIR}
98	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}	86	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS1} ${DOCSDIR}
		87	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS2} ${DOCSDIR}
99	.endif	88	.endif
100		89
101	@${CAT} ${PKGMESSAGE}	90	@${CAT} ${PKGMESSAGE}
102		91
103	.include <bsd.port.post.mk>	92	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (sguil-server-0.7.0.tar.gz) = 8ed845779c516b7bcb092454d339a26bca69f52689f9f07831fb41a3efe58809	1	SHA256 (sguil-server-0.8.0.tar.gz) = faa7152ddbdc0ba797c79d6419bf3ae50bfd6dbba4b2cd28ccb04a55ef788360
2	SIZE (sguil-server-0.7.0.tar.gz) = 103440	2	SIZE (sguil-server-0.8.0.tar.gz) = 102236




--- lib/SguildLoaderd.tcl.orig	2012-10-12 21:07:19.000000000 +0000
+++ lib/SguildLoaderd.tcl	2012-10-12 21:15:06.000000000 +0000
@@ -124,7 +124,7 @@
         INDEX dst_port (dst_port),                         \
         INDEX src_port (src_port),                         \
         INDEX start_time (start_time)                      \
-        )                                                  \
+        )ENGINE=MyISAM                                     \
         "
 
     # Create the table
@@ -177,7 +177,7 @@
         INDEX dst_port (dst_port),                         \
         INDEX src_port (src_port),                         \
         INDEX start_time (start_time)                      \

         "
     # Create our MERGE sancp table
     mysqlexec $dbSocketID $createQuery
@@ -220,7 +220,7 @@
     } else {
         # Make sure its a MERGE table and not the old monster
         set tableStatus [mysqlsel $LOADERD_DB_ID {SHOW TABLE STATUS LIKE 'sancp'} -flatlist]
-        if { $tableStatus != "" && ![ string equal -nocase [lindex $tableStatus 1] "MRG_MyISAM" ] } {
+        if { $tableStatus != "" && ![ string equal -nocase [lindex $tableStatus 1] "MRG_MYISAM" ] } {
 
             ErrorMessage "ERROR: loaderd: You appear to be using an old version of the\n\
                           sguil database schema that does not support the MERGE sancp\n\
                           table. Please see the CHANGES document for more information\n."

Lines 1-11 Link Here

(-)files/patch-lib-SguildMysqlMerge.tcl (-4 / +4 lines)
1	--- lib/SguildMysqlMerge.tcl.bak 2009-07-06 14:53:27.000000000 -0500	1	--- lib/SguildMysqlMerge.tcl.orig 2012-10-12 21:18:22.000000000 +0000
2	+++ lib/SguildMysqlMerge.tcl 2009-07-06 14:54:26.000000000 -0500	2	+++ lib/SguildMysqlMerge.tcl 2012-10-12 21:19:41.000000000 +0000
3	@@ -9,7 +9,7 @@	3	@@ -9,7 +9,7 @@
4	set tmpQry "SHOW TABLE STATUS LIKE '$tableName'"	4	set tmpQry "SHOW TABLE STATUS LIKE '$tableName'"
5	set tableStatus [mysqlsel $MAIN_DB_SOCKETID $tmpQry -flatlist]	5	set tableStatus [mysqlsel $MAIN_DB_SOCKETID $tmpQry -flatlist]
6		6
7	- if { $tableStatus != "" && [lindex $tableStatus 1] != "MRG_MyISAM" } {	7	- if { $tableStatus != "" && ![ string equal -nocase [lindex $tableStatus 1] "MRG_MyISAM" ] } {
8	+ if { $tableStatus != "" && [lindex $tableStatus 1] != "MRG_MYISAM" } {	8	+ if { $tableStatus != "" && ![ string equal -nocase [lindex $tableStatus 1] "MRG_MYISAM" ] } {
9		9
10	# Non MERGE table found.	10	# Non MERGE table found.
11	set errorMsg "\n*************************************************************\n	11	set errorMsg "\n*************************************************************\n




--- sguild.orig	2012-12-17 20:54:14.000000000 +0000
+++ sguild	2012-12-17 20:56:47.000000000 +0000
@@ -1,6 +1,4 @@
 #!/bin/sh
-# Run tcl from users PATH \
-exec tclsh "$0" "$@"
 
 # $Id: sguild,v 1.193 2011/05/29 15:41:16 bamm Exp $ #
 
@@ -218,7 +216,7 @@
 ##################################
 
 # Do all priv account actions here.
-# Open log files/etc. Privs will be dropped after.
+# Open log files/usr/local/etc. Privs will be dropped after.
 
 if { ![info exists LOG_PATH] } { set LOG_PATH /var/log/sguild }
 
@@ -318,7 +316,7 @@
 # Check for certs
 if {![info exists CERTS_PATH]} {
 
-    set CERTS_PATH /etc/sguild/certs
+    set CERTS_PATH /usr/local/etc/sguild/certs
 
 }
 
@@ -348,13 +346,13 @@
 
 if { ![info exists CONF_FILE] } {
   # No conf file specified check the defaults
-  if { [file exists /etc/sguild/sguild.conf] } {
-    set CONF_FILE /etc/sguild/sguild.conf
+  if { [file exists /usr/local/etc/sguild/sguild.conf] } {
+    set CONF_FILE /usr/local/etc/sguild/sguild.conf
   } elseif { [file exists ./sguild.conf] } {
     set CONF_FILE ./sguild.conf
   } else {
     puts "Couldn't determine where the sguil config file is"
-    puts "Looked for ./sguild.conf and /etc/sguild/sguild.conf."
+    puts "Looked for ./sguild.conf and /usr/local/etc/sguild/sguild.conf."
     DisplayUsage $argv0
   }
 }
@@ -476,8 +474,8 @@
 # Check for a valid USERS file
 if { ![info exists USERS_FILE] } {
   # No users file was specified. Go with the defaults
-  if { [file exists /etc/sguild/sguild.users] } {
-    set USERS_FILE "/etc/sguild/sguild.users"
+  if { [file exists /usr/local/etc/sguil-server/sguild.users] } {
+    set USERS_FILE "/usr/local/etc/sguil-server/sguild.users"
   } elseif { [file exists ./sguild.users] } {
     set USERS_FILE "./sguild.users"
   } else {
     if { [info exists ADDUSER] && $ADDUSER } {
-      CreateUsersFile "/etc/sguild/sguild.users"
+      CreateUsersFile "/usr/local/etc/sguil-server/sguild.users"
     } else {
       set DEBUG 2
       LogMessage "ERROR: Could not find a sguild.users file."
-      LogMessage "       Checked in ./ and /etc/sguild/"
+      LogMessage "       Checked in ./ and /usr/local/etc/sguil-server/"
       DisplayUsage $argv0
     }
   }
@@ -392,8 +392,8 @@
 # Load accessfile
 if { ![info exists ACCESS_FILE] } {
   # Check the defaults
-  if { [file exists /etc/sguild/sguild.access] } {
-    set ACCESS_FILE "/etc/sguild/sguild.access"
+  if { [file exists /usr/local/etc/sguild/sguild.access] } {
+    set ACCESS_FILE "/usr/local/etc/sguild/sguild.access"
   } elseif { [file exists ./sguild.access] } {
     set ACCESS_FILE "./sguild.access"
   } else {
@@ -491,8 +489,8 @@
 }
 # Load auto cat config
 if { ![info exists AUTOCAT_FILE] } {
-   if { [file exists /etc/sguild/autocat.conf] } {
-     set AUTOCAT_FILE "/etc/sguild/autocat.conf"
+   if { [file exists /usr/local/etc/sguild/autocat.conf] } {
+     set AUTOCAT_FILE "/usr/local/etc/sguild/autocat.conf"
    } else {
      set AUTOCAT_FILE "./autocat.conf"
    }
@@ -502,8 +500,8 @@
 }
 # Load email config file
 if { ![info exists EMAIL_FILE] } {
-  if { [file exists /etc/sguild/sguild.email] } {
-    set EMAIL_FILE "/etc/sguild/sguild.email"
+  if { [file exists /usr/local/etc/sguild/sguild.email] } {
+    set EMAIL_FILE "/usr/local/etc/sguild/sguild.email"
   } else {
     set EMAIL_FILE "./sguild.email"
   }
@@ -515,8 +513,8 @@
 }
 # Load global queries.
 if { ![info exists GLOBAL_QRY_FILE] } {
-  if { [file exists /etc/sguild/sguild.queries] } {
-    set GLOBAL_QRY_FILE "/etc/sguild/sguild.queries"
+  if { [file exists /usr/local/etc/sguild/sguild.queries] } {
+    set GLOBAL_QRY_FILE "/usr/local/etc/sguild/sguild.queries"
   } else {
     set GLOBAL_QRY_FILE "./sguild.queries"
   }
@@ -528,8 +526,8 @@
 }
 # Load report queries.
 if { ![info exists REPORT_QRY_FILE] } {
-  if { [file exists /etc/sguild/sguild.reports] } {
-    set REPORT_QRY_FILE "/etc/sguild/sguild.reports"
+  if { [file exists /usr/local/etc/sguild/sguild.reports] } {
+    set REPORT_QRY_FILE "/usr/local/etc/sguild/sguild.reports"
   } else {
     set REPORT_QRY_FILE "./sguild.reports"
   }

Lines 5-11 Link Here

(-)files/patch-sguild.conf (-1 / +1 lines)
5		5
6	# Path the sguild libs	6	# Path the sguild libs
7	-set SGUILD_LIB_PATH ./lib	7	-set SGUILD_LIB_PATH ./lib
8	+set SGUILD_LIB_PATH /usr/local/lib/sguil-server	8	+set SGUILD_LIB_PATH /usr/local/lib/sguild
9		9
10	# DEBUG 0=off 1=important stuff 2=everything. Option 2 is VERY chatty.	10	# DEBUG 0=off 1=important stuff 2=everything. Option 2 is VERY chatty.
11	set DEBUG 2	11	set DEBUG 2




--- sql_scripts/create_sguildb.sql.orig	2012-10-12 21:39:20.000000000 +0000
+++ sql_scripts/create_sguildb.sql	2012-10-12 21:53:42.000000000 +0000
@@ -3,7 +3,7 @@
 -- CREATE DATABASE IF NOT EXISTS sguildb;
 -- USE sguildb;
 
--- Depreciated for MRG_MyISAM tables
+-- Deprecated for MRG_MyISAM tables
 -- CREATE TABLE event
 -- (
 --   sid			INT UNSIGNED	NOT NULL,
@@ -52,7 +52,7 @@
 --  INDEX status (status),
 --  INDEX abuse_queue (abuse_queue),
 --  INDEX abuse_sent (abuse_sent)
--- );
+-- )ENGINE=MyISAM;
 
 -- CREATE TABLE tcphdr
 -- (
@@ -66,7 +66,8 @@
 --  tcp_win	SMALLINT UNSIGNED,
 --  tcp_csum	SMALLINT UNSIGNED,
 --  cid		INT UNSIGNED	NOT NULL,
 --  tcp_seq	INT UNSIGNED,
@@ -68,16 +68,16 @@
 --  tcp_urp	SMALLINT UNSIGNED,
---  PRIMARY KEY (sid,cid));
+--  PRIMARY KEY (sid,cid)
+-- )ENGINE=MyISAM;
 --
 -- CREATE TABLE udphdr
 -- (
@@ -74,7 +75,8 @@
+-- (
 --  sid		INT UNSIGNED	NOT NULL,
 --  cid		INT UNSIGNED	NOT NULL,
 --  udp_len	SMALLINT UNSIGNED,
 --  udp_csum	SMALLINT UNSIGNED,
---  PRIMARY KEY (sid,cid));
+--  PRIMARY KEY (sid,cid)
+-- )ENGINE=MyISAM;
 --
 -- CREATE TABLE icmphdr
 -- (
@@ -83,14 +85,16 @@
+-- (
 --  sid		INT UNSIGNED	NOT NULL,
 --  cid		INT UNSIGNED	NOT NULL,
 --  icmp_csum	SMALLINT UNSIGNED,
 --  icmp_id	SMALLINT UNSIGNED,
 --  icmp_seq	SMALLINT UNSIGNED,
---  PRIMARY KEY (sid,cid));
+--  PRIMARY KEY (sid,cid)
+-- )ENGINE=MyISAM;
 --
 -- CREATE TABLE data
 -- (
+-- CREATE TABLE data
+-- (
 --  sid           INT UNSIGNED    NOT NULL,
 --  cid           INT UNSIGNED    NOT NULL,
 --  data_payload	TEXT,
---  PRIMARY KEY (sid,cid));
+--  PRIMARY KEY (sid,cid)
+-- )ENGINE=MyISAM;
 
 CREATE TABLE sensor
 (
@@ -101,13 +105,13 @@
   interface	VARCHAR(255),
   description	TEXT,
   bpf_filter	TEXT,

   PRIMARY KEY (sid),
   INDEX hostname_idx (hostname)
-);
+)ENGINE=MyISAM;
 
 CREATE TABLE portscan
 (
@@ -119,9 +123,10 @@
   dst_port	INT UNSIGNED,
   data		TEXT,
   INDEX ps_src_ip (src_ip),
-  INDEX ps_timestamp (timestamp));
+  INDEX ps_timestamp (timestamp)
+)ENGINE=MyISAM;
 
--- Depreciated
+-- Deprecated
 -- CREATE TABLE sessions ( 
 --  sid		INT UNSIGNED NOT NULL, 
 --  xid		BIGINT UNSIGNED NOT NULL, 
@@ -142,7 +147,8 @@
 --  INDEX server (src_ip), 
 --  INDEX client (dst_ip), 
 --  INDEX sport (src_port), 
---  INDEX cport (dst_port)); 
+--  INDEX cport (dst_port)
+-- )ENGINE=MyISAM; 
 
 CREATE TABLE status
 (
@@ -150,7 +156,7 @@
   description	VARCHAR(255) NOT NULL,
   long_desc     VARCHAR(255),
   PRIMARY KEY (status_id)
-);
+)ENGINE=MyISAM;
 
 CREATE TABLE history
 (
@@ -161,7 +167,7 @@
   status	SMALLINT UNSIGNED	NOT NULL,
   comment	VARCHAR(255),
   INDEX log_time (timestamp)
-);
+)ENGINE=MyISAM;
 
 CREATE TABLE user_info
 (
@@ -170,7 +176,7 @@
   last_login	DATETIME,
   password	VARCHAR(42),
   PRIMARY KEY (uid)
-);
+)ENGINE=MyISAM;
 
 CREATE TABLE nessus_data
 (
@@ -179,7 +185,8 @@
   nessus_id     INT UNSIGNED,
   level	        VARCHAR(20),
   description		TEXT,
-  INDEX rid (rid));
+  INDEX rid (rid)
+)ENGINE=MyISAM;
 
 CREATE TABLE nessus
 (
@@ -189,7 +196,8 @@
   timestart     DATETIME,
   timeend       DATETIME,
   PRIMARY KEY (rid),
-  INDEX ip (ip));
+  INDEX ip (ip)
+)ENGINE=MyISAM;
 
 CREATE TABLE IF NOT EXISTS `pads`
 (
@@ -204,10 +212,10 @@
   application           VARCHAR(255)     NOT NULL,
   hex_payload           VARCHAR(255),
   PRIMARY KEY (sid,asset_id)
-);
+)ENGINE=MyISAM;
 
 --
--- Depreciated for MERGE tables
+-- Deprecated for MERGE tables
 -- CREATE TABLE sancp
 -- (
+-- (
 --  sid		INT UNSIGNED	NOT NULL,
@@ -232,7 +240,7 @@
 --  start_time	DATETIME	NOT NULL,
@@ -231,8 +234,8 @@
 --  INDEX dst_port (dst_port),
 --  INDEX src_port (src_port),
 --  INDEX start_time (start_time)
--- );
+-- )ENGINE=MyISAM;
 --
 

 INSERT INTO status (status_id, description, long_desc) VALUES (0, "New", "Real Time Event");
@@ -251,7 +259,7 @@
@@ -250,7 +253,7 @@
 (
   version	VARCHAR(32),
   installed	DATETIME
-);
+)ENGINE=MyISAM;
 
 INSERT INTO version (version, installed) VALUES ("0.13", now());
 

Lines 8-15 Link Here

(-)files/pkg-deinstall.in (-2 / +2 lines)
8	# Make sure we're in the right stage of the process	8	# Make sure we're in the right stage of the process
9	if [ "$2" = "DEINSTALL" ]; then	9	if [ "$2" = "DEINSTALL" ]; then
10	echo "Stopping sguild......"	10	echo "Stopping sguild......"
11	%%PREFIX%%/etc/rc.d/sguild stop	11	%%PREFIX%%/etc/rc.d/sguild onestop
12	%%PREFIX%%/etc/rc.d/sguild poll	12	%%PREFIX%%/etc/rc.d/sguild onepoll
13	if [ ! ${BATCH} ]; then	13	if [ ! ${BATCH} ]; then
14	echo "Would you like to remove the sguild certs?" ; read ans	14	echo "Would you like to remove the sguild certs?" ; read ans
15	case "$ans" in	15	case "$ans" in

Lines 396-401 Link Here

(-)files/pkg-install.in (+2 lines)
396	chown ${sguil_user}:${sguil_group} %%PREFIX%%/bin/${files}	396	chown ${sguil_user}:${sguil_group} %%PREFIX%%/bin/${files}
397	fi	397	fi
398	done	398	done
		399	chown -R ${sguil_user}:${sguil_group} %%PREFIX%%/etc/%%SGUILDIR%%
		400	chown -R ${sguil_user}:${sguil_group} %%PREFIX%%/lib/%%SGUILDIR%%
399	if [ ! -f %%PREFIX%%/bin/sguild ]; then	401	if [ ! -f %%PREFIX%%/bin/sguild ]; then
400	echo "Sguild is missing! Please correct the problem before continuing!"	402	echo "Sguild is missing! Please correct the problem before continuing!"
401	exit 1	403	exit 1




         * !!!!!!!!!!! WARNING !!!!!!!!!!! *
         ***********************************

PLEASE NOTE: If you are upgrading from a previous version,
read the UPGRADE doc (in %%DOCSDIR%%) before proceeding!!!
Some noteworthy changes in version 0.7.0:
SSL is now required for server, sensor and client.
The sguild.conf and sguild.email files have changed.
You MUST run the upgrade_0.7.tcl script to clean up and
prepare the database before running the new version.  BE SURE
TO BACK UP YOUR DATABASE BEFORE PROCEEDING!!!

If you had existing config files in %%PREFIX%%/etc/%%SGUILDIR%%
they were not overwritten.  If this is a first time install, you
must copy the sample files to the corresponding conf file and 

correct LOG_DIRS and put a copy of the snort rules you use in 
LOG_DIR/rules.

The sguild program was placed in %%PREFIX%%/bin/.
were placed in %%PREFIX%%/bin/.  The incident_report.tcl
script is from the contrib section.  There is no documentation
and the script's variables must be edited before it is used.

Some contributed scripts were placed in 
%%PREFIX%%/share/%%SGUILDIR%%/contrib

A startup script, named sguild.sh was installed in
%%PREFIX%%/etc/rc.d/.  To enable it, edit /etc/rc.conf
per the instructions in the script.




# Add the following lines to /etc/rc.conf to enable sguild:
# sguild_enable (bool):		Set to YES to enable sguild
# 				Default: NO
# The following commandline arguments are available for sguild
# "  -c <filename>: PATH to the sguild config (sguild.conf) file."
# "  -a <filename>: PATH to the autocat config (autocat.conf) file."
# "  -g <filename>: PATH to the sguild global queries (sguild.queries) file."
# "  -u <filename>: PATH to the sguild users (sguild.users) file."
# "  -P <filename>: Name of file to write the PID to."
# "                 Default is /var/run/%%SGUILDIR%%/sguild.pid"
# "  -l <filepath>: PATH to sguild libraries."
# "  -O <filename>: Define PATH to tls (tcl openssl) lib (libtls1.x.so)"
# "  -C <directory>: Directory that contains sguild.pem and sguild.key"
# "  -D Runs sguild in daemon mode."
# "  -A <filename>: PATH to sguild.access file."
# "  -d <0|1|2>: Set DEBUG level"
# sguild_flags (str):		Extra flags passed to sguild
#				Default: -D -P ${pid}
# sguild_conf (str):		Sguild configuration file
#				Default: %%PREFIX%%/etc/%%SGUILDIR%%/sguild.conf
# sguild_user (str):		Default: sguil
# Note: this value MUST be set in /etc/rc.conf if you do not accept the default
# user created by the pkg-install script

. /etc/rc.subr

name="sguild"
rcvar=sguild_enable
load_rc_config sguild
# set some defaults
: ${sguild_enable:="NO"}
: ${sguild_conf:="%%PREFIX%%/etc/%%SGUILDIR%%/sguild.conf"}
: ${pid:="/var/run/%%SGUILDIR%%/sguild.pid"}
: ${sguild_flags:="-D -P ${pid}"}
: ${sguild_user:="sguil"}

name="sguild"
rcvar=sguild_enable
command="%%PREFIX%%/bin/${name}"
procname="%%PREFIX%%/bin/%%TCLSH%%"
procname="%%TCLSH%%"
check_process="${procname}"
sguild_user="sguil"

run_rc_command "$1"




bin/archive_sguildb.tcl
bin/incident_report.tcl
bin/sguild
etc/%%SGUILDIR%%/autocat.conf-sample
etc/%%SGUILDIR%%/sguild.access-sample

lib/%%SGUILDIR%%/SguildGenericEvent.tcl
lib/%%SGUILDIR%%/SguildHealthChecks.tcl
lib/%%SGUILDIR%%/SguildLoaderd.tcl
lib/%%SGUILDIR%%/SguildLoaderd.tcl.orig
lib/%%SGUILDIR%%/SguildMysqlMerge.tcl
lib/%%SGUILDIR%%/SguildMysqlMerge.tcl.orig
lib/%%SGUILDIR%%/SguildPadsLib.tcl
lib/%%SGUILDIR%%/SguildQueryd.tcl
lib/%%SGUILDIR%%/SguildReportBuilder.tcl

lib/%%SGUILDIR%%/SguildSensorCmdRcvd.tcl
lib/%%SGUILDIR%%/SguildTranscript.tcl
lib/%%SGUILDIR%%/SguildUtils.tcl
%%DOCSDIR%%/CHANGES
%%DOCSDIR%%/FAQ
%%DOCSDIR%%/INSTALL
%%DOCSDIR%%/INSTALL.openbsd
%%DOCSDIR%%/OPENSSL.README
%%DOCSDIR%%/README
%%DOCSDIR%%/TODO
%%DOCSDIR%%/UPGRADE
%%DOCSDIR%%/USAGE
%%DOCSDIR%%/sguildb.dia
share/%%SGUILDIR%%/contrib/incident_report.tcl
share/%%SGUILDIR%%/contrib/init/sguil
share/%%SGUILDIR%%/contrib/init/sguild
share/%%SGUILDIR%%/create_ruledb.sql
share/%%SGUILDIR%%/create_sguildb.sql
share/%%SGUILDIR%%/create_sguildb.sql.orig
share/%%SGUILDIR%%/migrate_event.tcl
share/%%SGUILDIR%%/migrate_sancp.tcl
share/%%SGUILDIR%%/sancp_cleanup.tcl
share/%%SGUILDIR%%/sancp_cleanup.tcl.orig
share/%%SGUILDIR%%/update_0.7.tcl
share/%%SGUILDIR%%/update_0.8.tcl
share/%%SGUILDIR%%/update_sguildb_v10-v11.sql
share/%%SGUILDIR%%/update_sguildb_v11-v12.sql
share/%%SGUILDIR%%/update_sguildb_v12-v13.sql
share/%%SGUILDIR%%/update_sguildb_v5-v6.sql
share/%%SGUILDIR%%/update_sguildb_v6-v7.sql
share/%%SGUILDIR%%/update_sguildb_v7-v8.sql
share/%%SGUILDIR%%/update_sguildb_v8-v9.sql
share/%%SGUILDIR%%/update_sguildb_v9-v10.sql
@dirrm share/%%SGUILDIR%%/contrib/init
@dirrm share/%%SGUILDIR%%/contrib
@dirrm share/%%SGUILDIR%%
@unexec if [ ! -f %D/etc/%%SGUILDIR%%/sguild.conf ] && [ ! -d %D/etc/%%SGUILDIR%%/certs ] ; then rmdir %D/etc/%%SGUILDIR%%; fi
@dirrm lib/%%SGUILDIR%%
@dirrm etc/%%SGUILDIR%%
@dirrm %%DOCSDIR%%

Return to bug 174591

Lines 1-15 Link Here

(-)files/patch-lib-SguildLoaderd.tcl (-10 / +10 lines)
1	--- lib/SguildLoaderd.tcl.orig 2007-09-25 14:17:13.000000000 +0000	1	--- lib/SguildLoaderd.tcl.orig 2012-10-12 21:07:19.000000000 +0000
2	+++ lib/SguildLoaderd.tcl 2011-08-11 20:22:18.000000000 +0000	2	+++ lib/SguildLoaderd.tcl 2012-10-12 21:15:06.000000000 +0000
3	@@ -129,7 +129,7 @@	3	@@ -124,7 +124,7 @@
4	INDEX dst_port (dst_port), \	4	INDEX dst_port (dst_port), \
5	INDEX src_port (src_port), \	5	INDEX src_port (src_port), \
6	INDEX start_time (start_time) \	6	INDEX start_time (start_time) \
7	- ) \	7	- ) \
8	+ ) ENGINE=MyISAM \	8	+ )ENGINE=MyISAM \
9	"	9	"
10		10
11	# Create the table	11	# Create the table
12	@@ -182,7 +182,7 @@	12	@@ -177,7 +177,7 @@
13	INDEX dst_port (dst_port), \	13	INDEX dst_port (dst_port), \
14	INDEX src_port (src_port), \	14	INDEX src_port (src_port), \
15	INDEX start_time (start_time) \	15	INDEX start_time (start_time) \
Lines 18-29 Link Here
18	"	18	"
19	# Create our MERGE sancp table	19	# Create our MERGE sancp table
20	mysqlexec $dbSocketID $createQuery	20	mysqlexec $dbSocketID $createQuery
21	@@ -225,7 +225,7 @@	21	@@ -220,7 +220,7 @@
22	} else {	22	} else {
23	# Make sure its a MERGE table and not the old monster	23	# Make sure its a MERGE table and not the old monster
24	set tableStatus [mysqlsel $LOADERD_DB_ID {SHOW TABLE STATUS LIKE 'sancp'} -flatlist]	24	set tableStatus [mysqlsel $LOADERD_DB_ID {SHOW TABLE STATUS LIKE 'sancp'} -flatlist]
25	- if { [lindex $tableStatus 1] != "MRG_MyISAM" } {	25	- if { $tableStatus != "" && ![ string equal -nocase [lindex $tableStatus 1] "MRG_MyISAM" ] } {
26	+ if { [lindex $tableStatus 1] != "MRG_MYISAM" } {	26	+ if { $tableStatus != "" && ![ string equal -nocase [lindex $tableStatus 1] "MRG_MYISAM" ] } {
		27
27	ErrorMessage "ERROR: loaderd: You appear to be using an old version of the\n\	28	ErrorMessage "ERROR: loaderd: You appear to be using an old version of the\n\
28	sguil database schema that does not support the MERGE sancp\n\	29	sguil database schema that does not support the MERGE sancp\n\
29	table. Please see the CHANGES document for more information\n."

Lines 1-105 Link Here

(-)files/patch-sguild (-45 / +39 lines)
1	--- sguild.orig 2008-04-08 22:02:24.000000000 -0500	1	--- sguild.orig 2012-12-17 20:54:14.000000000 +0000
2	+++ sguild 2008-04-08 22:09:11.000000000 -0500	2	+++ sguild 2012-12-17 20:56:47.000000000 +0000
3	@@ -235,7 +235,7 @@	3	@@ -1,6 +1,4 @@
		4	#!/bin/sh
		5	-# Run tcl from users PATH \
		6	-exec tclsh "$0" "$@"
		7
		8	# $Id: sguild,v 1.193 2011/05/29 15:41:16 bamm Exp $ #
		9
		10	@@ -218,7 +216,7 @@
		11	##################################
		12
		13	# Do all priv account actions here.
		14	-# Open log files/etc. Privs will be dropped after.
		15	+# Open log files/usr/local/etc. Privs will be dropped after.
		16
		17	if { ![info exists LOG_PATH] } { set LOG_PATH /var/log/sguild }
		18
		19	@@ -318,7 +316,7 @@
4	# Check for certs	20	# Check for certs
5	if {![info exists CERTS_PATH]} {	21	if {![info exists CERTS_PATH]} {
6		22
7	- set CERTS_PATH /etc/sguild/certs	23	- set CERTS_PATH /etc/sguild/certs
8	+ set CERTS_PATH /usr/local/etc/sguil-server/certs	24	+ set CERTS_PATH /usr/local/etc/sguild/certs
9		25
10	}	26	}
11		27
12	@@ -265,13 +265,13 @@	28	@@ -348,13 +346,13 @@
13		29
14	if { ![info exists CONF_FILE] } {	30	if { ![info exists CONF_FILE] } {
15	# No conf file specified check the defaults	31	# No conf file specified check the defaults
16	- if { [file exists /etc/sguild/sguild.conf] } {	32	- if { [file exists /etc/sguild/sguild.conf] } {
17	- set CONF_FILE /etc/sguild/sguild.conf	33	- set CONF_FILE /etc/sguild/sguild.conf
18	+ if { [file exists /usr/local/etc/sguil-server/sguild.conf] } {	34	+ if { [file exists /usr/local/etc/sguild/sguild.conf] } {
19	+ set CONF_FILE /usr/local/etc/sguil-server/sguild.conf	35	+ set CONF_FILE /usr/local/etc/sguild/sguild.conf
20	} elseif { [file exists ./sguild.conf] } {	36	} elseif { [file exists ./sguild.conf] } {
21	set CONF_FILE ./sguild.conf	37	set CONF_FILE ./sguild.conf
22	} else {	38	} else {
23	puts "Couldn't determine where the sguil config file is"	39	puts "Couldn't determine where the sguil config file is"
24	- puts "Looked for ./sguild.conf and /etc/sguild/sguild.conf."	40	- puts "Looked for ./sguild.conf and /etc/sguild/sguild.conf."
25	+ puts "Looked for ./sguild.conf and /usr/local/etc/sguil-server/sguild.conf."	41	+ puts "Looked for ./sguild.conf and /usr/local/etc/sguild/sguild.conf."
26	DisplayUsage $argv0	42	DisplayUsage $argv0
27	}	43	}
28	}	44	}
29	@@ -354,17 +354,17 @@	45	@@ -476,8 +474,8 @@
30	# Check for a valid USERS file
31	if { ![info exists USERS_FILE] } {
32	# No users file was specified. Go with the defaults
33	- if { [file exists /etc/sguild/sguild.users] } {
34	- set USERS_FILE "/etc/sguild/sguild.users"
35	+ if { [file exists /usr/local/etc/sguil-server/sguild.users] } {
36	+ set USERS_FILE "/usr/local/etc/sguil-server/sguild.users"
37	} elseif { [file exists ./sguild.users] } {
38	set USERS_FILE "./sguild.users"
39	} else {
40	if { [info exists ADDUSER] && $ADDUSER } {
41	- CreateUsersFile "/etc/sguild/sguild.users"
42	+ CreateUsersFile "/usr/local/etc/sguil-server/sguild.users"
43	} else {
44	set DEBUG 2
45	LogMessage "ERROR: Could not find a sguild.users file."
46	- LogMessage " Checked in ./ and /etc/sguild/"
47	+ LogMessage " Checked in ./ and /usr/local/etc/sguil-server/"
48	DisplayUsage $argv0
49	}
50	}
51	@@ -392,8 +392,8 @@
52	# Load accessfile	46	# Load accessfile
53	if { ![info exists ACCESS_FILE] } {	47	if { ![info exists ACCESS_FILE] } {
54	# Check the defaults	48	# Check the defaults
55	- if { [file exists /etc/sguild/sguild.access] } {	49	- if { [file exists /etc/sguild/sguild.access] } {
56	- set ACCESS_FILE "/etc/sguild/sguild.access"	50	- set ACCESS_FILE "/etc/sguild/sguild.access"
57	+ if { [file exists /usr/local/etc/sguil-server/sguild.access] } {	51	+ if { [file exists /usr/local/etc/sguild/sguild.access] } {
58	+ set ACCESS_FILE "/usr/local/etc/sguil-server/sguild.access"	52	+ set ACCESS_FILE "/usr/local/etc/sguild/sguild.access"
59	} elseif { [file exists ./sguild.access] } {	53	} elseif { [file exists ./sguild.access] } {
60	set ACCESS_FILE "./sguild.access"	54	set ACCESS_FILE "./sguild.access"
61	} else {	55	} else {
62	@@ -407,8 +407,8 @@	56	@@ -491,8 +489,8 @@
63	}	57	}
64	# Load auto cat config	58	# Load auto cat config
65	if { ![info exists AUTOCAT_FILE] } {	59	if { ![info exists AUTOCAT_FILE] } {
66	- if { [file exists /etc/sguild/autocat.conf] } {	60	- if { [file exists /etc/sguild/autocat.conf] } {
67	- set AUTOCAT_FILE "/etc/sguild/autocat.conf"	61	- set AUTOCAT_FILE "/etc/sguild/autocat.conf"
68	+ if { [file exists /usr/local/etc/sguil-server/autocat.conf] } {	62	+ if { [file exists /usr/local/etc/sguild/autocat.conf] } {
69	+ set AUTOCAT_FILE "/usr/local/etc/sguil-server/autocat.conf"	63	+ set AUTOCAT_FILE "/usr/local/etc/sguild/autocat.conf"
70	} else {	64	} else {
71	set AUTOCAT_FILE "./autocat.conf"	65	set AUTOCAT_FILE "./autocat.conf"
72	}	66	}
73	@@ -418,8 +418,8 @@	67	@@ -502,8 +500,8 @@
74	}	68	}
75	# Load email config file	69	# Load email config file
76	if { ![info exists EMAIL_FILE] } {	70	if { ![info exists EMAIL_FILE] } {
77	- if { [file exists /etc/sguild/sguild.email] } {	71	- if { [file exists /etc/sguild/sguild.email] } {
78	- set EMAIL_FILE "/etc/sguild/sguild.email"	72	- set EMAIL_FILE "/etc/sguild/sguild.email"
79	+ if { [file exists /usr/local/etc/sguil-server/sguild.email] } {	73	+ if { [file exists /usr/local/etc/sguild/sguild.email] } {
80	+ set EMAIL_FILE "/usr/local/etc/sguil-server/sguild.email"	74	+ set EMAIL_FILE "/usr/local/etc/sguild/sguild.email"
81	} else {	75	} else {
82	set EMAIL_FILE "./sguild.email"	76	set EMAIL_FILE "./sguild.email"
83	}	77	}
84	@@ -431,8 +431,8 @@	78	@@ -515,8 +513,8 @@
85	}	79	}
86	# Load global queries.	80	# Load global queries.
87	if { ![info exists GLOBAL_QRY_FILE] } {	81	if { ![info exists GLOBAL_QRY_FILE] } {
88	- if { [file exists /etc/sguild/sguild.queries] } {	82	- if { [file exists /etc/sguild/sguild.queries] } {
89	- set GLOBAL_QRY_FILE "/etc/sguild/sguild.queries"	83	- set GLOBAL_QRY_FILE "/etc/sguild/sguild.queries"
90	+ if { [file exists /usr/local/etc/sguil-server/sguild.queries] } {	84	+ if { [file exists /usr/local/etc/sguild/sguild.queries] } {
91	+ set GLOBAL_QRY_FILE "/usr/local/etc/sguil-server/sguild.queries"	85	+ set GLOBAL_QRY_FILE "/usr/local/etc/sguild/sguild.queries"
92	} else {	86	} else {
93	set GLOBAL_QRY_FILE "./sguild.queries"	87	set GLOBAL_QRY_FILE "./sguild.queries"
94	}	88	}
95	@@ -444,8 +444,8 @@	89	@@ -528,8 +526,8 @@
96	}	90	}
97	# Load report queries.	91	# Load report queries.
98	if { ![info exists REPORT_QRY_FILE] } {	92	if { ![info exists REPORT_QRY_FILE] } {
99	- if { [file exists /etc/sguild/sguild.reports] } {	93	- if { [file exists /etc/sguild/sguild.reports] } {
100	- set REPORT_QRY_FILE "/etc/sguild/sguild.reports"	94	- set REPORT_QRY_FILE "/etc/sguild/sguild.reports"
101	+ if { [file exists /usr/local/etc/sguil-server/sguild.reports] } {	95	+ if { [file exists /usr/local/etc/sguild/sguild.reports] } {
102	+ set REPORT_QRY_FILE "/usr/local/etc/sguil-server/sguild.reports"	96	+ set REPORT_QRY_FILE "/usr/local/etc/sguild/sguild.reports"
103	} else {	97	} else {
104	set REPORT_QRY_FILE "./sguild.reports"	98	set REPORT_QRY_FILE "./sguild.reports"
105	}	99	}

Lines 1-52 Link Here

(-)files/patch-sql_scripts-create_sguildb.sql (-80 / +99 lines)
1	--- sql_scripts/create_sguildb.sql.orig 2007-03-17 02:43:37.000000000 +0000	1	--- sql_scripts/create_sguildb.sql.orig 2012-10-12 21:39:20.000000000 +0000
2	+++ sql_scripts/create_sguildb.sql 2011-08-09 22:21:09.000000000 +0000	2	+++ sql_scripts/create_sguildb.sql 2012-10-12 21:53:42.000000000 +0000
3	@@ -52,10 +52,10 @@	3	@@ -3,7 +3,7 @@
		4	-- CREATE DATABASE IF NOT EXISTS sguildb;
		5	-- USE sguildb;
		6
		7	--- Depreciated for MRG_MyISAM tables
		8	+-- Deprecated for MRG_MyISAM tables
		9	-- CREATE TABLE event
		10	-- (
		11	-- sid INT UNSIGNED NOT NULL,
		12	@@ -52,7 +52,7 @@
4	-- INDEX status (status),	13	-- INDEX status (status),
5	-- INDEX abuse_queue (abuse_queue),	14	-- INDEX abuse_queue (abuse_queue),
6	-- INDEX abuse_sent (abuse_sent)	15	-- INDEX abuse_sent (abuse_sent)
7	---);	16	--- );
8	+-- );	17	+-- )ENGINE=MyISAM;
9		18
10	---CREATE TABLE tcphdr	19	-- CREATE TABLE tcphdr
11	---(	20	-- (
12	+-- CREATE TABLE tcphdr	21	@@ -66,7 +66,8 @@
13	+-- (	22	-- tcp_win SMALLINT UNSIGNED,
14	-- sid INT UNSIGNED NOT NULL,	23	-- tcp_csum SMALLINT UNSIGNED,
15	-- cid INT UNSIGNED NOT NULL,
16	-- tcp_seq INT UNSIGNED,
17	@@ -68,16 +68,16 @@
18	-- tcp_urp SMALLINT UNSIGNED,	24	-- tcp_urp SMALLINT UNSIGNED,
19	-- PRIMARY KEY (sid,cid));	25	--- PRIMARY KEY (sid,cid));
		26	+-- PRIMARY KEY (sid,cid)
		27	+-- )ENGINE=MyISAM;
20	--	28	--
21	---CREATE TABLE udphdr	29	-- CREATE TABLE udphdr
22	---(	30	-- (
23	+-- CREATE TABLE udphdr	31	@@ -74,7 +75,8 @@
24	+-- (
25	-- sid INT UNSIGNED NOT NULL,
26	-- cid INT UNSIGNED NOT NULL,	32	-- cid INT UNSIGNED NOT NULL,
27	-- udp_len SMALLINT UNSIGNED,	33	-- udp_len SMALLINT UNSIGNED,
28	-- udp_csum SMALLINT UNSIGNED,	34	-- udp_csum SMALLINT UNSIGNED,
29	-- PRIMARY KEY (sid,cid));	35	--- PRIMARY KEY (sid,cid));
		36	+-- PRIMARY KEY (sid,cid)
		37	+-- )ENGINE=MyISAM;
30	--	38	--
31	---CREATE TABLE icmphdr	39	-- CREATE TABLE icmphdr
32	---(	40	-- (
33	+-- CREATE TABLE icmphdr	41	@@ -83,14 +85,16 @@
34	+-- (
35	-- sid INT UNSIGNED NOT NULL,
36	-- cid INT UNSIGNED NOT NULL,
37	-- icmp_csum SMALLINT UNSIGNED,	42	-- icmp_csum SMALLINT UNSIGNED,
38	@@ -85,8 +85,8 @@	43	-- icmp_id SMALLINT UNSIGNED,
39	-- icmp_seq SMALLINT UNSIGNED,	44	-- icmp_seq SMALLINT UNSIGNED,
40	-- PRIMARY KEY (sid,cid));	45	--- PRIMARY KEY (sid,cid));
		46	+-- PRIMARY KEY (sid,cid)
		47	+-- )ENGINE=MyISAM;
41	--	48	--
42	---CREATE TABLE data	49	-- CREATE TABLE data
43	---(	50	-- (
44	+-- CREATE TABLE data
45	+-- (
46	-- sid INT UNSIGNED NOT NULL,	51	-- sid INT UNSIGNED NOT NULL,
47	-- cid INT UNSIGNED NOT NULL,	52	-- cid INT UNSIGNED NOT NULL,
48	-- data_payload TEXT,	53	-- data_payload TEXT,
49	@@ -101,13 +101,13 @@	54	--- PRIMARY KEY (sid,cid));
		55	+-- PRIMARY KEY (sid,cid)
		56	+-- )ENGINE=MyISAM;
		57
		58	CREATE TABLE sensor
		59	(
		60	@@ -101,13 +105,13 @@
50	interface VARCHAR(255),	61	interface VARCHAR(255),
51	description TEXT,	62	description TEXT,
52	bpf_filter TEXT,	63	bpf_filter TEXT,
Lines 58-157 Link Here
58	PRIMARY KEY (sid),	69	PRIMARY KEY (sid),
59	INDEX hostname_idx (hostname)	70	INDEX hostname_idx (hostname)
60	-);	71	-);
61	+) ENGINE=MyISAM;	72	+)ENGINE=MyISAM;
62		73
63	CREATE TABLE portscan	74	CREATE TABLE portscan
64	(	75	(
65	@@ -119,7 +119,8 @@	76	@@ -119,9 +123,10 @@
66	dst_port INT UNSIGNED,	77	dst_port INT UNSIGNED,
67	data TEXT,	78	data TEXT,
68	INDEX ps_src_ip (src_ip),	79	INDEX ps_src_ip (src_ip),
69	- INDEX ps_timestamp (timestamp));	80	- INDEX ps_timestamp (timestamp));
70	+ INDEX ps_timestamp (timestamp)	81	+ INDEX ps_timestamp (timestamp)
71	+) ENGINE=MyISAM;	82	+)ENGINE=MyISAM;
72		83
73	-- Depreciated	84	--- Depreciated
74	-- CREATE TABLE sessions (	85	+-- Deprecated
75	@@ -150,7 +151,7 @@	86	-- CREATE TABLE sessions (
		87	-- sid INT UNSIGNED NOT NULL,
		88	-- xid BIGINT UNSIGNED NOT NULL,
		89	@@ -142,7 +147,8 @@
		90	-- INDEX server (src_ip),
		91	-- INDEX client (dst_ip),
		92	-- INDEX sport (src_port),
		93	--- INDEX cport (dst_port));
		94	+-- INDEX cport (dst_port)
		95	+-- )ENGINE=MyISAM;
		96
		97	CREATE TABLE status
		98	(
		99	@@ -150,7 +156,7 @@
76	description VARCHAR(255) NOT NULL,	100	description VARCHAR(255) NOT NULL,
77	long_desc VARCHAR(255),	101	long_desc VARCHAR(255),
78	PRIMARY KEY (status_id)	102	PRIMARY KEY (status_id)
79	-);	103	-);
80	+) ENGINE=MyISAM;	104	+)ENGINE=MyISAM;
81		105
82	CREATE TABLE history	106	CREATE TABLE history
83	(	107	(
84	@@ -161,7 +162,7 @@	108	@@ -161,7 +167,7 @@
85	status SMALLINT UNSIGNED NOT NULL,	109	status SMALLINT UNSIGNED NOT NULL,
86	comment VARCHAR(255),	110	comment VARCHAR(255),
87	INDEX log_time (timestamp)	111	INDEX log_time (timestamp)
88	-);	112	-);
89	+) ENGINE=MyISAM;	113	+)ENGINE=MyISAM;
90		114
91	CREATE TABLE user_info	115	CREATE TABLE user_info
92	(	116	(
93	@@ -169,7 +170,7 @@	117	@@ -170,7 +176,7 @@
94	username VARCHAR(16) NOT NULL,	118	last_login DATETIME,
95	last_login DATETIME NOT NULL,	119	password VARCHAR(42),
96	PRIMARY KEY (uid)	120	PRIMARY KEY (uid)
97	-);	121	-);
98	+) ENGINE=MyISAM;	122	+)ENGINE=MyISAM;
99		123
100	CREATE TABLE nessus_data	124	CREATE TABLE nessus_data
101	(	125	(
102	@@ -178,7 +179,8 @@	126	@@ -179,7 +185,8 @@
103	nessus_id INT UNSIGNED,	127	nessus_id INT UNSIGNED,
104	level VARCHAR(20),	128	level VARCHAR(20),
105	description TEXT,	129	description TEXT,
106	- INDEX rid (rid));	130	- INDEX rid (rid));
107	+ INDEX rid (rid)	131	+ INDEX rid (rid)
108	+) ENGINE=MyISAM;	132	+)ENGINE=MyISAM;
109		133
110	CREATE TABLE nessus	134	CREATE TABLE nessus
111	(	135	(
112	@@ -188,7 +190,8 @@	136	@@ -189,7 +196,8 @@
113	timestart DATETIME,	137	timestart DATETIME,
114	timeend DATETIME,	138	timeend DATETIME,
115	PRIMARY KEY (rid),	139	PRIMARY KEY (rid),
116	- INDEX ip (ip));	140	- INDEX ip (ip));
117	+ INDEX ip (ip)	141	+ INDEX ip (ip)
118	+) ENGINE=MyISAM;	142	+)ENGINE=MyISAM;
119		143
120	CREATE TABLE IF NOT EXISTS `pads`	144	CREATE TABLE IF NOT EXISTS `pads`
121	(	145	(
122	@@ -203,12 +206,12 @@	146	@@ -204,10 +212,10 @@
123	application VARCHAR(255) NOT NULL,	147	application VARCHAR(255) NOT NULL,
124	hex_payload VARCHAR(255),	148	hex_payload VARCHAR(255),
125	PRIMARY KEY (sid,asset_id)	149	PRIMARY KEY (sid,asset_id)
126	-);	150	-);
127	+) ENGINE=MyISAM;	151	+)ENGINE=MyISAM;
128		152
129	--	153	--
130	-- Depreciated for MERGE tables	154	--- Depreciated for MERGE tables
131	---CREATE TABLE sancp	155	+-- Deprecated for MERGE tables
132	---(	156	-- CREATE TABLE sancp
133	+-- CREATE TABLE sancp	157	-- (
134	+-- (
135	-- sid INT UNSIGNED NOT NULL,	158	-- sid INT UNSIGNED NOT NULL,
136	-- sancpid BIGINT UNSIGNED NOT NULL,	159	@@ -232,7 +240,7 @@
137	-- start_time DATETIME NOT NULL,
138	@@ -231,8 +234,8 @@
139	-- INDEX dst_port (dst_port),	160	-- INDEX dst_port (dst_port),
140	-- INDEX src_port (src_port),	161	-- INDEX src_port (src_port),
141	-- INDEX start_time (start_time)	162	-- INDEX start_time (start_time)
142	---);	163	--- );
143	---	164	+-- )ENGINE=MyISAM;
144	+-- );	165	--
145	+--	166
146
147	INSERT INTO status (status_id, description, long_desc) VALUES (0, "New", "Real Time Event");	167	INSERT INTO status (status_id, description, long_desc) VALUES (0, "New", "Real Time Event");
148	INSERT INTO status (status_id, description, long_desc) VALUES (1, "No Further Action Required", "No Further Action Required");	168	@@ -251,7 +259,7 @@
149	@@ -250,7 +253,7 @@
150	(	169	(
151	version VARCHAR(32),	170	version VARCHAR(32),
152	installed DATETIME	171	installed DATETIME
153	-);	172	-);
154	+) ENGINE=MyISAM;	173	+)ENGINE=MyISAM;
155		174
156	INSERT INTO version (version, installed) VALUES ("0.12", now());	175	INSERT INTO version (version, installed) VALUES ("0.13", now());
157		176

Lines 2-16 Link Here

(-)files/pkg-message.in (-13 / +4 lines)
2	* !!!!!!!!!!! WARNING !!!!!!!!!!! *	2	* !!!!!!!!!!! WARNING !!!!!!!!!!! *
3	***********************************	3	***********************************
4		4
5	PLEASE NOTE: If you are upgrading from a previous version,
6	read the UPGRADE doc (in %%DOCSDIR%%) before proceeding!!!
7	Some noteworthy changes in version 0.7.0:
8	SSL is now required for server, sensor and client.
9	The sguild.conf and sguild.email files have changed.
10	You MUST run the upgrade_0.7.tcl script to clean up and
11	prepare the database before running the new version. BE SURE
12	TO BACK UP YOUR DATABASE BEFORE PROCEEDING!!!
13
14	If you had existing config files in %%PREFIX%%/etc/%%SGUILDIR%%	5	If you had existing config files in %%PREFIX%%/etc/%%SGUILDIR%%
15	they were not overwritten. If this is a first time install, you	6	they were not overwritten. If this is a first time install, you
16	must copy the sample files to the corresponding conf file and	7	must copy the sample files to the corresponding conf file and
Lines 24-34 Link Here
24	correct LOG_DIRS and put a copy of the snort rules you use in	15	correct LOG_DIRS and put a copy of the snort rules you use in
25	LOG_DIR/rules.	16	LOG_DIR/rules.
26		17
27	The sguild, archive_sguildb.tcl and incident_report.tcl scripts	18	The sguild program was placed in %%PREFIX%%/bin/.
28	were placed in %%PREFIX%%/bin/. The incident_report.tcl
29	script is from the contrib section. There is no documentation
30	and the script's variables must be edited before it is used.
31		19
		20	Some contributed scripts were placed in
		21	%%PREFIX%%/share/%%SGUILDIR%%/contrib
		22
32	A startup script, named sguild.sh was installed in	23	A startup script, named sguild.sh was installed in
33	%%PREFIX%%/etc/rc.d/. To enable it, edit /etc/rc.conf	24	%%PREFIX%%/etc/rc.d/. To enable it, edit /etc/rc.conf
34	per the instructions in the script.	25	per the instructions in the script.

Lines 9-51 Link Here

(-)files/sguild.in (-25 / +9 lines)
9	# Add the following lines to /etc/rc.conf to enable sguild:	9	# Add the following lines to /etc/rc.conf to enable sguild:
10	# sguild_enable (bool): Set to YES to enable sguild	10	# sguild_enable (bool): Set to YES to enable sguild
11	# Default: NO	11	# Default: NO
12	# The following commandline arguments are available for sguild
13	# " -c <filename>: PATH to the sguild config (sguild.conf) file."
14	# " -a <filename>: PATH to the autocat config (autocat.conf) file."
15	# " -g <filename>: PATH to the sguild global queries (sguild.queries) file."
16	# " -u <filename>: PATH to the sguild users (sguild.users) file."
17	# " -P <filename>: Name of file to write the PID to."
18	# " Default is /var/run/%%SGUILDIR%%/sguild.pid"
19	# " -l <filepath>: PATH to sguild libraries."
20	# " -O <filename>: Define PATH to tls (tcl openssl) lib (libtls1.x.so)"
21	# " -C <directory>: Directory that contains sguild.pem and sguild.key"
22	# " -D Runs sguild in daemon mode."
23	# " -A <filename>: PATH to sguild.access file."
24	# " -d <0\|1\|2>: Set DEBUG level"
25	# sguild_flags (str): Extra flags passed to sguild	12	# sguild_flags (str): Extra flags passed to sguild
26	# Default: -D -P ${pid}	13	# Default: -D -P ${pid}
27	# sguild_conf (str): Sguild configuration file	14	# sguild_conf (str): Sguild configuration file
28	# Default: %%PREFIX%%/etc/%%SGUILDIR%%/sguild.conf	15	# Default: %%PREFIX%%/etc/%%SGUILDIR%%/sguild.conf
29	# sguild_user (str): Default: sguild	16	# sguild_user (str): Default: sguil
30	# Note: this value MUST be set in /etc/rc.conf if you do not accept the default	17	# Note: this value MUST be set in /etc/rc.conf if you do not accept the default
31	# user created by the pkg-install script	18	# user created by the pkg-install script
32		19
33	. /etc/rc.subr	20	. /etc/rc.subr
34		21
		22	name="sguild"
		23	rcvar=sguild_enable
35	load_rc_config sguild	24	load_rc_config sguild
36	# set some defaults	25	# set some defaults
37	sguild_enable=${sguild_enable:-"NO"}	26	: ${sguild_enable:="NO"}
38	sguild_conf=${sguild_conf:-"/%%PREFIX%%/etc/%%SGUILDIR%%/sguild.conf"}	27	: ${sguild_conf:="%%PREFIX%%/etc/%%SGUILDIR%%/sguild.conf"}
39	pid=${pid:-"/var/run/%%SGUILDIR%%/sguild.pid"}	28	: ${pid:="/var/run/%%SGUILDIR%%/sguild.pid"}
40	sguild_flags=${sguild_flags:-"-D -P ${pid}"}	29	: ${sguild_flags:="-D -P ${pid}"}
41	sguild_user=${sguild_user:-"sguil"}	30	: ${sguild_user:="sguil"}
42		31
43	name="sguild"
44	rcvar=sguild_enable
45	command="%%PREFIX%%/bin/${name}"	32	command="%%PREFIX%%/bin/${name}"
46	command_args="-c ${sguild_conf} ${sguild_flags}"	33	procname="%%PREFIX%%/bin/%%TCLSH%%"
47	procname="%%TCLSH%%"
48	check_process="${procname}"
49	sguild_user="sguil"
50		34
51	run_rc_command "$1"	35	run_rc_command "$1"

Lines 1-5 Link Here

(-)pkg-plist (-7 / +26 lines)
1	bin/archive_sguildb.tcl
2	bin/incident_report.tcl
3	bin/sguild	1	bin/sguild
4	etc/%%SGUILDIR%%/autocat.conf-sample	2	etc/%%SGUILDIR%%/autocat.conf-sample
5	etc/%%SGUILDIR%%/sguild.access-sample	3	etc/%%SGUILDIR%%/sguild.access-sample
Lines 19-25 Link Here
19	lib/%%SGUILDIR%%/SguildGenericEvent.tcl	17	lib/%%SGUILDIR%%/SguildGenericEvent.tcl
20	lib/%%SGUILDIR%%/SguildHealthChecks.tcl	18	lib/%%SGUILDIR%%/SguildHealthChecks.tcl
21	lib/%%SGUILDIR%%/SguildLoaderd.tcl	19	lib/%%SGUILDIR%%/SguildLoaderd.tcl
		20	lib/%%SGUILDIR%%/SguildLoaderd.tcl.orig
22	lib/%%SGUILDIR%%/SguildMysqlMerge.tcl	21	lib/%%SGUILDIR%%/SguildMysqlMerge.tcl
		22	lib/%%SGUILDIR%%/SguildMysqlMerge.tcl.orig
23	lib/%%SGUILDIR%%/SguildPadsLib.tcl	23	lib/%%SGUILDIR%%/SguildPadsLib.tcl
24	lib/%%SGUILDIR%%/SguildQueryd.tcl	24	lib/%%SGUILDIR%%/SguildQueryd.tcl
25	lib/%%SGUILDIR%%/SguildReportBuilder.tcl	25	lib/%%SGUILDIR%%/SguildReportBuilder.tcl
Lines 28-47 Link Here
28	lib/%%SGUILDIR%%/SguildSensorCmdRcvd.tcl	28	lib/%%SGUILDIR%%/SguildSensorCmdRcvd.tcl
29	lib/%%SGUILDIR%%/SguildTranscript.tcl	29	lib/%%SGUILDIR%%/SguildTranscript.tcl
30	lib/%%SGUILDIR%%/SguildUtils.tcl	30	lib/%%SGUILDIR%%/SguildUtils.tcl
		31	%%DOCSDIR%%/CHANGES
		32	%%DOCSDIR%%/FAQ
		33	%%DOCSDIR%%/INSTALL
		34	%%DOCSDIR%%/INSTALL.openbsd
		35	%%DOCSDIR%%/OPENSSL.README
		36	%%DOCSDIR%%/README
		37	%%DOCSDIR%%/TODO
		38	%%DOCSDIR%%/UPGRADE
		39	%%DOCSDIR%%/USAGE
		40	%%DOCSDIR%%/sguildb.dia
		41	share/%%SGUILDIR%%/contrib/incident_report.tcl
		42	share/%%SGUILDIR%%/contrib/init/sguil
		43	share/%%SGUILDIR%%/contrib/init/sguild
31	share/%%SGUILDIR%%/create_ruledb.sql	44	share/%%SGUILDIR%%/create_ruledb.sql
32	share/%%SGUILDIR%%/create_sguildb.sql	45	share/%%SGUILDIR%%/create_sguildb.sql
		46	share/%%SGUILDIR%%/create_sguildb.sql.orig
33	share/%%SGUILDIR%%/migrate_event.tcl	47	share/%%SGUILDIR%%/migrate_event.tcl
34	share/%%SGUILDIR%%/migrate_sancp.tcl	48	share/%%SGUILDIR%%/migrate_sancp.tcl
35	share/%%SGUILDIR%%/sancp_cleanup.tcl	49	share/%%SGUILDIR%%/sancp_cleanup.tcl
		50	share/%%SGUILDIR%%/sancp_cleanup.tcl.orig
36	share/%%SGUILDIR%%/update_0.7.tcl	51	share/%%SGUILDIR%%/update_0.7.tcl
		52	share/%%SGUILDIR%%/update_0.8.tcl
		53	share/%%SGUILDIR%%/update_sguildb_v10-v11.sql
		54	share/%%SGUILDIR%%/update_sguildb_v11-v12.sql
		55	share/%%SGUILDIR%%/update_sguildb_v12-v13.sql
37	share/%%SGUILDIR%%/update_sguildb_v5-v6.sql	56	share/%%SGUILDIR%%/update_sguildb_v5-v6.sql
38	share/%%SGUILDIR%%/update_sguildb_v6-v7.sql	57	share/%%SGUILDIR%%/update_sguildb_v6-v7.sql
39	share/%%SGUILDIR%%/update_sguildb_v7-v8.sql	58	share/%%SGUILDIR%%/update_sguildb_v7-v8.sql
40	share/%%SGUILDIR%%/update_sguildb_v8-v9.sql	59	share/%%SGUILDIR%%/update_sguildb_v8-v9.sql
41	share/%%SGUILDIR%%/update_sguildb_v9-v10.sql	60	share/%%SGUILDIR%%/update_sguildb_v9-v10.sql
42	share/%%SGUILDIR%%/update_sguildb_v10-v11.sql	61	@dirrm share/%%SGUILDIR%%/contrib/init
43	share/%%SGUILDIR%%/update_sguildb_v11-v12.sql	62	@dirrm share/%%SGUILDIR%%/contrib
44	@dirrmtry etc/%%SGUILDIR%%/certs	63	@dirrm share/%%SGUILDIR%%
45	@unexec if [ ! -f %D/etc/%%SGUILDIR%%/sguild.conf ] && [ ! -d %D/etc/%%SGUILDIR%%/certs ] ; then rmdir %D/etc/%%SGUILDIR%%; fi
46	@dirrm lib/%%SGUILDIR%%	64	@dirrm lib/%%SGUILDIR%%
47	@dirrm share/%%SGUILDIR%%	65	@dirrm etc/%%SGUILDIR%%
		66	@dirrm %%DOCSDIR%%