From pauls@utd65257.utdallas.edu  Mon Jul  6 20:23:24 2009
Return-Path: <pauls@utd65257.utdallas.edu>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E0031065696
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  6 Jul 2009 20:23:24 +0000 (UTC)
	(envelope-from pauls@utd65257.utdallas.edu)
Received: from utd65257.utdallas.edu (utd65257.utdallas.edu [129.110.3.28])
	by mx1.freebsd.org (Postfix) with ESMTP id E40A68FC1D
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  6 Jul 2009 20:23:23 +0000 (UTC)
	(envelope-from pauls@utd65257.utdallas.edu)
Received: from utd65257.utdallas.edu (localhost [127.0.0.1])
	by utd65257.utdallas.edu (Postfix) with ESMTP id B33CC347845
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  6 Jul 2009 15:05:45 -0500 (CDT)
Received: (from root@localhost)
	by utd65257.utdallas.edu (8.14.3/8.14.3/Submit) id n66K5jUh061458;
	Mon, 6 Jul 2009 15:05:45 -0500 (CDT)
	(envelope-from pauls)
Message-Id: <200907062005.n66K5jUh061458@utd65257.utdallas.edu>
Date: Mon, 6 Jul 2009 15:05:45 -0500 (CDT)
From: Paul Schmehl <pauls@utdallas.edu>
Reply-To: Paul Schmehl <pauls@utdallas.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: security/sguil-server, fixes a bug in two library scripts
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         136391
>Category:       ports
>Synopsis:       security/sguil-server, fixes a bug in two library scripts
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 06 20:30:01 UTC 2009
>Closed-Date:    Tue Jul 07 13:20:31 UTC 2009
>Last-Modified:  Tue Jul 07 13:20:31 UTC 2009
>Originator:     Paul Schmehl
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
The University of Texas at Dallas
>Environment:
System: FreeBSD hostname.utdallas.edu 7.2-STABLE FreeBSD 7.2-STABLE #12: Wed May 6 12:12:16 CDT 2009 root@hostname.utdallas.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	There is a type in two library files; MyISAM instead of MYISAM
	that causes upgrades to fail during the update database phase
	These patches fix those typos
>How-To-Repeat:
	
>Fix:

	

--- patch-lib-SguildLoaderd.tcl begins here ---
--- lib/SguildLoaderd.tcl.bak	2009-07-06 14:53:16.000000000 -0500
+++ lib/SguildLoaderd.tcl	2009-07-06 14:53:56.000000000 -0500
@@ -225,7 +225,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 { [lindex $tableStatus 1] != "MRG_MyISAM" } {
+        if { [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."
--- patch-lib-SguildLoaderd.tcl ends here ---

--- patch-lib-SguildMysqlMerge.tcl begins here ---
--- lib/SguildMysqlMerge.tcl.bak	2009-07-06 14:53:27.000000000 -0500
+++ lib/SguildMysqlMerge.tcl	2009-07-06 14:54:26.000000000 -0500
@@ -9,7 +9,7 @@
         set tmpQry "SHOW TABLE STATUS LIKE '$tableName'"
         set tableStatus [mysqlsel $MAIN_DB_SOCKETID $tmpQry -flatlist]
 
-        if { $tableStatus != "" && [lindex $tableStatus 1] != "MRG_MyISAM" } {
+        if { $tableStatus != "" && [lindex $tableStatus 1] != "MRG_MYISAM" } {
 
             # Non MERGE table found.
             set errorMsg "\n*************************************************************\n
--- patch-lib-SguildMysqlMerge.tcl ends here ---


>Release-Note:
>Audit-Trail:

From: Paul Schmehl <pauls@utdallas.edu>
To: bug-followup@FreeBSD.org, pauls@utdallas.edu
Cc:  
Subject: Re: ports/136391: security/sguil-server, fixes a bug in two library
 scripts
Date: Mon, 06 Jul 2009 20:54:32 +0000

 --==========7E3CFED49536C331828C==========
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 The description should have read "There is a typo", not "There is a type" 
 (which is rather ironic considering).  Also, these patch files go in 
 /usr/ports/security/sguil-server/files/, which was not noted in the original 
 PR.  My apologies for that.
 
 The attached patch, if applied from /usr/ports, should update the port.
 
 -- 
 Paul Schmehl (pauls@utdallas.edu)
 Senior Information Security Analyst
 The University of Texas at Dallas
 http://www.utdallas.edu/ir/security/
 
 --==========7E3CFED49536C331828C==========
 Content-Type: application/octet-stream; name=patch-security-sguil-server
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=patch-security-sguil-server;
  size=4338
 
 ZGlmZiAtTmF1ciBzZWN1cml0eS9zZ3VpbC1zZXJ2ZXIuYmFrL2ZpbGVzL3BhdGNoLWxpYi1TZ3Vp
 bGRMb2FkZXJkLnRjbCBzZWN1cml0eS9zZ3VpbC1zZXJ2ZXIvZmlsZXMvcGF0Y2gtbGliLVNndWls
 ZExvYWRlcmQudGNsCi0tLSBzZWN1cml0eS9zZ3VpbC1zZXJ2ZXIuYmFrL2ZpbGVzL3BhdGNoLWxp
 Yi1TZ3VpbGRMb2FkZXJkLnRjbAkxOTY5LTEyLTMxIDE4OjAwOjAwLjAwMDAwMDAwMCAtMDYwMAor
 Kysgc2VjdXJpdHkvc2d1aWwtc2VydmVyL2ZpbGVzL3BhdGNoLWxpYi1TZ3VpbGRMb2FkZXJkLnRj
 bAkyMDA5LTA3LTA2IDE0OjU3OjQ2LjAwMDAwMDAwMCAtMDUwMApAQCAtMCwwICsxLDExIEBACist
 LS0gbGliL1NndWlsZExvYWRlcmQudGNsLmJhawkyMDA5LTA3LTA2IDE0OjUzOjE2LjAwMDAwMDAw
 MCAtMDUwMAorKysrIGxpYi9TZ3VpbGRMb2FkZXJkLnRjbAkyMDA5LTA3LTA2IDE0OjUzOjU2LjAw
 MDAwMDAwMCAtMDUwMAorQEAgLTIyNSw3ICsyMjUsNyBAQAorICAgICB9IGVsc2UgeworICAgICAg
 ICAgIyBNYWtlIHN1cmUgaXRzIGEgTUVSR0UgdGFibGUgYW5kIG5vdCB0aGUgb2xkIG1vbnN0ZXIK
 KyAgICAgICAgIHNldCB0YWJsZVN0YXR1cyBbbXlzcWxzZWwgJExPQURFUkRfREJfSUQge1NIT1cg
 VEFCTEUgU1RBVFVTIExJS0UgJ3NhbmNwJ30gLWZsYXRsaXN0XQorLSAgICAgICAgaWYgeyBbbGlu
 ZGV4ICR0YWJsZVN0YXR1cyAxXSAhPSAiTVJHX015SVNBTSIgfSB7CisrICAgICAgICBpZiB7IFts
 aW5kZXggJHRhYmxlU3RhdHVzIDFdICE9ICJNUkdfTVlJU0FNIiB9IHsKKyAgICAgICAgICAgICBF
 cnJvck1lc3NhZ2UgIkVSUk9SOiBsb2FkZXJkOiBZb3UgYXBwZWFyIHRvIGJlIHVzaW5nIGFuIG9s
 ZCB2ZXJzaW9uIG9mIHRoZVxuXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgc2d1aWwgZGF0
 YWJhc2Ugc2NoZW1hIHRoYXQgZG9lcyBub3Qgc3VwcG9ydCB0aGUgTUVSR0Ugc2FuY3BcblwKKyAg
 ICAgICAgICAgICAgICAgICAgICAgICAgIHRhYmxlLiBQbGVhc2Ugc2VlIHRoZSBDSEFOR0VTIGRv
 Y3VtZW50IGZvciBtb3JlIGluZm9ybWF0aW9uXG4uIgpkaWZmIC1OYXVyIHNlY3VyaXR5L3NndWls
 LXNlcnZlci5iYWsvZmlsZXMvcGF0Y2gtbGliLVNndWlsZE15c3FsTWVyZ2UudGNsIHNlY3VyaXR5
 L3NndWlsLXNlcnZlci9maWxlcy9wYXRjaC1saWItU2d1aWxkTXlzcWxNZXJnZS50Y2wKLS0tIHNl
 Y3VyaXR5L3NndWlsLXNlcnZlci5iYWsvZmlsZXMvcGF0Y2gtbGliLVNndWlsZE15c3FsTWVyZ2Uu
 dGNsCTE5NjktMTItMzEgMTg6MDA6MDAuMDAwMDAwMDAwIC0wNjAwCisrKyBzZWN1cml0eS9zZ3Vp
 bC1zZXJ2ZXIvZmlsZXMvcGF0Y2gtbGliLVNndWlsZE15c3FsTWVyZ2UudGNsCTIwMDktMDctMDYg
 MTQ6NTg6MDIuMDAwMDAwMDAwIC0wNTAwCkBAIC0wLDAgKzEsMTEgQEAKKy0tLSBsaWIvU2d1aWxk
 TXlzcWxNZXJnZS50Y2wuYmFrCTIwMDktMDctMDYgMTQ6NTM6MjcuMDAwMDAwMDAwIC0wNTAwCisr
 KysgbGliL1NndWlsZE15c3FsTWVyZ2UudGNsCTIwMDktMDctMDYgMTQ6NTQ6MjYuMDAwMDAwMDAw
 IC0wNTAwCitAQCAtOSw3ICs5LDcgQEAKKyAgICAgICAgIHNldCB0bXBRcnkgIlNIT1cgVEFCTEUg
 U1RBVFVTIExJS0UgJyR0YWJsZU5hbWUnIgorICAgICAgICAgc2V0IHRhYmxlU3RhdHVzIFtteXNx
 bHNlbCAkTUFJTl9EQl9TT0NLRVRJRCAkdG1wUXJ5IC1mbGF0bGlzdF0KKyAKKy0gICAgICAgIGlm
 IHsgJHRhYmxlU3RhdHVzICE9ICIiICYmIFtsaW5kZXggJHRhYmxlU3RhdHVzIDFdICE9ICJNUkdf
 TXlJU0FNIiB9IHsKKysgICAgICAgIGlmIHsgJHRhYmxlU3RhdHVzICE9ICIiICYmIFtsaW5kZXgg
 JHRhYmxlU3RhdHVzIDFdICE9ICJNUkdfTVlJU0FNIiB9IHsKKyAKKyAgICAgICAgICAgICAjIE5v
 biBNRVJHRSB0YWJsZSBmb3VuZC4KKyAgICAgICAgICAgICBzZXQgZXJyb3JNc2cgIlxuKioqKioq
 KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxu
 CmRpZmYgLU5hdXIgc2VjdXJpdHkvc2d1aWwtc2VydmVyLmJhay9wYXRjaC1zZWN1cml0eS1zZ3Vp
 bC1zZXJ2ZXIgc2VjdXJpdHkvc2d1aWwtc2VydmVyL3BhdGNoLXNlY3VyaXR5LXNndWlsLXNlcnZl
 cgotLS0gc2VjdXJpdHkvc2d1aWwtc2VydmVyLmJhay9wYXRjaC1zZWN1cml0eS1zZ3VpbC1zZXJ2
 ZXIJMjAwOS0wNy0wNiAxNTo1MjozMC4wMDAwMDAwMDAgLTA1MDAKKysrIHNlY3VyaXR5L3NndWls
 LXNlcnZlci9wYXRjaC1zZWN1cml0eS1zZ3VpbC1zZXJ2ZXIJMTk2OS0xMi0zMSAxODowMDowMC4w
 MDAwMDAwMDAgLTA2MDAKQEAgLTEsMzAgKzAsMCBAQAotZGlmZiAtTmF1ciBzZWN1cml0eS9zZ3Vp
 bC1zZXJ2ZXIuYmFrL2ZpbGVzL3BhdGNoLWxpYi1TZ3VpbGRMb2FkZXJkLnRjbCBzZWN1cml0eS9z
 Z3VpbC1zZXJ2ZXIvZmlsZXMvcGF0Y2gtbGliLVNndWlsZExvYWRlcmQudGNsCi0tLS0gc2VjdXJp
 dHkvc2d1aWwtc2VydmVyLmJhay9maWxlcy9wYXRjaC1saWItU2d1aWxkTG9hZGVyZC50Y2wJMTk2
 OS0xMi0zMSAxODowMDowMC4wMDAwMDAwMDAgLTA2MDAKLSsrKyBzZWN1cml0eS9zZ3VpbC1zZXJ2
 ZXIvZmlsZXMvcGF0Y2gtbGliLVNndWlsZExvYWRlcmQudGNsCTIwMDktMDctMDYgMTQ6NTc6NDYu
 MDAwMDAwMDAwIC0wNTAwCi1AQCAtMCwwICsxLDExIEBACi0rLS0tIGxpYi9TZ3VpbGRMb2FkZXJk
 LnRjbC5iYWsJMjAwOS0wNy0wNiAxNDo1MzoxNi4wMDAwMDAwMDAgLTA1MDAKLSsrKysgbGliL1Nn
 dWlsZExvYWRlcmQudGNsCTIwMDktMDctMDYgMTQ6NTM6NTYuMDAwMDAwMDAwIC0wNTAwCi0rQEAg
 LTIyNSw3ICsyMjUsNyBAQAotKyAgICAgfSBlbHNlIHsKLSsgICAgICAgICAjIE1ha2Ugc3VyZSBp
 dHMgYSBNRVJHRSB0YWJsZSBhbmQgbm90IHRoZSBvbGQgbW9uc3RlcgotKyAgICAgICAgIHNldCB0
 YWJsZVN0YXR1cyBbbXlzcWxzZWwgJExPQURFUkRfREJfSUQge1NIT1cgVEFCTEUgU1RBVFVTIExJ
 S0UgJ3NhbmNwJ30gLWZsYXRsaXN0XQotKy0gICAgICAgIGlmIHsgW2xpbmRleCAkdGFibGVTdGF0
 dXMgMV0gIT0gIk1SR19NeUlTQU0iIH0gewotKysgICAgICAgIGlmIHsgW2xpbmRleCAkdGFibGVT
 dGF0dXMgMV0gIT0gIk1SR19NWUlTQU0iIH0gewotKyAgICAgICAgICAgICBFcnJvck1lc3NhZ2Ug
 IkVSUk9SOiBsb2FkZXJkOiBZb3UgYXBwZWFyIHRvIGJlIHVzaW5nIGFuIG9sZCB2ZXJzaW9uIG9m
 IHRoZVxuXAotKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHNndWlsIGRhdGFiYXNlIHNjaGVt
 YSB0aGF0IGRvZXMgbm90IHN1cHBvcnQgdGhlIE1FUkdFIHNhbmNwXG5cCi0rICAgICAgICAgICAg
 ICAgICAgICAgICAgICAgdGFibGUuIFBsZWFzZSBzZWUgdGhlIENIQU5HRVMgZG9jdW1lbnQgZm9y
 IG1vcmUgaW5mb3JtYXRpb25cbi4iCi1kaWZmIC1OYXVyIHNlY3VyaXR5L3NndWlsLXNlcnZlci5i
 YWsvZmlsZXMvcGF0Y2gtbGliLVNndWlsZE15c3FsTWVyZ2UudGNsIHNlY3VyaXR5L3NndWlsLXNl
 cnZlci9maWxlcy9wYXRjaC1saWItU2d1aWxkTXlzcWxNZXJnZS50Y2wKLS0tLSBzZWN1cml0eS9z
 Z3VpbC1zZXJ2ZXIuYmFrL2ZpbGVzL3BhdGNoLWxpYi1TZ3VpbGRNeXNxbE1lcmdlLnRjbAkxOTY5
 LTEyLTMxIDE4OjAwOjAwLjAwMDAwMDAwMCAtMDYwMAotKysrIHNlY3VyaXR5L3NndWlsLXNlcnZl
 ci9maWxlcy9wYXRjaC1saWItU2d1aWxkTXlzcWxNZXJnZS50Y2wJMjAwOS0wNy0wNiAxNDo1ODow
 Mi4wMDAwMDAwMDAgLTA1MDAKLUBAIC0wLDAgKzEsMTEgQEAKLSstLS0gbGliL1NndWlsZE15c3Fs
 TWVyZ2UudGNsLmJhawkyMDA5LTA3LTA2IDE0OjUzOjI3LjAwMDAwMDAwMCAtMDUwMAotKysrKyBs
 aWIvU2d1aWxkTXlzcWxNZXJnZS50Y2wJMjAwOS0wNy0wNiAxNDo1NDoyNi4wMDAwMDAwMDAgLTA1
 MDAKLStAQCAtOSw3ICs5LDcgQEAKLSsgICAgICAgICBzZXQgdG1wUXJ5ICJTSE9XIFRBQkxFIFNU
 QVRVUyBMSUtFICckdGFibGVOYW1lJyIKLSsgICAgICAgICBzZXQgdGFibGVTdGF0dXMgW215c3Fs
 c2VsICRNQUlOX0RCX1NPQ0tFVElEICR0bXBRcnkgLWZsYXRsaXN0XQotKyAKLSstICAgICAgICBp
 ZiB7ICR0YWJsZVN0YXR1cyAhPSAiIiAmJiBbbGluZGV4ICR0YWJsZVN0YXR1cyAxXSAhPSAiTVJH
 X015SVNBTSIgfSB7Ci0rKyAgICAgICAgaWYgeyAkdGFibGVTdGF0dXMgIT0gIiIgJiYgW2xpbmRl
 eCAkdGFibGVTdGF0dXMgMV0gIT0gIk1SR19NWUlTQU0iIH0gewotKyAKLSsgICAgICAgICAgICAg
 IyBOb24gTUVSR0UgdGFibGUgZm91bmQuCi0rICAgICAgICAgICAgIHNldCBlcnJvck1zZyAiXG4q
 KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
 KioqXG4K
 
 --==========7E3CFED49536C331828C==========--
 
Responsible-Changed-From-To: freebsd-ports-bugs->amdmi3 
Responsible-Changed-By: amdmi3 
Responsible-Changed-When: Tue Jul 7 00:39:06 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=136391 
State-Changed-From-To: open->closed 
State-Changed-By: amdmi3 
State-Changed-When: Tue Jul 7 13:20:29 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=136391 
>Unformatted:
